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 @@
 #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 @@
 #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 bde71fb..242c239 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -873,7 +873,6 @@
 #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 141fc99..0f256d8 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 4296c6b..94fcdbd 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 0c7573a..6f05d87 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 a0b193e..654b778 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 30f31a9..7049091 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -218,11 +218,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 620ca02..bcaea95 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 cf13563..43fbdd3 100644
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -140,7 +140,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 8784c4e..437a745 100644
--- a/include/configs/arndale.h
+++ b/include/configs/arndale.h
@@ -25,7 +25,6 @@
 #define CONFIG_EXYNOS_SPL
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_PROMPT		"ARNDALE # "
 #define CONFIG_DEFAULT_CONSOLE		"console=ttySAC2,115200n8\0"
 
 #define CONFIG_IDENT_STRING		" for ARNDALE"
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 adc578a..1790f60 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 3400dd4..578c4ab 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 93c5f48..ce6b158 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/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 6885ae1..281d614 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 cf08414..33b22a7 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 @@
 
 #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 6d73f9d..06c51c0 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 1e94c34..fbfebcf 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 ab8d293..f0da913 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 b82140e..7ac3224 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 30aecca..2251f59 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 e873fa4..72296a0 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 9bdd2d6..bbc801b 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 @@
 /* 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 35e9a15..15d8150 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 410cf6874..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 2e16ca7..98205ad 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 7c90812..1c0d96e 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -226,7 +226,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 @@
  */
 #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 26aa8ca..c80e915 100644
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -36,11 +36,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 4d04f54..af69ad9 100644
--- a/include/configs/integratorcp.h
+++ b/include/configs/integratorcp.h
@@ -41,8 +41,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 def0ab4..e87a010 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/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 @@
 
 /* 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 0b26404..0f70c47 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -270,11 +270,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 b90de14..92e5429 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/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 436b022..6ae736f 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -151,7 +151,6 @@
 	   "else run netboot; fi"
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_PROMPT		"=> "
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 
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 7ec9965..915df52 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -396,7 +396,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		"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 eac24d3..4b693e8 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 0deff46..3c70158 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -12,7 +12,6 @@
 #include <configs/exynos5-common.h>
 
 #undef CONFIG_ENV_IS_IN_SPI_FLASH
-#define CONFIG_SYS_PROMPT		"ODROID-XU3 # "
 #define CONFIG_IDENT_STRING		" for ODROID-XU3"
 
 #define CONFIG_BOARD_COMMON
diff --git a/include/configs/odroid_xu3.h.rej b/include/configs/odroid_xu3.h.rej
new file mode 100644
index 0000000..a1c2964
--- /dev/null
+++ b/include/configs/odroid_xu3.h.rej
@@ -0,0 +1,10 @@
+--- include/configs/odroid_xu3.h
++++ 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 314e507..7e7f6f2 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 7457324..e09e617 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 19543a1..9e2cf73 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 cbaf692..53ff61d 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 26adfba..4e93705 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 @@
  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 0f5e9fe..6c42aaa 100644
--- a/include/configs/peach-pi.h
+++ b/include/configs/peach-pi.h
@@ -29,7 +29,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"
 
 /* Display */
diff --git a/include/configs/peach-pit.h b/include/configs/peach-pit.h
index f259434..6c68dd2 100644
--- a/include/configs/peach-pit.h
+++ b/include/configs/peach-pit.h
@@ -29,7 +29,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"
 
 /* DRAM Memory Banks */
diff --git a/include/configs/pepper.h b/include/configs/pepper.h
index 0bdcf22..1bc8c4b 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 dd638c4..8830a10 100644
--- a/include/configs/rpi-common.h
+++ b/include/configs/rpi-common.h
@@ -115,7 +115,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 235bba5..aff264b 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 ceac5e0..bcc8dcb 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/smartweb.h b/include/configs/smartweb.h
index e5aec33..d696d4b 100644
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -154,7 +154,6 @@
 /* General Boot Parameter */
 #define CONFIG_BOOTDELAY		3
 #define CONFIG_BOOTCOMMAND		"run flashboot"
-#define CONFIG_SYS_PROMPT		"U-Boot> "
 #define CONFIG_SYS_CBSIZE		512
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_PBSIZE \
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 82d41cc..f66bb12 100644
--- a/include/configs/smdk5250.h
+++ b/include/configs/smdk5250.h
@@ -17,7 +17,6 @@
 
 #define CONFIG_BOARD_COMMON
 
-#define CONFIG_SYS_PROMPT		"SMDK5250 # "
 #define CONFIG_IDENT_STRING		" for SMDK5250"
 #define CONFIG_DEFAULT_CONSOLE		"console=ttySAC1,115200n8\0"
 
diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h
index 623efa8..9cf886c 100644
--- a/include/configs/smdk5420.h
+++ b/include/configs/smdk5420.h
@@ -27,7 +27,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/sniper.h b/include/configs/sniper.h
index b40c4c0..a0ee5bd 100644
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -184,7 +184,6 @@
 
 #define CONFIG_AUTO_COMPLETE
 
-#define CONFIG_SYS_PROMPT	"Sniper # "
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_HUSH_PARSER
 
diff --git a/include/configs/snow.h b/include/configs/snow.h
index bf3377c..1d8d8da 100644
--- a/include/configs/snow.h
+++ b/include/configs/snow.h
@@ -15,7 +15,6 @@
 
 #define CONFIG_BOARD_COMMON
 
-#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/spring.h b/include/configs/spring.h
index a692dfd..8940123 100644
--- a/include/configs/spring.h
+++ b/include/configs/spring.h
@@ -13,7 +13,6 @@
 
 #define CONFIG_BOARD_COMMON
 
-#define CONFIG_SYS_PROMPT		"spring # "
 #define CONFIG_IDENT_STRING		" for spring"
 #define CONFIG_DEFAULT_CONSOLE		"console=ttySAC1,115200n8\0"
 
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 1ac3db6..19d9cf9 100644
--- a/include/configs/stm32f429-discovery.h
+++ b/include/configs/stm32f429-discovery.h
@@ -100,7 +100,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 a2cbcf5..0ecb91b 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 3eacfa7..408895f 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 14985f8..66cb274 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 08345cc..3297424 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 ffe167e..145f635 100644
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -88,10 +88,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 6dc5ebd..18fca02 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -115,7 +115,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 8b1189e..0fc8cf7 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 bed8ffd..98f6ae9 100644
--- a/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@ -281,7 +281,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 68853b6..01b7993 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -131,7 +131,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 @@
 #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 98bebd0..cc72c86 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