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

[oweals/u-boot.git] / configs / amcore_defconfig

diff --git a/configs/amcore_defconfig b/configs/amcore_defconfig
index 5b271b98e1c3e7c494f9fe492678dbb1c0fada94..aa43859cb872ea4add082b5b794121784eddfe92 100644 (file)
--- a/configs/amcore_defconfig
+++ b/configs/amcore_defconfig
@@ -1,7 +1,8 @@
 CONFIG_M68K=y
+CONFIG_SYS_TEXT_BASE=0xffc00000
 CONFIG_SYS_MALLOC_F_LEN=0x800
 CONFIG_TARGET_AMCORE=y
-CONFIG_SYS_TEXT_BASE=0xffc00000
+CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_BOOTDELAY=1
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 # CONFIG_DISPLAY_BOARDINFO is not set
@@ -15,5 +16,7 @@ CONFIG_LOOPW=y
 # CONFIG_CMD_NFS is not set
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIMER=y
+CONFIG_CMD_DIAG=y
 CONFIG_DM=y
+CONFIG_MTD_NOR_FLASH=y
 CONFIG_DM_SERIAL=y