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

[u-boot] / configs / integratorap_cm926ejs_defconfig

diff --git a/configs/integratorap_cm926ejs_defconfig b/configs/integratorap_cm926ejs_defconfig
index f58e256b93d3fb5bca397ae778ee65f36893adeb..f288dc88e2ddace36570bf1ca1368341b39f35b8 100644 (file)
--- a/configs/integratorap_cm926ejs_defconfig
+++ b/configs/integratorap_cm926ejs_defconfig
@@ -2,6 +2,14 @@ CONFIG_ARM=y
 CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_AP=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-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