[U-Boot] [PATCH 00/12] cm-fx6 and kconfig updates

[U-Boot] [PATCH 00/12] cm-fx6 and kconfig updates

[Nikita Kiryanov]

This series includes some fixes for cm-fx6, as well as migrating of cm-fx6
config options to the defconfig file. In the process of migrating the config
#defines, new entries are added to menuconfig.

Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>

Nikita Kiryanov (12):
  arm: mx6: cm-fx6: map HDMI to IPU1 DI0 explicitly
  arm: mx6: cm-fx6: make it possible to not init display
  arm: mx6: cm-fx6: add support for displaytype env var
  arm: mx6: cm-fx6: setup hdmi only on hdmi enable
  arm: mx6: cm-fx6: move CMD configs to defconfig
  arm: mx6: cm-fx6: move cm-fx6 target under ARCH_MX6
  arm: mx6: kconfig: don't select CPU_V7 per board
  arm: mx6: usb: kconfig: add USB_EHCI_MX6 kconfig option
  usb: kconfig: usb keyboard kconfig
  usb: kconfig: create a menu for usb
  sf: kconfig: add kconfig options for spi flashes
  kconfig: add config option for shell prompt

 arch/arm/Kconfig               |  8 ----
 arch/arm/cpu/armv7/mx6/Kconfig |  9 ++++-
 board/compulab/cm_fx6/cm_fx6.c | 86 +++++++++++++++++++++++++++---------------
 common/Kconfig                 |  7 ++++
 configs/cm_fx6_defconfig       | 21 +++++++++++
 drivers/mtd/spi/Kconfig        | 44 +++++++++++++++++++++
 drivers/usb/Kconfig            | 29 ++++++++++++++
 drivers/usb/host/Kconfig       |  7 ++++
 include/configs/cm_fx6.h       | 18 ---------
 9 files changed, 171 insertions(+), 58 deletions(-)

-- 
1.9.1

[U-Boot] [PATCH 01/12] arm: mx6: cm-fx6: map HDMI to IPU1 DI0 explicitly

[Nikita Kiryanov]

U-Boot does not explicitly assign the display to an IPU interface. Instead, it
relies on the power-on default of DI0.

Since the kernel reassigns HDMI display to DI1, after a warm reset the HDMI
display no longer works in U-Boot.

Fix this by explicitly assigning HDMI to IPU1 DI0 in U-Boot.

Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
---
 board/compulab/cm_fx6/cm_fx6.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index 7a1bbaf..b500f91 100644
--- a/board/compulab/cm_fx6/cm_fx6.c
+++ b/board/compulab/cm_fx6/cm_fx6.c
@@ -83,6 +83,7 @@ size_t display_count = ARRAY_SIZE(displays);
 static void cm_fx6_setup_display(void)
 {
 	struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
+	struct iomuxc *const iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR;
 	int reg;
 
 	enable_ipu_clock();
@@ -90,6 +91,7 @@ static void cm_fx6_setup_display(void)
 	reg = __raw_readl(&mxc_ccm->CCGR3);
 	reg |= MXC_CCM_CCGR3_IPU1_IPU_DI0_MASK;
 	writel(reg, &mxc_ccm->CCGR3);
+	clrbits_le32(&iomuxc_regs->gpr[3], MXC_CCM_CCGR3_IPU1_IPU_DI0_MASK);
 }
 #else
 static inline void cm_fx6_setup_display(void) {}
-- 
1.9.1

[U-Boot] [PATCH 02/12] arm: mx6: cm-fx6: make it possible to not init display

[Nikita Kiryanov]

Implement a cm-fx6 specific board_video_skip() to provide the option to not
initialize the display.

The new function does not init display if the environment variable "panel" is
not defined, or if it is set to an unsupported value.

Collateral changes:
- Don't use the global displays array (it's CONFIG_IMX_VIDEO_SKIP specific).
- Don't use detect_hdmi(), since env controlled init makes it unnecessary.

Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
---
 board/compulab/cm_fx6/cm_fx6.c | 72 ++++++++++++++++++++++++++++--------------
 include/configs/cm_fx6.h       |  1 -
 2 files changed, 48 insertions(+), 25 deletions(-)

diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index b500f91..2fb8db5 100644
--- a/board/compulab/cm_fx6/cm_fx6.c
+++ b/board/compulab/cm_fx6/cm_fx6.c
@@ -13,6 +13,7 @@
 #include <fsl_esdhc.h>
 #include <miiphy.h>
 #include <netdev.h>
+#include <errno.h>
 #include <fdt_support.h>
 #include <sata.h>
 #include <splash.h>
@@ -54,31 +55,27 @@ static void cm_fx6_enable_hdmi(struct display_info_t const *dev)
 	imx_enable_hdmi_phy();
 }
 
-struct display_info_t const displays[] = {
-	{
-		.bus	= -1,
-		.addr	= 0,
-		.pixfmt	= IPU_PIX_FMT_RGB24,
-		.detect	= detect_hdmi,
-		.enable	= cm_fx6_enable_hdmi,
-		.mode	= {
-			.name           = "HDMI",
-			.refresh        = 60,
-			.xres           = 1024,
-			.yres           = 768,
-			.pixclock       = 40385,
-			.left_margin    = 220,
-			.right_margin   = 40,
-			.upper_margin   = 21,
-			.lower_margin   = 7,
-			.hsync_len      = 60,
-			.vsync_len      = 10,
-			.sync           = FB_SYNC_EXT,
-			.vmode          = FB_VMODE_NONINTERLACED,
-		}
-	},
+static struct display_info_t preset_hdmi_1024X768 = {
+	.bus	= -1,
+	.addr	= 0,
+	.pixfmt	= IPU_PIX_FMT_RGB24,
+	.enable	= cm_fx6_enable_hdmi,
+	.mode	= {
+		.name           = "HDMI",
+		.refresh        = 60,
+		.xres           = 1024,
+		.yres           = 768,
+		.pixclock       = 40385,
+		.left_margin    = 220,
+		.right_margin   = 40,
+		.upper_margin   = 21,
+		.lower_margin   = 7,
+		.hsync_len      = 60,
+		.vsync_len      = 10,
+		.sync           = FB_SYNC_EXT,
+		.vmode          = FB_VMODE_NONINTERLACED,
+	}
 };
-size_t display_count = ARRAY_SIZE(displays);
 
 static void cm_fx6_setup_display(void)
 {
@@ -93,6 +90,33 @@ static void cm_fx6_setup_display(void)
 	writel(reg, &mxc_ccm->CCGR3);
 	clrbits_le32(&iomuxc_regs->gpr[3], MXC_CCM_CCGR3_IPU1_IPU_DI0_MASK);
 }
+
+int board_video_skip(void)
+{
+	int ret;
+	struct display_info_t *preset;
+	char const *panel = getenv("panel");
+
+	if (!panel)
+		return -ENOENT;
+
+	if (!strcmp(panel, "HDMI"))
+		preset = &preset_hdmi_1024X768;
+	else
+		return -EINVAL;
+
+	ret = ipuv3_fb_init(&preset->mode, 0, preset->pixfmt);
+	if (ret) {
+		printf("Can't init display %s: %d\n", preset->mode.name, ret);
+		return ret;
+	}
+
+	preset->enable(preset);
+	printf("Display: %s (%ux%u)\n", preset->mode.name, preset->mode.xres,
+	       preset->mode.yres);
+
+	return 0;
+}
 #else
 static inline void cm_fx6_setup_display(void) {}
 #endif /* CONFIG_VIDEO_IPUV3 */
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 231f4ba..f23ef8b 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -258,7 +258,6 @@
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_IPUV3_CLK          260000000
 #define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
-- 
1.9.1

[U-Boot] [PATCH 03/12] arm: mx6: cm-fx6: add support for displaytype env var

[Nikita Kiryanov]

Add support for selecting display preset using the environment variable
"displaytype". This is a preparation for future merging of compulab
omap3_display.c display selection code with the cm-fx6 display selection code.

The "panel" environment variable is retained for backwards compatibility.

Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
---
 board/compulab/cm_fx6/cm_fx6.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index 2fb8db5..3e518c1 100644
--- a/board/compulab/cm_fx6/cm_fx6.c
+++ b/board/compulab/cm_fx6/cm_fx6.c
@@ -95,7 +95,10 @@ int board_video_skip(void)
 {
 	int ret;
 	struct display_info_t *preset;
-	char const *panel = getenv("panel");
+	char const *panel = getenv("displaytype");
+
+	if (!panel) /* Also accept panel for backward compatibility */
+		panel = getenv("panel");
 
 	if (!panel)
 		return -ENOENT;
-- 
1.9.1

[U-Boot] [PATCH 04/12] arm: mx6: cm-fx6: setup hdmi only on hdmi enable

[Nikita Kiryanov]

Refactor display code to only setup hdmi if do_enable_hdmi() is invoked.

Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
---
 board/compulab/cm_fx6/cm_fx6.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index 3e518c1..e85c8ab 100644
--- a/board/compulab/cm_fx6/cm_fx6.c
+++ b/board/compulab/cm_fx6/cm_fx6.c
@@ -52,6 +52,9 @@ int splash_screen_prepare(void)
 #ifdef CONFIG_IMX_HDMI
 static void cm_fx6_enable_hdmi(struct display_info_t const *dev)
 {
+	struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
+	imx_setup_hdmi();
+	setbits_le32(&mxc_ccm->CCGR3, MXC_CCM_CCGR3_IPU1_IPU_DI0_MASK);
 	imx_enable_hdmi_phy();
 }
 
@@ -79,15 +82,9 @@ static struct display_info_t preset_hdmi_1024X768 = {
 
 static void cm_fx6_setup_display(void)
 {
-	struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
 	struct iomuxc *const iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR;
-	int reg;
 
 	enable_ipu_clock();
-	imx_setup_hdmi();
-	reg = __raw_readl(&mxc_ccm->CCGR3);
-	reg |= MXC_CCM_CCGR3_IPU1_IPU_DI0_MASK;
-	writel(reg, &mxc_ccm->CCGR3);
 	clrbits_le32(&iomuxc_regs->gpr[3], MXC_CCM_CCGR3_IPU1_IPU_DI0_MASK);
 }
 
-- 
1.9.1

[U-Boot] [PATCH 05/12] arm: mx6: cm-fx6: move CMD configs to defconfig

[Nikita Kiryanov]

Move CONFIG_CMD_* options that can be selected in menuconfig to cm-fx6
defconfig.

Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
---
 configs/cm_fx6_defconfig | 5 +++++
 include/configs/cm_fx6.h | 3 ---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index 6be5c17..25829db 100644
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -9,4 +9,9 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_PING=y
 CONFIG_SPI_FLASH=y
+CONFIG_CMD_SF=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_USB=y
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index f23ef8b..9b00c0d 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -50,7 +50,6 @@
 					sizeof(CONFIG_SYS_PROMPT) + 16)
 
 /* SPI flash */
-#define CONFIG_CMD_SF
 #define CONFIG_SF_DEFAULT_BUS		0
 #define CONFIG_SF_DEFAULT_CS		0
 #define CONFIG_SF_DEFAULT_SPEED		25000000
@@ -199,7 +198,6 @@
 #define CONFIG_NET_RETRY_COUNT		5
 
 /* USB */
-#define CONFIG_CMD_USB
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_MX6
 #define CONFIG_USB_STORAGE
@@ -212,7 +210,6 @@
 #define CONFIG_SYS_STDIO_DEREGISTER
 
 /* I2C */
-#define CONFIG_CMD_I2C
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_I2C_MXC
 #define CONFIG_SYS_I2C_MXC_I2C3		/* enable I2C bus 3 */
-- 
1.9.1

[U-Boot] [PATCH 06/12] arm: mx6: cm-fx6: move cm-fx6 target under ARCH_MX6

[Nikita Kiryanov]

cm-fx6 is an MX6 based board, and the menuconfig hierarchy should
reflect that. Make TARGET_CM_FX6 dependant on ARCH_MX6.

Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
---
 arch/arm/Kconfig               | 8 --------
 arch/arm/cpu/armv7/mx6/Kconfig | 8 ++++++++
 configs/cm_fx6_defconfig       | 1 +
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 506463c..fc8c435 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -625,14 +625,6 @@ config RMOBILE
 	bool "Renesas ARM SoCs"
 	select CPU_V7
 
-config TARGET_CM_FX6
-	bool "Support cm_fx6"
-	select CPU_V7
-	select SUPPORT_SPL
-	select DM
-	select DM_SERIAL
-	select DM_GPIO
-
 config ARCH_SOCFPGA
 	bool "Altera SOCFPGA family"
 	select CPU_V7
diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig
index 10908c4..2c18bcd 100644
--- a/arch/arm/cpu/armv7/mx6/Kconfig
+++ b/arch/arm/cpu/armv7/mx6/Kconfig
@@ -29,6 +29,14 @@ choice
 	prompt "MX6 board select"
 	optional
 
+config TARGET_CM_FX6
+	bool "Support CM-FX6"
+	select CPU_V7
+	select SUPPORT_SPL
+	select DM
+	select DM_SERIAL
+	select DM_GPIO
+
 config TARGET_SECOMX6
 	bool "Support secomx6 boards"
 	select CPU_V7
diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index 25829db..7ad5c21 100644
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_CM_FX6=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL"
-- 
1.9.1

[U-Boot] [PATCH 07/12] arm: mx6: kconfig: don't select CPU_V7 per board

[Nikita Kiryanov]

CPU_V7 is already selected by ARCH_MX6, so no point in selecting it again
by boards that depend on ARCH_MX6.

Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
---
 arch/arm/cpu/armv7/mx6/Kconfig | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig
index 2c18bcd..68b46c1 100644
--- a/arch/arm/cpu/armv7/mx6/Kconfig
+++ b/arch/arm/cpu/armv7/mx6/Kconfig
@@ -31,7 +31,6 @@ choice
 
 config TARGET_CM_FX6
 	bool "Support CM-FX6"
-	select CPU_V7
 	select SUPPORT_SPL
 	select DM
 	select DM_SERIAL
@@ -39,11 +38,9 @@ config TARGET_CM_FX6
 
 config TARGET_SECOMX6
 	bool "Support secomx6 boards"
-	select CPU_V7
 
 config TARGET_TQMA6
 	bool "TQ Systems TQMa6 board"
-	select CPU_V7
 
 endchoice
 
-- 
1.9.1

[U-Boot] [PATCH 08/12] arm: mx6: usb: kconfig: add USB_EHCI_MX6 kconfig option

[Nikita Kiryanov]

Add USB_EHCI_MX6 option to menuconfig and use it when migrating cm-fx6 usb
config to defconfig.

Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
---
 configs/cm_fx6_defconfig | 4 ++++
 drivers/usb/host/Kconfig | 7 +++++++
 include/configs/cm_fx6.h | 3 ---
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index 7ad5c21..07a84bb 100644
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -15,4 +15,8 @@ CONFIG_CMD_PING=y
 CONFIG_SPI_FLASH=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_I2C=y
+CONFIG_USB=y
 CONFIG_CMD_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_MX6=y
+CONFIG_USB_STORAGE=y
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 8705c7c..b30b43d 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -52,6 +52,13 @@ config USB_EHCI
 
 if USB_EHCI_HCD
 
+config USB_EHCI_MX6
+	bool "Support for i.MX6 on-chip EHCI USB controller"
+	depends on ARCH_MX6
+	default y
+	---help---
+	  Enables support for the on-chip EHCI controller on i.MX6 SoCs.
+
 config USB_EHCI_UNIPHIER
 	bool "Support for UniPhier on-chip EHCI USB controller"
 	depends on ARCH_UNIPHIER && OF_CONTROL
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 9b00c0d..9f69322 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -198,9 +198,6 @@
 #define CONFIG_NET_RETRY_COUNT		5
 
 /* USB */
-#define CONFIG_USB_EHCI
-#define CONFIG_USB_EHCI_MX6
-#define CONFIG_USB_STORAGE
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS		0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT	2
-- 
1.9.1

[U-Boot] [PATCH 09/12] usb: kconfig: usb keyboard kconfig

[Nikita Kiryanov]

Add Kconfig options for USB keyboard and use them for cm-fx6.

Cc: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
---
 configs/cm_fx6_defconfig |  2 ++
 drivers/usb/Kconfig      | 27 +++++++++++++++++++++++++++
 include/configs/cm_fx6.h |  2 --
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index 07a84bb..f0fd48c 100644
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -20,3 +20,5 @@ CONFIG_CMD_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_MX6=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
+CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 637ef3d..04289f2 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -59,4 +59,31 @@ config USB_STORAGE
 	  Say Y here if you want to connect USB mass storage devices to your
 	  board's USB port.
 
+config USB_KEYBOARD
+	bool "USB Keyboard support"
+	---help---
+	  Say Y here if you want to use a USB keyboard for U-Boot command line
+	  input.
+
+if USB_KEYBOARD
+
+choice
+	prompt "USB keyboard polling"
+	optional
+	---help---
+	  Enable a polling mechanism for USB keyboard.
+
+	config SYS_USB_EVENT_POLL
+		bool "Interrupt polling"
+
+	config SYS_USB_EVENT_POLL_VIA_INT_QUEUE
+		bool "Poll via interrupt queue"
+
+	config SYS_USB_EVENT_POLL_VIA_CONTROL_EP
+		bool "Poll via control EP"
+
+endchoice
+
+endif
+
 endif
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 9f69322..059004c 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -202,8 +202,6 @@
 #define CONFIG_MXC_USB_FLAGS		0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT	2
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET	/* For OTG port */
-#define CONFIG_USB_KEYBOARD
-#define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP
 #define CONFIG_SYS_STDIO_DEREGISTER
 
 /* I2C */
-- 
1.9.1

[U-Boot] [PATCH 10/12] usb: kconfig: create a menu for usb

[Nikita Kiryanov]

With recent additions to USB Kconfig the number of USB options had grown
large enough to warrant a separate menu for USB.

Add a Kconfig menu for USB.

Cc: Marek Vasut <marex@denx.de>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
---
 drivers/usb/Kconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 04289f2..f13a088 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -1,3 +1,4 @@
+menu USB
 config USB_ARCH_HAS_HCD
 	def_bool y
 
@@ -87,3 +88,4 @@ endchoice
 endif
 
 endif
+endmenu
-- 
1.9.1

[U-Boot] [PATCH 11/12] sf: kconfig: add kconfig options for spi flashes

[Nikita Kiryanov]

Add kconfig options for various SPI flashes and use them in cm-fx6 defconfig.

Cc: Jagan Teki <jteki@openedev.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
---
 configs/cm_fx6_defconfig |  8 ++++++++
 drivers/mtd/spi/Kconfig  | 44 ++++++++++++++++++++++++++++++++++++++++++++
 include/configs/cm_fx6.h |  8 --------
 3 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index f0fd48c..2aba359 100644
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -13,6 +13,14 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL"
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
 CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_I2C=y
 CONFIG_USB=y
diff --git a/drivers/mtd/spi/Kconfig b/drivers/mtd/spi/Kconfig
index 4f0c040..8b730ff 100644
--- a/drivers/mtd/spi/Kconfig
+++ b/drivers/mtd/spi/Kconfig
@@ -42,6 +42,50 @@ config SPI_FLASH_BAR
 	  Bank/Extended address registers are used to access the flash
 	  which has size > 16MiB in 3-byte addressing.
 
+if SPI_FLASH
+
+config SPI_FLASH_ATMEL
+	bool "Atmel SPI flash support"
+	help
+	  Add support for various Atmel SPI flash chips (AT45xxx and AT25xxx)
+
+config SPI_FLASH_EON
+	bool "EON SPI flash support"
+	help
+	  Add support for various EON SPI flash chips (EN25xxx)
+
+config SPI_FLASH_GIGADEVICE
+	bool "GigaDevice SPI flash support"
+	help
+	  Add support for various GigaDevice SPI flash chips (GD25xxx)
+
+config SPI_FLASH_MACRONIX
+	bool "Macronix SPI flash support"
+	help
+	  Add support for various Macronix SPI flash chips (MX25Lxxx)
+
+config SPI_FLASH_SPANSION
+	bool "Spansion SPI flash support"
+	help
+	  Add support for various Spansion SPI flash chips (S25FLxxx)
+
+config SPI_FLASH_STMICRO
+	bool "STMicro SPI flash support"
+	help
+	  Add support for various STMicro SPI flash chips (M25Pxxx and N25Qxxx)
+
+config SPI_FLASH_SST
+	bool "SST SPI flash support"
+	help
+	  Add support for various SST SPI flash chips (SST25xxx)
+
+config SPI_FLASH_WINBOND
+	bool "Winbond SPI flash support"
+	help
+	  Add support for various Winbond SPI flash chips (W25xxx)
+
+endif
+
 config SPI_FLASH_DATAFLASH
 	bool "AT45xxx DataFlash support"
 	depends on SPI_FLASH && DM_SPI_FLASH
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 059004c..bbd9f38 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -162,14 +162,6 @@
 /* SPI */
 #define CONFIG_SPI
 #define CONFIG_MXC_SPI
-#define CONFIG_SPI_FLASH_ATMEL
-#define CONFIG_SPI_FLASH_EON
-#define CONFIG_SPI_FLASH_GIGADEVICE
-#define CONFIG_SPI_FLASH_MACRONIX
-#define CONFIG_SPI_FLASH_SPANSION
-#define CONFIG_SPI_FLASH_STMICRO
-#define CONFIG_SPI_FLASH_SST
-#define CONFIG_SPI_FLASH_WINBOND
 
 /* NAND */
 #ifndef CONFIG_SPL_BUILD
-- 
1.9.1

[U-Boot] [PATCH 12/12] kconfig: add config option for shell prompt

[Nikita Kiryanov]

Add option to set shell prompt string from menuconfig and use it
when migrating CONFIG_SYS_PROMPT to cm-fx6 defconfig.

Cc: Tom Rini <trini@konsulko.com>
Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
---
 common/Kconfig           | 7 +++++++
 configs/cm_fx6_defconfig | 1 +
 include/configs/cm_fx6.h | 1 -
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/common/Kconfig b/common/Kconfig
index 40cd69e..6b24fd9 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -17,6 +17,13 @@ config SYS_HUSH_PARSER
 	help
 	  Backward compatibility.
 
+config SYS_PROMPT
+	string "Shell prompt"
+	default "# "
+	help
+	  This string is displayed in the command line to the left of the
+	  cursor.
+
 menu "Autoboot options"
 
 config AUTOBOOT_KEYED
diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index 2aba359..66fc382 100644
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -30,3 +30,4 @@ CONFIG_USB_EHCI_MX6=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
+CONFIG_SYS_PROMPT="CM-FX6 # "
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index bbd9f38..ddf6b5f 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -45,7 +45,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /* Shell */
-#define CONFIG_SYS_PROMPT	"CM-FX6 # "
 #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE + \
 					sizeof(CONFIG_SYS_PROMPT) + 16)
 
-- 
1.9.1

[U-Boot] [PATCH 08/12] arm: mx6: usb: kconfig: add USB_EHCI_MX6 kconfig option

[Marek Vasut]

On Thursday, July 23, 2015 at 04:19:35 PM, Nikita Kiryanov wrote:
> Add USB_EHCI_MX6 option to menuconfig and use it when migrating cm-fx6 usb
> config to defconfig.
> 
> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> Cc: Marek Vasut <marex@denx.de>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Igor Grinberg <grinberg@compulab.co.il>
> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
> ---
>  configs/cm_fx6_defconfig | 4 ++++
>  drivers/usb/host/Kconfig | 7 +++++++
>  include/configs/cm_fx6.h | 3 ---
>  3 files changed, 11 insertions(+), 3 deletions(-)
> 
> diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
> index 7ad5c21..07a84bb 100644
> --- a/configs/cm_fx6_defconfig
> +++ b/configs/cm_fx6_defconfig
> @@ -15,4 +15,8 @@ CONFIG_CMD_PING=y
>  CONFIG_SPI_FLASH=y
>  CONFIG_CMD_SF=y
>  CONFIG_CMD_I2C=y
> +CONFIG_USB=y
>  CONFIG_CMD_USB=y
> +CONFIG_USB_EHCI_HCD=y
> +CONFIG_USB_EHCI_MX6=y
> +CONFIG_USB_STORAGE=y
> diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
> index 8705c7c..b30b43d 100644
> --- a/drivers/usb/host/Kconfig
> +++ b/drivers/usb/host/Kconfig
> @@ -52,6 +52,13 @@ config USB_EHCI
> 
>  if USB_EHCI_HCD
> 
> +config USB_EHCI_MX6
> +	bool "Support for i.MX6 on-chip EHCI USB controller"
> +	depends on ARCH_MX6
> +	default y
> +	---help---
> +	  Enables support for the on-chip EHCI controller on i.MX6 SoCs.
> +
>  config USB_EHCI_UNIPHIER
>  	bool "Support for UniPhier on-chip EHCI USB controller"
>  	depends on ARCH_UNIPHIER && OF_CONTROL
> diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
> index 9b00c0d..9f69322 100644
> --- a/include/configs/cm_fx6.h
> +++ b/include/configs/cm_fx6.h
> @@ -198,9 +198,6 @@
>  #define CONFIG_NET_RETRY_COUNT		5
> 
>  /* USB */
> -#define CONFIG_USB_EHCI
> -#define CONFIG_USB_EHCI_MX6
> -#define CONFIG_USB_STORAGE
>  #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
>  #define CONFIG_MXC_USB_FLAGS		0
>  #define CONFIG_USB_MAX_CONTROLLER_COUNT	2

Can you please also convert the rest of the boards ?

Best regards,
Marek Vasut

[U-Boot] [PATCH 09/12] usb: kconfig: usb keyboard kconfig

[Marek Vasut]

On Thursday, July 23, 2015 at 04:19:36 PM, Nikita Kiryanov wrote:
> Add Kconfig options for USB keyboard and use them for cm-fx6.
> 
> Cc: Marek Vasut <marex@denx.de>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Igor Grinberg <grinberg@compulab.co.il>
> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
> ---
>  configs/cm_fx6_defconfig |  2 ++
>  drivers/usb/Kconfig      | 27 +++++++++++++++++++++++++++
>  include/configs/cm_fx6.h |  2 --
>  3 files changed, 29 insertions(+), 2 deletions(-)
> 
> diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
> index 07a84bb..f0fd48c 100644
> --- a/configs/cm_fx6_defconfig
> +++ b/configs/cm_fx6_defconfig
> @@ -20,3 +20,5 @@ CONFIG_CMD_USB=y
>  CONFIG_USB_EHCI_HCD=y
>  CONFIG_USB_EHCI_MX6=y
>  CONFIG_USB_STORAGE=y
> +CONFIG_USB_KEYBOARD=y
> +CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
> diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
> index 637ef3d..04289f2 100644
> --- a/drivers/usb/Kconfig
> +++ b/drivers/usb/Kconfig
> @@ -59,4 +59,31 @@ config USB_STORAGE
>  	  Say Y here if you want to connect USB mass storage devices to your
>  	  board's USB port.
> 
> +config USB_KEYBOARD
> +	bool "USB Keyboard support"
> +	---help---
> +	  Say Y here if you want to use a USB keyboard for U-Boot command line
> +	  input.
> +
> +if USB_KEYBOARD
> +
> +choice
> +	prompt "USB keyboard polling"
> +	optional
> +	---help---
> +	  Enable a polling mechanism for USB keyboard.
> +
> +	config SYS_USB_EVENT_POLL
> +		bool "Interrupt polling"
> +
> +	config SYS_USB_EVENT_POLL_VIA_INT_QUEUE
> +		bool "Poll via interrupt queue"
> +
> +	config SYS_USB_EVENT_POLL_VIA_CONTROL_EP
> +		bool "Poll via control EP"
> +
> +endchoice
> +
> +endif
> +
>  endif
> diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
> index 9f69322..059004c 100644
> --- a/include/configs/cm_fx6.h
> +++ b/include/configs/cm_fx6.h
> @@ -202,8 +202,6 @@
>  #define CONFIG_MXC_USB_FLAGS		0
>  #define CONFIG_USB_MAX_CONTROLLER_COUNT	2
>  #define CONFIG_EHCI_HCD_INIT_AFTER_RESET	/* For OTG port */
> -#define CONFIG_USB_KEYBOARD
> -#define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP
>  #define CONFIG_SYS_STDIO_DEREGISTER

Same here :)

[U-Boot] [PATCH 10/12] usb: kconfig: create a menu for usb

[Marek Vasut]

On Thursday, July 23, 2015 at 04:19:37 PM, Nikita Kiryanov wrote:
> With recent additions to USB Kconfig the number of USB options had grown
> large enough to warrant a separate menu for USB.
> 
> Add a Kconfig menu for USB.
> 
> Cc: Marek Vasut <marex@denx.de>
> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>

Great work, thanks ! :)

Best regards,
Marek Vasut

[U-Boot] [PATCH 01/12] arm: mx6: cm-fx6: map HDMI to IPU1 DI0 explicitly

[Nikolay Dimitrov]

Hi Nikita,

On 07/23/2015 05:19 PM, Nikita Kiryanov wrote:
> U-Boot does not explicitly assign the display to an IPU interface. Instead, it
> relies on the power-on default of DI0.
>
> Since the kernel reassigns HDMI display to DI1, after a warm reset the HDMI
> display no longer works in U-Boot.
>
> Fix this by explicitly assigning HDMI to IPU1 DI0 in U-Boot.
>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Igor Grinberg <grinberg@compulab.co.il>
> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
> ---
>   board/compulab/cm_fx6/cm_fx6.c | 2 ++
>   1 file changed, 2 insertions(+)

I'm just curious - what motivated your choice of DI0 instead of DI1?

Regards,
Nikolay

[U-Boot] [PATCH 12/12] kconfig: add config option for shell prompt

[Tom Rini]

On Thu, Jul 23, 2015 at 05:19:39PM +0300, Nikita Kiryanov wrote:

> Add option to set shell prompt string from menuconfig and use it
> when migrating CONFIG_SYS_PROMPT to cm-fx6 defconfig.
> 
> Cc: Tom Rini <trini@konsulko.com>
> Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Igor Grinberg <grinberg@compulab.co.il>
> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>

Conceptually, I like.

> ---
>  common/Kconfig           | 7 +++++++
>  configs/cm_fx6_defconfig | 1 +
>  include/configs/cm_fx6.h | 1 -
>  3 files changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/common/Kconfig b/common/Kconfig
> index 40cd69e..6b24fd9 100644
> --- a/common/Kconfig
> +++ b/common/Kconfig
> @@ -17,6 +17,13 @@ config SYS_HUSH_PARSER
>  	help
>  	  Backward compatibility.
>  
> +config SYS_PROMPT
> +	string "Shell prompt"
> +	default "# "

How about "U-Boot> " which while not what I had been forcing everyone in
TI-land to use, is the most common.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150723/453c8df0/attachment.sig>

[U-Boot] [PATCH 12/12] kconfig: add config option for shell prompt

[Masahiro Yamada]

2015-07-24 6:21 GMT+09:00 Tom Rini <trini@konsulko.com>:
> On Thu, Jul 23, 2015 at 05:19:39PM +0300, Nikita Kiryanov wrote:
>
>> Add option to set shell prompt string from menuconfig and use it
>> when migrating CONFIG_SYS_PROMPT to cm-fx6 defconfig.
>>
>> Cc: Tom Rini <trini@konsulko.com>
>> Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
>> Cc: Stefano Babic <sbabic@denx.de>
>> Cc: Igor Grinberg <grinberg@compulab.co.il>
>> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
>
> Conceptually, I like.



This patch breaks many boards.


$ make zmx25_defconfig && make CROSS_COMPILE=arm-linux-gnueabi-
    ...
  CC      arch/arm/cpu/arm926ejs/cpu.o
In file included from include/config.h:5:0,
                 from include/common.h:18,
                 from arch/arm/cpu/arm926ejs/cpu.c:16:
include/configs/zmx25.h:141:0: warning: "CONFIG_SYS_PROMPT" redefined
[enabled by default]
In file included from ././include/linux/kconfig.h:4:0,
                 from <command-line>:0:
include/generated/autoconf.h:48:0: note: this is the location of the
previous definition
  CC      arch/arm/cpu/arm926ejs/cache.o
In file included from include/config.h:5:0,
                 from include/common.h:18,
                 from arch/arm/cpu/arm926ejs/cache.c:8:
include/configs/zmx25.h:141:0: warning: "CONFIG_SYS_PROMPT" redefined
[enabled by default]
In file included from ././include/linux/kconfig.h:4:0,
                 from <command-line>:0:
include/generated/autoconf.h:48:0: note: this is the location of the
previous definition
  CC      arch/arm/cpu/arm926ejs/mx25/generic.o
In file included from include/config.h:5:0,
                 from include/common.h:18,
                 from arch/arm/cpu/arm926ejs/mx25/generic.c:12:
include/configs/zmx25.h:141:0: warning: "CONFIG_SYS_PROMPT" redefined
[enabled by default]
In file included from ././include/linux/kconfig.h:4:0,
                 from <command-line>:0:




This move should be done globally like what Joe does.







>> ---
>>  common/Kconfig           | 7 +++++++
>>  configs/cm_fx6_defconfig | 1 +
>>  include/configs/cm_fx6.h | 1 -
>>  3 files changed, 8 insertions(+), 1 deletion(-)
>>
>> diff --git a/common/Kconfig b/common/Kconfig
>> index 40cd69e..6b24fd9 100644
>> --- a/common/Kconfig
>> +++ b/common/Kconfig
>> @@ -17,6 +17,13 @@ config SYS_HUSH_PARSER
>>       help
>>         Backward compatibility.
>>
>> +config SYS_PROMPT
>> +     string "Shell prompt"
>> +     default "# "
>
> How about "U-Boot> " which while not what I had been forcing everyone in
> TI-land to use, is the most common.



No.

We had already decided the default prompt is "=> ".


See include/config_fallbacks.h

and below:



commit 0defddc851edfc34bcf3c3379fe74b11dc01a493
Author: Rob Herring <rob.herring@calxeda.com>
Date:   Mon Sep 30 17:11:48 2013 -0500

    config: Add a default CONFIG_SYS_PROMPT

    The definitions for CONFIG_SYS_PROMPT are varied with little reason other
    than to display the board name. Over half the definitions are "==> ", so
    make this the default. The rest of the boards remain unchanged to avoid
    breaking any external scripts expecting a certain prompt.

    Signed-off-by: Rob Herring <rob.herring@calxeda.com>
    Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>




-- 
Best Regards
Masahiro Yamada

[U-Boot] [PATCH 08/12] arm: mx6: usb: kconfig: add USB_EHCI_MX6 kconfig option

[Nikita Kiryanov]

On Thu, Jul 23, 2015 at 05:01:07PM +0200, Marek Vasut wrote:
> On Thursday, July 23, 2015 at 04:19:35 PM, Nikita Kiryanov wrote:
> > Add USB_EHCI_MX6 option to menuconfig and use it when migrating cm-fx6 usb
> > config to defconfig.
> > 
> > Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> > Cc: Marek Vasut <marex@denx.de>
> > Cc: Stefano Babic <sbabic@denx.de>
> > Cc: Igor Grinberg <grinberg@compulab.co.il>
> > Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
> > ---
> >  configs/cm_fx6_defconfig | 4 ++++
> >  drivers/usb/host/Kconfig | 7 +++++++
> >  include/configs/cm_fx6.h | 3 ---
> >  3 files changed, 11 insertions(+), 3 deletions(-)
> > 
> 
> Can you please also convert the rest of the boards ?
> 

Sure, coming up.

> Best regards,
> Marek Vasut
> 

[U-Boot] [PATCH 09/12] usb: kconfig: usb keyboard kconfig

[Nikita Kiryanov]

On Thu, Jul 23, 2015 at 05:01:24PM +0200, Marek Vasut wrote:
> On Thursday, July 23, 2015 at 04:19:36 PM, Nikita Kiryanov wrote:
> > Add Kconfig options for USB keyboard and use them for cm-fx6.
> > 
> > Cc: Marek Vasut <marex@denx.de>
> > Cc: Stefano Babic <sbabic@denx.de>
> > Cc: Igor Grinberg <grinberg@compulab.co.il>
> > Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
> > ---
> >  configs/cm_fx6_defconfig |  2 ++
> >  drivers/usb/Kconfig      | 27 +++++++++++++++++++++++++++
> >  include/configs/cm_fx6.h |  2 --
> >  3 files changed, 29 insertions(+), 2 deletions(-)
> > 
> 
> Same here :)
>

Coming up...

[U-Boot] [PATCH 12/12] kconfig: add config option for shell prompt

[Nikita Kiryanov]

On Fri, Jul 24, 2015 at 11:05:22AM +0900, Masahiro Yamada wrote:
> 2015-07-24 6:21 GMT+09:00 Tom Rini <trini@konsulko.com>:
> > On Thu, Jul 23, 2015 at 05:19:39PM +0300, Nikita Kiryanov wrote:
> >
> >> Add option to set shell prompt string from menuconfig and use it
> >> when migrating CONFIG_SYS_PROMPT to cm-fx6 defconfig.
> >>
> >> Cc: Tom Rini <trini@konsulko.com>
> >> Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
> >> Cc: Stefano Babic <sbabic@denx.de>
> >> Cc: Igor Grinberg <grinberg@compulab.co.il>
> >> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
> >
> > Conceptually, I like.
> 
> 
> 
> This patch breaks many boards.

V2 with a makeall coming up.

> -- 
> Best Regards
> Masahiro Yamada
> 

[U-Boot] [PATCH 01/12] arm: mx6: cm-fx6: map HDMI to IPU1 DI0 explicitly

[Nikita Kiryanov]

On Thu, Jul 23, 2015 at 08:54:25PM +0300, Nikolay Dimitrov wrote:
> Hi Nikita,
> 
> On 07/23/2015 05:19 PM, Nikita Kiryanov wrote:
> >U-Boot does not explicitly assign the display to an IPU interface. Instead, it
> >relies on the power-on default of DI0.
> >
> >Since the kernel reassigns HDMI display to DI1, after a warm reset the HDMI
> >display no longer works in U-Boot.
> >
> >Fix this by explicitly assigning HDMI to IPU1 DI0 in U-Boot.
> >
> >Cc: Stefano Babic <sbabic@denx.de>
> >Cc: Igor Grinberg <grinberg@compulab.co.il>
> >Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
> >---
> >  board/compulab/cm_fx6/cm_fx6.c | 2 ++
> >  1 file changed, 2 insertions(+)
> 
> I'm just curious - what motivated your choice of DI0 instead of DI1?

We discovered this after we already did a release with DI0, so I kept it
consistent with that release.

> 
> Regards,
> Nikolay
> 

[U-Boot] [PATCH 08/12] arm: mx6: usb: kconfig: add USB_EHCI_MX6 kconfig option

[Stefano Babic]

Hi Nikita, Marek,

On 26/07/2015 10:17, Nikita Kiryanov wrote:
> On Thu, Jul 23, 2015 at 05:01:07PM +0200, Marek Vasut wrote:
>> On Thursday, July 23, 2015 at 04:19:35 PM, Nikita Kiryanov wrote:
>>> Add USB_EHCI_MX6 option to menuconfig and use it when migrating cm-fx6 usb
>>> config to defconfig.
>>>
>>> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
>>> Cc: Marek Vasut <marex@denx.de>
>>> Cc: Stefano Babic <sbabic@denx.de>
>>> Cc: Igor Grinberg <grinberg@compulab.co.il>
>>> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
>>> ---
>>>  configs/cm_fx6_defconfig | 4 ++++
>>>  drivers/usb/host/Kconfig | 7 +++++++
>>>  include/configs/cm_fx6.h | 3 ---
>>>  3 files changed, 11 insertions(+), 3 deletions(-)
>>>
>>
>> Can you please also convert the rest of the boards ?
>>
> 
> Sure, coming up.

As this series has no relevant issue (it is fine with me), my proposal
is to merge the series and convert the other boards (that are not
touched by the series, anyway) with follow-up patches. Is it ok for you ?

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

[U-Boot] [PATCH 08/12] arm: mx6: usb: kconfig: add USB_EHCI_MX6 kconfig option

[Marek Vasut]

On Sunday, July 26, 2015 at 11:36:11 AM, Stefano Babic wrote:
> Hi Nikita, Marek,
> 
> On 26/07/2015 10:17, Nikita Kiryanov wrote:
> > On Thu, Jul 23, 2015 at 05:01:07PM +0200, Marek Vasut wrote:
> >> On Thursday, July 23, 2015 at 04:19:35 PM, Nikita Kiryanov wrote:
> >>> Add USB_EHCI_MX6 option to menuconfig and use it when migrating cm-fx6
> >>> usb config to defconfig.
> >>> 
> >>> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> >>> Cc: Marek Vasut <marex@denx.de>
> >>> Cc: Stefano Babic <sbabic@denx.de>
> >>> Cc: Igor Grinberg <grinberg@compulab.co.il>
> >>> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
> >>> ---
> >>> 
> >>>  configs/cm_fx6_defconfig | 4 ++++
> >>>  drivers/usb/host/Kconfig | 7 +++++++
> >>>  include/configs/cm_fx6.h | 3 ---
> >>>  3 files changed, 11 insertions(+), 3 deletions(-)
> >> 
> >> Can you please also convert the rest of the boards ?
> > 
> > Sure, coming up.
> 
> As this series has no relevant issue (it is fine with me), my proposal
> is to merge the series and convert the other boards (that are not
> touched by the series, anyway) with follow-up patches. Is it ok for you ?

I think Nikita is already working on the conversion, so either way is fine.

Best regards,
Marek Vasut

[U-Boot] [PATCH 08/12] arm: mx6: usb: kconfig: add USB_EHCI_MX6 kconfig option

[Stefano Babic]

Hi Marek,

On 26/07/2015 12:35, Marek Vasut wrote:
> On Sunday, July 26, 2015 at 11:36:11 AM, Stefano Babic wrote:
>> Hi Nikita, Marek,
>>
>> On 26/07/2015 10:17, Nikita Kiryanov wrote:
>>> On Thu, Jul 23, 2015 at 05:01:07PM +0200, Marek Vasut wrote:
>>>> On Thursday, July 23, 2015 at 04:19:35 PM, Nikita Kiryanov wrote:
>>>>> Add USB_EHCI_MX6 option to menuconfig and use it when migrating cm-fx6
>>>>> usb config to defconfig.
>>>>>
>>>>> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
>>>>> Cc: Marek Vasut <marex@denx.de>
>>>>> Cc: Stefano Babic <sbabic@denx.de>
>>>>> Cc: Igor Grinberg <grinberg@compulab.co.il>
>>>>> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
>>>>> ---
>>>>>
>>>>>  configs/cm_fx6_defconfig | 4 ++++
>>>>>  drivers/usb/host/Kconfig | 7 +++++++
>>>>>  include/configs/cm_fx6.h | 3 ---
>>>>>  3 files changed, 11 insertions(+), 3 deletions(-)
>>>>
>>>> Can you please also convert the rest of the boards ?
>>>
>>> Sure, coming up.
>>
>> As this series has no relevant issue (it is fine with me), my proposal
>> is to merge the series and convert the other boards (that are not
>> touched by the series, anyway) with follow-up patches. Is it ok for you ?
> 
> I think Nikita is already working on the conversion, so either way is fine.

Fine with me. I hold on the current patches. Nikita, let me know which
is your preferred way to go on.

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

[U-Boot] [PATCH 01/12] arm: mx6: cm-fx6: map HDMI to IPU1 DI0 explicitly

[Nikolay Dimitrov]

On 07/26/2015 11:48 AM, Nikita Kiryanov wrote:
> On Thu, Jul 23, 2015 at 08:54:25PM +0300, Nikolay Dimitrov wrote:
>> Hi Nikita,
>>
>> On 07/23/2015 05:19 PM, Nikita Kiryanov wrote:
>>> U-Boot does not explicitly assign the display to an IPU interface. Instead, it
>>> relies on the power-on default of DI0.
>>>
>>> Since the kernel reassigns HDMI display to DI1, after a warm reset the HDMI
>>> display no longer works in U-Boot.
>>>
>>> Fix this by explicitly assigning HDMI to IPU1 DI0 in U-Boot.
>>>
>>> Cc: Stefano Babic <sbabic@denx.de>
>>> Cc: Igor Grinberg <grinberg@compulab.co.il>
>>> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
>>> ---
>>>   board/compulab/cm_fx6/cm_fx6.c | 2 ++
>>>   1 file changed, 2 insertions(+)
>>
>> I'm just curious - what motivated your choice of DI0 instead of DI1?
>
> We discovered this after we already did a release with DI0, so I kept it
> consistent with that release.
>
>>
>> Regards,
>> Nikolay
>>
>

Thanks!

[U-Boot] [PATCH 01/12] arm: mx6: cm-fx6: map HDMI to IPU1 DI0 explicitly

[Igor Grinberg]

Hi Nikita,

On 07/23/15 17:19, Nikita Kiryanov wrote:
> U-Boot does not explicitly assign the display to an IPU interface. Instead, it
> relies on the power-on default of DI0.
> 
> Since the kernel reassigns HDMI display to DI1, after a warm reset the HDMI
> display no longer works in U-Boot.
> 
> Fix this by explicitly assigning HDMI to IPU1 DI0 in U-Boot.
> 
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Igor Grinberg <grinberg@compulab.co.il>
> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
> ---
>  board/compulab/cm_fx6/cm_fx6.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
> index 7a1bbaf..b500f91 100644
> --- a/board/compulab/cm_fx6/cm_fx6.c
> +++ b/board/compulab/cm_fx6/cm_fx6.c
> @@ -83,6 +83,7 @@ size_t display_count = ARRAY_SIZE(displays);
>  static void cm_fx6_setup_display(void)
>  {
>  	struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
> +	struct iomuxc *const iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR;
>  	int reg;
>  
>  	enable_ipu_clock();
> @@ -90,6 +91,7 @@ static void cm_fx6_setup_display(void)
>  	reg = __raw_readl(&mxc_ccm->CCGR3);
>  	reg |= MXC_CCM_CCGR3_IPU1_IPU_DI0_MASK;
>  	writel(reg, &mxc_ccm->CCGR3);
> +	clrbits_le32(&iomuxc_regs->gpr[3], MXC_CCM_CCGR3_IPU1_IPU_DI0_MASK);

I would like to see this done through a display framework of some kind...
But since there none...

Acked-by: Igor Grinberg <grinberg@compulab.co.il>

>  }
>  #else
>  static inline void cm_fx6_setup_display(void) {}
> 

-- 
Regards,
Igor.

[U-Boot] [PATCH 03/12] arm: mx6: cm-fx6: add support for displaytype env var

[Igor Grinberg]

On 07/23/15 17:19, Nikita Kiryanov wrote:
> Add support for selecting display preset using the environment variable
> "displaytype". This is a preparation for future merging of compulab
> omap3_display.c display selection code with the cm-fx6 display selection code.
> 
> The "panel" environment variable is retained for backwards compatibility.
> 
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Igor Grinberg <grinberg@compulab.co.il>
> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>

Acked-by: Igor Grinberg <grinberg@compulab.co.il>

> ---
>  board/compulab/cm_fx6/cm_fx6.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
> index 2fb8db5..3e518c1 100644
> --- a/board/compulab/cm_fx6/cm_fx6.c
> +++ b/board/compulab/cm_fx6/cm_fx6.c
> @@ -95,7 +95,10 @@ int board_video_skip(void)
>  {
>  	int ret;
>  	struct display_info_t *preset;
> -	char const *panel = getenv("panel");
> +	char const *panel = getenv("displaytype");
> +
> +	if (!panel) /* Also accept panel for backward compatibility */
> +		panel = getenv("panel");
>  
>  	if (!panel)
>  		return -ENOENT;
> 

-- 
Regards,
Igor.

[U-Boot] [PATCH 04/12] arm: mx6: cm-fx6: setup hdmi only on hdmi enable

[Igor Grinberg]

On 07/23/15 17:19, Nikita Kiryanov wrote:
> Refactor display code to only setup hdmi if do_enable_hdmi() is invoked.
> 
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Igor Grinberg <grinberg@compulab.co.il>
> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>

Great!
Acked-by: Igor Grinberg <grinberg@compulab.co.il>

> ---
>  board/compulab/cm_fx6/cm_fx6.c | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
> index 3e518c1..e85c8ab 100644
> --- a/board/compulab/cm_fx6/cm_fx6.c
> +++ b/board/compulab/cm_fx6/cm_fx6.c
> @@ -52,6 +52,9 @@ int splash_screen_prepare(void)
>  #ifdef CONFIG_IMX_HDMI
>  static void cm_fx6_enable_hdmi(struct display_info_t const *dev)
>  {
> +	struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
> +	imx_setup_hdmi();
> +	setbits_le32(&mxc_ccm->CCGR3, MXC_CCM_CCGR3_IPU1_IPU_DI0_MASK);
>  	imx_enable_hdmi_phy();
>  }
>  
> @@ -79,15 +82,9 @@ static struct display_info_t preset_hdmi_1024X768 = {
>  
>  static void cm_fx6_setup_display(void)
>  {
> -	struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
>  	struct iomuxc *const iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR;
> -	int reg;
>  
>  	enable_ipu_clock();
> -	imx_setup_hdmi();
> -	reg = __raw_readl(&mxc_ccm->CCGR3);
> -	reg |= MXC_CCM_CCGR3_IPU1_IPU_DI0_MASK;
> -	writel(reg, &mxc_ccm->CCGR3);
>  	clrbits_le32(&iomuxc_regs->gpr[3], MXC_CCM_CCGR3_IPU1_IPU_DI0_MASK);
>  }
>  
> 

-- 
Regards,
Igor.

[U-Boot] [PATCH 05/12] arm: mx6: cm-fx6: move CMD configs to defconfig

[Igor Grinberg]

On 07/23/15 17:19, Nikita Kiryanov wrote:
> Move CONFIG_CMD_* options that can be selected in menuconfig to cm-fx6
> defconfig.
> 
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Igor Grinberg <grinberg@compulab.co.il>
> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>

Acked-by: Igor Grinberg <grinberg@compulab.co.il>

> ---
>  configs/cm_fx6_defconfig | 5 +++++
>  include/configs/cm_fx6.h | 3 ---
>  2 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
> index 6be5c17..25829db 100644
> --- a/configs/cm_fx6_defconfig
> +++ b/configs/cm_fx6_defconfig
> @@ -9,4 +9,9 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL"
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_CMD_DHCP=y
> +CONFIG_CMD_PING=y
>  CONFIG_SPI_FLASH=y
> +CONFIG_CMD_SF=y
> +CONFIG_CMD_I2C=y
> +CONFIG_CMD_USB=y
> diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
> index f23ef8b..9b00c0d 100644
> --- a/include/configs/cm_fx6.h
> +++ b/include/configs/cm_fx6.h
> @@ -50,7 +50,6 @@
>  					sizeof(CONFIG_SYS_PROMPT) + 16)
>  
>  /* SPI flash */
> -#define CONFIG_CMD_SF
>  #define CONFIG_SF_DEFAULT_BUS		0
>  #define CONFIG_SF_DEFAULT_CS		0
>  #define CONFIG_SF_DEFAULT_SPEED		25000000
> @@ -199,7 +198,6 @@
>  #define CONFIG_NET_RETRY_COUNT		5
>  
>  /* USB */
> -#define CONFIG_CMD_USB
>  #define CONFIG_USB_EHCI
>  #define CONFIG_USB_EHCI_MX6
>  #define CONFIG_USB_STORAGE
> @@ -212,7 +210,6 @@
>  #define CONFIG_SYS_STDIO_DEREGISTER
>  
>  /* I2C */
> -#define CONFIG_CMD_I2C
>  #define CONFIG_SYS_I2C
>  #define CONFIG_SYS_I2C_MXC
>  #define CONFIG_SYS_I2C_MXC_I2C3		/* enable I2C bus 3 */
> 

-- 
Regards,
Igor.

[U-Boot] [PATCH 06/12] arm: mx6: cm-fx6: move cm-fx6 target under ARCH_MX6

[Igor Grinberg]

On 07/23/15 17:19, Nikita Kiryanov wrote:
> cm-fx6 is an MX6 based board, and the menuconfig hierarchy should
> reflect that. Make TARGET_CM_FX6 dependant on ARCH_MX6.
> 
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Igor Grinberg <grinberg@compulab.co.il>
> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>

Seems reasonable.
Acked-by: Igor Grinberg <grinberg@compulab.co.il>

> ---
>  arch/arm/Kconfig               | 8 --------
>  arch/arm/cpu/armv7/mx6/Kconfig | 8 ++++++++
>  configs/cm_fx6_defconfig       | 1 +
>  3 files changed, 9 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 506463c..fc8c435 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -625,14 +625,6 @@ config RMOBILE
>  	bool "Renesas ARM SoCs"
>  	select CPU_V7
>  
> -config TARGET_CM_FX6
> -	bool "Support cm_fx6"
> -	select CPU_V7
> -	select SUPPORT_SPL
> -	select DM
> -	select DM_SERIAL
> -	select DM_GPIO
> -
>  config ARCH_SOCFPGA
>  	bool "Altera SOCFPGA family"
>  	select CPU_V7
> diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig
> index 10908c4..2c18bcd 100644
> --- a/arch/arm/cpu/armv7/mx6/Kconfig
> +++ b/arch/arm/cpu/armv7/mx6/Kconfig
> @@ -29,6 +29,14 @@ choice
>  	prompt "MX6 board select"
>  	optional
>  
> +config TARGET_CM_FX6
> +	bool "Support CM-FX6"
> +	select CPU_V7
> +	select SUPPORT_SPL
> +	select DM
> +	select DM_SERIAL
> +	select DM_GPIO
> +
>  config TARGET_SECOMX6
>  	bool "Support secomx6 boards"
>  	select CPU_V7
> diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
> index 25829db..7ad5c21 100644
> --- a/configs/cm_fx6_defconfig
> +++ b/configs/cm_fx6_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_ARM=y
> +CONFIG_ARCH_MX6=y
>  CONFIG_TARGET_CM_FX6=y
>  CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL"
> 

-- 
Regards,
Igor.

[U-Boot] [PATCH 08/12] arm: mx6: usb: kconfig: add USB_EHCI_MX6 kconfig option

[Igor Grinberg]

On 07/23/15 17:19, Nikita Kiryanov wrote:
> Add USB_EHCI_MX6 option to menuconfig and use it when migrating cm-fx6 usb
> config to defconfig.
> 
> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> Cc: Marek Vasut <marex@denx.de>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Igor Grinberg <grinberg@compulab.co.il>
> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>

Acked-by: Igor Grinberg <grinberg@compulab.co.il>

> ---
>  configs/cm_fx6_defconfig | 4 ++++
>  drivers/usb/host/Kconfig | 7 +++++++
>  include/configs/cm_fx6.h | 3 ---
>  3 files changed, 11 insertions(+), 3 deletions(-)
> 
> diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
> index 7ad5c21..07a84bb 100644
> --- a/configs/cm_fx6_defconfig
> +++ b/configs/cm_fx6_defconfig
> @@ -15,4 +15,8 @@ CONFIG_CMD_PING=y
>  CONFIG_SPI_FLASH=y
>  CONFIG_CMD_SF=y
>  CONFIG_CMD_I2C=y
> +CONFIG_USB=y
>  CONFIG_CMD_USB=y
> +CONFIG_USB_EHCI_HCD=y
> +CONFIG_USB_EHCI_MX6=y
> +CONFIG_USB_STORAGE=y
> diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
> index 8705c7c..b30b43d 100644
> --- a/drivers/usb/host/Kconfig
> +++ b/drivers/usb/host/Kconfig
> @@ -52,6 +52,13 @@ config USB_EHCI
>  
>  if USB_EHCI_HCD
>  
> +config USB_EHCI_MX6
> +	bool "Support for i.MX6 on-chip EHCI USB controller"
> +	depends on ARCH_MX6
> +	default y
> +	---help---
> +	  Enables support for the on-chip EHCI controller on i.MX6 SoCs.
> +
>  config USB_EHCI_UNIPHIER
>  	bool "Support for UniPhier on-chip EHCI USB controller"
>  	depends on ARCH_UNIPHIER && OF_CONTROL
> diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
> index 9b00c0d..9f69322 100644
> --- a/include/configs/cm_fx6.h
> +++ b/include/configs/cm_fx6.h
> @@ -198,9 +198,6 @@
>  #define CONFIG_NET_RETRY_COUNT		5
>  
>  /* USB */
> -#define CONFIG_USB_EHCI
> -#define CONFIG_USB_EHCI_MX6
> -#define CONFIG_USB_STORAGE
>  #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
>  #define CONFIG_MXC_USB_FLAGS		0
>  #define CONFIG_USB_MAX_CONTROLLER_COUNT	2
> 

-- 
Regards,
Igor.

[U-Boot] [PATCH 11/12] sf: kconfig: add kconfig options for spi flashes

[Igor Grinberg]

On 07/23/15 17:19, Nikita Kiryanov wrote:
> Add kconfig options for various SPI flashes and use them in cm-fx6 defconfig.
> 
> Cc: Jagan Teki <jteki@openedev.com>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Igor Grinberg <grinberg@compulab.co.il>
> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>

Acked-by: Igor Grinberg <grinberg@compulab.co.il>

> ---
>  configs/cm_fx6_defconfig |  8 ++++++++
>  drivers/mtd/spi/Kconfig  | 44 ++++++++++++++++++++++++++++++++++++++++++++
>  include/configs/cm_fx6.h |  8 --------
>  3 files changed, 52 insertions(+), 8 deletions(-)
> 
> diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
> index f0fd48c..2aba359 100644
> --- a/configs/cm_fx6_defconfig
> +++ b/configs/cm_fx6_defconfig
> @@ -13,6 +13,14 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL"
>  CONFIG_CMD_DHCP=y
>  CONFIG_CMD_PING=y
>  CONFIG_SPI_FLASH=y
> +CONFIG_SPI_FLASH_ATMEL=y
> +CONFIG_SPI_FLASH_EON=y
> +CONFIG_SPI_FLASH_GIGADEVICE=y
> +CONFIG_SPI_FLASH_MACRONIX=y
> +CONFIG_SPI_FLASH_SPANSION=y
> +CONFIG_SPI_FLASH_STMICRO=y
> +CONFIG_SPI_FLASH_SST=y
> +CONFIG_SPI_FLASH_WINBOND=y
>  CONFIG_CMD_SF=y
>  CONFIG_CMD_I2C=y
>  CONFIG_USB=y
> diff --git a/drivers/mtd/spi/Kconfig b/drivers/mtd/spi/Kconfig
> index 4f0c040..8b730ff 100644
> --- a/drivers/mtd/spi/Kconfig
> +++ b/drivers/mtd/spi/Kconfig
> @@ -42,6 +42,50 @@ config SPI_FLASH_BAR
>  	  Bank/Extended address registers are used to access the flash
>  	  which has size > 16MiB in 3-byte addressing.
>  
> +if SPI_FLASH
> +
> +config SPI_FLASH_ATMEL
> +	bool "Atmel SPI flash support"
> +	help
> +	  Add support for various Atmel SPI flash chips (AT45xxx and AT25xxx)
> +
> +config SPI_FLASH_EON
> +	bool "EON SPI flash support"
> +	help
> +	  Add support for various EON SPI flash chips (EN25xxx)
> +
> +config SPI_FLASH_GIGADEVICE
> +	bool "GigaDevice SPI flash support"
> +	help
> +	  Add support for various GigaDevice SPI flash chips (GD25xxx)
> +
> +config SPI_FLASH_MACRONIX
> +	bool "Macronix SPI flash support"
> +	help
> +	  Add support for various Macronix SPI flash chips (MX25Lxxx)
> +
> +config SPI_FLASH_SPANSION
> +	bool "Spansion SPI flash support"
> +	help
> +	  Add support for various Spansion SPI flash chips (S25FLxxx)
> +
> +config SPI_FLASH_STMICRO
> +	bool "STMicro SPI flash support"
> +	help
> +	  Add support for various STMicro SPI flash chips (M25Pxxx and N25Qxxx)
> +
> +config SPI_FLASH_SST
> +	bool "SST SPI flash support"
> +	help
> +	  Add support for various SST SPI flash chips (SST25xxx)
> +
> +config SPI_FLASH_WINBOND
> +	bool "Winbond SPI flash support"
> +	help
> +	  Add support for various Winbond SPI flash chips (W25xxx)
> +
> +endif
> +
>  config SPI_FLASH_DATAFLASH
>  	bool "AT45xxx DataFlash support"
>  	depends on SPI_FLASH && DM_SPI_FLASH
> diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
> index 059004c..bbd9f38 100644
> --- a/include/configs/cm_fx6.h
> +++ b/include/configs/cm_fx6.h
> @@ -162,14 +162,6 @@
>  /* SPI */
>  #define CONFIG_SPI
>  #define CONFIG_MXC_SPI
> -#define CONFIG_SPI_FLASH_ATMEL
> -#define CONFIG_SPI_FLASH_EON
> -#define CONFIG_SPI_FLASH_GIGADEVICE
> -#define CONFIG_SPI_FLASH_MACRONIX
> -#define CONFIG_SPI_FLASH_SPANSION
> -#define CONFIG_SPI_FLASH_STMICRO
> -#define CONFIG_SPI_FLASH_SST
> -#define CONFIG_SPI_FLASH_WINBOND
>  
>  /* NAND */
>  #ifndef CONFIG_SPL_BUILD
> 

-- 
Regards,
Igor.

[U-Boot] [PATCH 09/12] usb: kconfig: usb keyboard kconfig

[Igor Grinberg]

On 07/23/15 17:19, Nikita Kiryanov wrote:
> Add Kconfig options for USB keyboard and use them for cm-fx6.
> 
> Cc: Marek Vasut <marex@denx.de>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Igor Grinberg <grinberg@compulab.co.il>
> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>

Acked-by: Igor Grinberg <grinberg@compulab.co.il>

> ---
>  configs/cm_fx6_defconfig |  2 ++
>  drivers/usb/Kconfig      | 27 +++++++++++++++++++++++++++
>  include/configs/cm_fx6.h |  2 --
>  3 files changed, 29 insertions(+), 2 deletions(-)
> 
> diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
> index 07a84bb..f0fd48c 100644
> --- a/configs/cm_fx6_defconfig
> +++ b/configs/cm_fx6_defconfig
> @@ -20,3 +20,5 @@ CONFIG_CMD_USB=y
>  CONFIG_USB_EHCI_HCD=y
>  CONFIG_USB_EHCI_MX6=y
>  CONFIG_USB_STORAGE=y
> +CONFIG_USB_KEYBOARD=y
> +CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
> diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
> index 637ef3d..04289f2 100644
> --- a/drivers/usb/Kconfig
> +++ b/drivers/usb/Kconfig
> @@ -59,4 +59,31 @@ config USB_STORAGE
>  	  Say Y here if you want to connect USB mass storage devices to your
>  	  board's USB port.
>  
> +config USB_KEYBOARD
> +	bool "USB Keyboard support"
> +	---help---
> +	  Say Y here if you want to use a USB keyboard for U-Boot command line
> +	  input.
> +
> +if USB_KEYBOARD
> +
> +choice
> +	prompt "USB keyboard polling"
> +	optional
> +	---help---
> +	  Enable a polling mechanism for USB keyboard.
> +
> +	config SYS_USB_EVENT_POLL
> +		bool "Interrupt polling"
> +
> +	config SYS_USB_EVENT_POLL_VIA_INT_QUEUE
> +		bool "Poll via interrupt queue"
> +
> +	config SYS_USB_EVENT_POLL_VIA_CONTROL_EP
> +		bool "Poll via control EP"
> +
> +endchoice
> +
> +endif
> +
>  endif
> diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
> index 9f69322..059004c 100644
> --- a/include/configs/cm_fx6.h
> +++ b/include/configs/cm_fx6.h
> @@ -202,8 +202,6 @@
>  #define CONFIG_MXC_USB_FLAGS		0
>  #define CONFIG_USB_MAX_CONTROLLER_COUNT	2
>  #define CONFIG_EHCI_HCD_INIT_AFTER_RESET	/* For OTG port */
> -#define CONFIG_USB_KEYBOARD
> -#define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP
>  #define CONFIG_SYS_STDIO_DEREGISTER
>  
>  /* I2C */
> 

-- 
Regards,
Igor.

[U-Boot] [PATCH 08/12] arm: mx6: usb: kconfig: add USB_EHCI_MX6 kconfig option

[Nikita Kiryanov]

Hi Stefano, Marek,

On Sun, Jul 26, 2015 at 12:50:56PM +0200, Stefano Babic wrote:
> Hi Marek,
> 
> On 26/07/2015 12:35, Marek Vasut wrote:
> > On Sunday, July 26, 2015 at 11:36:11 AM, Stefano Babic wrote:
> >> Hi Nikita, Marek,
> >>
> >> On 26/07/2015 10:17, Nikita Kiryanov wrote:
> >>> On Thu, Jul 23, 2015 at 05:01:07PM +0200, Marek Vasut wrote:
> >>>> On Thursday, July 23, 2015 at 04:19:35 PM, Nikita Kiryanov wrote:
> >>>>> Add USB_EHCI_MX6 option to menuconfig and use it when migrating cm-fx6
> >>>>> usb config to defconfig.
> >>>>>
> >>>>> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> >>>>> Cc: Marek Vasut <marex@denx.de>
> >>>>> Cc: Stefano Babic <sbabic@denx.de>
> >>>>> Cc: Igor Grinberg <grinberg@compulab.co.il>
> >>>>> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
> >>>>> ---
> >>>>>
> >>>>>  configs/cm_fx6_defconfig | 4 ++++
> >>>>>  drivers/usb/host/Kconfig | 7 +++++++
> >>>>>  include/configs/cm_fx6.h | 3 ---
> >>>>>  3 files changed, 11 insertions(+), 3 deletions(-)
> >>>>
> >>>> Can you please also convert the rest of the boards ?
> >>>
> >>> Sure, coming up.
> >>
> >> As this series has no relevant issue (it is fine with me), my proposal
> >> is to merge the series and convert the other boards (that are not
> >> touched by the series, anyway) with follow-up patches. Is it ok for you ?
> > 
> > I think Nikita is already working on the conversion, so either way is fine.
> 
> Fine with me. I hold on the current patches. Nikita, let me know which
> is your preferred way to go on.

I did not start the conversion yet (working on V2 for the last patch
first), so we can do this with follow up patches.

> 
> Best regards,
> Stefano Babic
> 
> -- 
> =====================================================================
> DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
> =====================================================================
> 

[U-Boot] [PATCH V2 12/12] kconfig: add config option for shell prompt

[Nikita Kiryanov]

Add option to set shell prompt string from menuconfig and migrate
boards globally.

The migration is done as follows:
- Boards that explicitly and unconditionally set CONFIG_SYS_PROMPT had the
  entry moved to their defconfig files.
- Boards that defined some kind of #ifdef logic which selects the
  CONFIG_SYS_PROMPT (for example qemu-mips) got an #undef CONFIG_SYS_PROMPT
  right before the #ifdef logic and were left alone.
- This change forces CONFIG_SYS_PROMPT to be a per board decision, and thus
  CONFIG_SYS_PROMPT was removed from all <soc>_common.h and <arch>_common.h
  files. This results in a streamlined default value across platforms, and
  includes the following files: spear-common, sunxi-common, mv-common,
  ti_armv7_common, tegra-common, at91-sama5_common, and zynq-common.
- Boards that relied on <arch/soc>_common.h values of CONFIG_SYS_PROMPT were
  not updated in their respective defconfig files under the assumption that
  since they did not explicitly define a value, they're fine with whatever
  the default is.
- On the other hand, boards that relied on a value defined in some
  <boards>_common.h file such as woodburn_common, rpi-common,
  bur_am335x_common, ls2085a_common, siemens_am33x_common, and
  omap3_evm_common, had their values moved to the respective defconfig files.
- The define V_PROMPT was removed, since it is not used anywhere except for
  assigning a value for CONFIG_SYS_PROMPT.

Cc: Tom Rini <trini@konsulko.com>
Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
---
Changes in V2:
	- Migrate boards globally (compile tested with buildman on arm and
	  powerpc)
	- Change default value to "=> "
	- V_PROMPT define removed as part of the migration

 common/Kconfig                                  | 7 +++++++
 configs/M5208EVBE_defconfig                     | 1 +
 configs/M52277EVB_defconfig                     | 1 +
 configs/M5235EVB_defconfig                      | 1 +
 configs/M5272C3_defconfig                       | 1 +
 configs/M5275EVB_defconfig                      | 1 +
 configs/M5282EVB_defconfig                      | 1 +
 configs/M53017EVB_defconfig                     | 1 +
 configs/M5329AFEE_defconfig                     | 1 +
 configs/M5329BFEE_defconfig                     | 1 +
 configs/M5373EVB_defconfig                      | 1 +
 configs/M54418TWR_defconfig                     | 1 +
 configs/M54418TWR_nand_mii_defconfig            | 1 +
 configs/M54418TWR_nand_rmii_defconfig           | 1 +
 configs/M54418TWR_nand_rmii_lowfreq_defconfig   | 1 +
 configs/M54418TWR_serial_mii_defconfig          | 1 +
 configs/M54418TWR_serial_rmii_defconfig         | 1 +
 configs/M54451EVB_defconfig                     | 1 +
 configs/M54455EVB_defconfig                     | 1 +
 configs/M5475AFE_defconfig                      | 1 +
 configs/M5475BFE_defconfig                      | 1 +
 configs/M5475CFE_defconfig                      | 1 +
 configs/M5475DFE_defconfig                      | 1 +
 configs/M5475EFE_defconfig                      | 1 +
 configs/M5475FFE_defconfig                      | 1 +
 configs/M5475GFE_defconfig                      | 1 +
 configs/M5485AFE_defconfig                      | 1 +
 configs/M5485BFE_defconfig                      | 1 +
 configs/M5485CFE_defconfig                      | 1 +
 configs/M5485DFE_defconfig                      | 1 +
 configs/M5485EFE_defconfig                      | 1 +
 configs/M5485FFE_defconfig                      | 1 +
 configs/M5485GFE_defconfig                      | 1 +
 configs/M5485HFE_defconfig                      | 1 +
 configs/MPC8349ITXGP_defconfig                  | 1 +
 configs/MPC8349ITX_LOWBOOT_defconfig            | 1 +
 configs/MPC8349ITX_defconfig                    | 1 +
 configs/PATI_defconfig                          | 1 +
 configs/T1023RDB_NAND_defconfig                 | 1 +
 configs/T1023RDB_SDCARD_defconfig               | 1 +
 configs/T1023RDB_SECURE_BOOT_defconfig          | 1 +
 configs/T1023RDB_SPIFLASH_defconfig             | 1 +
 configs/T1023RDB_defconfig                      | 1 +
 configs/T1024QDS_D4_SECURE_BOOT_defconfig       | 1 +
 configs/T1024QDS_NAND_defconfig                 | 1 +
 configs/T1024QDS_SDCARD_defconfig               | 1 +
 configs/T1024QDS_SECURE_BOOT_defconfig          | 1 +
 configs/T1024QDS_SPIFLASH_defconfig             | 1 +
 configs/T1024QDS_defconfig                      | 1 +
 configs/T1024RDB_NAND_defconfig                 | 1 +
 configs/T1024RDB_SDCARD_defconfig               | 1 +
 configs/T1024RDB_SECURE_BOOT_defconfig          | 1 +
 configs/T1024RDB_SPIFLASH_defconfig             | 1 +
 configs/T1024RDB_defconfig                      | 1 +
 configs/UCP1020_defconfig                       | 1 +
 configs/VCMA9_defconfig                         | 1 +
 configs/ac14xx_defconfig                        | 1 +
 configs/adp-ag101_defconfig                     | 1 +
 configs/adp-ag101p_defconfig                    | 1 +
 configs/adp-ag102_defconfig                     | 1 +
 configs/am3517_crane_defconfig                  | 1 +
 configs/am3517_evm_defconfig                    | 1 +
 configs/amcore_defconfig                        | 1 +
 configs/apalis_t30_defconfig                    | 1 +
 configs/apf27_defconfig                         | 1 +
 configs/arcangel4_defconfig                     | 1 +
 configs/arndale_defconfig                       | 1 +
 configs/astro_mcf5373l_defconfig                | 1 +
 configs/at91rm9200ek_defconfig                  | 1 +
 configs/at91rm9200ek_ram_defconfig              | 1 +
 configs/at91sam9260ek_dataflash_cs0_defconfig   | 1 +
 configs/at91sam9260ek_dataflash_cs1_defconfig   | 1 +
 configs/at91sam9260ek_nandflash_defconfig       | 1 +
 configs/at91sam9261ek_dataflash_cs0_defconfig   | 1 +
 configs/at91sam9261ek_dataflash_cs3_defconfig   | 1 +
 configs/at91sam9261ek_nandflash_defconfig       | 1 +
 configs/at91sam9263ek_dataflash_cs0_defconfig   | 1 +
 configs/at91sam9263ek_dataflash_defconfig       | 1 +
 configs/at91sam9263ek_nandflash_defconfig       | 1 +
 configs/at91sam9263ek_norflash_boot_defconfig   | 1 +
 configs/at91sam9263ek_norflash_defconfig        | 1 +
 configs/at91sam9g10ek_dataflash_cs0_defconfig   | 1 +
 configs/at91sam9g10ek_dataflash_cs3_defconfig   | 1 +
 configs/at91sam9g10ek_nandflash_defconfig       | 1 +
 configs/at91sam9g20ek_2mmc_defconfig            | 1 +
 configs/at91sam9g20ek_2mmc_nandflash_defconfig  | 1 +
 configs/at91sam9g20ek_dataflash_cs0_defconfig   | 1 +
 configs/at91sam9g20ek_dataflash_cs1_defconfig   | 1 +
 configs/at91sam9g20ek_nandflash_defconfig       | 1 +
 configs/at91sam9m10g45ek_mmc_defconfig          | 1 +
 configs/at91sam9m10g45ek_nandflash_defconfig    | 1 +
 configs/at91sam9n12ek_mmc_defconfig             | 1 +
 configs/at91sam9n12ek_nandflash_defconfig       | 1 +
 configs/at91sam9n12ek_spiflash_defconfig        | 1 +
 configs/at91sam9rlek_dataflash_defconfig        | 1 +
 configs/at91sam9rlek_mmc_defconfig              | 1 +
 configs/at91sam9rlek_nandflash_defconfig        | 1 +
 configs/at91sam9x5ek_dataflash_defconfig        | 1 +
 configs/at91sam9x5ek_mmc_defconfig              | 1 +
 configs/at91sam9x5ek_nandflash_defconfig        | 1 +
 configs/at91sam9x5ek_spiflash_defconfig         | 1 +
 configs/at91sam9xeek_dataflash_cs0_defconfig    | 1 +
 configs/at91sam9xeek_dataflash_cs1_defconfig    | 1 +
 configs/at91sam9xeek_nandflash_defconfig        | 1 +
 configs/atngw100_defconfig                      | 1 +
 configs/atngw100mkii_defconfig                  | 1 +
 configs/atstk1002_defconfig                     | 1 +
 configs/axs101_defconfig                        | 1 +
 configs/beaver_defconfig                        | 1 +
 configs/bf537-minotaur_defconfig                | 1 +
 configs/bf537-srv1_defconfig                    | 1 +
 configs/bf561-acvilon_defconfig                 | 1 +
 configs/br4_defconfig                           | 1 +
 configs/cairo_defconfig                         | 1 +
 configs/calimain_defconfig                      | 1 +
 configs/cam_enc_4xx_defconfig                   | 1 +
 configs/cardhu_defconfig                        | 1 +
 configs/cgtqmx6qeval_defconfig                  | 1 +
 configs/cm_fx6_defconfig                        | 1 +
 configs/cm_t335_defconfig                       | 1 +
 configs/cm_t3517_defconfig                      | 1 +
 configs/cm_t35_defconfig                        | 1 +
 configs/cm_t54_defconfig                        | 1 +
 configs/cobra5272_defconfig                     | 1 +
 configs/colibri_t20_defconfig                   | 1 +
 configs/colibri_t30_defconfig                   | 1 +
 configs/colibri_vf_defconfig                    | 1 +
 configs/colibri_vf_dtb_defconfig                | 1 +
 configs/corvus_defconfig                        | 1 +
 configs/cpu9260_128M_defconfig                  | 1 +
 configs/cpu9260_defconfig                       | 1 +
 configs/cpu9260_nand_128M_defconfig             | 1 +
 configs/cpu9260_nand_defconfig                  | 1 +
 configs/cpu9G20_128M_defconfig                  | 1 +
 configs/cpu9G20_defconfig                       | 1 +
 configs/cpu9G20_nand_128M_defconfig             | 1 +
 configs/cpu9G20_nand_defconfig                  | 1 +
 configs/cpuat91_defconfig                       | 1 +
 configs/da830evm_defconfig                      | 1 +
 configs/da850evm_defconfig                      | 1 +
 configs/da850evm_direct_nor_defconfig           | 1 +
 configs/dalmore_defconfig                       | 1 +
 configs/davinci_dm355evm_defconfig              | 1 +
 configs/davinci_dm355leopard_defconfig          | 1 +
 configs/davinci_dm365evm_defconfig              | 1 +
 configs/davinci_dm6467evm_defconfig             | 1 +
 configs/davinci_dvevm_defconfig                 | 1 +
 configs/davinci_schmoogie_defconfig             | 1 +
 configs/davinci_sffsdr_defconfig                | 1 +
 configs/davinci_sonata_defconfig                | 1 +
 configs/dbau1000_defconfig                      | 1 +
 configs/dbau1100_defconfig                      | 1 +
 configs/dbau1500_defconfig                      | 1 +
 configs/dbau1550_defconfig                      | 1 +
 configs/dbau1550_el_defconfig                   | 1 +
 configs/dig297_defconfig                        | 1 +
 configs/dockstar_defconfig                      | 1 +
 configs/draco_defconfig                         | 1 +
 configs/duovero_defconfig                       | 1 +
 configs/ea20_defconfig                          | 1 +
 configs/eb_cpu5282_defconfig                    | 1 +
 configs/eb_cpux9k2_defconfig                    | 1 +
 configs/eco5pk_defconfig                        | 1 +
 configs/edminiv2_defconfig                      | 1 +
 configs/ethernut5_defconfig                     | 1 +
 configs/flea3_defconfig                         | 1 +
 configs/fx12mm_defconfig                        | 1 +
 configs/goflexhome_defconfig                    | 1 +
 configs/grasshopper_defconfig                   | 1 +
 configs/gwventana_defconfig                     | 1 +
 configs/h2200_defconfig                         | 1 +
 configs/harmony_defconfig                       | 1 +
 configs/hrcon_defconfig                         | 1 +
 configs/ib62x0_defconfig                        | 1 +
 configs/iconnect_defconfig                      | 1 +
 configs/ima3-mx53_defconfig                     | 1 +
 configs/imx31_litekit_defconfig                 | 1 +
 configs/imx31_phycore_defconfig                 | 1 +
 configs/integratorap_cm720t_defconfig           | 1 +
 configs/integratorap_cm920t_defconfig           | 1 +
 configs/integratorap_cm926ejs_defconfig         | 1 +
 configs/integratorap_cm946es_defconfig          | 1 +
 configs/integratorcp_cm1136_defconfig           | 1 +
 configs/integratorcp_cm920t_defconfig           | 1 +
 configs/integratorcp_cm926ejs_defconfig         | 1 +
 configs/integratorcp_cm946es_defconfig          | 1 +
 configs/ipam390_defconfig                       | 1 +
 configs/jetson-tk1_defconfig                    | 1 +
 configs/jornada_defconfig                       | 1 +
 configs/k2e_evm_defconfig                       | 1 +
 configs/k2hk_evm_defconfig                      | 1 +
 configs/k2l_evm_defconfig                       | 1 +
 configs/kwb_defconfig                           | 1 +
 configs/kzm9g_defconfig                         | 1 +
 configs/ls2085a_emu_D4_defconfig                | 1 +
 configs/ls2085a_emu_defconfig                   | 1 +
 configs/ls2085a_simu_defconfig                  | 1 +
 configs/ls2085aqds_defconfig                    | 1 +
 configs/ls2085aqds_nand_defconfig               | 1 +
 configs/ls2085ardb_defconfig                    | 1 +
 configs/ls2085ardb_nand_defconfig               | 1 +
 configs/mcx_defconfig                           | 1 +
 configs/medcom-wide_defconfig                   | 1 +
 configs/microblaze-generic_defconfig            | 1 +
 configs/ml507_defconfig                         | 1 +
 configs/mt_ventoux_defconfig                    | 1 +
 configs/mx51_efikamx_defconfig                  | 1 +
 configs/nas220_defconfig                        | 1 +
 configs/nhk8815_defconfig                       | 1 +
 configs/nokia_rx51_defconfig                    | 1 +
 configs/nyan-big_defconfig                      | 1 +
 configs/odroid-xu3_defconfig                    | 1 +
 configs/odroid_defconfig                        | 1 +
 configs/omap3_evm_defconfig                     | 1 +
 configs/omap3_evm_quick_mmc_defconfig           | 1 +
 configs/omap3_evm_quick_nand_defconfig          | 1 +
 configs/omap3_logic_defconfig                   | 1 +
 configs/omap3_mvblx_defconfig                   | 1 +
 configs/omap3_overo_defconfig                   | 1 +
 configs/omap3_pandora_defconfig                 | 1 +
 configs/omap3_sdp3430_defconfig                 | 1 +
 configs/omapl138_lcdk_defconfig                 | 1 +
 configs/origen_defconfig                        | 1 +
 configs/palmld_defconfig                        | 1 +
 configs/palmtc_defconfig                        | 1 +
 configs/paz00_defconfig                         | 1 +
 configs/pb1000_defconfig                        | 1 +
 configs/pcm030_defconfig                        | 1 +
 configs/peach-pi_defconfig                      | 1 +
 configs/peach-pit_defconfig                     | 1 +
 configs/pepper_defconfig                        | 1 +
 configs/platinum_picon_defconfig                | 1 +
 configs/platinum_titanium_defconfig             | 1 +
 configs/plutux_defconfig                        | 1 +
 configs/pm9261_defconfig                        | 1 +
 configs/pm9263_defconfig                        | 1 +
 configs/pm9g45_defconfig                        | 1 +
 configs/pogo_e02_defconfig                      | 1 +
 configs/pr1_defconfig                           | 1 +
 configs/pxm2_defconfig                          | 1 +
 configs/rastaban_defconfig                      | 1 +
 configs/rpi_2_defconfig                         | 1 +
 configs/rpi_defconfig                           | 1 +
 configs/rut_defconfig                           | 1 +
 configs/s5p_goni_defconfig                      | 1 +
 configs/s5pc210_universal_defconfig             | 1 +
 configs/scb9328_defconfig                       | 1 +
 configs/seaboard_defconfig                      | 1 +
 configs/secomx6quq7_defconfig                   | 1 +
 configs/smdk2410_defconfig                      | 1 +
 configs/smdk5250_defconfig                      | 1 +
 configs/smdk5420_defconfig                      | 1 +
 configs/smdkc100_defconfig                      | 1 +
 configs/smdkv310_defconfig                      | 1 +
 configs/snapper9260_defconfig                   | 1 +
 configs/snow_defconfig                          | 1 +
 configs/snowball_defconfig                      | 1 +
 configs/stamp9g20_defconfig                     | 1 +
 configs/stm32f429-discovery_defconfig           | 1 +
 configs/stv0991_defconfig                       | 1 +
 configs/stxgp3_defconfig                        | 1 +
 configs/stxssa_defconfig                        | 1 +
 configs/tao3530_defconfig                       | 1 +
 configs/taurus_defconfig                        | 1 +
 configs/tb100_defconfig                         | 1 +
 configs/tbs2910_defconfig                       | 1 +
 configs/tec-ng_defconfig                        | 1 +
 configs/tec_defconfig                           | 1 +
 configs/thuban_defconfig                        | 1 +
 configs/ti814x_evm_defconfig                    | 1 +
 configs/ti816x_evm_defconfig                    | 1 +
 configs/titanium_defconfig                      | 1 +
 configs/trats2_defconfig                        | 1 +
 configs/trats_defconfig                         | 1 +
 configs/tricorder_defconfig                     | 1 +
 configs/trimslice_defconfig                     | 1 +
 configs/tseries_mmc_defconfig                   | 1 +
 configs/tseries_nand_defconfig                  | 1 +
 configs/tseries_spi_defconfig                   | 1 +
 configs/tt01_defconfig                          | 1 +
 configs/twister_defconfig                       | 1 +
 configs/u8500_href_defconfig                    | 1 +
 configs/usb_a9263_dataflash_defconfig           | 1 +
 configs/v5fx30teval_defconfig                   | 1 +
 configs/vct_platinum_defconfig                  | 1 +
 configs/vct_platinum_onenand_defconfig          | 1 +
 configs/vct_platinum_onenand_small_defconfig    | 1 +
 configs/vct_platinum_small_defconfig            | 1 +
 configs/vct_platinumavc_defconfig               | 1 +
 configs/vct_platinumavc_onenand_defconfig       | 1 +
 configs/vct_platinumavc_onenand_small_defconfig | 1 +
 configs/vct_platinumavc_small_defconfig         | 1 +
 configs/vct_premium_defconfig                   | 1 +
 configs/vct_premium_onenand_defconfig           | 1 +
 configs/vct_premium_onenand_small_defconfig     | 1 +
 configs/vct_premium_small_defconfig             | 1 +
 configs/venice2_defconfig                       | 1 +
 configs/ventana_defconfig                       | 1 +
 configs/vexpress_aemv8a_juno_defconfig          | 1 +
 configs/vexpress_aemv8a_semi_defconfig          | 1 +
 configs/vision2_defconfig                       | 1 +
 configs/vl_ma2sc_defconfig                      | 1 +
 configs/vpac270_nor_128_defconfig               | 1 +
 configs/vpac270_nor_256_defconfig               | 1 +
 configs/vpac270_ond_256_defconfig               | 1 +
 configs/whistler_defconfig                      | 1 +
 configs/wireless_space_defconfig                | 1 +
 configs/woodburn_defconfig                      | 1 +
 configs/woodburn_sd_defconfig                   | 1 +
 configs/x600_defconfig                          | 1 +
 configs/xilinx-ppc405-generic_defconfig         | 1 +
 configs/xilinx-ppc440-generic_defconfig         | 1 +
 configs/xilinx_zynqmp_defconfig                 | 1 +
 configs/zipitz2_defconfig                       | 1 +
 configs/zmx25_defconfig                         | 1 +
 include/configs/M5208EVBE.h                     | 1 -
 include/configs/M52277EVB.h                     | 1 -
 include/configs/M5235EVB.h                      | 1 -
 include/configs/M5272C3.h                       | 1 -
 include/configs/M5275EVB.h                      | 1 -
 include/configs/M5282EVB.h                      | 1 -
 include/configs/M53017EVB.h                     | 1 -
 include/configs/M5329EVB.h                      | 1 -
 include/configs/M5373EVB.h                      | 1 -
 include/configs/M54418TWR.h                     | 1 -
 include/configs/M54451EVB.h                     | 1 -
 include/configs/M54455EVB.h                     | 1 -
 include/configs/M5475EVB.h                      | 1 -
 include/configs/M5485EVB.h                      | 1 -
 include/configs/MPC8349ITX.h                    | 6 ------
 include/configs/PATI.h                          | 1 -
 include/configs/T102xQDS.h                      | 1 -
 include/configs/T102xRDB.h                      | 1 -
 include/configs/UCP1020.h                       | 1 -
 include/configs/VCMA9.h                         | 1 -
 include/configs/ac14xx.h                        | 1 -
 include/configs/adp-ag101.h                     | 1 -
 include/configs/adp-ag101p.h                    | 1 -
 include/configs/adp-ag102.h                     | 1 -
 include/configs/am3517_crane.h                  | 3 ---
 include/configs/am3517_evm.h                    | 3 ---
 include/configs/amcore.h                        | 1 -
 include/configs/apalis_t30.h                    | 1 -
 include/configs/apf27.h                         | 1 -
 include/configs/arcangel4.h                     | 1 -
 include/configs/arndale.h                       | 1 -
 include/configs/astro_mcf5373l.h                | 2 --
 include/configs/at91-sama5_common.h             | 1 -
 include/configs/at91rm9200ek.h                  | 1 -
 include/configs/at91sam9260ek.h                 | 1 -
 include/configs/at91sam9261ek.h                 | 1 -
 include/configs/at91sam9263ek.h                 | 1 -
 include/configs/at91sam9m10g45ek.h              | 1 -
 include/configs/at91sam9n12ek.h                 | 1 -
 include/configs/at91sam9rlek.h                  | 1 -
 include/configs/at91sam9x5ek.h                  | 1 -
 include/configs/atngw100.h                      | 1 -
 include/configs/atngw100mkii.h                  | 1 -
 include/configs/atstk1002.h                     | 1 -
 include/configs/axs101.h                        | 1 -
 include/configs/balloon3.h                      | 1 +
 include/configs/beaver.h                        | 1 -
 include/configs/bf537-minotaur.h                | 1 -
 include/configs/bf537-srv1.h                    | 1 -
 include/configs/bf561-acvilon.h                 | 1 -
 include/configs/br4.h                           | 1 -
 include/configs/bur_am335x_common.h             | 1 -
 include/configs/calimain.h                      | 1 -
 include/configs/cam_enc_4xx.h                   | 1 -
 include/configs/cardhu.h                        | 1 -
 include/configs/cgtqmx6eval.h                   | 1 -
 include/configs/cm_fx6.h                        | 1 -
 include/configs/cm_t335.h                       | 3 ---
 include/configs/cm_t35.h                        | 1 -
 include/configs/cm_t3517.h                      | 1 -
 include/configs/cm_t54.h                        | 2 --
 include/configs/cobra5272.h                     | 2 --
 include/configs/colibri_pxa270.h                | 1 +
 include/configs/colibri_t20.h                   | 1 -
 include/configs/colibri_t30.h                   | 1 -
 include/configs/colibri_vf.h                    | 1 -
 include/configs/corvus.h                        | 1 -
 include/configs/cpu9260.h                       | 5 -----
 include/configs/cpuat91.h                       | 1 -
 include/configs/da830evm.h                      | 1 -
 include/configs/da850evm.h                      | 1 -
 include/configs/dalmore.h                       | 1 -
 include/configs/davinci_dm355evm.h              | 1 -
 include/configs/davinci_dm355leopard.h          | 1 -
 include/configs/davinci_dm365evm.h              | 1 -
 include/configs/davinci_dm6467evm.h             | 1 -
 include/configs/davinci_dvevm.h                 | 1 -
 include/configs/davinci_schmoogie.h             | 1 -
 include/configs/davinci_sffsdr.h                | 1 -
 include/configs/davinci_sonata.h                | 1 -
 include/configs/dbau1x00.h                      | 2 --
 include/configs/dig297.h                        | 1 -
 include/configs/dockstar.h                      | 3 ---
 include/configs/duovero.h                       | 3 ---
 include/configs/ea20.h                          | 1 -
 include/configs/eb_cpu5282.h                    | 1 -
 include/configs/eb_cpux9k2.h                    | 1 -
 include/configs/eco5pk.h                        | 6 ------
 include/configs/edb93xx.h                       | 2 +-
 include/configs/edminiv2.h                      | 1 -
 include/configs/ethernut5.h                     | 1 -
 include/configs/flea3.h                         | 1 -
 include/configs/fx12mm.h                        | 1 -
 include/configs/goflexhome.h                    | 3 ---
 include/configs/grasshopper.h                   | 1 -
 include/configs/gw_ventana.h                    | 1 -
 include/configs/h2200.h                         | 1 -
 include/configs/harmony.h                       | 1 -
 include/configs/hrcon.h                         | 1 -
 include/configs/ib62x0.h                        | 3 ---
 include/configs/iconnect.h                      | 3 ---
 include/configs/ima3-mx53.h                     | 1 -
 include/configs/imx31_litekit.h                 | 1 -
 include/configs/imx31_phycore.h                 | 1 -
 include/configs/integratorap.h                  | 5 -----
 include/configs/integratorcp.h                  | 2 --
 include/configs/ipam390.h                       | 1 -
 include/configs/jetson-tk1.h                    | 1 -
 include/configs/jornada.h                       | 1 -
 include/configs/k2e_evm.h                       | 2 --
 include/configs/k2hk_evm.h                      | 2 --
 include/configs/k2l_evm.h                       | 2 --
 include/configs/kzm9g.h                         | 1 -
 include/configs/lp8x4x.h                        | 1 +
 include/configs/ls2085a_common.h                | 1 -
 include/configs/lsxl.h                          | 1 -
 include/configs/malta.h                         | 1 +
 include/configs/mcx.h                           | 3 ---
 include/configs/medcom-wide.h                   | 1 -
 include/configs/microblaze-generic.h            | 2 --
 include/configs/ml507.h                         | 1 -
 include/configs/mt_ventoux.h                    | 6 ------
 include/configs/mv-common.h                     | 1 -
 include/configs/mx51_efikamx.h                  | 1 -
 include/configs/nas220.h                        | 4 ----
 include/configs/nhk8815.h                       | 1 -
 include/configs/nokia_rx51.h                    | 1 -
 include/configs/nyan-big.h                      | 1 -
 include/configs/odroid.h                        | 3 ---
 include/configs/odroid_xu3.h                    | 1 -
 include/configs/omap3_cairo.h                   | 4 ----
 include/configs/omap3_evm_common.h              | 1 -
 include/configs/omap3_logic.h                   | 1 -
 include/configs/omap3_mvblx.h                   | 1 -
 include/configs/omap3_overo.h                   | 6 ------
 include/configs/omap3_pandora.h                 | 6 ------
 include/configs/omap3_sdp3430.h                 | 1 -
 include/configs/omapl138_lcdk.h                 | 1 -
 include/configs/origen.h                        | 3 ---
 include/configs/palmld.h                        | 3 ---
 include/configs/palmtc.h                        | 3 ---
 include/configs/palmtreo680.h                   | 1 +
 include/configs/paz00.h                         | 1 -
 include/configs/pb1x00.h                        | 1 -
 include/configs/pcm030.h                        | 1 -
 include/configs/peach-pi.h                      | 1 -
 include/configs/peach-pit.h                     | 1 -
 include/configs/pepper.h                        | 3 ---
 include/configs/platinum_picon.h                | 2 --
 include/configs/platinum_titanium.h             | 2 --
 include/configs/plutux.h                        | 1 -
 include/configs/pm9261.h                        | 1 -
 include/configs/pm9263.h                        | 1 -
 include/configs/pm9g45.h                        | 1 -
 include/configs/pogo_e02.h                      | 4 ----
 include/configs/pr1.h                           | 1 -
 include/configs/pxa255_idp.h                    | 1 +
 include/configs/qemu-mips.h                     | 1 +
 include/configs/qemu-mips64.h                   | 1 +
 include/configs/rpi-common.h                    | 1 -
 include/configs/s5p_goni.h                      | 1 -
 include/configs/s5pc210_universal.h             | 3 ---
 include/configs/scb9328.h                       | 1 -
 include/configs/seaboard.h                      | 1 -
 include/configs/secomx6quq7.h                   | 3 ---
 include/configs/siemens-am33x-common.h          | 1 -
 include/configs/smdk2410.h                      | 1 -
 include/configs/smdk5250.h                      | 1 -
 include/configs/smdk5420.h                      | 1 -
 include/configs/smdkc100.h                      | 1 -
 include/configs/smdkv310.h                      | 1 -
 include/configs/snapper9260.h                   | 1 -
 include/configs/snow.h                          | 1 -
 include/configs/snowball.h                      | 1 -
 include/configs/spear-common.h                  | 1 -
 include/configs/stamp9g20.h                     | 1 -
 include/configs/stm32f429-discovery.h           | 1 -
 include/configs/stv0991.h                       | 1 -
 include/configs/stxgp3.h                        | 1 -
 include/configs/stxssa.h                        | 1 -
 include/configs/sunxi-common.h                  | 2 --
 include/configs/tao3530.h                       | 1 -
 include/configs/taurus.h                        | 1 -
 include/configs/tb100.h                         | 1 -
 include/configs/tbs2910.h                       | 1 -
 include/configs/tec-ng.h                        | 1 -
 include/configs/tec.h                           | 1 -
 include/configs/tegra-common.h                  | 4 ----
 include/configs/ti814x_evm.h                    | 1 -
 include/configs/ti816x_evm.h                    | 1 -
 include/configs/ti_armv7_common.h               | 1 -
 include/configs/titanium.h                      | 3 ---
 include/configs/trats.h                         | 2 --
 include/configs/trats2.h                        | 3 ---
 include/configs/tricorder.h                     | 1 -
 include/configs/trimslice.h                     | 1 -
 include/configs/trizepsiv.h                     | 1 +
 include/configs/tt01.h                          | 1 -
 include/configs/twister.h                       | 2 --
 include/configs/u8500_href.h                    | 1 -
 include/configs/usb_a9263.h                     | 1 -
 include/configs/v5fx30teval.h                   | 1 -
 include/configs/vct.h                           | 1 -
 include/configs/venice2.h                       | 1 -
 include/configs/ventana.h                       | 1 -
 include/configs/versatile.h                     | 1 +
 include/configs/vexpress_aemv8a.h               | 1 -
 include/configs/vexpress_common.h               | 1 -
 include/configs/vision2.h                       | 1 -
 include/configs/vl_ma2sc.h                      | 1 -
 include/configs/vpac270.h                       | 1 -
 include/configs/whistler.h                      | 1 -
 include/configs/wireless_space.h                | 2 --
 include/configs/woodburn_common.h               | 1 -
 include/configs/x600.h                          | 1 -
 include/configs/xaeniax.h                       | 2 +-
 include/configs/xilinx-ppc405-generic.h         | 1 -
 include/configs/xilinx-ppc440-generic.h         | 1 -
 include/configs/xilinx_zynqmp.h                 | 1 -
 include/configs/zipitz2.h                       | 3 ---
 include/configs/zmx25.h                         | 1 -
 include/configs/zynq-common.h                   | 1 -
 537 files changed, 333 insertions(+), 310 deletions(-)

diff --git a/common/Kconfig b/common/Kconfig
index 40cd69e..88dc016 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -17,6 +17,13 @@ config SYS_HUSH_PARSER
 	help
 	  Backward compatibility.
 
+config SYS_PROMPT
+	string "Shell prompt"
+	default "=> "
+	help
+	  This string is displayed in the command line to the left of the
+	  cursor.
+
 menu "Autoboot options"
 
 config AUTOBOOT_KEYED
diff --git a/configs/M5208EVBE_defconfig b/configs/M5208EVBE_defconfig
index 58de96b..6a46194 100644
--- a/configs/M5208EVBE_defconfig
+++ b/configs/M5208EVBE_defconfig
@@ -1,3 +1,4 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5208EVBE=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M52277EVB_defconfig b/configs/M52277EVB_defconfig
index 6a2d175..608edc5 100644
--- a/configs/M52277EVB_defconfig
+++ b/configs/M52277EVB_defconfig
@@ -5,3 +5,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_SPANSION_BOOT,SYS_TEXT_BASE=0x00000000"
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M5235EVB_defconfig b/configs/M5235EVB_defconfig
index 3292cff..e9c2b7c 100644
--- a/configs/M5235EVB_defconfig
+++ b/configs/M5235EVB_defconfig
@@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFFE00000"
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M5272C3_defconfig b/configs/M5272C3_defconfig
index 23d5468..6ad4e13 100644
--- a/configs/M5272C3_defconfig
+++ b/configs/M5272C3_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_M5272C3=y
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M5275EVB_defconfig b/configs/M5275EVB_defconfig
index f051bf1..b29021b 100644
--- a/configs/M5275EVB_defconfig
+++ b/configs/M5275EVB_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_M5275EVB=y
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M5282EVB_defconfig b/configs/M5282EVB_defconfig
index 6c130e8..322ee9a 100644
--- a/configs/M5282EVB_defconfig
+++ b/configs/M5282EVB_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_M5282EVB=y
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M53017EVB_defconfig b/configs/M53017EVB_defconfig
index 1f5bc86..3e72290 100644
--- a/configs/M53017EVB_defconfig
+++ b/configs/M53017EVB_defconfig
@@ -1,3 +1,4 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M53017EVB=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M5329AFEE_defconfig b/configs/M5329AFEE_defconfig
index 02af3a4..1d2bb81 100644
--- a/configs/M5329AFEE_defconfig
+++ b/configs/M5329AFEE_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
 CONFIG_TARGET_M5329EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=0"
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M5329BFEE_defconfig b/configs/M5329BFEE_defconfig
index f757a35..915734c 100644
--- a/configs/M5329BFEE_defconfig
+++ b/configs/M5329BFEE_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
 CONFIG_TARGET_M5329EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=16"
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M5373EVB_defconfig b/configs/M5373EVB_defconfig
index 304ca48..eb7a96a 100644
--- a/configs/M5373EVB_defconfig
+++ b/configs/M5373EVB_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
 CONFIG_TARGET_M5373EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=16"
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M54418TWR_defconfig b/configs/M54418TWR_defconfig
index 9a93b3b..a5c35d1 100644
--- a/configs/M54418TWR_defconfig
+++ b/configs/M54418TWR_defconfig
@@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_IN
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M54418TWR_nand_mii_defconfig b/configs/M54418TWR_nand_mii_defconfig
index c194ea7..20eadcf 100644
--- a/configs/M54418TWR_nand_mii_defconfig
+++ b/configs/M54418TWR_nand_mii_defconfig
@@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSR
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M54418TWR_nand_rmii_defconfig b/configs/M54418TWR_nand_rmii_defconfig
index 4ee35ff..d47127c 100644
--- a/configs/M54418TWR_nand_rmii_defconfig
+++ b/configs/M54418TWR_nand_rmii_defconfig
@@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSR
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M54418TWR_nand_rmii_lowfreq_defconfig b/configs/M54418TWR_nand_rmii_lowfreq_defconfig
index 4c4b70a..700745d 100644
--- a/configs/M54418TWR_nand_rmii_lowfreq_defconfig
+++ b/configs/M54418TWR_nand_rmii_lowfreq_defconfig
@@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,LOW_MCFCLK,SYS_TEXT_BASE=0x47E00000,SYS_
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M54418TWR_serial_mii_defconfig b/configs/M54418TWR_serial_mii_defconfig
index 3be102c..4450084 100644
--- a/configs/M54418TWR_serial_mii_defconfig
+++ b/configs/M54418TWR_serial_mii_defconfig
@@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_IN
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M54418TWR_serial_rmii_defconfig b/configs/M54418TWR_serial_rmii_defconfig
index 9a93b3b..a5c35d1 100644
--- a/configs/M54418TWR_serial_rmii_defconfig
+++ b/configs/M54418TWR_serial_rmii_defconfig
@@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_IN
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M54451EVB_defconfig b/configs/M54451EVB_defconfig
index b35bb81..0b446b8 100644
--- a/configs/M54451EVB_defconfig
+++ b/configs/M54451EVB_defconfig
@@ -5,3 +5,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x00000000,SYS_INPUT_CLKSRC=24000000"
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M54455EVB_defconfig b/configs/M54455EVB_defconfig
index cb56586..c7a0164 100644
--- a/configs/M54455EVB_defconfig
+++ b/configs/M54455EVB_defconfig
@@ -5,3 +5,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_ATMEL_BOOT,SYS_TEXT_BASE=0x04000000,SYS_INPUT_CLKS
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M5475AFE_defconfig b/configs/M5475AFE_defconfig
index 343f52f..b29d1a6 100644
--- a/configs/M5475AFE_defconfig
+++ b/configs/M5475AFE_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
 CONFIG_TARGET_M5475EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64"
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M5475BFE_defconfig b/configs/M5475BFE_defconfig
index c9667da..e62fbf6 100644
--- a/configs/M5475BFE_defconfig
+++ b/configs/M5475BFE_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
 CONFIG_TARGET_M5475EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16"
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M5475CFE_defconfig b/configs/M5475CFE_defconfig
index c1a9558..195b4e3 100644
--- a/configs/M5475CFE_defconfig
+++ b/configs/M5475CFE_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
 CONFIG_TARGET_M5475EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO,SYS_USBCTRL"
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M5475DFE_defconfig b/configs/M5475DFE_defconfig
index d879894..314ced6 100644
--- a/configs/M5475DFE_defconfig
+++ b/configs/M5475DFE_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
 CONFIG_TARGET_M5475EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_USBCTRL"
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M5475EFE_defconfig b/configs/M5475EFE_defconfig
index 9b677ee..279808f 100644
--- a/configs/M5475EFE_defconfig
+++ b/configs/M5475EFE_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
 CONFIG_TARGET_M5475EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_VIDEO,SYS_USBCTRL"
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M5475FFE_defconfig b/configs/M5475FFE_defconfig
index 4989b00..a00100e 100644
--- a/configs/M5475FFE_defconfig
+++ b/configs/M5475FFE_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
 CONFIG_TARGET_M5475EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=32,SYS_VIDEO,SYS_USBCTRL,SYS_DRAMSZ1=64"
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M5475GFE_defconfig b/configs/M5475GFE_defconfig
index 31df40e..1ea82a7 100644
--- a/configs/M5475GFE_defconfig
+++ b/configs/M5475GFE_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
 CONFIG_TARGET_M5475EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=4,SYS_DRAMSZ=64"
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M5485AFE_defconfig b/configs/M5485AFE_defconfig
index 5381b74..70cfa8f 100644
--- a/configs/M5485AFE_defconfig
+++ b/configs/M5485AFE_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
 CONFIG_TARGET_M5485EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64"
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M5485BFE_defconfig b/configs/M5485BFE_defconfig
index 36dcccf..377b87f 100644
--- a/configs/M5485BFE_defconfig
+++ b/configs/M5485BFE_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
 CONFIG_TARGET_M5485EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16"
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M5485CFE_defconfig b/configs/M5485CFE_defconfig
index e5cc1e1..faa0196 100644
--- a/configs/M5485CFE_defconfig
+++ b/configs/M5485CFE_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
 CONFIG_TARGET_M5485EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO,SYS_USBCTRL"
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M5485DFE_defconfig b/configs/M5485DFE_defconfig
index fdf667a..71a028f 100644
--- a/configs/M5485DFE_defconfig
+++ b/configs/M5485DFE_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
 CONFIG_TARGET_M5485EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_USBCTRL"
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M5485EFE_defconfig b/configs/M5485EFE_defconfig
index a5933f2..784803e 100644
--- a/configs/M5485EFE_defconfig
+++ b/configs/M5485EFE_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
 CONFIG_TARGET_M5485EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_VIDEO,SYS_USBCTRL"
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M5485FFE_defconfig b/configs/M5485FFE_defconfig
index 116c5cc..8a831e3 100644
--- a/configs/M5485FFE_defconfig
+++ b/configs/M5485FFE_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
 CONFIG_TARGET_M5485EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=32,SYS_VIDEO,SYS_USBCTRL,SYS_DRAMSZ1=64"
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M5485GFE_defconfig b/configs/M5485GFE_defconfig
index fd5fc1a..00c7479 100644
--- a/configs/M5485GFE_defconfig
+++ b/configs/M5485GFE_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
 CONFIG_TARGET_M5485EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=4,SYS_DRAMSZ=64"
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M5485HFE_defconfig b/configs/M5485HFE_defconfig
index 6e2768c..887bd4d 100644
--- a/configs/M5485HFE_defconfig
+++ b/configs/M5485HFE_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
 CONFIG_TARGET_M5485EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO"
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/MPC8349ITXGP_defconfig b/configs/MPC8349ITXGP_defconfig
index 7a43fa0..4578b32 100644
--- a/configs/MPC8349ITXGP_defconfig
+++ b/configs/MPC8349ITXGP_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8349ITX=y
 CONFIG_SYS_EXTRA_OPTIONS="MPC8349ITXGP,SYS_TEXT_BASE=0xFE000000"
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="MPC8349E-mITX-GP> "
diff --git a/configs/MPC8349ITX_LOWBOOT_defconfig b/configs/MPC8349ITX_LOWBOOT_defconfig
index f74d42c..c5fbeb9 100644
--- a/configs/MPC8349ITX_LOWBOOT_defconfig
+++ b/configs/MPC8349ITX_LOWBOOT_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8349ITX=y
 CONFIG_SYS_EXTRA_OPTIONS="MPC8349ITX,SYS_TEXT_BASE=0xFE000000"
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="MPC8349E-mITX> "
diff --git a/configs/MPC8349ITX_defconfig b/configs/MPC8349ITX_defconfig
index 84c117c..a895c53 100644
--- a/configs/MPC8349ITX_defconfig
+++ b/configs/MPC8349ITX_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8349ITX=y
 CONFIG_SYS_EXTRA_OPTIONS="MPC8349ITX"
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="MPC8349E-mITX> "
diff --git a/configs/PATI_defconfig b/configs/PATI_defconfig
index da8525e..6c1bf17 100644
--- a/configs/PATI_defconfig
+++ b/configs/PATI_defconfig
@@ -13,3 +13,4 @@ CONFIG_TARGET_PATI=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="pati=> "
diff --git a/configs/T1023RDB_NAND_defconfig b/configs/T1023RDB_NAND_defconfig
index 3ee42d6..af44f87 100644
--- a/configs/T1023RDB_NAND_defconfig
+++ b/configs/T1023RDB_NAND_defconfig
@@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="=> "
diff --git a/configs/T1023RDB_SDCARD_defconfig b/configs/T1023RDB_SDCARD_defconfig
index ed67945..f2cb98f 100644
--- a/configs/T1023RDB_SDCARD_defconfig
+++ b/configs/T1023RDB_SDCARD_defconfig
@@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="=> "
diff --git a/configs/T1023RDB_SECURE_BOOT_defconfig b/configs/T1023RDB_SECURE_BOOT_defconfig
index 76e3e91..6ae58a6 100644
--- a/configs/T1023RDB_SECURE_BOOT_defconfig
+++ b/configs/T1023RDB_SECURE_BOOT_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,SECURE_BOOT"
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="=> "
diff --git a/configs/T1023RDB_SPIFLASH_defconfig b/configs/T1023RDB_SPIFLASH_defconfig
index e7f4525..08bc509 100644
--- a/configs/T1023RDB_SPIFLASH_defconfig
+++ b/configs/T1023RDB_SPIFLASH_defconfig
@@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="=> "
diff --git a/configs/T1023RDB_defconfig b/configs/T1023RDB_defconfig
index 8ff03a5..fad0d30 100644
--- a/configs/T1023RDB_defconfig
+++ b/configs/T1023RDB_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB"
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="=> "
diff --git a/configs/T1024QDS_D4_SECURE_BOOT_defconfig b/configs/T1024QDS_D4_SECURE_BOOT_defconfig
index 06a9619..9f268df 100644
--- a/configs/T1024QDS_D4_SECURE_BOOT_defconfig
+++ b/configs/T1024QDS_D4_SECURE_BOOT_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,SYS_FSL_DDR4,SECURE_BOOT"
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="=> "
diff --git a/configs/T1024QDS_NAND_defconfig b/configs/T1024QDS_NAND_defconfig
index c49facf..172ebb5 100644
--- a/configs/T1024QDS_NAND_defconfig
+++ b/configs/T1024QDS_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T102XQDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="=> "
diff --git a/configs/T1024QDS_SDCARD_defconfig b/configs/T1024QDS_SDCARD_defconfig
index 3a3beb1..7a78c1e 100644
--- a/configs/T1024QDS_SDCARD_defconfig
+++ b/configs/T1024QDS_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T102XQDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="=> "
diff --git a/configs/T1024QDS_SECURE_BOOT_defconfig b/configs/T1024QDS_SECURE_BOOT_defconfig
index b0890a4..022f1b2 100644
--- a/configs/T1024QDS_SECURE_BOOT_defconfig
+++ b/configs/T1024QDS_SECURE_BOOT_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,SECURE_BOOT"
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="=> "
diff --git a/configs/T1024QDS_SPIFLASH_defconfig b/configs/T1024QDS_SPIFLASH_defconfig
index df3ca94..94f7386 100644
--- a/configs/T1024QDS_SPIFLASH_defconfig
+++ b/configs/T1024QDS_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T102XQDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="=> "
diff --git a/configs/T1024QDS_defconfig b/configs/T1024QDS_defconfig
index 93588b7..520009f 100644
--- a/configs/T1024QDS_defconfig
+++ b/configs/T1024QDS_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024"
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="=> "
diff --git a/configs/T1024RDB_NAND_defconfig b/configs/T1024RDB_NAND_defconfig
index 6f4f026..fa6fd70 100644
--- a/configs/T1024RDB_NAND_defconfig
+++ b/configs/T1024RDB_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T102XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="=> "
diff --git a/configs/T1024RDB_SDCARD_defconfig b/configs/T1024RDB_SDCARD_defconfig
index 53c5c8c..5eb84a8 100644
--- a/configs/T1024RDB_SDCARD_defconfig
+++ b/configs/T1024RDB_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T102XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="=> "
diff --git a/configs/T1024RDB_SECURE_BOOT_defconfig b/configs/T1024RDB_SECURE_BOOT_defconfig
index 65e9a5a..ddf60fe 100644
--- a/configs/T1024RDB_SECURE_BOOT_defconfig
+++ b/configs/T1024RDB_SECURE_BOOT_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,SECURE_BOOT"
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="=> "
diff --git a/configs/T1024RDB_SPIFLASH_defconfig b/configs/T1024RDB_SPIFLASH_defconfig
index 60aee0d..48a72e7 100644
--- a/configs/T1024RDB_SPIFLASH_defconfig
+++ b/configs/T1024RDB_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T102XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="=> "
diff --git a/configs/T1024RDB_defconfig b/configs/T1024RDB_defconfig
index 2da2ea7..0631647 100644
--- a/configs/T1024RDB_defconfig
+++ b/configs/T1024RDB_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB"
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="=> "
diff --git a/configs/UCP1020_defconfig b/configs/UCP1020_defconfig
index 010b15f..cada7bb 100644
--- a/configs/UCP1020_defconfig
+++ b/configs/UCP1020_defconfig
@@ -5,3 +5,4 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc>\" to stop\n"
 CONFIG_AUTOBOOT_STOP_STR="\x1b"
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="B$ "
diff --git a/configs/VCMA9_defconfig b/configs/VCMA9_defconfig
index 8885f1a..e9b28a8 100644
--- a/configs/VCMA9_defconfig
+++ b/configs/VCMA9_defconfig
@@ -1,3 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_VCMA9=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="VCMA9 # "
diff --git a/configs/ac14xx_defconfig b/configs/ac14xx_defconfig
index 37fb0e0..238630e 100644
--- a/configs/ac14xx_defconfig
+++ b/configs/ac14xx_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC512X=y
 CONFIG_TARGET_AC14XX=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="ac14xx> "
diff --git a/configs/adp-ag101_defconfig b/configs/adp-ag101_defconfig
index e550f71..ac1dcaa 100644
--- a/configs/adp-ag101_defconfig
+++ b/configs/adp-ag101_defconfig
@@ -1,3 +1,4 @@
 CONFIG_NDS32=y
 CONFIG_TARGET_ADP_AG101=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="NDS32 # "
diff --git a/configs/adp-ag101p_defconfig b/configs/adp-ag101p_defconfig
index 740cb57..92aa0be 100644
--- a/configs/adp-ag101p_defconfig
+++ b/configs/adp-ag101p_defconfig
@@ -1,3 +1,4 @@
 CONFIG_NDS32=y
 CONFIG_TARGET_ADP_AG101P=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="NDS32 # "
diff --git a/configs/adp-ag102_defconfig b/configs/adp-ag102_defconfig
index 721f61d..1bef350 100644
--- a/configs/adp-ag102_defconfig
+++ b/configs/adp-ag102_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_ADP_AG102=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="NDS32 # "
diff --git a/configs/am3517_crane_defconfig b/configs/am3517_crane_defconfig
index a44ffe7..806dc3a 100644
--- a/configs/am3517_crane_defconfig
+++ b/configs/am3517_crane_defconfig
@@ -9,3 +9,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="AM3517_CRANE # "
diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig
index 4589b30..6eefd61 100644
--- a/configs/am3517_evm_defconfig
+++ b/configs/am3517_evm_defconfig
@@ -7,3 +7,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="AM3517_EVM # "
diff --git a/configs/amcore_defconfig b/configs/amcore_defconfig
index 47c4f3d..dc16d5b 100644
--- a/configs/amcore_defconfig
+++ b/configs/amcore_defconfig
@@ -6,3 +6,4 @@ CONFIG_TARGET_AMCORE=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="amcore $ "
diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig
index fa9f365..c0bc3c5 100644
--- a/configs/apalis_t30_defconfig
+++ b/configs/apalis_t30_defconfig
@@ -12,3 +12,4 @@ CONFIG_SPL_DM=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Apalis T30 # "
diff --git a/configs/apf27_defconfig b/configs/apf27_defconfig
index 854a2b7..4503235 100644
--- a/configs/apf27_defconfig
+++ b/configs/apf27_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_APF27=y
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
+CONFIG_SYS_PROMPT="BIOS> "
diff --git a/configs/arcangel4_defconfig b/configs/arcangel4_defconfig
index 5683b81..cd9aafd 100644
--- a/configs/arcangel4_defconfig
+++ b/configs/arcangel4_defconfig
@@ -11,3 +11,4 @@ CONFIG_OF_EMBED=y
 CONFIG_DM=y
 CONFIG_DM_SERIAL=y
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="arcangel4# "
diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig
index aa489cf..43c5527 100644
--- a/configs/arndale_defconfig
+++ b/configs/arndale_defconfig
@@ -13,3 +13,4 @@ CONFIG_SOUND_MAX98095=y
 CONFIG_SOUND_WM8994=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_SYS_PROMPT="ARNDALE # "
diff --git a/configs/astro_mcf5373l_defconfig b/configs/astro_mcf5373l_defconfig
index f394f4d..8676120 100644
--- a/configs/astro_mcf5373l_defconfig
+++ b/configs/astro_mcf5373l_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_ASTRO_MCF5373L=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="URMEL > "
diff --git a/configs/at91rm9200ek_defconfig b/configs/at91rm9200ek_defconfig
index 74d4f3a..10df5f8 100644
--- a/configs/at91rm9200ek_defconfig
+++ b/configs/at91rm9200ek_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91RM9200EK=y
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91rm9200ek_ram_defconfig b/configs/at91rm9200ek_ram_defconfig
index f499453..2765e9d 100644
--- a/configs/at91rm9200ek_ram_defconfig
+++ b/configs/at91rm9200ek_ram_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_AT91RM9200EK=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9260ek_dataflash_cs0_defconfig b/configs/at91sam9260ek_dataflash_cs0_defconfig
index 96c5eee..9909bc8 100644
--- a/configs/at91sam9260ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9260ek_dataflash_cs0_defconfig
@@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_DATAFLASH_CS0"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9260ek_dataflash_cs1_defconfig b/configs/at91sam9260ek_dataflash_cs1_defconfig
index 6330c3e..8fdbd88 100644
--- a/configs/at91sam9260ek_dataflash_cs1_defconfig
+++ b/configs/at91sam9260ek_dataflash_cs1_defconfig
@@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_DATAFLASH_CS1"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9260ek_nandflash_defconfig b/configs/at91sam9260ek_nandflash_defconfig
index ae2defd..e4fc8d7 100644
--- a/configs/at91sam9260ek_nandflash_defconfig
+++ b/configs/at91sam9260ek_nandflash_defconfig
@@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_NANDFLASH"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9261ek_dataflash_cs0_defconfig b/configs/at91sam9261ek_dataflash_cs0_defconfig
index 838b235..e182f70 100644
--- a/configs/at91sam9261ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs0_defconfig
@@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_DATAFLASH_CS0"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9261ek_dataflash_cs3_defconfig b/configs/at91sam9261ek_dataflash_cs3_defconfig
index 6104479..b3a35dd 100644
--- a/configs/at91sam9261ek_dataflash_cs3_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs3_defconfig
@@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_DATAFLASH_CS3"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9261ek_nandflash_defconfig b/configs/at91sam9261ek_nandflash_defconfig
index 4015c9f..58aa38f 100644
--- a/configs/at91sam9261ek_nandflash_defconfig
+++ b/configs/at91sam9261ek_nandflash_defconfig
@@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_NANDFLASH"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9263ek_dataflash_cs0_defconfig b/configs/at91sam9263ek_dataflash_cs0_defconfig
index d9003ff..82e1b86 100644
--- a/configs/at91sam9263ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9263ek_dataflash_cs0_defconfig
@@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9263ek_dataflash_defconfig b/configs/at91sam9263ek_dataflash_defconfig
index d9003ff..82e1b86 100644
--- a/configs/at91sam9263ek_dataflash_defconfig
+++ b/configs/at91sam9263ek_dataflash_defconfig
@@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9263ek_nandflash_defconfig b/configs/at91sam9263ek_nandflash_defconfig
index 600c5dd..bac882e 100644
--- a/configs/at91sam9263ek_nandflash_defconfig
+++ b/configs/at91sam9263ek_nandflash_defconfig
@@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NANDFLASH"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9263ek_norflash_boot_defconfig b/configs/at91sam9263ek_norflash_boot_defconfig
index 2e34b79..75f0ec6 100644
--- a/configs/at91sam9263ek_norflash_boot_defconfig
+++ b/configs/at91sam9263ek_norflash_boot_defconfig
@@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_BOOT_NORFLASH"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9263ek_norflash_defconfig b/configs/at91sam9263ek_norflash_defconfig
index f72ed85..5bcdab0 100644
--- a/configs/at91sam9263ek_norflash_defconfig
+++ b/configs/at91sam9263ek_norflash_defconfig
@@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NORFLASH"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9g10ek_dataflash_cs0_defconfig b/configs/at91sam9g10ek_dataflash_cs0_defconfig
index 5f8d803..80e6a8a 100644
--- a/configs/at91sam9g10ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9g10ek_dataflash_cs0_defconfig
@@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_DATAFLASH_CS0"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9g10ek_dataflash_cs3_defconfig b/configs/at91sam9g10ek_dataflash_cs3_defconfig
index 3ed763e..e6c9f61 100644
--- a/configs/at91sam9g10ek_dataflash_cs3_defconfig
+++ b/configs/at91sam9g10ek_dataflash_cs3_defconfig
@@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_DATAFLASH_CS3"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9g10ek_nandflash_defconfig b/configs/at91sam9g10ek_nandflash_defconfig
index c27e39a..0adaf11 100644
--- a/configs/at91sam9g10ek_nandflash_defconfig
+++ b/configs/at91sam9g10ek_nandflash_defconfig
@@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_NANDFLASH"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9g20ek_2mmc_defconfig b/configs/at91sam9g20ek_2mmc_defconfig
index d58de8e..40cd6b1 100644
--- a/configs/at91sam9g20ek_2mmc_defconfig
+++ b/configs/at91sam9g20ek_2mmc_defconfig
@@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,AT91SAM9G20EK_2MMC,SYS_USE_MMC"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9g20ek_2mmc_nandflash_defconfig b/configs/at91sam9g20ek_2mmc_nandflash_defconfig
index 4b28839..6f59305 100644
--- a/configs/at91sam9g20ek_2mmc_nandflash_defconfig
+++ b/configs/at91sam9g20ek_2mmc_nandflash_defconfig
@@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,AT91SAM9G20EK_2MMC,SYS_USE_NANDFLASH"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9g20ek_dataflash_cs0_defconfig b/configs/at91sam9g20ek_dataflash_cs0_defconfig
index ee86dad..b63c6d6 100644
--- a/configs/at91sam9g20ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9g20ek_dataflash_cs0_defconfig
@@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_DATAFLASH_CS0"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9g20ek_dataflash_cs1_defconfig b/configs/at91sam9g20ek_dataflash_cs1_defconfig
index 39d4b09..aad9c1e 100644
--- a/configs/at91sam9g20ek_dataflash_cs1_defconfig
+++ b/configs/at91sam9g20ek_dataflash_cs1_defconfig
@@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_DATAFLASH_CS1"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9g20ek_nandflash_defconfig b/configs/at91sam9g20ek_nandflash_defconfig
index d636485..f247084 100644
--- a/configs/at91sam9g20ek_nandflash_defconfig
+++ b/configs/at91sam9g20ek_nandflash_defconfig
@@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_NANDFLASH"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9m10g45ek_mmc_defconfig b/configs/at91sam9m10g45ek_mmc_defconfig
index 1472d20..f88b48b 100644
--- a/configs/at91sam9m10g45ek_mmc_defconfig
+++ b/configs/at91sam9m10g45ek_mmc_defconfig
@@ -10,3 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_MMC"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9m10g45ek_nandflash_defconfig b/configs/at91sam9m10g45ek_nandflash_defconfig
index 526419c..7675f52 100644
--- a/configs/at91sam9m10g45ek_nandflash_defconfig
+++ b/configs/at91sam9m10g45ek_nandflash_defconfig
@@ -10,3 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_NANDFLASH"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9n12ek_mmc_defconfig b/configs/at91sam9n12ek_mmc_defconfig
index c549baf..1702a32 100644
--- a/configs/at91sam9n12ek_mmc_defconfig
+++ b/configs/at91sam9n12ek_mmc_defconfig
@@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_MMC"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9n12ek_nandflash_defconfig b/configs/at91sam9n12ek_nandflash_defconfig
index 756db2a..9f87469 100644
--- a/configs/at91sam9n12ek_nandflash_defconfig
+++ b/configs/at91sam9n12ek_nandflash_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_NANDFLASH"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9n12ek_spiflash_defconfig b/configs/at91sam9n12ek_spiflash_defconfig
index 0430de9..a7d0581 100644
--- a/configs/at91sam9n12ek_spiflash_defconfig
+++ b/configs/at91sam9n12ek_spiflash_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_SPIFLASH"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9rlek_dataflash_defconfig b/configs/at91sam9rlek_dataflash_defconfig
index c555caa..ed2f5d2 100644
--- a/configs/at91sam9rlek_dataflash_defconfig
+++ b/configs/at91sam9rlek_dataflash_defconfig
@@ -12,3 +12,4 @@ CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9rlek_mmc_defconfig b/configs/at91sam9rlek_mmc_defconfig
index 5cb5655..760cf92 100644
--- a/configs/at91sam9rlek_mmc_defconfig
+++ b/configs/at91sam9rlek_mmc_defconfig
@@ -12,3 +12,4 @@ CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9rlek_nandflash_defconfig b/configs/at91sam9rlek_nandflash_defconfig
index 3e3528e..191a261 100644
--- a/configs/at91sam9rlek_nandflash_defconfig
+++ b/configs/at91sam9rlek_nandflash_defconfig
@@ -12,3 +12,4 @@ CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9x5ek_dataflash_defconfig b/configs/at91sam9x5ek_dataflash_defconfig
index c757fc4..38607d0 100644
--- a/configs/at91sam9x5ek_dataflash_defconfig
+++ b/configs/at91sam9x5ek_dataflash_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_DATAFLASH"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig
index 82e67f3..8776627 100644
--- a/configs/at91sam9x5ek_mmc_defconfig
+++ b/configs/at91sam9x5ek_mmc_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_MMC"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig
index b45d8d0..cedc560 100644
--- a/configs/at91sam9x5ek_nandflash_defconfig
+++ b/configs/at91sam9x5ek_nandflash_defconfig
@@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_NANDFLASH"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9x5ek_spiflash_defconfig b/configs/at91sam9x5ek_spiflash_defconfig
index f33a2fd..3896300 100644
--- a/configs/at91sam9x5ek_spiflash_defconfig
+++ b/configs/at91sam9x5ek_spiflash_defconfig
@@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_SPIFLASH"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9xeek_dataflash_cs0_defconfig b/configs/at91sam9xeek_dataflash_cs0_defconfig
index 585d564..fbdb564 100644
--- a/configs/at91sam9xeek_dataflash_cs0_defconfig
+++ b/configs/at91sam9xeek_dataflash_cs0_defconfig
@@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_DATAFLASH_CS0"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9xeek_dataflash_cs1_defconfig b/configs/at91sam9xeek_dataflash_cs1_defconfig
index 1c38777..4f0cc11 100644
--- a/configs/at91sam9xeek_dataflash_cs1_defconfig
+++ b/configs/at91sam9xeek_dataflash_cs1_defconfig
@@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_DATAFLASH_CS1"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9xeek_nandflash_defconfig b/configs/at91sam9xeek_nandflash_defconfig
index 5e9a080..3dde55c 100644
--- a/configs/at91sam9xeek_nandflash_defconfig
+++ b/configs/at91sam9xeek_nandflash_defconfig
@@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_NANDFLASH"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig
index 0f5be56..51facf7 100644
--- a/configs/atngw100_defconfig
+++ b/configs/atngw100_defconfig
@@ -9,3 +9,4 @@ CONFIG_AUTOBOOT_STOP_STR=" "
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/atngw100mkii_defconfig b/configs/atngw100mkii_defconfig
index b4d8d1c..b7099f5 100644
--- a/configs/atngw100mkii_defconfig
+++ b/configs/atngw100mkii_defconfig
@@ -8,3 +8,4 @@ CONFIG_AUTOBOOT_STOP_STR=" "
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/atstk1002_defconfig b/configs/atstk1002_defconfig
index bb0406e..78e2256 100644
--- a/configs/atstk1002_defconfig
+++ b/configs/atstk1002_defconfig
@@ -8,3 +8,4 @@ CONFIG_AUTOBOOT_STOP_STR=" "
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/axs101_defconfig b/configs/axs101_defconfig
index 04aec0b..9a6cef3 100644
--- a/configs/axs101_defconfig
+++ b/configs/axs101_defconfig
@@ -10,3 +10,4 @@ CONFIG_SYS_TEXT_BASE=0x81000000
 CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="AXS# "
diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig
index ad74b85..02e19d2 100644
--- a/configs/beaver_defconfig
+++ b/configs/beaver_defconfig
@@ -14,3 +14,4 @@ CONFIG_SPI_FLASH=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Tegra30 (Beaver) # "
diff --git a/configs/bf537-minotaur_defconfig b/configs/bf537-minotaur_defconfig
index 57e9a24..212f2bb 100644
--- a/configs/bf537-minotaur_defconfig
+++ b/configs/bf537-minotaur_defconfig
@@ -5,3 +5,4 @@ CONFIG_TARGET_BF537_MINOTAUR=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="minotaur> "
diff --git a/configs/bf537-srv1_defconfig b/configs/bf537-srv1_defconfig
index 51022d8..52abf99 100644
--- a/configs/bf537-srv1_defconfig
+++ b/configs/bf537-srv1_defconfig
@@ -5,3 +5,4 @@ CONFIG_TARGET_BF537_SRV1=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="srv1> "
diff --git a/configs/bf561-acvilon_defconfig b/configs/bf561-acvilon_defconfig
index 897e44f..1409901 100644
--- a/configs/bf561-acvilon_defconfig
+++ b/configs/bf561-acvilon_defconfig
@@ -6,3 +6,4 @@ CONFIG_TARGET_BF561_ACVILON=y
 CONFIG_SPI_FLASH=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
 CONFIG_LIB_RAND=y
+CONFIG_SYS_PROMPT="Acvilon> "
diff --git a/configs/br4_defconfig b/configs/br4_defconfig
index b129899..540dbef 100644
--- a/configs/br4_defconfig
+++ b/configs/br4_defconfig
@@ -6,3 +6,4 @@ CONFIG_TARGET_BR4=y
 CONFIG_SPI_FLASH=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
 CONFIG_LIB_RAND=y
+CONFIG_SYS_PROMPT="br4>"
diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig
index b837de3..756457c 100644
--- a/configs/cairo_defconfig
+++ b/configs/cairo_defconfig
@@ -7,3 +7,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_NET is not set
+CONFIG_SYS_PROMPT="Cairo # "
diff --git a/configs/calimain_defconfig b/configs/calimain_defconfig
index 35f73e3..4d952cd 100644
--- a/configs/calimain_defconfig
+++ b/configs/calimain_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_CALIMAIN=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR="\x0b"
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="Calimain > "
diff --git a/configs/cam_enc_4xx_defconfig b/configs/cam_enc_4xx_defconfig
index f7f6f12..a67bf0e 100644
--- a/configs/cam_enc_4xx_defconfig
+++ b/configs/cam_enc_4xx_defconfig
@@ -7,3 +7,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="cam_enc_4xx> "
diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig
index c0e98a5..5c298d7 100644
--- a/configs/cardhu_defconfig
+++ b/configs/cardhu_defconfig
@@ -14,3 +14,4 @@ CONFIG_SPI_FLASH=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Tegra30 (Cardhu) # "
diff --git a/configs/cgtqmx6qeval_defconfig b/configs/cgtqmx6qeval_defconfig
index e1eb871..b6ed4b6 100644
--- a/configs/cgtqmx6qeval_defconfig
+++ b/configs/cgtqmx6qeval_defconfig
@@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/congatec/cgtqmx6eval/imximage.cfg,MX6
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="CGT-QMX6-Quad U-Boot > "
diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index 2aba359..66fc382 100644
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -30,3 +30,4 @@ CONFIG_USB_EHCI_MX6=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
+CONFIG_SYS_PROMPT="CM-FX6 # "
diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig
index 9ebd327..4f4bd0b 100644
--- a/configs/cm_t335_defconfig
+++ b/configs/cm_t335_defconfig
@@ -4,3 +4,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="CM-T335 # "
diff --git a/configs/cm_t3517_defconfig b/configs/cm_t3517_defconfig
index 57b44ba..1eb4250 100644
--- a/configs/cm_t3517_defconfig
+++ b/configs/cm_t3517_defconfig
@@ -5,3 +5,4 @@ CONFIG_TARGET_CM_T3517=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="CM-T3517 # "
diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig
index c8dc124..99dd2f4 100644
--- a/configs/cm_t35_defconfig
+++ b/configs/cm_t35_defconfig
@@ -6,3 +6,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="CM-T3x # "
diff --git a/configs/cm_t54_defconfig b/configs/cm_t54_defconfig
index af7c880..fc72ffa 100644
--- a/configs/cm_t54_defconfig
+++ b/configs/cm_t54_defconfig
@@ -6,3 +6,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="CM-T54 # "
diff --git a/configs/cobra5272_defconfig b/configs/cobra5272_defconfig
index 2ccb80c..77ad34d 100644
--- a/configs/cobra5272_defconfig
+++ b/configs/cobra5272_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_COBRA5272=y
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="COBRA > "
diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig
index 4e1369b..0d28b06 100644
--- a/configs/colibri_t20_defconfig
+++ b/configs/colibri_t20_defconfig
@@ -12,3 +12,4 @@ CONFIG_SPL_DM=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Colibri T20 # "
diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig
index 45cf20a..d1ed09d 100644
--- a/configs/colibri_t30_defconfig
+++ b/configs/colibri_t30_defconfig
@@ -12,3 +12,4 @@ CONFIG_SPL_DM=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Colibri T30 # "
diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig
index ffb3b4f..74af563 100644
--- a/configs/colibri_vf_defconfig
+++ b/configs/colibri_vf_defconfig
@@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_vf/imximage.cfg,ENV_I
 CONFIG_DM=y
 CONFIG_NAND_VF610_NFC=y
 CONFIG_SYS_NAND_VF610_NFC_60_ECC_BYTES=y
+CONFIG_SYS_PROMPT="Colibri VFxx # "
diff --git a/configs/colibri_vf_dtb_defconfig b/configs/colibri_vf_dtb_defconfig
index 49f2105..54c3f2d 100644
--- a/configs/colibri_vf_dtb_defconfig
+++ b/configs/colibri_vf_dtb_defconfig
@@ -9,3 +9,4 @@ CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_NAND_VF610_NFC=y
 CONFIG_SYS_NAND_VF610_NFC_60_ECC_BYTES=y
+CONFIG_SYS_PROMPT="Colibri VFxx # "
diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig
index 13afb08..1fed14e 100644
--- a/configs/corvus_defconfig
+++ b/configs/corvus_defconfig
@@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,MACH_TYPE=2066,SYS_USE_NANDFLASH"
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/cpu9260_128M_defconfig b/configs/cpu9260_128M_defconfig
index f423980..187fced 100644
--- a/configs/cpu9260_128M_defconfig
+++ b/configs/cpu9260_128M_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9260,CPU9260_128M"
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="CPU9260=> "
diff --git a/configs/cpu9260_defconfig b/configs/cpu9260_defconfig
index 88afe9f..4b50505 100644
--- a/configs/cpu9260_defconfig
+++ b/configs/cpu9260_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9260"
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="CPU9260=> "
diff --git a/configs/cpu9260_nand_128M_defconfig b/configs/cpu9260_nand_128M_defconfig
index f59b000..797fb85 100644
--- a/configs/cpu9260_nand_128M_defconfig
+++ b/configs/cpu9260_nand_128M_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9260,CPU9260_128M,NANDBOOT"
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="CPU9260=> "
diff --git a/configs/cpu9260_nand_defconfig b/configs/cpu9260_nand_defconfig
index e914c2b..8d155d0 100644
--- a/configs/cpu9260_nand_defconfig
+++ b/configs/cpu9260_nand_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9260,NANDBOOT"
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="CPU9260=> "
diff --git a/configs/cpu9G20_128M_defconfig b/configs/cpu9G20_128M_defconfig
index d215cc0..650c934 100644
--- a/configs/cpu9G20_128M_defconfig
+++ b/configs/cpu9G20_128M_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9G20,CPU9G20_128M"
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="CPU9G20=> "
diff --git a/configs/cpu9G20_defconfig b/configs/cpu9G20_defconfig
index 51b19f0..997eec5 100644
--- a/configs/cpu9G20_defconfig
+++ b/configs/cpu9G20_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9G20"
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="CPU9G20=> "
diff --git a/configs/cpu9G20_nand_128M_defconfig b/configs/cpu9G20_nand_128M_defconfig
index da4cbdd..6d62732 100644
--- a/configs/cpu9G20_nand_128M_defconfig
+++ b/configs/cpu9G20_nand_128M_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9G20,CPU9G20_128M,NANDBOOT"
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="CPU9G20=> "
diff --git a/configs/cpu9G20_nand_defconfig b/configs/cpu9G20_nand_defconfig
index b9e4b3c..52f916f 100644
--- a/configs/cpu9G20_nand_defconfig
+++ b/configs/cpu9G20_nand_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9G20,NANDBOOT"
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="CPU9G20=> "
diff --git a/configs/cpuat91_defconfig b/configs/cpuat91_defconfig
index cfc62aa..10b8ad2 100644
--- a/configs/cpuat91_defconfig
+++ b/configs/cpuat91_defconfig
@@ -10,3 +10,4 @@ CONFIG_AUTOBOOT_STOP_STR=" "
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="CPUAT91=> "
diff --git a/configs/da830evm_defconfig b/configs/da830evm_defconfig
index e0c8e25..d37ede3 100644
--- a/configs/da830evm_defconfig
+++ b/configs/da830evm_defconfig
@@ -6,3 +6,4 @@ CONFIG_TARGET_DA830EVM=y
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot > "
diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig
index 41395e3..557c0d5 100644
--- a/configs/da850evm_defconfig
+++ b/configs/da850evm_defconfig
@@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot > "
diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig
index a1cba1a..79b877f 100644
--- a/configs/da850evm_direct_nor_defconfig
+++ b/configs/da850evm_direct_nor_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_DA850EVM=y
 CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH,USE_NOR,DIRECT_NOR_BOOT"
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot > "
diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig
index e7443f8..e7688a6 100644
--- a/configs/dalmore_defconfig
+++ b/configs/dalmore_defconfig
@@ -14,3 +14,4 @@ CONFIG_SPI_FLASH=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Tegra114 (Dalmore) # "
diff --git a/configs/davinci_dm355evm_defconfig b/configs/davinci_dm355evm_defconfig
index f10b643..4513ce4 100644
--- a/configs/davinci_dm355evm_defconfig
+++ b/configs/davinci_dm355evm_defconfig
@@ -6,3 +6,4 @@ CONFIG_TARGET_DAVINCI_DM355EVM=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="DM355 EVM # "
diff --git a/configs/davinci_dm355leopard_defconfig b/configs/davinci_dm355leopard_defconfig
index 7b33f6d..7945605 100644
--- a/configs/davinci_dm355leopard_defconfig
+++ b/configs/davinci_dm355leopard_defconfig
@@ -6,3 +6,4 @@ CONFIG_TARGET_DAVINCI_DM355LEOPARD=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="DM355 LEOPARD # "
diff --git a/configs/davinci_dm365evm_defconfig b/configs/davinci_dm365evm_defconfig
index f139b58..3550e75 100644
--- a/configs/davinci_dm365evm_defconfig
+++ b/configs/davinci_dm365evm_defconfig
@@ -6,3 +6,4 @@ CONFIG_TARGET_DAVINCI_DM365EVM=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="DM36x EVM # "
diff --git a/configs/davinci_dm6467evm_defconfig b/configs/davinci_dm6467evm_defconfig
index 2a5262a..b2021af 100644
--- a/configs/davinci_dm6467evm_defconfig
+++ b/configs/davinci_dm6467evm_defconfig
@@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="REFCLK_FREQ=27000000"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="DM6467 EVM > "
diff --git a/configs/davinci_dvevm_defconfig b/configs/davinci_dvevm_defconfig
index aa30d1b..7c6f03e 100644
--- a/configs/davinci_dvevm_defconfig
+++ b/configs/davinci_dvevm_defconfig
@@ -6,3 +6,4 @@ CONFIG_TARGET_DAVINCI_DVEVM=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot > "
diff --git a/configs/davinci_schmoogie_defconfig b/configs/davinci_schmoogie_defconfig
index 7c11c8c..2fb4d9f 100644
--- a/configs/davinci_schmoogie_defconfig
+++ b/configs/davinci_schmoogie_defconfig
@@ -6,3 +6,4 @@ CONFIG_TARGET_DAVINCI_SCHMOOGIE=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot > "
diff --git a/configs/davinci_sffsdr_defconfig b/configs/davinci_sffsdr_defconfig
index 7aca606..633b4a8 100644
--- a/configs/davinci_sffsdr_defconfig
+++ b/configs/davinci_sffsdr_defconfig
@@ -6,3 +6,4 @@ CONFIG_TARGET_DAVINCI_SFFSDR=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot > "
diff --git a/configs/davinci_sonata_defconfig b/configs/davinci_sonata_defconfig
index 6014eee..697ce06 100644
--- a/configs/davinci_sonata_defconfig
+++ b/configs/davinci_sonata_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_DAVINCI_SONATA=y
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot > "
diff --git a/configs/dbau1000_defconfig b/configs/dbau1000_defconfig
index 58da5b7..5dc12d2 100644
--- a/configs/dbau1000_defconfig
+++ b/configs/dbau1000_defconfig
@@ -10,3 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="DBAU1000"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="DbAu1xx0 # "
diff --git a/configs/dbau1100_defconfig b/configs/dbau1100_defconfig
index 14aeb4c..522b9bc 100644
--- a/configs/dbau1100_defconfig
+++ b/configs/dbau1100_defconfig
@@ -10,3 +10,4 @@ CONFIG_DBAU1100=y
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="DbAu1xx0 # "
diff --git a/configs/dbau1500_defconfig b/configs/dbau1500_defconfig
index 699b968..2fdddc7 100644
--- a/configs/dbau1500_defconfig
+++ b/configs/dbau1500_defconfig
@@ -10,3 +10,4 @@ CONFIG_DBAU1500=y
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="DbAu1xx0 # "
diff --git a/configs/dbau1550_defconfig b/configs/dbau1550_defconfig
index 6b17da7..07be3f1 100644
--- a/configs/dbau1550_defconfig
+++ b/configs/dbau1550_defconfig
@@ -8,3 +8,4 @@ CONFIG_DBAU1550=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="DbAu1xx0 # "
diff --git a/configs/dbau1550_el_defconfig b/configs/dbau1550_el_defconfig
index 845bc87..7bd1e0c 100644
--- a/configs/dbau1550_el_defconfig
+++ b/configs/dbau1550_el_defconfig
@@ -9,3 +9,4 @@ CONFIG_SYS_LITTLE_ENDIAN=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="DbAu1xx0 # "
diff --git a/configs/dig297_defconfig b/configs/dig297_defconfig
index 483c20e..4c2c982 100644
--- a/configs/dig297_defconfig
+++ b/configs/dig297_defconfig
@@ -7,3 +7,4 @@ CONFIG_TARGET_DIG297=y
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="DIG297# "
diff --git a/configs/dockstar_defconfig b/configs/dockstar_defconfig
index 40f6e0f..e4da466 100644
--- a/configs/dockstar_defconfig
+++ b/configs/dockstar_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_DOCKSTAR=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="DockStar> "
diff --git a/configs/draco_defconfig b/configs/draco_defconfig
index 8b177b3..d2fc98d 100644
--- a/configs/draco_defconfig
+++ b/configs/draco_defconfig
@@ -8,3 +8,4 @@ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot# "
diff --git a/configs/duovero_defconfig b/configs/duovero_defconfig
index 57410d3..d3de28a 100644
--- a/configs/duovero_defconfig
+++ b/configs/duovero_defconfig
@@ -6,3 +6,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="duovero # "
diff --git a/configs/ea20_defconfig b/configs/ea20_defconfig
index 388dfec..1d7494f 100644
--- a/configs/ea20_defconfig
+++ b/configs/ea20_defconfig
@@ -5,3 +5,4 @@ CONFIG_TARGET_EA20=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="ea20 > "
diff --git a/configs/eb_cpu5282_defconfig b/configs/eb_cpu5282_defconfig
index 1e19d3a..0044de6 100644
--- a/configs/eb_cpu5282_defconfig
+++ b/configs/eb_cpu5282_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_EB_CPU5282=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFF000000,SYS_MONITOR_BASE=0xFF000400"
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="\nEB+CPU5282> "
diff --git a/configs/eb_cpux9k2_defconfig b/configs/eb_cpux9k2_defconfig
index bff6595..6a6f3cd 100644
--- a/configs/eb_cpux9k2_defconfig
+++ b/configs/eb_cpux9k2_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_EB_CPUX9K2=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/eco5pk_defconfig b/configs/eco5pk_defconfig
index c43603b..8b5874d 100644
--- a/configs/eco5pk_defconfig
+++ b/configs/eco5pk_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="ECO5-PK # "
diff --git a/configs/edminiv2_defconfig b/configs/edminiv2_defconfig
index 80ff33f..b2a2506 100644
--- a/configs/edminiv2_defconfig
+++ b/configs/edminiv2_defconfig
@@ -3,3 +3,4 @@ CONFIG_ORION5X=y
 CONFIG_TARGET_EDMINIV2=y
 CONFIG_SPL=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="EDMiniV2> "
diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig
index d2379ec..d97008a 100644
--- a/configs/ethernut5_defconfig
+++ b/configs/ethernut5_defconfig
@@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE"
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/flea3_defconfig b/configs/flea3_defconfig
index 7ea5da2..c9e4a28 100644
--- a/configs/flea3_defconfig
+++ b/configs/flea3_defconfig
@@ -1,3 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_FLEA3=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="flea3 U-Boot > "
diff --git a/configs/fx12mm_defconfig b/configs/fx12mm_defconfig
index 1013b70..0213681 100644
--- a/configs/fx12mm_defconfig
+++ b/configs/fx12mm_defconfig
@@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x041000
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="FX12MM:/# "
diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig
index d1b9ba1..059ce80 100644
--- a/configs/goflexhome_defconfig
+++ b/configs/goflexhome_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_GOFLEXHOME=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="GoFlexHome> "
diff --git a/configs/grasshopper_defconfig b/configs/grasshopper_defconfig
index 2d9c8ad..eefc5f2 100644
--- a/configs/grasshopper_defconfig
+++ b/configs/grasshopper_defconfig
@@ -6,3 +6,4 @@ CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig
index 401f77e..d81f941 100644
--- a/configs/gwventana_defconfig
+++ b/configs/gwventana_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
 # CONFIG_CMD_FLASH is not set
 CONFIG_DM=y
 CONFIG_DM_SERIAL=y
+CONFIG_SYS_PROMPT="Ventana > "
diff --git a/configs/h2200_defconfig b/configs/h2200_defconfig
index f90a4a6..07b1706 100644
--- a/configs/h2200_defconfig
+++ b/configs/h2200_defconfig
@@ -17,3 +17,4 @@ CONFIG_TARGET_H2200=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 # CONFIG_CMD_MISC is not set
+CONFIG_SYS_PROMPT="> "
diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig
index d88a082..c9c0618 100644
--- a/configs/harmony_defconfig
+++ b/configs/harmony_defconfig
@@ -13,3 +13,4 @@ CONFIG_SPL_DM=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Tegra20 (Harmony) # "
diff --git a/configs/hrcon_defconfig b/configs/hrcon_defconfig
index 6b2b5d3..1308f05 100644
--- a/configs/hrcon_defconfig
+++ b/configs/hrcon_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_HRCON=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR=" "
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="=> "
diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig
index e418d8f..b3fa890 100644
--- a/configs/ib62x0_defconfig
+++ b/configs/ib62x0_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_IB62X0=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="ib62x0 => "
diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig
index 49d4fa0..4c34290 100644
--- a/configs/iconnect_defconfig
+++ b/configs/iconnect_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_ICONNECT=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="iconnect => "
diff --git a/configs/ima3-mx53_defconfig b/configs/ima3-mx53_defconfig
index ef15127..1f5e3a6 100644
--- a/configs/ima3-mx53_defconfig
+++ b/configs/ima3-mx53_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_IMA3_MX53=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/esg/ima3-mx53/imximage.cfg"
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="IMA3 MX53 U-Boot > "
diff --git a/configs/imx31_litekit_defconfig b/configs/imx31_litekit_defconfig
index b197935..f10759b 100644
--- a/configs/imx31_litekit_defconfig
+++ b/configs/imx31_litekit_defconfig
@@ -1,3 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_IMX31_LITEKIT=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="uboot> "
diff --git a/configs/imx31_phycore_defconfig b/configs/imx31_phycore_defconfig
index 161a604..e801ee7 100644
--- a/configs/imx31_phycore_defconfig
+++ b/configs/imx31_phycore_defconfig
@@ -1,3 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_IMX31_PHYCORE=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="uboot> "
diff --git a/configs/integratorap_cm720t_defconfig b/configs/integratorap_cm720t_defconfig
index 369add7..50c6005 100644
--- a/configs/integratorap_cm720t_defconfig
+++ b/configs/integratorap_cm720t_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_AP=y
 CONFIG_CM720T=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="Integrator-AP # "
diff --git a/configs/integratorap_cm920t_defconfig b/configs/integratorap_cm920t_defconfig
index aa27cbd..ab0cdbd 100644
--- a/configs/integratorap_cm920t_defconfig
+++ b/configs/integratorap_cm920t_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_AP=y
 CONFIG_CM920T=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="Integrator-AP # "
diff --git a/configs/integratorap_cm926ejs_defconfig b/configs/integratorap_cm926ejs_defconfig
index 8155b67..317c6d8 100644
--- a/configs/integratorap_cm926ejs_defconfig
+++ b/configs/integratorap_cm926ejs_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_AP=y
 CONFIG_CM926EJ_S=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="Integrator-AP # "
diff --git a/configs/integratorap_cm946es_defconfig b/configs/integratorap_cm946es_defconfig
index b3b5edf..5ce1c00 100644
--- a/configs/integratorap_cm946es_defconfig
+++ b/configs/integratorap_cm946es_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_AP=y
 CONFIG_CM946ES=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="Integrator-AP # "
diff --git a/configs/integratorcp_cm1136_defconfig b/configs/integratorcp_cm1136_defconfig
index 5ab7c27..ddd2ce7 100644
--- a/configs/integratorcp_cm1136_defconfig
+++ b/configs/integratorcp_cm1136_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_CP=y
 CONFIG_CM1136=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="Integrator-CP # "
diff --git a/configs/integratorcp_cm920t_defconfig b/configs/integratorcp_cm920t_defconfig
index d0ed78d..036b32e 100644
--- a/configs/integratorcp_cm920t_defconfig
+++ b/configs/integratorcp_cm920t_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_CP=y
 CONFIG_CM920T=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="Integrator-CP # "
diff --git a/configs/integratorcp_cm926ejs_defconfig b/configs/integratorcp_cm926ejs_defconfig
index 9aa8602..6fc2a84 100644
--- a/configs/integratorcp_cm926ejs_defconfig
+++ b/configs/integratorcp_cm926ejs_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_CP=y
 CONFIG_CM926EJ_S=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="Integrator-CP # "
diff --git a/configs/integratorcp_cm946es_defconfig b/configs/integratorcp_cm946es_defconfig
index ef9d7d6..e077a5e 100644
--- a/configs/integratorcp_cm946es_defconfig
+++ b/configs/integratorcp_cm946es_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_CP=y
 CONFIG_CM946ES=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="Integrator-CP # "
diff --git a/configs/ipam390_defconfig b/configs/ipam390_defconfig
index c053b38..c416340 100644
--- a/configs/ipam390_defconfig
+++ b/configs/ipam390_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot > "
diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig
index 7085469..14e1f05 100644
--- a/configs/jetson-tk1_defconfig
+++ b/configs/jetson-tk1_defconfig
@@ -14,3 +14,4 @@ CONFIG_SPI_FLASH=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Tegra124 (Jetson TK1) # "
diff --git a/configs/jornada_defconfig b/configs/jornada_defconfig
index 735c75f..65cbc2a 100644
--- a/configs/jornada_defconfig
+++ b/configs/jornada_defconfig
@@ -6,3 +6,4 @@ CONFIG_TARGET_JORNADA=y
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
 # CONFIG_CMD_MISC is not set
+CONFIG_SYS_PROMPT="HP Jornada# "
diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig
index f422886..c4cbadd 100644
--- a/configs/k2e_evm_defconfig
+++ b/configs/k2e_evm_defconfig
@@ -6,3 +6,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="K2E EVM # "
diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig
index 297183f..a604939 100644
--- a/configs/k2hk_evm_defconfig
+++ b/configs/k2hk_evm_defconfig
@@ -6,3 +6,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="K2HK EVM # "
diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig
index 7aa538d..a687e0c 100644
--- a/configs/k2l_evm_defconfig
+++ b/configs/k2l_evm_defconfig
@@ -6,3 +6,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="K2L EVM # "
diff --git a/configs/kwb_defconfig b/configs/kwb_defconfig
index 5bca811..928c4bf 100644
--- a/configs/kwb_defconfig
+++ b/configs/kwb_defconfig
@@ -14,3 +14,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
 # CONFIG_CMD_ITEST is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="U-Boot (BuR V2.0)# "
diff --git a/configs/kzm9g_defconfig b/configs/kzm9g_defconfig
index 3df79d4..0669bbc 100644
--- a/configs/kzm9g_defconfig
+++ b/configs/kzm9g_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
 CONFIG_RMOBILE=y
 CONFIG_TARGET_KZM9G=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="KZM-A9-GT# "
diff --git a/configs/ls2085a_emu_D4_defconfig b/configs/ls2085a_emu_D4_defconfig
index 9c82e17..bbc68a0 100644
--- a/configs/ls2085a_emu_D4_defconfig
+++ b/configs/ls2085a_emu_D4_defconfig
@@ -12,3 +12,4 @@ CONFIG_SYS_EXTRA_OPTIONS="EMU,SYS_FSL_DDR4"
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 # CONFIG_CMD_MISC is not set
+CONFIG_SYS_PROMPT="=> "
diff --git a/configs/ls2085a_emu_defconfig b/configs/ls2085a_emu_defconfig
index fa4a44e..5c198d0 100644
--- a/configs/ls2085a_emu_defconfig
+++ b/configs/ls2085a_emu_defconfig
@@ -12,3 +12,4 @@ CONFIG_SYS_EXTRA_OPTIONS="EMU"
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 # CONFIG_CMD_MISC is not set
+CONFIG_SYS_PROMPT="=> "
diff --git a/configs/ls2085a_simu_defconfig b/configs/ls2085a_simu_defconfig
index de9776d..31ca31c 100644
--- a/configs/ls2085a_simu_defconfig
+++ b/configs/ls2085a_simu_defconfig
@@ -12,3 +12,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SIMU"
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 # CONFIG_CMD_MISC is not set
+CONFIG_SYS_PROMPT="=> "
diff --git a/configs/ls2085aqds_defconfig b/configs/ls2085aqds_defconfig
index 00b062b..a7f2dcb 100644
--- a/configs/ls2085aqds_defconfig
+++ b/configs/ls2085aqds_defconfig
@@ -9,3 +9,4 @@ CONFIG_DM=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
+CONFIG_SYS_PROMPT="=> "
diff --git a/configs/ls2085aqds_nand_defconfig b/configs/ls2085aqds_nand_defconfig
index b9dd651..1479802 100644
--- a/configs/ls2085aqds_nand_defconfig
+++ b/configs/ls2085aqds_nand_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_LS2085AQDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,NAND"
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="=> "
diff --git a/configs/ls2085ardb_defconfig b/configs/ls2085ardb_defconfig
index c7dae4b..2006c2a 100644
--- a/configs/ls2085ardb_defconfig
+++ b/configs/ls2085ardb_defconfig
@@ -9,3 +9,4 @@ CONFIG_DM=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
+CONFIG_SYS_PROMPT="=> "
diff --git a/configs/ls2085ardb_nand_defconfig b/configs/ls2085ardb_nand_defconfig
index 8539307..dee7f3d 100644
--- a/configs/ls2085ardb_nand_defconfig
+++ b/configs/ls2085ardb_nand_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_LS2085ARDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,NAND"
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="=> "
diff --git a/configs/mcx_defconfig b/configs/mcx_defconfig
index 1d3e978..1f38640 100644
--- a/configs/mcx_defconfig
+++ b/configs/mcx_defconfig
@@ -7,3 +7,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="mcx # "
diff --git a/configs/medcom-wide_defconfig b/configs/medcom-wide_defconfig
index bb33542..c0ba9d1 100644
--- a/configs/medcom-wide_defconfig
+++ b/configs/medcom-wide_defconfig
@@ -13,3 +13,4 @@ CONFIG_SPL_DM=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Tegra20 (Medcom-Wide) # "
diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index 8355c67..5de1bcd 100644
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -6,3 +6,4 @@ CONFIG_SPL=y
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_OF_EMBED=y
+CONFIG_SYS_PROMPT="U-Boot-mONStR> "
diff --git a/configs/ml507_defconfig b/configs/ml507_defconfig
index 3f66c86..44b7c31 100644
--- a/configs/ml507_defconfig
+++ b/configs/ml507_defconfig
@@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x041000
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="ml507:/# "
diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig
index 0a6b7d6..d5d26cf 100644
--- a/configs/mt_ventoux_defconfig
+++ b/configs/mt_ventoux_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="mt_ventoux => "
diff --git a/configs/mx51_efikamx_defconfig b/configs/mx51_efikamx_defconfig
index 9c0deb1..a88c223 100644
--- a/configs/mx51_efikamx_defconfig
+++ b/configs/mx51_efikamx_defconfig
@@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_MX51_EFIKAMX,IMX_CONFIG=board/gene
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="Efika> "
diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig
index 47e5911..257c305 100644
--- a/configs/nas220_defconfig
+++ b/configs/nas220_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_NAS220=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="nas220> "
diff --git a/configs/nhk8815_defconfig b/configs/nhk8815_defconfig
index f9fac6f..218d92a 100644
--- a/configs/nhk8815_defconfig
+++ b/configs/nhk8815_defconfig
@@ -4,3 +4,4 @@ CONFIG_NOMADIK_NHK8815=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="Nomadik> "
diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig
index c40dadf..3dd24e0 100644
--- a/configs/nokia_rx51_defconfig
+++ b/configs/nokia_rx51_defconfig
@@ -10,3 +10,4 @@ CONFIG_AUTOBOOT_KEYED=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="Nokia RX-51 # "
diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig
index 79b74a7..590596e 100644
--- a/configs/nyan-big_defconfig
+++ b/configs/nyan-big_defconfig
@@ -20,3 +20,4 @@ CONFIG_VIDEO_TEGRA124=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Tegra124 (Nyan-big) # "
diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig
index 2b960d5..ad9bb61 100644
--- a/configs/odroid-xu3_defconfig
+++ b/configs/odroid-xu3_defconfig
@@ -7,3 +7,4 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos5422-odroidxu3"
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_SYS_PROMPT="ODROID-XU3 # "
diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig
index 3104f88..0a4f63b 100644
--- a/configs/odroid_defconfig
+++ b/configs/odroid_defconfig
@@ -21,3 +21,4 @@ CONFIG_DM_REGULATOR_MAX77686=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_ERRNO_STR=y
+CONFIG_SYS_PROMPT="Odroid # "
diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig
index 65b6f6a..de8fbd9 100644
--- a/configs/omap3_evm_defconfig
+++ b/configs/omap3_evm_defconfig
@@ -7,3 +7,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="OMAP3_EVM # "
diff --git a/configs/omap3_evm_quick_mmc_defconfig b/configs/omap3_evm_quick_mmc_defconfig
index 527b465..7d15b16 100644
--- a/configs/omap3_evm_quick_mmc_defconfig
+++ b/configs/omap3_evm_quick_mmc_defconfig
@@ -23,3 +23,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 # CONFIG_CMD_MISC is not set
+CONFIG_SYS_PROMPT="OMAP3_EVM # "
diff --git a/configs/omap3_evm_quick_nand_defconfig b/configs/omap3_evm_quick_nand_defconfig
index e3278b5..cd30134 100644
--- a/configs/omap3_evm_quick_nand_defconfig
+++ b/configs/omap3_evm_quick_nand_defconfig
@@ -23,3 +23,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 # CONFIG_CMD_MISC is not set
+CONFIG_SYS_PROMPT="OMAP3_EVM # "
diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
index b11d2e4..5d0ac9e 100644
--- a/configs/omap3_logic_defconfig
+++ b/configs/omap3_logic_defconfig
@@ -5,3 +5,4 @@ CONFIG_TARGET_OMAP3_LOGIC=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
+CONFIG_SYS_PROMPT="OMAP Logic # "
diff --git a/configs/omap3_mvblx_defconfig b/configs/omap3_mvblx_defconfig
index 415b02e..fb12a70 100644
--- a/configs/omap3_mvblx_defconfig
+++ b/configs/omap3_mvblx_defconfig
@@ -6,3 +6,4 @@ CONFIG_AUTOBOOT_STOP_STR="S"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="mvblx # "
diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig
index 8d55590..5d03485 100644
--- a/configs/omap3_overo_defconfig
+++ b/configs/omap3_overo_defconfig
@@ -8,3 +8,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="Overo # "
diff --git a/configs/omap3_pandora_defconfig b/configs/omap3_pandora_defconfig
index f18a520..4fb7899 100644
--- a/configs/omap3_pandora_defconfig
+++ b/configs/omap3_pandora_defconfig
@@ -8,3 +8,4 @@ CONFIG_TARGET_OMAP3_PANDORA=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="Pandora # "
diff --git a/configs/omap3_sdp3430_defconfig b/configs/omap3_sdp3430_defconfig
index df9e709..2e46091 100644
--- a/configs/omap3_sdp3430_defconfig
+++ b/configs/omap3_sdp3430_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_OMAP3_SDP3430=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="OMAP34XX SDP # "
diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig
index a49be95..4cff178 100644
--- a/configs/omapl138_lcdk_defconfig
+++ b/configs/omapl138_lcdk_defconfig
@@ -6,3 +6,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot > "
diff --git a/configs/origen_defconfig b/configs/origen_defconfig
index 6961978..d69d497 100644
--- a/configs/origen_defconfig
+++ b/configs/origen_defconfig
@@ -13,3 +13,4 @@ CONFIG_OF_CONTROL=y
 CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_SYS_PROMPT="ORIGEN # "
diff --git a/configs/palmld_defconfig b/configs/palmld_defconfig
index 8bf6c53..354071a 100644
--- a/configs/palmld_defconfig
+++ b/configs/palmld_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_PALMLD=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/palmtc_defconfig b/configs/palmtc_defconfig
index 4042466..de617e1 100644
--- a/configs/palmtc_defconfig
+++ b/configs/palmtc_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_PALMTC=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/paz00_defconfig b/configs/paz00_defconfig
index 60fb2d6..5cba318 100644
--- a/configs/paz00_defconfig
+++ b/configs/paz00_defconfig
@@ -13,3 +13,4 @@ CONFIG_SPL_DM=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Tegra20 (Paz00) MOD # "
diff --git a/configs/pb1000_defconfig b/configs/pb1000_defconfig
index 72756a7..c6221a3 100644
--- a/configs/pb1000_defconfig
+++ b/configs/pb1000_defconfig
@@ -10,3 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="PB1000"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Pb1x00 # "
diff --git a/configs/pcm030_defconfig b/configs/pcm030_defconfig
index df9309e..6305092 100644
--- a/configs/pcm030_defconfig
+++ b/configs/pcm030_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_PCM030=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="uboot> "
diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig
index c17fc73..fa58d3e 100644
--- a/configs/peach-pi_defconfig
+++ b/configs/peach-pi_defconfig
@@ -12,3 +12,4 @@ CONFIG_CROS_EC_SPI=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_SYS_PROMPT="Peach-Pi # "
diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig
index 8f21722..4dd58c9 100644
--- a/configs/peach-pit_defconfig
+++ b/configs/peach-pit_defconfig
@@ -12,3 +12,4 @@ CONFIG_CROS_EC_SPI=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_SYS_PROMPT="Peach-Pit # "
diff --git a/configs/pepper_defconfig b/configs/pepper_defconfig
index eb1b6cf..787c5f9 100644
--- a/configs/pepper_defconfig
+++ b/configs/pepper_defconfig
@@ -4,3 +4,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="pepper# "
diff --git a/configs/platinum_picon_defconfig b/configs/platinum_picon_defconfig
index 3484c46..64da7c4 100644
--- a/configs/platinum_picon_defconfig
+++ b/configs/platinum_picon_defconfig
@@ -5,3 +5,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6DL"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="picon > "
diff --git a/configs/platinum_titanium_defconfig b/configs/platinum_titanium_defconfig
index 6a2cacf..67957c3 100644
--- a/configs/platinum_titanium_defconfig
+++ b/configs/platinum_titanium_defconfig
@@ -5,3 +5,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="titanium > "
diff --git a/configs/plutux_defconfig b/configs/plutux_defconfig
index 8d96e33..07fa7f9 100644
--- a/configs/plutux_defconfig
+++ b/configs/plutux_defconfig
@@ -13,3 +13,4 @@ CONFIG_SPL_DM=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Tegra20 (Plutux) # "
diff --git a/configs/pm9261_defconfig b/configs/pm9261_defconfig
index 2c842b4..0a7716e 100644
--- a/configs/pm9261_defconfig
+++ b/configs/pm9261_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261"
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="pm9261> "
diff --git a/configs/pm9263_defconfig b/configs/pm9263_defconfig
index a065ce0..45e060b 100644
--- a/configs/pm9263_defconfig
+++ b/configs/pm9263_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263"
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="u-boot-pm9263> "
diff --git a/configs/pm9g45_defconfig b/configs/pm9g45_defconfig
index bbaeae8..3f34b3c 100644
--- a/configs/pm9g45_defconfig
+++ b/configs/pm9g45_defconfig
@@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G45"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/pogo_e02_defconfig b/configs/pogo_e02_defconfig
index f21237f..50a058e 100644
--- a/configs/pogo_e02_defconfig
+++ b/configs/pogo_e02_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_POGO_E02=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="PogoE02> "
diff --git a/configs/pr1_defconfig b/configs/pr1_defconfig
index b06babc..583f132 100644
--- a/configs/pr1_defconfig
+++ b/configs/pr1_defconfig
@@ -6,3 +6,4 @@ CONFIG_TARGET_PR1=y
 CONFIG_SPI_FLASH=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
 CONFIG_LIB_RAND=y
+CONFIG_SYS_PROMPT="pr1>"
diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
index 0bb42ff..41c2849 100644
--- a/configs/pxm2_defconfig
+++ b/configs/pxm2_defconfig
@@ -8,3 +8,4 @@ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot# "
diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig
index 2b126ac..7a3ac70 100644
--- a/configs/rastaban_defconfig
+++ b/configs/rastaban_defconfig
@@ -8,3 +8,4 @@ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot# "
diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
index 139189d..4b92045 100644
--- a/configs/rpi_2_defconfig
+++ b/configs/rpi_2_defconfig
@@ -6,3 +6,4 @@ CONFIG_TARGET_RPI_2=y
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_PHYS_TO_BUS=y
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
index db8da68..195ff99 100644
--- a/configs/rpi_defconfig
+++ b/configs/rpi_defconfig
@@ -6,3 +6,4 @@ CONFIG_TARGET_RPI=y
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_PHYS_TO_BUS=y
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/rut_defconfig b/configs/rut_defconfig
index da9dfe3..774957c 100644
--- a/configs/rut_defconfig
+++ b/configs/rut_defconfig
@@ -8,3 +8,4 @@ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot# "
diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig
index 7e03b9d..5c873f7 100644
--- a/configs/s5p_goni_defconfig
+++ b/configs/s5p_goni_defconfig
@@ -10,3 +10,4 @@ CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-goni"
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
 # CONFIG_CMD_MISC is not set
+CONFIG_SYS_PROMPT="Goni # "
diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig
index 21a4708..1a49978 100644
--- a/configs/s5pc210_universal_defconfig
+++ b/configs/s5pc210_universal_defconfig
@@ -12,3 +12,4 @@ CONFIG_OF_CONTROL=y
 CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_SYS_PROMPT="Universal # "
diff --git a/configs/scb9328_defconfig b/configs/scb9328_defconfig
index 3104586..c9c5034 100644
--- a/configs/scb9328_defconfig
+++ b/configs/scb9328_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_SCB9328=y
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="scb9328> "
diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
index 942f17e..54afbdb 100644
--- a/configs/seaboard_defconfig
+++ b/configs/seaboard_defconfig
@@ -13,3 +13,4 @@ CONFIG_SPL_DM=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Tegra20 (SeaBoard) # "
diff --git a/configs/secomx6quq7_defconfig b/configs/secomx6quq7_defconfig
index 0095ceb..c97172d 100644
--- a/configs/secomx6quq7_defconfig
+++ b/configs/secomx6quq7_defconfig
@@ -7,3 +7,4 @@ CONFIG_SECOMX6_2GB=y
 CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_MMC"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
+CONFIG_SYS_PROMPT="SECO MX6Q uQ7 U-Boot > "
diff --git a/configs/smdk2410_defconfig b/configs/smdk2410_defconfig
index 74bb9e3..51f348e 100644
--- a/configs/smdk2410_defconfig
+++ b/configs/smdk2410_defconfig
@@ -1,3 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SMDK2410=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="SMDK2410 # "
diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig
index 8412d6f..b8df6fb 100644
--- a/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@ -14,3 +14,4 @@ CONFIG_SOUND_MAX98095=y
 CONFIG_SOUND_WM8994=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_SYS_PROMPT="SMDK5250 # "
diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig
index a96b368..d1d75e2 100644
--- a/configs/smdk5420_defconfig
+++ b/configs/smdk5420_defconfig
@@ -8,3 +8,4 @@ CONFIG_SPL=y
 CONFIG_SPI_FLASH=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_SYS_PROMPT="SMDK5420 # "
diff --git a/configs/smdkc100_defconfig b/configs/smdkc100_defconfig
index 6c8359e..676781e 100644
--- a/configs/smdkc100_defconfig
+++ b/configs/smdkc100_defconfig
@@ -5,3 +5,4 @@ CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-smdkc100"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="SMDKC100 # "
diff --git a/configs/smdkv310_defconfig b/configs/smdkv310_defconfig
index 39dd5be..7833f62 100644
--- a/configs/smdkv310_defconfig
+++ b/configs/smdkv310_defconfig
@@ -10,3 +10,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_MISC is not set
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_SYS_PROMPT="SMDKV310 # "
diff --git a/configs/snapper9260_defconfig b/configs/snapper9260_defconfig
index d319a4f..31cc5a0 100644
--- a/configs/snapper9260_defconfig
+++ b/configs/snapper9260_defconfig
@@ -10,3 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="Snapper> "
diff --git a/configs/snow_defconfig b/configs/snow_defconfig
index 93fbcae..54efe1a 100644
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -18,3 +18,4 @@ CONFIG_SOUND_MAX98095=y
 CONFIG_SOUND_WM8994=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_SYS_PROMPT="snow # "
diff --git a/configs/snowball_defconfig b/configs/snowball_defconfig
index 31aa583..e73bc48 100644
--- a/configs/snowball_defconfig
+++ b/configs/snowball_defconfig
@@ -10,3 +10,4 @@ CONFIG_TARGET_SNOWBALL=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="U8500 $ "
diff --git a/configs/stamp9g20_defconfig b/configs/stamp9g20_defconfig
index 78c4775..40d6232 100644
--- a/configs/stamp9g20_defconfig
+++ b/configs/stamp9g20_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/stm32f429-discovery_defconfig b/configs/stm32f429-discovery_defconfig
index 188adc5..0c54d5b 100644
--- a/configs/stm32f429-discovery_defconfig
+++ b/configs/stm32f429-discovery_defconfig
@@ -1,3 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_STM32F429_DISCOVERY=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot > "
diff --git a/configs/stv0991_defconfig b/configs/stv0991_defconfig
index 3bdb1fc..f71206a 100644
--- a/configs/stv0991_defconfig
+++ b/configs/stv0991_defconfig
@@ -12,3 +12,4 @@ CONFIG_AUTOBOOT_STOP_STR=" "
 CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_OF_CONTROL=y
+CONFIG_SYS_PROMPT="STV0991> "
diff --git a/configs/stxgp3_defconfig b/configs/stxgp3_defconfig
index 86afe88..816092d 100644
--- a/configs/stxgp3_defconfig
+++ b/configs/stxgp3_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_STXGP3=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="GPPP=> "
diff --git a/configs/stxssa_defconfig b/configs/stxssa_defconfig
index c072417..ec812c1 100644
--- a/configs/stxssa_defconfig
+++ b/configs/stxssa_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_STXSSA=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="SSA=> "
diff --git a/configs/tao3530_defconfig b/configs/tao3530_defconfig
index ae4b49b..779f400 100644
--- a/configs/tao3530_defconfig
+++ b/configs/tao3530_defconfig
@@ -7,3 +7,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="TAO-3530 # "
diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig
index 3787493..838d0ed 100644
--- a/configs/taurus_defconfig
+++ b/configs/taurus_defconfig
@@ -11,3 +11,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,MACH_TYPE=2067,BOARD_TAURUS"
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/tb100_defconfig b/configs/tb100_defconfig
index cc8f527..acd1f3a 100644
--- a/configs/tb100_defconfig
+++ b/configs/tb100_defconfig
@@ -14,3 +14,4 @@ CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="[tb100]:~# "
diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
index f0e5106..745d32e 100644
--- a/configs/tbs2910_defconfig
+++ b/configs/tbs2910_defconfig
@@ -5,3 +5,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,
 # CONFIG_CMD_FLASH is not set
 CONFIG_DM=y
 CONFIG_DM_THERMAL=y
+CONFIG_SYS_PROMPT="Matrix U-Boot> "
diff --git a/configs/tec-ng_defconfig b/configs/tec-ng_defconfig
index e731205..4e8f5c6 100644
--- a/configs/tec-ng_defconfig
+++ b/configs/tec-ng_defconfig
@@ -14,3 +14,4 @@ CONFIG_SPI_FLASH=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Tegra30 (TEC-NG) # "
diff --git a/configs/tec_defconfig b/configs/tec_defconfig
index 3f815fe..84fa0be 100644
--- a/configs/tec_defconfig
+++ b/configs/tec_defconfig
@@ -13,3 +13,4 @@ CONFIG_SPL_DM=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Tegra20 (TEC) # "
diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig
index 8192b28..e2a6b0c 100644
--- a/configs/thuban_defconfig
+++ b/configs/thuban_defconfig
@@ -8,3 +8,4 @@ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot# "
diff --git a/configs/ti814x_evm_defconfig b/configs/ti814x_evm_defconfig
index ade4ea2..f7d1e11 100644
--- a/configs/ti814x_evm_defconfig
+++ b/configs/ti814x_evm_defconfig
@@ -4,3 +4,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot# "
diff --git a/configs/ti816x_evm_defconfig b/configs/ti816x_evm_defconfig
index 67e5e60..1fd2719 100644
--- a/configs/ti816x_evm_defconfig
+++ b/configs/ti816x_evm_defconfig
@@ -4,3 +4,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="u-boot/ti816x# "
diff --git a/configs/titanium_defconfig b/configs/titanium_defconfig
index e892d3e..d286fd6 100644
--- a/configs/titanium_defconfig
+++ b/configs/titanium_defconfig
@@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/barco/titanium/imximage.cfg"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="Titanium > "
diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig
index f3cbe6d..f0dd2b9 100644
--- a/configs/trats2_defconfig
+++ b/configs/trats2_defconfig
@@ -13,3 +13,4 @@ CONFIG_OF_CONTROL=y
 CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_SYS_PROMPT="Trats2 # "
diff --git a/configs/trats_defconfig b/configs/trats_defconfig
index 6553edb..6412f31 100644
--- a/configs/trats_defconfig
+++ b/configs/trats_defconfig
@@ -12,3 +12,4 @@ CONFIG_OF_CONTROL=y
 CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_SYS_PROMPT="Trats # "
diff --git a/configs/tricorder_defconfig b/configs/tricorder_defconfig
index cbd4dd3..1da9e94 100644
--- a/configs/tricorder_defconfig
+++ b/configs/tricorder_defconfig
@@ -9,3 +9,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="OMAP3 Tricorder # "
diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig
index 9d2fb2d..a1bcb11 100644
--- a/configs/trimslice_defconfig
+++ b/configs/trimslice_defconfig
@@ -14,3 +14,4 @@ CONFIG_SPI_FLASH=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Tegra20 (TrimSlice) # "
diff --git a/configs/tseries_mmc_defconfig b/configs/tseries_mmc_defconfig
index 9ed13b6..a083ee0 100644
--- a/configs/tseries_mmc_defconfig
+++ b/configs/tseries_mmc_defconfig
@@ -14,3 +14,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT"
 # CONFIG_CMD_ITEST is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="U-Boot (BuR V2.0)# "
diff --git a/configs/tseries_nand_defconfig b/configs/tseries_nand_defconfig
index 0b577edc..aa66a0e 100644
--- a/configs/tseries_nand_defconfig
+++ b/configs/tseries_nand_defconfig
@@ -14,3 +14,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND"
 # CONFIG_CMD_ITEST is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="U-Boot (BuR V2.0)# "
diff --git a/configs/tseries_spi_defconfig b/configs/tseries_spi_defconfig
index 1602a43..1cb90d6 100644
--- a/configs/tseries_spi_defconfig
+++ b/configs/tseries_spi_defconfig
@@ -15,3 +15,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,SPI_BOOT,EMMC_BOOT"
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot (BuR V2.0)# "
diff --git a/configs/tt01_defconfig b/configs/tt01_defconfig
index d23904d..08f9f7b 100644
--- a/configs/tt01_defconfig
+++ b/configs/tt01_defconfig
@@ -1,3 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_TT01=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="TT01> "
diff --git a/configs/twister_defconfig b/configs/twister_defconfig
index 7381665..c3edd34 100644
--- a/configs/twister_defconfig
+++ b/configs/twister_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="twister => "
diff --git a/configs/u8500_href_defconfig b/configs/u8500_href_defconfig
index 5a82ca8..0aebc78 100644
--- a/configs/u8500_href_defconfig
+++ b/configs/u8500_href_defconfig
@@ -10,3 +10,4 @@ CONFIG_TARGET_U8500_HREF=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="U8500 $ "
diff --git a/configs/usb_a9263_dataflash_defconfig b/configs/usb_a9263_dataflash_defconfig
index 5f3974e..8cf3c4c 100644
--- a/configs/usb_a9263_dataflash_defconfig
+++ b/configs/usb_a9263_dataflash_defconfig
@@ -10,3 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_ITEST is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/v5fx30teval_defconfig b/configs/v5fx30teval_defconfig
index 8173f3e..e77dce9 100644
--- a/configs/v5fx30teval_defconfig
+++ b/configs/v5fx30teval_defconfig
@@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x041000
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="v5fx30t:/# "
diff --git a/configs/vct_platinum_defconfig b/configs/vct_platinum_defconfig
index 81cf280..9a46dcb 100644
--- a/configs/vct_platinum_defconfig
+++ b/configs/vct_platinum_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_VCT=y
 CONFIG_VCT_PLATINUM=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/vct_platinum_onenand_defconfig b/configs/vct_platinum_onenand_defconfig
index 8d91aa5..8c8d69a 100644
--- a/configs/vct_platinum_onenand_defconfig
+++ b/configs/vct_platinum_onenand_defconfig
@@ -6,3 +6,4 @@ CONFIG_VCT_ONENAND=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/vct_platinum_onenand_small_defconfig b/configs/vct_platinum_onenand_small_defconfig
index 6eaec0c..4e6cbc7 100644
--- a/configs/vct_platinum_onenand_small_defconfig
+++ b/configs/vct_platinum_onenand_small_defconfig
@@ -17,3 +17,4 @@ CONFIG_VCT_SMALL_IMAGE=y
 # CONFIG_CMD_NFS is not set
 # CONFIG_CMD_MISC is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/vct_platinum_small_defconfig b/configs/vct_platinum_small_defconfig
index 088ab7e..f896822 100644
--- a/configs/vct_platinum_small_defconfig
+++ b/configs/vct_platinum_small_defconfig
@@ -14,3 +14,4 @@ CONFIG_VCT_SMALL_IMAGE=y
 # CONFIG_CMD_NFS is not set
 # CONFIG_CMD_MISC is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/vct_platinumavc_defconfig b/configs/vct_platinumavc_defconfig
index faeb6a2..6e867b2 100644
--- a/configs/vct_platinumavc_defconfig
+++ b/configs/vct_platinumavc_defconfig
@@ -5,3 +5,4 @@ CONFIG_VCT_PLATINUMAVC=y
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="VCT# "
diff --git a/configs/vct_platinumavc_onenand_defconfig b/configs/vct_platinumavc_onenand_defconfig
index 900a626..55f8c91 100644
--- a/configs/vct_platinumavc_onenand_defconfig
+++ b/configs/vct_platinumavc_onenand_defconfig
@@ -8,3 +8,4 @@ CONFIG_VCT_ONENAND=y
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/vct_platinumavc_onenand_small_defconfig b/configs/vct_platinumavc_onenand_small_defconfig
index e9928a0..343ab8f 100644
--- a/configs/vct_platinumavc_onenand_small_defconfig
+++ b/configs/vct_platinumavc_onenand_small_defconfig
@@ -17,3 +17,4 @@ CONFIG_VCT_SMALL_IMAGE=y
 # CONFIG_CMD_NFS is not set
 # CONFIG_CMD_MISC is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/vct_platinumavc_small_defconfig b/configs/vct_platinumavc_small_defconfig
index 719bd64..b4acc4a 100644
--- a/configs/vct_platinumavc_small_defconfig
+++ b/configs/vct_platinumavc_small_defconfig
@@ -14,3 +14,4 @@ CONFIG_VCT_SMALL_IMAGE=y
 # CONFIG_CMD_NFS is not set
 # CONFIG_CMD_MISC is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/vct_premium_defconfig b/configs/vct_premium_defconfig
index 7b04e7c..d71dd53 100644
--- a/configs/vct_premium_defconfig
+++ b/configs/vct_premium_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_VCT=y
 CONFIG_VCT_PREMIUM=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/vct_premium_onenand_defconfig b/configs/vct_premium_onenand_defconfig
index 769f8bd..6923db8 100644
--- a/configs/vct_premium_onenand_defconfig
+++ b/configs/vct_premium_onenand_defconfig
@@ -6,3 +6,4 @@ CONFIG_VCT_ONENAND=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/vct_premium_onenand_small_defconfig b/configs/vct_premium_onenand_small_defconfig
index c062a01..04a2855 100644
--- a/configs/vct_premium_onenand_small_defconfig
+++ b/configs/vct_premium_onenand_small_defconfig
@@ -17,3 +17,4 @@ CONFIG_VCT_SMALL_IMAGE=y
 # CONFIG_CMD_NFS is not set
 # CONFIG_CMD_MISC is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/vct_premium_small_defconfig b/configs/vct_premium_small_defconfig
index 4a5cdb0..265a6a5 100644
--- a/configs/vct_premium_small_defconfig
+++ b/configs/vct_premium_small_defconfig
@@ -14,3 +14,4 @@ CONFIG_VCT_SMALL_IMAGE=y
 # CONFIG_CMD_NFS is not set
 # CONFIG_CMD_MISC is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig
index 9ccd739..0bab477 100644
--- a/configs/venice2_defconfig
+++ b/configs/venice2_defconfig
@@ -14,3 +14,4 @@ CONFIG_SPI_FLASH=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Tegra124 (Venice2) # "
diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig
index f728585..d347317 100644
--- a/configs/ventana_defconfig
+++ b/configs/ventana_defconfig
@@ -13,3 +13,4 @@ CONFIG_SPL_DM=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Tegra20 (Ventana) # "
diff --git a/configs/vexpress_aemv8a_juno_defconfig b/configs/vexpress_aemv8a_juno_defconfig
index 0baaa91..3390f0e 100644
--- a/configs/vexpress_aemv8a_juno_defconfig
+++ b/configs/vexpress_aemv8a_juno_defconfig
@@ -15,3 +15,4 @@ CONFIG_DEFAULT_DEVICE_TREE="vexpress64"
 # CONFIG_CMD_MISC is not set
 CONFIG_DM=y
 CONFIG_DM_SERIAL=y
+CONFIG_SYS_PROMPT="VExpress64# "
diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig
index bf5576a..9890e64 100644
--- a/configs/vexpress_aemv8a_semi_defconfig
+++ b/configs/vexpress_aemv8a_semi_defconfig
@@ -16,3 +16,4 @@ CONFIG_DEFAULT_DEVICE_TREE="vexpress64"
 # CONFIG_CMD_MISC is not set
 CONFIG_DM=y
 CONFIG_DM_SERIAL=y
+CONFIG_SYS_PROMPT="VExpress64# "
diff --git a/configs/vision2_defconfig b/configs/vision2_defconfig
index afe3b3c..962dc5b 100644
--- a/configs/vision2_defconfig
+++ b/configs/vision2_defconfig
@@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/ttcontrol/vision2/imximage_hynix.cfg"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="Vision II U-boot > "
diff --git a/configs/vl_ma2sc_defconfig b/configs/vl_ma2sc_defconfig
index 7a66783..c908c6e 100644
--- a/configs/vl_ma2sc_defconfig
+++ b/configs/vl_ma2sc_defconfig
@@ -6,3 +6,4 @@ CONFIG_TARGET_VL_MA2SC=y
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/vpac270_nor_128_defconfig b/configs/vpac270_nor_128_defconfig
index bbc6e6a..1d11653 100644
--- a/configs/vpac270_nor_128_defconfig
+++ b/configs/vpac270_nor_128_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_VPAC270=y
 CONFIG_SYS_EXTRA_OPTIONS="NOR,RAM_128M"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/vpac270_nor_256_defconfig b/configs/vpac270_nor_256_defconfig
index 3f1ae1e..bcd1006 100644
--- a/configs/vpac270_nor_256_defconfig
+++ b/configs/vpac270_nor_256_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_VPAC270=y
 CONFIG_SYS_EXTRA_OPTIONS="NOR,RAM_256M"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/vpac270_ond_256_defconfig b/configs/vpac270_ond_256_defconfig
index 7500b7c..d989819 100644
--- a/configs/vpac270_ond_256_defconfig
+++ b/configs/vpac270_ond_256_defconfig
@@ -5,3 +5,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ONENAND,RAM_256M"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/whistler_defconfig b/configs/whistler_defconfig
index 43d725b..e3ce9fd 100644
--- a/configs/whistler_defconfig
+++ b/configs/whistler_defconfig
@@ -13,3 +13,4 @@ CONFIG_SPL_DM=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Tegra20 (Whistler) # "
diff --git a/configs/wireless_space_defconfig b/configs/wireless_space_defconfig
index 5551d27..63013f6 100644
--- a/configs/wireless_space_defconfig
+++ b/configs/wireless_space_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_WIRELESS_SPACE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+ONFIG_SYS_PROMPT="ws> "
diff --git a/configs/woodburn_defconfig b/configs/woodburn_defconfig
index 8dcf3e1..3b463c1 100644
--- a/configs/woodburn_defconfig
+++ b/configs/woodburn_defconfig
@@ -1,3 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_WOODBURN=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="woodburn U-Boot > "
diff --git a/configs/woodburn_sd_defconfig b/configs/woodburn_sd_defconfig
index 96a00b3..59f2ad0 100644
--- a/configs/woodburn_sd_defconfig
+++ b/configs/woodburn_sd_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_WOODBURN_SD=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/woodburn/imximage.cfg"
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="woodburn U-Boot > "
diff --git a/configs/x600_defconfig b/configs/x600_defconfig
index fdd4d3b..6be6cc3 100644
--- a/configs/x600_defconfig
+++ b/configs/x600_defconfig
@@ -7,3 +7,4 @@ CONFIG_AUTOBOOT_STOP_STR=" "
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_SYS_PROMPT="X600> "
diff --git a/configs/xilinx-ppc405-generic_defconfig b/configs/xilinx-ppc405-generic_defconfig
index 9dae755..98030d0 100644
--- a/configs/xilinx-ppc405-generic_defconfig
+++ b/configs/xilinx-ppc405-generic_defconfig
@@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x041000
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="xlx-ppc405:/# "
diff --git a/configs/xilinx-ppc440-generic_defconfig b/configs/xilinx-ppc440-generic_defconfig
index 398362b..de69773 100644
--- a/configs/xilinx-ppc440-generic_defconfig
+++ b/configs/xilinx-ppc440-generic_defconfig
@@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x041000
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="board:/# "
diff --git a/configs/xilinx_zynqmp_defconfig b/configs/xilinx_zynqmp_defconfig
index 1c64eea..000cc93 100644
--- a/configs/xilinx_zynqmp_defconfig
+++ b/configs/xilinx_zynqmp_defconfig
@@ -15,3 +15,4 @@ CONFIG_DEFAULT_DEVICE_TREE="zynqmp"
 # CONFIG_CMD_NFS is not set
 CONFIG_CMD_TIME=y
 CONFIG_CMD_TIMER=y
+CONFIG_SYS_PROMPT="ZynqMP> "
diff --git a/configs/zipitz2_defconfig b/configs/zipitz2_defconfig
index 3591849..2977ccc 100644
--- a/configs/zipitz2_defconfig
+++ b/configs/zipitz2_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_ZIPITZ2=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/zmx25_defconfig b/configs/zmx25_defconfig
index a34e827..c759cdf 100644
--- a/configs/zmx25_defconfig
+++ b/configs/zmx25_defconfig
@@ -5,3 +5,4 @@ CONFIG_AUTOBOOT_PROMPT="boot in %d s\n"
 CONFIG_AUTOBOOT_DELAY_STR="delaygs"
 CONFIG_AUTOBOOT_STOP_STR="stopgs"
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="zmx25> "
diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index a2468c3..5e15dd9 100644
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -88,7 +88,6 @@
 	""
 
 #define CONFIG_PRAM		512	/* 512 KB */
-#define CONFIG_SYS_PROMPT	"-> "
 #define CONFIG_SYS_LONGHELP	/* undef to save memory */
 
 #ifdef CONFIG_CMD_KGDB
diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h
index 2e86016..d1cadc0 100644
--- a/include/configs/M52277EVB.h
+++ b/include/configs/M52277EVB.h
@@ -150,7 +150,6 @@
 
 #define CONFIG_PRAM		2048	/* 2048 KB */
 
-#define CONFIG_SYS_PROMPT	"-> "
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 
 #if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index ae11e7d..1472672 100644
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -106,7 +106,6 @@
 	""
 
 #define CONFIG_PRAM		512	/* 512 KB */
-#define CONFIG_SYS_PROMPT		"-> "
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 
 #if defined(CONFIG_KGDB)
diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index d888c3e..006f2d8 100644
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -105,7 +105,6 @@
 	"save\0"				\
 	""
 
-#define CONFIG_SYS_PROMPT		"-> "
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 
 #if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h
index fa9b973..116e8e2 100644
--- a/include/configs/M5275EVB.h
+++ b/include/configs/M5275EVB.h
@@ -98,7 +98,6 @@
 #define CONFIG_SYS_I2C_PINMUX_CLR	(0xFFF0)
 #define CONFIG_SYS_I2C_PINMUX_SET	(0x000F)
 
-#define CONFIG_SYS_PROMPT		"-> "
 #define CONFIG_SYS_LONGHELP		/* undef to save memory	*/
 
 #if (CONFIG_CMD_KGDB)
diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index 860abe7..eff0aa6 100644
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -94,7 +94,6 @@
 	"save\0"				\
 	""
 
-#define CONFIG_SYS_PROMPT		"-> "
 #define	CONFIG_SYS_LONGHELP		/* undef to save memory         */
 
 #if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index 817b142..a48ae6b 100644
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -108,7 +108,6 @@
 	""
 
 #define CONFIG_PRAM		512	/* 512 KB */
-#define CONFIG_SYS_PROMPT	"-> "
 #define CONFIG_SYS_LONGHELP	/* undef to save memory */
 
 #ifdef CONFIG_CMD_KGDB
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index 4724a9c..e806b7a 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -102,7 +102,6 @@
 	""
 
 #define CONFIG_PRAM		512	/* 512 KB */
-#define CONFIG_SYS_PROMPT		"-> "
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 
 #ifdef CONFIG_CMD_KGDB
diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index 32afa44..1df98f7 100644
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -102,7 +102,6 @@
 	""
 
 #define CONFIG_PRAM		512	/* 512 KB */
-#define CONFIG_SYS_PROMPT		"-> "
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 
 #ifdef CONFIG_CMD_KGDB
diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
index 1f65918..db0ddcd 100644
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -216,7 +216,6 @@
 #define CONFIG_SYS_HUSH_PARSER		1
 #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
-#define CONFIG_SYS_PROMPT		"-> "
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 
 #if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h
index 2c08512..de747a4 100644
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@@ -160,7 +160,6 @@
 
 #define CONFIG_PRAM			2048	/* 2048 KB */
 
-#define CONFIG_SYS_PROMPT		"-> "
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 
 #if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index e82ba32..06da5f0 100644
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -219,7 +219,6 @@
 
 #define CONFIG_PRAM		2048	/* 2048 KB */
 
-#define CONFIG_SYS_PROMPT		"-> "
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 
 #if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h
index 3c1bb90..e30b645 100644
--- a/include/configs/M5475EVB.h
+++ b/include/configs/M5475EVB.h
@@ -146,7 +146,6 @@
 	""
 
 #define CONFIG_PRAM		512	/* 512 KB */
-#define CONFIG_SYS_PROMPT		"-> "
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 
 #ifdef CONFIG_CMD_KGDB
diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h
index 7e1b364..051c940 100644
--- a/include/configs/M5485EVB.h
+++ b/include/configs/M5485EVB.h
@@ -134,7 +134,6 @@
 	""
 
 #define CONFIG_PRAM		512	/* 512 KB */
-#define CONFIG_SYS_PROMPT		"-> "
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 
 #ifdef CONFIG_CMD_KGDB
diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index 32cb007..834786d 100644
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -544,12 +544,6 @@ boards, we say we have two, but don't display a message if we find only one. */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
 #define CONFIG_LOADADDR	800000	/* default location for tftp and bootm */
 
-#ifdef CONFIG_MPC8349ITX
-#define CONFIG_SYS_PROMPT "MPC8349E-mITX> "	/* Monitor Command Prompt */
-#else
-#define CONFIG_SYS_PROMPT "MPC8349E-mITX-GP> "	/* Monitor Command Prompt */
-#endif
-
 #if defined(CONFIG_CMD_KGDB)
 	#define CONFIG_SYS_CBSIZE	1024	/* Console I/O Buffer Size */
 #else
diff --git a/include/configs/PATI.h b/include/configs/PATI.h
index dfc4fc0..5d0e422 100644
--- a/include/configs/PATI.h
+++ b/include/configs/PATI.h
@@ -71,7 +71,6 @@
 #define CONFIG_PREBOOT
 
 #define	CONFIG_SYS_LONGHELP				/* undef to save memory		*/
-#define	CONFIG_SYS_PROMPT		"pati=> "		/* Monitor Command Prompt	*/
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024		/* Console I/O Buffer Size	*/
 #else
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index 0fa03cf..21a918a 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -871,7 +871,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_CMDLINE_EDITING			/* Command-line editing */
 #define CONFIG_AUTO_COMPLETE			/* add autocompletion support */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt */
 #ifdef CONFIG_CMD_KGDB
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
 #else
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index f99663a..7cdc4b9 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -876,7 +876,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_CMDLINE_EDITING			/* Command-line editing */
 #define CONFIG_AUTO_COMPLETE			/* add autocompletion support */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt */
 #ifdef CONFIG_CMD_KGDB
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
 #else
diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index bdedef5..76611b0 100644
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -550,7 +550,6 @@
 #define CONFIG_SYS_LONGHELP			/* undef to save memory */
 #define CONFIG_CMDLINE_EDITING			/* Command-line editing */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#define CONFIG_SYS_PROMPT	"B$ "		/* Monitor Command Prompt */
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
 #else
diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h
index 60c2948..5b2e092 100644
--- a/include/configs/VCMA9.h
+++ b/include/configs/VCMA9.h
@@ -140,7 +140,6 @@
 
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
-#define CONFIG_SYS_PROMPT		"VCMA9 # "
 #define CONFIG_SYS_CBSIZE		256
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h
index 8a5d1e6..f05d9ec 100644
--- a/include/configs/ac14xx.h
+++ b/include/configs/ac14xx.h
@@ -421,7 +421,6 @@
  */
 #define CONFIG_SYS_LONGHELP			/* undef to save memory */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
-#define CONFIG_SYS_PROMPT	"ac14xx> "	/* Monitor Command Prompt */
 
 #ifdef CONFIG_CMD_KGDB
 # define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
diff --git a/include/configs/adp-ag101.h b/include/configs/adp-ag101.h
index 4d52ba1..5a89f39 100644
--- a/include/configs/adp-ag101.h
+++ b/include/configs/adp-ag101.h
@@ -117,7 +117,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP			/* undef to save memory */
-#define CONFIG_SYS_PROMPT	"NDS32 # "	/* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
 
 /* Print Buffer Size */
diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h
index 06860b5..f5b20aa 100644
--- a/include/configs/adp-ag101p.h
+++ b/include/configs/adp-ag101p.h
@@ -117,7 +117,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP			/* undef to save memory */
-#define CONFIG_SYS_PROMPT	"NDS32 # "	/* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
 
 /* Print Buffer Size */
diff --git a/include/configs/adp-ag102.h b/include/configs/adp-ag102.h
index 026696c..c55dc71 100644
--- a/include/configs/adp-ag102.h
+++ b/include/configs/adp-ag102.h
@@ -180,7 +180,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP			/* undef to save memory */
-#define CONFIG_SYS_PROMPT	"NDS32 # "	/* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
 
 /* Print Buffer Size */
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index 6a0240b..18a214f 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -207,11 +207,8 @@
 /*
  * Miscellaneous configurable options
  */
-#define V_PROMPT			"AM3517_CRANE # "
-
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
-#define CONFIG_SYS_PROMPT		V_PROMPT
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index b90a60d..6e99aae 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -216,11 +216,8 @@
 /*
  * Miscellaneous configurable options
  */
-#define V_PROMPT			"AM3517_EVM # "
-
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
-#define CONFIG_SYS_PROMPT		V_PROMPT
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/amcore.h b/include/configs/amcore.h
index 45fd265..bbab8b2 100644
--- a/include/configs/amcore.h
+++ b/include/configs/amcore.h
@@ -26,7 +26,6 @@
 #define CONFIG_CMD_TIMER
 #define CONFIG_CMD_DIAG
 
-#define CONFIG_SYS_PROMPT		"amcore $ "
 /* undef to save memory	*/
 #undef	CONFIG_SYS_LONGHELP
 
diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index aba9ba6..ed8ff52 100644
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -12,7 +12,6 @@
 #include "tegra30-common.h"
 
 /* High-level configuration options */
-#define V_PROMPT			"Apalis T30 # "
 #define CONFIG_TEGRA_BOARD_STRING	"Toradex Apalis T30"
 
 /* Board-specific serial config */
diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index a0a26bb..1f1b013 100644
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -139,7 +139,6 @@
  * U-Boot general configurations
  */
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_PROMPT		"BIOS> "	/* prompt string */
 #define CONFIG_SYS_CBSIZE		2048		/* console I/O buffer */
 #define CONFIG_SYS_PBSIZE		\
 				(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
diff --git a/include/configs/arcangel4.h b/include/configs/arcangel4.h
index 6636e0e..a342d7e 100644
--- a/include/configs/arcangel4.h
+++ b/include/configs/arcangel4.h
@@ -67,7 +67,6 @@
  * Console configuration
  */
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_PROMPT		"arcangel4# "
 #define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/arndale.h b/include/configs/arndale.h
index 3ad4a9b..e590fa2 100644
--- a/include/configs/arndale.h
+++ b/include/configs/arndale.h
@@ -33,7 +33,6 @@
 #define CONFIG_EXYNOS_SPL
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_PROMPT		"ARNDALE # "
 #define CONFIG_DEFAULT_CONSOLE		"console=ttySAC2,115200n8\0"
 
 #define CONFIG_NR_DRAM_BANKS	8
diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index c6e1f56..1c3a1c9 100644
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -207,8 +207,6 @@
 #define CONFIG_BOOTARGS		" console=ttyS2,115200 rootfstype=romfs"\
 				" loaderversion=$loaderversion"
 
-#define CONFIG_SYS_PROMPT	"URMEL > "
-
 /* default RAM address for user programs */
 #define CONFIG_SYS_LOAD_ADDR	0x20000
 
diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h
index c2621ff..2bded45 100644
--- a/include/configs/at91-sama5_common.h
+++ b/include/configs/at91-sama5_common.h
@@ -66,7 +66,6 @@
 
 #define CONFIG_BAUDRATE			115200
 
-#define CONFIG_SYS_PROMPT		"U-Boot> "
 #define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h
index 6f1f65f..7e026ef 100644
--- a/include/configs/at91rm9200ek.h
+++ b/include/configs/at91rm9200ek.h
@@ -194,7 +194,6 @@
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT		"U-Boot> "
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 #define CONFIG_SYS_MAXARGS		16	/* max number of command args */
 /* Print Buffer Size */
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index e98cf0c..459b8f9 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -254,7 +254,6 @@
 	"root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait"
 #endif
 
-#define CONFIG_SYS_PROMPT		"U-Boot> "
 #define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 42461d2..9c595f2 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -201,7 +201,6 @@
 	"root=/dev/mtdblock7 rw rootfstype=jffs2"
 #endif
 
-#define CONFIG_SYS_PROMPT		"U-Boot> "
 #define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index 731c7f1..3eb0154 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -330,7 +330,6 @@
 	"root=/dev/mtdblock7 rw rootfstype=jffs2"
 #endif
 
-#define CONFIG_SYS_PROMPT		"U-Boot> "
 #define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index 09d8bec..4d90209 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -181,7 +181,6 @@
 
 #define CONFIG_BAUDRATE			115200
 
-#define CONFIG_SYS_PROMPT		"U-Boot> "
 #define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index a19d4d9..ea0a94b 100644
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -221,7 +221,6 @@
 
 #endif
 
-#define CONFIG_SYS_PROMPT	"U-Boot> "
 #define CONFIG_SYS_CBSIZE	256
 #define CONFIG_SYS_MAXARGS	16
 #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) \
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index e709f9c..f7a174e 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -184,7 +184,6 @@
 				"root=/dev/mmcblk0p2 rw rootwait"
 #endif
 
-#define CONFIG_SYS_PROMPT		"U-Boot> "
 #define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index b9a7754..9f76786 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -223,7 +223,6 @@
 
 #define CONFIG_BAUDRATE		115200
 
-#define CONFIG_SYS_PROMPT	"U-Boot> "
 #define CONFIG_SYS_CBSIZE	256
 #define CONFIG_SYS_MAXARGS	16
 #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) \
diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h
index 1cab0a9..c436fef 100644
--- a/include/configs/atngw100.h
+++ b/include/configs/atngw100.h
@@ -135,7 +135,6 @@
 #define CONFIG_SYS_BOOTPARAMS_LEN		(16 * 1024)
 
 /* Other configuration settings that shouldn't have to change all that often */
-#define CONFIG_SYS_PROMPT			"U-Boot> "
 #define CONFIG_SYS_CBSIZE			256
 #define CONFIG_SYS_MAXARGS			16
 #define CONFIG_SYS_PBSIZE			(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/atngw100mkii.h b/include/configs/atngw100mkii.h
index 486d9ee..3935811 100644
--- a/include/configs/atngw100mkii.h
+++ b/include/configs/atngw100mkii.h
@@ -156,7 +156,6 @@
 #define CONFIG_SYS_BOOTPARAMS_LEN	(16 * 1024)
 
 /* Other configuration settings that shouldn't have to change all that often */
-#define CONFIG_SYS_PROMPT		"U-Boot> "
 #define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h
index 1cd99e9..8cd7c35 100644
--- a/include/configs/atstk1002.h
+++ b/include/configs/atstk1002.h
@@ -151,7 +151,6 @@
 #define CONFIG_SYS_BOOTPARAMS_LEN		(16 * 1024)
 
 /* Other configuration settings that shouldn't have to change all that often */
-#define CONFIG_SYS_PROMPT			"U-Boot> "
 #define CONFIG_SYS_CBSIZE			256
 #define CONFIG_SYS_MAXARGS			16
 #define CONFIG_SYS_PBSIZE			(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/axs101.h b/include/configs/axs101.h
index 25116e5..7cb8853 100644
--- a/include/configs/axs101.h
+++ b/include/configs/axs101.h
@@ -155,7 +155,6 @@
  * Console configuration
  */
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_PROMPT		"AXS# "
 #define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/balloon3.h b/include/configs/balloon3.h
index 12c5a6c..124a766 100644
--- a/include/configs/balloon3.h
+++ b/include/configs/balloon3.h
@@ -64,6 +64,7 @@
 #define	CONFIG_SYS_HUSH_PARSER		1
 
 #define	CONFIG_SYS_LONGHELP
+#undef CONFIG_SYS_PROMPT
 #ifdef	CONFIG_SYS_HUSH_PARSER
 #define	CONFIG_SYS_PROMPT		"$ "
 #else
diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index c403729..348d9ef 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -25,7 +25,6 @@
 #define CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1
 
 /* High-level configuration options */
-#define V_PROMPT		"Tegra30 (Beaver) # "
 #define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Beaver"
 
 /* Board-specific serial config */
diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h
index 7e52d17..6674d28 100644
--- a/include/configs/bf537-minotaur.h
+++ b/include/configs/bf537-minotaur.h
@@ -159,7 +159,6 @@
 
 #define CONFIG_BOOTCOMMAND	"run ramboot"
 #define CONFIG_BOOTARGS	"root=/dev/mtdblock0 rw"
-#define CONFIG_SYS_PROMPT	"minotaur> "
 
 #define BOOT_ENV_SETTINGS \
 	"update=tftpboot $(loadaddr) u-boot.ldr;" \
diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h
index d8a0cc6..15d912e 100644
--- a/include/configs/bf537-srv1.h
+++ b/include/configs/bf537-srv1.h
@@ -158,7 +158,6 @@
 
 #define CONFIG_BOOTCOMMAND	"run flashboot"
 #define CONFIG_BOOTARGS	"root=/dev/mtdblock0 rw"
-#define CONFIG_SYS_PROMPT	"srv1> "
 
 #define BOOT_ENV_SETTINGS \
 	"update=tftpboot $(loadaddr) u-boot.ldr;" \
diff --git a/include/configs/bf561-acvilon.h b/include/configs/bf561-acvilon.h
index da28396..b3c6d29 100644
--- a/include/configs/bf561-acvilon.h
+++ b/include/configs/bf561-acvilon.h
@@ -153,7 +153,6 @@
  */
 #define CONFIG_UART_CONSOLE			0
 #define CONFIG_BAUDRATE				57600
-#define CONFIG_SYS_PROMPT "Acvilon> "
 
 /*
  * Pull in common ADI header for remaining command/environment setup
diff --git a/include/configs/br4.h b/include/configs/br4.h
index cbef809..959f9a9 100644
--- a/include/configs/br4.h
+++ b/include/configs/br4.h
@@ -127,7 +127,6 @@
 #define CONFIG_BAUDRATE		115200
 #define CONFIG_RTC_BFIN
 #define CONFIG_UART_CONSOLE	0
-#define CONFIG_SYS_PROMPT	"br4>"
 #define CONFIG_BOOTCOMMAND	"run nandboot"
 #define CONFIG_BOOTDELAY	2
 #define CONFIG_LOADADDR		0x2000000
diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h
index 1521415..838ef1f 100644
--- a/include/configs/bur_am335x_common.h
+++ b/include/configs/bur_am335x_common.h
@@ -129,7 +129,6 @@
  */
 #define CONFIG_SYS_MALLOC_LEN		(5120 << 10)
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT		"U-Boot (BuR V2.0)# "
 #define CONFIG_SYS_CONSOLE_INFO_QUIET
 #define CONFIG_ENV_OVERWRITE		/* Overwrite ethaddr / serial# */
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
diff --git a/include/configs/calimain.h b/include/configs/calimain.h
index 7d8bb47..c8b15fb 100644
--- a/include/configs/calimain.h
+++ b/include/configs/calimain.h
@@ -194,7 +194,6 @@
  * U-Boot general configuration
  */
 #define CONFIG_BOOTFILE        "uImage" /* Boot file name */
-#define CONFIG_SYS_PROMPT      "Calimain > " /* Command Prompt */
 #define CONFIG_SYS_CBSIZE      1024 /* Console I/O Buffer Size	*/
 #define CONFIG_SYS_PBSIZE      (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 #define CONFIG_SYS_MAXARGS     16 /* max number of command args */
diff --git a/include/configs/cam_enc_4xx.h b/include/configs/cam_enc_4xx.h
index 21e3a0c..918bd43 100644
--- a/include/configs/cam_enc_4xx.h
+++ b/include/configs/cam_enc_4xx.h
@@ -124,7 +124,6 @@
 
 /* U-Boot general configuration */
 #define CONFIG_BOOTFILE		"uImage"	/* Boot file name */
-#define CONFIG_SYS_PROMPT	"cam_enc_4xx> "	/* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size  */
 #define CONFIG_SYS_PBSIZE			/* Print buffer size */ \
 		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index 96dfe07..a62680b 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -25,7 +25,6 @@
 #define CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3
 
 /* High-level configuration options */
-#define V_PROMPT		"Tegra30 (Cardhu) # "
 #define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Cardhu"
 
 #define BOARD_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index dd06c05..f6b88fb 100644
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -88,7 +88,6 @@
 	   "else echo ERR: Fail to boot from mmc; fi"
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_PROMPT	       "CGT-QMX6-Quad U-Boot > "
 
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index bbd9f38..ddf6b5f 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -45,7 +45,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /* Shell */
-#define CONFIG_SYS_PROMPT	"CM-FX6 # "
 #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE + \
 					sizeof(CONFIG_SYS_PROMPT) + 16)
 
diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h
index 767ef3a..adf05b1 100644
--- a/include/configs/cm_t335.h
+++ b/include/configs/cm_t335.h
@@ -27,9 +27,6 @@
 #undef CONFIG_MAX_RAM_BANK_SIZE
 #define CONFIG_MAX_RAM_BANK_SIZE	(512 << 20)	/* 512MB */
 
-#undef CONFIG_SYS_PROMPT
-#define CONFIG_SYS_PROMPT		"CM-T335 # "
-
 #define CONFIG_OMAP_COMMON
 
 #define MACH_TYPE_CM_T335		4586	/* Until the next sync */
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index 41df106..a4590b3 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -222,7 +222,6 @@
 #define CONFIG_SYS_AUTOLOAD		"no"
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
-#define CONFIG_SYS_PROMPT		"CM-T3x # "
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h
index a8d0b97..b162762 100644
--- a/include/configs/cm_t3517.h
+++ b/include/configs/cm_t3517.h
@@ -227,7 +227,6 @@
 #define CONFIG_SYS_AUTOLOAD		"no"
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
-#define CONFIG_SYS_PROMPT		"CM-T3517 # "
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h
index 2a8b730..95a5a60 100644
--- a/include/configs/cm_t54.h
+++ b/include/configs/cm_t54.h
@@ -105,14 +105,12 @@
  * Miscellaneous configurable options
  */
 #undef CONFIG_SYS_AUTOLOAD
-#undef CONFIG_SYS_PROMPT
 #undef CONFIG_EXTRA_ENV_SETTINGS
 #undef CONFIG_BOOTCOMMAND
 #undef CONFIG_BOOTDELAY
 
 #define CONFIG_BOOTDELAY		3
 #define CONFIG_SYS_AUTOLOAD		"no"
-#define CONFIG_SYS_PROMPT		"CM-T54 # "
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
index 8a6106d..8e70d8c 100644
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -178,8 +178,6 @@ considered during boot */
 
 #endif
 
-#define CONFIG_SYS_PROMPT		"COBRA > "	/* Layout of u-boot prompt*/
-
 #define CONFIG_SYS_LOAD_ADDR		0x20000		/*Defines default RAM address
 from which user programs will be started */
 
diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
index e3f0ab0..a1b64c6 100644
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -81,6 +81,7 @@
 #define	CONFIG_SYS_HUSH_PARSER		1
 
 #undef	CONFIG_SYS_LONGHELP		/* Saves 10 KB */
+#undef CONFIG_SYS_PROMPT
 #ifdef	CONFIG_SYS_HUSH_PARSER
 #define	CONFIG_SYS_PROMPT		"$ "
 #else
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index 8228e42..078c913 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -10,7 +10,6 @@
 #include "tegra20-common.h"
 
 /* High-level configuration options */
-#define V_PROMPT			"Colibri T20 # "
 #define CONFIG_TEGRA_BOARD_STRING	"Toradex Colibri T20"
 
 /* Board-specific serial config */
diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index 4655668..40bccd2 100644
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -12,7 +12,6 @@
 #include "tegra30-common.h"
 
 /* High-level configuration options */
-#define V_PROMPT			"Colibri T30 # "
 #define CONFIG_TEGRA_BOARD_STRING	"Toradex Colibri T30"
 
 /* Board-specific serial config */
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index f2f8e2e..1d01c5c 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -177,7 +177,6 @@
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
 #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#define CONFIG_SYS_PROMPT		"Colibri VFxx # "
 #undef CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE		\
diff --git a/include/configs/corvus.h b/include/configs/corvus.h
index 3cfae21..2d2f3c1 100644
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -133,7 +133,6 @@
 
 #define CONFIG_BAUDRATE			115200
 
-#define CONFIG_SYS_PROMPT		"U-Boot> "
 #define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE +	\
diff --git a/include/configs/cpu9260.h b/include/configs/cpu9260.h
index d3c6f75..82f4fe7 100644
--- a/include/configs/cpu9260.h
+++ b/include/configs/cpu9260.h
@@ -464,11 +464,6 @@
 
 #define CONFIG_BAUDRATE			115200
 
-#if defined(CONFIG_CPU9G20)
-#define CONFIG_SYS_PROMPT		"CPU9G20=> "
-#elif defined(CONFIG_CPU9260)
-#define CONFIG_SYS_PROMPT		"CPU9260=> "
-#endif
 #define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_PBSIZE		\
diff --git a/include/configs/cpuat91.h b/include/configs/cpuat91.h
index f990cf7..29cd842 100644
--- a/include/configs/cpuat91.h
+++ b/include/configs/cpuat91.h
@@ -173,7 +173,6 @@
 
 #define CONFIG_BAUDRATE			115200
 
-#define CONFIG_SYS_PROMPT		"CPUAT91=> "
 #define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		32
 #define CONFIG_SYS_PBSIZE		\
diff --git a/include/configs/da830evm.h b/include/configs/da830evm.h
index 729b6e7..5826a58 100644
--- a/include/configs/da830evm.h
+++ b/include/configs/da830evm.h
@@ -143,7 +143,6 @@
 #undef CONFIG_MISC_INIT_R
 #undef CONFIG_BOOTDELAY
 #define CONFIG_BOOTFILE		"uImage" /* Boot file name */
-#define CONFIG_SYS_PROMPT	"U-Boot > " /* Command Prompt */
 #define CONFIG_SYS_CBSIZE	1024 /* Console I/O Buffer Size	*/
 #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 #define CONFIG_SYS_MAXARGS	16 /* max number of command args */
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 3da9da4..1cd11c0 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -262,7 +262,6 @@
 #define CONFIG_MISC_INIT_R
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOOTFILE		"uImage" /* Boot file name */
-#define CONFIG_SYS_PROMPT	"U-Boot > " /* Command Prompt */
 #define CONFIG_SYS_CBSIZE	1024 /* Console I/O Buffer Size	*/
 #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 #define CONFIG_SYS_MAXARGS	16 /* max number of command args */
diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h
index 89b6f23..24e368a 100644
--- a/include/configs/dalmore.h
+++ b/include/configs/dalmore.h
@@ -22,7 +22,6 @@
 #include "tegra114-common.h"
 
 /* High-level configuration options */
-#define V_PROMPT		"Tegra114 (Dalmore) # "
 #define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Dalmore"
 
 /* Board-specific serial config */
diff --git a/include/configs/davinci_dm355evm.h b/include/configs/davinci_dm355evm.h
index 847d788..7a9ce64 100644
--- a/include/configs/davinci_dm355evm.h
+++ b/include/configs/davinci_dm355evm.h
@@ -110,7 +110,6 @@
 
 /* U-Boot general configuration */
 #define CONFIG_BOOTFILE		"uImage"	/* Boot file name */
-#define CONFIG_SYS_PROMPT	"DM355 EVM # "	/* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size  */
 #define CONFIG_SYS_PBSIZE			/* Print buffer size */ \
 		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/davinci_dm355leopard.h b/include/configs/davinci_dm355leopard.h
index d4b994a..e3ff943 100644
--- a/include/configs/davinci_dm355leopard.h
+++ b/include/configs/davinci_dm355leopard.h
@@ -78,7 +78,6 @@
 
 /* U-Boot general configuration */
 #define CONFIG_BOOTFILE		"uImage"	/* Boot file name */
-#define CONFIG_SYS_PROMPT	"DM355 LEOPARD # "
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size  */
 #define CONFIG_SYS_PBSIZE			/* Print buffer size */ \
 		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/davinci_dm365evm.h b/include/configs/davinci_dm365evm.h
index 8b42c50..573c1b0 100644
--- a/include/configs/davinci_dm365evm.h
+++ b/include/configs/davinci_dm365evm.h
@@ -143,7 +143,6 @@
 
 /* U-Boot general configuration */
 #define CONFIG_BOOTFILE		"uImage"	/* Boot file name */
-#define CONFIG_SYS_PROMPT	"DM36x EVM # "	/* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size  */
 #define CONFIG_SYS_PBSIZE			/* Print buffer size */ \
 		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/davinci_dm6467evm.h b/include/configs/davinci_dm6467evm.h
index 8571cbd..6346422 100644
--- a/include/configs/davinci_dm6467evm.h
+++ b/include/configs/davinci_dm6467evm.h
@@ -94,7 +94,6 @@ extern unsigned int davinci_arm_clk_get(void);
 /* U-Boot general configuration */
 #define CONFIG_BOOTDELAY	3
 #define CONFIG_BOOTFILE		"uImage"	/* Boot file name */
-#define CONFIG_SYS_PROMPT	"DM6467 EVM > "	/* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size  */
 #define CONFIG_SYS_PBSIZE		\
 			(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/davinci_dvevm.h b/include/configs/davinci_dvevm.h
index 6108736..6f73339 100644
--- a/include/configs/davinci_dvevm.h
+++ b/include/configs/davinci_dvevm.h
@@ -143,7 +143,6 @@
 #define CONFIG_MISC_INIT_R
 #undef CONFIG_BOOTDELAY
 #define CONFIG_BOOTFILE		"uImage"	/* Boot file name */
-#define CONFIG_SYS_PROMPT		"U-Boot > "	/* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE		1024		/* Console I/O Buffer Size  */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)	/* Print buffer sz */
 #define CONFIG_SYS_MAXARGS		16		/* max number of command args */
diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h
index db636e4..bc5e1ca 100644
--- a/include/configs/davinci_schmoogie.h
+++ b/include/configs/davinci_schmoogie.h
@@ -87,7 +87,6 @@
 #define CONFIG_MISC_INIT_R
 #undef CONFIG_BOOTDELAY
 #define CONFIG_BOOTFILE		"uImage"	/* Boot file name */
-#define CONFIG_SYS_PROMPT		"U-Boot > "	/* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE		1024		/* Console I/O Buffer Size  */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)	/* Print buffer sz */
 #define CONFIG_SYS_MAXARGS		16		/* max number of command args */
diff --git a/include/configs/davinci_sffsdr.h b/include/configs/davinci_sffsdr.h
index 9ecf6ce..e719388 100644
--- a/include/configs/davinci_sffsdr.h
+++ b/include/configs/davinci_sffsdr.h
@@ -74,7 +74,6 @@
 #define CONFIG_MISC_INIT_R
 #define CONFIG_BOOTDELAY	5		/* Autoboot after 5 seconds. */
 #define CONFIG_BOOTFILE		"uImage"	/* Boot file name */
-#define CONFIG_SYS_PROMPT		"U-Boot > "	/* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE		1024		/* Console I/O Buffer Size  */
 #define CONFIG_SYS_PBSIZE							\
 		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)	/* Print buffer size */
diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h
index 410cf68..b85c988 100644
--- a/include/configs/davinci_sonata.h
+++ b/include/configs/davinci_sonata.h
@@ -133,7 +133,6 @@
 #define CONFIG_MISC_INIT_R
 #undef CONFIG_BOOTDELAY
 #define CONFIG_BOOTFILE		"uImage"	/* Boot file name */
-#define CONFIG_SYS_PROMPT		"U-Boot > "	/* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE		1024		/* Console I/O Buffer Size  */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)	/* Print buffer sz */
 #define CONFIG_SYS_MAXARGS		16		/* max number of command args */
diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index 0abab78..46e3a6c 100644
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -98,8 +98,6 @@
  */
 #define	CONFIG_SYS_LONGHELP				/* undef to save memory      */
 
-#define	CONFIG_SYS_PROMPT		"DbAu1xx0 # "	/* Monitor Command Prompt    */
-
 #define	CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size   */
 #define	CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)  /* Print Buffer Size */
 #define	CONFIG_SYS_MAXARGS		16		/* max number of command args*/
diff --git a/include/configs/dig297.h b/include/configs/dig297.h
index f6d7ec4..fa24af7 100644
--- a/include/configs/dig297.h
+++ b/include/configs/dig297.h
@@ -208,7 +208,6 @@
  */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
-#define CONFIG_SYS_PROMPT		"DIG297# "
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h
index b27b202..a62f4e3 100644
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
@@ -43,9 +43,6 @@
  */
 #include "mv-common.h"
 
-#undef CONFIG_SYS_PROMPT	/* previously defined in mv-common.h */
-#define CONFIG_SYS_PROMPT	"DockStar> "	/* Command Prompt */
-
 /*
  *  Environment variables configurations
  */
diff --git a/include/configs/duovero.h b/include/configs/duovero.h
index 6e53da5..28d12ad 100644
--- a/include/configs/duovero.h
+++ b/include/configs/duovero.h
@@ -27,9 +27,6 @@
 #define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION
 #define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
 
-#undef CONFIG_SYS_PROMPT
-#define CONFIG_SYS_PROMPT		"duovero # "
-
 /* USB UHH support options */
 #define CONFIG_CMD_USB
 #define CONFIG_USB_HOST
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index b9f28a3..9a70aae 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -122,7 +122,6 @@
  * U-Boot general configuration
  */
 #define CONFIG_BOOTFILE		"uImage" /* Boot file name */
-#define CONFIG_SYS_PROMPT	"ea20 > " /* Command Prompt */
 #define CONFIG_SYS_CBSIZE	1024 /* Console I/O Buffer Size	*/
 #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 #define CONFIG_SYS_MAXARGS	16 /* max number of command args */
diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h
index 924362c..f9ec028 100644
--- a/include/configs/eb_cpu5282.h
+++ b/include/configs/eb_cpu5282.h
@@ -73,7 +73,6 @@
 #define CONFIG_MCFTMR
 
 #define CONFIG_BOOTDELAY	5
-#define CONFIG_SYS_PROMPT	"\nEB+CPU5282> "
 #define	CONFIG_SYS_LONGHELP	1
 
 #define	CONFIG_SYS_CBSIZE	1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/eb_cpux9k2.h b/include/configs/eb_cpux9k2.h
index 271e071..d27f7e0 100644
--- a/include/configs/eb_cpux9k2.h
+++ b/include/configs/eb_cpux9k2.h
@@ -44,7 +44,6 @@
 #define CONFIG_BOOT_RETRY_TIME		30
 #define CONFIG_CMDLINE_EDITING
 
-#define CONFIG_SYS_PROMPT	"U-Boot> "	/* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE	512		/* Console I/O Buffer Size */
 #define CONFIG_SYS_MAXARGS	32		/* max number of command args */
 #define CONFIG_SYS_PBSIZE	\
diff --git a/include/configs/eco5pk.h b/include/configs/eco5pk.h
index 49c53e4..f23d383 100644
--- a/include/configs/eco5pk.h
+++ b/include/configs/eco5pk.h
@@ -37,12 +37,6 @@
 #define CONFIG_AUTO_COMPLETE
 
 /*
- * Miscellaneous configurable options
- */
-#define V_PROMPT		"ECO5-PK # "
-#define CONFIG_SYS_PROMPT	V_PROMPT
-
-/*
  * Set its own mtdparts, different from common
  */
 #undef MTDIDS_DEFAULT
diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h
index 87b29f8..efe2a9d 100644
--- a/include/configs/edb93xx.h
+++ b/include/configs/edb93xx.h
@@ -39,7 +39,7 @@
 
 #define CONFIG_SYS_LDSCRIPT	"board/cirrus/edb93xx/u-boot.lds"
 
-
+#undef CONFIG_SYS_PROMPT
 #ifdef CONFIG_EDB9301
 #define CONFIG_EP9301
 #define CONFIG_MACH_TYPE		MACH_TYPE_EDB9301
diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index b5e8e0e..8b38d7e 100644
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -130,7 +130,6 @@
 #define CONFIG_INITRD_TAG	1	/* enable INITRD tag */
 #define CONFIG_SETUP_MEMORY_TAGS 1	/* enable memory tag */
 
-#define	CONFIG_SYS_PROMPT	"EDMiniV2> "	/* Command Prompt */
 #define	CONFIG_SYS_CBSIZE	1024	/* Console I/O Buff Size */
 #define	CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE \
 		+sizeof(CONFIG_SYS_PROMPT) + 16)	/* Print Buff */
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index c7b1e5c..b49b903 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -237,7 +237,6 @@
 #endif
 
 /* Misc. u-boot settings */
-#define CONFIG_SYS_PROMPT		"U-Boot> "
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
diff --git a/include/configs/flea3.h b/include/configs/flea3.h
index 5d66901..5b4b011 100644
--- a/include/configs/flea3.h
+++ b/include/configs/flea3.h
@@ -108,7 +108,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP	/* undef to save memory */
-#define CONFIG_SYS_PROMPT	"flea3 U-Boot > "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_HUSH_PARSER	/* Use the HUSH parser */
 
diff --git a/include/configs/fx12mm.h b/include/configs/fx12mm.h
index f1cbc8e..fa32a2e 100644
--- a/include/configs/fx12mm.h
+++ b/include/configs/fx12mm.h
@@ -37,7 +37,6 @@
 #define CONFIG_ENV_OVERWRITE 	1
 
 /*Misc*/
-#define CONFIG_SYS_PROMPT	"FX12MM:/# " /* Monitor Command Prompt */
 #define CONFIG_PREBOOT      	"echo U-Boot is up and running;"
 
 /*Flash*/
diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h
index 967a05a..2a42e7c 100644
--- a/include/configs/goflexhome.h
+++ b/include/configs/goflexhome.h
@@ -70,9 +70,6 @@
  */
 #include "mv-common.h"
 
-#undef CONFIG_SYS_PROMPT	/* previously defined in mv-common.h */
-#define CONFIG_SYS_PROMPT	"GoFlexHome> "	/* Command Prompt */
-
 /*
  *  Environment variables configurations
  */
diff --git a/include/configs/grasshopper.h b/include/configs/grasshopper.h
index 231f25a..274175b 100644
--- a/include/configs/grasshopper.h
+++ b/include/configs/grasshopper.h
@@ -144,7 +144,6 @@
 #define CONFIG_SYS_BOOTPARAMS_LEN	(16 * 1024)
 
 /* Other configuration settings that shouldn't have to change all that often */
-#define CONFIG_SYS_PROMPT		"U-Boot> "
 #define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 902ec2c..78fe136 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -231,7 +231,6 @@
 #define CONFIG_IMX_VIDEO_SKIP
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_PROMPT	             "Ventana > "
 #define CONFIG_HWCONFIG
 
 /* Print Buffer Size */
diff --git a/include/configs/h2200.h b/include/configs/h2200.h
index 1d2d09a..e8dfa74 100644
--- a/include/configs/h2200.h
+++ b/include/configs/h2200.h
@@ -123,7 +123,6 @@
 #define CONFIG_INITRD_TAG
 
 /* Monitor Command Prompt */
-#define CONFIG_SYS_PROMPT		"> "
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_PROMPT_HUSH_PS2	"$ "
 
diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index 99a63d6..e0bc7c0 100644
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -12,7 +12,6 @@
 #include "tegra20-common.h"
 
 /* High-level configuration options */
-#define V_PROMPT		"Tegra20 (Harmony) # "
 #define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Harmony"
 
 /* Board-specific serial config */
diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h
index 08e2f42..558edfc 100644
--- a/include/configs/hrcon.h
+++ b/include/configs/hrcon.h
@@ -484,7 +484,6 @@ int fpga_gpio_get(unsigned int bus, int pin);
  */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_SYS_LOAD_ADDR		0x2000000 /* default load address */
-#define CONFIG_SYS_PROMPT		"=> "	/* Monitor Command Prompt */
 #define CONFIG_SYS_HZ		1000	/* decrementer freq: 1ms ticks */
 
 #undef CONFIG_ZERO_BOOTDELAY_CHECK	/* ignore keypress on bootdelay==0 */
diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
index ee52452..6afe340 100644
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
@@ -59,9 +59,6 @@
  */
 #include "mv-common.h"
 
-#undef CONFIG_SYS_PROMPT
-#define CONFIG_SYS_PROMPT	"ib62x0 => "
-
 /*
  * Environment variables configuration
  */
diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h
index 1a5c93d..bce97dc 100644
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
@@ -52,9 +52,6 @@
  */
 #include "mv-common.h"
 
-#undef CONFIG_SYS_PROMPT
-#define CONFIG_SYS_PROMPT	"iconnect => "
-
 /*
  * Environment variables configuration
  */
diff --git a/include/configs/ima3-mx53.h b/include/configs/ima3-mx53.h
index 5a02917..2fa6c3d 100644
--- a/include/configs/ima3-mx53.h
+++ b/include/configs/ima3-mx53.h
@@ -94,7 +94,6 @@
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
-#define CONFIG_SYS_PROMPT		"IMA3 MX53 U-Boot > "
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 
diff --git a/include/configs/imx31_litekit.h b/include/configs/imx31_litekit.h
index c552e9f..23e3a6c 100644
--- a/include/configs/imx31_litekit.h
+++ b/include/configs/imx31_litekit.h
@@ -101,7 +101,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
-#define CONFIG_SYS_PROMPT		"uboot> "
 #define CONFIG_SYS_CBSIZE		256  /* Console I/O Buffer Size */
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index 54e8121..86f327c 100644
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -102,7 +102,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
-#define CONFIG_SYS_PROMPT		"uboot> "
 /* Console I/O Buffer Size */
 #define CONFIG_SYS_CBSIZE		256
 /* Print Buffer Size */
diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h
index c76ebcb..5e3ed8e 100644
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -47,11 +47,6 @@
 #define CONFIG_BOOTARGS		"root=/dev/mtdblock0 console=ttyAM0 console=tty"
 #define CONFIG_BOOTCOMMAND	""
 
-/*
- * Miscellaneous configurable options
- */
-#define CONFIG_SYS_PROMPT	"Integrator-AP # "	/* Monitor Command Prompt   */
-
 /* Flash settings */
 #define CONFIG_SYS_FLASH_SIZE		0x02000000 /* 32 MiB */
 #define CONFIG_SYS_MAX_FLASH_SECT	128
diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h
index d6f2602..5391ae6 100644
--- a/include/configs/integratorcp.h
+++ b/include/configs/integratorcp.h
@@ -50,8 +50,6 @@
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_SYS_PROMPT	"Integrator-CP # "	/* Monitor Command Prompt */
-
 #define PHYS_FLASH_SIZE			0x01000000	/* 16MB */
 #define CONFIG_SYS_MAX_FLASH_SECT	64
 #define CONFIG_ENV_IS_IN_FLASH	1
diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h
index e68b661..b1cd7df 100644
--- a/include/configs/ipam390.h
+++ b/include/configs/ipam390.h
@@ -207,7 +207,6 @@
 #define CONFIG_MISC_INIT_R
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOOTFILE		"uImage" /* Boot file name */
-#define CONFIG_SYS_PROMPT	"U-Boot > " /* Command Prompt */
 #define CONFIG_SYS_CBSIZE	1024 /* Console I/O Buffer Size	*/
 #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 #define CONFIG_SYS_MAXARGS	16 /* max number of command args */
diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index 3bbff28..a16239b 100644
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -16,7 +16,6 @@
 #include "tegra124-common.h"
 
 /* High-level configuration options */
-#define V_PROMPT			"Tegra124 (Jetson TK1) # "
 #define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Jetson TK1"
 
 /* Board-specific serial config */
diff --git a/include/configs/jornada.h b/include/configs/jornada.h
index 71f2ee1..3090476 100644
--- a/include/configs/jornada.h
+++ b/include/configs/jornada.h
@@ -55,7 +55,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP	/* undef to save memory */
-#define CONFIG_SYS_PROMPT		"HP Jornada# "
 #define CONFIG_SYS_CBSIZE		256	/* console buffsize */
 #define CONFIG_SYS_PBSIZE		(256+sizeof(CONFIG_SYS_PROMPT)+16)
 #define CONFIG_SYS_MAXARGS		16	/* max number of command args */
diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h
index a28ceb7..d3ccf60 100644
--- a/include/configs/k2e_evm.h
+++ b/include/configs/k2e_evm.h
@@ -15,8 +15,6 @@
 #define CONFIG_K2E_EVM
 
 /* U-Boot general configuration */
-#define CONFIG_SYS_PROMPT               "K2E EVM # "
-
 #define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS				\
 	"addr_mon=0x0c140000\0"						\
 	"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs "	\
diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h
index eae7721..93487de 100644
--- a/include/configs/k2hk_evm.h
+++ b/include/configs/k2hk_evm.h
@@ -15,8 +15,6 @@
 #define CONFIG_K2HK_EVM
 
 /* U-Boot general configuration */
-#define CONFIG_SYS_PROMPT               "K2HK EVM # "
-
 #define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS				\
 	"addr_mon=0x0c5f0000\0"						\
 	"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs "	\
diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h
index 57da057..bf03386 100644
--- a/include/configs/k2l_evm.h
+++ b/include/configs/k2l_evm.h
@@ -15,8 +15,6 @@
 #define CONFIG_K2L_EVM
 
 /* U-Boot general configuration */
-#define CONFIG_SYS_PROMPT		"K2L EVM # "
-
 #define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS				\
 	"addr_mon=0x0c140000\0"						\
 	"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs "	\
diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index 93c2976..8a451ec 100644
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -53,7 +53,6 @@
 
 /* prompt */
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_PROMPT		"KZM-A9-GT# "
 #define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_PBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
diff --git a/include/configs/lp8x4x.h b/include/configs/lp8x4x.h
index e9ee3fb..10a7b05 100644
--- a/include/configs/lp8x4x.h
+++ b/include/configs/lp8x4x.h
@@ -97,6 +97,7 @@
 #define	CONFIG_SYS_HUSH_PARSER		1
 
 #define	CONFIG_SYS_LONGHELP
+#undef CONFIG_SYS_PROMPT
 #ifdef	CONFIG_SYS_HUSH_PARSER
 #define	CONFIG_SYS_PROMPT		"$ "
 #else
diff --git a/include/configs/ls2085a_common.h b/include/configs/ls2085a_common.h
index 5afee55..39fb464 100644
--- a/include/configs/ls2085a_common.h
+++ b/include/configs/ls2085a_common.h
@@ -260,7 +260,6 @@ unsigned long long get_qixis_addr(void);
 
 /* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
-#define CONFIG_SYS_PROMPT		"=> "
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 					sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_HUSH_PARSER
diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h
index ddbf5ce..1837258 100644
--- a/include/configs/lsxl.h
+++ b/include/configs/lsxl.h
@@ -88,7 +88,6 @@
 #define CONFIG_SF_DEFAULT_SPEED		25000000
 
 
-#undef CONFIG_SYS_PROMPT
 #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
diff --git a/include/configs/malta.h b/include/configs/malta.h
index ab2335f..2f33f63 100644
--- a/include/configs/malta.h
+++ b/include/configs/malta.h
@@ -59,6 +59,7 @@
 /*
  * Console configuration
  */
+#undef CONFIG_SYS_PROMPT
 #if defined(CONFIG_SYS_LITTLE_ENDIAN)
 #define CONFIG_SYS_PROMPT		"maltael # "
 #else
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 0a7b7cf..d5adfd6 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -267,11 +267,8 @@
 /*
  * Miscellaneous configurable options
  */
-#define V_PROMPT			"mcx # "
-
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
-#define CONFIG_SYS_PROMPT		V_PROMPT
 #define CONFIG_SYS_CBSIZE		1024/* Console I/O Buffer Size */
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h
index b5d72e3..6dfd5e2 100644
--- a/include/configs/medcom-wide.h
+++ b/include/configs/medcom-wide.h
@@ -13,7 +13,6 @@
 #include "tegra20-common.h"
 
 /* High-level configuration options */
-#define V_PROMPT			"Tegra20 (Medcom-Wide) # "
 #define CONFIG_TEGRA_BOARD_STRING	"Avionic Design Medcom-Wide"
 
 /* Board-specific serial config */
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index e16965c..626fa44 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -316,8 +316,6 @@
 				"1m(cramfs),-(jffs2)"
 #endif
 
-/* Miscellaneous configurable options */
-#define	CONFIG_SYS_PROMPT	"U-Boot-mONStR> "
 /* size of console buffer */
 #define	CONFIG_SYS_CBSIZE	512
  /* print buffer size */
diff --git a/include/configs/ml507.h b/include/configs/ml507.h
index b9ecb09..89a7290 100644
--- a/include/configs/ml507.h
+++ b/include/configs/ml507.h
@@ -24,7 +24,6 @@
 #define CONFIG_ENV_ADDR		(XPAR_FLASH_MEM0_BASEADDR+CONFIG_ENV_OFFSET)
 
 /*Misc*/
-#define CONFIG_SYS_PROMPT	"ml507:/# "	/* Monitor Command Prompt    */
 #define CONFIG_PREBOOT		"echo U-Boot is up and runnining;"
 
 /*Flash*/
diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h
index dd516ac..3073db9 100644
--- a/include/configs/mt_ventoux.h
+++ b/include/configs/mt_ventoux.h
@@ -30,12 +30,6 @@
 #define CONFIG_HOSTNAME mt_ventoux
 
 /*
- * Miscellaneous configurable options
- */
-#define V_PROMPT			"mt_ventoux => "
-#define CONFIG_SYS_PROMPT		V_PROMPT
-
-/*
  * Set its own mtdparts, different from common
  */
 #undef MTDIDS_DEFAULT
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index b654fff..f0a3365 100644
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -70,7 +70,6 @@
 #define CONFIG_INITRD_TAG	1	/* enable INITRD tag */
 #define CONFIG_SETUP_MEMORY_TAGS 1	/* enable memory tag */
 
-#define	CONFIG_SYS_PROMPT	"Marvell>> "	/* Command Prompt */
 #define	CONFIG_SYS_CBSIZE	1024	/* Console I/O Buff Size */
 #define	CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE \
 		+sizeof(CONFIG_SYS_PROMPT) + 16)	/* Print Buff */
diff --git a/include/configs/mx51_efikamx.h b/include/configs/mx51_efikamx.h
index 22aec4f..373cfcb 100644
--- a/include/configs/mx51_efikamx.h
+++ b/include/configs/mx51_efikamx.h
@@ -205,7 +205,6 @@
 
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
-#define CONFIG_SYS_PROMPT		"Efika> "
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 /* Print Buffer Size */
diff --git a/include/configs/nas220.h b/include/configs/nas220.h
index 61af61f..ebf6750 100644
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -64,10 +64,6 @@
  */
 #include "mv-common.h"
 
-/* Remove or override few declarations from mv-common.h */
-#undef CONFIG_SYS_PROMPT	/* previously defined in mv-common.h */
-#define CONFIG_SYS_PROMPT "nas220> "
-
 /*
  *  Environment variables configurations
  */
diff --git a/include/configs/nhk8815.h b/include/configs/nhk8815.h
index 8755be7..dd70adc 100644
--- a/include/configs/nhk8815.h
+++ b/include/configs/nhk8815.h
@@ -27,7 +27,6 @@
 /* user interface */
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT		"Nomadik> "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE \
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index efc583f..c4d6b3f 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -396,7 +396,6 @@ int rx51_kp_getc(struct stdio_dev *sdev);
 #define CONFIG_SYS_LONGHELP			/* undef to save memory */
 #define CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser */
 #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#define CONFIG_SYS_PROMPT		"Nokia RX-51 # "
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index dd549aa..b198016 100644
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -13,7 +13,6 @@
 #include "tegra124-common.h"
 
 /* High-level configuration options */
-#define V_PROMPT			"Tegra124 (Nyan-big) # "
 #define CONFIG_TEGRA_BOARD_STRING	"Google/NVIDIA Nyan-big"
 
 /* Board-specific serial config */
diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index 69be496..1afe04a 100644
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -14,9 +14,6 @@
 
 #include <configs/exynos4-common.h>
 
-#define CONFIG_SYS_PROMPT	"Odroid # "	/* Monitor Command Prompt */
-
-
 #define CONFIG_SYS_L2CACHE_OFF
 #ifndef CONFIG_SYS_L2CACHE_OFF
 #define CONFIG_SYS_L2_PL310
diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index cf17f3d..bacd7c3 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -10,7 +10,6 @@
 
 #include "exynos5420-common.h"
 
-#define CONFIG_SYS_PROMPT		"ODROID-XU3 # "
 #define CONFIG_IDENT_STRING		" for ODROID-XU3"
 
 #define CONFIG_BOARD_COMMON
diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h
index 81d4b34..713df3c 100644
--- a/include/configs/omap3_cairo.h
+++ b/include/configs/omap3_cairo.h
@@ -241,10 +241,6 @@
 #define CONFIG_SERIAL2
 #endif
 
-/* Keep old prompt in case some existing script depends on it */
-#undef CONFIG_SYS_PROMPT
-#define CONFIG_SYS_PROMPT		"Cairo # "
-
 /* Provide MACH_TYPE for compatibility with non-DT kernels */
 #define MACH_TYPE_OMAP3_CAIRO	3063
 #define CONFIG_MACH_TYPE	MACH_TYPE_OMAP3_CAIRO
diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h
index 370f21e..b0d1c93 100644
--- a/include/configs/omap3_evm_common.h
+++ b/include/configs/omap3_evm_common.h
@@ -179,7 +179,6 @@
  * U-boot features
  * ----------------------------------------------------------------------------
  */
-#define CONFIG_SYS_PROMPT		"OMAP3_EVM # "
 #define CONFIG_SYS_MAXARGS		16	/* max args for a command */
 
 #define CONFIG_MISC_INIT_R
diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index af6ae73..7ff0b1a 100644
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -235,7 +235,6 @@
  */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
-#define CONFIG_SYS_PROMPT		"OMAP Logic # "
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h
index 4339b05..40f278a 100644
--- a/include/configs/omap3_mvblx.h
+++ b/include/configs/omap3_mvblx.h
@@ -205,7 +205,6 @@
  */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
-#define CONFIG_SYS_PROMPT		"mvblx # "
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
index 76bf3b6..3c29fc1 100644
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.h
@@ -186,12 +186,6 @@
 	"fi;" \
 	"run nanddtsboot; " \
 
-/*
- * Miscellaneous configurable options
- */
-#undef CONFIG_SYS_PROMPT
-#define CONFIG_SYS_PROMPT		"Overo # "
-
 /* memtest works on */
 #define CONFIG_SYS_MEMTEST_START	(OMAP34XX_SDRC_CS0)
 #define CONFIG_SYS_MEMTEST_END		(OMAP34XX_SDRC_CS0 + \
diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index 49467c9..93cb9a3 100644
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -101,12 +101,6 @@
 	"ubi part boot && ubifsmount ubi:boot && " \
 		"ubifsload ${loadaddr} uImage && bootm ${loadaddr}"
 
-/*
- * Miscellaneous configurable options
- */
-#undef CONFIG_SYS_PROMPT
-#define CONFIG_SYS_PROMPT		"Pandora # "
-
 /* memtest works on */
 #define CONFIG_SYS_MEMTEST_START	(OMAP34XX_SDRC_CS0)
 #define CONFIG_SYS_MEMTEST_END		(OMAP34XX_SDRC_CS0 + \
diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h
index 16ceb91..f43e477 100644
--- a/include/configs/omap3_sdp3430.h
+++ b/include/configs/omap3_sdp3430.h
@@ -240,7 +240,6 @@
 
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
-#define CONFIG_SYS_PROMPT		"OMAP34XX SDP # "
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index 6d0d020..d9a3aa4 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -199,7 +199,6 @@
 #define CONFIG_MISC_INIT_R
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOOTFILE		"uImage" /* Boot file name */
-#define CONFIG_SYS_PROMPT	"U-Boot > " /* Command Prompt */
 #define CONFIG_SYS_CBSIZE	1024 /* Console I/O Buffer Size	*/
 #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 #define CONFIG_SYS_MAXARGS	16 /* max number of command args */
diff --git a/include/configs/origen.h b/include/configs/origen.h
index dae8fd5..21d8e7a 100644
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -11,9 +11,6 @@
 
 #include <configs/exynos4-common.h>
 
-#define CONFIG_SYS_PROMPT		"ORIGEN # "
-
-
 /* High Level Configuration Options */
 #define CONFIG_EXYNOS4210		1	/* which is a EXYNOS4210 SoC */
 #define CONFIG_ORIGEN			1	/* working with ORIGEN*/
diff --git a/include/configs/palmld.h b/include/configs/palmld.h
index a9f92fa..ec48c14 100644
--- a/include/configs/palmld.h
+++ b/include/configs/palmld.h
@@ -96,9 +96,6 @@
 #define	CONFIG_SYS_HUSH_PARSER		1
 
 #define	CONFIG_SYS_LONGHELP
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT		"$ "
-#endif
 #define	CONFIG_SYS_CBSIZE		256
 #define	CONFIG_SYS_PBSIZE		\
 	(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
diff --git a/include/configs/palmtc.h b/include/configs/palmtc.h
index b68ad3b..81c3f02 100644
--- a/include/configs/palmtc.h
+++ b/include/configs/palmtc.h
@@ -99,9 +99,6 @@
 #define	CONFIG_SYS_HUSH_PARSER		1
 
 #define	CONFIG_SYS_LONGHELP
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT		"$ "
-#endif
 #define	CONFIG_SYS_CBSIZE		256
 #define	CONFIG_SYS_PBSIZE		\
 	(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
diff --git a/include/configs/palmtreo680.h b/include/configs/palmtreo680.h
index 3946607..ffb0d1e 100644
--- a/include/configs/palmtreo680.h
+++ b/include/configs/palmtreo680.h
@@ -92,6 +92,7 @@
 #define CONFIG_SYS_PROMPT_HUSH_PS2      "> "
 
 #define CONFIG_SYS_LONGHELP
+#undef CONFIG_SYS_PROMPT
 #ifdef CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_PROMPT               "$ "
 #else
diff --git a/include/configs/paz00.h b/include/configs/paz00.h
index 0bdeccc..8eac81a 100644
--- a/include/configs/paz00.h
+++ b/include/configs/paz00.h
@@ -21,7 +21,6 @@
 #include "tegra20-common.h"
 
 /* High-level configuration options */
-#define V_PROMPT		"Tegra20 (Paz00) MOD # "
 #define CONFIG_TEGRA_BOARD_STRING	"Compal Paz00"
 
 /* Board-specific serial config */
diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h
index af2654e..516d381 100644
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -52,7 +52,6 @@
  * Miscellaneous configurable options
  */
 #define	CONFIG_SYS_LONGHELP				/* undef to save memory      */
-#define	CONFIG_SYS_PROMPT		"Pb1x00 # "	/* Monitor Command Prompt    */
 #define	CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size   */
 #define	CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)  /* Print Buffer Size */
 #define	CONFIG_SYS_MAXARGS		16		/* max number of command args*/
diff --git a/include/configs/pcm030.h b/include/configs/pcm030.h
index 83c96a8..29feb7b 100644
--- a/include/configs/pcm030.h
+++ b/include/configs/pcm030.h
@@ -337,7 +337,6 @@ RTC configuration
  Miscellaneous configurable options
 -------------------------------------------------------------------------------*/
 #define CONFIG_SYS_LONGHELP	/* undef to save memory */
-#define CONFIG_SYS_PROMPT "uboot> " /* Monitor Command Prompt */
 
 #define CONFIG_CMDLINE_EDITING 1 /* add command line history */
 
diff --git a/include/configs/peach-pi.h b/include/configs/peach-pi.h
index 46699ff..5906171 100644
--- a/include/configs/peach-pi.h
+++ b/include/configs/peach-pi.h
@@ -36,7 +36,6 @@
 #define CONFIG_SERIAL3		/* use SERIAL 3 */
 #define CONFIG_DEFAULT_CONSOLE	"console=ttySAC1,115200n8\0"
 
-#define CONFIG_SYS_PROMPT	"Peach-Pi # "
 #define CONFIG_IDENT_STRING	" for Peach-Pi"
 
 #define CONFIG_VIDEO_PARADE
diff --git a/include/configs/peach-pit.h b/include/configs/peach-pit.h
index c5c9e3a..3b92df8 100644
--- a/include/configs/peach-pit.h
+++ b/include/configs/peach-pit.h
@@ -36,7 +36,6 @@
 #define CONFIG_SERIAL3		/* use SERIAL 3 */
 #define CONFIG_DEFAULT_CONSOLE	"console=ttySAC1,115200n8\0"
 
-#define CONFIG_SYS_PROMPT	"Peach-Pit # "
 #define CONFIG_IDENT_STRING	" for Peach-Pit"
 
 #define CONFIG_VIDEO_PARADE
diff --git a/include/configs/pepper.h b/include/configs/pepper.h
index 16149f6..f58b74a 100644
--- a/include/configs/pepper.h
+++ b/include/configs/pepper.h
@@ -17,9 +17,6 @@
 #define V_OSCK				24000000  /* Clock output from T2 */
 #define V_SCLK				(V_OSCK)
 
-#undef CONFIG_SYS_PROMPT
-#define CONFIG_SYS_PROMPT		"pepper# "
-
 #define CONFIG_SYS_I2C_EEPROM_ADDR	0x50
 
 /* Mach type */
diff --git a/include/configs/platinum_picon.h b/include/configs/platinum_picon.h
index f5b476f..3679530 100644
--- a/include/configs/platinum_picon.h
+++ b/include/configs/platinum_picon.h
@@ -19,8 +19,6 @@
 
 #define CONFIG_HOSTNAME				picon
 
-#define CONFIG_SYS_PROMPT			"picon > "
-
 #define CONFIG_PLATFORM_ENV_SETTINGS		"\0"
 
 #define CONFIG_EXTRA_ENV_SETTINGS		CONFIG_COMMON_ENV_SETTINGS \
diff --git a/include/configs/platinum_titanium.h b/include/configs/platinum_titanium.h
index 9bca10f..ccb6441 100644
--- a/include/configs/platinum_titanium.h
+++ b/include/configs/platinum_titanium.h
@@ -26,8 +26,6 @@
 
 #define CONFIG_HOSTNAME				titanium
 
-#define CONFIG_SYS_PROMPT			"titanium > "
-
 #define CONFIG_PLATFORM_ENV_SETTINGS		"\0"
 
 #define CONFIG_EXTRA_ENV_SETTINGS		CONFIG_COMMON_ENV_SETTINGS \
diff --git a/include/configs/plutux.h b/include/configs/plutux.h
index 7f7ea97..1d6df32 100644
--- a/include/configs/plutux.h
+++ b/include/configs/plutux.h
@@ -13,7 +13,6 @@
 #include "tegra20-common.h"
 
 /* High-level configuration options */
-#define V_PROMPT			"Tegra20 (Plutux) # "
 #define CONFIG_TEGRA_BOARD_STRING	"Avionic Design Plutux"
 
 /* Board-specific serial config */
diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index f9a1d51..f4f96a7 100644
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -336,7 +336,6 @@
 
 #define CONFIG_BAUDRATE			115200
 
-#define CONFIG_SYS_PROMPT		"pm9261> "
 #define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_PBSIZE		\
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index 6c434f0..bd43577 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -370,7 +370,6 @@
 
 #define CONFIG_BAUDRATE			115200
 
-#define CONFIG_SYS_PROMPT		"u-boot-pm9263> "
 #define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_PBSIZE		\
diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h
index c793865..09f0744 100644
--- a/include/configs/pm9g45.h
+++ b/include/configs/pm9g45.h
@@ -149,7 +149,6 @@
 
 #define CONFIG_BAUDRATE			115200
 
-#define CONFIG_SYS_PROMPT		"U-Boot> "
 #define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h
index 3a0992a..8cf3ad8 100644
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
@@ -47,10 +47,6 @@
  */
 #include "mv-common.h"
 
-/* Remove or override few declarations from mv-common.h */
-#undef CONFIG_SYS_PROMPT	/* previously defined in mv-common.h */
-#define CONFIG_SYS_PROMPT	"PogoE02> "
-
 /*
  *  Environment variables configurations
  */
diff --git a/include/configs/pr1.h b/include/configs/pr1.h
index 3e4aab4..f76e023 100644
--- a/include/configs/pr1.h
+++ b/include/configs/pr1.h
@@ -128,7 +128,6 @@
 #define CONFIG_BAUDRATE		115200
 #define CONFIG_RTC_BFIN
 #define CONFIG_UART_CONSOLE	0
-#define CONFIG_SYS_PROMPT	"pr1>"
 #define CONFIG_BOOTCOMMAND	"run nandboot"
 #define CONFIG_BOOTDELAY	2
 #define CONFIG_LOADADDR		0x2000000
diff --git a/include/configs/pxa255_idp.h b/include/configs/pxa255_idp.h
index 3edeb08..332d79f 100644
--- a/include/configs/pxa255_idp.h
+++ b/include/configs/pxa255_idp.h
@@ -205,6 +205,7 @@
 #define CONFIG_SYS_HUSH_PARSER		1
 
 #define CONFIG_SYS_LONGHELP				/* undef to save memory		*/
+#undef CONFIG_SYS_PROMPT
 #ifdef CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_PROMPT		"$ "		/* Monitor Command Prompt */
 #else
diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index b22637b..a7ec8f5 100644
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -78,6 +78,7 @@
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 
 /* Monitor Command Prompt */
+#undef CONFIG_SYS_PROMPT
 #if defined(CONFIG_SYS_LITTLE_ENDIAN)
 #define CONFIG_SYS_PROMPT		"qemu-mipsel # "
 #else
diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h
index fae5b05..4de15bf 100644
--- a/include/configs/qemu-mips64.h
+++ b/include/configs/qemu-mips64.h
@@ -80,6 +80,7 @@
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 
 /* Monitor Command Prompt */
+#undef CONFIG_SYS_PROMPT
 #if defined(CONFIG_SYS_LITTLE_ENDIAN)
 #define CONFIG_SYS_PROMPT		"qemu-mips64el # "
 #else
diff --git a/include/configs/rpi-common.h b/include/configs/rpi-common.h
index 1012cdd..25566d2 100644
--- a/include/configs/rpi-common.h
+++ b/include/configs/rpi-common.h
@@ -116,7 +116,6 @@
 
 /* Shell */
 #define CONFIG_SYS_MAXARGS		8
-#define CONFIG_SYS_PROMPT		"U-Boot> "
 #define CONFIG_COMMAND_HISTORY
 
 /* Commands */
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 7994ecf..e2bf234 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -197,7 +197,6 @@
 
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser	*/
-#define CONFIG_SYS_PROMPT	"Goni # "
 #define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE	384	/* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16	/* max number of command args */
diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index e7bace4..35fef2b 100644
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -12,9 +12,6 @@
 
 #include <configs/exynos4-common.h>
 
-#define CONFIG_SYS_PROMPT	"Universal # "	/* Monitor Command Prompt */
-
-
 #define CONFIG_TIZEN			/* TIZEN lib */
 
 /* Keep L2 Cache Disabled */
diff --git a/include/configs/scb9328.h b/include/configs/scb9328.h
index f367d62..d4ffb46 100644
--- a/include/configs/scb9328.h
+++ b/include/configs/scb9328.h
@@ -51,7 +51,6 @@
  * General options for u-boot. Modify to save memory foot print
  */
 #define CONFIG_SYS_LONGHELP				      /* undef saves memory  */
-#define CONFIG_SYS_PROMPT		"scb9328> "	      /* prompt string	     */
 #define CONFIG_SYS_CBSIZE		256		      /* console I/O buffer  */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* print buffer size   */
 #define CONFIG_SYS_MAXARGS		16		      /* max command args    */
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index fdeffb5..3e90474 100644
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -20,7 +20,6 @@
 #include "tegra20-common.h"
 
 /* High-level configuration options */
-#define V_PROMPT		"Tegra20 (SeaBoard) # "
 #define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Seaboard"
 
 /* Board-specific serial config */
diff --git a/include/configs/secomx6quq7.h b/include/configs/secomx6quq7.h
index 114d1fd..703f4fc 100644
--- a/include/configs/secomx6quq7.h
+++ b/include/configs/secomx6quq7.h
@@ -74,9 +74,6 @@
 	"stderr=serial\0"
 
 
-/* Miscellaneous configurable options */
-#define CONFIG_SYS_PROMPT		"SECO MX6Q uQ7 U-Boot > "
-
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE +		\
 					 sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index e5fd147..687f2da 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -27,7 +27,6 @@
 #define CONFIG_SYS_MALLOC_LEN		(16 * 1024 * 1024)
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
-#define CONFIG_SYS_PROMPT		"U-Boot# "
 #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_BOARD_LATE_INIT
 #define CONFIG_SYS_NO_FLASH
diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index 7b4b3b0..a6bfa76 100644
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -106,7 +106,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
-#define CONFIG_SYS_PROMPT	"SMDK2410 # "
 #define CONFIG_SYS_CBSIZE	256
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h
index e5655fc..8975316 100644
--- a/include/configs/smdk5250.h
+++ b/include/configs/smdk5250.h
@@ -25,7 +25,6 @@
 #define CONFIG_USB_XHCI
 #define CONFIG_USB_XHCI_EXYNOS
 
-#define CONFIG_SYS_PROMPT		"SMDK5250 # "
 #define CONFIG_IDENT_STRING		" for SMDK5250"
 
 /* Miscellaneous configurable options */
diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h
index 607877c..bbc75d8 100644
--- a/include/configs/smdk5420.h
+++ b/include/configs/smdk5420.h
@@ -29,7 +29,6 @@
 #define CONFIG_SERIAL3		/* use SERIAL 3 */
 #define CONFIG_DEFAULT_CONSOLE	"console=ttySAC1,115200n8\0"
 
-#define CONFIG_SYS_PROMPT	"SMDK5420 # "
 #define CONFIG_IDENT_STRING	" for SMDK5420"
 #define CONFIG_DEFAULT_CONSOLE		"console=ttySAC1,115200n8\0"
 
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index 08a2e9f..4ec9c65 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -152,7 +152,6 @@
  */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser	*/
-#define CONFIG_SYS_PROMPT		"SMDKC100 # "
 #define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE	384	/* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16	/* max number of command args */
diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
index d26e5ec..dbba88b 100644
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@@ -55,7 +55,6 @@
 #define CONFIG_BOOTCOMMAND	"fatload mmc 0 40007000 uImage; bootm 40007000"
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_PROMPT		"SMDKV310 # "
 #define CONFIG_DEFAULT_CONSOLE		"console=ttySAC2,115200n8\0"
 /* memtest works on */
 #define CONFIG_SYS_MEMTEST_START	CONFIG_SYS_SDRAM_BASE
diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h
index 70ef939..7758b0f 100644
--- a/include/configs/snapper9260.h
+++ b/include/configs/snapper9260.h
@@ -89,7 +89,6 @@
 #define CONFIG_USART_ID			ATMEL_ID_SYS
 #endif
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_PROMPT		"Snapper> "
 
 /* I2C - Bit-bashed */
 #define CONFIG_SYS_I2C
diff --git a/include/configs/snow.h b/include/configs/snow.h
index 557f86c..8dba8f5 100644
--- a/include/configs/snow.h
+++ b/include/configs/snow.h
@@ -28,7 +28,6 @@
 #define CONFIG_USB_XHCI_EXYNOS
 #define CONFIG_USB_EHCI_EXYNOS
 
-#define CONFIG_SYS_PROMPT		"snow # "
 #define CONFIG_IDENT_STRING		" for snow"
 #define CONFIG_DEFAULT_CONSOLE		"console=ttySAC1,115200n8\0"
 
diff --git a/include/configs/snowball.h b/include/configs/snowball.h
index 91aaffa..de03e76 100644
--- a/include/configs/snowball.h
+++ b/include/configs/snowball.h
@@ -154,7 +154,6 @@
  */
 
 #define CONFIG_SYS_LONGHELP			/* undef to save memory     */
-#define CONFIG_SYS_PROMPT	"U8500 $ "	/* Monitor Command Prompt   */
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size  */
 
 /* Print Buffer Size */
diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
index f75c306..fb1bf66 100644
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@@ -201,7 +201,6 @@
 #define CONFIG_SYS_MALLOC_LEN			(1024*1024)
 #define CONFIG_IDENT_STRING			"-SPEAr"
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_PROMPT			"u-boot> "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_CBSIZE			256
 #define CONFIG_SYS_PBSIZE			(CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/stamp9g20.h b/include/configs/stamp9g20.h
index 086ebcf..87df70b 100644
--- a/include/configs/stamp9g20.h
+++ b/include/configs/stamp9g20.h
@@ -180,7 +180,6 @@
 /* General Boot Parameter */
 #define CONFIG_BOOTDELAY		3
 #define CONFIG_BOOTCOMMAND		"run flashboot"
-#define CONFIG_SYS_PROMPT		"U-Boot> "
 #define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_PBSIZE \
diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h
index 1b4fd21..7ccdcb7 100644
--- a/include/configs/stm32f429-discovery.h
+++ b/include/configs/stm32f429-discovery.h
@@ -97,7 +97,6 @@
  */
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT	       "U-Boot > "
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
 
diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h
index 887f31a..b1b6919 100644
--- a/include/configs/stv0991.h
+++ b/include/configs/stv0991.h
@@ -36,7 +36,6 @@
 #define CONFIG_PL01X_SERIAL
 
 /* user interface */
-#define CONFIG_SYS_PROMPT			"STV0991> "
 #define CONFIG_SYS_CBSIZE			1024
 #define CONFIG_SYS_PBSIZE			(CONFIG_SYS_CBSIZE \
 						+sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h
index 6676f37..25b7d5f 100644
--- a/include/configs/stxgp3.h
+++ b/include/configs/stxgp3.h
@@ -315,7 +315,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP			/* undef to save memory		*/
-#define CONFIG_SYS_PROMPT	"GPPP=> "	/* Monitor Command Prompt	*/
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
 #else
diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h
index 5b1f3ab..ee16fea 100644
--- a/include/configs/stxssa.h
+++ b/include/configs/stxssa.h
@@ -349,7 +349,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP			/* undef to save memory		*/
-#define CONFIG_SYS_PROMPT	"SSA=> "	/* Monitor Command Prompt	*/
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
 #else
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 9576bc1..9ab376c 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -50,8 +50,6 @@
  */
 #define CONFIG_DISPLAY_CPUINFO
 
-#define CONFIG_SYS_PROMPT	"sunxi# "
-
 /* Serial & console */
 #define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
index c8ec79b..a8928e5 100644
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@@ -196,7 +196,6 @@
  */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
-#define CONFIG_SYS_PROMPT		"TAO-3530 # "
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 
 /* turn on command-line edit/hist/auto */
diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index d5b93eb..2c9f5da 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -165,7 +165,6 @@
 	"512k(dtb),6M(kernel)ro,-(rootfs) "				\
 	"root=/dev/mtdblock7 rw rootfstype=jffs2"
 
-#define CONFIG_SYS_PROMPT		"U-Boot> "
 #define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_PBSIZE \
diff --git a/include/configs/tb100.h b/include/configs/tb100.h
index 42817ae..41c2c72 100644
--- a/include/configs/tb100.h
+++ b/include/configs/tb100.h
@@ -96,7 +96,6 @@
  * Console configuration
  */
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_PROMPT		"[tb100]:~# "
 #define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 42e5821..6afa18d 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -18,7 +18,6 @@
 
 #define CONFIG_BOARD_EARLY_INIT_F
 
-#define CONFIG_SYS_PROMPT		"Matrix U-Boot> "
 #define CONFIG_SYS_HZ			1000
 
 #define CONFIG_IMX6_THERMAL
diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
index fa651c1..4cf2823 100644
--- a/include/configs/tec-ng.h
+++ b/include/configs/tec-ng.h
@@ -11,7 +11,6 @@
 #include "tegra30-common.h"
 
 /* High-level configuration options */
-#define V_PROMPT			"Tegra30 (TEC-NG) # "
 #define CONFIG_TEGRA_BOARD_STRING	"Avionic Design Tamonten? NG Evaluation Carrier"
 
 /* Board-specific serial config */
diff --git a/include/configs/tec.h b/include/configs/tec.h
index 3b543eb..4b8ca5e 100644
--- a/include/configs/tec.h
+++ b/include/configs/tec.h
@@ -13,7 +13,6 @@
 #include "tegra20-common.h"
 
 /* High-level configuration options */
-#define V_PROMPT			"Tegra20 (TEC) # "
 #define CONFIG_TEGRA_BOARD_STRING	"Avionic Design Tamonten Evaluation Carrier"
 
 /* Board-specific serial config */
diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index 7b4c0d7..2b1b21f 100644
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -83,10 +83,6 @@
 #endif
 
 /*
- * Miscellaneous configurable options
- */
-#define CONFIG_SYS_PROMPT		V_PROMPT
-/*
  * Increasing the size of the IO buffer as default nfsargs size is more
  *  than 256 and so it is not possible to edit it
  */
diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
index fcfb70e..7fa35a1 100644
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -28,7 +28,6 @@
 #define CONFIG_SYS_MALLOC_LEN		(1024 << 10)
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_SYS_HUSH_PARSER		/* Use HUSH for command parsing */
-#define CONFIG_SYS_PROMPT		"U-Boot# "
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_MACH_TYPE		MACH_TYPE_TI8148EVM
 
diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h
index 8d52057..01d8233 100644
--- a/include/configs/ti816x_evm.h
+++ b/include/configs/ti816x_evm.h
@@ -24,7 +24,6 @@
 #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (32 * 1024))
 #define CONFIG_SYS_LONGHELP		/* undef save memory */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT		"u-boot/ti816x# "
 #define CONFIG_MACH_TYPE		MACH_TYPE_TI8168EVM
 
 #define CONFIG_OF_LIBFDT
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index 0aea7d1..6a2ddd3 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -133,7 +133,6 @@
 #define CONFIG_SYS_MALLOC_LEN	(16 << 20)
 #endif
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT		"U-Boot# "
 #define CONFIG_SYS_CONSOLE_INFO_QUIET
 #define CONFIG_BAUDRATE			115200
 #define CONFIG_ENV_VARS_UBOOT_CONFIG	/* Strongly encouraged */
diff --git a/include/configs/titanium.h b/include/configs/titanium.h
index 49aa3c7..1b4ca29 100644
--- a/include/configs/titanium.h
+++ b/include/configs/titanium.h
@@ -141,9 +141,6 @@
 
 #define CONFIG_BOOTCOMMAND		"run nand_ubifs"
 
-/* Miscellaneous configurable options */
-#define CONFIG_SYS_PROMPT		"Titanium > "
-
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 					 sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/trats.h b/include/configs/trats.h
index 6808e78..5fb991b 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -12,8 +12,6 @@
 
 #include <configs/exynos4-common.h>
 
-#define CONFIG_SYS_PROMPT	"Trats # "	/* Monitor Command Prompt */
-
 #define CONFIG_TRATS
 
 
diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index 94c31fb..f12a952 100644
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -13,9 +13,6 @@
 
 #include <configs/exynos4-common.h>
 
-#define CONFIG_SYS_PROMPT	"Trats2 # "	/* Monitor Command Prompt */
-
-
 #define CONFIG_TIZEN			/* TIZEN lib */
 
 #define CONFIG_SYS_L2CACHE_OFF
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index 23bf599..f04b572 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -284,7 +284,6 @@
 #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
 #define CONFIG_CMDLINE_EDITING		/* enable cmdline history */
 #define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_PROMPT		"OMAP3 Tricorder # "
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index 2db38e5..2ab5511 100644
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -12,7 +12,6 @@
 #include "tegra20-common.h"
 
 /* High-level configuration options */
-#define V_PROMPT		"Tegra20 (TrimSlice) # "
 #define CONFIG_TEGRA_BOARD_STRING	"Compulab Trimslice"
 
 /* Board-specific serial config */
diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h
index 8368931..40c8d71 100644
--- a/include/configs/trizepsiv.h
+++ b/include/configs/trizepsiv.h
@@ -130,6 +130,7 @@
 #define CONFIG_SYS_HUSH_PARSER		1
 
 #define CONFIG_SYS_LONGHELP				/* undef to save memory		*/
+#undef CONFIG_SYS_PROMPT
 #ifdef CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_PROMPT		"$ "		/* Monitor Command Prompt */
 #else
diff --git a/include/configs/tt01.h b/include/configs/tt01.h
index 9501a83..ca1e2e2 100644
--- a/include/configs/tt01.h
+++ b/include/configs/tt01.h
@@ -224,7 +224,6 @@
 #define CONFIG_SYS_HUSH_PARSER
 
 #define CONFIG_SYS_LONGHELP			/* undef to save memory */
-#define CONFIG_SYS_PROMPT	"TT01> "
 #define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/twister.h b/include/configs/twister.h
index f24dc13..4f5560f 100644
--- a/include/configs/twister.h
+++ b/include/configs/twister.h
@@ -29,8 +29,6 @@
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_SYS_PROMPT		"twister => "
-
 #define CONFIG_SMC911X
 #define CONFIG_SMC911X_16_BIT
 #define CONFIG_SMC911X_BASE		0x2C000000
diff --git a/include/configs/u8500_href.h b/include/configs/u8500_href.h
index 6a22571..a8cc030 100644
--- a/include/configs/u8500_href.h
+++ b/include/configs/u8500_href.h
@@ -111,7 +111,6 @@
  */
 
 #define CONFIG_SYS_LONGHELP			/* undef to save memory     */
-#define CONFIG_SYS_PROMPT	"U8500 $ "	/* Monitor Command Prompt   */
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size  */
 
 /* Print Buffer Size */
diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h
index 4774de5..10a1664 100644
--- a/include/configs/usb_a9263.h
+++ b/include/configs/usb_a9263.h
@@ -140,7 +140,6 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"mtdparts=" MTDPARTS_DEFAULT "\0" \
 
-#define CONFIG_SYS_PROMPT		"U-Boot> "
 #define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/v5fx30teval.h b/include/configs/v5fx30teval.h
index f30a090..298fa3e 100644
--- a/include/configs/v5fx30teval.h
+++ b/include/configs/v5fx30teval.h
@@ -24,7 +24,6 @@
 #define CONFIG_ENV_ADDR		(XPAR_FLASH_MEM0_BASEADDR+CONFIG_ENV_OFFSET)
 
 /*Misc*/
-#define CONFIG_SYS_PROMPT		"v5fx30t:/# "	/* Monitor Command Prompt    */
 #define CONFIG_PREBOOT		"echo U-Boot is up and runnining;"
 
 /*Flash*/
diff --git a/include/configs/vct.h b/include/configs/vct.h
index b54519d..80f6a60 100644
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -145,7 +145,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP			/* undef to save memory		*/
-#define CONFIG_SYS_PROMPT	"VCT# "		/* Monitor Command Prompt	*/
 #define CONFIG_SYS_CBSIZE	512		/* Console I/O Buffer Size	*/
 #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE + \
 				 sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/venice2.h b/include/configs/venice2.h
index 1d9d053..4c2eb0d 100644
--- a/include/configs/venice2.h
+++ b/include/configs/venice2.h
@@ -13,7 +13,6 @@
 #include "tegra124-common.h"
 
 /* High-level configuration options */
-#define V_PROMPT			"Tegra124 (Venice2) # "
 #define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Venice2"
 
 /* Board-specific serial config */
diff --git a/include/configs/ventana.h b/include/configs/ventana.h
index 3f1ebcd..e9c3500 100644
--- a/include/configs/ventana.h
+++ b/include/configs/ventana.h
@@ -12,7 +12,6 @@
 #include "tegra20-common.h"
 
 /* High-level configuration options */
-#define V_PROMPT		"Tegra20 (Ventana) # "
 #define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Ventana"
 
 /* Board-specific serial config */
diff --git a/include/configs/versatile.h b/include/configs/versatile.h
index de23375..636ca43 100644
--- a/include/configs/versatile.h
+++ b/include/configs/versatile.h
@@ -108,6 +108,7 @@
 #define CONFIG_SYS_LONGHELP	/* undef to save memory */
 #define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
 /* Monitor Command Prompt	 */
+#undef CONFIG_SYS_PROMPT
 #ifdef CONFIG_ARCH_VERSATILE_AB
 # define CONFIG_SYS_PROMPT	"VersatileAB # "
 #else
diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index c36237f..6107c64 100644
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -239,7 +239,6 @@
 
 /* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
-#define CONFIG_SYS_PROMPT		"VExpress64# "
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 					sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_HUSH_PARSER
diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
index 0c1da01..df2ac64 100644
--- a/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@ -280,7 +280,6 @@
 
 /* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
-#define CONFIG_SYS_PROMPT		"VExpress# "
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 					sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_HUSH_PARSER
diff --git a/include/configs/vision2.h b/include/configs/vision2.h
index 93c7348..b43373f 100644
--- a/include/configs/vision2.h
+++ b/include/configs/vision2.h
@@ -137,7 +137,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP
-#define	CONFIG_SYS_PROMPT		"Vision II U-boot > "
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
 
diff --git a/include/configs/vl_ma2sc.h b/include/configs/vl_ma2sc.h
index e4958ce..3facd7f 100644
--- a/include/configs/vl_ma2sc.h
+++ b/include/configs/vl_ma2sc.h
@@ -340,7 +340,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{312500, 230400, 115200, 19200, \
 						38400, 57600, 9600 }
 
-#define CONFIG_SYS_PROMPT	"U-Boot> "
 #define CONFIG_SYS_CBSIZE	512		/* Console I/O Buffer Size */
 #define CONFIG_SYS_MAXARGS	32		/* max number of command args */
 #define CONFIG_SYS_PBSIZE	\
diff --git a/include/configs/vpac270.h b/include/configs/vpac270.h
index 95a69b3..976ba5d 100644
--- a/include/configs/vpac270.h
+++ b/include/configs/vpac270.h
@@ -126,7 +126,6 @@
 
 #define	CONFIG_SYS_LONGHELP
 #ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT		"$ "
 #else
 #endif
 #define	CONFIG_SYS_CBSIZE		256
diff --git a/include/configs/whistler.h b/include/configs/whistler.h
index 13cc3d3..ff85964 100644
--- a/include/configs/whistler.h
+++ b/include/configs/whistler.h
@@ -12,7 +12,6 @@
 #include "tegra20-common.h"
 
 /* High-level configuration options */
-#define V_PROMPT		"Tegra20 (Whistler) # "
 #define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Whistler"
 
 /* Board-specific serial config */
diff --git a/include/configs/wireless_space.h b/include/configs/wireless_space.h
index 7219034..191ac1b 100644
--- a/include/configs/wireless_space.h
+++ b/include/configs/wireless_space.h
@@ -64,8 +64,6 @@
 #undef CONFIG_SYS_IDE_MAXDEVICE
 #define CONFIG_SYS_IDE_MAXBUS           1
 #define CONFIG_SYS_IDE_MAXDEVICE        1
-#undef CONFIG_SYS_PROMPT
-#define CONFIG_SYS_PROMPT		"ws> "
 
 /*
  * Ethernet Driver configuration
diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h
index 52d392c..5d9f529 100644
--- a/include/configs/woodburn_common.h
+++ b/include/configs/woodburn_common.h
@@ -130,7 +130,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP	/* undef to save memory */
-#define CONFIG_SYS_PROMPT	"woodburn U-Boot > "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_HUSH_PARSER	/* Use the HUSH parser */
 
diff --git a/include/configs/x600.h b/include/configs/x600.h
index 1d4c1a9..edb16b1 100644
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -151,7 +151,6 @@
 #define CONFIG_SYS_MALLOC_LEN			(1024 * 1024)
 #define CONFIG_IDENT_STRING			"-SPEAr"
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_PROMPT			"X600> "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_CBSIZE			256
 #define CONFIG_SYS_PBSIZE			(CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h
index a072464..8d19bff 100644
--- a/include/configs/xaeniax.h
+++ b/include/configs/xaeniax.h
@@ -94,7 +94,7 @@
 #define CONFIG_SYS_LONGHELP				/* undef to save memory	*/
 #define CONFIG_SYS_HUSH_PARSER		1
 
-
+#undef CONFIG_SYS_PROMPT
 #ifdef CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_PROMPT		"u-boot$ "	/* Monitor Command Prompt */
 #else
diff --git a/include/configs/xilinx-ppc405-generic.h b/include/configs/xilinx-ppc405-generic.h
index 75b119f..40fa087 100644
--- a/include/configs/xilinx-ppc405-generic.h
+++ b/include/configs/xilinx-ppc405-generic.h
@@ -26,7 +26,6 @@
 #define CONFIG_ENV_OVERWRITE		1
 
 /*Misc*/
-#define CONFIG_SYS_PROMPT	"xlx-ppc405:/# " /* Monitor Command Prompt */
 #define CONFIG_PREBOOT		"echo U-Boot is up and runnining;"
 
 /*Flash*/
diff --git a/include/configs/xilinx-ppc440-generic.h b/include/configs/xilinx-ppc440-generic.h
index 8e68415..95b8834 100644
--- a/include/configs/xilinx-ppc440-generic.h
+++ b/include/configs/xilinx-ppc440-generic.h
@@ -24,7 +24,6 @@
 #define CONFIG_ENV_ADDR		(XPAR_FLASH_MEM0_BASEADDR+CONFIG_ENV_OFFSET)
 
 /*Misc*/
-#define CONFIG_SYS_PROMPT		"board:/# "	/* Monitor Command Prompt    */
 #define CONFIG_PREBOOT		"echo U-Boot is up and runnining;"
 
 /*Flash*/
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index ad82ed6..4fd1232 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -118,7 +118,6 @@
 /* Monitor Command Prompt */
 /* Console I/O Buffer Size */
 #define CONFIG_SYS_CBSIZE		2048
-#define CONFIG_SYS_PROMPT		"ZynqMP> "
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 					sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_HUSH_PARSER
diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h
index cff3ba8..0199190 100644
--- a/include/configs/zipitz2.h
+++ b/include/configs/zipitz2.h
@@ -119,9 +119,6 @@ unsigned char zipitz2_spi_read(void);
 #define	CONFIG_SYS_HUSH_PARSER		1
 
 #define	CONFIG_SYS_LONGHELP				/* undef to save memory	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT		"$ "		/* Monitor Command Prompt */
-#endif
 #define	CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size */
 #define	CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)	/* Print Buffer Size */
 #define	CONFIG_SYS_MAXARGS		16		/* max number of command args */
diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h
index af7cc49..81b9ce4 100644
--- a/include/configs/zmx25.h
+++ b/include/configs/zmx25.h
@@ -138,7 +138,6 @@
 #define CONFIG_SYS_MEMTEST_START	(PHYS_SDRAM + (512*1024))
 #define CONFIG_SYS_MEMTEST_END		(PHYS_SDRAM + PHYS_SDRAM_SIZE)
 
-#define CONFIG_SYS_PROMPT	"zmx25> "
 #define CONFIG_SYS_CBSIZE	256
 #define CONFIG_SYS_MAXARGS	16
 #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 5526214..66ac9d3 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -235,7 +235,6 @@
 #define CONFIG_SYS_LOAD_ADDR		0 /* default? */
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_PROMPT		"zynq-uboot> "
 #define CONFIG_SYS_HUSH_PARSER
 
 #define CONFIG_CMDLINE_EDITING
-- 
1.9.1

[U-Boot] [PATCH V2 12/12] kconfig: add config option for shell prompt

[Masahiro Yamada]

2015-07-28 16:08 GMT+09:00 Nikita Kiryanov <nikita@compulab.co.il>:
> Add option to set shell prompt string from menuconfig and migrate
> boards globally.
>
> The migration is done as follows:
> - Boards that explicitly and unconditionally set CONFIG_SYS_PROMPT had the
>   entry moved to their defconfig files.
> - Boards that defined some kind of #ifdef logic which selects the
>   CONFIG_SYS_PROMPT (for example qemu-mips) got an #undef CONFIG_SYS_PROMPT
>   right before the #ifdef logic and were left alone.
> - This change forces CONFIG_SYS_PROMPT to be a per board decision, and thus
>   CONFIG_SYS_PROMPT was removed from all <soc>_common.h and <arch>_common.h
>   files. This results in a streamlined default value across platforms, and
>   includes the following files: spear-common, sunxi-common, mv-common,
>   ti_armv7_common, tegra-common, at91-sama5_common, and zynq-common.
> - Boards that relied on <arch/soc>_common.h values of CONFIG_SYS_PROMPT were
>   not updated in their respective defconfig files under the assumption that
>   since they did not explicitly define a value, they're fine with whatever
>   the default is.
> - On the other hand, boards that relied on a value defined in some
>   <boards>_common.h file such as woodburn_common, rpi-common,
>   bur_am335x_common, ls2085a_common, siemens_am33x_common, and
>   omap3_evm_common, had their values moved to the respective defconfig files.
> - The define V_PROMPT was removed, since it is not used anywhere except for
>   assigning a value for CONFIG_SYS_PROMPT.
>
> Cc: Tom Rini <trini@konsulko.com>
> Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Igor Grinberg <grinberg@compulab.co.il>
> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
> ---
> Changes in V2:
>         - Migrate boards globally (compile tested with buildman on arm and
>           powerpc)
>         - Change default value to "=> "
>         - V_PROMPT define removed as part of the migration
>

> diff --git a/configs/T1023RDB_NAND_defconfig b/configs/T1023RDB_NAND_defconfig
> index 3ee42d6..af44f87 100644
> --- a/configs/T1023RDB_NAND_defconfig
> +++ b/configs/T1023RDB_NAND_defconfig
> @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="=> "


This is the same as the default.  It should not appear in a defconfig.

It is not sorted by savedefconfig, either.

tools/moveconfig.py exists to do such things automatically.





-- 
Best Regards
Masahiro Yamada

[U-Boot] [PATCH V2 12/12] kconfig: add config option for shell prompt

[Nikita Kiryanov]

On Wed, Jul 29, 2015 at 12:59:00AM +0900, Masahiro Yamada wrote:
> 2015-07-28 16:08 GMT+09:00 Nikita Kiryanov <nikita@compulab.co.il>:
> > Add option to set shell prompt string from menuconfig and migrate
> > boards globally.
> >
> > The migration is done as follows:
> > - Boards that explicitly and unconditionally set CONFIG_SYS_PROMPT had the
> >   entry moved to their defconfig files.
> > - Boards that defined some kind of #ifdef logic which selects the
> >   CONFIG_SYS_PROMPT (for example qemu-mips) got an #undef CONFIG_SYS_PROMPT
> >   right before the #ifdef logic and were left alone.
> > - This change forces CONFIG_SYS_PROMPT to be a per board decision, and thus
> >   CONFIG_SYS_PROMPT was removed from all <soc>_common.h and <arch>_common.h
> >   files. This results in a streamlined default value across platforms, and
> >   includes the following files: spear-common, sunxi-common, mv-common,
> >   ti_armv7_common, tegra-common, at91-sama5_common, and zynq-common.
> > - Boards that relied on <arch/soc>_common.h values of CONFIG_SYS_PROMPT were
> >   not updated in their respective defconfig files under the assumption that
> >   since they did not explicitly define a value, they're fine with whatever
> >   the default is.
> > - On the other hand, boards that relied on a value defined in some
> >   <boards>_common.h file such as woodburn_common, rpi-common,
> >   bur_am335x_common, ls2085a_common, siemens_am33x_common, and
> >   omap3_evm_common, had their values moved to the respective defconfig files.
> > - The define V_PROMPT was removed, since it is not used anywhere except for
> >   assigning a value for CONFIG_SYS_PROMPT.
> >
> > Cc: Tom Rini <trini@konsulko.com>
> > Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
> > Cc: Stefano Babic <sbabic@denx.de>
> > Cc: Igor Grinberg <grinberg@compulab.co.il>
> > Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
> > ---
> > Changes in V2:
> >         - Migrate boards globally (compile tested with buildman on arm and
> >           powerpc)
> >         - Change default value to "=> "
> >         - V_PROMPT define removed as part of the migration
> >
> 
> > diff --git a/configs/T1023RDB_NAND_defconfig b/configs/T1023RDB_NAND_defconfig
> > index 3ee42d6..af44f87 100644
> > --- a/configs/T1023RDB_NAND_defconfig
> > +++ b/configs/T1023RDB_NAND_defconfig
> > @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
> >  # CONFIG_CMD_IMLS is not set
> >  # CONFIG_CMD_FLASH is not set
> >  CONFIG_SPI_FLASH=y
> > +CONFIG_SYS_PROMPT="=> "
> 
> 
> This is the same as the default.  It should not appear in a defconfig.

I'll take care of it in a V3...

> 
> It is not sorted by savedefconfig, either.
> 
> tools/moveconfig.py exists to do such things automatically.

OK I'll use it next time.

> 
> -- 
> Best Regards
> Masahiro Yamada
> 

[U-Boot] [PATCH V2 12/12] kconfig: add config option for shell prompt

[Stefano Babic]

Hi Tom,


this patch is across architectures - currently it is assigned to me. Do
you prefer I apply it as last of the series to u-boot-imx before my PR
or you want to apply it directly to mainline ?

Best regards,
Stefano


On 28/07/2015 09:08, Nikita Kiryanov wrote:
> Add option to set shell prompt string from menuconfig and migrate
> boards globally.
> 
> The migration is done as follows:
> - Boards that explicitly and unconditionally set CONFIG_SYS_PROMPT had the
>   entry moved to their defconfig files.
> - Boards that defined some kind of #ifdef logic which selects the
>   CONFIG_SYS_PROMPT (for example qemu-mips) got an #undef CONFIG_SYS_PROMPT
>   right before the #ifdef logic and were left alone.
> - This change forces CONFIG_SYS_PROMPT to be a per board decision, and thus
>   CONFIG_SYS_PROMPT was removed from all <soc>_common.h and <arch>_common.h
>   files. This results in a streamlined default value across platforms, and
>   includes the following files: spear-common, sunxi-common, mv-common,
>   ti_armv7_common, tegra-common, at91-sama5_common, and zynq-common.
> - Boards that relied on <arch/soc>_common.h values of CONFIG_SYS_PROMPT were
>   not updated in their respective defconfig files under the assumption that
>   since they did not explicitly define a value, they're fine with whatever
>   the default is.
> - On the other hand, boards that relied on a value defined in some
>   <boards>_common.h file such as woodburn_common, rpi-common,
>   bur_am335x_common, ls2085a_common, siemens_am33x_common, and
>   omap3_evm_common, had their values moved to the respective defconfig files.
> - The define V_PROMPT was removed, since it is not used anywhere except for
>   assigning a value for CONFIG_SYS_PROMPT.
> 
> Cc: Tom Rini <trini@konsulko.com>
> Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Igor Grinberg <grinberg@compulab.co.il>
> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
> ---
> Changes in V2:
> 	- Migrate boards globally (compile tested with buildman on arm and
> 	  powerpc)
> 	- Change default value to "=> "
> 	- V_PROMPT define removed as part of the migration
> 
>  common/Kconfig                                  | 7 +++++++
>  configs/M5208EVBE_defconfig                     | 1 +
>  configs/M52277EVB_defconfig                     | 1 +
>  configs/M5235EVB_defconfig                      | 1 +
>  configs/M5272C3_defconfig                       | 1 +
>  configs/M5275EVB_defconfig                      | 1 +
>  configs/M5282EVB_defconfig                      | 1 +
>  configs/M53017EVB_defconfig                     | 1 +
>  configs/M5329AFEE_defconfig                     | 1 +
>  configs/M5329BFEE_defconfig                     | 1 +
>  configs/M5373EVB_defconfig                      | 1 +
>  configs/M54418TWR_defconfig                     | 1 +
>  configs/M54418TWR_nand_mii_defconfig            | 1 +
>  configs/M54418TWR_nand_rmii_defconfig           | 1 +
>  configs/M54418TWR_nand_rmii_lowfreq_defconfig   | 1 +
>  configs/M54418TWR_serial_mii_defconfig          | 1 +
>  configs/M54418TWR_serial_rmii_defconfig         | 1 +
>  configs/M54451EVB_defconfig                     | 1 +
>  configs/M54455EVB_defconfig                     | 1 +
>  configs/M5475AFE_defconfig                      | 1 +
>  configs/M5475BFE_defconfig                      | 1 +
>  configs/M5475CFE_defconfig                      | 1 +
>  configs/M5475DFE_defconfig                      | 1 +
>  configs/M5475EFE_defconfig                      | 1 +
>  configs/M5475FFE_defconfig                      | 1 +
>  configs/M5475GFE_defconfig                      | 1 +
>  configs/M5485AFE_defconfig                      | 1 +
>  configs/M5485BFE_defconfig                      | 1 +
>  configs/M5485CFE_defconfig                      | 1 +
>  configs/M5485DFE_defconfig                      | 1 +
>  configs/M5485EFE_defconfig                      | 1 +
>  configs/M5485FFE_defconfig                      | 1 +
>  configs/M5485GFE_defconfig                      | 1 +
>  configs/M5485HFE_defconfig                      | 1 +
>  configs/MPC8349ITXGP_defconfig                  | 1 +
>  configs/MPC8349ITX_LOWBOOT_defconfig            | 1 +
>  configs/MPC8349ITX_defconfig                    | 1 +
>  configs/PATI_defconfig                          | 1 +
>  configs/T1023RDB_NAND_defconfig                 | 1 +
>  configs/T1023RDB_SDCARD_defconfig               | 1 +
>  configs/T1023RDB_SECURE_BOOT_defconfig          | 1 +
>  configs/T1023RDB_SPIFLASH_defconfig             | 1 +
>  configs/T1023RDB_defconfig                      | 1 +
>  configs/T1024QDS_D4_SECURE_BOOT_defconfig       | 1 +
>  configs/T1024QDS_NAND_defconfig                 | 1 +
>  configs/T1024QDS_SDCARD_defconfig               | 1 +
>  configs/T1024QDS_SECURE_BOOT_defconfig          | 1 +
>  configs/T1024QDS_SPIFLASH_defconfig             | 1 +
>  configs/T1024QDS_defconfig                      | 1 +
>  configs/T1024RDB_NAND_defconfig                 | 1 +
>  configs/T1024RDB_SDCARD_defconfig               | 1 +
>  configs/T1024RDB_SECURE_BOOT_defconfig          | 1 +
>  configs/T1024RDB_SPIFLASH_defconfig             | 1 +
>  configs/T1024RDB_defconfig                      | 1 +
>  configs/UCP1020_defconfig                       | 1 +
>  configs/VCMA9_defconfig                         | 1 +
>  configs/ac14xx_defconfig                        | 1 +
>  configs/adp-ag101_defconfig                     | 1 +
>  configs/adp-ag101p_defconfig                    | 1 +
>  configs/adp-ag102_defconfig                     | 1 +
>  configs/am3517_crane_defconfig                  | 1 +
>  configs/am3517_evm_defconfig                    | 1 +
>  configs/amcore_defconfig                        | 1 +
>  configs/apalis_t30_defconfig                    | 1 +
>  configs/apf27_defconfig                         | 1 +
>  configs/arcangel4_defconfig                     | 1 +
>  configs/arndale_defconfig                       | 1 +
>  configs/astro_mcf5373l_defconfig                | 1 +
>  configs/at91rm9200ek_defconfig                  | 1 +
>  configs/at91rm9200ek_ram_defconfig              | 1 +
>  configs/at91sam9260ek_dataflash_cs0_defconfig   | 1 +
>  configs/at91sam9260ek_dataflash_cs1_defconfig   | 1 +
>  configs/at91sam9260ek_nandflash_defconfig       | 1 +
>  configs/at91sam9261ek_dataflash_cs0_defconfig   | 1 +
>  configs/at91sam9261ek_dataflash_cs3_defconfig   | 1 +
>  configs/at91sam9261ek_nandflash_defconfig       | 1 +
>  configs/at91sam9263ek_dataflash_cs0_defconfig   | 1 +
>  configs/at91sam9263ek_dataflash_defconfig       | 1 +
>  configs/at91sam9263ek_nandflash_defconfig       | 1 +
>  configs/at91sam9263ek_norflash_boot_defconfig   | 1 +
>  configs/at91sam9263ek_norflash_defconfig        | 1 +
>  configs/at91sam9g10ek_dataflash_cs0_defconfig   | 1 +
>  configs/at91sam9g10ek_dataflash_cs3_defconfig   | 1 +
>  configs/at91sam9g10ek_nandflash_defconfig       | 1 +
>  configs/at91sam9g20ek_2mmc_defconfig            | 1 +
>  configs/at91sam9g20ek_2mmc_nandflash_defconfig  | 1 +
>  configs/at91sam9g20ek_dataflash_cs0_defconfig   | 1 +
>  configs/at91sam9g20ek_dataflash_cs1_defconfig   | 1 +
>  configs/at91sam9g20ek_nandflash_defconfig       | 1 +
>  configs/at91sam9m10g45ek_mmc_defconfig          | 1 +
>  configs/at91sam9m10g45ek_nandflash_defconfig    | 1 +
>  configs/at91sam9n12ek_mmc_defconfig             | 1 +
>  configs/at91sam9n12ek_nandflash_defconfig       | 1 +
>  configs/at91sam9n12ek_spiflash_defconfig        | 1 +
>  configs/at91sam9rlek_dataflash_defconfig        | 1 +
>  configs/at91sam9rlek_mmc_defconfig              | 1 +
>  configs/at91sam9rlek_nandflash_defconfig        | 1 +
>  configs/at91sam9x5ek_dataflash_defconfig        | 1 +
>  configs/at91sam9x5ek_mmc_defconfig              | 1 +
>  configs/at91sam9x5ek_nandflash_defconfig        | 1 +
>  configs/at91sam9x5ek_spiflash_defconfig         | 1 +
>  configs/at91sam9xeek_dataflash_cs0_defconfig    | 1 +
>  configs/at91sam9xeek_dataflash_cs1_defconfig    | 1 +
>  configs/at91sam9xeek_nandflash_defconfig        | 1 +
>  configs/atngw100_defconfig                      | 1 +
>  configs/atngw100mkii_defconfig                  | 1 +
>  configs/atstk1002_defconfig                     | 1 +
>  configs/axs101_defconfig                        | 1 +
>  configs/beaver_defconfig                        | 1 +
>  configs/bf537-minotaur_defconfig                | 1 +
>  configs/bf537-srv1_defconfig                    | 1 +
>  configs/bf561-acvilon_defconfig                 | 1 +
>  configs/br4_defconfig                           | 1 +
>  configs/cairo_defconfig                         | 1 +
>  configs/calimain_defconfig                      | 1 +
>  configs/cam_enc_4xx_defconfig                   | 1 +
>  configs/cardhu_defconfig                        | 1 +
>  configs/cgtqmx6qeval_defconfig                  | 1 +
>  configs/cm_fx6_defconfig                        | 1 +
>  configs/cm_t335_defconfig                       | 1 +
>  configs/cm_t3517_defconfig                      | 1 +
>  configs/cm_t35_defconfig                        | 1 +
>  configs/cm_t54_defconfig                        | 1 +
>  configs/cobra5272_defconfig                     | 1 +
>  configs/colibri_t20_defconfig                   | 1 +
>  configs/colibri_t30_defconfig                   | 1 +
>  configs/colibri_vf_defconfig                    | 1 +
>  configs/colibri_vf_dtb_defconfig                | 1 +
>  configs/corvus_defconfig                        | 1 +
>  configs/cpu9260_128M_defconfig                  | 1 +
>  configs/cpu9260_defconfig                       | 1 +
>  configs/cpu9260_nand_128M_defconfig             | 1 +
>  configs/cpu9260_nand_defconfig                  | 1 +
>  configs/cpu9G20_128M_defconfig                  | 1 +
>  configs/cpu9G20_defconfig                       | 1 +
>  configs/cpu9G20_nand_128M_defconfig             | 1 +
>  configs/cpu9G20_nand_defconfig                  | 1 +
>  configs/cpuat91_defconfig                       | 1 +
>  configs/da830evm_defconfig                      | 1 +
>  configs/da850evm_defconfig                      | 1 +
>  configs/da850evm_direct_nor_defconfig           | 1 +
>  configs/dalmore_defconfig                       | 1 +
>  configs/davinci_dm355evm_defconfig              | 1 +
>  configs/davinci_dm355leopard_defconfig          | 1 +
>  configs/davinci_dm365evm_defconfig              | 1 +
>  configs/davinci_dm6467evm_defconfig             | 1 +
>  configs/davinci_dvevm_defconfig                 | 1 +
>  configs/davinci_schmoogie_defconfig             | 1 +
>  configs/davinci_sffsdr_defconfig                | 1 +
>  configs/davinci_sonata_defconfig                | 1 +
>  configs/dbau1000_defconfig                      | 1 +
>  configs/dbau1100_defconfig                      | 1 +
>  configs/dbau1500_defconfig                      | 1 +
>  configs/dbau1550_defconfig                      | 1 +
>  configs/dbau1550_el_defconfig                   | 1 +
>  configs/dig297_defconfig                        | 1 +
>  configs/dockstar_defconfig                      | 1 +
>  configs/draco_defconfig                         | 1 +
>  configs/duovero_defconfig                       | 1 +
>  configs/ea20_defconfig                          | 1 +
>  configs/eb_cpu5282_defconfig                    | 1 +
>  configs/eb_cpux9k2_defconfig                    | 1 +
>  configs/eco5pk_defconfig                        | 1 +
>  configs/edminiv2_defconfig                      | 1 +
>  configs/ethernut5_defconfig                     | 1 +
>  configs/flea3_defconfig                         | 1 +
>  configs/fx12mm_defconfig                        | 1 +
>  configs/goflexhome_defconfig                    | 1 +
>  configs/grasshopper_defconfig                   | 1 +
>  configs/gwventana_defconfig                     | 1 +
>  configs/h2200_defconfig                         | 1 +
>  configs/harmony_defconfig                       | 1 +
>  configs/hrcon_defconfig                         | 1 +
>  configs/ib62x0_defconfig                        | 1 +
>  configs/iconnect_defconfig                      | 1 +
>  configs/ima3-mx53_defconfig                     | 1 +
>  configs/imx31_litekit_defconfig                 | 1 +
>  configs/imx31_phycore_defconfig                 | 1 +
>  configs/integratorap_cm720t_defconfig           | 1 +
>  configs/integratorap_cm920t_defconfig           | 1 +
>  configs/integratorap_cm926ejs_defconfig         | 1 +
>  configs/integratorap_cm946es_defconfig          | 1 +
>  configs/integratorcp_cm1136_defconfig           | 1 +
>  configs/integratorcp_cm920t_defconfig           | 1 +
>  configs/integratorcp_cm926ejs_defconfig         | 1 +
>  configs/integratorcp_cm946es_defconfig          | 1 +
>  configs/ipam390_defconfig                       | 1 +
>  configs/jetson-tk1_defconfig                    | 1 +
>  configs/jornada_defconfig                       | 1 +
>  configs/k2e_evm_defconfig                       | 1 +
>  configs/k2hk_evm_defconfig                      | 1 +
>  configs/k2l_evm_defconfig                       | 1 +
>  configs/kwb_defconfig                           | 1 +
>  configs/kzm9g_defconfig                         | 1 +
>  configs/ls2085a_emu_D4_defconfig                | 1 +
>  configs/ls2085a_emu_defconfig                   | 1 +
>  configs/ls2085a_simu_defconfig                  | 1 +
>  configs/ls2085aqds_defconfig                    | 1 +
>  configs/ls2085aqds_nand_defconfig               | 1 +
>  configs/ls2085ardb_defconfig                    | 1 +
>  configs/ls2085ardb_nand_defconfig               | 1 +
>  configs/mcx_defconfig                           | 1 +
>  configs/medcom-wide_defconfig                   | 1 +
>  configs/microblaze-generic_defconfig            | 1 +
>  configs/ml507_defconfig                         | 1 +
>  configs/mt_ventoux_defconfig                    | 1 +
>  configs/mx51_efikamx_defconfig                  | 1 +
>  configs/nas220_defconfig                        | 1 +
>  configs/nhk8815_defconfig                       | 1 +
>  configs/nokia_rx51_defconfig                    | 1 +
>  configs/nyan-big_defconfig                      | 1 +
>  configs/odroid-xu3_defconfig                    | 1 +
>  configs/odroid_defconfig                        | 1 +
>  configs/omap3_evm_defconfig                     | 1 +
>  configs/omap3_evm_quick_mmc_defconfig           | 1 +
>  configs/omap3_evm_quick_nand_defconfig          | 1 +
>  configs/omap3_logic_defconfig                   | 1 +
>  configs/omap3_mvblx_defconfig                   | 1 +
>  configs/omap3_overo_defconfig                   | 1 +
>  configs/omap3_pandora_defconfig                 | 1 +
>  configs/omap3_sdp3430_defconfig                 | 1 +
>  configs/omapl138_lcdk_defconfig                 | 1 +
>  configs/origen_defconfig                        | 1 +
>  configs/palmld_defconfig                        | 1 +
>  configs/palmtc_defconfig                        | 1 +
>  configs/paz00_defconfig                         | 1 +
>  configs/pb1000_defconfig                        | 1 +
>  configs/pcm030_defconfig                        | 1 +
>  configs/peach-pi_defconfig                      | 1 +
>  configs/peach-pit_defconfig                     | 1 +
>  configs/pepper_defconfig                        | 1 +
>  configs/platinum_picon_defconfig                | 1 +
>  configs/platinum_titanium_defconfig             | 1 +
>  configs/plutux_defconfig                        | 1 +
>  configs/pm9261_defconfig                        | 1 +
>  configs/pm9263_defconfig                        | 1 +
>  configs/pm9g45_defconfig                        | 1 +
>  configs/pogo_e02_defconfig                      | 1 +
>  configs/pr1_defconfig                           | 1 +
>  configs/pxm2_defconfig                          | 1 +
>  configs/rastaban_defconfig                      | 1 +
>  configs/rpi_2_defconfig                         | 1 +
>  configs/rpi_defconfig                           | 1 +
>  configs/rut_defconfig                           | 1 +
>  configs/s5p_goni_defconfig                      | 1 +
>  configs/s5pc210_universal_defconfig             | 1 +
>  configs/scb9328_defconfig                       | 1 +
>  configs/seaboard_defconfig                      | 1 +
>  configs/secomx6quq7_defconfig                   | 1 +
>  configs/smdk2410_defconfig                      | 1 +
>  configs/smdk5250_defconfig                      | 1 +
>  configs/smdk5420_defconfig                      | 1 +
>  configs/smdkc100_defconfig                      | 1 +
>  configs/smdkv310_defconfig                      | 1 +
>  configs/snapper9260_defconfig                   | 1 +
>  configs/snow_defconfig                          | 1 +
>  configs/snowball_defconfig                      | 1 +
>  configs/stamp9g20_defconfig                     | 1 +
>  configs/stm32f429-discovery_defconfig           | 1 +
>  configs/stv0991_defconfig                       | 1 +
>  configs/stxgp3_defconfig                        | 1 +
>  configs/stxssa_defconfig                        | 1 +
>  configs/tao3530_defconfig                       | 1 +
>  configs/taurus_defconfig                        | 1 +
>  configs/tb100_defconfig                         | 1 +
>  configs/tbs2910_defconfig                       | 1 +
>  configs/tec-ng_defconfig                        | 1 +
>  configs/tec_defconfig                           | 1 +
>  configs/thuban_defconfig                        | 1 +
>  configs/ti814x_evm_defconfig                    | 1 +
>  configs/ti816x_evm_defconfig                    | 1 +
>  configs/titanium_defconfig                      | 1 +
>  configs/trats2_defconfig                        | 1 +
>  configs/trats_defconfig                         | 1 +
>  configs/tricorder_defconfig                     | 1 +
>  configs/trimslice_defconfig                     | 1 +
>  configs/tseries_mmc_defconfig                   | 1 +
>  configs/tseries_nand_defconfig                  | 1 +
>  configs/tseries_spi_defconfig                   | 1 +
>  configs/tt01_defconfig                          | 1 +
>  configs/twister_defconfig                       | 1 +
>  configs/u8500_href_defconfig                    | 1 +
>  configs/usb_a9263_dataflash_defconfig           | 1 +
>  configs/v5fx30teval_defconfig                   | 1 +
>  configs/vct_platinum_defconfig                  | 1 +
>  configs/vct_platinum_onenand_defconfig          | 1 +
>  configs/vct_platinum_onenand_small_defconfig    | 1 +
>  configs/vct_platinum_small_defconfig            | 1 +
>  configs/vct_platinumavc_defconfig               | 1 +
>  configs/vct_platinumavc_onenand_defconfig       | 1 +
>  configs/vct_platinumavc_onenand_small_defconfig | 1 +
>  configs/vct_platinumavc_small_defconfig         | 1 +
>  configs/vct_premium_defconfig                   | 1 +
>  configs/vct_premium_onenand_defconfig           | 1 +
>  configs/vct_premium_onenand_small_defconfig     | 1 +
>  configs/vct_premium_small_defconfig             | 1 +
>  configs/venice2_defconfig                       | 1 +
>  configs/ventana_defconfig                       | 1 +
>  configs/vexpress_aemv8a_juno_defconfig          | 1 +
>  configs/vexpress_aemv8a_semi_defconfig          | 1 +
>  configs/vision2_defconfig                       | 1 +
>  configs/vl_ma2sc_defconfig                      | 1 +
>  configs/vpac270_nor_128_defconfig               | 1 +
>  configs/vpac270_nor_256_defconfig               | 1 +
>  configs/vpac270_ond_256_defconfig               | 1 +
>  configs/whistler_defconfig                      | 1 +
>  configs/wireless_space_defconfig                | 1 +
>  configs/woodburn_defconfig                      | 1 +
>  configs/woodburn_sd_defconfig                   | 1 +
>  configs/x600_defconfig                          | 1 +
>  configs/xilinx-ppc405-generic_defconfig         | 1 +
>  configs/xilinx-ppc440-generic_defconfig         | 1 +
>  configs/xilinx_zynqmp_defconfig                 | 1 +
>  configs/zipitz2_defconfig                       | 1 +
>  configs/zmx25_defconfig                         | 1 +
>  include/configs/M5208EVBE.h                     | 1 -
>  include/configs/M52277EVB.h                     | 1 -
>  include/configs/M5235EVB.h                      | 1 -
>  include/configs/M5272C3.h                       | 1 -
>  include/configs/M5275EVB.h                      | 1 -
>  include/configs/M5282EVB.h                      | 1 -
>  include/configs/M53017EVB.h                     | 1 -
>  include/configs/M5329EVB.h                      | 1 -
>  include/configs/M5373EVB.h                      | 1 -
>  include/configs/M54418TWR.h                     | 1 -
>  include/configs/M54451EVB.h                     | 1 -
>  include/configs/M54455EVB.h                     | 1 -
>  include/configs/M5475EVB.h                      | 1 -
>  include/configs/M5485EVB.h                      | 1 -
>  include/configs/MPC8349ITX.h                    | 6 ------
>  include/configs/PATI.h                          | 1 -
>  include/configs/T102xQDS.h                      | 1 -
>  include/configs/T102xRDB.h                      | 1 -
>  include/configs/UCP1020.h                       | 1 -
>  include/configs/VCMA9.h                         | 1 -
>  include/configs/ac14xx.h                        | 1 -
>  include/configs/adp-ag101.h                     | 1 -
>  include/configs/adp-ag101p.h                    | 1 -
>  include/configs/adp-ag102.h                     | 1 -
>  include/configs/am3517_crane.h                  | 3 ---
>  include/configs/am3517_evm.h                    | 3 ---
>  include/configs/amcore.h                        | 1 -
>  include/configs/apalis_t30.h                    | 1 -
>  include/configs/apf27.h                         | 1 -
>  include/configs/arcangel4.h                     | 1 -
>  include/configs/arndale.h                       | 1 -
>  include/configs/astro_mcf5373l.h                | 2 --
>  include/configs/at91-sama5_common.h             | 1 -
>  include/configs/at91rm9200ek.h                  | 1 -
>  include/configs/at91sam9260ek.h                 | 1 -
>  include/configs/at91sam9261ek.h                 | 1 -
>  include/configs/at91sam9263ek.h                 | 1 -
>  include/configs/at91sam9m10g45ek.h              | 1 -
>  include/configs/at91sam9n12ek.h                 | 1 -
>  include/configs/at91sam9rlek.h                  | 1 -
>  include/configs/at91sam9x5ek.h                  | 1 -
>  include/configs/atngw100.h                      | 1 -
>  include/configs/atngw100mkii.h                  | 1 -
>  include/configs/atstk1002.h                     | 1 -
>  include/configs/axs101.h                        | 1 -
>  include/configs/balloon3.h                      | 1 +
>  include/configs/beaver.h                        | 1 -
>  include/configs/bf537-minotaur.h                | 1 -
>  include/configs/bf537-srv1.h                    | 1 -
>  include/configs/bf561-acvilon.h                 | 1 -
>  include/configs/br4.h                           | 1 -
>  include/configs/bur_am335x_common.h             | 1 -
>  include/configs/calimain.h                      | 1 -
>  include/configs/cam_enc_4xx.h                   | 1 -
>  include/configs/cardhu.h                        | 1 -
>  include/configs/cgtqmx6eval.h                   | 1 -
>  include/configs/cm_fx6.h                        | 1 -
>  include/configs/cm_t335.h                       | 3 ---
>  include/configs/cm_t35.h                        | 1 -
>  include/configs/cm_t3517.h                      | 1 -
>  include/configs/cm_t54.h                        | 2 --
>  include/configs/cobra5272.h                     | 2 --
>  include/configs/colibri_pxa270.h                | 1 +
>  include/configs/colibri_t20.h                   | 1 -
>  include/configs/colibri_t30.h                   | 1 -
>  include/configs/colibri_vf.h                    | 1 -
>  include/configs/corvus.h                        | 1 -
>  include/configs/cpu9260.h                       | 5 -----
>  include/configs/cpuat91.h                       | 1 -
>  include/configs/da830evm.h                      | 1 -
>  include/configs/da850evm.h                      | 1 -
>  include/configs/dalmore.h                       | 1 -
>  include/configs/davinci_dm355evm.h              | 1 -
>  include/configs/davinci_dm355leopard.h          | 1 -
>  include/configs/davinci_dm365evm.h              | 1 -
>  include/configs/davinci_dm6467evm.h             | 1 -
>  include/configs/davinci_dvevm.h                 | 1 -
>  include/configs/davinci_schmoogie.h             | 1 -
>  include/configs/davinci_sffsdr.h                | 1 -
>  include/configs/davinci_sonata.h                | 1 -
>  include/configs/dbau1x00.h                      | 2 --
>  include/configs/dig297.h                        | 1 -
>  include/configs/dockstar.h                      | 3 ---
>  include/configs/duovero.h                       | 3 ---
>  include/configs/ea20.h                          | 1 -
>  include/configs/eb_cpu5282.h                    | 1 -
>  include/configs/eb_cpux9k2.h                    | 1 -
>  include/configs/eco5pk.h                        | 6 ------
>  include/configs/edb93xx.h                       | 2 +-
>  include/configs/edminiv2.h                      | 1 -
>  include/configs/ethernut5.h                     | 1 -
>  include/configs/flea3.h                         | 1 -
>  include/configs/fx12mm.h                        | 1 -
>  include/configs/goflexhome.h                    | 3 ---
>  include/configs/grasshopper.h                   | 1 -
>  include/configs/gw_ventana.h                    | 1 -
>  include/configs/h2200.h                         | 1 -
>  include/configs/harmony.h                       | 1 -
>  include/configs/hrcon.h                         | 1 -
>  include/configs/ib62x0.h                        | 3 ---
>  include/configs/iconnect.h                      | 3 ---
>  include/configs/ima3-mx53.h                     | 1 -
>  include/configs/imx31_litekit.h                 | 1 -
>  include/configs/imx31_phycore.h                 | 1 -
>  include/configs/integratorap.h                  | 5 -----
>  include/configs/integratorcp.h                  | 2 --
>  include/configs/ipam390.h                       | 1 -
>  include/configs/jetson-tk1.h                    | 1 -
>  include/configs/jornada.h                       | 1 -
>  include/configs/k2e_evm.h                       | 2 --
>  include/configs/k2hk_evm.h                      | 2 --
>  include/configs/k2l_evm.h                       | 2 --
>  include/configs/kzm9g.h                         | 1 -
>  include/configs/lp8x4x.h                        | 1 +
>  include/configs/ls2085a_common.h                | 1 -
>  include/configs/lsxl.h                          | 1 -
>  include/configs/malta.h                         | 1 +
>  include/configs/mcx.h                           | 3 ---
>  include/configs/medcom-wide.h                   | 1 -
>  include/configs/microblaze-generic.h            | 2 --
>  include/configs/ml507.h                         | 1 -
>  include/configs/mt_ventoux.h                    | 6 ------
>  include/configs/mv-common.h                     | 1 -
>  include/configs/mx51_efikamx.h                  | 1 -
>  include/configs/nas220.h                        | 4 ----
>  include/configs/nhk8815.h                       | 1 -
>  include/configs/nokia_rx51.h                    | 1 -
>  include/configs/nyan-big.h                      | 1 -
>  include/configs/odroid.h                        | 3 ---
>  include/configs/odroid_xu3.h                    | 1 -
>  include/configs/omap3_cairo.h                   | 4 ----
>  include/configs/omap3_evm_common.h              | 1 -
>  include/configs/omap3_logic.h                   | 1 -
>  include/configs/omap3_mvblx.h                   | 1 -
>  include/configs/omap3_overo.h                   | 6 ------
>  include/configs/omap3_pandora.h                 | 6 ------
>  include/configs/omap3_sdp3430.h                 | 1 -
>  include/configs/omapl138_lcdk.h                 | 1 -
>  include/configs/origen.h                        | 3 ---
>  include/configs/palmld.h                        | 3 ---
>  include/configs/palmtc.h                        | 3 ---
>  include/configs/palmtreo680.h                   | 1 +
>  include/configs/paz00.h                         | 1 -
>  include/configs/pb1x00.h                        | 1 -
>  include/configs/pcm030.h                        | 1 -
>  include/configs/peach-pi.h                      | 1 -
>  include/configs/peach-pit.h                     | 1 -
>  include/configs/pepper.h                        | 3 ---
>  include/configs/platinum_picon.h                | 2 --
>  include/configs/platinum_titanium.h             | 2 --
>  include/configs/plutux.h                        | 1 -
>  include/configs/pm9261.h                        | 1 -
>  include/configs/pm9263.h                        | 1 -
>  include/configs/pm9g45.h                        | 1 -
>  include/configs/pogo_e02.h                      | 4 ----
>  include/configs/pr1.h                           | 1 -
>  include/configs/pxa255_idp.h                    | 1 +
>  include/configs/qemu-mips.h                     | 1 +
>  include/configs/qemu-mips64.h                   | 1 +
>  include/configs/rpi-common.h                    | 1 -
>  include/configs/s5p_goni.h                      | 1 -
>  include/configs/s5pc210_universal.h             | 3 ---
>  include/configs/scb9328.h                       | 1 -
>  include/configs/seaboard.h                      | 1 -
>  include/configs/secomx6quq7.h                   | 3 ---
>  include/configs/siemens-am33x-common.h          | 1 -
>  include/configs/smdk2410.h                      | 1 -
>  include/configs/smdk5250.h                      | 1 -
>  include/configs/smdk5420.h                      | 1 -
>  include/configs/smdkc100.h                      | 1 -
>  include/configs/smdkv310.h                      | 1 -
>  include/configs/snapper9260.h                   | 1 -
>  include/configs/snow.h                          | 1 -
>  include/configs/snowball.h                      | 1 -
>  include/configs/spear-common.h                  | 1 -
>  include/configs/stamp9g20.h                     | 1 -
>  include/configs/stm32f429-discovery.h           | 1 -
>  include/configs/stv0991.h                       | 1 -
>  include/configs/stxgp3.h                        | 1 -
>  include/configs/stxssa.h                        | 1 -
>  include/configs/sunxi-common.h                  | 2 --
>  include/configs/tao3530.h                       | 1 -
>  include/configs/taurus.h                        | 1 -
>  include/configs/tb100.h                         | 1 -
>  include/configs/tbs2910.h                       | 1 -
>  include/configs/tec-ng.h                        | 1 -
>  include/configs/tec.h                           | 1 -
>  include/configs/tegra-common.h                  | 4 ----
>  include/configs/ti814x_evm.h                    | 1 -
>  include/configs/ti816x_evm.h                    | 1 -
>  include/configs/ti_armv7_common.h               | 1 -
>  include/configs/titanium.h                      | 3 ---
>  include/configs/trats.h                         | 2 --
>  include/configs/trats2.h                        | 3 ---
>  include/configs/tricorder.h                     | 1 -
>  include/configs/trimslice.h                     | 1 -
>  include/configs/trizepsiv.h                     | 1 +
>  include/configs/tt01.h                          | 1 -
>  include/configs/twister.h                       | 2 --
>  include/configs/u8500_href.h                    | 1 -
>  include/configs/usb_a9263.h                     | 1 -
>  include/configs/v5fx30teval.h                   | 1 -
>  include/configs/vct.h                           | 1 -
>  include/configs/venice2.h                       | 1 -
>  include/configs/ventana.h                       | 1 -
>  include/configs/versatile.h                     | 1 +
>  include/configs/vexpress_aemv8a.h               | 1 -
>  include/configs/vexpress_common.h               | 1 -
>  include/configs/vision2.h                       | 1 -
>  include/configs/vl_ma2sc.h                      | 1 -
>  include/configs/vpac270.h                       | 1 -
>  include/configs/whistler.h                      | 1 -
>  include/configs/wireless_space.h                | 2 --
>  include/configs/woodburn_common.h               | 1 -
>  include/configs/x600.h                          | 1 -
>  include/configs/xaeniax.h                       | 2 +-
>  include/configs/xilinx-ppc405-generic.h         | 1 -
>  include/configs/xilinx-ppc440-generic.h         | 1 -
>  include/configs/xilinx_zynqmp.h                 | 1 -
>  include/configs/zipitz2.h                       | 3 ---
>  include/configs/zmx25.h                         | 1 -
>  include/configs/zynq-common.h                   | 1 -
>  537 files changed, 333 insertions(+), 310 deletions(-)
> 
> diff --git a/common/Kconfig b/common/Kconfig
> index 40cd69e..88dc016 100644
> --- a/common/Kconfig
> +++ b/common/Kconfig
> @@ -17,6 +17,13 @@ config SYS_HUSH_PARSER
>  	help
>  	  Backward compatibility.
>  
> +config SYS_PROMPT
> +	string "Shell prompt"
> +	default "=> "
> +	help
> +	  This string is displayed in the command line to the left of the
> +	  cursor.
> +
>  menu "Autoboot options"
>  
>  config AUTOBOOT_KEYED
> diff --git a/configs/M5208EVBE_defconfig b/configs/M5208EVBE_defconfig
> index 58de96b..6a46194 100644
> --- a/configs/M5208EVBE_defconfig
> +++ b/configs/M5208EVBE_defconfig
> @@ -1,3 +1,4 @@
>  CONFIG_M68K=y
>  CONFIG_TARGET_M5208EVBE=y
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/M52277EVB_defconfig b/configs/M52277EVB_defconfig
> index 6a2d175..608edc5 100644
> --- a/configs/M52277EVB_defconfig
> +++ b/configs/M52277EVB_defconfig
> @@ -5,3 +5,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_SPANSION_BOOT,SYS_TEXT_BASE=0x00000000"
>  # CONFIG_CMD_NET is not set
>  # CONFIG_CMD_NFS is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/M5235EVB_defconfig b/configs/M5235EVB_defconfig
> index 3292cff..e9c2b7c 100644
> --- a/configs/M5235EVB_defconfig
> +++ b/configs/M5235EVB_defconfig
> @@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFFE00000"
>  # CONFIG_CMD_LOADB is not set
>  # CONFIG_CMD_LOADS is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/M5272C3_defconfig b/configs/M5272C3_defconfig
> index 23d5468..6ad4e13 100644
> --- a/configs/M5272C3_defconfig
> +++ b/configs/M5272C3_defconfig
> @@ -3,3 +3,4 @@ CONFIG_TARGET_M5272C3=y
>  # CONFIG_CMD_LOADB is not set
>  # CONFIG_CMD_LOADS is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/M5275EVB_defconfig b/configs/M5275EVB_defconfig
> index f051bf1..b29021b 100644
> --- a/configs/M5275EVB_defconfig
> +++ b/configs/M5275EVB_defconfig
> @@ -3,3 +3,4 @@ CONFIG_TARGET_M5275EVB=y
>  # CONFIG_CMD_LOADB is not set
>  # CONFIG_CMD_LOADS is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/M5282EVB_defconfig b/configs/M5282EVB_defconfig
> index 6c130e8..322ee9a 100644
> --- a/configs/M5282EVB_defconfig
> +++ b/configs/M5282EVB_defconfig
> @@ -3,3 +3,4 @@ CONFIG_TARGET_M5282EVB=y
>  # CONFIG_CMD_LOADB is not set
>  # CONFIG_CMD_LOADS is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/M53017EVB_defconfig b/configs/M53017EVB_defconfig
> index 1f5bc86..3e72290 100644
> --- a/configs/M53017EVB_defconfig
> +++ b/configs/M53017EVB_defconfig
> @@ -1,3 +1,4 @@
>  CONFIG_M68K=y
>  CONFIG_TARGET_M53017EVB=y
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/M5329AFEE_defconfig b/configs/M5329AFEE_defconfig
> index 02af3a4..1d2bb81 100644
> --- a/configs/M5329AFEE_defconfig
> +++ b/configs/M5329AFEE_defconfig
> @@ -2,3 +2,4 @@ CONFIG_M68K=y
>  CONFIG_TARGET_M5329EVB=y
>  CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=0"
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/M5329BFEE_defconfig b/configs/M5329BFEE_defconfig
> index f757a35..915734c 100644
> --- a/configs/M5329BFEE_defconfig
> +++ b/configs/M5329BFEE_defconfig
> @@ -2,3 +2,4 @@ CONFIG_M68K=y
>  CONFIG_TARGET_M5329EVB=y
>  CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=16"
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/M5373EVB_defconfig b/configs/M5373EVB_defconfig
> index 304ca48..eb7a96a 100644
> --- a/configs/M5373EVB_defconfig
> +++ b/configs/M5373EVB_defconfig
> @@ -2,3 +2,4 @@ CONFIG_M68K=y
>  CONFIG_TARGET_M5373EVB=y
>  CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=16"
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/M54418TWR_defconfig b/configs/M54418TWR_defconfig
> index 9a93b3b..a5c35d1 100644
> --- a/configs/M54418TWR_defconfig
> +++ b/configs/M54418TWR_defconfig
> @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_IN
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/M54418TWR_nand_mii_defconfig b/configs/M54418TWR_nand_mii_defconfig
> index c194ea7..20eadcf 100644
> --- a/configs/M54418TWR_nand_mii_defconfig
> +++ b/configs/M54418TWR_nand_mii_defconfig
> @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSR
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/M54418TWR_nand_rmii_defconfig b/configs/M54418TWR_nand_rmii_defconfig
> index 4ee35ff..d47127c 100644
> --- a/configs/M54418TWR_nand_rmii_defconfig
> +++ b/configs/M54418TWR_nand_rmii_defconfig
> @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSR
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/M54418TWR_nand_rmii_lowfreq_defconfig b/configs/M54418TWR_nand_rmii_lowfreq_defconfig
> index 4c4b70a..700745d 100644
> --- a/configs/M54418TWR_nand_rmii_lowfreq_defconfig
> +++ b/configs/M54418TWR_nand_rmii_lowfreq_defconfig
> @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,LOW_MCFCLK,SYS_TEXT_BASE=0x47E00000,SYS_
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/M54418TWR_serial_mii_defconfig b/configs/M54418TWR_serial_mii_defconfig
> index 3be102c..4450084 100644
> --- a/configs/M54418TWR_serial_mii_defconfig
> +++ b/configs/M54418TWR_serial_mii_defconfig
> @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_IN
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/M54418TWR_serial_rmii_defconfig b/configs/M54418TWR_serial_rmii_defconfig
> index 9a93b3b..a5c35d1 100644
> --- a/configs/M54418TWR_serial_rmii_defconfig
> +++ b/configs/M54418TWR_serial_rmii_defconfig
> @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_IN
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/M54451EVB_defconfig b/configs/M54451EVB_defconfig
> index b35bb81..0b446b8 100644
> --- a/configs/M54451EVB_defconfig
> +++ b/configs/M54451EVB_defconfig
> @@ -5,3 +5,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x00000000,SYS_INPUT_CLKSRC=24000000"
>  # CONFIG_CMD_LOADS is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/M54455EVB_defconfig b/configs/M54455EVB_defconfig
> index cb56586..c7a0164 100644
> --- a/configs/M54455EVB_defconfig
> +++ b/configs/M54455EVB_defconfig
> @@ -5,3 +5,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_ATMEL_BOOT,SYS_TEXT_BASE=0x04000000,SYS_INPUT_CLKS
>  # CONFIG_CMD_LOADS is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/M5475AFE_defconfig b/configs/M5475AFE_defconfig
> index 343f52f..b29d1a6 100644
> --- a/configs/M5475AFE_defconfig
> +++ b/configs/M5475AFE_defconfig
> @@ -2,3 +2,4 @@ CONFIG_M68K=y
>  CONFIG_TARGET_M5475EVB=y
>  CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64"
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/M5475BFE_defconfig b/configs/M5475BFE_defconfig
> index c9667da..e62fbf6 100644
> --- a/configs/M5475BFE_defconfig
> +++ b/configs/M5475BFE_defconfig
> @@ -2,3 +2,4 @@ CONFIG_M68K=y
>  CONFIG_TARGET_M5475EVB=y
>  CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16"
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/M5475CFE_defconfig b/configs/M5475CFE_defconfig
> index c1a9558..195b4e3 100644
> --- a/configs/M5475CFE_defconfig
> +++ b/configs/M5475CFE_defconfig
> @@ -2,3 +2,4 @@ CONFIG_M68K=y
>  CONFIG_TARGET_M5475EVB=y
>  CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO,SYS_USBCTRL"
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/M5475DFE_defconfig b/configs/M5475DFE_defconfig
> index d879894..314ced6 100644
> --- a/configs/M5475DFE_defconfig
> +++ b/configs/M5475DFE_defconfig
> @@ -2,3 +2,4 @@ CONFIG_M68K=y
>  CONFIG_TARGET_M5475EVB=y
>  CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_USBCTRL"
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/M5475EFE_defconfig b/configs/M5475EFE_defconfig
> index 9b677ee..279808f 100644
> --- a/configs/M5475EFE_defconfig
> +++ b/configs/M5475EFE_defconfig
> @@ -2,3 +2,4 @@ CONFIG_M68K=y
>  CONFIG_TARGET_M5475EVB=y
>  CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_VIDEO,SYS_USBCTRL"
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/M5475FFE_defconfig b/configs/M5475FFE_defconfig
> index 4989b00..a00100e 100644
> --- a/configs/M5475FFE_defconfig
> +++ b/configs/M5475FFE_defconfig
> @@ -2,3 +2,4 @@ CONFIG_M68K=y
>  CONFIG_TARGET_M5475EVB=y
>  CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=32,SYS_VIDEO,SYS_USBCTRL,SYS_DRAMSZ1=64"
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/M5475GFE_defconfig b/configs/M5475GFE_defconfig
> index 31df40e..1ea82a7 100644
> --- a/configs/M5475GFE_defconfig
> +++ b/configs/M5475GFE_defconfig
> @@ -2,3 +2,4 @@ CONFIG_M68K=y
>  CONFIG_TARGET_M5475EVB=y
>  CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=4,SYS_DRAMSZ=64"
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/M5485AFE_defconfig b/configs/M5485AFE_defconfig
> index 5381b74..70cfa8f 100644
> --- a/configs/M5485AFE_defconfig
> +++ b/configs/M5485AFE_defconfig
> @@ -2,3 +2,4 @@ CONFIG_M68K=y
>  CONFIG_TARGET_M5485EVB=y
>  CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64"
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/M5485BFE_defconfig b/configs/M5485BFE_defconfig
> index 36dcccf..377b87f 100644
> --- a/configs/M5485BFE_defconfig
> +++ b/configs/M5485BFE_defconfig
> @@ -2,3 +2,4 @@ CONFIG_M68K=y
>  CONFIG_TARGET_M5485EVB=y
>  CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16"
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/M5485CFE_defconfig b/configs/M5485CFE_defconfig
> index e5cc1e1..faa0196 100644
> --- a/configs/M5485CFE_defconfig
> +++ b/configs/M5485CFE_defconfig
> @@ -2,3 +2,4 @@ CONFIG_M68K=y
>  CONFIG_TARGET_M5485EVB=y
>  CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO,SYS_USBCTRL"
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/M5485DFE_defconfig b/configs/M5485DFE_defconfig
> index fdf667a..71a028f 100644
> --- a/configs/M5485DFE_defconfig
> +++ b/configs/M5485DFE_defconfig
> @@ -2,3 +2,4 @@ CONFIG_M68K=y
>  CONFIG_TARGET_M5485EVB=y
>  CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_USBCTRL"
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/M5485EFE_defconfig b/configs/M5485EFE_defconfig
> index a5933f2..784803e 100644
> --- a/configs/M5485EFE_defconfig
> +++ b/configs/M5485EFE_defconfig
> @@ -2,3 +2,4 @@ CONFIG_M68K=y
>  CONFIG_TARGET_M5485EVB=y
>  CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_VIDEO,SYS_USBCTRL"
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/M5485FFE_defconfig b/configs/M5485FFE_defconfig
> index 116c5cc..8a831e3 100644
> --- a/configs/M5485FFE_defconfig
> +++ b/configs/M5485FFE_defconfig
> @@ -2,3 +2,4 @@ CONFIG_M68K=y
>  CONFIG_TARGET_M5485EVB=y
>  CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=32,SYS_VIDEO,SYS_USBCTRL,SYS_DRAMSZ1=64"
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/M5485GFE_defconfig b/configs/M5485GFE_defconfig
> index fd5fc1a..00c7479 100644
> --- a/configs/M5485GFE_defconfig
> +++ b/configs/M5485GFE_defconfig
> @@ -2,3 +2,4 @@ CONFIG_M68K=y
>  CONFIG_TARGET_M5485EVB=y
>  CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=4,SYS_DRAMSZ=64"
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/M5485HFE_defconfig b/configs/M5485HFE_defconfig
> index 6e2768c..887bd4d 100644
> --- a/configs/M5485HFE_defconfig
> +++ b/configs/M5485HFE_defconfig
> @@ -2,3 +2,4 @@ CONFIG_M68K=y
>  CONFIG_TARGET_M5485EVB=y
>  CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO"
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="-> "
> diff --git a/configs/MPC8349ITXGP_defconfig b/configs/MPC8349ITXGP_defconfig
> index 7a43fa0..4578b32 100644
> --- a/configs/MPC8349ITXGP_defconfig
> +++ b/configs/MPC8349ITXGP_defconfig
> @@ -3,3 +3,4 @@ CONFIG_MPC83xx=y
>  CONFIG_TARGET_MPC8349ITX=y
>  CONFIG_SYS_EXTRA_OPTIONS="MPC8349ITXGP,SYS_TEXT_BASE=0xFE000000"
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="MPC8349E-mITX-GP> "
> diff --git a/configs/MPC8349ITX_LOWBOOT_defconfig b/configs/MPC8349ITX_LOWBOOT_defconfig
> index f74d42c..c5fbeb9 100644
> --- a/configs/MPC8349ITX_LOWBOOT_defconfig
> +++ b/configs/MPC8349ITX_LOWBOOT_defconfig
> @@ -3,3 +3,4 @@ CONFIG_MPC83xx=y
>  CONFIG_TARGET_MPC8349ITX=y
>  CONFIG_SYS_EXTRA_OPTIONS="MPC8349ITX,SYS_TEXT_BASE=0xFE000000"
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="MPC8349E-mITX> "
> diff --git a/configs/MPC8349ITX_defconfig b/configs/MPC8349ITX_defconfig
> index 84c117c..a895c53 100644
> --- a/configs/MPC8349ITX_defconfig
> +++ b/configs/MPC8349ITX_defconfig
> @@ -3,3 +3,4 @@ CONFIG_MPC83xx=y
>  CONFIG_TARGET_MPC8349ITX=y
>  CONFIG_SYS_EXTRA_OPTIONS="MPC8349ITX"
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="MPC8349E-mITX> "
> diff --git a/configs/PATI_defconfig b/configs/PATI_defconfig
> index da8525e..6c1bf17 100644
> --- a/configs/PATI_defconfig
> +++ b/configs/PATI_defconfig
> @@ -13,3 +13,4 @@ CONFIG_TARGET_PATI=y
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NET is not set
>  # CONFIG_CMD_NFS is not set
> +CONFIG_SYS_PROMPT="pati=> "
> diff --git a/configs/T1023RDB_NAND_defconfig b/configs/T1023RDB_NAND_defconfig
> index 3ee42d6..af44f87 100644
> --- a/configs/T1023RDB_NAND_defconfig
> +++ b/configs/T1023RDB_NAND_defconfig
> @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="=> "
> diff --git a/configs/T1023RDB_SDCARD_defconfig b/configs/T1023RDB_SDCARD_defconfig
> index ed67945..f2cb98f 100644
> --- a/configs/T1023RDB_SDCARD_defconfig
> +++ b/configs/T1023RDB_SDCARD_defconfig
> @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="=> "
> diff --git a/configs/T1023RDB_SECURE_BOOT_defconfig b/configs/T1023RDB_SECURE_BOOT_defconfig
> index 76e3e91..6ae58a6 100644
> --- a/configs/T1023RDB_SECURE_BOOT_defconfig
> +++ b/configs/T1023RDB_SECURE_BOOT_defconfig
> @@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
>  CONFIG_TARGET_T102XRDB=y
>  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,SECURE_BOOT"
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="=> "
> diff --git a/configs/T1023RDB_SPIFLASH_defconfig b/configs/T1023RDB_SPIFLASH_defconfig
> index e7f4525..08bc509 100644
> --- a/configs/T1023RDB_SPIFLASH_defconfig
> +++ b/configs/T1023RDB_SPIFLASH_defconfig
> @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="=> "
> diff --git a/configs/T1023RDB_defconfig b/configs/T1023RDB_defconfig
> index 8ff03a5..fad0d30 100644
> --- a/configs/T1023RDB_defconfig
> +++ b/configs/T1023RDB_defconfig
> @@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
>  CONFIG_TARGET_T102XRDB=y
>  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB"
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="=> "
> diff --git a/configs/T1024QDS_D4_SECURE_BOOT_defconfig b/configs/T1024QDS_D4_SECURE_BOOT_defconfig
> index 06a9619..9f268df 100644
> --- a/configs/T1024QDS_D4_SECURE_BOOT_defconfig
> +++ b/configs/T1024QDS_D4_SECURE_BOOT_defconfig
> @@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
>  CONFIG_TARGET_T102XQDS=y
>  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,SYS_FSL_DDR4,SECURE_BOOT"
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="=> "
> diff --git a/configs/T1024QDS_NAND_defconfig b/configs/T1024QDS_NAND_defconfig
> index c49facf..172ebb5 100644
> --- a/configs/T1024QDS_NAND_defconfig
> +++ b/configs/T1024QDS_NAND_defconfig
> @@ -4,3 +4,4 @@ CONFIG_TARGET_T102XQDS=y
>  CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="=> "
> diff --git a/configs/T1024QDS_SDCARD_defconfig b/configs/T1024QDS_SDCARD_defconfig
> index 3a3beb1..7a78c1e 100644
> --- a/configs/T1024QDS_SDCARD_defconfig
> +++ b/configs/T1024QDS_SDCARD_defconfig
> @@ -4,3 +4,4 @@ CONFIG_TARGET_T102XQDS=y
>  CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="=> "
> diff --git a/configs/T1024QDS_SECURE_BOOT_defconfig b/configs/T1024QDS_SECURE_BOOT_defconfig
> index b0890a4..022f1b2 100644
> --- a/configs/T1024QDS_SECURE_BOOT_defconfig
> +++ b/configs/T1024QDS_SECURE_BOOT_defconfig
> @@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
>  CONFIG_TARGET_T102XQDS=y
>  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,SECURE_BOOT"
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="=> "
> diff --git a/configs/T1024QDS_SPIFLASH_defconfig b/configs/T1024QDS_SPIFLASH_defconfig
> index df3ca94..94f7386 100644
> --- a/configs/T1024QDS_SPIFLASH_defconfig
> +++ b/configs/T1024QDS_SPIFLASH_defconfig
> @@ -4,3 +4,4 @@ CONFIG_TARGET_T102XQDS=y
>  CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="=> "
> diff --git a/configs/T1024QDS_defconfig b/configs/T1024QDS_defconfig
> index 93588b7..520009f 100644
> --- a/configs/T1024QDS_defconfig
> +++ b/configs/T1024QDS_defconfig
> @@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
>  CONFIG_TARGET_T102XQDS=y
>  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024"
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="=> "
> diff --git a/configs/T1024RDB_NAND_defconfig b/configs/T1024RDB_NAND_defconfig
> index 6f4f026..fa6fd70 100644
> --- a/configs/T1024RDB_NAND_defconfig
> +++ b/configs/T1024RDB_NAND_defconfig
> @@ -4,3 +4,4 @@ CONFIG_TARGET_T102XRDB=y
>  CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="=> "
> diff --git a/configs/T1024RDB_SDCARD_defconfig b/configs/T1024RDB_SDCARD_defconfig
> index 53c5c8c..5eb84a8 100644
> --- a/configs/T1024RDB_SDCARD_defconfig
> +++ b/configs/T1024RDB_SDCARD_defconfig
> @@ -4,3 +4,4 @@ CONFIG_TARGET_T102XRDB=y
>  CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="=> "
> diff --git a/configs/T1024RDB_SECURE_BOOT_defconfig b/configs/T1024RDB_SECURE_BOOT_defconfig
> index 65e9a5a..ddf60fe 100644
> --- a/configs/T1024RDB_SECURE_BOOT_defconfig
> +++ b/configs/T1024RDB_SECURE_BOOT_defconfig
> @@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
>  CONFIG_TARGET_T102XRDB=y
>  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,SECURE_BOOT"
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="=> "
> diff --git a/configs/T1024RDB_SPIFLASH_defconfig b/configs/T1024RDB_SPIFLASH_defconfig
> index 60aee0d..48a72e7 100644
> --- a/configs/T1024RDB_SPIFLASH_defconfig
> +++ b/configs/T1024RDB_SPIFLASH_defconfig
> @@ -4,3 +4,4 @@ CONFIG_TARGET_T102XRDB=y
>  CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="=> "
> diff --git a/configs/T1024RDB_defconfig b/configs/T1024RDB_defconfig
> index 2da2ea7..0631647 100644
> --- a/configs/T1024RDB_defconfig
> +++ b/configs/T1024RDB_defconfig
> @@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
>  CONFIG_TARGET_T102XRDB=y
>  CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB"
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="=> "
> diff --git a/configs/UCP1020_defconfig b/configs/UCP1020_defconfig
> index 010b15f..cada7bb 100644
> --- a/configs/UCP1020_defconfig
> +++ b/configs/UCP1020_defconfig
> @@ -5,3 +5,4 @@ CONFIG_AUTOBOOT_KEYED=y
>  CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc>\" to stop\n"
>  CONFIG_AUTOBOOT_STOP_STR="\x1b"
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="B$ "
> diff --git a/configs/VCMA9_defconfig b/configs/VCMA9_defconfig
> index 8885f1a..e9b28a8 100644
> --- a/configs/VCMA9_defconfig
> +++ b/configs/VCMA9_defconfig
> @@ -1,3 +1,4 @@
>  CONFIG_ARM=y
>  CONFIG_TARGET_VCMA9=y
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="VCMA9 # "
> diff --git a/configs/ac14xx_defconfig b/configs/ac14xx_defconfig
> index 37fb0e0..238630e 100644
> --- a/configs/ac14xx_defconfig
> +++ b/configs/ac14xx_defconfig
> @@ -2,3 +2,4 @@ CONFIG_PPC=y
>  CONFIG_MPC512X=y
>  CONFIG_TARGET_AC14XX=y
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="ac14xx> "
> diff --git a/configs/adp-ag101_defconfig b/configs/adp-ag101_defconfig
> index e550f71..ac1dcaa 100644
> --- a/configs/adp-ag101_defconfig
> +++ b/configs/adp-ag101_defconfig
> @@ -1,3 +1,4 @@
>  CONFIG_NDS32=y
>  CONFIG_TARGET_ADP_AG101=y
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="NDS32 # "
> diff --git a/configs/adp-ag101p_defconfig b/configs/adp-ag101p_defconfig
> index 740cb57..92aa0be 100644
> --- a/configs/adp-ag101p_defconfig
> +++ b/configs/adp-ag101p_defconfig
> @@ -1,3 +1,4 @@
>  CONFIG_NDS32=y
>  CONFIG_TARGET_ADP_AG101P=y
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="NDS32 # "
> diff --git a/configs/adp-ag102_defconfig b/configs/adp-ag102_defconfig
> index 721f61d..1bef350 100644
> --- a/configs/adp-ag102_defconfig
> +++ b/configs/adp-ag102_defconfig
> @@ -3,3 +3,4 @@ CONFIG_TARGET_ADP_AG102=y
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="NDS32 # "
> diff --git a/configs/am3517_crane_defconfig b/configs/am3517_crane_defconfig
> index a44ffe7..806dc3a 100644
> --- a/configs/am3517_crane_defconfig
> +++ b/configs/am3517_crane_defconfig
> @@ -9,3 +9,4 @@ CONFIG_SPL=y
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NET is not set
>  # CONFIG_CMD_NFS is not set
> +CONFIG_SYS_PROMPT="AM3517_CRANE # "
> diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig
> index 4589b30..6eefd61 100644
> --- a/configs/am3517_evm_defconfig
> +++ b/configs/am3517_evm_defconfig
> @@ -7,3 +7,4 @@ CONFIG_SPL=y
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="AM3517_EVM # "
> diff --git a/configs/amcore_defconfig b/configs/amcore_defconfig
> index 47c4f3d..dc16d5b 100644
> --- a/configs/amcore_defconfig
> +++ b/configs/amcore_defconfig
> @@ -6,3 +6,4 @@ CONFIG_TARGET_AMCORE=y
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NET is not set
>  # CONFIG_CMD_NFS is not set
> +CONFIG_SYS_PROMPT="amcore $ "
> diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig
> index fa9f365..c0bc3c5 100644
> --- a/configs/apalis_t30_defconfig
> +++ b/configs/apalis_t30_defconfig
> @@ -12,3 +12,4 @@ CONFIG_SPL_DM=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="Apalis T30 # "
> diff --git a/configs/apf27_defconfig b/configs/apf27_defconfig
> index 854a2b7..4503235 100644
> --- a/configs/apf27_defconfig
> +++ b/configs/apf27_defconfig
> @@ -3,3 +3,4 @@ CONFIG_TARGET_APF27=y
>  CONFIG_SPL=y
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
> +CONFIG_SYS_PROMPT="BIOS> "
> diff --git a/configs/arcangel4_defconfig b/configs/arcangel4_defconfig
> index 5683b81..cd9aafd 100644
> --- a/configs/arcangel4_defconfig
> +++ b/configs/arcangel4_defconfig
> @@ -11,3 +11,4 @@ CONFIG_OF_EMBED=y
>  CONFIG_DM=y
>  CONFIG_DM_SERIAL=y
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="arcangel4# "
> diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig
> index aa489cf..43c5527 100644
> --- a/configs/arndale_defconfig
> +++ b/configs/arndale_defconfig
> @@ -13,3 +13,4 @@ CONFIG_SOUND_MAX98095=y
>  CONFIG_SOUND_WM8994=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
> +CONFIG_SYS_PROMPT="ARNDALE # "
> diff --git a/configs/astro_mcf5373l_defconfig b/configs/astro_mcf5373l_defconfig
> index f394f4d..8676120 100644
> --- a/configs/astro_mcf5373l_defconfig
> +++ b/configs/astro_mcf5373l_defconfig
> @@ -3,3 +3,4 @@ CONFIG_TARGET_ASTRO_MCF5373L=y
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NET is not set
>  # CONFIG_CMD_NFS is not set
> +CONFIG_SYS_PROMPT="URMEL > "
> diff --git a/configs/at91rm9200ek_defconfig b/configs/at91rm9200ek_defconfig
> index 74d4f3a..10df5f8 100644
> --- a/configs/at91rm9200ek_defconfig
> +++ b/configs/at91rm9200ek_defconfig
> @@ -3,3 +3,4 @@ CONFIG_ARCH_AT91=y
>  CONFIG_TARGET_AT91RM9200EK=y
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91rm9200ek_ram_defconfig b/configs/at91rm9200ek_ram_defconfig
> index f499453..2765e9d 100644
> --- a/configs/at91rm9200ek_ram_defconfig
> +++ b/configs/at91rm9200ek_ram_defconfig
> @@ -4,3 +4,4 @@ CONFIG_TARGET_AT91RM9200EK=y
>  CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9260ek_dataflash_cs0_defconfig b/configs/at91sam9260ek_dataflash_cs0_defconfig
> index 96c5eee..9909bc8 100644
> --- a/configs/at91sam9260ek_dataflash_cs0_defconfig
> +++ b/configs/at91sam9260ek_dataflash_cs0_defconfig
> @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_DATAFLASH_CS0"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SOURCE is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9260ek_dataflash_cs1_defconfig b/configs/at91sam9260ek_dataflash_cs1_defconfig
> index 6330c3e..8fdbd88 100644
> --- a/configs/at91sam9260ek_dataflash_cs1_defconfig
> +++ b/configs/at91sam9260ek_dataflash_cs1_defconfig
> @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_DATAFLASH_CS1"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SOURCE is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9260ek_nandflash_defconfig b/configs/at91sam9260ek_nandflash_defconfig
> index ae2defd..e4fc8d7 100644
> --- a/configs/at91sam9260ek_nandflash_defconfig
> +++ b/configs/at91sam9260ek_nandflash_defconfig
> @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_NANDFLASH"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SOURCE is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9261ek_dataflash_cs0_defconfig b/configs/at91sam9261ek_dataflash_cs0_defconfig
> index 838b235..e182f70 100644
> --- a/configs/at91sam9261ek_dataflash_cs0_defconfig
> +++ b/configs/at91sam9261ek_dataflash_cs0_defconfig
> @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_DATAFLASH_CS0"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SOURCE is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9261ek_dataflash_cs3_defconfig b/configs/at91sam9261ek_dataflash_cs3_defconfig
> index 6104479..b3a35dd 100644
> --- a/configs/at91sam9261ek_dataflash_cs3_defconfig
> +++ b/configs/at91sam9261ek_dataflash_cs3_defconfig
> @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_DATAFLASH_CS3"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SOURCE is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9261ek_nandflash_defconfig b/configs/at91sam9261ek_nandflash_defconfig
> index 4015c9f..58aa38f 100644
> --- a/configs/at91sam9261ek_nandflash_defconfig
> +++ b/configs/at91sam9261ek_nandflash_defconfig
> @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_NANDFLASH"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SOURCE is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9263ek_dataflash_cs0_defconfig b/configs/at91sam9263ek_dataflash_cs0_defconfig
> index d9003ff..82e1b86 100644
> --- a/configs/at91sam9263ek_dataflash_cs0_defconfig
> +++ b/configs/at91sam9263ek_dataflash_cs0_defconfig
> @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SOURCE is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9263ek_dataflash_defconfig b/configs/at91sam9263ek_dataflash_defconfig
> index d9003ff..82e1b86 100644
> --- a/configs/at91sam9263ek_dataflash_defconfig
> +++ b/configs/at91sam9263ek_dataflash_defconfig
> @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SOURCE is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9263ek_nandflash_defconfig b/configs/at91sam9263ek_nandflash_defconfig
> index 600c5dd..bac882e 100644
> --- a/configs/at91sam9263ek_nandflash_defconfig
> +++ b/configs/at91sam9263ek_nandflash_defconfig
> @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NANDFLASH"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SOURCE is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9263ek_norflash_boot_defconfig b/configs/at91sam9263ek_norflash_boot_defconfig
> index 2e34b79..75f0ec6 100644
> --- a/configs/at91sam9263ek_norflash_boot_defconfig
> +++ b/configs/at91sam9263ek_norflash_boot_defconfig
> @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_BOOT_NORFLASH"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SOURCE is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9263ek_norflash_defconfig b/configs/at91sam9263ek_norflash_defconfig
> index f72ed85..5bcdab0 100644
> --- a/configs/at91sam9263ek_norflash_defconfig
> +++ b/configs/at91sam9263ek_norflash_defconfig
> @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NORFLASH"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SOURCE is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9g10ek_dataflash_cs0_defconfig b/configs/at91sam9g10ek_dataflash_cs0_defconfig
> index 5f8d803..80e6a8a 100644
> --- a/configs/at91sam9g10ek_dataflash_cs0_defconfig
> +++ b/configs/at91sam9g10ek_dataflash_cs0_defconfig
> @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_DATAFLASH_CS0"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SOURCE is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9g10ek_dataflash_cs3_defconfig b/configs/at91sam9g10ek_dataflash_cs3_defconfig
> index 3ed763e..e6c9f61 100644
> --- a/configs/at91sam9g10ek_dataflash_cs3_defconfig
> +++ b/configs/at91sam9g10ek_dataflash_cs3_defconfig
> @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_DATAFLASH_CS3"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SOURCE is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9g10ek_nandflash_defconfig b/configs/at91sam9g10ek_nandflash_defconfig
> index c27e39a..0adaf11 100644
> --- a/configs/at91sam9g10ek_nandflash_defconfig
> +++ b/configs/at91sam9g10ek_nandflash_defconfig
> @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_NANDFLASH"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SOURCE is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9g20ek_2mmc_defconfig b/configs/at91sam9g20ek_2mmc_defconfig
> index d58de8e..40cd6b1 100644
> --- a/configs/at91sam9g20ek_2mmc_defconfig
> +++ b/configs/at91sam9g20ek_2mmc_defconfig
> @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,AT91SAM9G20EK_2MMC,SYS_USE_MMC"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SOURCE is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9g20ek_2mmc_nandflash_defconfig b/configs/at91sam9g20ek_2mmc_nandflash_defconfig
> index 4b28839..6f59305 100644
> --- a/configs/at91sam9g20ek_2mmc_nandflash_defconfig
> +++ b/configs/at91sam9g20ek_2mmc_nandflash_defconfig
> @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,AT91SAM9G20EK_2MMC,SYS_USE_NANDFLASH"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SOURCE is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9g20ek_dataflash_cs0_defconfig b/configs/at91sam9g20ek_dataflash_cs0_defconfig
> index ee86dad..b63c6d6 100644
> --- a/configs/at91sam9g20ek_dataflash_cs0_defconfig
> +++ b/configs/at91sam9g20ek_dataflash_cs0_defconfig
> @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_DATAFLASH_CS0"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SOURCE is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9g20ek_dataflash_cs1_defconfig b/configs/at91sam9g20ek_dataflash_cs1_defconfig
> index 39d4b09..aad9c1e 100644
> --- a/configs/at91sam9g20ek_dataflash_cs1_defconfig
> +++ b/configs/at91sam9g20ek_dataflash_cs1_defconfig
> @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_DATAFLASH_CS1"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SOURCE is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9g20ek_nandflash_defconfig b/configs/at91sam9g20ek_nandflash_defconfig
> index d636485..f247084 100644
> --- a/configs/at91sam9g20ek_nandflash_defconfig
> +++ b/configs/at91sam9g20ek_nandflash_defconfig
> @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_NANDFLASH"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SOURCE is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9m10g45ek_mmc_defconfig b/configs/at91sam9m10g45ek_mmc_defconfig
> index 1472d20..f88b48b 100644
> --- a/configs/at91sam9m10g45ek_mmc_defconfig
> +++ b/configs/at91sam9m10g45ek_mmc_defconfig
> @@ -10,3 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_MMC"
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9m10g45ek_nandflash_defconfig b/configs/at91sam9m10g45ek_nandflash_defconfig
> index 526419c..7675f52 100644
> --- a/configs/at91sam9m10g45ek_nandflash_defconfig
> +++ b/configs/at91sam9m10g45ek_nandflash_defconfig
> @@ -10,3 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_NANDFLASH"
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9n12ek_mmc_defconfig b/configs/at91sam9n12ek_mmc_defconfig
> index c549baf..1702a32 100644
> --- a/configs/at91sam9n12ek_mmc_defconfig
> +++ b/configs/at91sam9n12ek_mmc_defconfig
> @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_MMC"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9n12ek_nandflash_defconfig b/configs/at91sam9n12ek_nandflash_defconfig
> index 756db2a..9f87469 100644
> --- a/configs/at91sam9n12ek_nandflash_defconfig
> +++ b/configs/at91sam9n12ek_nandflash_defconfig
> @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_NANDFLASH"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9n12ek_spiflash_defconfig b/configs/at91sam9n12ek_spiflash_defconfig
> index 0430de9..a7d0581 100644
> --- a/configs/at91sam9n12ek_spiflash_defconfig
> +++ b/configs/at91sam9n12ek_spiflash_defconfig
> @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_SPIFLASH"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9rlek_dataflash_defconfig b/configs/at91sam9rlek_dataflash_defconfig
> index c555caa..ed2f5d2 100644
> --- a/configs/at91sam9rlek_dataflash_defconfig
> +++ b/configs/at91sam9rlek_dataflash_defconfig
> @@ -12,3 +12,4 @@ CONFIG_HUSH_PARSER=y
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NET is not set
>  # CONFIG_CMD_NFS is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9rlek_mmc_defconfig b/configs/at91sam9rlek_mmc_defconfig
> index 5cb5655..760cf92 100644
> --- a/configs/at91sam9rlek_mmc_defconfig
> +++ b/configs/at91sam9rlek_mmc_defconfig
> @@ -12,3 +12,4 @@ CONFIG_HUSH_PARSER=y
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NET is not set
>  # CONFIG_CMD_NFS is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9rlek_nandflash_defconfig b/configs/at91sam9rlek_nandflash_defconfig
> index 3e3528e..191a261 100644
> --- a/configs/at91sam9rlek_nandflash_defconfig
> +++ b/configs/at91sam9rlek_nandflash_defconfig
> @@ -12,3 +12,4 @@ CONFIG_HUSH_PARSER=y
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NET is not set
>  # CONFIG_CMD_NFS is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9x5ek_dataflash_defconfig b/configs/at91sam9x5ek_dataflash_defconfig
> index c757fc4..38607d0 100644
> --- a/configs/at91sam9x5ek_dataflash_defconfig
> +++ b/configs/at91sam9x5ek_dataflash_defconfig
> @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_DATAFLASH"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig
> index 82e67f3..8776627 100644
> --- a/configs/at91sam9x5ek_mmc_defconfig
> +++ b/configs/at91sam9x5ek_mmc_defconfig
> @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_MMC"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig
> index b45d8d0..cedc560 100644
> --- a/configs/at91sam9x5ek_nandflash_defconfig
> +++ b/configs/at91sam9x5ek_nandflash_defconfig
> @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_NANDFLASH"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9x5ek_spiflash_defconfig b/configs/at91sam9x5ek_spiflash_defconfig
> index f33a2fd..3896300 100644
> --- a/configs/at91sam9x5ek_spiflash_defconfig
> +++ b/configs/at91sam9x5ek_spiflash_defconfig
> @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_SPIFLASH"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9xeek_dataflash_cs0_defconfig b/configs/at91sam9xeek_dataflash_cs0_defconfig
> index 585d564..fbdb564 100644
> --- a/configs/at91sam9xeek_dataflash_cs0_defconfig
> +++ b/configs/at91sam9xeek_dataflash_cs0_defconfig
> @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_DATAFLASH_CS0"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SOURCE is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9xeek_dataflash_cs1_defconfig b/configs/at91sam9xeek_dataflash_cs1_defconfig
> index 1c38777..4f0cc11 100644
> --- a/configs/at91sam9xeek_dataflash_cs1_defconfig
> +++ b/configs/at91sam9xeek_dataflash_cs1_defconfig
> @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_DATAFLASH_CS1"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SOURCE is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9xeek_nandflash_defconfig b/configs/at91sam9xeek_nandflash_defconfig
> index 5e9a080..3dde55c 100644
> --- a/configs/at91sam9xeek_nandflash_defconfig
> +++ b/configs/at91sam9xeek_nandflash_defconfig
> @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_NANDFLASH"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SOURCE is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig
> index 0f5be56..51facf7 100644
> --- a/configs/atngw100_defconfig
> +++ b/configs/atngw100_defconfig
> @@ -9,3 +9,4 @@ CONFIG_AUTOBOOT_STOP_STR=" "
>  # CONFIG_CMD_SOURCE is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/atngw100mkii_defconfig b/configs/atngw100mkii_defconfig
> index b4d8d1c..b7099f5 100644
> --- a/configs/atngw100mkii_defconfig
> +++ b/configs/atngw100mkii_defconfig
> @@ -8,3 +8,4 @@ CONFIG_AUTOBOOT_STOP_STR=" "
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/atstk1002_defconfig b/configs/atstk1002_defconfig
> index bb0406e..78e2256 100644
> --- a/configs/atstk1002_defconfig
> +++ b/configs/atstk1002_defconfig
> @@ -8,3 +8,4 @@ CONFIG_AUTOBOOT_STOP_STR=" "
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SOURCE is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/axs101_defconfig b/configs/axs101_defconfig
> index 04aec0b..9a6cef3 100644
> --- a/configs/axs101_defconfig
> +++ b/configs/axs101_defconfig
> @@ -10,3 +10,4 @@ CONFIG_SYS_TEXT_BASE=0x81000000
>  CONFIG_NETDEVICES=y
>  CONFIG_ETH_DESIGNWARE=y
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="AXS# "
> diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig
> index ad74b85..02e19d2 100644
> --- a/configs/beaver_defconfig
> +++ b/configs/beaver_defconfig
> @@ -14,3 +14,4 @@ CONFIG_SPI_FLASH=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="Tegra30 (Beaver) # "
> diff --git a/configs/bf537-minotaur_defconfig b/configs/bf537-minotaur_defconfig
> index 57e9a24..212f2bb 100644
> --- a/configs/bf537-minotaur_defconfig
> +++ b/configs/bf537-minotaur_defconfig
> @@ -5,3 +5,4 @@ CONFIG_TARGET_BF537_MINOTAUR=y
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_NET_RANDOM_ETHADDR=y
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="minotaur> "
> diff --git a/configs/bf537-srv1_defconfig b/configs/bf537-srv1_defconfig
> index 51022d8..52abf99 100644
> --- a/configs/bf537-srv1_defconfig
> +++ b/configs/bf537-srv1_defconfig
> @@ -5,3 +5,4 @@ CONFIG_TARGET_BF537_SRV1=y
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_NET_RANDOM_ETHADDR=y
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="srv1> "
> diff --git a/configs/bf561-acvilon_defconfig b/configs/bf561-acvilon_defconfig
> index 897e44f..1409901 100644
> --- a/configs/bf561-acvilon_defconfig
> +++ b/configs/bf561-acvilon_defconfig
> @@ -6,3 +6,4 @@ CONFIG_TARGET_BF561_ACVILON=y
>  CONFIG_SPI_FLASH=y
>  CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
>  CONFIG_LIB_RAND=y
> +CONFIG_SYS_PROMPT="Acvilon> "
> diff --git a/configs/br4_defconfig b/configs/br4_defconfig
> index b129899..540dbef 100644
> --- a/configs/br4_defconfig
> +++ b/configs/br4_defconfig
> @@ -6,3 +6,4 @@ CONFIG_TARGET_BR4=y
>  CONFIG_SPI_FLASH=y
>  CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
>  CONFIG_LIB_RAND=y
> +CONFIG_SYS_PROMPT="br4>"
> diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig
> index b837de3..756457c 100644
> --- a/configs/cairo_defconfig
> +++ b/configs/cairo_defconfig
> @@ -7,3 +7,4 @@ CONFIG_SPL=y
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_NET is not set
> +CONFIG_SYS_PROMPT="Cairo # "
> diff --git a/configs/calimain_defconfig b/configs/calimain_defconfig
> index 35f73e3..4d952cd 100644
> --- a/configs/calimain_defconfig
> +++ b/configs/calimain_defconfig
> @@ -4,3 +4,4 @@ CONFIG_TARGET_CALIMAIN=y
>  CONFIG_AUTOBOOT_KEYED=y
>  CONFIG_AUTOBOOT_STOP_STR="\x0b"
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="Calimain > "
> diff --git a/configs/cam_enc_4xx_defconfig b/configs/cam_enc_4xx_defconfig
> index f7f6f12..a67bf0e 100644
> --- a/configs/cam_enc_4xx_defconfig
> +++ b/configs/cam_enc_4xx_defconfig
> @@ -7,3 +7,4 @@ CONFIG_SPL=y
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="cam_enc_4xx> "
> diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig
> index c0e98a5..5c298d7 100644
> --- a/configs/cardhu_defconfig
> +++ b/configs/cardhu_defconfig
> @@ -14,3 +14,4 @@ CONFIG_SPI_FLASH=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="Tegra30 (Cardhu) # "
> diff --git a/configs/cgtqmx6qeval_defconfig b/configs/cgtqmx6qeval_defconfig
> index e1eb871..b6ed4b6 100644
> --- a/configs/cgtqmx6qeval_defconfig
> +++ b/configs/cgtqmx6qeval_defconfig
> @@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/congatec/cgtqmx6eval/imximage.cfg,MX6
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="CGT-QMX6-Quad U-Boot > "
> diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
> index 2aba359..66fc382 100644
> --- a/configs/cm_fx6_defconfig
> +++ b/configs/cm_fx6_defconfig
> @@ -30,3 +30,4 @@ CONFIG_USB_EHCI_MX6=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_KEYBOARD=y
>  CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
> +CONFIG_SYS_PROMPT="CM-FX6 # "
> diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig
> index 9ebd327..4f4bd0b 100644
> --- a/configs/cm_t335_defconfig
> +++ b/configs/cm_t335_defconfig
> @@ -4,3 +4,4 @@ CONFIG_SPL=y
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="CM-T335 # "
> diff --git a/configs/cm_t3517_defconfig b/configs/cm_t3517_defconfig
> index 57b44ba..1eb4250 100644
> --- a/configs/cm_t3517_defconfig
> +++ b/configs/cm_t3517_defconfig
> @@ -5,3 +5,4 @@ CONFIG_TARGET_CM_T3517=y
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="CM-T3517 # "
> diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig
> index c8dc124..99dd2f4 100644
> --- a/configs/cm_t35_defconfig
> +++ b/configs/cm_t35_defconfig
> @@ -6,3 +6,4 @@ CONFIG_SPL=y
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="CM-T3x # "
> diff --git a/configs/cm_t54_defconfig b/configs/cm_t54_defconfig
> index af7c880..fc72ffa 100644
> --- a/configs/cm_t54_defconfig
> +++ b/configs/cm_t54_defconfig
> @@ -6,3 +6,4 @@ CONFIG_SPL=y
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NFS is not set
> +CONFIG_SYS_PROMPT="CM-T54 # "
> diff --git a/configs/cobra5272_defconfig b/configs/cobra5272_defconfig
> index 2ccb80c..77ad34d 100644
> --- a/configs/cobra5272_defconfig
> +++ b/configs/cobra5272_defconfig
> @@ -3,3 +3,4 @@ CONFIG_TARGET_COBRA5272=y
>  # CONFIG_CMD_LOADB is not set
>  # CONFIG_CMD_LOADS is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="COBRA > "
> diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig
> index 4e1369b..0d28b06 100644
> --- a/configs/colibri_t20_defconfig
> +++ b/configs/colibri_t20_defconfig
> @@ -12,3 +12,4 @@ CONFIG_SPL_DM=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="Colibri T20 # "
> diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig
> index 45cf20a..d1ed09d 100644
> --- a/configs/colibri_t30_defconfig
> +++ b/configs/colibri_t30_defconfig
> @@ -12,3 +12,4 @@ CONFIG_SPL_DM=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="Colibri T30 # "
> diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig
> index ffb3b4f..74af563 100644
> --- a/configs/colibri_vf_defconfig
> +++ b/configs/colibri_vf_defconfig
> @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_vf/imximage.cfg,ENV_I
>  CONFIG_DM=y
>  CONFIG_NAND_VF610_NFC=y
>  CONFIG_SYS_NAND_VF610_NFC_60_ECC_BYTES=y
> +CONFIG_SYS_PROMPT="Colibri VFxx # "
> diff --git a/configs/colibri_vf_dtb_defconfig b/configs/colibri_vf_dtb_defconfig
> index 49f2105..54c3f2d 100644
> --- a/configs/colibri_vf_dtb_defconfig
> +++ b/configs/colibri_vf_dtb_defconfig
> @@ -9,3 +9,4 @@ CONFIG_OF_CONTROL=y
>  CONFIG_DM=y
>  CONFIG_NAND_VF610_NFC=y
>  CONFIG_SYS_NAND_VF610_NFC_60_ECC_BYTES=y
> +CONFIG_SYS_PROMPT="Colibri VFxx # "
> diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig
> index 13afb08..1fed14e 100644
> --- a/configs/corvus_defconfig
> +++ b/configs/corvus_defconfig
> @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,MACH_TYPE=2066,SYS_USE_NANDFLASH"
>  # CONFIG_CMD_LOADS is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/cpu9260_128M_defconfig b/configs/cpu9260_128M_defconfig
> index f423980..187fced 100644
> --- a/configs/cpu9260_128M_defconfig
> +++ b/configs/cpu9260_128M_defconfig
> @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9260,CPU9260_128M"
>  # CONFIG_CMD_LOADS is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="CPU9260=> "
> diff --git a/configs/cpu9260_defconfig b/configs/cpu9260_defconfig
> index 88afe9f..4b50505 100644
> --- a/configs/cpu9260_defconfig
> +++ b/configs/cpu9260_defconfig
> @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9260"
>  # CONFIG_CMD_LOADS is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="CPU9260=> "
> diff --git a/configs/cpu9260_nand_128M_defconfig b/configs/cpu9260_nand_128M_defconfig
> index f59b000..797fb85 100644
> --- a/configs/cpu9260_nand_128M_defconfig
> +++ b/configs/cpu9260_nand_128M_defconfig
> @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9260,CPU9260_128M,NANDBOOT"
>  # CONFIG_CMD_LOADS is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="CPU9260=> "
> diff --git a/configs/cpu9260_nand_defconfig b/configs/cpu9260_nand_defconfig
> index e914c2b..8d155d0 100644
> --- a/configs/cpu9260_nand_defconfig
> +++ b/configs/cpu9260_nand_defconfig
> @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9260,NANDBOOT"
>  # CONFIG_CMD_LOADS is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="CPU9260=> "
> diff --git a/configs/cpu9G20_128M_defconfig b/configs/cpu9G20_128M_defconfig
> index d215cc0..650c934 100644
> --- a/configs/cpu9G20_128M_defconfig
> +++ b/configs/cpu9G20_128M_defconfig
> @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9G20,CPU9G20_128M"
>  # CONFIG_CMD_LOADS is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="CPU9G20=> "
> diff --git a/configs/cpu9G20_defconfig b/configs/cpu9G20_defconfig
> index 51b19f0..997eec5 100644
> --- a/configs/cpu9G20_defconfig
> +++ b/configs/cpu9G20_defconfig
> @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9G20"
>  # CONFIG_CMD_LOADS is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="CPU9G20=> "
> diff --git a/configs/cpu9G20_nand_128M_defconfig b/configs/cpu9G20_nand_128M_defconfig
> index da4cbdd..6d62732 100644
> --- a/configs/cpu9G20_nand_128M_defconfig
> +++ b/configs/cpu9G20_nand_128M_defconfig
> @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9G20,CPU9G20_128M,NANDBOOT"
>  # CONFIG_CMD_LOADS is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="CPU9G20=> "
> diff --git a/configs/cpu9G20_nand_defconfig b/configs/cpu9G20_nand_defconfig
> index b9e4b3c..52f916f 100644
> --- a/configs/cpu9G20_nand_defconfig
> +++ b/configs/cpu9G20_nand_defconfig
> @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9G20,NANDBOOT"
>  # CONFIG_CMD_LOADS is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="CPU9G20=> "
> diff --git a/configs/cpuat91_defconfig b/configs/cpuat91_defconfig
> index cfc62aa..10b8ad2 100644
> --- a/configs/cpuat91_defconfig
> +++ b/configs/cpuat91_defconfig
> @@ -10,3 +10,4 @@ CONFIG_AUTOBOOT_STOP_STR=" "
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NFS is not set
> +CONFIG_SYS_PROMPT="CPUAT91=> "
> diff --git a/configs/da830evm_defconfig b/configs/da830evm_defconfig
> index e0c8e25..d37ede3 100644
> --- a/configs/da830evm_defconfig
> +++ b/configs/da830evm_defconfig
> @@ -6,3 +6,4 @@ CONFIG_TARGET_DA830EVM=y
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="U-Boot > "
> diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig
> index 41395e3..557c0d5 100644
> --- a/configs/da850evm_defconfig
> +++ b/configs/da850evm_defconfig
> @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH"
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="U-Boot > "
> diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig
> index a1cba1a..79b877f 100644
> --- a/configs/da850evm_direct_nor_defconfig
> +++ b/configs/da850evm_direct_nor_defconfig
> @@ -4,3 +4,4 @@ CONFIG_TARGET_DA850EVM=y
>  CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH,USE_NOR,DIRECT_NOR_BOOT"
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="U-Boot > "
> diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig
> index e7443f8..e7688a6 100644
> --- a/configs/dalmore_defconfig
> +++ b/configs/dalmore_defconfig
> @@ -14,3 +14,4 @@ CONFIG_SPI_FLASH=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="Tegra114 (Dalmore) # "
> diff --git a/configs/davinci_dm355evm_defconfig b/configs/davinci_dm355evm_defconfig
> index f10b643..4513ce4 100644
> --- a/configs/davinci_dm355evm_defconfig
> +++ b/configs/davinci_dm355evm_defconfig
> @@ -6,3 +6,4 @@ CONFIG_TARGET_DAVINCI_DM355EVM=y
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="DM355 EVM # "
> diff --git a/configs/davinci_dm355leopard_defconfig b/configs/davinci_dm355leopard_defconfig
> index 7b33f6d..7945605 100644
> --- a/configs/davinci_dm355leopard_defconfig
> +++ b/configs/davinci_dm355leopard_defconfig
> @@ -6,3 +6,4 @@ CONFIG_TARGET_DAVINCI_DM355LEOPARD=y
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="DM355 LEOPARD # "
> diff --git a/configs/davinci_dm365evm_defconfig b/configs/davinci_dm365evm_defconfig
> index f139b58..3550e75 100644
> --- a/configs/davinci_dm365evm_defconfig
> +++ b/configs/davinci_dm365evm_defconfig
> @@ -6,3 +6,4 @@ CONFIG_TARGET_DAVINCI_DM365EVM=y
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="DM36x EVM # "
> diff --git a/configs/davinci_dm6467evm_defconfig b/configs/davinci_dm6467evm_defconfig
> index 2a5262a..b2021af 100644
> --- a/configs/davinci_dm6467evm_defconfig
> +++ b/configs/davinci_dm6467evm_defconfig
> @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="REFCLK_FREQ=27000000"
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="DM6467 EVM > "
> diff --git a/configs/davinci_dvevm_defconfig b/configs/davinci_dvevm_defconfig
> index aa30d1b..7c6f03e 100644
> --- a/configs/davinci_dvevm_defconfig
> +++ b/configs/davinci_dvevm_defconfig
> @@ -6,3 +6,4 @@ CONFIG_TARGET_DAVINCI_DVEVM=y
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot > "
> diff --git a/configs/davinci_schmoogie_defconfig b/configs/davinci_schmoogie_defconfig
> index 7c11c8c..2fb4d9f 100644
> --- a/configs/davinci_schmoogie_defconfig
> +++ b/configs/davinci_schmoogie_defconfig
> @@ -6,3 +6,4 @@ CONFIG_TARGET_DAVINCI_SCHMOOGIE=y
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot > "
> diff --git a/configs/davinci_sffsdr_defconfig b/configs/davinci_sffsdr_defconfig
> index 7aca606..633b4a8 100644
> --- a/configs/davinci_sffsdr_defconfig
> +++ b/configs/davinci_sffsdr_defconfig
> @@ -6,3 +6,4 @@ CONFIG_TARGET_DAVINCI_SFFSDR=y
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot > "
> diff --git a/configs/davinci_sonata_defconfig b/configs/davinci_sonata_defconfig
> index 6014eee..697ce06 100644
> --- a/configs/davinci_sonata_defconfig
> +++ b/configs/davinci_sonata_defconfig
> @@ -4,3 +4,4 @@ CONFIG_TARGET_DAVINCI_SONATA=y
>  # CONFIG_CMD_BDI is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot > "
> diff --git a/configs/dbau1000_defconfig b/configs/dbau1000_defconfig
> index 58da5b7..5dc12d2 100644
> --- a/configs/dbau1000_defconfig
> +++ b/configs/dbau1000_defconfig
> @@ -10,3 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="DBAU1000"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="DbAu1xx0 # "
> diff --git a/configs/dbau1100_defconfig b/configs/dbau1100_defconfig
> index 14aeb4c..522b9bc 100644
> --- a/configs/dbau1100_defconfig
> +++ b/configs/dbau1100_defconfig
> @@ -10,3 +10,4 @@ CONFIG_DBAU1100=y
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="DbAu1xx0 # "
> diff --git a/configs/dbau1500_defconfig b/configs/dbau1500_defconfig
> index 699b968..2fdddc7 100644
> --- a/configs/dbau1500_defconfig
> +++ b/configs/dbau1500_defconfig
> @@ -10,3 +10,4 @@ CONFIG_DBAU1500=y
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="DbAu1xx0 # "
> diff --git a/configs/dbau1550_defconfig b/configs/dbau1550_defconfig
> index 6b17da7..07be3f1 100644
> --- a/configs/dbau1550_defconfig
> +++ b/configs/dbau1550_defconfig
> @@ -8,3 +8,4 @@ CONFIG_DBAU1550=y
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NFS is not set
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="DbAu1xx0 # "
> diff --git a/configs/dbau1550_el_defconfig b/configs/dbau1550_el_defconfig
> index 845bc87..7bd1e0c 100644
> --- a/configs/dbau1550_el_defconfig
> +++ b/configs/dbau1550_el_defconfig
> @@ -9,3 +9,4 @@ CONFIG_SYS_LITTLE_ENDIAN=y
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NFS is not set
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="DbAu1xx0 # "
> diff --git a/configs/dig297_defconfig b/configs/dig297_defconfig
> index 483c20e..4c2c982 100644
> --- a/configs/dig297_defconfig
> +++ b/configs/dig297_defconfig
> @@ -7,3 +7,4 @@ CONFIG_TARGET_DIG297=y
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NFS is not set
> +CONFIG_SYS_PROMPT="DIG297# "
> diff --git a/configs/dockstar_defconfig b/configs/dockstar_defconfig
> index 40f6e0f..e4da466 100644
> --- a/configs/dockstar_defconfig
> +++ b/configs/dockstar_defconfig
> @@ -4,3 +4,4 @@ CONFIG_TARGET_DOCKSTAR=y
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="DockStar> "
> diff --git a/configs/draco_defconfig b/configs/draco_defconfig
> index 8b177b3..d2fc98d 100644
> --- a/configs/draco_defconfig
> +++ b/configs/draco_defconfig
> @@ -8,3 +8,4 @@ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="U-Boot# "
> diff --git a/configs/duovero_defconfig b/configs/duovero_defconfig
> index 57410d3..d3de28a 100644
> --- a/configs/duovero_defconfig
> +++ b/configs/duovero_defconfig
> @@ -6,3 +6,4 @@ CONFIG_SPL=y
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NFS is not set
> +CONFIG_SYS_PROMPT="duovero # "
> diff --git a/configs/ea20_defconfig b/configs/ea20_defconfig
> index 388dfec..1d7494f 100644
> --- a/configs/ea20_defconfig
> +++ b/configs/ea20_defconfig
> @@ -5,3 +5,4 @@ CONFIG_TARGET_EA20=y
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="ea20 > "
> diff --git a/configs/eb_cpu5282_defconfig b/configs/eb_cpu5282_defconfig
> index 1e19d3a..0044de6 100644
> --- a/configs/eb_cpu5282_defconfig
> +++ b/configs/eb_cpu5282_defconfig
> @@ -3,3 +3,4 @@ CONFIG_TARGET_EB_CPU5282=y
>  CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFF000000,SYS_MONITOR_BASE=0xFF000400"
>  # CONFIG_CMD_LOADB is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="\nEB+CPU5282> "
> diff --git a/configs/eb_cpux9k2_defconfig b/configs/eb_cpux9k2_defconfig
> index bff6595..6a6f3cd 100644
> --- a/configs/eb_cpux9k2_defconfig
> +++ b/configs/eb_cpux9k2_defconfig
> @@ -2,3 +2,4 @@ CONFIG_ARM=y
>  CONFIG_ARCH_AT91=y
>  CONFIG_TARGET_EB_CPUX9K2=y
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/eco5pk_defconfig b/configs/eco5pk_defconfig
> index c43603b..8b5874d 100644
> --- a/configs/eco5pk_defconfig
> +++ b/configs/eco5pk_defconfig
> @@ -5,3 +5,4 @@ CONFIG_SPL=y
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="ECO5-PK # "
> diff --git a/configs/edminiv2_defconfig b/configs/edminiv2_defconfig
> index 80ff33f..b2a2506 100644
> --- a/configs/edminiv2_defconfig
> +++ b/configs/edminiv2_defconfig
> @@ -3,3 +3,4 @@ CONFIG_ORION5X=y
>  CONFIG_TARGET_EDMINIV2=y
>  CONFIG_SPL=y
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="EDMiniV2> "
> diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig
> index d2379ec..d97008a 100644
> --- a/configs/ethernut5_defconfig
> +++ b/configs/ethernut5_defconfig
> @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE"
>  # CONFIG_CMD_LOADS is not set
>  # CONFIG_CMD_FPGA is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/flea3_defconfig b/configs/flea3_defconfig
> index 7ea5da2..c9e4a28 100644
> --- a/configs/flea3_defconfig
> +++ b/configs/flea3_defconfig
> @@ -1,3 +1,4 @@
>  CONFIG_ARM=y
>  CONFIG_TARGET_FLEA3=y
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="flea3 U-Boot > "
> diff --git a/configs/fx12mm_defconfig b/configs/fx12mm_defconfig
> index 1013b70..0213681 100644
> --- a/configs/fx12mm_defconfig
> +++ b/configs/fx12mm_defconfig
> @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x041000
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NET is not set
>  # CONFIG_CMD_NFS is not set
> +CONFIG_SYS_PROMPT="FX12MM:/# "
> diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig
> index d1b9ba1..059ce80 100644
> --- a/configs/goflexhome_defconfig
> +++ b/configs/goflexhome_defconfig
> @@ -4,3 +4,4 @@ CONFIG_TARGET_GOFLEXHOME=y
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="GoFlexHome> "
> diff --git a/configs/grasshopper_defconfig b/configs/grasshopper_defconfig
> index 2d9c8ad..eefc5f2 100644
> --- a/configs/grasshopper_defconfig
> +++ b/configs/grasshopper_defconfig
> @@ -6,3 +6,4 @@ CONFIG_AUTOBOOT_DELAY_STR="d"
>  CONFIG_AUTOBOOT_STOP_STR=" "
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig
> index 401f77e..d81f941 100644
> --- a/configs/gwventana_defconfig
> +++ b/configs/gwventana_defconfig
> @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
>  # CONFIG_CMD_FLASH is not set
>  CONFIG_DM=y
>  CONFIG_DM_SERIAL=y
> +CONFIG_SYS_PROMPT="Ventana > "
> diff --git a/configs/h2200_defconfig b/configs/h2200_defconfig
> index f90a4a6..07b1706 100644
> --- a/configs/h2200_defconfig
> +++ b/configs/h2200_defconfig
> @@ -17,3 +17,4 @@ CONFIG_TARGET_H2200=y
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NFS is not set
>  # CONFIG_CMD_MISC is not set
> +CONFIG_SYS_PROMPT="> "
> diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig
> index d88a082..c9c0618 100644
> --- a/configs/harmony_defconfig
> +++ b/configs/harmony_defconfig
> @@ -13,3 +13,4 @@ CONFIG_SPL_DM=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="Tegra20 (Harmony) # "
> diff --git a/configs/hrcon_defconfig b/configs/hrcon_defconfig
> index 6b2b5d3..1308f05 100644
> --- a/configs/hrcon_defconfig
> +++ b/configs/hrcon_defconfig
> @@ -4,3 +4,4 @@ CONFIG_TARGET_HRCON=y
>  CONFIG_AUTOBOOT_KEYED=y
>  CONFIG_AUTOBOOT_STOP_STR=" "
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="=> "
> diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig
> index e418d8f..b3fa890 100644
> --- a/configs/ib62x0_defconfig
> +++ b/configs/ib62x0_defconfig
> @@ -4,3 +4,4 @@ CONFIG_TARGET_IB62X0=y
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="ib62x0 => "
> diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig
> index 49d4fa0..4c34290 100644
> --- a/configs/iconnect_defconfig
> +++ b/configs/iconnect_defconfig
> @@ -4,3 +4,4 @@ CONFIG_TARGET_ICONNECT=y
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="iconnect => "
> diff --git a/configs/ima3-mx53_defconfig b/configs/ima3-mx53_defconfig
> index ef15127..1f5e3a6 100644
> --- a/configs/ima3-mx53_defconfig
> +++ b/configs/ima3-mx53_defconfig
> @@ -3,3 +3,4 @@ CONFIG_TARGET_IMA3_MX53=y
>  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/esg/ima3-mx53/imximage.cfg"
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="IMA3 MX53 U-Boot > "
> diff --git a/configs/imx31_litekit_defconfig b/configs/imx31_litekit_defconfig
> index b197935..f10759b 100644
> --- a/configs/imx31_litekit_defconfig
> +++ b/configs/imx31_litekit_defconfig
> @@ -1,3 +1,4 @@
>  CONFIG_ARM=y
>  CONFIG_TARGET_IMX31_LITEKIT=y
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="uboot> "
> diff --git a/configs/imx31_phycore_defconfig b/configs/imx31_phycore_defconfig
> index 161a604..e801ee7 100644
> --- a/configs/imx31_phycore_defconfig
> +++ b/configs/imx31_phycore_defconfig
> @@ -1,3 +1,4 @@
>  CONFIG_ARM=y
>  CONFIG_TARGET_IMX31_PHYCORE=y
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="uboot> "
> diff --git a/configs/integratorap_cm720t_defconfig b/configs/integratorap_cm720t_defconfig
> index 369add7..50c6005 100644
> --- a/configs/integratorap_cm720t_defconfig
> +++ b/configs/integratorap_cm720t_defconfig
> @@ -3,3 +3,4 @@ CONFIG_ARCH_INTEGRATOR=y
>  CONFIG_ARCH_INTEGRATOR_AP=y
>  CONFIG_CM720T=y
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="Integrator-AP # "
> diff --git a/configs/integratorap_cm920t_defconfig b/configs/integratorap_cm920t_defconfig
> index aa27cbd..ab0cdbd 100644
> --- a/configs/integratorap_cm920t_defconfig
> +++ b/configs/integratorap_cm920t_defconfig
> @@ -3,3 +3,4 @@ CONFIG_ARCH_INTEGRATOR=y
>  CONFIG_ARCH_INTEGRATOR_AP=y
>  CONFIG_CM920T=y
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="Integrator-AP # "
> diff --git a/configs/integratorap_cm926ejs_defconfig b/configs/integratorap_cm926ejs_defconfig
> index 8155b67..317c6d8 100644
> --- a/configs/integratorap_cm926ejs_defconfig
> +++ b/configs/integratorap_cm926ejs_defconfig
> @@ -3,3 +3,4 @@ CONFIG_ARCH_INTEGRATOR=y
>  CONFIG_ARCH_INTEGRATOR_AP=y
>  CONFIG_CM926EJ_S=y
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="Integrator-AP # "
> diff --git a/configs/integratorap_cm946es_defconfig b/configs/integratorap_cm946es_defconfig
> index b3b5edf..5ce1c00 100644
> --- a/configs/integratorap_cm946es_defconfig
> +++ b/configs/integratorap_cm946es_defconfig
> @@ -3,3 +3,4 @@ CONFIG_ARCH_INTEGRATOR=y
>  CONFIG_ARCH_INTEGRATOR_AP=y
>  CONFIG_CM946ES=y
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="Integrator-AP # "
> diff --git a/configs/integratorcp_cm1136_defconfig b/configs/integratorcp_cm1136_defconfig
> index 5ab7c27..ddd2ce7 100644
> --- a/configs/integratorcp_cm1136_defconfig
> +++ b/configs/integratorcp_cm1136_defconfig
> @@ -3,3 +3,4 @@ CONFIG_ARCH_INTEGRATOR=y
>  CONFIG_ARCH_INTEGRATOR_CP=y
>  CONFIG_CM1136=y
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="Integrator-CP # "
> diff --git a/configs/integratorcp_cm920t_defconfig b/configs/integratorcp_cm920t_defconfig
> index d0ed78d..036b32e 100644
> --- a/configs/integratorcp_cm920t_defconfig
> +++ b/configs/integratorcp_cm920t_defconfig
> @@ -3,3 +3,4 @@ CONFIG_ARCH_INTEGRATOR=y
>  CONFIG_ARCH_INTEGRATOR_CP=y
>  CONFIG_CM920T=y
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="Integrator-CP # "
> diff --git a/configs/integratorcp_cm926ejs_defconfig b/configs/integratorcp_cm926ejs_defconfig
> index 9aa8602..6fc2a84 100644
> --- a/configs/integratorcp_cm926ejs_defconfig
> +++ b/configs/integratorcp_cm926ejs_defconfig
> @@ -3,3 +3,4 @@ CONFIG_ARCH_INTEGRATOR=y
>  CONFIG_ARCH_INTEGRATOR_CP=y
>  CONFIG_CM926EJ_S=y
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="Integrator-CP # "
> diff --git a/configs/integratorcp_cm946es_defconfig b/configs/integratorcp_cm946es_defconfig
> index ef9d7d6..e077a5e 100644
> --- a/configs/integratorcp_cm946es_defconfig
> +++ b/configs/integratorcp_cm946es_defconfig
> @@ -3,3 +3,4 @@ CONFIG_ARCH_INTEGRATOR=y
>  CONFIG_ARCH_INTEGRATOR_CP=y
>  CONFIG_CM946ES=y
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="Integrator-CP # "
> diff --git a/configs/ipam390_defconfig b/configs/ipam390_defconfig
> index c053b38..c416340 100644
> --- a/configs/ipam390_defconfig
> +++ b/configs/ipam390_defconfig
> @@ -5,3 +5,4 @@ CONFIG_SPL=y
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot > "
> diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig
> index 7085469..14e1f05 100644
> --- a/configs/jetson-tk1_defconfig
> +++ b/configs/jetson-tk1_defconfig
> @@ -14,3 +14,4 @@ CONFIG_SPI_FLASH=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="Tegra124 (Jetson TK1) # "
> diff --git a/configs/jornada_defconfig b/configs/jornada_defconfig
> index 735c75f..65cbc2a 100644
> --- a/configs/jornada_defconfig
> +++ b/configs/jornada_defconfig
> @@ -6,3 +6,4 @@ CONFIG_TARGET_JORNADA=y
>  # CONFIG_CMD_NET is not set
>  # CONFIG_CMD_NFS is not set
>  # CONFIG_CMD_MISC is not set
> +CONFIG_SYS_PROMPT="HP Jornada# "
> diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig
> index f422886..c4cbadd 100644
> --- a/configs/k2e_evm_defconfig
> +++ b/configs/k2e_evm_defconfig
> @@ -6,3 +6,4 @@ CONFIG_SPL=y
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="K2E EVM # "
> diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig
> index 297183f..a604939 100644
> --- a/configs/k2hk_evm_defconfig
> +++ b/configs/k2hk_evm_defconfig
> @@ -6,3 +6,4 @@ CONFIG_SPL=y
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="K2HK EVM # "
> diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig
> index 7aa538d..a687e0c 100644
> --- a/configs/k2l_evm_defconfig
> +++ b/configs/k2l_evm_defconfig
> @@ -6,3 +6,4 @@ CONFIG_SPL=y
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="K2L EVM # "
> diff --git a/configs/kwb_defconfig b/configs/kwb_defconfig
> index 5bca811..928c4bf 100644
> --- a/configs/kwb_defconfig
> +++ b/configs/kwb_defconfig
> @@ -14,3 +14,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
>  # CONFIG_CMD_ITEST is not set
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NFS is not set
> +CONFIG_SYS_PROMPT="U-Boot (BuR V2.0)# "
> diff --git a/configs/kzm9g_defconfig b/configs/kzm9g_defconfig
> index 3df79d4..0669bbc 100644
> --- a/configs/kzm9g_defconfig
> +++ b/configs/kzm9g_defconfig
> @@ -2,3 +2,4 @@ CONFIG_ARM=y
>  CONFIG_RMOBILE=y
>  CONFIG_TARGET_KZM9G=y
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="KZM-A9-GT# "
> diff --git a/configs/ls2085a_emu_D4_defconfig b/configs/ls2085a_emu_D4_defconfig
> index 9c82e17..bbc68a0 100644
> --- a/configs/ls2085a_emu_D4_defconfig
> +++ b/configs/ls2085a_emu_D4_defconfig
> @@ -12,3 +12,4 @@ CONFIG_SYS_EXTRA_OPTIONS="EMU,SYS_FSL_DDR4"
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NFS is not set
>  # CONFIG_CMD_MISC is not set
> +CONFIG_SYS_PROMPT="=> "
> diff --git a/configs/ls2085a_emu_defconfig b/configs/ls2085a_emu_defconfig
> index fa4a44e..5c198d0 100644
> --- a/configs/ls2085a_emu_defconfig
> +++ b/configs/ls2085a_emu_defconfig
> @@ -12,3 +12,4 @@ CONFIG_SYS_EXTRA_OPTIONS="EMU"
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NFS is not set
>  # CONFIG_CMD_MISC is not set
> +CONFIG_SYS_PROMPT="=> "
> diff --git a/configs/ls2085a_simu_defconfig b/configs/ls2085a_simu_defconfig
> index de9776d..31ca31c 100644
> --- a/configs/ls2085a_simu_defconfig
> +++ b/configs/ls2085a_simu_defconfig
> @@ -12,3 +12,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SIMU"
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NFS is not set
>  # CONFIG_CMD_MISC is not set
> +CONFIG_SYS_PROMPT="=> "
> diff --git a/configs/ls2085aqds_defconfig b/configs/ls2085aqds_defconfig
> index 00b062b..a7f2dcb 100644
> --- a/configs/ls2085aqds_defconfig
> +++ b/configs/ls2085aqds_defconfig
> @@ -9,3 +9,4 @@ CONFIG_DM=y
>  CONFIG_DM_SPI_FLASH=y
>  CONFIG_DM_SPI=y
>  CONFIG_FSL_DSPI=y
> +CONFIG_SYS_PROMPT="=> "
> diff --git a/configs/ls2085aqds_nand_defconfig b/configs/ls2085aqds_nand_defconfig
> index b9dd651..1479802 100644
> --- a/configs/ls2085aqds_nand_defconfig
> +++ b/configs/ls2085aqds_nand_defconfig
> @@ -3,3 +3,4 @@ CONFIG_TARGET_LS2085AQDS=y
>  CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,NAND"
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="=> "
> diff --git a/configs/ls2085ardb_defconfig b/configs/ls2085ardb_defconfig
> index c7dae4b..2006c2a 100644
> --- a/configs/ls2085ardb_defconfig
> +++ b/configs/ls2085ardb_defconfig
> @@ -9,3 +9,4 @@ CONFIG_DM=y
>  CONFIG_DM_SPI_FLASH=y
>  CONFIG_DM_SPI=y
>  CONFIG_FSL_DSPI=y
> +CONFIG_SYS_PROMPT="=> "
> diff --git a/configs/ls2085ardb_nand_defconfig b/configs/ls2085ardb_nand_defconfig
> index 8539307..dee7f3d 100644
> --- a/configs/ls2085ardb_nand_defconfig
> +++ b/configs/ls2085ardb_nand_defconfig
> @@ -3,3 +3,4 @@ CONFIG_TARGET_LS2085ARDB=y
>  CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,NAND"
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="=> "
> diff --git a/configs/mcx_defconfig b/configs/mcx_defconfig
> index 1d3e978..1f38640 100644
> --- a/configs/mcx_defconfig
> +++ b/configs/mcx_defconfig
> @@ -7,3 +7,4 @@ CONFIG_SPL=y
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="mcx # "
> diff --git a/configs/medcom-wide_defconfig b/configs/medcom-wide_defconfig
> index bb33542..c0ba9d1 100644
> --- a/configs/medcom-wide_defconfig
> +++ b/configs/medcom-wide_defconfig
> @@ -13,3 +13,4 @@ CONFIG_SPL_DM=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="Tegra20 (Medcom-Wide) # "
> diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
> index 8355c67..5de1bcd 100644
> --- a/configs/microblaze-generic_defconfig
> +++ b/configs/microblaze-generic_defconfig
> @@ -6,3 +6,4 @@ CONFIG_SPL=y
>  CONFIG_OF_CONTROL=y
>  CONFIG_SPL_DISABLE_OF_CONTROL=y
>  CONFIG_OF_EMBED=y
> +CONFIG_SYS_PROMPT="U-Boot-mONStR> "
> diff --git a/configs/ml507_defconfig b/configs/ml507_defconfig
> index 3f66c86..44b7c31 100644
> --- a/configs/ml507_defconfig
> +++ b/configs/ml507_defconfig
> @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x041000
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NET is not set
>  # CONFIG_CMD_NFS is not set
> +CONFIG_SYS_PROMPT="ml507:/# "
> diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig
> index 0a6b7d6..d5d26cf 100644
> --- a/configs/mt_ventoux_defconfig
> +++ b/configs/mt_ventoux_defconfig
> @@ -5,3 +5,4 @@ CONFIG_SPL=y
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="mt_ventoux => "
> diff --git a/configs/mx51_efikamx_defconfig b/configs/mx51_efikamx_defconfig
> index 9c0deb1..a88c223 100644
> --- a/configs/mx51_efikamx_defconfig
> +++ b/configs/mx51_efikamx_defconfig
> @@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_MX51_EFIKAMX,IMX_CONFIG=board/gene
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="Efika> "
> diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig
> index 47e5911..257c305 100644
> --- a/configs/nas220_defconfig
> +++ b/configs/nas220_defconfig
> @@ -4,3 +4,4 @@ CONFIG_TARGET_NAS220=y
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="nas220> "
> diff --git a/configs/nhk8815_defconfig b/configs/nhk8815_defconfig
> index f9fac6f..218d92a 100644
> --- a/configs/nhk8815_defconfig
> +++ b/configs/nhk8815_defconfig
> @@ -4,3 +4,4 @@ CONFIG_NOMADIK_NHK8815=y
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="Nomadik> "
> diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig
> index c40dadf..3dd24e0 100644
> --- a/configs/nokia_rx51_defconfig
> +++ b/configs/nokia_rx51_defconfig
> @@ -10,3 +10,4 @@ CONFIG_AUTOBOOT_KEYED=y
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NET is not set
>  # CONFIG_CMD_NFS is not set
> +CONFIG_SYS_PROMPT="Nokia RX-51 # "
> diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig
> index 79b74a7..590596e 100644
> --- a/configs/nyan-big_defconfig
> +++ b/configs/nyan-big_defconfig
> @@ -20,3 +20,4 @@ CONFIG_VIDEO_TEGRA124=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="Tegra124 (Nyan-big) # "
> diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig
> index 2b960d5..ad9bb61 100644
> --- a/configs/odroid-xu3_defconfig
> +++ b/configs/odroid-xu3_defconfig
> @@ -7,3 +7,4 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos5422-odroidxu3"
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
> +CONFIG_SYS_PROMPT="ODROID-XU3 # "
> diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig
> index 3104f88..0a4f63b 100644
> --- a/configs/odroid_defconfig
> +++ b/configs/odroid_defconfig
> @@ -21,3 +21,4 @@ CONFIG_DM_REGULATOR_MAX77686=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_ERRNO_STR=y
> +CONFIG_SYS_PROMPT="Odroid # "
> diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig
> index 65b6f6a..de8fbd9 100644
> --- a/configs/omap3_evm_defconfig
> +++ b/configs/omap3_evm_defconfig
> @@ -7,3 +7,4 @@ CONFIG_SPL=y
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="OMAP3_EVM # "
> diff --git a/configs/omap3_evm_quick_mmc_defconfig b/configs/omap3_evm_quick_mmc_defconfig
> index 527b465..7d15b16 100644
> --- a/configs/omap3_evm_quick_mmc_defconfig
> +++ b/configs/omap3_evm_quick_mmc_defconfig
> @@ -23,3 +23,4 @@ CONFIG_SPL=y
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NFS is not set
>  # CONFIG_CMD_MISC is not set
> +CONFIG_SYS_PROMPT="OMAP3_EVM # "
> diff --git a/configs/omap3_evm_quick_nand_defconfig b/configs/omap3_evm_quick_nand_defconfig
> index e3278b5..cd30134 100644
> --- a/configs/omap3_evm_quick_nand_defconfig
> +++ b/configs/omap3_evm_quick_nand_defconfig
> @@ -23,3 +23,4 @@ CONFIG_SPL=y
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NFS is not set
>  # CONFIG_CMD_MISC is not set
> +CONFIG_SYS_PROMPT="OMAP3_EVM # "
> diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
> index b11d2e4..5d0ac9e 100644
> --- a/configs/omap3_logic_defconfig
> +++ b/configs/omap3_logic_defconfig
> @@ -5,3 +5,4 @@ CONFIG_TARGET_OMAP3_LOGIC=y
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_FPGA is not set
> +CONFIG_SYS_PROMPT="OMAP Logic # "
> diff --git a/configs/omap3_mvblx_defconfig b/configs/omap3_mvblx_defconfig
> index 415b02e..fb12a70 100644
> --- a/configs/omap3_mvblx_defconfig
> +++ b/configs/omap3_mvblx_defconfig
> @@ -6,3 +6,4 @@ CONFIG_AUTOBOOT_STOP_STR="S"
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="mvblx # "
> diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig
> index 8d55590..5d03485 100644
> --- a/configs/omap3_overo_defconfig
> +++ b/configs/omap3_overo_defconfig
> @@ -8,3 +8,4 @@ CONFIG_SPL=y
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NFS is not set
> +CONFIG_SYS_PROMPT="Overo # "
> diff --git a/configs/omap3_pandora_defconfig b/configs/omap3_pandora_defconfig
> index f18a520..4fb7899 100644
> --- a/configs/omap3_pandora_defconfig
> +++ b/configs/omap3_pandora_defconfig
> @@ -8,3 +8,4 @@ CONFIG_TARGET_OMAP3_PANDORA=y
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NET is not set
>  # CONFIG_CMD_NFS is not set
> +CONFIG_SYS_PROMPT="Pandora # "
> diff --git a/configs/omap3_sdp3430_defconfig b/configs/omap3_sdp3430_defconfig
> index df9e709..2e46091 100644
> --- a/configs/omap3_sdp3430_defconfig
> +++ b/configs/omap3_sdp3430_defconfig
> @@ -4,3 +4,4 @@ CONFIG_TARGET_OMAP3_SDP3430=y
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="OMAP34XX SDP # "
> diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig
> index a49be95..4cff178 100644
> --- a/configs/omapl138_lcdk_defconfig
> +++ b/configs/omapl138_lcdk_defconfig
> @@ -6,3 +6,4 @@ CONFIG_SPL=y
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="U-Boot > "
> diff --git a/configs/origen_defconfig b/configs/origen_defconfig
> index 6961978..d69d497 100644
> --- a/configs/origen_defconfig
> +++ b/configs/origen_defconfig
> @@ -13,3 +13,4 @@ CONFIG_OF_CONTROL=y
>  CONFIG_SPL_DISABLE_OF_CONTROL=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
> +CONFIG_SYS_PROMPT="ORIGEN # "
> diff --git a/configs/palmld_defconfig b/configs/palmld_defconfig
> index 8bf6c53..354071a 100644
> --- a/configs/palmld_defconfig
> +++ b/configs/palmld_defconfig
> @@ -4,3 +4,4 @@ CONFIG_TARGET_PALMLD=y
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NET is not set
>  # CONFIG_CMD_NFS is not set
> +CONFIG_SYS_PROMPT="$ "
> diff --git a/configs/palmtc_defconfig b/configs/palmtc_defconfig
> index 4042466..de617e1 100644
> --- a/configs/palmtc_defconfig
> +++ b/configs/palmtc_defconfig
> @@ -3,3 +3,4 @@ CONFIG_TARGET_PALMTC=y
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NET is not set
>  # CONFIG_CMD_NFS is not set
> +CONFIG_SYS_PROMPT="$ "
> diff --git a/configs/paz00_defconfig b/configs/paz00_defconfig
> index 60fb2d6..5cba318 100644
> --- a/configs/paz00_defconfig
> +++ b/configs/paz00_defconfig
> @@ -13,3 +13,4 @@ CONFIG_SPL_DM=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="Tegra20 (Paz00) MOD # "
> diff --git a/configs/pb1000_defconfig b/configs/pb1000_defconfig
> index 72756a7..c6221a3 100644
> --- a/configs/pb1000_defconfig
> +++ b/configs/pb1000_defconfig
> @@ -10,3 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="PB1000"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="Pb1x00 # "
> diff --git a/configs/pcm030_defconfig b/configs/pcm030_defconfig
> index df9309e..6305092 100644
> --- a/configs/pcm030_defconfig
> +++ b/configs/pcm030_defconfig
> @@ -2,3 +2,4 @@ CONFIG_PPC=y
>  CONFIG_MPC5xxx=y
>  CONFIG_TARGET_PCM030=y
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="uboot> "
> diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig
> index c17fc73..fa58d3e 100644
> --- a/configs/peach-pi_defconfig
> +++ b/configs/peach-pi_defconfig
> @@ -12,3 +12,4 @@ CONFIG_CROS_EC_SPI=y
>  CONFIG_CROS_EC_KEYB=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
> +CONFIG_SYS_PROMPT="Peach-Pi # "
> diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig
> index 8f21722..4dd58c9 100644
> --- a/configs/peach-pit_defconfig
> +++ b/configs/peach-pit_defconfig
> @@ -12,3 +12,4 @@ CONFIG_CROS_EC_SPI=y
>  CONFIG_CROS_EC_KEYB=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
> +CONFIG_SYS_PROMPT="Peach-Pit # "
> diff --git a/configs/pepper_defconfig b/configs/pepper_defconfig
> index eb1b6cf..787c5f9 100644
> --- a/configs/pepper_defconfig
> +++ b/configs/pepper_defconfig
> @@ -4,3 +4,4 @@ CONFIG_SPL=y
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="pepper# "
> diff --git a/configs/platinum_picon_defconfig b/configs/platinum_picon_defconfig
> index 3484c46..64da7c4 100644
> --- a/configs/platinum_picon_defconfig
> +++ b/configs/platinum_picon_defconfig
> @@ -5,3 +5,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6DL"
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="picon > "
> diff --git a/configs/platinum_titanium_defconfig b/configs/platinum_titanium_defconfig
> index 6a2cacf..67957c3 100644
> --- a/configs/platinum_titanium_defconfig
> +++ b/configs/platinum_titanium_defconfig
> @@ -5,3 +5,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="titanium > "
> diff --git a/configs/plutux_defconfig b/configs/plutux_defconfig
> index 8d96e33..07fa7f9 100644
> --- a/configs/plutux_defconfig
> +++ b/configs/plutux_defconfig
> @@ -13,3 +13,4 @@ CONFIG_SPL_DM=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="Tegra20 (Plutux) # "
> diff --git a/configs/pm9261_defconfig b/configs/pm9261_defconfig
> index 2c842b4..0a7716e 100644
> --- a/configs/pm9261_defconfig
> +++ b/configs/pm9261_defconfig
> @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261"
>  # CONFIG_CMD_LOADS is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="pm9261> "
> diff --git a/configs/pm9263_defconfig b/configs/pm9263_defconfig
> index a065ce0..45e060b 100644
> --- a/configs/pm9263_defconfig
> +++ b/configs/pm9263_defconfig
> @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263"
>  # CONFIG_CMD_LOADS is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="u-boot-pm9263> "
> diff --git a/configs/pm9g45_defconfig b/configs/pm9g45_defconfig
> index bbaeae8..3f34b3c 100644
> --- a/configs/pm9g45_defconfig
> +++ b/configs/pm9g45_defconfig
> @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G45"
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/pogo_e02_defconfig b/configs/pogo_e02_defconfig
> index f21237f..50a058e 100644
> --- a/configs/pogo_e02_defconfig
> +++ b/configs/pogo_e02_defconfig
> @@ -4,3 +4,4 @@ CONFIG_TARGET_POGO_E02=y
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="PogoE02> "
> diff --git a/configs/pr1_defconfig b/configs/pr1_defconfig
> index b06babc..583f132 100644
> --- a/configs/pr1_defconfig
> +++ b/configs/pr1_defconfig
> @@ -6,3 +6,4 @@ CONFIG_TARGET_PR1=y
>  CONFIG_SPI_FLASH=y
>  CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
>  CONFIG_LIB_RAND=y
> +CONFIG_SYS_PROMPT="pr1>"
> diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
> index 0bb42ff..41c2849 100644
> --- a/configs/pxm2_defconfig
> +++ b/configs/pxm2_defconfig
> @@ -8,3 +8,4 @@ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="U-Boot# "
> diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig
> index 2b126ac..7a3ac70 100644
> --- a/configs/rastaban_defconfig
> +++ b/configs/rastaban_defconfig
> @@ -8,3 +8,4 @@ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="U-Boot# "
> diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
> index 139189d..4b92045 100644
> --- a/configs/rpi_2_defconfig
> +++ b/configs/rpi_2_defconfig
> @@ -6,3 +6,4 @@ CONFIG_TARGET_RPI_2=y
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_PHYS_TO_BUS=y
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
> index db8da68..195ff99 100644
> --- a/configs/rpi_defconfig
> +++ b/configs/rpi_defconfig
> @@ -6,3 +6,4 @@ CONFIG_TARGET_RPI=y
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_PHYS_TO_BUS=y
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/rut_defconfig b/configs/rut_defconfig
> index da9dfe3..774957c 100644
> --- a/configs/rut_defconfig
> +++ b/configs/rut_defconfig
> @@ -8,3 +8,4 @@ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="U-Boot# "
> diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig
> index 7e03b9d..5c873f7 100644
> --- a/configs/s5p_goni_defconfig
> +++ b/configs/s5p_goni_defconfig
> @@ -10,3 +10,4 @@ CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-goni"
>  # CONFIG_CMD_NET is not set
>  # CONFIG_CMD_NFS is not set
>  # CONFIG_CMD_MISC is not set
> +CONFIG_SYS_PROMPT="Goni # "
> diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig
> index 21a4708..1a49978 100644
> --- a/configs/s5pc210_universal_defconfig
> +++ b/configs/s5pc210_universal_defconfig
> @@ -12,3 +12,4 @@ CONFIG_OF_CONTROL=y
>  CONFIG_SPL_DISABLE_OF_CONTROL=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
> +CONFIG_SYS_PROMPT="Universal # "
> diff --git a/configs/scb9328_defconfig b/configs/scb9328_defconfig
> index 3104586..c9c5034 100644
> --- a/configs/scb9328_defconfig
> +++ b/configs/scb9328_defconfig
> @@ -4,3 +4,4 @@ CONFIG_TARGET_SCB9328=y
>  # CONFIG_CMD_LOADS is not set
>  # CONFIG_CMD_SOURCE is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="scb9328> "
> diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
> index 942f17e..54afbdb 100644
> --- a/configs/seaboard_defconfig
> +++ b/configs/seaboard_defconfig
> @@ -13,3 +13,4 @@ CONFIG_SPL_DM=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="Tegra20 (SeaBoard) # "
> diff --git a/configs/secomx6quq7_defconfig b/configs/secomx6quq7_defconfig
> index 0095ceb..c97172d 100644
> --- a/configs/secomx6quq7_defconfig
> +++ b/configs/secomx6quq7_defconfig
> @@ -7,3 +7,4 @@ CONFIG_SECOMX6_2GB=y
>  CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_MMC"
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
> +CONFIG_SYS_PROMPT="SECO MX6Q uQ7 U-Boot > "
> diff --git a/configs/smdk2410_defconfig b/configs/smdk2410_defconfig
> index 74bb9e3..51f348e 100644
> --- a/configs/smdk2410_defconfig
> +++ b/configs/smdk2410_defconfig
> @@ -1,3 +1,4 @@
>  CONFIG_ARM=y
>  CONFIG_TARGET_SMDK2410=y
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="SMDK2410 # "
> diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig
> index 8412d6f..b8df6fb 100644
> --- a/configs/smdk5250_defconfig
> +++ b/configs/smdk5250_defconfig
> @@ -14,3 +14,4 @@ CONFIG_SOUND_MAX98095=y
>  CONFIG_SOUND_WM8994=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
> +CONFIG_SYS_PROMPT="SMDK5250 # "
> diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig
> index a96b368..d1d75e2 100644
> --- a/configs/smdk5420_defconfig
> +++ b/configs/smdk5420_defconfig
> @@ -8,3 +8,4 @@ CONFIG_SPL=y
>  CONFIG_SPI_FLASH=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
> +CONFIG_SYS_PROMPT="SMDK5420 # "
> diff --git a/configs/smdkc100_defconfig b/configs/smdkc100_defconfig
> index 6c8359e..676781e 100644
> --- a/configs/smdkc100_defconfig
> +++ b/configs/smdkc100_defconfig
> @@ -5,3 +5,4 @@ CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-smdkc100"
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="SMDKC100 # "
> diff --git a/configs/smdkv310_defconfig b/configs/smdkv310_defconfig
> index 39dd5be..7833f62 100644
> --- a/configs/smdkv310_defconfig
> +++ b/configs/smdkv310_defconfig
> @@ -10,3 +10,4 @@ CONFIG_SPL=y
>  # CONFIG_CMD_MISC is not set
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
> +CONFIG_SYS_PROMPT="SMDKV310 # "
> diff --git a/configs/snapper9260_defconfig b/configs/snapper9260_defconfig
> index d319a4f..31cc5a0 100644
> --- a/configs/snapper9260_defconfig
> +++ b/configs/snapper9260_defconfig
> @@ -10,3 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SOURCE is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="Snapper> "
> diff --git a/configs/snow_defconfig b/configs/snow_defconfig
> index 93fbcae..54efe1a 100644
> --- a/configs/snow_defconfig
> +++ b/configs/snow_defconfig
> @@ -18,3 +18,4 @@ CONFIG_SOUND_MAX98095=y
>  CONFIG_SOUND_WM8994=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
> +CONFIG_SYS_PROMPT="snow # "
> diff --git a/configs/snowball_defconfig b/configs/snowball_defconfig
> index 31aa583..e73bc48 100644
> --- a/configs/snowball_defconfig
> +++ b/configs/snowball_defconfig
> @@ -10,3 +10,4 @@ CONFIG_TARGET_SNOWBALL=y
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NET is not set
>  # CONFIG_CMD_NFS is not set
> +CONFIG_SYS_PROMPT="U8500 $ "
> diff --git a/configs/stamp9g20_defconfig b/configs/stamp9g20_defconfig
> index 78c4775..40d6232 100644
> --- a/configs/stamp9g20_defconfig
> +++ b/configs/stamp9g20_defconfig
> @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20"
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/stm32f429-discovery_defconfig b/configs/stm32f429-discovery_defconfig
> index 188adc5..0c54d5b 100644
> --- a/configs/stm32f429-discovery_defconfig
> +++ b/configs/stm32f429-discovery_defconfig
> @@ -1,3 +1,4 @@
>  CONFIG_ARM=y
>  CONFIG_TARGET_STM32F429_DISCOVERY=y
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot > "
> diff --git a/configs/stv0991_defconfig b/configs/stv0991_defconfig
> index 3bdb1fc..f71206a 100644
> --- a/configs/stv0991_defconfig
> +++ b/configs/stv0991_defconfig
> @@ -12,3 +12,4 @@ CONFIG_AUTOBOOT_STOP_STR=" "
>  CONFIG_NETDEVICES=y
>  CONFIG_ETH_DESIGNWARE=y
>  CONFIG_OF_CONTROL=y
> +CONFIG_SYS_PROMPT="STV0991> "
> diff --git a/configs/stxgp3_defconfig b/configs/stxgp3_defconfig
> index 86afe88..816092d 100644
> --- a/configs/stxgp3_defconfig
> +++ b/configs/stxgp3_defconfig
> @@ -2,3 +2,4 @@ CONFIG_PPC=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_STXGP3=y
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="GPPP=> "
> diff --git a/configs/stxssa_defconfig b/configs/stxssa_defconfig
> index c072417..ec812c1 100644
> --- a/configs/stxssa_defconfig
> +++ b/configs/stxssa_defconfig
> @@ -2,3 +2,4 @@ CONFIG_PPC=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_STXSSA=y
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="SSA=> "
> diff --git a/configs/tao3530_defconfig b/configs/tao3530_defconfig
> index ae4b49b..779f400 100644
> --- a/configs/tao3530_defconfig
> +++ b/configs/tao3530_defconfig
> @@ -7,3 +7,4 @@ CONFIG_SPL=y
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="TAO-3530 # "
> diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig
> index 3787493..838d0ed 100644
> --- a/configs/taurus_defconfig
> +++ b/configs/taurus_defconfig
> @@ -11,3 +11,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,MACH_TYPE=2067,BOARD_TAURUS"
>  # CONFIG_CMD_SOURCE is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/tb100_defconfig b/configs/tb100_defconfig
> index cc8f527..acd1f3a 100644
> --- a/configs/tb100_defconfig
> +++ b/configs/tb100_defconfig
> @@ -14,3 +14,4 @@ CONFIG_NETDEVICES=y
>  CONFIG_ETH_DESIGNWARE=y
>  CONFIG_DM_SERIAL=y
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="[tb100]:~# "
> diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
> index f0e5106..745d32e 100644
> --- a/configs/tbs2910_defconfig
> +++ b/configs/tbs2910_defconfig
> @@ -5,3 +5,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,
>  # CONFIG_CMD_FLASH is not set
>  CONFIG_DM=y
>  CONFIG_DM_THERMAL=y
> +CONFIG_SYS_PROMPT="Matrix U-Boot> "
> diff --git a/configs/tec-ng_defconfig b/configs/tec-ng_defconfig
> index e731205..4e8f5c6 100644
> --- a/configs/tec-ng_defconfig
> +++ b/configs/tec-ng_defconfig
> @@ -14,3 +14,4 @@ CONFIG_SPI_FLASH=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="Tegra30 (TEC-NG) # "
> diff --git a/configs/tec_defconfig b/configs/tec_defconfig
> index 3f815fe..84fa0be 100644
> --- a/configs/tec_defconfig
> +++ b/configs/tec_defconfig
> @@ -13,3 +13,4 @@ CONFIG_SPL_DM=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="Tegra20 (TEC) # "
> diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig
> index 8192b28..e2a6b0c 100644
> --- a/configs/thuban_defconfig
> +++ b/configs/thuban_defconfig
> @@ -8,3 +8,4 @@ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="U-Boot# "
> diff --git a/configs/ti814x_evm_defconfig b/configs/ti814x_evm_defconfig
> index ade4ea2..f7d1e11 100644
> --- a/configs/ti814x_evm_defconfig
> +++ b/configs/ti814x_evm_defconfig
> @@ -4,3 +4,4 @@ CONFIG_SPL=y
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot# "
> diff --git a/configs/ti816x_evm_defconfig b/configs/ti816x_evm_defconfig
> index 67e5e60..1fd2719 100644
> --- a/configs/ti816x_evm_defconfig
> +++ b/configs/ti816x_evm_defconfig
> @@ -4,3 +4,4 @@ CONFIG_SPL=y
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="u-boot/ti816x# "
> diff --git a/configs/titanium_defconfig b/configs/titanium_defconfig
> index e892d3e..d286fd6 100644
> --- a/configs/titanium_defconfig
> +++ b/configs/titanium_defconfig
> @@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/barco/titanium/imximage.cfg"
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="Titanium > "
> diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig
> index f3cbe6d..f0dd2b9 100644
> --- a/configs/trats2_defconfig
> +++ b/configs/trats2_defconfig
> @@ -13,3 +13,4 @@ CONFIG_OF_CONTROL=y
>  CONFIG_SPL_DISABLE_OF_CONTROL=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
> +CONFIG_SYS_PROMPT="Trats2 # "
> diff --git a/configs/trats_defconfig b/configs/trats_defconfig
> index 6553edb..6412f31 100644
> --- a/configs/trats_defconfig
> +++ b/configs/trats_defconfig
> @@ -12,3 +12,4 @@ CONFIG_OF_CONTROL=y
>  CONFIG_SPL_DISABLE_OF_CONTROL=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
> +CONFIG_SYS_PROMPT="Trats # "
> diff --git a/configs/tricorder_defconfig b/configs/tricorder_defconfig
> index cbd4dd3..1da9e94 100644
> --- a/configs/tricorder_defconfig
> +++ b/configs/tricorder_defconfig
> @@ -9,3 +9,4 @@ CONFIG_SPL=y
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NET is not set
>  # CONFIG_CMD_NFS is not set
> +CONFIG_SYS_PROMPT="OMAP3 Tricorder # "
> diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig
> index 9d2fb2d..a1bcb11 100644
> --- a/configs/trimslice_defconfig
> +++ b/configs/trimslice_defconfig
> @@ -14,3 +14,4 @@ CONFIG_SPI_FLASH=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="Tegra20 (TrimSlice) # "
> diff --git a/configs/tseries_mmc_defconfig b/configs/tseries_mmc_defconfig
> index 9ed13b6..a083ee0 100644
> --- a/configs/tseries_mmc_defconfig
> +++ b/configs/tseries_mmc_defconfig
> @@ -14,3 +14,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT"
>  # CONFIG_CMD_ITEST is not set
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NFS is not set
> +CONFIG_SYS_PROMPT="U-Boot (BuR V2.0)# "
> diff --git a/configs/tseries_nand_defconfig b/configs/tseries_nand_defconfig
> index 0b577edc..aa66a0e 100644
> --- a/configs/tseries_nand_defconfig
> +++ b/configs/tseries_nand_defconfig
> @@ -14,3 +14,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND"
>  # CONFIG_CMD_ITEST is not set
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NFS is not set
> +CONFIG_SYS_PROMPT="U-Boot (BuR V2.0)# "
> diff --git a/configs/tseries_spi_defconfig b/configs/tseries_spi_defconfig
> index 1602a43..1cb90d6 100644
> --- a/configs/tseries_spi_defconfig
> +++ b/configs/tseries_spi_defconfig
> @@ -15,3 +15,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,SPI_BOOT,EMMC_BOOT"
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NFS is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="U-Boot (BuR V2.0)# "
> diff --git a/configs/tt01_defconfig b/configs/tt01_defconfig
> index d23904d..08f9f7b 100644
> --- a/configs/tt01_defconfig
> +++ b/configs/tt01_defconfig
> @@ -1,3 +1,4 @@
>  CONFIG_ARM=y
>  CONFIG_TARGET_TT01=y
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="TT01> "
> diff --git a/configs/twister_defconfig b/configs/twister_defconfig
> index 7381665..c3edd34 100644
> --- a/configs/twister_defconfig
> +++ b/configs/twister_defconfig
> @@ -5,3 +5,4 @@ CONFIG_SPL=y
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="twister => "
> diff --git a/configs/u8500_href_defconfig b/configs/u8500_href_defconfig
> index 5a82ca8..0aebc78 100644
> --- a/configs/u8500_href_defconfig
> +++ b/configs/u8500_href_defconfig
> @@ -10,3 +10,4 @@ CONFIG_TARGET_U8500_HREF=y
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NET is not set
>  # CONFIG_CMD_NFS is not set
> +CONFIG_SYS_PROMPT="U8500 $ "
> diff --git a/configs/usb_a9263_dataflash_defconfig b/configs/usb_a9263_dataflash_defconfig
> index 5f3974e..8cf3c4c 100644
> --- a/configs/usb_a9263_dataflash_defconfig
> +++ b/configs/usb_a9263_dataflash_defconfig
> @@ -10,3 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_ITEST is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/v5fx30teval_defconfig b/configs/v5fx30teval_defconfig
> index 8173f3e..e77dce9 100644
> --- a/configs/v5fx30teval_defconfig
> +++ b/configs/v5fx30teval_defconfig
> @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x041000
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NET is not set
>  # CONFIG_CMD_NFS is not set
> +CONFIG_SYS_PROMPT="v5fx30t:/# "
> diff --git a/configs/vct_platinum_defconfig b/configs/vct_platinum_defconfig
> index 81cf280..9a46dcb 100644
> --- a/configs/vct_platinum_defconfig
> +++ b/configs/vct_platinum_defconfig
> @@ -3,3 +3,4 @@ CONFIG_TARGET_VCT=y
>  CONFIG_VCT_PLATINUM=y
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="$ "
> diff --git a/configs/vct_platinum_onenand_defconfig b/configs/vct_platinum_onenand_defconfig
> index 8d91aa5..8c8d69a 100644
> --- a/configs/vct_platinum_onenand_defconfig
> +++ b/configs/vct_platinum_onenand_defconfig
> @@ -6,3 +6,4 @@ CONFIG_VCT_ONENAND=y
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="$ "
> diff --git a/configs/vct_platinum_onenand_small_defconfig b/configs/vct_platinum_onenand_small_defconfig
> index 6eaec0c..4e6cbc7 100644
> --- a/configs/vct_platinum_onenand_small_defconfig
> +++ b/configs/vct_platinum_onenand_small_defconfig
> @@ -17,3 +17,4 @@ CONFIG_VCT_SMALL_IMAGE=y
>  # CONFIG_CMD_NFS is not set
>  # CONFIG_CMD_MISC is not set
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="$ "
> diff --git a/configs/vct_platinum_small_defconfig b/configs/vct_platinum_small_defconfig
> index 088ab7e..f896822 100644
> --- a/configs/vct_platinum_small_defconfig
> +++ b/configs/vct_platinum_small_defconfig
> @@ -14,3 +14,4 @@ CONFIG_VCT_SMALL_IMAGE=y
>  # CONFIG_CMD_NFS is not set
>  # CONFIG_CMD_MISC is not set
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="$ "
> diff --git a/configs/vct_platinumavc_defconfig b/configs/vct_platinumavc_defconfig
> index faeb6a2..6e867b2 100644
> --- a/configs/vct_platinumavc_defconfig
> +++ b/configs/vct_platinumavc_defconfig
> @@ -5,3 +5,4 @@ CONFIG_VCT_PLATINUMAVC=y
>  # CONFIG_CMD_NET is not set
>  # CONFIG_CMD_NFS is not set
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="VCT# "
> diff --git a/configs/vct_platinumavc_onenand_defconfig b/configs/vct_platinumavc_onenand_defconfig
> index 900a626..55f8c91 100644
> --- a/configs/vct_platinumavc_onenand_defconfig
> +++ b/configs/vct_platinumavc_onenand_defconfig
> @@ -8,3 +8,4 @@ CONFIG_VCT_ONENAND=y
>  # CONFIG_CMD_NET is not set
>  # CONFIG_CMD_NFS is not set
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="$ "
> diff --git a/configs/vct_platinumavc_onenand_small_defconfig b/configs/vct_platinumavc_onenand_small_defconfig
> index e9928a0..343ab8f 100644
> --- a/configs/vct_platinumavc_onenand_small_defconfig
> +++ b/configs/vct_platinumavc_onenand_small_defconfig
> @@ -17,3 +17,4 @@ CONFIG_VCT_SMALL_IMAGE=y
>  # CONFIG_CMD_NFS is not set
>  # CONFIG_CMD_MISC is not set
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="$ "
> diff --git a/configs/vct_platinumavc_small_defconfig b/configs/vct_platinumavc_small_defconfig
> index 719bd64..b4acc4a 100644
> --- a/configs/vct_platinumavc_small_defconfig
> +++ b/configs/vct_platinumavc_small_defconfig
> @@ -14,3 +14,4 @@ CONFIG_VCT_SMALL_IMAGE=y
>  # CONFIG_CMD_NFS is not set
>  # CONFIG_CMD_MISC is not set
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="$ "
> diff --git a/configs/vct_premium_defconfig b/configs/vct_premium_defconfig
> index 7b04e7c..d71dd53 100644
> --- a/configs/vct_premium_defconfig
> +++ b/configs/vct_premium_defconfig
> @@ -3,3 +3,4 @@ CONFIG_TARGET_VCT=y
>  CONFIG_VCT_PREMIUM=y
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="$ "
> diff --git a/configs/vct_premium_onenand_defconfig b/configs/vct_premium_onenand_defconfig
> index 769f8bd..6923db8 100644
> --- a/configs/vct_premium_onenand_defconfig
> +++ b/configs/vct_premium_onenand_defconfig
> @@ -6,3 +6,4 @@ CONFIG_VCT_ONENAND=y
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="$ "
> diff --git a/configs/vct_premium_onenand_small_defconfig b/configs/vct_premium_onenand_small_defconfig
> index c062a01..04a2855 100644
> --- a/configs/vct_premium_onenand_small_defconfig
> +++ b/configs/vct_premium_onenand_small_defconfig
> @@ -17,3 +17,4 @@ CONFIG_VCT_SMALL_IMAGE=y
>  # CONFIG_CMD_NFS is not set
>  # CONFIG_CMD_MISC is not set
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="$ "
> diff --git a/configs/vct_premium_small_defconfig b/configs/vct_premium_small_defconfig
> index 4a5cdb0..265a6a5 100644
> --- a/configs/vct_premium_small_defconfig
> +++ b/configs/vct_premium_small_defconfig
> @@ -14,3 +14,4 @@ CONFIG_VCT_SMALL_IMAGE=y
>  # CONFIG_CMD_NFS is not set
>  # CONFIG_CMD_MISC is not set
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="$ "
> diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig
> index 9ccd739..0bab477 100644
> --- a/configs/venice2_defconfig
> +++ b/configs/venice2_defconfig
> @@ -14,3 +14,4 @@ CONFIG_SPI_FLASH=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="Tegra124 (Venice2) # "
> diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig
> index f728585..d347317 100644
> --- a/configs/ventana_defconfig
> +++ b/configs/ventana_defconfig
> @@ -13,3 +13,4 @@ CONFIG_SPL_DM=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="Tegra20 (Ventana) # "
> diff --git a/configs/vexpress_aemv8a_juno_defconfig b/configs/vexpress_aemv8a_juno_defconfig
> index 0baaa91..3390f0e 100644
> --- a/configs/vexpress_aemv8a_juno_defconfig
> +++ b/configs/vexpress_aemv8a_juno_defconfig
> @@ -15,3 +15,4 @@ CONFIG_DEFAULT_DEVICE_TREE="vexpress64"
>  # CONFIG_CMD_MISC is not set
>  CONFIG_DM=y
>  CONFIG_DM_SERIAL=y
> +CONFIG_SYS_PROMPT="VExpress64# "
> diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig
> index bf5576a..9890e64 100644
> --- a/configs/vexpress_aemv8a_semi_defconfig
> +++ b/configs/vexpress_aemv8a_semi_defconfig
> @@ -16,3 +16,4 @@ CONFIG_DEFAULT_DEVICE_TREE="vexpress64"
>  # CONFIG_CMD_MISC is not set
>  CONFIG_DM=y
>  CONFIG_DM_SERIAL=y
> +CONFIG_SYS_PROMPT="VExpress64# "
> diff --git a/configs/vision2_defconfig b/configs/vision2_defconfig
> index afe3b3c..962dc5b 100644
> --- a/configs/vision2_defconfig
> +++ b/configs/vision2_defconfig
> @@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/ttcontrol/vision2/imximage_hynix.cfg"
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_SPI_FLASH=y
> +CONFIG_SYS_PROMPT="Vision II U-boot > "
> diff --git a/configs/vl_ma2sc_defconfig b/configs/vl_ma2sc_defconfig
> index 7a66783..c908c6e 100644
> --- a/configs/vl_ma2sc_defconfig
> +++ b/configs/vl_ma2sc_defconfig
> @@ -6,3 +6,4 @@ CONFIG_TARGET_VL_MA2SC=y
>  # CONFIG_CMD_LOADS is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/vpac270_nor_128_defconfig b/configs/vpac270_nor_128_defconfig
> index bbc6e6a..1d11653 100644
> --- a/configs/vpac270_nor_128_defconfig
> +++ b/configs/vpac270_nor_128_defconfig
> @@ -3,3 +3,4 @@ CONFIG_TARGET_VPAC270=y
>  CONFIG_SYS_EXTRA_OPTIONS="NOR,RAM_128M"
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="$ "
> diff --git a/configs/vpac270_nor_256_defconfig b/configs/vpac270_nor_256_defconfig
> index 3f1ae1e..bcd1006 100644
> --- a/configs/vpac270_nor_256_defconfig
> +++ b/configs/vpac270_nor_256_defconfig
> @@ -3,3 +3,4 @@ CONFIG_TARGET_VPAC270=y
>  CONFIG_SYS_EXTRA_OPTIONS="NOR,RAM_256M"
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="$ "
> diff --git a/configs/vpac270_ond_256_defconfig b/configs/vpac270_ond_256_defconfig
> index 7500b7c..d989819 100644
> --- a/configs/vpac270_ond_256_defconfig
> +++ b/configs/vpac270_ond_256_defconfig
> @@ -5,3 +5,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ONENAND,RAM_256M"
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="$ "
> diff --git a/configs/whistler_defconfig b/configs/whistler_defconfig
> index 43d725b..e3ce9fd 100644
> --- a/configs/whistler_defconfig
> +++ b/configs/whistler_defconfig
> @@ -13,3 +13,4 @@ CONFIG_SPL_DM=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USE_PRIVATE_LIBGCC=y
> +CONFIG_SYS_PROMPT="Tegra20 (Whistler) # "
> diff --git a/configs/wireless_space_defconfig b/configs/wireless_space_defconfig
> index 5551d27..63013f6 100644
> --- a/configs/wireless_space_defconfig
> +++ b/configs/wireless_space_defconfig
> @@ -4,3 +4,4 @@ CONFIG_TARGET_WIRELESS_SPACE=y
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_SETEXPR is not set
> +ONFIG_SYS_PROMPT="ws> "
> diff --git a/configs/woodburn_defconfig b/configs/woodburn_defconfig
> index 8dcf3e1..3b463c1 100644
> --- a/configs/woodburn_defconfig
> +++ b/configs/woodburn_defconfig
> @@ -1,3 +1,4 @@
>  CONFIG_ARM=y
>  CONFIG_TARGET_WOODBURN=y
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="woodburn U-Boot > "
> diff --git a/configs/woodburn_sd_defconfig b/configs/woodburn_sd_defconfig
> index 96a00b3..59f2ad0 100644
> --- a/configs/woodburn_sd_defconfig
> +++ b/configs/woodburn_sd_defconfig
> @@ -3,3 +3,4 @@ CONFIG_TARGET_WOODBURN_SD=y
>  CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/woodburn/imximage.cfg"
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="woodburn U-Boot > "
> diff --git a/configs/x600_defconfig b/configs/x600_defconfig
> index fdd4d3b..6be6cc3 100644
> --- a/configs/x600_defconfig
> +++ b/configs/x600_defconfig
> @@ -7,3 +7,4 @@ CONFIG_AUTOBOOT_STOP_STR=" "
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_NETDEVICES=y
>  CONFIG_ETH_DESIGNWARE=y
> +CONFIG_SYS_PROMPT="X600> "
> diff --git a/configs/xilinx-ppc405-generic_defconfig b/configs/xilinx-ppc405-generic_defconfig
> index 9dae755..98030d0 100644
> --- a/configs/xilinx-ppc405-generic_defconfig
> +++ b/configs/xilinx-ppc405-generic_defconfig
> @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x041000
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NET is not set
>  # CONFIG_CMD_NFS is not set
> +CONFIG_SYS_PROMPT="xlx-ppc405:/# "
> diff --git a/configs/xilinx-ppc440-generic_defconfig b/configs/xilinx-ppc440-generic_defconfig
> index 398362b..de69773 100644
> --- a/configs/xilinx-ppc440-generic_defconfig
> +++ b/configs/xilinx-ppc440-generic_defconfig
> @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x041000
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NET is not set
>  # CONFIG_CMD_NFS is not set
> +CONFIG_SYS_PROMPT="board:/# "
> diff --git a/configs/xilinx_zynqmp_defconfig b/configs/xilinx_zynqmp_defconfig
> index 1c64eea..000cc93 100644
> --- a/configs/xilinx_zynqmp_defconfig
> +++ b/configs/xilinx_zynqmp_defconfig
> @@ -15,3 +15,4 @@ CONFIG_DEFAULT_DEVICE_TREE="zynqmp"
>  # CONFIG_CMD_NFS is not set
>  CONFIG_CMD_TIME=y
>  CONFIG_CMD_TIMER=y
> +CONFIG_SYS_PROMPT="ZynqMP> "
> diff --git a/configs/zipitz2_defconfig b/configs/zipitz2_defconfig
> index 3591849..2977ccc 100644
> --- a/configs/zipitz2_defconfig
> +++ b/configs/zipitz2_defconfig
> @@ -4,3 +4,4 @@ CONFIG_TARGET_ZIPITZ2=y
>  # CONFIG_CMD_SETEXPR is not set
>  # CONFIG_CMD_NET is not set
>  # CONFIG_CMD_NFS is not set
> +CONFIG_SYS_PROMPT="$ "
> diff --git a/configs/zmx25_defconfig b/configs/zmx25_defconfig
> index a34e827..c759cdf 100644
> --- a/configs/zmx25_defconfig
> +++ b/configs/zmx25_defconfig
> @@ -5,3 +5,4 @@ CONFIG_AUTOBOOT_PROMPT="boot in %d s\n"
>  CONFIG_AUTOBOOT_DELAY_STR="delaygs"
>  CONFIG_AUTOBOOT_STOP_STR="stopgs"
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_SYS_PROMPT="zmx25> "
> diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
> index a2468c3..5e15dd9 100644
> --- a/include/configs/M5208EVBE.h
> +++ b/include/configs/M5208EVBE.h
> @@ -88,7 +88,6 @@
>  	""
>  
>  #define CONFIG_PRAM		512	/* 512 KB */
> -#define CONFIG_SYS_PROMPT	"-> "
>  #define CONFIG_SYS_LONGHELP	/* undef to save memory */
>  
>  #ifdef CONFIG_CMD_KGDB
> diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h
> index 2e86016..d1cadc0 100644
> --- a/include/configs/M52277EVB.h
> +++ b/include/configs/M52277EVB.h
> @@ -150,7 +150,6 @@
>  
>  #define CONFIG_PRAM		2048	/* 2048 KB */
>  
> -#define CONFIG_SYS_PROMPT	"-> "
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
>  
>  #if defined(CONFIG_CMD_KGDB)
> diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
> index ae11e7d..1472672 100644
> --- a/include/configs/M5235EVB.h
> +++ b/include/configs/M5235EVB.h
> @@ -106,7 +106,6 @@
>  	""
>  
>  #define CONFIG_PRAM		512	/* 512 KB */
> -#define CONFIG_SYS_PROMPT		"-> "
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
>  
>  #if defined(CONFIG_KGDB)
> diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
> index d888c3e..006f2d8 100644
> --- a/include/configs/M5272C3.h
> +++ b/include/configs/M5272C3.h
> @@ -105,7 +105,6 @@
>  	"save\0"				\
>  	""
>  
> -#define CONFIG_SYS_PROMPT		"-> "
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
>  
>  #if defined(CONFIG_CMD_KGDB)
> diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h
> index fa9b973..116e8e2 100644
> --- a/include/configs/M5275EVB.h
> +++ b/include/configs/M5275EVB.h
> @@ -98,7 +98,6 @@
>  #define CONFIG_SYS_I2C_PINMUX_CLR	(0xFFF0)
>  #define CONFIG_SYS_I2C_PINMUX_SET	(0x000F)
>  
> -#define CONFIG_SYS_PROMPT		"-> "
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory	*/
>  
>  #if (CONFIG_CMD_KGDB)
> diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
> index 860abe7..eff0aa6 100644
> --- a/include/configs/M5282EVB.h
> +++ b/include/configs/M5282EVB.h
> @@ -94,7 +94,6 @@
>  	"save\0"				\
>  	""
>  
> -#define CONFIG_SYS_PROMPT		"-> "
>  #define	CONFIG_SYS_LONGHELP		/* undef to save memory         */
>  
>  #if defined(CONFIG_CMD_KGDB)
> diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
> index 817b142..a48ae6b 100644
> --- a/include/configs/M53017EVB.h
> +++ b/include/configs/M53017EVB.h
> @@ -108,7 +108,6 @@
>  	""
>  
>  #define CONFIG_PRAM		512	/* 512 KB */
> -#define CONFIG_SYS_PROMPT	"-> "
>  #define CONFIG_SYS_LONGHELP	/* undef to save memory */
>  
>  #ifdef CONFIG_CMD_KGDB
> diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
> index 4724a9c..e806b7a 100644
> --- a/include/configs/M5329EVB.h
> +++ b/include/configs/M5329EVB.h
> @@ -102,7 +102,6 @@
>  	""
>  
>  #define CONFIG_PRAM		512	/* 512 KB */
> -#define CONFIG_SYS_PROMPT		"-> "
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
>  
>  #ifdef CONFIG_CMD_KGDB
> diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
> index 32afa44..1df98f7 100644
> --- a/include/configs/M5373EVB.h
> +++ b/include/configs/M5373EVB.h
> @@ -102,7 +102,6 @@
>  	""
>  
>  #define CONFIG_PRAM		512	/* 512 KB */
> -#define CONFIG_SYS_PROMPT		"-> "
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
>  
>  #ifdef CONFIG_CMD_KGDB
> diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
> index 1f65918..db0ddcd 100644
> --- a/include/configs/M54418TWR.h
> +++ b/include/configs/M54418TWR.h
> @@ -216,7 +216,6 @@
>  #define CONFIG_SYS_HUSH_PARSER		1
>  #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
>  
> -#define CONFIG_SYS_PROMPT		"-> "
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
>  
>  #if defined(CONFIG_CMD_KGDB)
> diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h
> index 2c08512..de747a4 100644
> --- a/include/configs/M54451EVB.h
> +++ b/include/configs/M54451EVB.h
> @@ -160,7 +160,6 @@
>  
>  #define CONFIG_PRAM			2048	/* 2048 KB */
>  
> -#define CONFIG_SYS_PROMPT		"-> "
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
>  
>  #if defined(CONFIG_CMD_KGDB)
> diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
> index e82ba32..06da5f0 100644
> --- a/include/configs/M54455EVB.h
> +++ b/include/configs/M54455EVB.h
> @@ -219,7 +219,6 @@
>  
>  #define CONFIG_PRAM		2048	/* 2048 KB */
>  
> -#define CONFIG_SYS_PROMPT		"-> "
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
>  
>  #if defined(CONFIG_CMD_KGDB)
> diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h
> index 3c1bb90..e30b645 100644
> --- a/include/configs/M5475EVB.h
> +++ b/include/configs/M5475EVB.h
> @@ -146,7 +146,6 @@
>  	""
>  
>  #define CONFIG_PRAM		512	/* 512 KB */
> -#define CONFIG_SYS_PROMPT		"-> "
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
>  
>  #ifdef CONFIG_CMD_KGDB
> diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h
> index 7e1b364..051c940 100644
> --- a/include/configs/M5485EVB.h
> +++ b/include/configs/M5485EVB.h
> @@ -134,7 +134,6 @@
>  	""
>  
>  #define CONFIG_PRAM		512	/* 512 KB */
> -#define CONFIG_SYS_PROMPT		"-> "
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
>  
>  #ifdef CONFIG_CMD_KGDB
> diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
> index 32cb007..834786d 100644
> --- a/include/configs/MPC8349ITX.h
> +++ b/include/configs/MPC8349ITX.h
> @@ -544,12 +544,6 @@ boards, we say we have two, but don't display a message if we find only one. */
>  #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
>  #define CONFIG_LOADADDR	800000	/* default location for tftp and bootm */
>  
> -#ifdef CONFIG_MPC8349ITX
> -#define CONFIG_SYS_PROMPT "MPC8349E-mITX> "	/* Monitor Command Prompt */
> -#else
> -#define CONFIG_SYS_PROMPT "MPC8349E-mITX-GP> "	/* Monitor Command Prompt */
> -#endif
> -
>  #if defined(CONFIG_CMD_KGDB)
>  	#define CONFIG_SYS_CBSIZE	1024	/* Console I/O Buffer Size */
>  #else
> diff --git a/include/configs/PATI.h b/include/configs/PATI.h
> index dfc4fc0..5d0e422 100644
> --- a/include/configs/PATI.h
> +++ b/include/configs/PATI.h
> @@ -71,7 +71,6 @@
>  #define CONFIG_PREBOOT
>  
>  #define	CONFIG_SYS_LONGHELP				/* undef to save memory		*/
> -#define	CONFIG_SYS_PROMPT		"pati=> "		/* Monitor Command Prompt	*/
>  #if defined(CONFIG_CMD_KGDB)
>  #define	CONFIG_SYS_CBSIZE		1024		/* Console I/O Buffer Size	*/
>  #else
> diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
> index 0fa03cf..21a918a 100644
> --- a/include/configs/T102xQDS.h
> +++ b/include/configs/T102xQDS.h
> @@ -871,7 +871,6 @@ unsigned long get_board_ddr_clk(void);
>  #define CONFIG_CMDLINE_EDITING			/* Command-line editing */
>  #define CONFIG_AUTO_COMPLETE			/* add autocompletion support */
>  #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
> -#define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt */
>  #ifdef CONFIG_CMD_KGDB
>  #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
>  #else
> diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
> index f99663a..7cdc4b9 100644
> --- a/include/configs/T102xRDB.h
> +++ b/include/configs/T102xRDB.h
> @@ -876,7 +876,6 @@ unsigned long get_board_ddr_clk(void);
>  #define CONFIG_CMDLINE_EDITING			/* Command-line editing */
>  #define CONFIG_AUTO_COMPLETE			/* add autocompletion support */
>  #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
> -#define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt */
>  #ifdef CONFIG_CMD_KGDB
>  #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
>  #else
> diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
> index bdedef5..76611b0 100644
> --- a/include/configs/UCP1020.h
> +++ b/include/configs/UCP1020.h
> @@ -550,7 +550,6 @@
>  #define CONFIG_SYS_LONGHELP			/* undef to save memory */
>  #define CONFIG_CMDLINE_EDITING			/* Command-line editing */
>  #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
> -#define CONFIG_SYS_PROMPT	"B$ "		/* Monitor Command Prompt */
>  #if defined(CONFIG_CMD_KGDB)
>  #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
>  #else
> diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h
> index 60c2948..5b2e092 100644
> --- a/include/configs/VCMA9.h
> +++ b/include/configs/VCMA9.h
> @@ -140,7 +140,6 @@
>  
>  /* Miscellaneous configurable options */
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
> -#define CONFIG_SYS_PROMPT		"VCMA9 # "
>  #define CONFIG_SYS_CBSIZE		256
>  /* Print Buffer Size */
>  #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
> diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h
> index 8a5d1e6..f05d9ec 100644
> --- a/include/configs/ac14xx.h
> +++ b/include/configs/ac14xx.h
> @@ -421,7 +421,6 @@
>   */
>  #define CONFIG_SYS_LONGHELP			/* undef to save memory */
>  #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
> -#define CONFIG_SYS_PROMPT	"ac14xx> "	/* Monitor Command Prompt */
>  
>  #ifdef CONFIG_CMD_KGDB
>  # define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
> diff --git a/include/configs/adp-ag101.h b/include/configs/adp-ag101.h
> index 4d52ba1..5a89f39 100644
> --- a/include/configs/adp-ag101.h
> +++ b/include/configs/adp-ag101.h
> @@ -117,7 +117,6 @@
>   * Miscellaneous configurable options
>   */
>  #define CONFIG_SYS_LONGHELP			/* undef to save memory */
> -#define CONFIG_SYS_PROMPT	"NDS32 # "	/* Monitor Command Prompt */
>  #define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
>  
>  /* Print Buffer Size */
> diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h
> index 06860b5..f5b20aa 100644
> --- a/include/configs/adp-ag101p.h
> +++ b/include/configs/adp-ag101p.h
> @@ -117,7 +117,6 @@
>   * Miscellaneous configurable options
>   */
>  #define CONFIG_SYS_LONGHELP			/* undef to save memory */
> -#define CONFIG_SYS_PROMPT	"NDS32 # "	/* Monitor Command Prompt */
>  #define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
>  
>  /* Print Buffer Size */
> diff --git a/include/configs/adp-ag102.h b/include/configs/adp-ag102.h
> index 026696c..c55dc71 100644
> --- a/include/configs/adp-ag102.h
> +++ b/include/configs/adp-ag102.h
> @@ -180,7 +180,6 @@
>   * Miscellaneous configurable options
>   */
>  #define CONFIG_SYS_LONGHELP			/* undef to save memory */
> -#define CONFIG_SYS_PROMPT	"NDS32 # "	/* Monitor Command Prompt */
>  #define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
>  
>  /* Print Buffer Size */
> diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
> index 6a0240b..18a214f 100644
> --- a/include/configs/am3517_crane.h
> +++ b/include/configs/am3517_crane.h
> @@ -207,11 +207,8 @@
>  /*
>   * Miscellaneous configurable options
>   */
> -#define V_PROMPT			"AM3517_CRANE # "
> -
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
>  #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
> -#define CONFIG_SYS_PROMPT		V_PROMPT
>  #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
>  /* Print Buffer Size */
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
> diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
> index b90a60d..6e99aae 100644
> --- a/include/configs/am3517_evm.h
> +++ b/include/configs/am3517_evm.h
> @@ -216,11 +216,8 @@
>  /*
>   * Miscellaneous configurable options
>   */
> -#define V_PROMPT			"AM3517_EVM # "
> -
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
>  #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
> -#define CONFIG_SYS_PROMPT		V_PROMPT
>  #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
>  /* Print Buffer Size */
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
> diff --git a/include/configs/amcore.h b/include/configs/amcore.h
> index 45fd265..bbab8b2 100644
> --- a/include/configs/amcore.h
> +++ b/include/configs/amcore.h
> @@ -26,7 +26,6 @@
>  #define CONFIG_CMD_TIMER
>  #define CONFIG_CMD_DIAG
>  
> -#define CONFIG_SYS_PROMPT		"amcore $ "
>  /* undef to save memory	*/
>  #undef	CONFIG_SYS_LONGHELP
>  
> diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
> index aba9ba6..ed8ff52 100644
> --- a/include/configs/apalis_t30.h
> +++ b/include/configs/apalis_t30.h
> @@ -12,7 +12,6 @@
>  #include "tegra30-common.h"
>  
>  /* High-level configuration options */
> -#define V_PROMPT			"Apalis T30 # "
>  #define CONFIG_TEGRA_BOARD_STRING	"Toradex Apalis T30"
>  
>  /* Board-specific serial config */
> diff --git a/include/configs/apf27.h b/include/configs/apf27.h
> index a0a26bb..1f1b013 100644
> --- a/include/configs/apf27.h
> +++ b/include/configs/apf27.h
> @@ -139,7 +139,6 @@
>   * U-Boot general configurations
>   */
>  #define CONFIG_SYS_LONGHELP
> -#define CONFIG_SYS_PROMPT		"BIOS> "	/* prompt string */
>  #define CONFIG_SYS_CBSIZE		2048		/* console I/O buffer */
>  #define CONFIG_SYS_PBSIZE		\
>  				(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
> diff --git a/include/configs/arcangel4.h b/include/configs/arcangel4.h
> index 6636e0e..a342d7e 100644
> --- a/include/configs/arcangel4.h
> +++ b/include/configs/arcangel4.h
> @@ -67,7 +67,6 @@
>   * Console configuration
>   */
>  #define CONFIG_SYS_LONGHELP
> -#define CONFIG_SYS_PROMPT		"arcangel4# "
>  #define CONFIG_SYS_CBSIZE		256
>  #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
> diff --git a/include/configs/arndale.h b/include/configs/arndale.h
> index 3ad4a9b..e590fa2 100644
> --- a/include/configs/arndale.h
> +++ b/include/configs/arndale.h
> @@ -33,7 +33,6 @@
>  #define CONFIG_EXYNOS_SPL
>  
>  /* Miscellaneous configurable options */
> -#define CONFIG_SYS_PROMPT		"ARNDALE # "
>  #define CONFIG_DEFAULT_CONSOLE		"console=ttySAC2,115200n8\0"
>  
>  #define CONFIG_NR_DRAM_BANKS	8
> diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
> index c6e1f56..1c3a1c9 100644
> --- a/include/configs/astro_mcf5373l.h
> +++ b/include/configs/astro_mcf5373l.h
> @@ -207,8 +207,6 @@
>  #define CONFIG_BOOTARGS		" console=ttyS2,115200 rootfstype=romfs"\
>  				" loaderversion=$loaderversion"
>  
> -#define CONFIG_SYS_PROMPT	"URMEL > "
> -
>  /* default RAM address for user programs */
>  #define CONFIG_SYS_LOAD_ADDR	0x20000
>  
> diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h
> index c2621ff..2bded45 100644
> --- a/include/configs/at91-sama5_common.h
> +++ b/include/configs/at91-sama5_common.h
> @@ -66,7 +66,6 @@
>  
>  #define CONFIG_BAUDRATE			115200
>  
> -#define CONFIG_SYS_PROMPT		"U-Boot> "
>  #define CONFIG_SYS_CBSIZE		256
>  #define CONFIG_SYS_MAXARGS		16
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
> diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h
> index 6f1f65f..7e026ef 100644
> --- a/include/configs/at91rm9200ek.h
> +++ b/include/configs/at91rm9200ek.h
> @@ -194,7 +194,6 @@
>  #define CONFIG_SYS_LONGHELP
>  #define CONFIG_AUTO_COMPLETE
>  #define CONFIG_SYS_HUSH_PARSER
> -#define CONFIG_SYS_PROMPT		"U-Boot> "
>  #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
>  #define CONFIG_SYS_MAXARGS		16	/* max number of command args */
>  /* Print Buffer Size */
> diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
> index e98cf0c..459b8f9 100644
> --- a/include/configs/at91sam9260ek.h
> +++ b/include/configs/at91sam9260ek.h
> @@ -254,7 +254,6 @@
>  	"root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait"
>  #endif
>  
> -#define CONFIG_SYS_PROMPT		"U-Boot> "
>  #define CONFIG_SYS_CBSIZE		256
>  #define CONFIG_SYS_MAXARGS		16
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
> diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
> index 42461d2..9c595f2 100644
> --- a/include/configs/at91sam9261ek.h
> +++ b/include/configs/at91sam9261ek.h
> @@ -201,7 +201,6 @@
>  	"root=/dev/mtdblock7 rw rootfstype=jffs2"
>  #endif
>  
> -#define CONFIG_SYS_PROMPT		"U-Boot> "
>  #define CONFIG_SYS_CBSIZE		256
>  #define CONFIG_SYS_MAXARGS		16
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
> diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
> index 731c7f1..3eb0154 100644
> --- a/include/configs/at91sam9263ek.h
> +++ b/include/configs/at91sam9263ek.h
> @@ -330,7 +330,6 @@
>  	"root=/dev/mtdblock7 rw rootfstype=jffs2"
>  #endif
>  
> -#define CONFIG_SYS_PROMPT		"U-Boot> "
>  #define CONFIG_SYS_CBSIZE		256
>  #define CONFIG_SYS_MAXARGS		16
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
> diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
> index 09d8bec..4d90209 100644
> --- a/include/configs/at91sam9m10g45ek.h
> +++ b/include/configs/at91sam9m10g45ek.h
> @@ -181,7 +181,6 @@
>  
>  #define CONFIG_BAUDRATE			115200
>  
> -#define CONFIG_SYS_PROMPT		"U-Boot> "
>  #define CONFIG_SYS_CBSIZE		256
>  #define CONFIG_SYS_MAXARGS		16
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
> diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
> index a19d4d9..ea0a94b 100644
> --- a/include/configs/at91sam9n12ek.h
> +++ b/include/configs/at91sam9n12ek.h
> @@ -221,7 +221,6 @@
>  
>  #endif
>  
> -#define CONFIG_SYS_PROMPT	"U-Boot> "
>  #define CONFIG_SYS_CBSIZE	256
>  #define CONFIG_SYS_MAXARGS	16
>  #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) \
> diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
> index e709f9c..f7a174e 100644
> --- a/include/configs/at91sam9rlek.h
> +++ b/include/configs/at91sam9rlek.h
> @@ -184,7 +184,6 @@
>  				"root=/dev/mmcblk0p2 rw rootwait"
>  #endif
>  
> -#define CONFIG_SYS_PROMPT		"U-Boot> "
>  #define CONFIG_SYS_CBSIZE		256
>  #define CONFIG_SYS_MAXARGS		16
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
> diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
> index b9a7754..9f76786 100644
> --- a/include/configs/at91sam9x5ek.h
> +++ b/include/configs/at91sam9x5ek.h
> @@ -223,7 +223,6 @@
>  
>  #define CONFIG_BAUDRATE		115200
>  
> -#define CONFIG_SYS_PROMPT	"U-Boot> "
>  #define CONFIG_SYS_CBSIZE	256
>  #define CONFIG_SYS_MAXARGS	16
>  #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) \
> diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h
> index 1cab0a9..c436fef 100644
> --- a/include/configs/atngw100.h
> +++ b/include/configs/atngw100.h
> @@ -135,7 +135,6 @@
>  #define CONFIG_SYS_BOOTPARAMS_LEN		(16 * 1024)
>  
>  /* Other configuration settings that shouldn't have to change all that often */
> -#define CONFIG_SYS_PROMPT			"U-Boot> "
>  #define CONFIG_SYS_CBSIZE			256
>  #define CONFIG_SYS_MAXARGS			16
>  #define CONFIG_SYS_PBSIZE			(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
> diff --git a/include/configs/atngw100mkii.h b/include/configs/atngw100mkii.h
> index 486d9ee..3935811 100644
> --- a/include/configs/atngw100mkii.h
> +++ b/include/configs/atngw100mkii.h
> @@ -156,7 +156,6 @@
>  #define CONFIG_SYS_BOOTPARAMS_LEN	(16 * 1024)
>  
>  /* Other configuration settings that shouldn't have to change all that often */
> -#define CONFIG_SYS_PROMPT		"U-Boot> "
>  #define CONFIG_SYS_CBSIZE		256
>  #define CONFIG_SYS_MAXARGS		16
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
> diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h
> index 1cd99e9..8cd7c35 100644
> --- a/include/configs/atstk1002.h
> +++ b/include/configs/atstk1002.h
> @@ -151,7 +151,6 @@
>  #define CONFIG_SYS_BOOTPARAMS_LEN		(16 * 1024)
>  
>  /* Other configuration settings that shouldn't have to change all that often */
> -#define CONFIG_SYS_PROMPT			"U-Boot> "
>  #define CONFIG_SYS_CBSIZE			256
>  #define CONFIG_SYS_MAXARGS			16
>  #define CONFIG_SYS_PBSIZE			(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
> diff --git a/include/configs/axs101.h b/include/configs/axs101.h
> index 25116e5..7cb8853 100644
> --- a/include/configs/axs101.h
> +++ b/include/configs/axs101.h
> @@ -155,7 +155,6 @@
>   * Console configuration
>   */
>  #define CONFIG_SYS_LONGHELP
> -#define CONFIG_SYS_PROMPT		"AXS# "
>  #define CONFIG_SYS_CBSIZE		256
>  #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
> diff --git a/include/configs/balloon3.h b/include/configs/balloon3.h
> index 12c5a6c..124a766 100644
> --- a/include/configs/balloon3.h
> +++ b/include/configs/balloon3.h
> @@ -64,6 +64,7 @@
>  #define	CONFIG_SYS_HUSH_PARSER		1
>  
>  #define	CONFIG_SYS_LONGHELP
> +#undef CONFIG_SYS_PROMPT
>  #ifdef	CONFIG_SYS_HUSH_PARSER
>  #define	CONFIG_SYS_PROMPT		"$ "
>  #else
> diff --git a/include/configs/beaver.h b/include/configs/beaver.h
> index c403729..348d9ef 100644
> --- a/include/configs/beaver.h
> +++ b/include/configs/beaver.h
> @@ -25,7 +25,6 @@
>  #define CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1
>  
>  /* High-level configuration options */
> -#define V_PROMPT		"Tegra30 (Beaver) # "
>  #define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Beaver"
>  
>  /* Board-specific serial config */
> diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h
> index 7e52d17..6674d28 100644
> --- a/include/configs/bf537-minotaur.h
> +++ b/include/configs/bf537-minotaur.h
> @@ -159,7 +159,6 @@
>  
>  #define CONFIG_BOOTCOMMAND	"run ramboot"
>  #define CONFIG_BOOTARGS	"root=/dev/mtdblock0 rw"
> -#define CONFIG_SYS_PROMPT	"minotaur> "
>  
>  #define BOOT_ENV_SETTINGS \
>  	"update=tftpboot $(loadaddr) u-boot.ldr;" \
> diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h
> index d8a0cc6..15d912e 100644
> --- a/include/configs/bf537-srv1.h
> +++ b/include/configs/bf537-srv1.h
> @@ -158,7 +158,6 @@
>  
>  #define CONFIG_BOOTCOMMAND	"run flashboot"
>  #define CONFIG_BOOTARGS	"root=/dev/mtdblock0 rw"
> -#define CONFIG_SYS_PROMPT	"srv1> "
>  
>  #define BOOT_ENV_SETTINGS \
>  	"update=tftpboot $(loadaddr) u-boot.ldr;" \
> diff --git a/include/configs/bf561-acvilon.h b/include/configs/bf561-acvilon.h
> index da28396..b3c6d29 100644
> --- a/include/configs/bf561-acvilon.h
> +++ b/include/configs/bf561-acvilon.h
> @@ -153,7 +153,6 @@
>   */
>  #define CONFIG_UART_CONSOLE			0
>  #define CONFIG_BAUDRATE				57600
> -#define CONFIG_SYS_PROMPT "Acvilon> "
>  
>  /*
>   * Pull in common ADI header for remaining command/environment setup
> diff --git a/include/configs/br4.h b/include/configs/br4.h
> index cbef809..959f9a9 100644
> --- a/include/configs/br4.h
> +++ b/include/configs/br4.h
> @@ -127,7 +127,6 @@
>  #define CONFIG_BAUDRATE		115200
>  #define CONFIG_RTC_BFIN
>  #define CONFIG_UART_CONSOLE	0
> -#define CONFIG_SYS_PROMPT	"br4>"
>  #define CONFIG_BOOTCOMMAND	"run nandboot"
>  #define CONFIG_BOOTDELAY	2
>  #define CONFIG_LOADADDR		0x2000000
> diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h
> index 1521415..838ef1f 100644
> --- a/include/configs/bur_am335x_common.h
> +++ b/include/configs/bur_am335x_common.h
> @@ -129,7 +129,6 @@
>   */
>  #define CONFIG_SYS_MALLOC_LEN		(5120 << 10)
>  #define CONFIG_SYS_HUSH_PARSER
> -#define CONFIG_SYS_PROMPT		"U-Boot (BuR V2.0)# "
>  #define CONFIG_SYS_CONSOLE_INFO_QUIET
>  #define CONFIG_ENV_OVERWRITE		/* Overwrite ethaddr / serial# */
>  #define CONFIG_SYS_CONSOLE_IS_IN_ENV
> diff --git a/include/configs/calimain.h b/include/configs/calimain.h
> index 7d8bb47..c8b15fb 100644
> --- a/include/configs/calimain.h
> +++ b/include/configs/calimain.h
> @@ -194,7 +194,6 @@
>   * U-Boot general configuration
>   */
>  #define CONFIG_BOOTFILE        "uImage" /* Boot file name */
> -#define CONFIG_SYS_PROMPT      "Calimain > " /* Command Prompt */
>  #define CONFIG_SYS_CBSIZE      1024 /* Console I/O Buffer Size	*/
>  #define CONFIG_SYS_PBSIZE      (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
>  #define CONFIG_SYS_MAXARGS     16 /* max number of command args */
> diff --git a/include/configs/cam_enc_4xx.h b/include/configs/cam_enc_4xx.h
> index 21e3a0c..918bd43 100644
> --- a/include/configs/cam_enc_4xx.h
> +++ b/include/configs/cam_enc_4xx.h
> @@ -124,7 +124,6 @@
>  
>  /* U-Boot general configuration */
>  #define CONFIG_BOOTFILE		"uImage"	/* Boot file name */
> -#define CONFIG_SYS_PROMPT	"cam_enc_4xx> "	/* Monitor Command Prompt */
>  #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size  */
>  #define CONFIG_SYS_PBSIZE			/* Print buffer size */ \
>  		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
> diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
> index 96dfe07..a62680b 100644
> --- a/include/configs/cardhu.h
> +++ b/include/configs/cardhu.h
> @@ -25,7 +25,6 @@
>  #define CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3
>  
>  /* High-level configuration options */
> -#define V_PROMPT		"Tegra30 (Cardhu) # "
>  #define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Cardhu"
>  
>  #define BOARD_EXTRA_ENV_SETTINGS \
> diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
> index dd06c05..f6b88fb 100644
> --- a/include/configs/cgtqmx6eval.h
> +++ b/include/configs/cgtqmx6eval.h
> @@ -88,7 +88,6 @@
>  	   "else echo ERR: Fail to boot from mmc; fi"
>  
>  /* Miscellaneous configurable options */
> -#define CONFIG_SYS_PROMPT	       "CGT-QMX6-Quad U-Boot > "
>  
>  /* Print Buffer Size */
>  #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
> diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
> index bbd9f38..ddf6b5f 100644
> --- a/include/configs/cm_fx6.h
> +++ b/include/configs/cm_fx6.h
> @@ -45,7 +45,6 @@
>  #define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
>  
>  /* Shell */
> -#define CONFIG_SYS_PROMPT	"CM-FX6 # "
>  #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE + \
>  					sizeof(CONFIG_SYS_PROMPT) + 16)
>  
> diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h
> index 767ef3a..adf05b1 100644
> --- a/include/configs/cm_t335.h
> +++ b/include/configs/cm_t335.h
> @@ -27,9 +27,6 @@
>  #undef CONFIG_MAX_RAM_BANK_SIZE
>  #define CONFIG_MAX_RAM_BANK_SIZE	(512 << 20)	/* 512MB */
>  
> -#undef CONFIG_SYS_PROMPT
> -#define CONFIG_SYS_PROMPT		"CM-T335 # "
> -
>  #define CONFIG_OMAP_COMMON
>  
>  #define MACH_TYPE_CM_T335		4586	/* Until the next sync */
> diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
> index 41df106..a4590b3 100644
> --- a/include/configs/cm_t35.h
> +++ b/include/configs/cm_t35.h
> @@ -222,7 +222,6 @@
>  #define CONFIG_SYS_AUTOLOAD		"no"
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
>  #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
> -#define CONFIG_SYS_PROMPT		"CM-T3x # "
>  #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
>  /* Print Buffer Size */
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
> diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h
> index a8d0b97..b162762 100644
> --- a/include/configs/cm_t3517.h
> +++ b/include/configs/cm_t3517.h
> @@ -227,7 +227,6 @@
>  #define CONFIG_SYS_AUTOLOAD		"no"
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
>  #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
> -#define CONFIG_SYS_PROMPT		"CM-T3517 # "
>  #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
>  /* Print Buffer Size */
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
> diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h
> index 2a8b730..95a5a60 100644
> --- a/include/configs/cm_t54.h
> +++ b/include/configs/cm_t54.h
> @@ -105,14 +105,12 @@
>   * Miscellaneous configurable options
>   */
>  #undef CONFIG_SYS_AUTOLOAD
> -#undef CONFIG_SYS_PROMPT
>  #undef CONFIG_EXTRA_ENV_SETTINGS
>  #undef CONFIG_BOOTCOMMAND
>  #undef CONFIG_BOOTDELAY
>  
>  #define CONFIG_BOOTDELAY		3
>  #define CONFIG_SYS_AUTOLOAD		"no"
> -#define CONFIG_SYS_PROMPT		"CM-T54 # "
>  
>  #define CONFIG_EXTRA_ENV_SETTINGS \
>  	DEFAULT_LINUX_BOOT_ENV \
> diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
> index 8a6106d..8e70d8c 100644
> --- a/include/configs/cobra5272.h
> +++ b/include/configs/cobra5272.h
> @@ -178,8 +178,6 @@ considered during boot */
>  
>  #endif
>  
> -#define CONFIG_SYS_PROMPT		"COBRA > "	/* Layout of u-boot prompt*/
> -
>  #define CONFIG_SYS_LOAD_ADDR		0x20000		/*Defines default RAM address
>  from which user programs will be started */
>  
> diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
> index e3f0ab0..a1b64c6 100644
> --- a/include/configs/colibri_pxa270.h
> +++ b/include/configs/colibri_pxa270.h
> @@ -81,6 +81,7 @@
>  #define	CONFIG_SYS_HUSH_PARSER		1
>  
>  #undef	CONFIG_SYS_LONGHELP		/* Saves 10 KB */
> +#undef CONFIG_SYS_PROMPT
>  #ifdef	CONFIG_SYS_HUSH_PARSER
>  #define	CONFIG_SYS_PROMPT		"$ "
>  #else
> diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
> index 8228e42..078c913 100644
> --- a/include/configs/colibri_t20.h
> +++ b/include/configs/colibri_t20.h
> @@ -10,7 +10,6 @@
>  #include "tegra20-common.h"
>  
>  /* High-level configuration options */
> -#define V_PROMPT			"Colibri T20 # "
>  #define CONFIG_TEGRA_BOARD_STRING	"Toradex Colibri T20"
>  
>  /* Board-specific serial config */
> diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
> index 4655668..40bccd2 100644
> --- a/include/configs/colibri_t30.h
> +++ b/include/configs/colibri_t30.h
> @@ -12,7 +12,6 @@
>  #include "tegra30-common.h"
>  
>  /* High-level configuration options */
> -#define V_PROMPT			"Colibri T30 # "
>  #define CONFIG_TEGRA_BOARD_STRING	"Toradex Colibri T30"
>  
>  /* Board-specific serial config */
> diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
> index f2f8e2e..1d01c5c 100644
> --- a/include/configs/colibri_vf.h
> +++ b/include/configs/colibri_vf.h
> @@ -177,7 +177,6 @@
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
>  #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
>  #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
> -#define CONFIG_SYS_PROMPT		"Colibri VFxx # "
>  #undef CONFIG_AUTO_COMPLETE
>  #define CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size */
>  #define CONFIG_SYS_PBSIZE		\
> diff --git a/include/configs/corvus.h b/include/configs/corvus.h
> index 3cfae21..2d2f3c1 100644
> --- a/include/configs/corvus.h
> +++ b/include/configs/corvus.h
> @@ -133,7 +133,6 @@
>  
>  #define CONFIG_BAUDRATE			115200
>  
> -#define CONFIG_SYS_PROMPT		"U-Boot> "
>  #define CONFIG_SYS_CBSIZE		256
>  #define CONFIG_SYS_MAXARGS		16
>  #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE +	\
> diff --git a/include/configs/cpu9260.h b/include/configs/cpu9260.h
> index d3c6f75..82f4fe7 100644
> --- a/include/configs/cpu9260.h
> +++ b/include/configs/cpu9260.h
> @@ -464,11 +464,6 @@
>  
>  #define CONFIG_BAUDRATE			115200
>  
> -#if defined(CONFIG_CPU9G20)
> -#define CONFIG_SYS_PROMPT		"CPU9G20=> "
> -#elif defined(CONFIG_CPU9260)
> -#define CONFIG_SYS_PROMPT		"CPU9260=> "
> -#endif
>  #define CONFIG_SYS_CBSIZE		256
>  #define CONFIG_SYS_MAXARGS		16
>  #define CONFIG_SYS_PBSIZE		\
> diff --git a/include/configs/cpuat91.h b/include/configs/cpuat91.h
> index f990cf7..29cd842 100644
> --- a/include/configs/cpuat91.h
> +++ b/include/configs/cpuat91.h
> @@ -173,7 +173,6 @@
>  
>  #define CONFIG_BAUDRATE			115200
>  
> -#define CONFIG_SYS_PROMPT		"CPUAT91=> "
>  #define CONFIG_SYS_CBSIZE		256
>  #define CONFIG_SYS_MAXARGS		32
>  #define CONFIG_SYS_PBSIZE		\
> diff --git a/include/configs/da830evm.h b/include/configs/da830evm.h
> index 729b6e7..5826a58 100644
> --- a/include/configs/da830evm.h
> +++ b/include/configs/da830evm.h
> @@ -143,7 +143,6 @@
>  #undef CONFIG_MISC_INIT_R
>  #undef CONFIG_BOOTDELAY
>  #define CONFIG_BOOTFILE		"uImage" /* Boot file name */
> -#define CONFIG_SYS_PROMPT	"U-Boot > " /* Command Prompt */
>  #define CONFIG_SYS_CBSIZE	1024 /* Console I/O Buffer Size	*/
>  #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
>  #define CONFIG_SYS_MAXARGS	16 /* max number of command args */
> diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
> index 3da9da4..1cd11c0 100644
> --- a/include/configs/da850evm.h
> +++ b/include/configs/da850evm.h
> @@ -262,7 +262,6 @@
>  #define CONFIG_MISC_INIT_R
>  #define CONFIG_BOARD_EARLY_INIT_F
>  #define CONFIG_BOOTFILE		"uImage" /* Boot file name */
> -#define CONFIG_SYS_PROMPT	"U-Boot > " /* Command Prompt */
>  #define CONFIG_SYS_CBSIZE	1024 /* Console I/O Buffer Size	*/
>  #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
>  #define CONFIG_SYS_MAXARGS	16 /* max number of command args */
> diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h
> index 89b6f23..24e368a 100644
> --- a/include/configs/dalmore.h
> +++ b/include/configs/dalmore.h
> @@ -22,7 +22,6 @@
>  #include "tegra114-common.h"
>  
>  /* High-level configuration options */
> -#define V_PROMPT		"Tegra114 (Dalmore) # "
>  #define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Dalmore"
>  
>  /* Board-specific serial config */
> diff --git a/include/configs/davinci_dm355evm.h b/include/configs/davinci_dm355evm.h
> index 847d788..7a9ce64 100644
> --- a/include/configs/davinci_dm355evm.h
> +++ b/include/configs/davinci_dm355evm.h
> @@ -110,7 +110,6 @@
>  
>  /* U-Boot general configuration */
>  #define CONFIG_BOOTFILE		"uImage"	/* Boot file name */
> -#define CONFIG_SYS_PROMPT	"DM355 EVM # "	/* Monitor Command Prompt */
>  #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size  */
>  #define CONFIG_SYS_PBSIZE			/* Print buffer size */ \
>  		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
> diff --git a/include/configs/davinci_dm355leopard.h b/include/configs/davinci_dm355leopard.h
> index d4b994a..e3ff943 100644
> --- a/include/configs/davinci_dm355leopard.h
> +++ b/include/configs/davinci_dm355leopard.h
> @@ -78,7 +78,6 @@
>  
>  /* U-Boot general configuration */
>  #define CONFIG_BOOTFILE		"uImage"	/* Boot file name */
> -#define CONFIG_SYS_PROMPT	"DM355 LEOPARD # "
>  #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size  */
>  #define CONFIG_SYS_PBSIZE			/* Print buffer size */ \
>  		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
> diff --git a/include/configs/davinci_dm365evm.h b/include/configs/davinci_dm365evm.h
> index 8b42c50..573c1b0 100644
> --- a/include/configs/davinci_dm365evm.h
> +++ b/include/configs/davinci_dm365evm.h
> @@ -143,7 +143,6 @@
>  
>  /* U-Boot general configuration */
>  #define CONFIG_BOOTFILE		"uImage"	/* Boot file name */
> -#define CONFIG_SYS_PROMPT	"DM36x EVM # "	/* Monitor Command Prompt */
>  #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size  */
>  #define CONFIG_SYS_PBSIZE			/* Print buffer size */ \
>  		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
> diff --git a/include/configs/davinci_dm6467evm.h b/include/configs/davinci_dm6467evm.h
> index 8571cbd..6346422 100644
> --- a/include/configs/davinci_dm6467evm.h
> +++ b/include/configs/davinci_dm6467evm.h
> @@ -94,7 +94,6 @@ extern unsigned int davinci_arm_clk_get(void);
>  /* U-Boot general configuration */
>  #define CONFIG_BOOTDELAY	3
>  #define CONFIG_BOOTFILE		"uImage"	/* Boot file name */
> -#define CONFIG_SYS_PROMPT	"DM6467 EVM > "	/* Monitor Command Prompt */
>  #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size  */
>  #define CONFIG_SYS_PBSIZE		\
>  			(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
> diff --git a/include/configs/davinci_dvevm.h b/include/configs/davinci_dvevm.h
> index 6108736..6f73339 100644
> --- a/include/configs/davinci_dvevm.h
> +++ b/include/configs/davinci_dvevm.h
> @@ -143,7 +143,6 @@
>  #define CONFIG_MISC_INIT_R
>  #undef CONFIG_BOOTDELAY
>  #define CONFIG_BOOTFILE		"uImage"	/* Boot file name */
> -#define CONFIG_SYS_PROMPT		"U-Boot > "	/* Monitor Command Prompt */
>  #define CONFIG_SYS_CBSIZE		1024		/* Console I/O Buffer Size  */
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)	/* Print buffer sz */
>  #define CONFIG_SYS_MAXARGS		16		/* max number of command args */
> diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h
> index db636e4..bc5e1ca 100644
> --- a/include/configs/davinci_schmoogie.h
> +++ b/include/configs/davinci_schmoogie.h
> @@ -87,7 +87,6 @@
>  #define CONFIG_MISC_INIT_R
>  #undef CONFIG_BOOTDELAY
>  #define CONFIG_BOOTFILE		"uImage"	/* Boot file name */
> -#define CONFIG_SYS_PROMPT		"U-Boot > "	/* Monitor Command Prompt */
>  #define CONFIG_SYS_CBSIZE		1024		/* Console I/O Buffer Size  */
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)	/* Print buffer sz */
>  #define CONFIG_SYS_MAXARGS		16		/* max number of command args */
> diff --git a/include/configs/davinci_sffsdr.h b/include/configs/davinci_sffsdr.h
> index 9ecf6ce..e719388 100644
> --- a/include/configs/davinci_sffsdr.h
> +++ b/include/configs/davinci_sffsdr.h
> @@ -74,7 +74,6 @@
>  #define CONFIG_MISC_INIT_R
>  #define CONFIG_BOOTDELAY	5		/* Autoboot after 5 seconds. */
>  #define CONFIG_BOOTFILE		"uImage"	/* Boot file name */
> -#define CONFIG_SYS_PROMPT		"U-Boot > "	/* Monitor Command Prompt */
>  #define CONFIG_SYS_CBSIZE		1024		/* Console I/O Buffer Size  */
>  #define CONFIG_SYS_PBSIZE							\
>  		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)	/* Print buffer size */
> diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h
> index 410cf68..b85c988 100644
> --- a/include/configs/davinci_sonata.h
> +++ b/include/configs/davinci_sonata.h
> @@ -133,7 +133,6 @@
>  #define CONFIG_MISC_INIT_R
>  #undef CONFIG_BOOTDELAY
>  #define CONFIG_BOOTFILE		"uImage"	/* Boot file name */
> -#define CONFIG_SYS_PROMPT		"U-Boot > "	/* Monitor Command Prompt */
>  #define CONFIG_SYS_CBSIZE		1024		/* Console I/O Buffer Size  */
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)	/* Print buffer sz */
>  #define CONFIG_SYS_MAXARGS		16		/* max number of command args */
> diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
> index 0abab78..46e3a6c 100644
> --- a/include/configs/dbau1x00.h
> +++ b/include/configs/dbau1x00.h
> @@ -98,8 +98,6 @@
>   */
>  #define	CONFIG_SYS_LONGHELP				/* undef to save memory      */
>  
> -#define	CONFIG_SYS_PROMPT		"DbAu1xx0 # "	/* Monitor Command Prompt    */
> -
>  #define	CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size   */
>  #define	CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)  /* Print Buffer Size */
>  #define	CONFIG_SYS_MAXARGS		16		/* max number of command args*/
> diff --git a/include/configs/dig297.h b/include/configs/dig297.h
> index f6d7ec4..fa24af7 100644
> --- a/include/configs/dig297.h
> +++ b/include/configs/dig297.h
> @@ -208,7 +208,6 @@
>   */
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
>  #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
> -#define CONFIG_SYS_PROMPT		"DIG297# "
>  #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
>  /* Print Buffer Size */
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
> diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h
> index b27b202..a62f4e3 100644
> --- a/include/configs/dockstar.h
> +++ b/include/configs/dockstar.h
> @@ -43,9 +43,6 @@
>   */
>  #include "mv-common.h"
>  
> -#undef CONFIG_SYS_PROMPT	/* previously defined in mv-common.h */
> -#define CONFIG_SYS_PROMPT	"DockStar> "	/* Command Prompt */
> -
>  /*
>   *  Environment variables configurations
>   */
> diff --git a/include/configs/duovero.h b/include/configs/duovero.h
> index 6e53da5..28d12ad 100644
> --- a/include/configs/duovero.h
> +++ b/include/configs/duovero.h
> @@ -27,9 +27,6 @@
>  #define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION
>  #define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
>  
> -#undef CONFIG_SYS_PROMPT
> -#define CONFIG_SYS_PROMPT		"duovero # "
> -
>  /* USB UHH support options */
>  #define CONFIG_CMD_USB
>  #define CONFIG_USB_HOST
> diff --git a/include/configs/ea20.h b/include/configs/ea20.h
> index b9f28a3..9a70aae 100644
> --- a/include/configs/ea20.h
> +++ b/include/configs/ea20.h
> @@ -122,7 +122,6 @@
>   * U-Boot general configuration
>   */
>  #define CONFIG_BOOTFILE		"uImage" /* Boot file name */
> -#define CONFIG_SYS_PROMPT	"ea20 > " /* Command Prompt */
>  #define CONFIG_SYS_CBSIZE	1024 /* Console I/O Buffer Size	*/
>  #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
>  #define CONFIG_SYS_MAXARGS	16 /* max number of command args */
> diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h
> index 924362c..f9ec028 100644
> --- a/include/configs/eb_cpu5282.h
> +++ b/include/configs/eb_cpu5282.h
> @@ -73,7 +73,6 @@
>  #define CONFIG_MCFTMR
>  
>  #define CONFIG_BOOTDELAY	5
> -#define CONFIG_SYS_PROMPT	"\nEB+CPU5282> "
>  #define	CONFIG_SYS_LONGHELP	1
>  
>  #define	CONFIG_SYS_CBSIZE	1024	/* Console I/O Buffer Size	*/
> diff --git a/include/configs/eb_cpux9k2.h b/include/configs/eb_cpux9k2.h
> index 271e071..d27f7e0 100644
> --- a/include/configs/eb_cpux9k2.h
> +++ b/include/configs/eb_cpux9k2.h
> @@ -44,7 +44,6 @@
>  #define CONFIG_BOOT_RETRY_TIME		30
>  #define CONFIG_CMDLINE_EDITING
>  
> -#define CONFIG_SYS_PROMPT	"U-Boot> "	/* Monitor Command Prompt */
>  #define CONFIG_SYS_CBSIZE	512		/* Console I/O Buffer Size */
>  #define CONFIG_SYS_MAXARGS	32		/* max number of command args */
>  #define CONFIG_SYS_PBSIZE	\
> diff --git a/include/configs/eco5pk.h b/include/configs/eco5pk.h
> index 49c53e4..f23d383 100644
> --- a/include/configs/eco5pk.h
> +++ b/include/configs/eco5pk.h
> @@ -37,12 +37,6 @@
>  #define CONFIG_AUTO_COMPLETE
>  
>  /*
> - * Miscellaneous configurable options
> - */
> -#define V_PROMPT		"ECO5-PK # "
> -#define CONFIG_SYS_PROMPT	V_PROMPT
> -
> -/*
>   * Set its own mtdparts, different from common
>   */
>  #undef MTDIDS_DEFAULT
> diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h
> index 87b29f8..efe2a9d 100644
> --- a/include/configs/edb93xx.h
> +++ b/include/configs/edb93xx.h
> @@ -39,7 +39,7 @@
>  
>  #define CONFIG_SYS_LDSCRIPT	"board/cirrus/edb93xx/u-boot.lds"
>  
> -
> +#undef CONFIG_SYS_PROMPT
>  #ifdef CONFIG_EDB9301
>  #define CONFIG_EP9301
>  #define CONFIG_MACH_TYPE		MACH_TYPE_EDB9301
> diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
> index b5e8e0e..8b38d7e 100644
> --- a/include/configs/edminiv2.h
> +++ b/include/configs/edminiv2.h
> @@ -130,7 +130,6 @@
>  #define CONFIG_INITRD_TAG	1	/* enable INITRD tag */
>  #define CONFIG_SETUP_MEMORY_TAGS 1	/* enable memory tag */
>  
> -#define	CONFIG_SYS_PROMPT	"EDMiniV2> "	/* Command Prompt */
>  #define	CONFIG_SYS_CBSIZE	1024	/* Console I/O Buff Size */
>  #define	CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE \
>  		+sizeof(CONFIG_SYS_PROMPT) + 16)	/* Print Buff */
> diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
> index c7b1e5c..b49b903 100644
> --- a/include/configs/ethernut5.h
> +++ b/include/configs/ethernut5.h
> @@ -237,7 +237,6 @@
>  #endif
>  
>  /* Misc. u-boot settings */
> -#define CONFIG_SYS_PROMPT		"U-Boot> "
>  #define CONFIG_SYS_HUSH_PARSER
>  #define CONFIG_SYS_CBSIZE		256
>  #define CONFIG_SYS_MAXARGS		16
> diff --git a/include/configs/flea3.h b/include/configs/flea3.h
> index 5d66901..5b4b011 100644
> --- a/include/configs/flea3.h
> +++ b/include/configs/flea3.h
> @@ -108,7 +108,6 @@
>   * Miscellaneous configurable options
>   */
>  #define CONFIG_SYS_LONGHELP	/* undef to save memory */
> -#define CONFIG_SYS_PROMPT	"flea3 U-Boot > "
>  #define CONFIG_CMDLINE_EDITING
>  #define CONFIG_SYS_HUSH_PARSER	/* Use the HUSH parser */
>  
> diff --git a/include/configs/fx12mm.h b/include/configs/fx12mm.h
> index f1cbc8e..fa32a2e 100644
> --- a/include/configs/fx12mm.h
> +++ b/include/configs/fx12mm.h
> @@ -37,7 +37,6 @@
>  #define CONFIG_ENV_OVERWRITE 	1
>  
>  /*Misc*/
> -#define CONFIG_SYS_PROMPT	"FX12MM:/# " /* Monitor Command Prompt */
>  #define CONFIG_PREBOOT      	"echo U-Boot is up and running;"
>  
>  /*Flash*/
> diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h
> index 967a05a..2a42e7c 100644
> --- a/include/configs/goflexhome.h
> +++ b/include/configs/goflexhome.h
> @@ -70,9 +70,6 @@
>   */
>  #include "mv-common.h"
>  
> -#undef CONFIG_SYS_PROMPT	/* previously defined in mv-common.h */
> -#define CONFIG_SYS_PROMPT	"GoFlexHome> "	/* Command Prompt */
> -
>  /*
>   *  Environment variables configurations
>   */
> diff --git a/include/configs/grasshopper.h b/include/configs/grasshopper.h
> index 231f25a..274175b 100644
> --- a/include/configs/grasshopper.h
> +++ b/include/configs/grasshopper.h
> @@ -144,7 +144,6 @@
>  #define CONFIG_SYS_BOOTPARAMS_LEN	(16 * 1024)
>  
>  /* Other configuration settings that shouldn't have to change all that often */
> -#define CONFIG_SYS_PROMPT		"U-Boot> "
>  #define CONFIG_SYS_CBSIZE		256
>  #define CONFIG_SYS_MAXARGS		16
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
> diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
> index 902ec2c..78fe136 100644
> --- a/include/configs/gw_ventana.h
> +++ b/include/configs/gw_ventana.h
> @@ -231,7 +231,6 @@
>  #define CONFIG_IMX_VIDEO_SKIP
>  
>  /* Miscellaneous configurable options */
> -#define CONFIG_SYS_PROMPT	             "Ventana > "
>  #define CONFIG_HWCONFIG
>  
>  /* Print Buffer Size */
> diff --git a/include/configs/h2200.h b/include/configs/h2200.h
> index 1d2d09a..e8dfa74 100644
> --- a/include/configs/h2200.h
> +++ b/include/configs/h2200.h
> @@ -123,7 +123,6 @@
>  #define CONFIG_INITRD_TAG
>  
>  /* Monitor Command Prompt */
> -#define CONFIG_SYS_PROMPT		"> "
>  #define CONFIG_SYS_HUSH_PARSER
>  #define CONFIG_SYS_PROMPT_HUSH_PS2	"$ "
>  
> diff --git a/include/configs/harmony.h b/include/configs/harmony.h
> index 99a63d6..e0bc7c0 100644
> --- a/include/configs/harmony.h
> +++ b/include/configs/harmony.h
> @@ -12,7 +12,6 @@
>  #include "tegra20-common.h"
>  
>  /* High-level configuration options */
> -#define V_PROMPT		"Tegra20 (Harmony) # "
>  #define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Harmony"
>  
>  /* Board-specific serial config */
> diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h
> index 08e2f42..558edfc 100644
> --- a/include/configs/hrcon.h
> +++ b/include/configs/hrcon.h
> @@ -484,7 +484,6 @@ int fpga_gpio_get(unsigned int bus, int pin);
>   */
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
>  #define CONFIG_SYS_LOAD_ADDR		0x2000000 /* default load address */
> -#define CONFIG_SYS_PROMPT		"=> "	/* Monitor Command Prompt */
>  #define CONFIG_SYS_HZ		1000	/* decrementer freq: 1ms ticks */
>  
>  #undef CONFIG_ZERO_BOOTDELAY_CHECK	/* ignore keypress on bootdelay==0 */
> diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
> index ee52452..6afe340 100644
> --- a/include/configs/ib62x0.h
> +++ b/include/configs/ib62x0.h
> @@ -59,9 +59,6 @@
>   */
>  #include "mv-common.h"
>  
> -#undef CONFIG_SYS_PROMPT
> -#define CONFIG_SYS_PROMPT	"ib62x0 => "
> -
>  /*
>   * Environment variables configuration
>   */
> diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h
> index 1a5c93d..bce97dc 100644
> --- a/include/configs/iconnect.h
> +++ b/include/configs/iconnect.h
> @@ -52,9 +52,6 @@
>   */
>  #include "mv-common.h"
>  
> -#undef CONFIG_SYS_PROMPT
> -#define CONFIG_SYS_PROMPT	"iconnect => "
> -
>  /*
>   * Environment variables configuration
>   */
> diff --git a/include/configs/ima3-mx53.h b/include/configs/ima3-mx53.h
> index 5a02917..2fa6c3d 100644
> --- a/include/configs/ima3-mx53.h
> +++ b/include/configs/ima3-mx53.h
> @@ -94,7 +94,6 @@
>  /* Miscellaneous configurable options */
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
>  #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
> -#define CONFIG_SYS_PROMPT		"IMA3 MX53 U-Boot > "
>  #define CONFIG_AUTO_COMPLETE
>  #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
>  
> diff --git a/include/configs/imx31_litekit.h b/include/configs/imx31_litekit.h
> index c552e9f..23e3a6c 100644
> --- a/include/configs/imx31_litekit.h
> +++ b/include/configs/imx31_litekit.h
> @@ -101,7 +101,6 @@
>   * Miscellaneous configurable options
>   */
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
> -#define CONFIG_SYS_PROMPT		"uboot> "
>  #define CONFIG_SYS_CBSIZE		256  /* Console I/O Buffer Size */
>  /* Print Buffer Size */
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
> diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
> index 54e8121..86f327c 100644
> --- a/include/configs/imx31_phycore.h
> +++ b/include/configs/imx31_phycore.h
> @@ -102,7 +102,6 @@
>   * Miscellaneous configurable options
>   */
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
> -#define CONFIG_SYS_PROMPT		"uboot> "
>  /* Console I/O Buffer Size */
>  #define CONFIG_SYS_CBSIZE		256
>  /* Print Buffer Size */
> diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h
> index c76ebcb..5e3ed8e 100644
> --- a/include/configs/integratorap.h
> +++ b/include/configs/integratorap.h
> @@ -47,11 +47,6 @@
>  #define CONFIG_BOOTARGS		"root=/dev/mtdblock0 console=ttyAM0 console=tty"
>  #define CONFIG_BOOTCOMMAND	""
>  
> -/*
> - * Miscellaneous configurable options
> - */
> -#define CONFIG_SYS_PROMPT	"Integrator-AP # "	/* Monitor Command Prompt   */
> -
>  /* Flash settings */
>  #define CONFIG_SYS_FLASH_SIZE		0x02000000 /* 32 MiB */
>  #define CONFIG_SYS_MAX_FLASH_SECT	128
> diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h
> index d6f2602..5391ae6 100644
> --- a/include/configs/integratorcp.h
> +++ b/include/configs/integratorcp.h
> @@ -50,8 +50,6 @@
>  /*
>   * Miscellaneous configurable options
>   */
> -#define CONFIG_SYS_PROMPT	"Integrator-CP # "	/* Monitor Command Prompt */
> -
>  #define PHYS_FLASH_SIZE			0x01000000	/* 16MB */
>  #define CONFIG_SYS_MAX_FLASH_SECT	64
>  #define CONFIG_ENV_IS_IN_FLASH	1
> diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h
> index e68b661..b1cd7df 100644
> --- a/include/configs/ipam390.h
> +++ b/include/configs/ipam390.h
> @@ -207,7 +207,6 @@
>  #define CONFIG_MISC_INIT_R
>  #define CONFIG_BOARD_EARLY_INIT_F
>  #define CONFIG_BOOTFILE		"uImage" /* Boot file name */
> -#define CONFIG_SYS_PROMPT	"U-Boot > " /* Command Prompt */
>  #define CONFIG_SYS_CBSIZE	1024 /* Console I/O Buffer Size	*/
>  #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
>  #define CONFIG_SYS_MAXARGS	16 /* max number of command args */
> diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
> index 3bbff28..a16239b 100644
> --- a/include/configs/jetson-tk1.h
> +++ b/include/configs/jetson-tk1.h
> @@ -16,7 +16,6 @@
>  #include "tegra124-common.h"
>  
>  /* High-level configuration options */
> -#define V_PROMPT			"Tegra124 (Jetson TK1) # "
>  #define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Jetson TK1"
>  
>  /* Board-specific serial config */
> diff --git a/include/configs/jornada.h b/include/configs/jornada.h
> index 71f2ee1..3090476 100644
> --- a/include/configs/jornada.h
> +++ b/include/configs/jornada.h
> @@ -55,7 +55,6 @@
>   * Miscellaneous configurable options
>   */
>  #define CONFIG_SYS_LONGHELP	/* undef to save memory */
> -#define CONFIG_SYS_PROMPT		"HP Jornada# "
>  #define CONFIG_SYS_CBSIZE		256	/* console buffsize */
>  #define CONFIG_SYS_PBSIZE		(256+sizeof(CONFIG_SYS_PROMPT)+16)
>  #define CONFIG_SYS_MAXARGS		16	/* max number of command args */
> diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h
> index a28ceb7..d3ccf60 100644
> --- a/include/configs/k2e_evm.h
> +++ b/include/configs/k2e_evm.h
> @@ -15,8 +15,6 @@
>  #define CONFIG_K2E_EVM
>  
>  /* U-Boot general configuration */
> -#define CONFIG_SYS_PROMPT               "K2E EVM # "
> -
>  #define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS				\
>  	"addr_mon=0x0c140000\0"						\
>  	"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs "	\
> diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h
> index eae7721..93487de 100644
> --- a/include/configs/k2hk_evm.h
> +++ b/include/configs/k2hk_evm.h
> @@ -15,8 +15,6 @@
>  #define CONFIG_K2HK_EVM
>  
>  /* U-Boot general configuration */
> -#define CONFIG_SYS_PROMPT               "K2HK EVM # "
> -
>  #define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS				\
>  	"addr_mon=0x0c5f0000\0"						\
>  	"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs "	\
> diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h
> index 57da057..bf03386 100644
> --- a/include/configs/k2l_evm.h
> +++ b/include/configs/k2l_evm.h
> @@ -15,8 +15,6 @@
>  #define CONFIG_K2L_EVM
>  
>  /* U-Boot general configuration */
> -#define CONFIG_SYS_PROMPT		"K2L EVM # "
> -
>  #define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS				\
>  	"addr_mon=0x0c140000\0"						\
>  	"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs "	\
> diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
> index 93c2976..8a451ec 100644
> --- a/include/configs/kzm9g.h
> +++ b/include/configs/kzm9g.h
> @@ -53,7 +53,6 @@
>  
>  /* prompt */
>  #define CONFIG_SYS_LONGHELP
> -#define CONFIG_SYS_PROMPT		"KZM-A9-GT# "
>  #define CONFIG_SYS_CBSIZE		256
>  #define CONFIG_SYS_PBSIZE		256
>  #define CONFIG_SYS_MAXARGS		16
> diff --git a/include/configs/lp8x4x.h b/include/configs/lp8x4x.h
> index e9ee3fb..10a7b05 100644
> --- a/include/configs/lp8x4x.h
> +++ b/include/configs/lp8x4x.h
> @@ -97,6 +97,7 @@
>  #define	CONFIG_SYS_HUSH_PARSER		1
>  
>  #define	CONFIG_SYS_LONGHELP
> +#undef CONFIG_SYS_PROMPT
>  #ifdef	CONFIG_SYS_HUSH_PARSER
>  #define	CONFIG_SYS_PROMPT		"$ "
>  #else
> diff --git a/include/configs/ls2085a_common.h b/include/configs/ls2085a_common.h
> index 5afee55..39fb464 100644
> --- a/include/configs/ls2085a_common.h
> +++ b/include/configs/ls2085a_common.h
> @@ -260,7 +260,6 @@ unsigned long long get_qixis_addr(void);
>  
>  /* Monitor Command Prompt */
>  #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
> -#define CONFIG_SYS_PROMPT		"=> "
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
>  					sizeof(CONFIG_SYS_PROMPT) + 16)
>  #define CONFIG_SYS_HUSH_PARSER
> diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h
> index ddbf5ce..1837258 100644
> --- a/include/configs/lsxl.h
> +++ b/include/configs/lsxl.h
> @@ -88,7 +88,6 @@
>  #define CONFIG_SF_DEFAULT_SPEED		25000000
>  
>  
> -#undef CONFIG_SYS_PROMPT
>  #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
>  
>  /*
> diff --git a/include/configs/malta.h b/include/configs/malta.h
> index ab2335f..2f33f63 100644
> --- a/include/configs/malta.h
> +++ b/include/configs/malta.h
> @@ -59,6 +59,7 @@
>  /*
>   * Console configuration
>   */
> +#undef CONFIG_SYS_PROMPT
>  #if defined(CONFIG_SYS_LITTLE_ENDIAN)
>  #define CONFIG_SYS_PROMPT		"maltael # "
>  #else
> diff --git a/include/configs/mcx.h b/include/configs/mcx.h
> index 0a7b7cf..d5adfd6 100644
> --- a/include/configs/mcx.h
> +++ b/include/configs/mcx.h
> @@ -267,11 +267,8 @@
>  /*
>   * Miscellaneous configurable options
>   */
> -#define V_PROMPT			"mcx # "
> -
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
>  #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
> -#define CONFIG_SYS_PROMPT		V_PROMPT
>  #define CONFIG_SYS_CBSIZE		1024/* Console I/O Buffer Size */
>  /* Print Buffer Size */
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
> diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h
> index b5d72e3..6dfd5e2 100644
> --- a/include/configs/medcom-wide.h
> +++ b/include/configs/medcom-wide.h
> @@ -13,7 +13,6 @@
>  #include "tegra20-common.h"
>  
>  /* High-level configuration options */
> -#define V_PROMPT			"Tegra20 (Medcom-Wide) # "
>  #define CONFIG_TEGRA_BOARD_STRING	"Avionic Design Medcom-Wide"
>  
>  /* Board-specific serial config */
> diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
> index e16965c..626fa44 100644
> --- a/include/configs/microblaze-generic.h
> +++ b/include/configs/microblaze-generic.h
> @@ -316,8 +316,6 @@
>  				"1m(cramfs),-(jffs2)"
>  #endif
>  
> -/* Miscellaneous configurable options */
> -#define	CONFIG_SYS_PROMPT	"U-Boot-mONStR> "
>  /* size of console buffer */
>  #define	CONFIG_SYS_CBSIZE	512
>   /* print buffer size */
> diff --git a/include/configs/ml507.h b/include/configs/ml507.h
> index b9ecb09..89a7290 100644
> --- a/include/configs/ml507.h
> +++ b/include/configs/ml507.h
> @@ -24,7 +24,6 @@
>  #define CONFIG_ENV_ADDR		(XPAR_FLASH_MEM0_BASEADDR+CONFIG_ENV_OFFSET)
>  
>  /*Misc*/
> -#define CONFIG_SYS_PROMPT	"ml507:/# "	/* Monitor Command Prompt    */
>  #define CONFIG_PREBOOT		"echo U-Boot is up and runnining;"
>  
>  /*Flash*/
> diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h
> index dd516ac..3073db9 100644
> --- a/include/configs/mt_ventoux.h
> +++ b/include/configs/mt_ventoux.h
> @@ -30,12 +30,6 @@
>  #define CONFIG_HOSTNAME mt_ventoux
>  
>  /*
> - * Miscellaneous configurable options
> - */
> -#define V_PROMPT			"mt_ventoux => "
> -#define CONFIG_SYS_PROMPT		V_PROMPT
> -
> -/*
>   * Set its own mtdparts, different from common
>   */
>  #undef MTDIDS_DEFAULT
> diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
> index b654fff..f0a3365 100644
> --- a/include/configs/mv-common.h
> +++ b/include/configs/mv-common.h
> @@ -70,7 +70,6 @@
>  #define CONFIG_INITRD_TAG	1	/* enable INITRD tag */
>  #define CONFIG_SETUP_MEMORY_TAGS 1	/* enable memory tag */
>  
> -#define	CONFIG_SYS_PROMPT	"Marvell>> "	/* Command Prompt */
>  #define	CONFIG_SYS_CBSIZE	1024	/* Console I/O Buff Size */
>  #define	CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE \
>  		+sizeof(CONFIG_SYS_PROMPT) + 16)	/* Print Buff */
> diff --git a/include/configs/mx51_efikamx.h b/include/configs/mx51_efikamx.h
> index 22aec4f..373cfcb 100644
> --- a/include/configs/mx51_efikamx.h
> +++ b/include/configs/mx51_efikamx.h
> @@ -205,7 +205,6 @@
>  
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
>  #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
> -#define CONFIG_SYS_PROMPT		"Efika> "
>  #define CONFIG_AUTO_COMPLETE
>  #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
>  /* Print Buffer Size */
> diff --git a/include/configs/nas220.h b/include/configs/nas220.h
> index 61af61f..ebf6750 100644
> --- a/include/configs/nas220.h
> +++ b/include/configs/nas220.h
> @@ -64,10 +64,6 @@
>   */
>  #include "mv-common.h"
>  
> -/* Remove or override few declarations from mv-common.h */
> -#undef CONFIG_SYS_PROMPT	/* previously defined in mv-common.h */
> -#define CONFIG_SYS_PROMPT "nas220> "
> -
>  /*
>   *  Environment variables configurations
>   */
> diff --git a/include/configs/nhk8815.h b/include/configs/nhk8815.h
> index 8755be7..dd70adc 100644
> --- a/include/configs/nhk8815.h
> +++ b/include/configs/nhk8815.h
> @@ -27,7 +27,6 @@
>  /* user interface */
>  #define CONFIG_SYS_LONGHELP
>  #define CONFIG_SYS_HUSH_PARSER
> -#define CONFIG_SYS_PROMPT		"Nomadik> "
>  #define CONFIG_CMDLINE_EDITING
>  #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE \
> diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
> index efc583f..c4d6b3f 100644
> --- a/include/configs/nokia_rx51.h
> +++ b/include/configs/nokia_rx51.h
> @@ -396,7 +396,6 @@ int rx51_kp_getc(struct stdio_dev *sdev);
>  #define CONFIG_SYS_LONGHELP			/* undef to save memory */
>  #define CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser */
>  #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
> -#define CONFIG_SYS_PROMPT		"Nokia RX-51 # "
>  #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
>  /* Print Buffer Size */
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
> diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
> index dd549aa..b198016 100644
> --- a/include/configs/nyan-big.h
> +++ b/include/configs/nyan-big.h
> @@ -13,7 +13,6 @@
>  #include "tegra124-common.h"
>  
>  /* High-level configuration options */
> -#define V_PROMPT			"Tegra124 (Nyan-big) # "
>  #define CONFIG_TEGRA_BOARD_STRING	"Google/NVIDIA Nyan-big"
>  
>  /* Board-specific serial config */
> diff --git a/include/configs/odroid.h b/include/configs/odroid.h
> index 69be496..1afe04a 100644
> --- a/include/configs/odroid.h
> +++ b/include/configs/odroid.h
> @@ -14,9 +14,6 @@
>  
>  #include <configs/exynos4-common.h>
>  
> -#define CONFIG_SYS_PROMPT	"Odroid # "	/* Monitor Command Prompt */
> -
> -
>  #define CONFIG_SYS_L2CACHE_OFF
>  #ifndef CONFIG_SYS_L2CACHE_OFF
>  #define CONFIG_SYS_L2_PL310
> diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
> index cf17f3d..bacd7c3 100644
> --- a/include/configs/odroid_xu3.h
> +++ b/include/configs/odroid_xu3.h
> @@ -10,7 +10,6 @@
>  
>  #include "exynos5420-common.h"
>  
> -#define CONFIG_SYS_PROMPT		"ODROID-XU3 # "
>  #define CONFIG_IDENT_STRING		" for ODROID-XU3"
>  
>  #define CONFIG_BOARD_COMMON
> diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h
> index 81d4b34..713df3c 100644
> --- a/include/configs/omap3_cairo.h
> +++ b/include/configs/omap3_cairo.h
> @@ -241,10 +241,6 @@
>  #define CONFIG_SERIAL2
>  #endif
>  
> -/* Keep old prompt in case some existing script depends on it */
> -#undef CONFIG_SYS_PROMPT
> -#define CONFIG_SYS_PROMPT		"Cairo # "
> -
>  /* Provide MACH_TYPE for compatibility with non-DT kernels */
>  #define MACH_TYPE_OMAP3_CAIRO	3063
>  #define CONFIG_MACH_TYPE	MACH_TYPE_OMAP3_CAIRO
> diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h
> index 370f21e..b0d1c93 100644
> --- a/include/configs/omap3_evm_common.h
> +++ b/include/configs/omap3_evm_common.h
> @@ -179,7 +179,6 @@
>   * U-boot features
>   * ----------------------------------------------------------------------------
>   */
> -#define CONFIG_SYS_PROMPT		"OMAP3_EVM # "
>  #define CONFIG_SYS_MAXARGS		16	/* max args for a command */
>  
>  #define CONFIG_MISC_INIT_R
> diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
> index af6ae73..7ff0b1a 100644
> --- a/include/configs/omap3_logic.h
> +++ b/include/configs/omap3_logic.h
> @@ -235,7 +235,6 @@
>   */
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
>  #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
> -#define CONFIG_SYS_PROMPT		"OMAP Logic # "
>  #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
>  /* Print Buffer Size */
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
> diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h
> index 4339b05..40f278a 100644
> --- a/include/configs/omap3_mvblx.h
> +++ b/include/configs/omap3_mvblx.h
> @@ -205,7 +205,6 @@
>   */
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
>  #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
> -#define CONFIG_SYS_PROMPT		"mvblx # "
>  #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
>  /* Print Buffer Size */
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
> diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
> index 76bf3b6..3c29fc1 100644
> --- a/include/configs/omap3_overo.h
> +++ b/include/configs/omap3_overo.h
> @@ -186,12 +186,6 @@
>  	"fi;" \
>  	"run nanddtsboot; " \
>  
> -/*
> - * Miscellaneous configurable options
> - */
> -#undef CONFIG_SYS_PROMPT
> -#define CONFIG_SYS_PROMPT		"Overo # "
> -
>  /* memtest works on */
>  #define CONFIG_SYS_MEMTEST_START	(OMAP34XX_SDRC_CS0)
>  #define CONFIG_SYS_MEMTEST_END		(OMAP34XX_SDRC_CS0 + \
> diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
> index 49467c9..93cb9a3 100644
> --- a/include/configs/omap3_pandora.h
> +++ b/include/configs/omap3_pandora.h
> @@ -101,12 +101,6 @@
>  	"ubi part boot && ubifsmount ubi:boot && " \
>  		"ubifsload ${loadaddr} uImage && bootm ${loadaddr}"
>  
> -/*
> - * Miscellaneous configurable options
> - */
> -#undef CONFIG_SYS_PROMPT
> -#define CONFIG_SYS_PROMPT		"Pandora # "
> -
>  /* memtest works on */
>  #define CONFIG_SYS_MEMTEST_START	(OMAP34XX_SDRC_CS0)
>  #define CONFIG_SYS_MEMTEST_END		(OMAP34XX_SDRC_CS0 + \
> diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h
> index 16ceb91..f43e477 100644
> --- a/include/configs/omap3_sdp3430.h
> +++ b/include/configs/omap3_sdp3430.h
> @@ -240,7 +240,6 @@
>  
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
>  #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
> -#define CONFIG_SYS_PROMPT		"OMAP34XX SDP # "
>  #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
>  /* Print Buffer Size */
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
> diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
> index 6d0d020..d9a3aa4 100644
> --- a/include/configs/omapl138_lcdk.h
> +++ b/include/configs/omapl138_lcdk.h
> @@ -199,7 +199,6 @@
>  #define CONFIG_MISC_INIT_R
>  #define CONFIG_BOARD_EARLY_INIT_F
>  #define CONFIG_BOOTFILE		"uImage" /* Boot file name */
> -#define CONFIG_SYS_PROMPT	"U-Boot > " /* Command Prompt */
>  #define CONFIG_SYS_CBSIZE	1024 /* Console I/O Buffer Size	*/
>  #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
>  #define CONFIG_SYS_MAXARGS	16 /* max number of command args */
> diff --git a/include/configs/origen.h b/include/configs/origen.h
> index dae8fd5..21d8e7a 100644
> --- a/include/configs/origen.h
> +++ b/include/configs/origen.h
> @@ -11,9 +11,6 @@
>  
>  #include <configs/exynos4-common.h>
>  
> -#define CONFIG_SYS_PROMPT		"ORIGEN # "
> -
> -
>  /* High Level Configuration Options */
>  #define CONFIG_EXYNOS4210		1	/* which is a EXYNOS4210 SoC */
>  #define CONFIG_ORIGEN			1	/* working with ORIGEN*/
> diff --git a/include/configs/palmld.h b/include/configs/palmld.h
> index a9f92fa..ec48c14 100644
> --- a/include/configs/palmld.h
> +++ b/include/configs/palmld.h
> @@ -96,9 +96,6 @@
>  #define	CONFIG_SYS_HUSH_PARSER		1
>  
>  #define	CONFIG_SYS_LONGHELP
> -#ifdef	CONFIG_SYS_HUSH_PARSER
> -#define	CONFIG_SYS_PROMPT		"$ "
> -#endif
>  #define	CONFIG_SYS_CBSIZE		256
>  #define	CONFIG_SYS_PBSIZE		\
>  	(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
> diff --git a/include/configs/palmtc.h b/include/configs/palmtc.h
> index b68ad3b..81c3f02 100644
> --- a/include/configs/palmtc.h
> +++ b/include/configs/palmtc.h
> @@ -99,9 +99,6 @@
>  #define	CONFIG_SYS_HUSH_PARSER		1
>  
>  #define	CONFIG_SYS_LONGHELP
> -#ifdef	CONFIG_SYS_HUSH_PARSER
> -#define	CONFIG_SYS_PROMPT		"$ "
> -#endif
>  #define	CONFIG_SYS_CBSIZE		256
>  #define	CONFIG_SYS_PBSIZE		\
>  	(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
> diff --git a/include/configs/palmtreo680.h b/include/configs/palmtreo680.h
> index 3946607..ffb0d1e 100644
> --- a/include/configs/palmtreo680.h
> +++ b/include/configs/palmtreo680.h
> @@ -92,6 +92,7 @@
>  #define CONFIG_SYS_PROMPT_HUSH_PS2      "> "
>  
>  #define CONFIG_SYS_LONGHELP
> +#undef CONFIG_SYS_PROMPT
>  #ifdef CONFIG_SYS_HUSH_PARSER
>  #define CONFIG_SYS_PROMPT               "$ "
>  #else
> diff --git a/include/configs/paz00.h b/include/configs/paz00.h
> index 0bdeccc..8eac81a 100644
> --- a/include/configs/paz00.h
> +++ b/include/configs/paz00.h
> @@ -21,7 +21,6 @@
>  #include "tegra20-common.h"
>  
>  /* High-level configuration options */
> -#define V_PROMPT		"Tegra20 (Paz00) MOD # "
>  #define CONFIG_TEGRA_BOARD_STRING	"Compal Paz00"
>  
>  /* Board-specific serial config */
> diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h
> index af2654e..516d381 100644
> --- a/include/configs/pb1x00.h
> +++ b/include/configs/pb1x00.h
> @@ -52,7 +52,6 @@
>   * Miscellaneous configurable options
>   */
>  #define	CONFIG_SYS_LONGHELP				/* undef to save memory      */
> -#define	CONFIG_SYS_PROMPT		"Pb1x00 # "	/* Monitor Command Prompt    */
>  #define	CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size   */
>  #define	CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)  /* Print Buffer Size */
>  #define	CONFIG_SYS_MAXARGS		16		/* max number of command args*/
> diff --git a/include/configs/pcm030.h b/include/configs/pcm030.h
> index 83c96a8..29feb7b 100644
> --- a/include/configs/pcm030.h
> +++ b/include/configs/pcm030.h
> @@ -337,7 +337,6 @@ RTC configuration
>   Miscellaneous configurable options
>  -------------------------------------------------------------------------------*/
>  #define CONFIG_SYS_LONGHELP	/* undef to save memory */
> -#define CONFIG_SYS_PROMPT "uboot> " /* Monitor Command Prompt */
>  
>  #define CONFIG_CMDLINE_EDITING 1 /* add command line history */
>  
> diff --git a/include/configs/peach-pi.h b/include/configs/peach-pi.h
> index 46699ff..5906171 100644
> --- a/include/configs/peach-pi.h
> +++ b/include/configs/peach-pi.h
> @@ -36,7 +36,6 @@
>  #define CONFIG_SERIAL3		/* use SERIAL 3 */
>  #define CONFIG_DEFAULT_CONSOLE	"console=ttySAC1,115200n8\0"
>  
> -#define CONFIG_SYS_PROMPT	"Peach-Pi # "
>  #define CONFIG_IDENT_STRING	" for Peach-Pi"
>  
>  #define CONFIG_VIDEO_PARADE
> diff --git a/include/configs/peach-pit.h b/include/configs/peach-pit.h
> index c5c9e3a..3b92df8 100644
> --- a/include/configs/peach-pit.h
> +++ b/include/configs/peach-pit.h
> @@ -36,7 +36,6 @@
>  #define CONFIG_SERIAL3		/* use SERIAL 3 */
>  #define CONFIG_DEFAULT_CONSOLE	"console=ttySAC1,115200n8\0"
>  
> -#define CONFIG_SYS_PROMPT	"Peach-Pit # "
>  #define CONFIG_IDENT_STRING	" for Peach-Pit"
>  
>  #define CONFIG_VIDEO_PARADE
> diff --git a/include/configs/pepper.h b/include/configs/pepper.h
> index 16149f6..f58b74a 100644
> --- a/include/configs/pepper.h
> +++ b/include/configs/pepper.h
> @@ -17,9 +17,6 @@
>  #define V_OSCK				24000000  /* Clock output from T2 */
>  #define V_SCLK				(V_OSCK)
>  
> -#undef CONFIG_SYS_PROMPT
> -#define CONFIG_SYS_PROMPT		"pepper# "
> -
>  #define CONFIG_SYS_I2C_EEPROM_ADDR	0x50
>  
>  /* Mach type */
> diff --git a/include/configs/platinum_picon.h b/include/configs/platinum_picon.h
> index f5b476f..3679530 100644
> --- a/include/configs/platinum_picon.h
> +++ b/include/configs/platinum_picon.h
> @@ -19,8 +19,6 @@
>  
>  #define CONFIG_HOSTNAME				picon
>  
> -#define CONFIG_SYS_PROMPT			"picon > "
> -
>  #define CONFIG_PLATFORM_ENV_SETTINGS		"\0"
>  
>  #define CONFIG_EXTRA_ENV_SETTINGS		CONFIG_COMMON_ENV_SETTINGS \
> diff --git a/include/configs/platinum_titanium.h b/include/configs/platinum_titanium.h
> index 9bca10f..ccb6441 100644
> --- a/include/configs/platinum_titanium.h
> +++ b/include/configs/platinum_titanium.h
> @@ -26,8 +26,6 @@
>  
>  #define CONFIG_HOSTNAME				titanium
>  
> -#define CONFIG_SYS_PROMPT			"titanium > "
> -
>  #define CONFIG_PLATFORM_ENV_SETTINGS		"\0"
>  
>  #define CONFIG_EXTRA_ENV_SETTINGS		CONFIG_COMMON_ENV_SETTINGS \
> diff --git a/include/configs/plutux.h b/include/configs/plutux.h
> index 7f7ea97..1d6df32 100644
> --- a/include/configs/plutux.h
> +++ b/include/configs/plutux.h
> @@ -13,7 +13,6 @@
>  #include "tegra20-common.h"
>  
>  /* High-level configuration options */
> -#define V_PROMPT			"Tegra20 (Plutux) # "
>  #define CONFIG_TEGRA_BOARD_STRING	"Avionic Design Plutux"
>  
>  /* Board-specific serial config */
> diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
> index f9a1d51..f4f96a7 100644
> --- a/include/configs/pm9261.h
> +++ b/include/configs/pm9261.h
> @@ -336,7 +336,6 @@
>  
>  #define CONFIG_BAUDRATE			115200
>  
> -#define CONFIG_SYS_PROMPT		"pm9261> "
>  #define CONFIG_SYS_CBSIZE		256
>  #define CONFIG_SYS_MAXARGS		16
>  #define CONFIG_SYS_PBSIZE		\
> diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
> index 6c434f0..bd43577 100644
> --- a/include/configs/pm9263.h
> +++ b/include/configs/pm9263.h
> @@ -370,7 +370,6 @@
>  
>  #define CONFIG_BAUDRATE			115200
>  
> -#define CONFIG_SYS_PROMPT		"u-boot-pm9263> "
>  #define CONFIG_SYS_CBSIZE		256
>  #define CONFIG_SYS_MAXARGS		16
>  #define CONFIG_SYS_PBSIZE		\
> diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h
> index c793865..09f0744 100644
> --- a/include/configs/pm9g45.h
> +++ b/include/configs/pm9g45.h
> @@ -149,7 +149,6 @@
>  
>  #define CONFIG_BAUDRATE			115200
>  
> -#define CONFIG_SYS_PROMPT		"U-Boot> "
>  #define CONFIG_SYS_CBSIZE		256
>  #define CONFIG_SYS_MAXARGS		16
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
> diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h
> index 3a0992a..8cf3ad8 100644
> --- a/include/configs/pogo_e02.h
> +++ b/include/configs/pogo_e02.h
> @@ -47,10 +47,6 @@
>   */
>  #include "mv-common.h"
>  
> -/* Remove or override few declarations from mv-common.h */
> -#undef CONFIG_SYS_PROMPT	/* previously defined in mv-common.h */
> -#define CONFIG_SYS_PROMPT	"PogoE02> "
> -
>  /*
>   *  Environment variables configurations
>   */
> diff --git a/include/configs/pr1.h b/include/configs/pr1.h
> index 3e4aab4..f76e023 100644
> --- a/include/configs/pr1.h
> +++ b/include/configs/pr1.h
> @@ -128,7 +128,6 @@
>  #define CONFIG_BAUDRATE		115200
>  #define CONFIG_RTC_BFIN
>  #define CONFIG_UART_CONSOLE	0
> -#define CONFIG_SYS_PROMPT	"pr1>"
>  #define CONFIG_BOOTCOMMAND	"run nandboot"
>  #define CONFIG_BOOTDELAY	2
>  #define CONFIG_LOADADDR		0x2000000
> diff --git a/include/configs/pxa255_idp.h b/include/configs/pxa255_idp.h
> index 3edeb08..332d79f 100644
> --- a/include/configs/pxa255_idp.h
> +++ b/include/configs/pxa255_idp.h
> @@ -205,6 +205,7 @@
>  #define CONFIG_SYS_HUSH_PARSER		1
>  
>  #define CONFIG_SYS_LONGHELP				/* undef to save memory		*/
> +#undef CONFIG_SYS_PROMPT
>  #ifdef CONFIG_SYS_HUSH_PARSER
>  #define CONFIG_SYS_PROMPT		"$ "		/* Monitor Command Prompt */
>  #else
> diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
> index b22637b..a7ec8f5 100644
> --- a/include/configs/qemu-mips.h
> +++ b/include/configs/qemu-mips.h
> @@ -78,6 +78,7 @@
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
>  
>  /* Monitor Command Prompt */
> +#undef CONFIG_SYS_PROMPT
>  #if defined(CONFIG_SYS_LITTLE_ENDIAN)
>  #define CONFIG_SYS_PROMPT		"qemu-mipsel # "
>  #else
> diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h
> index fae5b05..4de15bf 100644
> --- a/include/configs/qemu-mips64.h
> +++ b/include/configs/qemu-mips64.h
> @@ -80,6 +80,7 @@
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
>  
>  /* Monitor Command Prompt */
> +#undef CONFIG_SYS_PROMPT
>  #if defined(CONFIG_SYS_LITTLE_ENDIAN)
>  #define CONFIG_SYS_PROMPT		"qemu-mips64el # "
>  #else
> diff --git a/include/configs/rpi-common.h b/include/configs/rpi-common.h
> index 1012cdd..25566d2 100644
> --- a/include/configs/rpi-common.h
> +++ b/include/configs/rpi-common.h
> @@ -116,7 +116,6 @@
>  
>  /* Shell */
>  #define CONFIG_SYS_MAXARGS		8
> -#define CONFIG_SYS_PROMPT		"U-Boot> "
>  #define CONFIG_COMMAND_HISTORY
>  
>  /* Commands */
> diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
> index 7994ecf..e2bf234 100644
> --- a/include/configs/s5p_goni.h
> +++ b/include/configs/s5p_goni.h
> @@ -197,7 +197,6 @@
>  
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
>  #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser	*/
> -#define CONFIG_SYS_PROMPT	"Goni # "
>  #define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
>  #define CONFIG_SYS_PBSIZE	384	/* Print Buffer Size */
>  #define CONFIG_SYS_MAXARGS	16	/* max number of command args */
> diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
> index e7bace4..35fef2b 100644
> --- a/include/configs/s5pc210_universal.h
> +++ b/include/configs/s5pc210_universal.h
> @@ -12,9 +12,6 @@
>  
>  #include <configs/exynos4-common.h>
>  
> -#define CONFIG_SYS_PROMPT	"Universal # "	/* Monitor Command Prompt */
> -
> -
>  #define CONFIG_TIZEN			/* TIZEN lib */
>  
>  /* Keep L2 Cache Disabled */
> diff --git a/include/configs/scb9328.h b/include/configs/scb9328.h
> index f367d62..d4ffb46 100644
> --- a/include/configs/scb9328.h
> +++ b/include/configs/scb9328.h
> @@ -51,7 +51,6 @@
>   * General options for u-boot. Modify to save memory foot print
>   */
>  #define CONFIG_SYS_LONGHELP				      /* undef saves memory  */
> -#define CONFIG_SYS_PROMPT		"scb9328> "	      /* prompt string	     */
>  #define CONFIG_SYS_CBSIZE		256		      /* console I/O buffer  */
>  #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* print buffer size   */
>  #define CONFIG_SYS_MAXARGS		16		      /* max command args    */
> diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
> index fdeffb5..3e90474 100644
> --- a/include/configs/seaboard.h
> +++ b/include/configs/seaboard.h
> @@ -20,7 +20,6 @@
>  #include "tegra20-common.h"
>  
>  /* High-level configuration options */
> -#define V_PROMPT		"Tegra20 (SeaBoard) # "
>  #define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Seaboard"
>  
>  /* Board-specific serial config */
> diff --git a/include/configs/secomx6quq7.h b/include/configs/secomx6quq7.h
> index 114d1fd..703f4fc 100644
> --- a/include/configs/secomx6quq7.h
> +++ b/include/configs/secomx6quq7.h
> @@ -74,9 +74,6 @@
>  	"stderr=serial\0"
>  
>  
> -/* Miscellaneous configurable options */
> -#define CONFIG_SYS_PROMPT		"SECO MX6Q uQ7 U-Boot > "
> -
>  /* Print Buffer Size */
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE +		\
>  					 sizeof(CONFIG_SYS_PROMPT) + 16)
> diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
> index e5fd147..687f2da 100644
> --- a/include/configs/siemens-am33x-common.h
> +++ b/include/configs/siemens-am33x-common.h
> @@ -27,7 +27,6 @@
>  #define CONFIG_SYS_MALLOC_LEN		(16 * 1024 * 1024)
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
>  #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
> -#define CONFIG_SYS_PROMPT		"U-Boot# "
>  #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
>  #define CONFIG_BOARD_LATE_INIT
>  #define CONFIG_SYS_NO_FLASH
> diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
> index 7b4b3b0..a6bfa76 100644
> --- a/include/configs/smdk2410.h
> +++ b/include/configs/smdk2410.h
> @@ -106,7 +106,6 @@
>   * Miscellaneous configurable options
>   */
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
> -#define CONFIG_SYS_PROMPT	"SMDK2410 # "
>  #define CONFIG_SYS_CBSIZE	256
>  /* Print Buffer Size */
>  #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE + \
> diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h
> index e5655fc..8975316 100644
> --- a/include/configs/smdk5250.h
> +++ b/include/configs/smdk5250.h
> @@ -25,7 +25,6 @@
>  #define CONFIG_USB_XHCI
>  #define CONFIG_USB_XHCI_EXYNOS
>  
> -#define CONFIG_SYS_PROMPT		"SMDK5250 # "
>  #define CONFIG_IDENT_STRING		" for SMDK5250"
>  
>  /* Miscellaneous configurable options */
> diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h
> index 607877c..bbc75d8 100644
> --- a/include/configs/smdk5420.h
> +++ b/include/configs/smdk5420.h
> @@ -29,7 +29,6 @@
>  #define CONFIG_SERIAL3		/* use SERIAL 3 */
>  #define CONFIG_DEFAULT_CONSOLE	"console=ttySAC1,115200n8\0"
>  
> -#define CONFIG_SYS_PROMPT	"SMDK5420 # "
>  #define CONFIG_IDENT_STRING	" for SMDK5420"
>  #define CONFIG_DEFAULT_CONSOLE		"console=ttySAC1,115200n8\0"
>  
> diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
> index 08a2e9f..4ec9c65 100644
> --- a/include/configs/smdkc100.h
> +++ b/include/configs/smdkc100.h
> @@ -152,7 +152,6 @@
>   */
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
>  #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser	*/
> -#define CONFIG_SYS_PROMPT		"SMDKC100 # "
>  #define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
>  #define CONFIG_SYS_PBSIZE	384	/* Print Buffer Size */
>  #define CONFIG_SYS_MAXARGS	16	/* max number of command args */
> diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
> index d26e5ec..dbba88b 100644
> --- a/include/configs/smdkv310.h
> +++ b/include/configs/smdkv310.h
> @@ -55,7 +55,6 @@
>  #define CONFIG_BOOTCOMMAND	"fatload mmc 0 40007000 uImage; bootm 40007000"
>  
>  /* Miscellaneous configurable options */
> -#define CONFIG_SYS_PROMPT		"SMDKV310 # "
>  #define CONFIG_DEFAULT_CONSOLE		"console=ttySAC2,115200n8\0"
>  /* memtest works on */
>  #define CONFIG_SYS_MEMTEST_START	CONFIG_SYS_SDRAM_BASE
> diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h
> index 70ef939..7758b0f 100644
> --- a/include/configs/snapper9260.h
> +++ b/include/configs/snapper9260.h
> @@ -89,7 +89,6 @@
>  #define CONFIG_USART_ID			ATMEL_ID_SYS
>  #endif
>  #define CONFIG_BAUDRATE			115200
> -#define CONFIG_SYS_PROMPT		"Snapper> "
>  
>  /* I2C - Bit-bashed */
>  #define CONFIG_SYS_I2C
> diff --git a/include/configs/snow.h b/include/configs/snow.h
> index 557f86c..8dba8f5 100644
> --- a/include/configs/snow.h
> +++ b/include/configs/snow.h
> @@ -28,7 +28,6 @@
>  #define CONFIG_USB_XHCI_EXYNOS
>  #define CONFIG_USB_EHCI_EXYNOS
>  
> -#define CONFIG_SYS_PROMPT		"snow # "
>  #define CONFIG_IDENT_STRING		" for snow"
>  #define CONFIG_DEFAULT_CONSOLE		"console=ttySAC1,115200n8\0"
>  
> diff --git a/include/configs/snowball.h b/include/configs/snowball.h
> index 91aaffa..de03e76 100644
> --- a/include/configs/snowball.h
> +++ b/include/configs/snowball.h
> @@ -154,7 +154,6 @@
>   */
>  
>  #define CONFIG_SYS_LONGHELP			/* undef to save memory     */
> -#define CONFIG_SYS_PROMPT	"U8500 $ "	/* Monitor Command Prompt   */
>  #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size  */
>  
>  /* Print Buffer Size */
> diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
> index f75c306..fb1bf66 100644
> --- a/include/configs/spear-common.h
> +++ b/include/configs/spear-common.h
> @@ -201,7 +201,6 @@
>  #define CONFIG_SYS_MALLOC_LEN			(1024*1024)
>  #define CONFIG_IDENT_STRING			"-SPEAr"
>  #define CONFIG_SYS_LONGHELP
> -#define CONFIG_SYS_PROMPT			"u-boot> "
>  #define CONFIG_CMDLINE_EDITING
>  #define CONFIG_SYS_CBSIZE			256
>  #define CONFIG_SYS_PBSIZE			(CONFIG_SYS_CBSIZE + \
> diff --git a/include/configs/stamp9g20.h b/include/configs/stamp9g20.h
> index 086ebcf..87df70b 100644
> --- a/include/configs/stamp9g20.h
> +++ b/include/configs/stamp9g20.h
> @@ -180,7 +180,6 @@
>  /* General Boot Parameter */
>  #define CONFIG_BOOTDELAY		3
>  #define CONFIG_BOOTCOMMAND		"run flashboot"
> -#define CONFIG_SYS_PROMPT		"U-Boot> "
>  #define CONFIG_SYS_CBSIZE		256
>  #define CONFIG_SYS_MAXARGS		16
>  #define CONFIG_SYS_PBSIZE \
> diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h
> index 1b4fd21..7ccdcb7 100644
> --- a/include/configs/stm32f429-discovery.h
> +++ b/include/configs/stm32f429-discovery.h
> @@ -97,7 +97,6 @@
>   */
>  #define CONFIG_SYS_LONGHELP
>  #define CONFIG_SYS_HUSH_PARSER
> -#define CONFIG_SYS_PROMPT	       "U-Boot > "
>  #define CONFIG_AUTO_COMPLETE
>  #define CONFIG_CMDLINE_EDITING
>  
> diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h
> index 887f31a..b1b6919 100644
> --- a/include/configs/stv0991.h
> +++ b/include/configs/stv0991.h
> @@ -36,7 +36,6 @@
>  #define CONFIG_PL01X_SERIAL
>  
>  /* user interface */
> -#define CONFIG_SYS_PROMPT			"STV0991> "
>  #define CONFIG_SYS_CBSIZE			1024
>  #define CONFIG_SYS_PBSIZE			(CONFIG_SYS_CBSIZE \
>  						+sizeof(CONFIG_SYS_PROMPT) + 16)
> diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h
> index 6676f37..25b7d5f 100644
> --- a/include/configs/stxgp3.h
> +++ b/include/configs/stxgp3.h
> @@ -315,7 +315,6 @@
>   * Miscellaneous configurable options
>   */
>  #define CONFIG_SYS_LONGHELP			/* undef to save memory		*/
> -#define CONFIG_SYS_PROMPT	"GPPP=> "	/* Monitor Command Prompt	*/
>  #if defined(CONFIG_CMD_KGDB)
>  #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
>  #else
> diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h
> index 5b1f3ab..ee16fea 100644
> --- a/include/configs/stxssa.h
> +++ b/include/configs/stxssa.h
> @@ -349,7 +349,6 @@
>   * Miscellaneous configurable options
>   */
>  #define CONFIG_SYS_LONGHELP			/* undef to save memory		*/
> -#define CONFIG_SYS_PROMPT	"SSA=> "	/* Monitor Command Prompt	*/
>  #if defined(CONFIG_CMD_KGDB)
>  #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
>  #else
> diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
> index 9576bc1..9ab376c 100644
> --- a/include/configs/sunxi-common.h
> +++ b/include/configs/sunxi-common.h
> @@ -50,8 +50,6 @@
>   */
>  #define CONFIG_DISPLAY_CPUINFO
>  
> -#define CONFIG_SYS_PROMPT	"sunxi# "
> -
>  /* Serial & console */
>  #define CONFIG_SYS_NS16550
>  #define CONFIG_SYS_NS16550_SERIAL
> diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
> index c8ec79b..a8928e5 100644
> --- a/include/configs/tao3530.h
> +++ b/include/configs/tao3530.h
> @@ -196,7 +196,6 @@
>   */
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
>  #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
> -#define CONFIG_SYS_PROMPT		"TAO-3530 # "
>  #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
>  
>  /* turn on command-line edit/hist/auto */
> diff --git a/include/configs/taurus.h b/include/configs/taurus.h
> index d5b93eb..2c9f5da 100644
> --- a/include/configs/taurus.h
> +++ b/include/configs/taurus.h
> @@ -165,7 +165,6 @@
>  	"512k(dtb),6M(kernel)ro,-(rootfs) "				\
>  	"root=/dev/mtdblock7 rw rootfstype=jffs2"
>  
> -#define CONFIG_SYS_PROMPT		"U-Boot> "
>  #define CONFIG_SYS_CBSIZE		256
>  #define CONFIG_SYS_MAXARGS		16
>  #define CONFIG_SYS_PBSIZE \
> diff --git a/include/configs/tb100.h b/include/configs/tb100.h
> index 42817ae..41c2c72 100644
> --- a/include/configs/tb100.h
> +++ b/include/configs/tb100.h
> @@ -96,7 +96,6 @@
>   * Console configuration
>   */
>  #define CONFIG_SYS_LONGHELP
> -#define CONFIG_SYS_PROMPT		"[tb100]:~# "
>  #define CONFIG_SYS_CBSIZE		256
>  #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
> diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
> index 42e5821..6afa18d 100644
> --- a/include/configs/tbs2910.h
> +++ b/include/configs/tbs2910.h
> @@ -18,7 +18,6 @@
>  
>  #define CONFIG_BOARD_EARLY_INIT_F
>  
> -#define CONFIG_SYS_PROMPT		"Matrix U-Boot> "
>  #define CONFIG_SYS_HZ			1000
>  
>  #define CONFIG_IMX6_THERMAL
> diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
> index fa651c1..4cf2823 100644
> --- a/include/configs/tec-ng.h
> +++ b/include/configs/tec-ng.h
> @@ -11,7 +11,6 @@
>  #include "tegra30-common.h"
>  
>  /* High-level configuration options */
> -#define V_PROMPT			"Tegra30 (TEC-NG) # "
>  #define CONFIG_TEGRA_BOARD_STRING	"Avionic Design Tamonten? NG Evaluation Carrier"
>  
>  /* Board-specific serial config */
> diff --git a/include/configs/tec.h b/include/configs/tec.h
> index 3b543eb..4b8ca5e 100644
> --- a/include/configs/tec.h
> +++ b/include/configs/tec.h
> @@ -13,7 +13,6 @@
>  #include "tegra20-common.h"
>  
>  /* High-level configuration options */
> -#define V_PROMPT			"Tegra20 (TEC) # "
>  #define CONFIG_TEGRA_BOARD_STRING	"Avionic Design Tamonten Evaluation Carrier"
>  
>  /* Board-specific serial config */
> diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
> index 7b4c0d7..2b1b21f 100644
> --- a/include/configs/tegra-common.h
> +++ b/include/configs/tegra-common.h
> @@ -83,10 +83,6 @@
>  #endif
>  
>  /*
> - * Miscellaneous configurable options
> - */
> -#define CONFIG_SYS_PROMPT		V_PROMPT
> -/*
>   * Increasing the size of the IO buffer as default nfsargs size is more
>   *  than 256 and so it is not possible to edit it
>   */
> diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
> index fcfb70e..7fa35a1 100644
> --- a/include/configs/ti814x_evm.h
> +++ b/include/configs/ti814x_evm.h
> @@ -28,7 +28,6 @@
>  #define CONFIG_SYS_MALLOC_LEN		(1024 << 10)
>  #define CONFIG_SYS_LONGHELP		/* undef to save memory */
>  #define CONFIG_SYS_HUSH_PARSER		/* Use HUSH for command parsing */
> -#define CONFIG_SYS_PROMPT		"U-Boot# "
>  #define CONFIG_SYS_NO_FLASH
>  #define CONFIG_MACH_TYPE		MACH_TYPE_TI8148EVM
>  
> diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h
> index 8d52057..01d8233 100644
> --- a/include/configs/ti816x_evm.h
> +++ b/include/configs/ti816x_evm.h
> @@ -24,7 +24,6 @@
>  #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (32 * 1024))
>  #define CONFIG_SYS_LONGHELP		/* undef save memory */
>  #define CONFIG_SYS_HUSH_PARSER
> -#define CONFIG_SYS_PROMPT		"u-boot/ti816x# "
>  #define CONFIG_MACH_TYPE		MACH_TYPE_TI8168EVM
>  
>  #define CONFIG_OF_LIBFDT
> diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
> index 0aea7d1..6a2ddd3 100644
> --- a/include/configs/ti_armv7_common.h
> +++ b/include/configs/ti_armv7_common.h
> @@ -133,7 +133,6 @@
>  #define CONFIG_SYS_MALLOC_LEN	(16 << 20)
>  #endif
>  #define CONFIG_SYS_HUSH_PARSER
> -#define CONFIG_SYS_PROMPT		"U-Boot# "
>  #define CONFIG_SYS_CONSOLE_INFO_QUIET
>  #define CONFIG_BAUDRATE			115200
>  #define CONFIG_ENV_VARS_UBOOT_CONFIG	/* Strongly encouraged */
> diff --git a/include/configs/titanium.h b/include/configs/titanium.h
> index 49aa3c7..1b4ca29 100644
> --- a/include/configs/titanium.h
> +++ b/include/configs/titanium.h
> @@ -141,9 +141,6 @@
>  
>  #define CONFIG_BOOTCOMMAND		"run nand_ubifs"
>  
> -/* Miscellaneous configurable options */
> -#define CONFIG_SYS_PROMPT		"Titanium > "
> -
>  /* Print Buffer Size */
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
>  					 sizeof(CONFIG_SYS_PROMPT) + 16)
> diff --git a/include/configs/trats.h b/include/configs/trats.h
> index 6808e78..5fb991b 100644
> --- a/include/configs/trats.h
> +++ b/include/configs/trats.h
> @@ -12,8 +12,6 @@
>  
>  #include <configs/exynos4-common.h>
>  
> -#define CONFIG_SYS_PROMPT	"Trats # "	/* Monitor Command Prompt */
> -
>  #define CONFIG_TRATS
>  
>  
> diff --git a/include/configs/trats2.h b/include/configs/trats2.h
> index 94c31fb..f12a952 100644
> --- a/include/configs/trats2.h
> +++ b/include/configs/trats2.h
> @@ -13,9 +13,6 @@
>  
>  #include <configs/exynos4-common.h>
>  
> -#define CONFIG_SYS_PROMPT	"Trats2 # "	/* Monitor Command Prompt */
> -
> -
>  #define CONFIG_TIZEN			/* TIZEN lib */
>  
>  #define CONFIG_SYS_L2CACHE_OFF
> diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
> index 23bf599..f04b572 100644
> --- a/include/configs/tricorder.h
> +++ b/include/configs/tricorder.h
> @@ -284,7 +284,6 @@
>  #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
>  #define CONFIG_CMDLINE_EDITING		/* enable cmdline history */
>  #define CONFIG_AUTO_COMPLETE
> -#define CONFIG_SYS_PROMPT		"OMAP3 Tricorder # "
>  #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
>  /* Print Buffer Size */
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
> diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
> index 2db38e5..2ab5511 100644
> --- a/include/configs/trimslice.h
> +++ b/include/configs/trimslice.h
> @@ -12,7 +12,6 @@
>  #include "tegra20-common.h"
>  
>  /* High-level configuration options */
> -#define V_PROMPT		"Tegra20 (TrimSlice) # "
>  #define CONFIG_TEGRA_BOARD_STRING	"Compulab Trimslice"
>  
>  /* Board-specific serial config */
> diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h
> index 8368931..40c8d71 100644
> --- a/include/configs/trizepsiv.h
> +++ b/include/configs/trizepsiv.h
> @@ -130,6 +130,7 @@
>  #define CONFIG_SYS_HUSH_PARSER		1
>  
>  #define CONFIG_SYS_LONGHELP				/* undef to save memory		*/
> +#undef CONFIG_SYS_PROMPT
>  #ifdef CONFIG_SYS_HUSH_PARSER
>  #define CONFIG_SYS_PROMPT		"$ "		/* Monitor Command Prompt */
>  #else
> diff --git a/include/configs/tt01.h b/include/configs/tt01.h
> index 9501a83..ca1e2e2 100644
> --- a/include/configs/tt01.h
> +++ b/include/configs/tt01.h
> @@ -224,7 +224,6 @@
>  #define CONFIG_SYS_HUSH_PARSER
>  
>  #define CONFIG_SYS_LONGHELP			/* undef to save memory */
> -#define CONFIG_SYS_PROMPT	"TT01> "
>  #define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
>  /* Print Buffer Size */
>  #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE + \
> diff --git a/include/configs/twister.h b/include/configs/twister.h
> index f24dc13..4f5560f 100644
> --- a/include/configs/twister.h
> +++ b/include/configs/twister.h
> @@ -29,8 +29,6 @@
>  /*
>   * Miscellaneous configurable options
>   */
> -#define CONFIG_SYS_PROMPT		"twister => "
> -
>  #define CONFIG_SMC911X
>  #define CONFIG_SMC911X_16_BIT
>  #define CONFIG_SMC911X_BASE		0x2C000000
> diff --git a/include/configs/u8500_href.h b/include/configs/u8500_href.h
> index 6a22571..a8cc030 100644
> --- a/include/configs/u8500_href.h
> +++ b/include/configs/u8500_href.h
> @@ -111,7 +111,6 @@
>   */
>  
>  #define CONFIG_SYS_LONGHELP			/* undef to save memory     */
> -#define CONFIG_SYS_PROMPT	"U8500 $ "	/* Monitor Command Prompt   */
>  #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size  */
>  
>  /* Print Buffer Size */
> diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h
> index 4774de5..10a1664 100644
> --- a/include/configs/usb_a9263.h
> +++ b/include/configs/usb_a9263.h
> @@ -140,7 +140,6 @@
>  #define CONFIG_EXTRA_ENV_SETTINGS \
>  	"mtdparts=" MTDPARTS_DEFAULT "\0" \
>  
> -#define CONFIG_SYS_PROMPT		"U-Boot> "
>  #define CONFIG_SYS_CBSIZE		256
>  #define CONFIG_SYS_MAXARGS		16
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
> diff --git a/include/configs/v5fx30teval.h b/include/configs/v5fx30teval.h
> index f30a090..298fa3e 100644
> --- a/include/configs/v5fx30teval.h
> +++ b/include/configs/v5fx30teval.h
> @@ -24,7 +24,6 @@
>  #define CONFIG_ENV_ADDR		(XPAR_FLASH_MEM0_BASEADDR+CONFIG_ENV_OFFSET)
>  
>  /*Misc*/
> -#define CONFIG_SYS_PROMPT		"v5fx30t:/# "	/* Monitor Command Prompt    */
>  #define CONFIG_PREBOOT		"echo U-Boot is up and runnining;"
>  
>  /*Flash*/
> diff --git a/include/configs/vct.h b/include/configs/vct.h
> index b54519d..80f6a60 100644
> --- a/include/configs/vct.h
> +++ b/include/configs/vct.h
> @@ -145,7 +145,6 @@
>   * Miscellaneous configurable options
>   */
>  #define CONFIG_SYS_LONGHELP			/* undef to save memory		*/
> -#define CONFIG_SYS_PROMPT	"VCT# "		/* Monitor Command Prompt	*/
>  #define CONFIG_SYS_CBSIZE	512		/* Console I/O Buffer Size	*/
>  #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE + \
>  				 sizeof(CONFIG_SYS_PROMPT) + 16)
> diff --git a/include/configs/venice2.h b/include/configs/venice2.h
> index 1d9d053..4c2eb0d 100644
> --- a/include/configs/venice2.h
> +++ b/include/configs/venice2.h
> @@ -13,7 +13,6 @@
>  #include "tegra124-common.h"
>  
>  /* High-level configuration options */
> -#define V_PROMPT			"Tegra124 (Venice2) # "
>  #define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Venice2"
>  
>  /* Board-specific serial config */
> diff --git a/include/configs/ventana.h b/include/configs/ventana.h
> index 3f1ebcd..e9c3500 100644
> --- a/include/configs/ventana.h
> +++ b/include/configs/ventana.h
> @@ -12,7 +12,6 @@
>  #include "tegra20-common.h"
>  
>  /* High-level configuration options */
> -#define V_PROMPT		"Tegra20 (Ventana) # "
>  #define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Ventana"
>  
>  /* Board-specific serial config */
> diff --git a/include/configs/versatile.h b/include/configs/versatile.h
> index de23375..636ca43 100644
> --- a/include/configs/versatile.h
> +++ b/include/configs/versatile.h
> @@ -108,6 +108,7 @@
>  #define CONFIG_SYS_LONGHELP	/* undef to save memory */
>  #define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
>  /* Monitor Command Prompt	 */
> +#undef CONFIG_SYS_PROMPT
>  #ifdef CONFIG_ARCH_VERSATILE_AB
>  # define CONFIG_SYS_PROMPT	"VersatileAB # "
>  #else
> diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
> index c36237f..6107c64 100644
> --- a/include/configs/vexpress_aemv8a.h
> +++ b/include/configs/vexpress_aemv8a.h
> @@ -239,7 +239,6 @@
>  
>  /* Monitor Command Prompt */
>  #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
> -#define CONFIG_SYS_PROMPT		"VExpress64# "
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
>  					sizeof(CONFIG_SYS_PROMPT) + 16)
>  #define CONFIG_SYS_HUSH_PARSER
> diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
> index 0c1da01..df2ac64 100644
> --- a/include/configs/vexpress_common.h
> +++ b/include/configs/vexpress_common.h
> @@ -280,7 +280,6 @@
>  
>  /* Monitor Command Prompt */
>  #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
> -#define CONFIG_SYS_PROMPT		"VExpress# "
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
>  					sizeof(CONFIG_SYS_PROMPT) + 16)
>  #define CONFIG_SYS_HUSH_PARSER
> diff --git a/include/configs/vision2.h b/include/configs/vision2.h
> index 93c7348..b43373f 100644
> --- a/include/configs/vision2.h
> +++ b/include/configs/vision2.h
> @@ -137,7 +137,6 @@
>   * Miscellaneous configurable options
>   */
>  #define CONFIG_SYS_LONGHELP
> -#define	CONFIG_SYS_PROMPT		"Vision II U-boot > "
>  #define CONFIG_AUTO_COMPLETE
>  #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
>  
> diff --git a/include/configs/vl_ma2sc.h b/include/configs/vl_ma2sc.h
> index e4958ce..3facd7f 100644
> --- a/include/configs/vl_ma2sc.h
> +++ b/include/configs/vl_ma2sc.h
> @@ -340,7 +340,6 @@
>  #define CONFIG_SYS_BAUDRATE_TABLE	{312500, 230400, 115200, 19200, \
>  						38400, 57600, 9600 }
>  
> -#define CONFIG_SYS_PROMPT	"U-Boot> "
>  #define CONFIG_SYS_CBSIZE	512		/* Console I/O Buffer Size */
>  #define CONFIG_SYS_MAXARGS	32		/* max number of command args */
>  #define CONFIG_SYS_PBSIZE	\
> diff --git a/include/configs/vpac270.h b/include/configs/vpac270.h
> index 95a69b3..976ba5d 100644
> --- a/include/configs/vpac270.h
> +++ b/include/configs/vpac270.h
> @@ -126,7 +126,6 @@
>  
>  #define	CONFIG_SYS_LONGHELP
>  #ifdef	CONFIG_SYS_HUSH_PARSER
> -#define	CONFIG_SYS_PROMPT		"$ "
>  #else
>  #endif
>  #define	CONFIG_SYS_CBSIZE		256
> diff --git a/include/configs/whistler.h b/include/configs/whistler.h
> index 13cc3d3..ff85964 100644
> --- a/include/configs/whistler.h
> +++ b/include/configs/whistler.h
> @@ -12,7 +12,6 @@
>  #include "tegra20-common.h"
>  
>  /* High-level configuration options */
> -#define V_PROMPT		"Tegra20 (Whistler) # "
>  #define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Whistler"
>  
>  /* Board-specific serial config */
> diff --git a/include/configs/wireless_space.h b/include/configs/wireless_space.h
> index 7219034..191ac1b 100644
> --- a/include/configs/wireless_space.h
> +++ b/include/configs/wireless_space.h
> @@ -64,8 +64,6 @@
>  #undef CONFIG_SYS_IDE_MAXDEVICE
>  #define CONFIG_SYS_IDE_MAXBUS           1
>  #define CONFIG_SYS_IDE_MAXDEVICE        1
> -#undef CONFIG_SYS_PROMPT
> -#define CONFIG_SYS_PROMPT		"ws> "
>  
>  /*
>   * Ethernet Driver configuration
> diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h
> index 52d392c..5d9f529 100644
> --- a/include/configs/woodburn_common.h
> +++ b/include/configs/woodburn_common.h
> @@ -130,7 +130,6 @@
>   * Miscellaneous configurable options
>   */
>  #define CONFIG_SYS_LONGHELP	/* undef to save memory */
> -#define CONFIG_SYS_PROMPT	"woodburn U-Boot > "
>  #define CONFIG_CMDLINE_EDITING
>  #define CONFIG_SYS_HUSH_PARSER	/* Use the HUSH parser */
>  
> diff --git a/include/configs/x600.h b/include/configs/x600.h
> index 1d4c1a9..edb16b1 100644
> --- a/include/configs/x600.h
> +++ b/include/configs/x600.h
> @@ -151,7 +151,6 @@
>  #define CONFIG_SYS_MALLOC_LEN			(1024 * 1024)
>  #define CONFIG_IDENT_STRING			"-SPEAr"
>  #define CONFIG_SYS_LONGHELP
> -#define CONFIG_SYS_PROMPT			"X600> "
>  #define CONFIG_CMDLINE_EDITING
>  #define CONFIG_SYS_CBSIZE			256
>  #define CONFIG_SYS_PBSIZE			(CONFIG_SYS_CBSIZE + \
> diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h
> index a072464..8d19bff 100644
> --- a/include/configs/xaeniax.h
> +++ b/include/configs/xaeniax.h
> @@ -94,7 +94,7 @@
>  #define CONFIG_SYS_LONGHELP				/* undef to save memory	*/
>  #define CONFIG_SYS_HUSH_PARSER		1
>  
> -
> +#undef CONFIG_SYS_PROMPT
>  #ifdef CONFIG_SYS_HUSH_PARSER
>  #define CONFIG_SYS_PROMPT		"u-boot$ "	/* Monitor Command Prompt */
>  #else
> diff --git a/include/configs/xilinx-ppc405-generic.h b/include/configs/xilinx-ppc405-generic.h
> index 75b119f..40fa087 100644
> --- a/include/configs/xilinx-ppc405-generic.h
> +++ b/include/configs/xilinx-ppc405-generic.h
> @@ -26,7 +26,6 @@
>  #define CONFIG_ENV_OVERWRITE		1
>  
>  /*Misc*/
> -#define CONFIG_SYS_PROMPT	"xlx-ppc405:/# " /* Monitor Command Prompt */
>  #define CONFIG_PREBOOT		"echo U-Boot is up and runnining;"
>  
>  /*Flash*/
> diff --git a/include/configs/xilinx-ppc440-generic.h b/include/configs/xilinx-ppc440-generic.h
> index 8e68415..95b8834 100644
> --- a/include/configs/xilinx-ppc440-generic.h
> +++ b/include/configs/xilinx-ppc440-generic.h
> @@ -24,7 +24,6 @@
>  #define CONFIG_ENV_ADDR		(XPAR_FLASH_MEM0_BASEADDR+CONFIG_ENV_OFFSET)
>  
>  /*Misc*/
> -#define CONFIG_SYS_PROMPT		"board:/# "	/* Monitor Command Prompt    */
>  #define CONFIG_PREBOOT		"echo U-Boot is up and runnining;"
>  
>  /*Flash*/
> diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
> index ad82ed6..4fd1232 100644
> --- a/include/configs/xilinx_zynqmp.h
> +++ b/include/configs/xilinx_zynqmp.h
> @@ -118,7 +118,6 @@
>  /* Monitor Command Prompt */
>  /* Console I/O Buffer Size */
>  #define CONFIG_SYS_CBSIZE		2048
> -#define CONFIG_SYS_PROMPT		"ZynqMP> "
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
>  					sizeof(CONFIG_SYS_PROMPT) + 16)
>  #define CONFIG_SYS_HUSH_PARSER
> diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h
> index cff3ba8..0199190 100644
> --- a/include/configs/zipitz2.h
> +++ b/include/configs/zipitz2.h
> @@ -119,9 +119,6 @@ unsigned char zipitz2_spi_read(void);
>  #define	CONFIG_SYS_HUSH_PARSER		1
>  
>  #define	CONFIG_SYS_LONGHELP				/* undef to save memory	*/
> -#ifdef	CONFIG_SYS_HUSH_PARSER
> -#define	CONFIG_SYS_PROMPT		"$ "		/* Monitor Command Prompt */
> -#endif
>  #define	CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size */
>  #define	CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)	/* Print Buffer Size */
>  #define	CONFIG_SYS_MAXARGS		16		/* max number of command args */
> diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h
> index af7cc49..81b9ce4 100644
> --- a/include/configs/zmx25.h
> +++ b/include/configs/zmx25.h
> @@ -138,7 +138,6 @@
>  #define CONFIG_SYS_MEMTEST_START	(PHYS_SDRAM + (512*1024))
>  #define CONFIG_SYS_MEMTEST_END		(PHYS_SDRAM + PHYS_SDRAM_SIZE)
>  
> -#define CONFIG_SYS_PROMPT	"zmx25> "
>  #define CONFIG_SYS_CBSIZE	256
>  #define CONFIG_SYS_MAXARGS	16
>  #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE + \
> diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
> index 5526214..66ac9d3 100644
> --- a/include/configs/zynq-common.h
> +++ b/include/configs/zynq-common.h
> @@ -235,7 +235,6 @@
>  #define CONFIG_SYS_LOAD_ADDR		0 /* default? */
>  
>  /* Miscellaneous configurable options */
> -#define CONFIG_SYS_PROMPT		"zynq-uboot> "
>  #define CONFIG_SYS_HUSH_PARSER
>  
>  #define CONFIG_CMDLINE_EDITING
> 


-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

[U-Boot] [PATCH 01/12] arm: mx6: cm-fx6: map HDMI to IPU1 DI0 explicitly

[Stefano Babic]

On 23/07/2015 16:19, Nikita Kiryanov wrote:
> U-Boot does not explicitly assign the display to an IPU interface. Instead, it
> relies on the power-on default of DI0.
> 
> Since the kernel reassigns HDMI display to DI1, after a warm reset the HDMI
> display no longer works in U-Boot.
> 
> Fix this by explicitly assigning HDMI to IPU1 DI0 in U-Boot.
> 
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Igor Grinberg <grinberg@compulab.co.il>
> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
> ---
>  board/compulab/cm_fx6/cm_fx6.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
> index 7a1bbaf..b500f91 100644
> --- a/board/compulab/cm_fx6/cm_fx6.c
> +++ b/board/compulab/cm_fx6/cm_fx6.c
> @@ -83,6 +83,7 @@ size_t display_count = ARRAY_SIZE(displays);
>  static void cm_fx6_setup_display(void)
>  {
>  	struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
> +	struct iomuxc *const iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR;
>  	int reg;
>  
>  	enable_ipu_clock();
> @@ -90,6 +91,7 @@ static void cm_fx6_setup_display(void)
>  	reg = __raw_readl(&mxc_ccm->CCGR3);
>  	reg |= MXC_CCM_CCGR3_IPU1_IPU_DI0_MASK;
>  	writel(reg, &mxc_ccm->CCGR3);
> +	clrbits_le32(&iomuxc_regs->gpr[3], MXC_CCM_CCGR3_IPU1_IPU_DI0_MASK);
>  }
>  #else
>  static inline void cm_fx6_setup_display(void) {}
> 

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic


-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

[U-Boot] [PATCH 02/12] arm: mx6: cm-fx6: make it possible to not init display

[Stefano Babic]

On 23/07/2015 16:19, Nikita Kiryanov wrote:
> Implement a cm-fx6 specific board_video_skip() to provide the option to not
> initialize the display.
> 
> The new function does not init display if the environment variable "panel" is
> not defined, or if it is set to an unsupported value.
> 
> Collateral changes:
> - Don't use the global displays array (it's CONFIG_IMX_VIDEO_SKIP specific).
> - Don't use detect_hdmi(), since env controlled init makes it unnecessary.
> 
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Igor Grinberg <grinberg@compulab.co.il>
> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
> ---
>  board/compulab/cm_fx6/cm_fx6.c | 72 ++++++++++++++++++++++++++++--------------
>  include/configs/cm_fx6.h       |  1 -
>  2 files changed, 48 insertions(+), 25 deletions(-)
> 
> diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
> index b500f91..2fb8db5 100644
> --- a/board/compulab/cm_fx6/cm_fx6.c
> +++ b/board/compulab/cm_fx6/cm_fx6.c
> @@ -13,6 +13,7 @@
>  #include <fsl_esdhc.h>
>  #include <miiphy.h>
>  #include <netdev.h>
> +#include <errno.h>
>  #include <fdt_support.h>
>  #include <sata.h>
>  #include <splash.h>
> @@ -54,31 +55,27 @@ static void cm_fx6_enable_hdmi(struct display_info_t const *dev)
>  	imx_enable_hdmi_phy();
>  }
>  
> -struct display_info_t const displays[] = {
> -	{
> -		.bus	= -1,
> -		.addr	= 0,
> -		.pixfmt	= IPU_PIX_FMT_RGB24,
> -		.detect	= detect_hdmi,
> -		.enable	= cm_fx6_enable_hdmi,
> -		.mode	= {
> -			.name           = "HDMI",
> -			.refresh        = 60,
> -			.xres           = 1024,
> -			.yres           = 768,
> -			.pixclock       = 40385,
> -			.left_margin    = 220,
> -			.right_margin   = 40,
> -			.upper_margin   = 21,
> -			.lower_margin   = 7,
> -			.hsync_len      = 60,
> -			.vsync_len      = 10,
> -			.sync           = FB_SYNC_EXT,
> -			.vmode          = FB_VMODE_NONINTERLACED,
> -		}
> -	},
> +static struct display_info_t preset_hdmi_1024X768 = {
> +	.bus	= -1,
> +	.addr	= 0,
> +	.pixfmt	= IPU_PIX_FMT_RGB24,
> +	.enable	= cm_fx6_enable_hdmi,
> +	.mode	= {
> +		.name           = "HDMI",
> +		.refresh        = 60,
> +		.xres           = 1024,
> +		.yres           = 768,
> +		.pixclock       = 40385,
> +		.left_margin    = 220,
> +		.right_margin   = 40,
> +		.upper_margin   = 21,
> +		.lower_margin   = 7,
> +		.hsync_len      = 60,
> +		.vsync_len      = 10,
> +		.sync           = FB_SYNC_EXT,
> +		.vmode          = FB_VMODE_NONINTERLACED,
> +	}
>  };
> -size_t display_count = ARRAY_SIZE(displays);
>  
>  static void cm_fx6_setup_display(void)
>  {
> @@ -93,6 +90,33 @@ static void cm_fx6_setup_display(void)
>  	writel(reg, &mxc_ccm->CCGR3);
>  	clrbits_le32(&iomuxc_regs->gpr[3], MXC_CCM_CCGR3_IPU1_IPU_DI0_MASK);
>  }
> +
> +int board_video_skip(void)
> +{
> +	int ret;
> +	struct display_info_t *preset;
> +	char const *panel = getenv("panel");
> +
> +	if (!panel)
> +		return -ENOENT;
> +
> +	if (!strcmp(panel, "HDMI"))
> +		preset = &preset_hdmi_1024X768;
> +	else
> +		return -EINVAL;
> +
> +	ret = ipuv3_fb_init(&preset->mode, 0, preset->pixfmt);
> +	if (ret) {
> +		printf("Can't init display %s: %d\n", preset->mode.name, ret);
> +		return ret;
> +	}
> +
> +	preset->enable(preset);
> +	printf("Display: %s (%ux%u)\n", preset->mode.name, preset->mode.xres,
> +	       preset->mode.yres);
> +
> +	return 0;
> +}
>  #else
>  static inline void cm_fx6_setup_display(void) {}
>  #endif /* CONFIG_VIDEO_IPUV3 */
> diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
> index 231f4ba..f23ef8b 100644
> --- a/include/configs/cm_fx6.h
> +++ b/include/configs/cm_fx6.h
> @@ -258,7 +258,6 @@
>  #define CONFIG_VIDEO_IPUV3
>  #define CONFIG_IPUV3_CLK          260000000
>  #define CONFIG_IMX_HDMI
> -#define CONFIG_IMX_VIDEO_SKIP
>  #define CONFIG_CFB_CONSOLE
>  #define CONFIG_VGA_AS_SINGLE_DEVICE
>  #define CONFIG_SYS_CONSOLE_IS_IN_ENV
> 
Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic


-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

[U-Boot] [PATCH 03/12] arm: mx6: cm-fx6: add support for displaytype env var

[Stefano Babic]

On 23/07/2015 16:19, Nikita Kiryanov wrote:
> Add support for selecting display preset using the environment variable
> "displaytype". This is a preparation for future merging of compulab
> omap3_display.c display selection code with the cm-fx6 display selection code.
> 
> The "panel" environment variable is retained for backwards compatibility.
> 
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Igor Grinberg <grinberg@compulab.co.il>
> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
> ---
>  board/compulab/cm_fx6/cm_fx6.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
> index 2fb8db5..3e518c1 100644
> --- a/board/compulab/cm_fx6/cm_fx6.c
> +++ b/board/compulab/cm_fx6/cm_fx6.c
> @@ -95,7 +95,10 @@ int board_video_skip(void)
>  {
>  	int ret;
>  	struct display_info_t *preset;
> -	char const *panel = getenv("panel");
> +	char const *panel = getenv("displaytype");
> +
> +	if (!panel) /* Also accept panel for backward compatibility */
> +		panel = getenv("panel");
>  
>  	if (!panel)
>  		return -ENOENT;
> 

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

[U-Boot] [PATCH 04/12] arm: mx6: cm-fx6: setup hdmi only on hdmi enable

[Stefano Babic]

On 23/07/2015 16:19, Nikita Kiryanov wrote:
> Refactor display code to only setup hdmi if do_enable_hdmi() is invoked.
> 
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Igor Grinberg <grinberg@compulab.co.il>
> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
> ---
>  board/compulab/cm_fx6/cm_fx6.c | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
> index 3e518c1..e85c8ab 100644
> --- a/board/compulab/cm_fx6/cm_fx6.c
> +++ b/board/compulab/cm_fx6/cm_fx6.c
> @@ -52,6 +52,9 @@ int splash_screen_prepare(void)
>  #ifdef CONFIG_IMX_HDMI
>  static void cm_fx6_enable_hdmi(struct display_info_t const *dev)
>  {
> +	struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
> +	imx_setup_hdmi();
> +	setbits_le32(&mxc_ccm->CCGR3, MXC_CCM_CCGR3_IPU1_IPU_DI0_MASK);
>  	imx_enable_hdmi_phy();
>  }
>  
> @@ -79,15 +82,9 @@ static struct display_info_t preset_hdmi_1024X768 = {
>  
>  static void cm_fx6_setup_display(void)
>  {
> -	struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
>  	struct iomuxc *const iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR;
> -	int reg;
>  
>  	enable_ipu_clock();
> -	imx_setup_hdmi();
> -	reg = __raw_readl(&mxc_ccm->CCGR3);
> -	reg |= MXC_CCM_CCGR3_IPU1_IPU_DI0_MASK;
> -	writel(reg, &mxc_ccm->CCGR3);
>  	clrbits_le32(&iomuxc_regs->gpr[3], MXC_CCM_CCGR3_IPU1_IPU_DI0_MASK);
>  }
>  
> 
Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic


-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

[U-Boot] [PATCH 05/12] arm: mx6: cm-fx6: move CMD configs to defconfig

[Stefano Babic]

On 23/07/2015 16:19, Nikita Kiryanov wrote:
> Move CONFIG_CMD_* options that can be selected in menuconfig to cm-fx6
> defconfig.
> 
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Igor Grinberg <grinberg@compulab.co.il>
> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
> ---
>  configs/cm_fx6_defconfig | 5 +++++
>  include/configs/cm_fx6.h | 3 ---
>  2 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
> index 6be5c17..25829db 100644
> --- a/configs/cm_fx6_defconfig
> +++ b/configs/cm_fx6_defconfig
> @@ -9,4 +9,9 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL"
>  # CONFIG_CMD_FLASH is not set
>  # CONFIG_CMD_FPGA is not set
>  # CONFIG_CMD_SETEXPR is not set
> +CONFIG_CMD_DHCP=y
> +CONFIG_CMD_PING=y
>  CONFIG_SPI_FLASH=y
> +CONFIG_CMD_SF=y
> +CONFIG_CMD_I2C=y
> +CONFIG_CMD_USB=y
> diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
> index f23ef8b..9b00c0d 100644
> --- a/include/configs/cm_fx6.h
> +++ b/include/configs/cm_fx6.h
> @@ -50,7 +50,6 @@
>  					sizeof(CONFIG_SYS_PROMPT) + 16)
>  
>  /* SPI flash */
> -#define CONFIG_CMD_SF
>  #define CONFIG_SF_DEFAULT_BUS		0
>  #define CONFIG_SF_DEFAULT_CS		0
>  #define CONFIG_SF_DEFAULT_SPEED		25000000
> @@ -199,7 +198,6 @@
>  #define CONFIG_NET_RETRY_COUNT		5
>  
>  /* USB */
> -#define CONFIG_CMD_USB
>  #define CONFIG_USB_EHCI
>  #define CONFIG_USB_EHCI_MX6
>  #define CONFIG_USB_STORAGE
> @@ -212,7 +210,6 @@
>  #define CONFIG_SYS_STDIO_DEREGISTER
>  
>  /* I2C */
> -#define CONFIG_CMD_I2C
>  #define CONFIG_SYS_I2C
>  #define CONFIG_SYS_I2C_MXC
>  #define CONFIG_SYS_I2C_MXC_I2C3		/* enable I2C bus 3 */
> 

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

[U-Boot] [PATCH 06/12] arm: mx6: cm-fx6: move cm-fx6 target under ARCH_MX6

[Stefano Babic]

On 23/07/2015 16:19, Nikita Kiryanov wrote:
> cm-fx6 is an MX6 based board, and the menuconfig hierarchy should
> reflect that. Make TARGET_CM_FX6 dependant on ARCH_MX6.
> 
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Igor Grinberg <grinberg@compulab.co.il>
> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
> ---
>  arch/arm/Kconfig               | 8 --------
>  arch/arm/cpu/armv7/mx6/Kconfig | 8 ++++++++
>  configs/cm_fx6_defconfig       | 1 +
>  3 files changed, 9 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 506463c..fc8c435 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -625,14 +625,6 @@ config RMOBILE
>  	bool "Renesas ARM SoCs"
>  	select CPU_V7
>  
> -config TARGET_CM_FX6
> -	bool "Support cm_fx6"
> -	select CPU_V7
> -	select SUPPORT_SPL
> -	select DM
> -	select DM_SERIAL
> -	select DM_GPIO
> -
>  config ARCH_SOCFPGA
>  	bool "Altera SOCFPGA family"
>  	select CPU_V7
> diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig
> index 10908c4..2c18bcd 100644
> --- a/arch/arm/cpu/armv7/mx6/Kconfig
> +++ b/arch/arm/cpu/armv7/mx6/Kconfig
> @@ -29,6 +29,14 @@ choice
>  	prompt "MX6 board select"
>  	optional
>  
> +config TARGET_CM_FX6
> +	bool "Support CM-FX6"
> +	select CPU_V7
> +	select SUPPORT_SPL
> +	select DM
> +	select DM_SERIAL
> +	select DM_GPIO
> +
>  config TARGET_SECOMX6
>  	bool "Support secomx6 boards"
>  	select CPU_V7
> diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
> index 25829db..7ad5c21 100644
> --- a/configs/cm_fx6_defconfig
> +++ b/configs/cm_fx6_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_ARM=y
> +CONFIG_ARCH_MX6=y
>  CONFIG_TARGET_CM_FX6=y
>  CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL"
> 

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

[U-Boot] [PATCH 07/12] arm: mx6: kconfig: don't select CPU_V7 per board

[Stefano Babic]

On 23/07/2015 16:19, Nikita Kiryanov wrote:
> CPU_V7 is already selected by ARCH_MX6, so no point in selecting it again
> by boards that depend on ARCH_MX6.
> 
> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Igor Grinberg <grinberg@compulab.co.il>
> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
> ---
>  arch/arm/cpu/armv7/mx6/Kconfig | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig
> index 2c18bcd..68b46c1 100644
> --- a/arch/arm/cpu/armv7/mx6/Kconfig
> +++ b/arch/arm/cpu/armv7/mx6/Kconfig
> @@ -31,7 +31,6 @@ choice
>  
>  config TARGET_CM_FX6
>  	bool "Support CM-FX6"
> -	select CPU_V7
>  	select SUPPORT_SPL
>  	select DM
>  	select DM_SERIAL
> @@ -39,11 +38,9 @@ config TARGET_CM_FX6
>  
>  config TARGET_SECOMX6
>  	bool "Support secomx6 boards"
> -	select CPU_V7
>  
>  config TARGET_TQMA6
>  	bool "TQ Systems TQMa6 board"
> -	select CPU_V7
>  
>  endchoice
>  
> 

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

[U-Boot] [PATCH 08/12] arm: mx6: usb: kconfig: add USB_EHCI_MX6 kconfig option

[Stefano Babic]

On 23/07/2015 16:19, Nikita Kiryanov wrote:
> Add USB_EHCI_MX6 option to menuconfig and use it when migrating cm-fx6 usb
> config to defconfig.
> 
> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> Cc: Marek Vasut <marex@denx.de>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Igor Grinberg <grinberg@compulab.co.il>
> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
> ---
>  configs/cm_fx6_defconfig | 4 ++++
>  drivers/usb/host/Kconfig | 7 +++++++
>  include/configs/cm_fx6.h | 3 ---
>  3 files changed, 11 insertions(+), 3 deletions(-)
> 
> diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
> index 7ad5c21..07a84bb 100644
> --- a/configs/cm_fx6_defconfig
> +++ b/configs/cm_fx6_defconfig
> @@ -15,4 +15,8 @@ CONFIG_CMD_PING=y
>  CONFIG_SPI_FLASH=y
>  CONFIG_CMD_SF=y
>  CONFIG_CMD_I2C=y
> +CONFIG_USB=y
>  CONFIG_CMD_USB=y
> +CONFIG_USB_EHCI_HCD=y
> +CONFIG_USB_EHCI_MX6=y
> +CONFIG_USB_STORAGE=y
> diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
> index 8705c7c..b30b43d 100644
> --- a/drivers/usb/host/Kconfig
> +++ b/drivers/usb/host/Kconfig
> @@ -52,6 +52,13 @@ config USB_EHCI
>  
>  if USB_EHCI_HCD
>  
> +config USB_EHCI_MX6
> +	bool "Support for i.MX6 on-chip EHCI USB controller"
> +	depends on ARCH_MX6
> +	default y
> +	---help---
> +	  Enables support for the on-chip EHCI controller on i.MX6 SoCs.
> +
>  config USB_EHCI_UNIPHIER
>  	bool "Support for UniPhier on-chip EHCI USB controller"
>  	depends on ARCH_UNIPHIER && OF_CONTROL
> diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
> index 9b00c0d..9f69322 100644
> --- a/include/configs/cm_fx6.h
> +++ b/include/configs/cm_fx6.h
> @@ -198,9 +198,6 @@
>  #define CONFIG_NET_RETRY_COUNT		5
>  
>  /* USB */
> -#define CONFIG_USB_EHCI
> -#define CONFIG_USB_EHCI_MX6
> -#define CONFIG_USB_STORAGE
>  #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
>  #define CONFIG_MXC_USB_FLAGS		0
>  #define CONFIG_USB_MAX_CONTROLLER_COUNT	2
> 
Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic


-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

[U-Boot] [PATCH 09/12] usb: kconfig: usb keyboard kconfig

[Stefano Babic]

On 23/07/2015 16:19, Nikita Kiryanov wrote:
> Add Kconfig options for USB keyboard and use them for cm-fx6.
> 
> Cc: Marek Vasut <marex@denx.de>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Igor Grinberg <grinberg@compulab.co.il>
> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
> ---
>  configs/cm_fx6_defconfig |  2 ++
>  drivers/usb/Kconfig      | 27 +++++++++++++++++++++++++++
>  include/configs/cm_fx6.h |  2 --
>  3 files changed, 29 insertions(+), 2 deletions(-)
> 
> diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
> index 07a84bb..f0fd48c 100644
> --- a/configs/cm_fx6_defconfig
> +++ b/configs/cm_fx6_defconfig
> @@ -20,3 +20,5 @@ CONFIG_CMD_USB=y
>  CONFIG_USB_EHCI_HCD=y
>  CONFIG_USB_EHCI_MX6=y
>  CONFIG_USB_STORAGE=y
> +CONFIG_USB_KEYBOARD=y
> +CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
> diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
> index 637ef3d..04289f2 100644
> --- a/drivers/usb/Kconfig
> +++ b/drivers/usb/Kconfig
> @@ -59,4 +59,31 @@ config USB_STORAGE
>  	  Say Y here if you want to connect USB mass storage devices to your
>  	  board's USB port.
>  
> +config USB_KEYBOARD
> +	bool "USB Keyboard support"
> +	---help---
> +	  Say Y here if you want to use a USB keyboard for U-Boot command line
> +	  input.
> +
> +if USB_KEYBOARD
> +
> +choice
> +	prompt "USB keyboard polling"
> +	optional
> +	---help---
> +	  Enable a polling mechanism for USB keyboard.
> +
> +	config SYS_USB_EVENT_POLL
> +		bool "Interrupt polling"
> +
> +	config SYS_USB_EVENT_POLL_VIA_INT_QUEUE
> +		bool "Poll via interrupt queue"
> +
> +	config SYS_USB_EVENT_POLL_VIA_CONTROL_EP
> +		bool "Poll via control EP"
> +
> +endchoice
> +
> +endif
> +
>  endif
> diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
> index 9f69322..059004c 100644
> --- a/include/configs/cm_fx6.h
> +++ b/include/configs/cm_fx6.h
> @@ -202,8 +202,6 @@
>  #define CONFIG_MXC_USB_FLAGS		0
>  #define CONFIG_USB_MAX_CONTROLLER_COUNT	2
>  #define CONFIG_EHCI_HCD_INIT_AFTER_RESET	/* For OTG port */
> -#define CONFIG_USB_KEYBOARD
> -#define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP
>  #define CONFIG_SYS_STDIO_DEREGISTER
>  
>  /* I2C */
> 

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

[U-Boot] [PATCH 11/12] sf: kconfig: add kconfig options for spi flashes

[Stefano Babic]

On 23/07/2015 16:19, Nikita Kiryanov wrote:
> Add kconfig options for various SPI flashes and use them in cm-fx6 defconfig.
> 
> Cc: Jagan Teki <jteki@openedev.com>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Igor Grinberg <grinberg@compulab.co.il>
> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
> ---
>  configs/cm_fx6_defconfig |  8 ++++++++
>  drivers/mtd/spi/Kconfig  | 44 ++++++++++++++++++++++++++++++++++++++++++++
>  include/configs/cm_fx6.h |  8 --------
>  3 files changed, 52 insertions(+), 8 deletions(-)
> 
> diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
> index f0fd48c..2aba359 100644
> --- a/configs/cm_fx6_defconfig
> +++ b/configs/cm_fx6_defconfig
> @@ -13,6 +13,14 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL"
>  CONFIG_CMD_DHCP=y
>  CONFIG_CMD_PING=y
>  CONFIG_SPI_FLASH=y
> +CONFIG_SPI_FLASH_ATMEL=y
> +CONFIG_SPI_FLASH_EON=y
> +CONFIG_SPI_FLASH_GIGADEVICE=y
> +CONFIG_SPI_FLASH_MACRONIX=y
> +CONFIG_SPI_FLASH_SPANSION=y
> +CONFIG_SPI_FLASH_STMICRO=y
> +CONFIG_SPI_FLASH_SST=y
> +CONFIG_SPI_FLASH_WINBOND=y
>  CONFIG_CMD_SF=y
>  CONFIG_CMD_I2C=y
>  CONFIG_USB=y
> diff --git a/drivers/mtd/spi/Kconfig b/drivers/mtd/spi/Kconfig
> index 4f0c040..8b730ff 100644
> --- a/drivers/mtd/spi/Kconfig
> +++ b/drivers/mtd/spi/Kconfig
> @@ -42,6 +42,50 @@ config SPI_FLASH_BAR
>  	  Bank/Extended address registers are used to access the flash
>  	  which has size > 16MiB in 3-byte addressing.
>  
> +if SPI_FLASH
> +
> +config SPI_FLASH_ATMEL
> +	bool "Atmel SPI flash support"
> +	help
> +	  Add support for various Atmel SPI flash chips (AT45xxx and AT25xxx)
> +
> +config SPI_FLASH_EON
> +	bool "EON SPI flash support"
> +	help
> +	  Add support for various EON SPI flash chips (EN25xxx)
> +
> +config SPI_FLASH_GIGADEVICE
> +	bool "GigaDevice SPI flash support"
> +	help
> +	  Add support for various GigaDevice SPI flash chips (GD25xxx)
> +
> +config SPI_FLASH_MACRONIX
> +	bool "Macronix SPI flash support"
> +	help
> +	  Add support for various Macronix SPI flash chips (MX25Lxxx)
> +
> +config SPI_FLASH_SPANSION
> +	bool "Spansion SPI flash support"
> +	help
> +	  Add support for various Spansion SPI flash chips (S25FLxxx)
> +
> +config SPI_FLASH_STMICRO
> +	bool "STMicro SPI flash support"
> +	help
> +	  Add support for various STMicro SPI flash chips (M25Pxxx and N25Qxxx)
> +
> +config SPI_FLASH_SST
> +	bool "SST SPI flash support"
> +	help
> +	  Add support for various SST SPI flash chips (SST25xxx)
> +
> +config SPI_FLASH_WINBOND
> +	bool "Winbond SPI flash support"
> +	help
> +	  Add support for various Winbond SPI flash chips (W25xxx)
> +
> +endif
> +
>  config SPI_FLASH_DATAFLASH
>  	bool "AT45xxx DataFlash support"
>  	depends on SPI_FLASH && DM_SPI_FLASH
> diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
> index 059004c..bbd9f38 100644
> --- a/include/configs/cm_fx6.h
> +++ b/include/configs/cm_fx6.h
> @@ -162,14 +162,6 @@
>  /* SPI */
>  #define CONFIG_SPI
>  #define CONFIG_MXC_SPI
> -#define CONFIG_SPI_FLASH_ATMEL
> -#define CONFIG_SPI_FLASH_EON
> -#define CONFIG_SPI_FLASH_GIGADEVICE
> -#define CONFIG_SPI_FLASH_MACRONIX
> -#define CONFIG_SPI_FLASH_SPANSION
> -#define CONFIG_SPI_FLASH_STMICRO
> -#define CONFIG_SPI_FLASH_SST
> -#define CONFIG_SPI_FLASH_WINBOND
>  
>  /* NAND */
>  #ifndef CONFIG_SPL_BUILD
> 

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

[U-Boot] [PATCH V2 12/12] kconfig: add config option for shell prompt

[Tom Rini]

On Sun, Aug 02, 2015 at 10:53:04AM +0200, Stefano Babic wrote:

> Hi Tom,
> 
> 
> this patch is across architectures - currently it is assigned to me. Do
> you prefer I apply it as last of the series to u-boot-imx before my PR
> or you want to apply it directly to mainline ?

It looks like we can just do this as a stand-alone a bit later on (since
it needs a v3) if you want ot grab 1->11 now.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150802/f9647900/attachment.sig>