Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / configs / M5235EVB_defconfig

diff --git a/configs/M5235EVB_defconfig b/configs/M5235EVB_defconfig
index afb14b05d76c0b55c0281eb14ed8bf904a1e38a8..97a4bcd6293651493c1c8ff7878e8ada30171bf2 100644 (file)
--- a/configs/M5235EVB_defconfig
+++ b/configs/M5235EVB_defconfig
@@ -1,3 +1,20 @@
 CONFIG_M68K=y
+CONFIG_SYS_TEXT_BASE=0xFFE00000
 CONFIG_TARGET_M5235EVB=y
-CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFFE00000"
+CONFIG_BOOTDELAY=1
+# CONFIG_DISPLAY_BOARDINFO is not set
+# CONFIG_CMDLINE_EDITING is not set
+# CONFIG_AUTO_COMPLETE is not set
+CONFIG_SYS_PROMPT="-> "
+CONFIG_CMD_IMLS=y
+CONFIG_CMD_I2C=y
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+CONFIG_CMD_PCI=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_MII=y
+CONFIG_CMD_PING=y
+CONFIG_CMD_CACHE=y
+CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_MTD_NOR_FLASH=y