ARM: uniphier: merge two defconfig files

[oweals/u-boot.git] / configs / integratorcp_cm920t_defconfig

diff --git a/configs/integratorcp_cm920t_defconfig b/configs/integratorcp_cm920t_defconfig
index 25041ffea6c1dc12903d23965f50b7c7f54e22d8..20cd4046373840ce6ccd9d9eb134d8dd87c42b78 100644 (file)
--- a/configs/integratorcp_cm920t_defconfig
+++ b/configs/integratorcp_cm920t_defconfig
@@ -2,4 +2,5 @@ CONFIG_ARM=y
 CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_CP=y
 CONFIG_CM920T=y
-CONFIG_CMD_NET=y
+CONFIG_SYS_PROMPT="Integrator-CP # "
+# CONFIG_CMD_SETEXPR is not set