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 5c823260d4a53d860169cb586e3180979c8cc089..e99cd80a4e9980e490fbc173109c737726317027 100644 (file)
--- a/configs/integratorcp_cm926ejs_defconfig
+++ b/configs/integratorcp_cm926ejs_defconfig
@@ -2,4 +2,10 @@ CONFIG_ARM=y
 CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_CP=y
 CONFIG_CM926EJ_S=y
-CONFIG_CMD_NET=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