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

[u-boot] / configs / integratorap_cm946es_defconfig

diff --git a/configs/integratorap_cm946es_defconfig b/configs/integratorap_cm946es_defconfig
index 1b3c6f869fdbdfb6ec0c65bb80d88f01463379e0..c13af27def58710a1cd0cde873e043cddf458e21 100644 (file)
--- a/configs/integratorap_cm946es_defconfig
+++ b/configs/integratorap_cm946es_defconfig
@@ -8,5 +8,8 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Integrator-AP # "
 CONFIG_CMD_ARMFLASH=y
 # CONFIG_CMD_SETEXPR is not set
+# CONFIG_MMC is not set
+CONFIG_MTD_NOR_FLASH=y
 CONFIG_PCI=y
+CONFIG_BAUDRATE=38400
 CONFIG_OF_LIBFDT=y