Merge git://git.denx.de/u-boot-dm

[u-boot] / configs / amcore_defconfig

diff --git a/configs/amcore_defconfig b/configs/amcore_defconfig
index 0fe5afafd9e789661fe39235cf801dfeb58b05a8..15573d0c00067aa876b61891cf23284a8154081f 100644 (file)
--- a/configs/amcore_defconfig
+++ b/configs/amcore_defconfig
@@ -1,18 +1,22 @@
 CONFIG_M68K=y
+CONFIG_SYS_TEXT_BASE=0xFFC00000
 CONFIG_SYS_MALLOC_F_LEN=0x800
 CONFIG_TARGET_AMCORE=y
-CONFIG_SYS_TEXT_BASE=0xffc00000
 CONFIG_BOOTDELAY=1
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_SYS_PROMPT="amcore $ "
 # CONFIG_CMD_BOOTD is not set
+CONFIG_CMD_IMLS=y
 # CONFIG_CMD_XIMG is not set
 CONFIG_LOOPW=y
-# CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIMER=y
+CONFIG_CMD_DIAG=y
+CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_DM=y
+CONFIG_MTD_NOR_FLASH=y
 CONFIG_DM_SERIAL=y