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 32ea7b97e7a7a7956e935920d7ca5d32a746b115..037cd4dc614c4363daf83beae13043348b53f0fa 100644 (file)
--- a/configs/integratorcp_cm926ejs_defconfig
+++ b/configs/integratorcp_cm926ejs_defconfig
@@ -2,3 +2,13 @@ CONFIG_ARM=y
 CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_CP=y
 CONFIG_CM926EJ_S=y
+# CONFIG_DISPLAY_CPUINFO is not set
+# CONFIG_DISPLAY_BOARDINFO is not set
+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