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

[u-boot] / configs / M5485DFE_defconfig

diff --git a/configs/M5485DFE_defconfig b/configs/M5485DFE_defconfig
index f9dacc0141171247564620d06c126babc9584c06..3d289f77b0ff5456a3d5411e3572d838f6cf3145 100644 (file)
--- a/configs/M5485DFE_defconfig
+++ b/configs/M5485DFE_defconfig
@@ -1,15 +1,20 @@
 CONFIG_M68K=y
-CONFIG_TARGET_M5485EVB=y
 CONFIG_SYS_TEXT_BASE=0xFF800000
+CONFIG_TARGET_M5485EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_USBCTRL"
 CONFIG_BOOTDELAY=1
+# 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_PCI=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_MTD_NOR_FLASH=y
 CONFIG_PCI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y