ARM: uniphier: merge two defconfig files

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

diff --git a/configs/imx31_phycore_defconfig b/configs/imx31_phycore_defconfig
index 563de57dc070ba269d658bd026a6360b6c4bca04..6f3ae10d5472945623e1b2bd1bdf41fbf21c9516 100644 (file)
--- a/configs/imx31_phycore_defconfig
+++ b/configs/imx31_phycore_defconfig
@@ -1,2 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_IMX31_PHYCORE=y
+CONFIG_SYS_PROMPT="uboot> "
+# CONFIG_CMD_SETEXPR is not set