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

[u-boot] / configs / M5249EVB_defconfig

diff --git a/configs/M5249EVB_defconfig b/configs/M5249EVB_defconfig
index 6c77da4d8a309677d11843c8e906f0b554950d08..8478136c6b22e8eb6928d6eda8fc0378c77e04dc 100644 (file)
--- a/configs/M5249EVB_defconfig
+++ b/configs/M5249EVB_defconfig
@@ -1,9 +1,13 @@
 CONFIG_M68K=y
+CONFIG_SYS_TEXT_BASE=0xFFE00000
 CONFIG_TARGET_M5249EVB=y
-CONFIG_SYS_TEXT_BASE=0xffe00000
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 # CONFIG_DISPLAY_BOARDINFO is not set
+# CONFIG_CMDLINE_EDITING is not set
 # CONFIG_AUTOBOOT is not set
+CONFIG_CMD_IMLS=y
 CONFIG_LOOPW=y
 # CONFIG_CMD_SETEXPR is not set
-# CONFIG_CMD_NET is not set
 CONFIG_CMD_CACHE=y
+# CONFIG_NET is not set
+CONFIG_MTD_NOR_FLASH=y