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

[u-boot] / configs / M5235EVB_Flash32_defconfig

diff --git a/configs/M5235EVB_Flash32_defconfig b/configs/M5235EVB_Flash32_defconfig
index eff91eca58c44370c7f15562b774e056c4ae242d..f24955cd30faeec1753b9507ff30db866c35dcb4 100644 (file)
--- a/configs/M5235EVB_Flash32_defconfig
+++ b/configs/M5235EVB_Flash32_defconfig
@@ -1,13 +1,20 @@
 CONFIG_M68K=y
-CONFIG_TARGET_M5235EVB=y
 CONFIG_SYS_TEXT_BASE=0xFFC00000
+CONFIG_TARGET_M5235EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="NORFLASH_PS32BIT"
 CONFIG_BOOTDELAY=1
+# CONFIG_DISPLAY_BOARDINFO is not set
+# CONFIG_CMDLINE_EDITING is not set
+# CONFIG_AUTO_COMPLETE is not set
+CONFIG_CMD_IMLS=y
+CONFIG_CMD_I2C=y
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
-CONFIG_CMD_I2C=y
+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