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

[u-boot] / configs / integratorcp_cm926ejs_defconfig

diff --git a/configs/integratorcp_cm926ejs_defconfig b/configs/integratorcp_cm926ejs_defconfig
index a8d762b0047c066a0caddf0b2efe68399b42afb7..e99cd80a4e9980e490fbc173109c737726317027 100644 (file)
--- a/configs/integratorcp_cm926ejs_defconfig
+++ b/configs/integratorcp_cm926ejs_defconfig
@@ -1,3 +1,11 @@
-CONFIG_SYS_EXTRA_OPTIONS="CM924EJ_S"
 CONFIG_ARM=y
-CONFIG_TARGET_INTEGRATORCP_CM926EJS=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_OF_LIBFDT=y