Merge git://git.denx.de/u-boot-dm

[u-boot] / configs / integratorcp_cm946es_defconfig

diff --git a/configs/integratorcp_cm946es_defconfig b/configs/integratorcp_cm946es_defconfig
index 2e67dbc70a37160a28b38cf8374e32f82b9a63b8..a4aeba43d416d53e9806d5fd947f3aa5ffb7f512 100644 (file)
--- a/configs/integratorcp_cm946es_defconfig
+++ b/configs/integratorcp_cm946es_defconfig
@@ -1,3 +1,6 @@
-CONFIG_SYS_EXTRA_OPTIONS="CM946ES"
 CONFIG_ARM=y
-CONFIG_TARGET_INTEGRATORCP_CM946ES=y
+CONFIG_ARCH_INTEGRATOR=y
+CONFIG_ARCH_INTEGRATOR_CP=y
+CONFIG_CM946ES=y
+CONFIG_SYS_PROMPT="Integrator-CP # "
+# CONFIG_CMD_SETEXPR is not set