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

[people/ms/u-boot.git] / configs / integratorcp_cm926ejs_defconfig

diff --git a/configs/integratorcp_cm926ejs_defconfig b/configs/integratorcp_cm926ejs_defconfig
index e99cd80a4e9980e490fbc173109c737726317027..037cd4dc614c4363daf83beae13043348b53f0fa 100644 (file)
--- a/configs/integratorcp_cm926ejs_defconfig
+++ b/configs/integratorcp_cm926ejs_defconfig
@@ -8,4 +8,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Integrator-CP # "
 CONFIG_CMD_ARMFLASH=y
 # CONFIG_CMD_SETEXPR is not set
+# CONFIG_MMC is not set
+CONFIG_MTD_NOR_FLASH=y
+CONFIG_BAUDRATE=38400
 CONFIG_OF_LIBFDT=y