All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH v2 1/2] CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there
@ 2012-04-26 22:46 Tom Rini
  2012-04-26 22:46 ` [U-Boot] [PATCH v2 2/2] hush.c: Move default CONFIG_SYS_PROMPT_HUSH_PS2 to hush.c Tom Rini
                   ` (5 more replies)
  0 siblings, 6 replies; 25+ messages in thread
From: Tom Rini @ 2012-04-26 22:46 UTC (permalink / raw)
  To: u-boot

We provide a default table of { 9600, 19200, 38400, 57600, 115200 }
in <config_fallbacks.h> which mkconfig places after <configs/...h> in
the generated config file.  This is used when a board has not set its
own table.  A number of boards set values below 9600 but it is my belief
that this was done for completeness rather than as a requirement so they
have opted to the new default table.

Signed-off-by: Tom Rini <trini@ti.com>

---
Changes in v2:
- Create, use <config_fallbacks.h> rather than mkconfig directly for
  this table (per Mike Frysinger).
---
 include/config_cmd_defaults.h              |    1 -
 include/config_fallbacks.h                 |   16 ++++++++++++++++
 include/configs/AP1000.h                   |    1 -
 include/configs/APC405.h                   |    1 -
 include/configs/AR405.h                    |    1 -
 include/configs/ASH405.h                   |    1 -
 include/configs/Alaska8220.h               |    1 -
 include/configs/BC3450.h                   |    1 -
 include/configs/CANBT.h                    |    1 -
 include/configs/CATcenter.h                |    1 -
 include/configs/CMS700.h                   |    1 -
 include/configs/CPCI2DP.h                  |    1 -
 include/configs/CPCI405.h                  |    1 -
 include/configs/CPCI4052.h                 |    1 -
 include/configs/CPCI405AB.h                |    1 -
 include/configs/CPCI405DT.h                |    1 -
 include/configs/CPCI750.h                  |    1 -
 include/configs/CPCIISER4.h                |    1 -
 include/configs/CRAYL1.h                   |    1 -
 include/configs/DB64360.h                  |    1 -
 include/configs/DB64460.h                  |    1 -
 include/configs/DP405.h                    |    1 -
 include/configs/DU405.h                    |    1 -
 include/configs/EVB64260.h                 |    1 -
 include/configs/EXBITGEN.h                 |    1 -
 include/configs/G2000.h                    |    1 -
 include/configs/HH405.h                    |    1 -
 include/configs/HUB405.h                   |    1 -
 include/configs/IceCube.h                  |    1 -
 include/configs/JSE.h                      |    1 -
 include/configs/MIP405.h                   |    1 -
 include/configs/ML2.h                      |    1 -
 include/configs/MPC8260ADS.h               |    1 -
 include/configs/MPC8266ADS.h               |    1 -
 include/configs/MVBC_P.h                   |    1 -
 include/configs/MVSMR.h                    |    1 -
 include/configs/MigoR.h                    |    1 -
 include/configs/OCRTC.h                    |    1 -
 include/configs/ORSG.h                     |    1 -
 include/configs/P3G4.h                     |    1 -
 include/configs/PATI.h                     |    1 -
 include/configs/PCI405.h                   |    1 -
 include/configs/PCI5441.h                  |    1 -
 include/configs/PIP405.h                   |    1 -
 include/configs/PK1C20.h                   |    1 -
 include/configs/PLU405.h                   |    1 -
 include/configs/PM520.h                    |    1 -
 include/configs/PPChameleonEVB.h           |    1 -
 include/configs/Rattler.h                  |    1 -
 include/configs/TB5200.h                   |    1 -
 include/configs/TOP5200.h                  |    1 -
 include/configs/TOP860.h                   |    1 -
 include/configs/TQM5200.h                  |    1 -
 include/configs/Total5200.h                |    1 -
 include/configs/VOH405.h                   |    1 -
 include/configs/VOM405.h                   |    1 -
 include/configs/W7OLMC.h                   |    1 -
 include/configs/W7OLMG.h                   |    1 -
 include/configs/WUH405.h                   |    1 -
 include/configs/Yukon8220.h                |    1 -
 include/configs/ZPC1900.h                  |    1 -
 include/configs/ZUMA.h                     |    1 -
 include/configs/a4m072.h                   |    1 -
 include/configs/actux1.h                   |    1 -
 include/configs/actux2.h                   |    1 -
 include/configs/actux3.h                   |    1 -
 include/configs/actux4.h                   |    1 -
 include/configs/aev.h                      |    1 -
 include/configs/amcc-common.h              |    1 -
 include/configs/ap325rxa.h                 |    1 -
 include/configs/canmb.h                    |    1 -
 include/configs/cm5200.h                   |    1 -
 include/configs/cmi_mpc5xx.h               |    1 -
 include/configs/cogent_mpc8260.h           |    1 -
 include/configs/cogent_mpc8xx.h            |    1 -
 include/configs/cpci5200.h                 |    1 -
 include/configs/csb272.h                   |    1 -
 include/configs/csb472.h                   |    1 -
 include/configs/digsy_mtc.h                |    1 -
 include/configs/dvlhost.h                  |    1 -
 include/configs/ecovec.h                   |    1 -
 include/configs/edminiv2.h                 |    1 -
 include/configs/ep8248.h                   |    1 -
 include/configs/ep82xxm.h                  |    1 -
 include/configs/espt.h                     |    1 -
 include/configs/galaxy5200.h               |    1 -
 include/configs/gr_cpci_ax2000.h           |    1 -
 include/configs/gr_ep2s60.h                |    1 -
 include/configs/gr_xc3s_1500.h             |    1 -
 include/configs/grsim.h                    |    1 -
 include/configs/grsim_leon2.h              |    1 -
 include/configs/gth2.h                     |    1 -
 include/configs/hmi1001.h                  |    1 -
 include/configs/hymod.h                    |    1 -
 include/configs/inka4x0.h                  |    1 -
 include/configs/ipek01.h                   |    1 -
 include/configs/jupiter.h                  |    1 -
 include/configs/km/keymile-common.h        |    1 -
 include/configs/lwmon.h                    |    1 -
 include/configs/manroland/mpc5200-common.h |    1 -
 include/configs/mcc200.h                   |    1 -
 include/configs/mecp5200.h                 |    1 -
 include/configs/microblaze-generic.h       |    1 -
 include/configs/motionpro.h                |    1 -
 include/configs/mpr2.h                     |    1 -
 include/configs/ms7720se.h                 |    1 -
 include/configs/ms7722se.h                 |    1 -
 include/configs/muas3001.h                 |    1 -
 include/configs/munices.h                  |    1 -
 include/configs/mv-common.h                |    1 -
 include/configs/nios2-generic.h            |    1 -
 include/configs/o2dnt.h                    |    1 -
 include/configs/omap3_zoom2.h              |    1 -
 include/configs/openrisc-generic.h         |    1 -
 include/configs/p3mx.h                     |    1 -
 include/configs/p3p440.h                   |    1 -
 include/configs/pcm030.h                   |    1 -
 include/configs/pf5200.h                   |    1 -
 include/configs/quad100hd.h                |    1 -
 include/configs/rsk7203.h                  |    1 -
 include/configs/rsk7264.h                  |    1 -
 include/configs/sbc405.h                   |    1 -
 include/configs/sc3.h                      |    1 -
 include/configs/sh7757lcr.h                |    1 -
 include/configs/sh7763rdp.h                |    1 -
 include/configs/sh7785lcr.h                |    1 -
 include/configs/sorcery.h                  |    1 -
 include/configs/spieval.h                  |    1 -
 include/configs/v38b.h                     |    1 -
 include/configs/xilinx-ppc.h               |    2 --
 include/configs/xpedite1000.h              |    1 -
 include/configs/zeus.h                     |    1 -
 mkconfig                                   |    1 +
 133 files changed, 17 insertions(+), 132 deletions(-)
 create mode 100644 include/config_fallbacks.h

diff --git a/include/config_cmd_defaults.h b/include/config_cmd_defaults.h
index e11205d..a55b268 100644
--- a/include/config_cmd_defaults.h
+++ b/include/config_cmd_defaults.h
@@ -14,6 +14,5 @@
 #define CONFIG_CMD_EXPORTENV 1
 #define CONFIG_CMD_GO 1
 #define CONFIG_CMD_IMPORTENV 1
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #endif
diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h
new file mode 100644
index 0000000..430890c
--- /dev/null
+++ b/include/config_fallbacks.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2012 Texas Instruments
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License Version 2. This file is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#ifndef __CONFIG_FALLBACKS_H
+#define __CONFIG_FALLBACKS_H
+
+#ifndef CONFIG_SYS_BAUDRATE_TABLE
+#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
+#endif
+
+#endif	/* __CONFIG_FALLBACKS_H */
diff --git a/include/configs/AP1000.h b/include/configs/AP1000.h
index b598371..fd074fb 100644
--- a/include/configs/AP1000.h
+++ b/include/configs/AP1000.h
@@ -142,7 +142,6 @@
 #define CONFIG_SYS_INIT_CHAN2		0
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE  \
     {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
diff --git a/include/configs/APC405.h b/include/configs/APC405.h
index 88fba5c..9a65cbc 100644
--- a/include/configs/APC405.h
+++ b/include/configs/APC405.h
@@ -186,7 +186,6 @@
 #define CONFIG_SYS_EXT_SERIAL_CLOCK    14745600 /* use external serial clock   */
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE      \
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/AR405.h b/include/configs/AR405.h
index 50796af..9994476 100644
--- a/include/configs/AR405.h
+++ b/include/configs/AR405.h
@@ -137,7 +137,6 @@
 #define CONFIG_SYS_EXT_SERIAL_CLOCK	14745600 /* use external serial clock	*/
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/ASH405.h b/include/configs/ASH405.h
index 0f79f1e..7f48499 100644
--- a/include/configs/ASH405.h
+++ b/include/configs/ASH405.h
@@ -135,7 +135,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/Alaska8220.h b/include/configs/Alaska8220.h
index 015027d..39c29ec 100644
--- a/include/configs/Alaska8220.h
+++ b/include/configs/Alaska8220.h
@@ -62,7 +62,6 @@
 
 #define CONFIG_BAUDRATE		115200	    /* ... at 115200 bps */
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_TIMESTAMP			/* Print image info with timestamp */
diff --git a/include/configs/BC3450.h b/include/configs/BC3450.h
index 73925cd..8a73a9a 100644
--- a/include/configs/BC3450.h
+++ b/include/configs/BC3450.h
@@ -75,7 +75,6 @@
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1		*/
 #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps		*/
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
diff --git a/include/configs/CANBT.h b/include/configs/CANBT.h
index 70b2215..be9238e 100644
--- a/include/configs/CANBT.h
+++ b/include/configs/CANBT.h
@@ -111,7 +111,6 @@
 #define CONFIG_SYS_EXT_SERIAL_CLOCK	14745600 /* use external serial clock	*/
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/CATcenter.h b/include/configs/CATcenter.h
index 4d6d56a..84e4e78 100644
--- a/include/configs/CATcenter.h
+++ b/include/configs/CATcenter.h
@@ -194,7 +194,6 @@
 #define CONFIG_SYS_BASE_BAUD		691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/CMS700.h b/include/configs/CMS700.h
index e73be59..63d838f 100644
--- a/include/configs/CMS700.h
+++ b/include/configs/CMS700.h
@@ -133,7 +133,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h
index 20e5113..afe8d6e 100644
--- a/include/configs/CPCI2DP.h
+++ b/include/configs/CPCI2DP.h
@@ -123,7 +123,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/CPCI405.h b/include/configs/CPCI405.h
index a024e2b..cf1d1b3 100644
--- a/include/configs/CPCI405.h
+++ b/include/configs/CPCI405.h
@@ -136,7 +136,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h
index 21b5d6f..d17458e 100644
--- a/include/configs/CPCI4052.h
+++ b/include/configs/CPCI4052.h
@@ -145,7 +145,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/CPCI405AB.h b/include/configs/CPCI405AB.h
index 856583c..a0d16d2 100644
--- a/include/configs/CPCI405AB.h
+++ b/include/configs/CPCI405AB.h
@@ -144,7 +144,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/CPCI405DT.h b/include/configs/CPCI405DT.h
index 4a7363f..98b8ef5 100644
--- a/include/configs/CPCI405DT.h
+++ b/include/configs/CPCI405DT.h
@@ -146,7 +146,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/CPCI750.h b/include/configs/CPCI750.h
index 3768934..a6af86c 100644
--- a/include/configs/CPCI750.h
+++ b/include/configs/CPCI750.h
@@ -239,7 +239,6 @@
 #define CONFIG_SYS_HZ			1000		/* decr freq: 1ms ticks */
 #define CONFIG_SYS_BUS_CLK		133000000	/* 133 MHz (CPU = 5*Bus = 666MHz)		*/
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_SYS_TCLK		133000000
diff --git a/include/configs/CPCIISER4.h b/include/configs/CPCIISER4.h
index 35c1801..35daed0 100644
--- a/include/configs/CPCIISER4.h
+++ b/include/configs/CPCIISER4.h
@@ -120,7 +120,6 @@
 #define CONFIG_SYS_EXT_SERIAL_CLOCK	1843200	 /* use external serial clock	*/
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/CRAYL1.h b/include/configs/CRAYL1.h
index 8fde1a3..4aaceb7 100644
--- a/include/configs/CRAYL1.h
+++ b/include/configs/CRAYL1.h
@@ -140,7 +140,6 @@
  * drives the system clock.
  */
 #define CONFIG_SYS_BASE_BAUD       403225
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE  \
     {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
diff --git a/include/configs/DB64360.h b/include/configs/DB64360.h
index 96b2ecf..c3f3a24 100644
--- a/include/configs/DB64360.h
+++ b/include/configs/DB64360.h
@@ -328,7 +328,6 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
 #define CONFIG_SYS_TCLK		133000000
 
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_SYS_750FX_HID0		0x8000c084
diff --git a/include/configs/DB64460.h b/include/configs/DB64460.h
index 0d77fcf..d48f092 100644
--- a/include/configs/DB64460.h
+++ b/include/configs/DB64460.h
@@ -266,7 +266,6 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
 #define CONFIG_SYS_TCLK		133000000
 
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_SYS_750FX_HID0		0x8000c084
diff --git a/include/configs/DP405.h b/include/configs/DP405.h
index 7432de1..f6e2652 100644
--- a/include/configs/DP405.h
+++ b/include/configs/DP405.h
@@ -110,7 +110,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/DU405.h b/include/configs/DU405.h
index 69868c6..24df85a 100644
--- a/include/configs/DU405.h
+++ b/include/configs/DU405.h
@@ -124,7 +124,6 @@
 #define CONFIG_SYS_EXT_SERIAL_CLOCK	11059200  /* use external serial clock	*/
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/EVB64260.h b/include/configs/EVB64260.h
index 3aec672..b905402 100644
--- a/include/configs/EVB64260.h
+++ b/include/configs/EVB64260.h
@@ -145,7 +145,6 @@
 #define	CONFIG_SYS_HZ			1000		/* decr freq: 1ms ticks	*/
 #define CONFIG_SYS_BUS_CLK		100000000	/* 100 MHz		*/
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #ifdef CONFIG_EVB64260_750CX
diff --git a/include/configs/EXBITGEN.h b/include/configs/EXBITGEN.h
index 2eeae6c..43c8842 100644
--- a/include/configs/EXBITGEN.h
+++ b/include/configs/EXBITGEN.h
@@ -125,7 +125,6 @@
 #define CONFIG_BAUDRATE		115200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE      \
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/G2000.h b/include/configs/G2000.h
index 88c368d..d64dd8d 100644
--- a/include/configs/G2000.h
+++ b/include/configs/G2000.h
@@ -162,7 +162,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/HH405.h b/include/configs/HH405.h
index 7cea807..4a41b5c 100644
--- a/include/configs/HH405.h
+++ b/include/configs/HH405.h
@@ -187,7 +187,6 @@
 #define CONFIG_SYS_BASE_BAUD       691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE      \
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/HUB405.h b/include/configs/HUB405.h
index d22434a..afb8273 100644
--- a/include/configs/HUB405.h
+++ b/include/configs/HUB405.h
@@ -129,7 +129,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h
index 93c36cc..135ef55 100644
--- a/include/configs/IceCube.h
+++ b/include/configs/IceCube.h
@@ -53,7 +53,6 @@
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1 */
 #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 
diff --git a/include/configs/JSE.h b/include/configs/JSE.h
index 46c2e07..ef652b2 100644
--- a/include/configs/JSE.h
+++ b/include/configs/JSE.h
@@ -205,7 +205,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE  \
     {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index f3f9d89..9961fb5 100644
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -189,7 +189,6 @@
 #define CONFIG_SYS_BASE_BAUD       916667
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/ML2.h b/include/configs/ML2.h
index 64cacff..4df9f4c 100644
--- a/include/configs/ML2.h
+++ b/include/configs/ML2.h
@@ -149,7 +149,6 @@
 #define CONFIG_SYS_INIT_CHAN2	 1
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE  \
     {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h
index fd6d8c4..e4ea178 100644
--- a/include/configs/MPC8260ADS.h
+++ b/include/configs/MPC8260ADS.h
@@ -305,7 +305,6 @@
 
 #define CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks */
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_SYS_FLASH_BASE		0xff800000
diff --git a/include/configs/MPC8266ADS.h b/include/configs/MPC8266ADS.h
index 767fa33..0474140 100644
--- a/include/configs/MPC8266ADS.h
+++ b/include/configs/MPC8266ADS.h
@@ -246,7 +246,6 @@
 
 #define CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks */
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_SYS_FLASH_BASE		0xFE000000
diff --git a/include/configs/MVBC_P.h b/include/configs/MVBC_P.h
index a63c575..ade4893 100644
--- a/include/configs/MVBC_P.h
+++ b/include/configs/MVBC_P.h
@@ -47,7 +47,6 @@
 
 #define CONFIG_PSC_CONSOLE	1
 #define CONFIG_BAUDRATE		115200
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200, 230400}
 
 #define CONFIG_PCI		1
diff --git a/include/configs/MVSMR.h b/include/configs/MVSMR.h
index 9457bd3..f94ad5c 100644
--- a/include/configs/MVSMR.h
+++ b/include/configs/MVSMR.h
@@ -48,7 +48,6 @@
 
 #define CONFIG_PSC_CONSOLE	1
 #define CONFIG_BAUDRATE		115200
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200,\
 						230400}
 
diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h
index 53af631..619a800 100644
--- a/include/configs/MigoR.h
+++ b/include/configs/MigoR.h
@@ -65,7 +65,6 @@
 #define CONFIG_SYS_PBSIZE		256		/* Buffer size for Console output */
 #define CONFIG_SYS_MAXARGS		16		/* max args accepted for monitor commands */
 #define CONFIG_SYS_BARGSIZE	512		/* Buffer size for Boot Arguments passed to kernel */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }	/* List of legal baudrate settings for this board */
 
 /* SCIF */
diff --git a/include/configs/OCRTC.h b/include/configs/OCRTC.h
index f761450..47110af 100644
--- a/include/configs/OCRTC.h
+++ b/include/configs/OCRTC.h
@@ -116,7 +116,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/ORSG.h b/include/configs/ORSG.h
index ab9b89a..9f754c2 100644
--- a/include/configs/ORSG.h
+++ b/include/configs/ORSG.h
@@ -114,7 +114,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/P3G4.h b/include/configs/P3G4.h
index 28baadd..f7ef643 100644
--- a/include/configs/P3G4.h
+++ b/include/configs/P3G4.h
@@ -171,7 +171,6 @@
 #define	CONFIG_SYS_HZ			1000		/* decr freq: 1ms ticks	*/
 #define CONFIG_SYS_BUS_CLK		133000000	/* 133 MHz		*/
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 
diff --git a/include/configs/PATI.h b/include/configs/PATI.h
index d43b401..bf39d00 100644
--- a/include/configs/PATI.h
+++ b/include/configs/PATI.h
@@ -111,7 +111,6 @@
 
 #define	CONFIG_SYS_HZ			1000		/* Decrementer freq: 1 ms ticks	*/
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 1250000 }
 
 
diff --git a/include/configs/PCI405.h b/include/configs/PCI405.h
index 0f1b264..6be5c25 100644
--- a/include/configs/PCI405.h
+++ b/include/configs/PCI405.h
@@ -122,7 +122,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/PCI5441.h b/include/configs/PCI5441.h
index 33ffb36..ae5bc2e 100644
--- a/include/configs/PCI5441.h
+++ b/include/configs/PCI5441.h
@@ -100,7 +100,6 @@
 
 #define CONFIG_SYS_NIOS_FIXEDBAUD	1		/* Baudrate is fixed	*/
 #define CONFIG_BAUDRATE		115200		/* Initial baudrate	*/
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{115200}	/* It's fixed ;-)	*/
 
 #define CONFIG_SYS_CONSOLE_INFO_QUIET	1		/* Suppress console info*/
diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index 9a93396..242aa31 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -182,7 +182,6 @@
 #define CONFIG_SYS_BASE_BAUD       691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/PK1C20.h b/include/configs/PK1C20.h
index f668d1d..3fe2b3e 100644
--- a/include/configs/PK1C20.h
+++ b/include/configs/PK1C20.h
@@ -102,7 +102,6 @@
 
 #define CONFIG_SYS_NIOS_FIXEDBAUD	1		/* Baudrate is fixed	*/
 #define CONFIG_BAUDRATE		115200		/* Initial baudrate	*/
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{115200}	/* It's fixed ;-)	*/
 
 #define CONFIG_SYS_CONSOLE_INFO_QUIET	1		/* Suppress console info*/
diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h
index 1692ed1..1cce57e 100644
--- a/include/configs/PLU405.h
+++ b/include/configs/PLU405.h
@@ -146,7 +146,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/PM520.h b/include/configs/PM520.h
index 7addabb..9b01e4f 100644
--- a/include/configs/PM520.h
+++ b/include/configs/PM520.h
@@ -46,7 +46,6 @@
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1 */
 #define CONFIG_BAUDRATE		9600	/* ... at 9600 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 
diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h
index 5fa5ac5..2d45618 100644
--- a/include/configs/PPChameleonEVB.h
+++ b/include/configs/PPChameleonEVB.h
@@ -203,7 +203,6 @@
 #define CONFIG_SYS_BASE_BAUD		691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/Rattler.h b/include/configs/Rattler.h
index 4cedf07..9ddf626 100644
--- a/include/configs/Rattler.h
+++ b/include/configs/Rattler.h
@@ -189,7 +189,6 @@
 
 #define CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks */
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_SYS_FLASH_BASE		0xFE000000
diff --git a/include/configs/TB5200.h b/include/configs/TB5200.h
index 96b562c..feaadf3 100644
--- a/include/configs/TB5200.h
+++ b/include/configs/TB5200.h
@@ -59,7 +59,6 @@
 #define CONFIG_SERIAL_MULTI	1	/* support multiple consoles */
 #define CONFIG_PSC_CONSOLE2	6	/* second console is on PSC6 */
 #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
diff --git a/include/configs/TOP5200.h b/include/configs/TOP5200.h
index e2e392c..2267d59 100644
--- a/include/configs/TOP5200.h
+++ b/include/configs/TOP5200.h
@@ -62,7 +62,6 @@
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1 */
 #define CONFIG_BAUDRATE		9600	/* ... at 9600 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 
diff --git a/include/configs/TOP860.h b/include/configs/TOP860.h
index 7136233..3a01292 100644
--- a/include/configs/TOP860.h
+++ b/include/configs/TOP860.h
@@ -198,7 +198,6 @@
 #define	I2C_TRISTATE	{ __I2C_DIR &= ~SDA; }
 #endif
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*-----------------------------------------------------------------------
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index f7f3736..6ea3faa 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -63,7 +63,6 @@
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1			*/
 #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps			*/
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 #define CONFIG_BOOTCOUNT_LIMIT	1
 
diff --git a/include/configs/Total5200.h b/include/configs/Total5200.h
index a1d51e9..16b2dac 100644
--- a/include/configs/Total5200.h
+++ b/include/configs/Total5200.h
@@ -63,7 +63,6 @@
  */
 #define CONFIG_PSC_CONSOLE	3	/* console is on PSC3 */
 #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
diff --git a/include/configs/VOH405.h b/include/configs/VOH405.h
index 621ea3f..5b8f41f 100644
--- a/include/configs/VOH405.h
+++ b/include/configs/VOH405.h
@@ -144,7 +144,6 @@
 #define CONFIG_SYS_BASE_BAUD       691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h
index 36840cc..2ca4ed0 100644
--- a/include/configs/VOM405.h
+++ b/include/configs/VOM405.h
@@ -131,7 +131,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/W7OLMC.h b/include/configs/W7OLMC.h
index 58cd064..1d97d3e 100644
--- a/include/configs/W7OLMC.h
+++ b/include/configs/W7OLMC.h
@@ -138,7 +138,6 @@
 
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{9600}
 
 #define CONFIG_SYS_LOAD_ADDR		0x100000	/* default load address		*/
diff --git a/include/configs/W7OLMG.h b/include/configs/W7OLMG.h
index 4676ce7..93caacc 100644
--- a/include/configs/W7OLMG.h
+++ b/include/configs/W7OLMG.h
@@ -146,7 +146,6 @@
 
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{9600}
 
 #define CONFIG_SYS_LOAD_ADDR		0x100000	/* default load address		*/
diff --git a/include/configs/WUH405.h b/include/configs/WUH405.h
index eeb4088..504ad96 100644
--- a/include/configs/WUH405.h
+++ b/include/configs/WUH405.h
@@ -133,7 +133,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/Yukon8220.h b/include/configs/Yukon8220.h
index 3baa02c..5f925b3 100644
--- a/include/configs/Yukon8220.h
+++ b/include/configs/Yukon8220.h
@@ -62,7 +62,6 @@
 
 #define CONFIG_BAUDRATE		115200	    /* ... at 115200 bps */
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_TIMESTAMP			/* Print image info with timestamp */
diff --git a/include/configs/ZPC1900.h b/include/configs/ZPC1900.h
index 924b694..4cda22f 100644
--- a/include/configs/ZPC1900.h
+++ b/include/configs/ZPC1900.h
@@ -173,7 +173,6 @@
 
 #define CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks */
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_SYS_SDRAM_BASE		0x00000000
diff --git a/include/configs/ZUMA.h b/include/configs/ZUMA.h
index 72995bc..5350f61 100644
--- a/include/configs/ZUMA.h
+++ b/include/configs/ZUMA.h
@@ -167,7 +167,6 @@
 
 #define CONFIG_SYS_BUS_CLK		133000000	/* 133 MHz		*/
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h
index ef38102..1c13904 100644
--- a/include/configs/a4m072.h
+++ b/include/configs/a4m072.h
@@ -50,7 +50,6 @@
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1 */
 #define CONFIG_BAUDRATE		9600	/* ... at 9600 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 /* define to enable silent console */
 #define CONFIG_SILENT_CONSOLE
diff --git a/include/configs/actux1.h b/include/configs/actux1.h
index a52e4da..bdd2239 100644
--- a/include/configs/actux1.h
+++ b/include/configs/actux1.h
@@ -101,7 +101,6 @@
 #define CONFIG_SYS_LOAD_ADDR			0x00010000
 
 /* valid baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE		{ 9600, 19200, 38400, 57600,	\
 					  115200, 230400 }
 #define CONFIG_SERIAL_RTS_ACTIVE	1
diff --git a/include/configs/actux2.h b/include/configs/actux2.h
index f72a942..c55571c 100644
--- a/include/configs/actux2.h
+++ b/include/configs/actux2.h
@@ -94,7 +94,6 @@
 #define CONFIG_SYS_LOAD_ADDR			0x00010000
 
 /* valid baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE		{ 9600, 19200, 38400, 57600, \
 					  115200, 230400 }
 #define CONFIG_SERIAL_RTS_ACTIVE	1
diff --git a/include/configs/actux3.h b/include/configs/actux3.h
index 586642d..78ee2b5 100644
--- a/include/configs/actux3.h
+++ b/include/configs/actux3.h
@@ -92,7 +92,6 @@
 #define CONFIG_SYS_LOAD_ADDR			0x00010000
 
 /* valid baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE		{ 9600, 19200, 38400, 57600, \
 					  115200, 230400 }
 #define CONFIG_SERIAL_RTS_ACTIVE	1
diff --git a/include/configs/actux4.h b/include/configs/actux4.h
index 67362e5..c1105df 100644
--- a/include/configs/actux4.h
+++ b/include/configs/actux4.h
@@ -99,7 +99,6 @@
 #define CONFIG_SYS_LOAD_ADDR			0x00010000
 
 /* valid baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE		{ 9600, 19200, 38400, 57600, \
 					  115200, 230400 }
 #define CONFIG_SERIAL_RTS_ACTIVE	1
diff --git a/include/configs/aev.h b/include/configs/aev.h
index 5678773..8d0890f 100644
--- a/include/configs/aev.h
+++ b/include/configs/aev.h
@@ -59,7 +59,6 @@
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1 */
 #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h
index a9e1be8..76ef56f 100644
--- a/include/configs/amcc-common.h
+++ b/include/configs/amcc-common.h
@@ -37,7 +37,6 @@
 #define CONFIG_SYS_NS16550_REG_SIZE	1
 #define CONFIG_SYS_NS16550_CLK		get_serial_clock()
 #define CONFIG_BAUDRATE		115200
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE  \
     {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h
index 95774e0..42a134b 100644
--- a/include/configs/ap325rxa.h
+++ b/include/configs/ap325rxa.h
@@ -77,7 +77,6 @@
 /* Buffer size for Boot Arguments passed to kernel */
 #define CONFIG_SYS_BARGSIZE	512
 /* List of legal baudrate settings for this board */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 38400 }
 
 /* SCIF */
diff --git a/include/configs/canmb.h b/include/configs/canmb.h
index e473e7a..d4c5bbd 100644
--- a/include/configs/canmb.h
+++ b/include/configs/canmb.h
@@ -51,7 +51,6 @@
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1 */
 #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 
diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h
index e1b3830..0abe090 100644
--- a/include/configs/cm5200.h
+++ b/include/configs/cm5200.h
@@ -60,7 +60,6 @@
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1 */
 #define CONFIG_BAUDRATE		57600	/* ... at 57600 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 #define CONFIG_SILENT_CONSOLE	1	/* needed to silence i2c_init() */
 
diff --git a/include/configs/cmi_mpc5xx.h b/include/configs/cmi_mpc5xx.h
index f312cad..329e4e3 100644
--- a/include/configs/cmi_mpc5xx.h
+++ b/include/configs/cmi_mpc5xx.h
@@ -114,7 +114,6 @@
 
 #define	CONFIG_SYS_HZ			1000		/* Decrementer freq: 1 ms ticks	*/
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 1250000 }
 
 
diff --git a/include/configs/cogent_mpc8260.h b/include/configs/cogent_mpc8260.h
index c800753..2997f52 100644
--- a/include/configs/cogent_mpc8260.h
+++ b/include/configs/cogent_mpc8260.h
@@ -157,7 +157,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
diff --git a/include/configs/cogent_mpc8xx.h b/include/configs/cogent_mpc8xx.h
index 10c91e3..58aa88b 100644
--- a/include/configs/cogent_mpc8xx.h
+++ b/include/configs/cogent_mpc8xx.h
@@ -122,7 +122,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_SYS_ALLOC_DPRAM
diff --git a/include/configs/cpci5200.h b/include/configs/cpci5200.h
index a31bf42..a9cfe26 100644
--- a/include/configs/cpci5200.h
+++ b/include/configs/cpci5200.h
@@ -58,7 +58,6 @@
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1 */
 #define CONFIG_BAUDRATE		9600	/* ... at 115200 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
diff --git a/include/configs/csb272.h b/include/configs/csb272.h
index f0b8494..fb5f868 100644
--- a/include/configs/csb272.h
+++ b/include/configs/csb272.h
@@ -171,7 +171,6 @@
 #define CONFIG_SYS_EXT_SERIAL_CLOCK	3868400	/* use external serial clock */
 #undef  CONFIG_SYS_BASE_BAUD
 #define CONFIG_BAUDRATE		38400	/* Default baud rate */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE      \
     { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400 }
 
diff --git a/include/configs/csb472.h b/include/configs/csb472.h
index cf54fcb..5d18ac7 100644
--- a/include/configs/csb472.h
+++ b/include/configs/csb472.h
@@ -170,7 +170,6 @@
 #undef CONFIG_SYS_EXT_SERIAL_CLOCK		/* use internal serial clock */
 #define CONFIG_SYS_BASE_BAUD		691200
 #define CONFIG_BAUDRATE		38400	/* Default baud rate */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE      \
     { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400 }
 
diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h
index 400454f..d517334 100644
--- a/include/configs/digsy_mtc.h
+++ b/include/configs/digsy_mtc.h
@@ -59,7 +59,6 @@
  */
 #define CONFIG_PSC_CONSOLE	4	/* console is on PSC4  */
 #define CONFIG_BAUDRATE		115200	/* ... at 115200  bps  */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
diff --git a/include/configs/dvlhost.h b/include/configs/dvlhost.h
index 89c59b7..4eda91e 100644
--- a/include/configs/dvlhost.h
+++ b/include/configs/dvlhost.h
@@ -100,7 +100,6 @@
 #define CONFIG_SYS_LOAD_ADDR		0x00010000
 
 /* valid baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, \
 					  115200, 230400 }
 #define CONFIG_SERIAL_RTS_ACTIVE	1
diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h
index 6f20827..4d09132 100644
--- a/include/configs/ecovec.h
+++ b/include/configs/ecovec.h
@@ -117,7 +117,6 @@
 /* Buffer size for Boot Arguments passed to kernel */
 #define CONFIG_SYS_BARGSIZE	512
 /* List of legal baudrate settings for this board */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }
 
 /* SCIF */
diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index 9e9b25b..9b7cc66 100644
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -95,7 +95,6 @@
 
 #define CONFIG_CONS_INDEX	1	/*Console on UART0 */
 #define CONFIG_BAUDRATE			115200
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE \
 	{ 9600, 19200, 38400, 57600, 115200, 230400, 460800, 921600 }
 
diff --git a/include/configs/ep8248.h b/include/configs/ep8248.h
index a88e910..2b40f59 100644
--- a/include/configs/ep8248.h
+++ b/include/configs/ep8248.h
@@ -173,7 +173,6 @@
 
 #define CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks */
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_SYS_FLASH_BASE		0xFF800000
diff --git a/include/configs/ep82xxm.h b/include/configs/ep82xxm.h
index fa44708..04c0708 100644
--- a/include/configs/ep82xxm.h
+++ b/include/configs/ep82xxm.h
@@ -184,7 +184,6 @@
 
 #define CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks */
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*-----------------------------------------------------------------------
diff --git a/include/configs/espt.h b/include/configs/espt.h
index 8ce297d..3df1fae 100644
--- a/include/configs/espt.h
+++ b/include/configs/espt.h
@@ -65,7 +65,6 @@
 #define CONFIG_SYS_MAXARGS		16	/* max args accepted for monitor commands */
 #define CONFIG_SYS_BARGSIZE	512	/* Buffer size for Boot Arguments
 								passed to kernel */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }	/* List of legal baudrate
 												settings for this board */
 
diff --git a/include/configs/galaxy5200.h b/include/configs/galaxy5200.h
index 9249533..a38298f 100644
--- a/include/configs/galaxy5200.h
+++ b/include/configs/galaxy5200.h
@@ -65,7 +65,6 @@
 					/* register later on to  */
 					/* enable UART function! */
 #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h
index d37b39f..dd6c41d 100644
--- a/include/configs/gr_cpci_ax2000.h
+++ b/include/configs/gr_cpci_ax2000.h
@@ -67,7 +67,6 @@
  * Serial console configuration
  */
 #define CONFIG_BAUDRATE		38400	/* ... at 38400 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /* Partitions */
diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h
index 85f1b03..7068ff8 100644
--- a/include/configs/gr_ep2s60.h
+++ b/include/configs/gr_ep2s60.h
@@ -61,7 +61,6 @@
  * Serial console configuration
  */
 #define CONFIG_BAUDRATE		38400	/* ... at 38400 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /* Partitions */
diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h
index 8b8a3fb..5006322 100644
--- a/include/configs/gr_xc3s_1500.h
+++ b/include/configs/gr_xc3s_1500.h
@@ -48,7 +48,6 @@
  * Serial console configuration
  */
 #define CONFIG_BAUDRATE		38400	/* ... at 38400 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /* Partitions */
diff --git a/include/configs/grsim.h b/include/configs/grsim.h
index 6bdd35d..f3639dd 100644
--- a/include/configs/grsim.h
+++ b/include/configs/grsim.h
@@ -55,7 +55,6 @@
  * Serial console configuration
  */
 #define CONFIG_BAUDRATE		38400	/* ... at 38400 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /* Partitions */
diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h
index 6d5044c..fb9a3f9 100644
--- a/include/configs/grsim_leon2.h
+++ b/include/configs/grsim_leon2.h
@@ -54,7 +54,6 @@
  * Serial console configuration
  */
 #define CONFIG_BAUDRATE		38400	/* ... at 38400 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /* Partitions */
diff --git a/include/configs/gth2.h b/include/configs/gth2.h
index 077079c..76e911a 100644
--- a/include/configs/gth2.h
+++ b/include/configs/gth2.h
@@ -49,7 +49,6 @@
 #define CONFIG_BAUDRATE		115200
 
 /* valid baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }
 
 /* Only interrupt boot if space is pressed */
diff --git a/include/configs/hmi1001.h b/include/configs/hmi1001.h
index 2e680e5..354072a 100644
--- a/include/configs/hmi1001.h
+++ b/include/configs/hmi1001.h
@@ -48,7 +48,6 @@
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1	*/
 #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps	*/
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /* Partitions */
diff --git a/include/configs/hymod.h b/include/configs/hymod.h
index 1e80ec0..8c9f3d1 100644
--- a/include/configs/hymod.h
+++ b/include/configs/hymod.h
@@ -289,7 +289,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define	CONFIG_SYS_I2C_SPEED		50000
diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h
index c62cf67..2b0b616 100644
--- a/include/configs/inka4x0.h
+++ b/include/configs/inka4x0.h
@@ -57,7 +57,6 @@
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1	*/
 #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps	*/
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h
index db5c7e1..cfa4d8c 100644
--- a/include/configs/ipek01.h
+++ b/include/configs/ipek01.h
@@ -53,7 +53,6 @@
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1 */
 #define CONFIG_BAUDRATE		115200	/* ... at 9600 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history */
diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h
index e338b66..f5adccb 100644
--- a/include/configs/jupiter.h
+++ b/include/configs/jupiter.h
@@ -54,7 +54,6 @@
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1 */
 #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index f6208ca..7a01705 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -78,7 +78,6 @@
 #define CONFIG_SYS_HZ			1000	/* decr. freq: 1 ms ticks */
 
 #define CONFIG_BAUDRATE			115200
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_LOADS_ECHO
diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h
index e308448..405bc69 100644
--- a/include/configs/lwmon.h
+++ b/include/configs/lwmon.h
@@ -242,7 +242,6 @@
  * When the watchdog is enabled, output must be fast enough in Linux.
  */
 #ifdef CONFIG_WATCHDOG
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{		38400, 57600, 115200 }
 #endif
 
diff --git a/include/configs/manroland/mpc5200-common.h b/include/configs/manroland/mpc5200-common.h
index 2addd34..3e4131e 100644
--- a/include/configs/manroland/mpc5200-common.h
+++ b/include/configs/manroland/mpc5200-common.h
@@ -39,7 +39,6 @@
  * Serial console configuration
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1	*/
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200,\
 					 230400 }
 
diff --git a/include/configs/mcc200.h b/include/configs/mcc200.h
index c67dfaa..b56b273 100644
--- a/include/configs/mcc200.h
+++ b/include/configs/mcc200.h
@@ -88,7 +88,6 @@
 #error "Select only one console device!"
 #endif
 #define CONFIG_BAUDRATE		115200
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_MII		1
diff --git a/include/configs/mecp5200.h b/include/configs/mecp5200.h
index 9652a6e..22e95b3 100644
--- a/include/configs/mecp5200.h
+++ b/include/configs/mecp5200.h
@@ -62,7 +62,6 @@
 #else
 #define CONFIG_BAUDRATE		9600	/* ... at 115200 bps */
 #endif
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_MII
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 25a815c..efca136 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -36,7 +36,6 @@
 # define CONFIG_XILINX_UARTLITE
 # define CONFIG_SERIAL_BASE	XILINX_UARTLITE_BASEADDR
 # define CONFIG_BAUDRATE	XILINX_UARTLITE_BAUDRATE
-# undef CONFIG_SYS_BAUDRATE_TABLE
 # define CONFIG_SYS_BAUDRATE_TABLE	{ CONFIG_BAUDRATE }
 # define CONSOLE_ARG	"console=console=ttyUL0,115200\0"
 #elif XILINX_UART16550_BASEADDR
diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h
index fdeebc8..bdcae59 100644
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -75,7 +75,6 @@
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1 */
 #define CONFIG_NETCONSOLE	1	/* network console */
 #define CONFIG_BAUDRATE		115200
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h
index 3d7c820..0f7edff 100644
--- a/include/configs/mpr2.h
+++ b/include/configs/mpr2.h
@@ -52,7 +52,6 @@
 #define CONFIG_SYS_PBSIZE		256	/* Buffer size for Console output */
 #define CONFIG_SYS_MAXARGS		16	/* max args accepted for monitor commands */
 #define CONFIG_SYS_BARGSIZE		512	/* Buffer size for Boot Arguments passed to kernel */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }	/* List of legal baudrate settings for this board */
 #define CONFIG_SYS_LOAD_ADDR		(CONFIG_SYS_SDRAM_BASE + 32 * 1024 * 1024)
 #define CONFIG_SYS_MONITOR_BASE	CONFIG_SYS_FLASH_BASE
diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h
index de77aa2..afa82cf 100644
--- a/include/configs/ms7720se.h
+++ b/include/configs/ms7720se.h
@@ -61,7 +61,6 @@
 /* Buffer size for Boot Arguments passed to kernel */
 #define CONFIG_SYS_BARGSIZE	512
 /* List of legal baudrate settings for this board */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }
 
 /* SCIF */
diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h
index f5d6731..7cf641f 100644
--- a/include/configs/ms7722se.h
+++ b/include/configs/ms7722se.h
@@ -63,7 +63,6 @@
 #define CONFIG_SYS_PBSIZE		256		/* Buffer size for Console output */
 #define CONFIG_SYS_MAXARGS		16		/* max args accepted for monitor commands */
 #define CONFIG_SYS_BARGSIZE		512		/* Buffer size for Boot Arguments passed to kernel */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }	/* List of legal baudrate settings for this board */
 
 /* SCIF */
diff --git a/include/configs/muas3001.h b/include/configs/muas3001.h
index 0e14dce..18bd37e 100644
--- a/include/configs/muas3001.h
+++ b/include/configs/muas3001.h
@@ -215,7 +215,6 @@
 
 #define CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks */
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_SYS_SDRAM_BASE		0x00000000
diff --git a/include/configs/munices.h b/include/configs/munices.h
index a0296d8..425a1d8 100644
--- a/include/configs/munices.h
+++ b/include/configs/munices.h
@@ -61,7 +61,6 @@
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1 */
 #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define	CONFIG_TIMESTAMP	1	/* Print image info with timestamp */
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index 229ba5d..1a63791 100644
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -70,7 +70,6 @@
 
 #define CONFIG_CONS_INDEX	1	/*Console on UART0 */
 #define CONFIG_BAUDRATE			115200
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, \
 					  115200,230400, 460800, 921600 }
 /* auto boot */
diff --git a/include/configs/nios2-generic.h b/include/configs/nios2-generic.h
index 6863576..17017a5 100644
--- a/include/configs/nios2-generic.h
+++ b/include/configs/nios2-generic.h
@@ -46,7 +46,6 @@
 #define CONFIG_ALTERA_JTAG_UART_BYPASS
 #define CONFIG_SYS_NIOS_FIXEDBAUD
 #define CONFIG_BAUDRATE		CONFIG_SYS_UART_BAUD
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{CONFIG_BAUDRATE}
 #define CONFIG_SYS_CONSOLE_INFO_QUIET	/* Suppress console info */
 
diff --git a/include/configs/o2dnt.h b/include/configs/o2dnt.h
index cce2b63..22eb004 100644
--- a/include/configs/o2dnt.h
+++ b/include/configs/o2dnt.h
@@ -43,7 +43,6 @@
  */
 #define CONFIG_PSC_CONSOLE	5	/* console is on PSC5 */
 #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h
index 3a2d849..b60ece3 100644
--- a/include/configs/omap3_zoom2.h
+++ b/include/configs/omap3_zoom2.h
@@ -89,7 +89,6 @@
 #define CONFIG_SYS_NS16550_REG_SIZE	(-2)
 #define CONFIG_SYS_NS16550_CLK		V_NS16550_CLK
 #define CONFIG_BAUDRATE			115200
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{115200}
 
 /* allow to overwrite serial and ethaddr */
diff --git a/include/configs/openrisc-generic.h b/include/configs/openrisc-generic.h
index ac4e5fc..5ff410d 100644
--- a/include/configs/openrisc-generic.h
+++ b/include/configs/openrisc-generic.h
@@ -55,7 +55,6 @@
 # define CONFIG_SYS_NS16550_CLK		CONFIG_SYS_CLK_FREQ
 
 #define CONFIG_BAUDRATE			CONFIG_SYS_UART_BAUD
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{CONFIG_BAUDRATE}
 #define CONFIG_SYS_CONSOLE_INFO_QUIET	/* Suppress console info */
 #define CONSOLE_ARG			"console=console=ttyS0,115200\0"
diff --git a/include/configs/p3mx.h b/include/configs/p3mx.h
index c70cc6b..e44009e 100644
--- a/include/configs/p3mx.h
+++ b/include/configs/p3mx.h
@@ -108,7 +108,6 @@
 #define CONFIG_MPSC			/* MV64460 Serial		*/
 #define CONFIG_MPSC_PORT	0
 #define CONFIG_BAUDRATE		115200	/* console baudrate		*/
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 #define CONFIG_LOADS_ECHO	1	/* echo on for serial download	*/
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	1	/* allow baudrate change	*/
diff --git a/include/configs/p3p440.h b/include/configs/p3p440.h
index ff1468b..d7b1ca2 100644
--- a/include/configs/p3p440.h
+++ b/include/configs/p3p440.h
@@ -90,7 +90,6 @@
 #undef CONFIG_SYS_EXT_SERIAL_CLOCK
 #define CONFIG_BAUDRATE		115200
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE						\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,		\
 			57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/pcm030.h b/include/configs/pcm030.h
index 0685837..1c4d722 100644
--- a/include/configs/pcm030.h
+++ b/include/configs/pcm030.h
@@ -62,7 +62,6 @@ Serial console configuration
 					/* register later on to */
 					/*enable UART function! */
 #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
diff --git a/include/configs/pf5200.h b/include/configs/pf5200.h
index 91fefc4..4a98545 100644
--- a/include/configs/pf5200.h
+++ b/include/configs/pf5200.h
@@ -60,7 +60,6 @@
 #else
 #define CONFIG_BAUDRATE		9600	/* ... at 115200 bps */
 #endif
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
diff --git a/include/configs/quad100hd.h b/include/configs/quad100hd.h
index ea282a6..dc5ec3a 100644
--- a/include/configs/quad100hd.h
+++ b/include/configs/quad100hd.h
@@ -117,7 +117,6 @@
 #define CONFIG_SERIAL_MULTI
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h
index e7a8c41..59b45c8 100644
--- a/include/configs/rsk7203.h
+++ b/include/configs/rsk7203.h
@@ -63,7 +63,6 @@
 /* Buffer size for Boot Arguments passed to kernel */
 #define CONFIG_SYS_BARGSIZE	512
 /* List of legal baudrate settings for this board */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }
 
 /* SCIF */
diff --git a/include/configs/rsk7264.h b/include/configs/rsk7264.h
index 3a25b30..af9524e 100644
--- a/include/configs/rsk7264.h
+++ b/include/configs/rsk7264.h
@@ -26,7 +26,6 @@
 #define CONFIG_BAUDRATE		115200
 #define CONFIG_BOOTARGS		"console=ttySC3,115200"
 #define CONFIG_BOOTDELAY	3
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ CONFIG_BAUDRATE }
 
 #define CONFIG_SYS_LONGHELP	1	/* undef to save memory	*/
diff --git a/include/configs/sbc405.h b/include/configs/sbc405.h
index 2d74235..cab6660 100644
--- a/include/configs/sbc405.h
+++ b/include/configs/sbc405.h
@@ -158,7 +158,6 @@
 #define CONFIG_SYS_BASE_BAUD		691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE					\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,	\
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/sc3.h b/include/configs/sc3.h
index b616456..2d6e51d 100644
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -235,7 +235,6 @@
 #define CONFIG_SYS_BASE_BAUD		921600	/* internal clock */
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE  \
     {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h
index 7c3a948..73d2a87 100644
--- a/include/configs/sh7757lcr.h
+++ b/include/configs/sh7757lcr.h
@@ -73,7 +73,6 @@
 #define CONFIG_SYS_PBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_BARGSIZE		512
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }
 
 /* SCIF */
diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h
index 0a8df7f..59728f5 100644
--- a/include/configs/sh7763rdp.h
+++ b/include/configs/sh7763rdp.h
@@ -65,7 +65,6 @@
 #define CONFIG_SYS_MAXARGS		16	/* max args accepted for monitor commands */
 #define CONFIG_SYS_BARGSIZE	512	/* Buffer size for Boot Arguments
 								passed to kernel */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }	/* List of legal baudrate
 												settings for this board */
 
diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index e94f913..1e71bcc 100644
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -87,7 +87,6 @@
 #define CONFIG_SYS_PBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_BARGSIZE		512
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }
 
 /* SCIF */
diff --git a/include/configs/sorcery.h b/include/configs/sorcery.h
index 3c8b24c..fe40bf0 100644
--- a/include/configs/sorcery.h
+++ b/include/configs/sorcery.h
@@ -46,7 +46,6 @@
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC */
 
 #define CONFIG_BAUDRATE		115200	    /* ... at 115200 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /* PCI */
diff --git a/include/configs/spieval.h b/include/configs/spieval.h
index a958fd0..f27466c 100644
--- a/include/configs/spieval.h
+++ b/include/configs/spieval.h
@@ -48,7 +48,6 @@
  */
 #define CONFIG_PSC_CONSOLE	6	/* console is on PSC6 */
 #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #ifdef CONFIG_STK52XX
diff --git a/include/configs/v38b.h b/include/configs/v38b.h
index 84a5f9d..47bb846 100644
--- a/include/configs/v38b.h
+++ b/include/configs/v38b.h
@@ -54,7 +54,6 @@
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1 */
 #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h
index e2173de..bd7bac0 100644
--- a/include/configs/xilinx-ppc.h
+++ b/include/configs/xilinx-ppc.h
@@ -121,7 +121,6 @@
 #define CONFIG_XILINX_UARTLITE
 #define CONFIG_SERIAL_BASE		XPAR_UARTLITE_0_BASEADDR
 #define CONFIG_BAUDRATE			XPAR_UARTLITE_0_BAUDRATE
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ CONFIG_BAUDRATE }
 #else
 #ifdef XPAR_UARTNS550_0_BASEADDR
@@ -132,7 +131,6 @@
 #define CONFIG_SYS_NS16550_COM1		XPAR_UARTNS550_0_BASEADDR
 #define CONFIG_SYS_NS16550_CLK		XPAR_UARTNS550_0_CLOCK_FREQ_HZ
 #define CONFIG_BAUDRATE			115200
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 115200 }
 #endif
 #endif
diff --git a/include/configs/xpedite1000.h b/include/configs/xpedite1000.h
index e686891..d72921e 100644
--- a/include/configs/xpedite1000.h
+++ b/include/configs/xpedite1000.h
@@ -118,7 +118,6 @@ extern void out32(unsigned int, unsigned long);
 #define CONFIG_SYS_NS16550_REG_SIZE	1
 #define CONFIG_SYS_NS16550_CLK		get_serial_clock()
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE \
 	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400}
 #define CONFIG_BAUDRATE			115200
diff --git a/include/configs/zeus.h b/include/configs/zeus.h
index 6535ea2..63279b0 100644
--- a/include/configs/zeus.h
+++ b/include/configs/zeus.h
@@ -133,7 +133,6 @@
 #define CONFIG_BAUDRATE		115200
 #define CONFIG_SERIAL_MULTI
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE  \
     {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
diff --git a/mkconfig b/mkconfig
index 438530b..daa1810 100755
--- a/mkconfig
+++ b/mkconfig
@@ -167,6 +167,7 @@ cat << EOF >> config.h
 #include <config_defaults.h>
 #include <configs/${CONFIG_NAME}.h>
 #include <asm/config.h>
+#include <config_fallbacks.h>
 EOF
 
 exit 0
-- 
1.7.0.4

^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [U-Boot] [PATCH v2 2/2] hush.c: Move default CONFIG_SYS_PROMPT_HUSH_PS2 to hush.c
  2012-04-26 22:46 [U-Boot] [PATCH v2 1/2] CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there Tom Rini
@ 2012-04-26 22:46 ` Tom Rini
  2012-04-27  5:35   ` Mike Frysinger
  2012-04-29 15:13   ` Stefano Babic
  2012-04-26 23:53 ` [U-Boot] [PATCH v2 1/2] CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there Tom Rini
                   ` (4 subsequent siblings)
  5 siblings, 2 replies; 25+ messages in thread
From: Tom Rini @ 2012-04-26 22:46 UTC (permalink / raw)
  To: u-boot

Exactly one board has defined CONFIG_SYS_PROMPT_HUSH_PS2 to a value
different than "> " which is vision2.  I have Cc'd the maintainer here
as I strongly suspect this is a bug rather than intentional behavior.

Cc: Stefano Babic <sbabic@denx.de>
Signed-off-by: Tom Rini <trini@ti.com>
---
 board/fads/fads.h                      |    1 -
 common/hush.c                          |    3 +++
 include/configs/AP1000.h               |    1 -
 include/configs/ASH405.h               |    3 ---
 include/configs/Adder.h                |    1 -
 include/configs/CATcenter.h            |    3 ---
 include/configs/CMS700.h               |    3 ---
 include/configs/CPC45.h                |    3 ---
 include/configs/CPCI2DP.h              |    3 ---
 include/configs/CPCI405.h              |    3 ---
 include/configs/CPCI4052.h             |    3 ---
 include/configs/CPCI405AB.h            |    3 ---
 include/configs/CPCI405DT.h            |    3 ---
 include/configs/CPCI750.h              |    1 -
 include/configs/CRAYL1.h               |    1 -
 include/configs/CU824.h                |    3 ---
 include/configs/DB64360.h              |    1 -
 include/configs/DB64460.h              |    1 -
 include/configs/DP405.h                |    3 ---
 include/configs/EB+MCF-EV123.h         |    1 -
 include/configs/EP88x.h                |    1 -
 include/configs/EVB64260.h             |    1 -
 include/configs/FPS850L.h              |    3 ---
 include/configs/FPS860L.h              |    3 ---
 include/configs/G2000.h                |    3 ---
 include/configs/GEN860T.h              |    1 -
 include/configs/HH405.h                |    3 ---
 include/configs/HUB405.h               |    3 ---
 include/configs/HWW1U1A.h              |    1 -
 include/configs/ISPAN.h                |    1 -
 include/configs/IceCube.h              |    1 -
 include/configs/JSE.h                  |    3 ---
 include/configs/KAREF.h                |    1 -
 include/configs/M5271EVB.h             |    1 -
 include/configs/MBX.h                  |    3 ---
 include/configs/MERGERBOX.h            |    1 -
 include/configs/METROBOX.h             |    1 -
 include/configs/MIP405.h               |    1 -
 include/configs/MPC8260ADS.h           |    1 -
 include/configs/MPC8308RDB.h           |    1 -
 include/configs/MPC8313ERDB.h          |    1 -
 include/configs/MPC8315ERDB.h          |    3 ---
 include/configs/MPC8323ERDB.h          |    3 ---
 include/configs/MPC832XEMDS.h          |    3 ---
 include/configs/MPC8349EMDS.h          |    3 ---
 include/configs/MPC8349ITX.h           |    1 -
 include/configs/MPC8360EMDS.h          |    3 ---
 include/configs/MPC8360ERDK.h          |    3 ---
 include/configs/MPC837XEMDS.h          |    3 ---
 include/configs/MPC837XERDB.h          |    3 ---
 include/configs/MPC8536DS.h            |    3 ---
 include/configs/MPC8540ADS.h           |    1 -
 include/configs/MPC8541CDS.h           |    1 -
 include/configs/MPC8544DS.h            |    3 ---
 include/configs/MPC8548CDS.h           |    3 ---
 include/configs/MPC8555CDS.h           |    1 -
 include/configs/MPC8560ADS.h           |    1 -
 include/configs/MPC8568MDS.h           |    1 -
 include/configs/MPC8569MDS.h           |    1 -
 include/configs/MPC8572DS.h            |    3 ---
 include/configs/MPC8610HPCD.h          |    3 ---
 include/configs/MPC8641HPCN.h          |    3 ---
 include/configs/MVBC_P.h               |    1 -
 include/configs/MVBLM7.h               |    1 -
 include/configs/MVS1.h                 |    3 ---
 include/configs/MVSMR.h                |    1 -
 include/configs/NETPHONE.h             |    1 -
 include/configs/NETTA.h                |    1 -
 include/configs/NETTA2.h               |    1 -
 include/configs/NSCU.h                 |    3 ---
 include/configs/P1010RDB.h             |    3 ---
 include/configs/P1022DS.h              |    1 -
 include/configs/P1023RDS.h             |    3 ---
 include/configs/P1_P2_RDB.h            |    3 ---
 include/configs/P2020COME.h            |    3 ---
 include/configs/P2020DS.h              |    3 ---
 include/configs/P2041RDB.h             |    1 -
 include/configs/P3G4.h                 |    1 -
 include/configs/PCI405.h               |    3 ---
 include/configs/PCIPPC2.h              |    3 ---
 include/configs/PCIPPC6.h              |    3 ---
 include/configs/PIP405.h               |    1 -
 include/configs/PK1C20.h               |    1 -
 include/configs/PLU405.h               |    3 ---
 include/configs/PMC405.h               |    3 ---
 include/configs/PPChameleonEVB.h       |    3 ---
 include/configs/QS823.h                |    1 -
 include/configs/QS850.h                |    1 -
 include/configs/QS860T.h               |    1 -
 include/configs/Rattler.h              |    1 -
 include/configs/SBC8540.h              |    3 ---
 include/configs/SIMPC8313.h            |    1 -
 include/configs/TK885D.h               |    3 ---
 include/configs/TOP860.h               |    3 ---
 include/configs/TQM5200.h              |    1 -
 include/configs/TQM823L.h              |    3 ---
 include/configs/TQM823M.h              |    3 ---
 include/configs/TQM8260.h              |    3 ---
 include/configs/TQM8272.h              |    3 ---
 include/configs/TQM834x.h              |    3 ---
 include/configs/TQM850L.h              |    3 ---
 include/configs/TQM850M.h              |    3 ---
 include/configs/TQM855L.h              |    3 ---
 include/configs/TQM855M.h              |    3 ---
 include/configs/TQM85xx.h              |    3 ---
 include/configs/TQM860L.h              |    3 ---
 include/configs/TQM860M.h              |    3 ---
 include/configs/TQM862L.h              |    3 ---
 include/configs/TQM862M.h              |    3 ---
 include/configs/TQM866M.h              |    3 ---
 include/configs/TQM885D.h              |    3 ---
 include/configs/VCMA9.h                |    1 -
 include/configs/VOH405.h               |    3 ---
 include/configs/VOM405.h               |    3 ---
 include/configs/W7OLMC.h               |    1 -
 include/configs/W7OLMG.h               |    1 -
 include/configs/WUH405.h               |    3 ---
 include/configs/ZPC1900.h              |    1 -
 include/configs/ZUMA.h                 |    1 -
 include/configs/a4m072.h               |    3 ---
 include/configs/am3517_crane.h         |    1 -
 include/configs/am3517_evm.h           |    1 -
 include/configs/amcc-common.h          |    3 ---
 include/configs/aria.h                 |    1 -
 include/configs/astro_mcf5373l.h       |    1 -
 include/configs/at91rm9200ek.h         |    1 -
 include/configs/at91sam9263ek.h        |    1 -
 include/configs/at91sam9m10g45ek.h     |    1 -
 include/configs/balloon3.h             |    1 -
 include/configs/bct-brettl2.h          |    1 -
 include/configs/c2mon.h                |    3 ---
 include/configs/calimain.h             |    1 -
 include/configs/cam_enc_4xx.h          |    1 -
 include/configs/cm_t35.h               |    1 -
 include/configs/colibri_pxa270.h       |    1 -
 include/configs/corenet_ds.h           |    1 -
 include/configs/csb272.h               |    3 ---
 include/configs/csb472.h               |    3 ---
 include/configs/da830evm.h             |    1 -
 include/configs/da850evm.h             |    1 -
 include/configs/davinci_dm355evm.h     |    1 -
 include/configs/davinci_dm355leopard.h |    1 -
 include/configs/davinci_dm365evm.h     |    1 -
 include/configs/davinci_dm6467evm.h    |    1 -
 include/configs/davinci_dvevm.h        |    1 -
 include/configs/davinci_schmoogie.h    |    1 -
 include/configs/davinci_sffsdr.h       |    1 -
 include/configs/davinci_sonata.h       |    1 -
 include/configs/devkit8000.h           |    1 -
 include/configs/dig297.h               |    1 -
 include/configs/digsy_mtc.h            |    1 -
 include/configs/dns325.h               |    1 -
 include/configs/ea20.h                 |    1 -
 include/configs/edminiv2.h             |    1 -
 include/configs/efikamx.h              |    1 -
 include/configs/enbw_cmc.h             |    1 -
 include/configs/ep8248.h               |    1 -
 include/configs/ep8260.h               |    1 -
 include/configs/ep82xxm.h              |    1 -
 include/configs/ethernut5.h            |    1 -
 include/configs/flea3.h                |    1 -
 include/configs/galaxy5200.h           |    1 -
 include/configs/grasshopper.h          |    1 -
 include/configs/grsim.h                |    3 ---
 include/configs/grsim_leon2.h          |    3 ---
 include/configs/gw8260.h               |    1 -
 include/configs/hawkboard.h            |    1 -
 include/configs/igep0020.h             |    1 -
 include/configs/igep0030.h             |    1 -
 include/configs/integratorap.h         |    1 -
 include/configs/jadecpu.h              |    1 -
 include/configs/jupiter.h              |    3 ---
 include/configs/km/keymile-common.h    |    1 -
 include/configs/lacie_kw.h             |    1 -
 include/configs/lubbock.h              |    1 -
 include/configs/lwmon.h                |    3 ---
 include/configs/lwmon5.h               |    3 ---
 include/configs/m28evk.h               |    1 -
 include/configs/mcc200.h               |    1 -
 include/configs/mcx.h                  |    1 -
 include/configs/mecp5123.h             |    1 -
 include/configs/microblaze-generic.h   |    3 ---
 include/configs/motionpro.h            |    1 -
 include/configs/mpc5121-common.h       |    3 ---
 include/configs/mpc5121ads.h           |    1 -
 include/configs/mpc7448hpc2.h          |    1 -
 include/configs/mpc8308_p1m.h          |    1 -
 include/configs/mpq101.h               |    3 ---
 include/configs/muas3001.h             |    1 -
 include/configs/mx1ads.h               |    1 -
 include/configs/mx28evk.h              |    1 -
 include/configs/mx35pdk.h              |    1 -
 include/configs/mx51evk.h              |    1 -
 include/configs/mx53ard.h              |    1 -
 include/configs/mx53evk.h              |    1 -
 include/configs/mx53loco.h             |    1 -
 include/configs/mx53smd.h              |    1 -
 include/configs/mx6qarm2.h             |    1 -
 include/configs/mx6qsabrelite.h        |    1 -
 include/configs/nhk8815.h              |    1 -
 include/configs/nios2-generic.h        |    1 -
 include/configs/omap3_beagle.h         |    1 -
 include/configs/omap3_evm_common.h     |    1 -
 include/configs/omap3_logic.h          |    1 -
 include/configs/omap3_mvblx.h          |    1 -
 include/configs/omap3_overo.h          |    1 -
 include/configs/omap3_pandora.h        |    1 -
 include/configs/omap3_sdp3430.h        |    1 -
 include/configs/omap3_zoom1.h          |    1 -
 include/configs/omap4_common.h         |    1 -
 include/configs/omap5_evm.h            |    1 -
 include/configs/origen.h               |    1 -
 include/configs/p1_p2_rdb_pc.h         |    3 ---
 include/configs/p3mx.h                 |    1 -
 include/configs/palmld.h               |    1 -
 include/configs/palmtc.h               |    1 -
 include/configs/pm9g45.h               |    1 -
 include/configs/pxa255_idp.h           |    1 -
 include/configs/qemu-mips.h            |    1 -
 include/configs/qong.h                 |    3 ---
 include/configs/s5p_goni.h             |    1 -
 include/configs/s5pc210_universal.h    |    1 -
 include/configs/sacsng.h               |    1 -
 include/configs/sandbox.h              |    1 -
 include/configs/sbc405.h               |    3 ---
 include/configs/sbc8349.h              |    3 ---
 include/configs/sbc8548.h              |    3 ---
 include/configs/sbc8560.h              |    3 ---
 include/configs/sbc8641d.h             |    1 -
 include/configs/smdk2410.h             |    1 -
 include/configs/smdk5250.h             |    1 -
 include/configs/smdk6400.h             |    3 ---
 include/configs/smdkc100.h             |    1 -
 include/configs/smdkv310.h             |    1 -
 include/configs/snapper9260.h          |    1 -
 include/configs/socrates.h             |    3 ---
 include/configs/sorcery.h              |    3 ---
 include/configs/spc1920.h              |    1 -
 include/configs/stxgp3.h               |    1 -
 include/configs/stxssa.h               |    3 ---
 include/configs/stxxtc.h               |    1 -
 include/configs/svm_sc8xx.h            |    1 -
 include/configs/tam3517-common.h       |    1 -
 include/configs/tegra2-common.h        |    1 -
 include/configs/tnetv107x_evm.h        |    1 -
 include/configs/trats.h                |    1 -
 include/configs/tricorder.h            |    1 -
 include/configs/trizepsiv.h            |    1 -
 include/configs/tt01.h                 |    1 -
 include/configs/u8500_href.h           |    1 -
 include/configs/uc100.h                |    3 ---
 include/configs/ve8313.h               |    1 -
 include/configs/virtlab2.h             |    3 ---
 include/configs/vision2.h              |    1 -
 include/configs/vme8349.h              |    3 ---
 include/configs/vpac270.h              |    1 -
 include/configs/xaeniax.h              |    1 -
 include/configs/xilinx-ppc.h           |    1 -
 include/configs/xpedite1000.h          |    1 -
 include/configs/xpedite517x.h          |    1 -
 include/configs/xpedite520x.h          |    1 -
 include/configs/xpedite537x.h          |    1 -
 include/configs/xpedite550x.h          |    1 -
 include/configs/zipitz2.h              |    1 -
 include/configs/zmx25.h                |    1 -
 265 files changed, 3 insertions(+), 450 deletions(-)

diff --git a/board/fads/fads.h b/board/fads/fads.h
index 1a3d22a..fa4a25a 100644
--- a/board/fads/fads.h
+++ b/board/fads/fads.h
@@ -132,7 +132,6 @@
  */
 #define	CONFIG_SYS_PROMPT		"=>"		/* Monitor Command Prompt	*/
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define	CONFIG_SYS_LONGHELP				/* #undef to save memory	*/
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024		/* Console I/O Buffer Size	*/
diff --git a/common/hush.c b/common/hush.c
index 672ab9e..1eff182 100644
--- a/common/hush.c
+++ b/common/hush.c
@@ -92,6 +92,9 @@
 #include <common.h>        /* readline */
 #include <hush.h>
 #include <command.h>        /* find_cmd */
+#ifndef CONFIG_SYS_PROMPT_HUSH_PS2
+#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
+#endif
 #endif
 #ifndef __U_BOOT__
 #include <ctype.h>     /* isalpha, isdigit */
diff --git a/include/configs/AP1000.h b/include/configs/AP1000.h
index fd074fb..09cfef6 100644
--- a/include/configs/AP1000.h
+++ b/include/configs/AP1000.h
@@ -39,7 +39,6 @@
 
 #define CONFIG_SYS_HUSH_PARSER 1		/* use "hush" command parser	*/
 #define CONFIG_SYS_PROMPT		"0> "
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define CONFIG_COMMAND_EDIT	1
 #define CONFIG_COMPLETE_ADDRESSES 1
diff --git a/include/configs/ASH405.h b/include/configs/ASH405.h
index 7f48499..09aa763 100644
--- a/include/configs/ASH405.h
+++ b/include/configs/ASH405.h
@@ -105,9 +105,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/Adder.h b/include/configs/Adder.h
index ecf5fb8..a23c7ff 100644
--- a/include/configs/Adder.h
+++ b/include/configs/Adder.h
@@ -90,7 +90,6 @@
  */
 #define CONFIG_SYS_PROMPT		"=> "		/* Monitor Command Prompt	*/
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_LONGHELP				/* #undef to save memory	*/
 #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 */
diff --git a/include/configs/CATcenter.h b/include/configs/CATcenter.h
index 84e4e78..1e3a564 100644
--- a/include/configs/CATcenter.h
+++ b/include/configs/CATcenter.h
@@ -170,9 +170,6 @@
 #define CONFIG_SYS_PROMPT		"=> "	/* Monitor Command Prompt	*/
 
 #define	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/CMS700.h b/include/configs/CMS700.h
index 63d838f..686d158 100644
--- a/include/configs/CMS700.h
+++ b/include/configs/CMS700.h
@@ -103,9 +103,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/CPC45.h b/include/configs/CPC45.h
index b2b9e07..fc226f1 100644
--- a/include/configs/CPC45.h
+++ b/include/configs/CPC45.h
@@ -96,9 +96,6 @@
 #if 1
 #define CONFIG_SYS_HUSH_PARSER		1	/* use "hush" command parser	*/
 #endif
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 /* Print Buffer Size
  */
diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h
index afe8d6e..11cf58b 100644
--- a/include/configs/CPCI2DP.h
+++ b/include/configs/CPCI2DP.h
@@ -91,9 +91,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/CPCI405.h b/include/configs/CPCI405.h
index cf1d1b3..9ecdad9 100644
--- a/include/configs/CPCI405.h
+++ b/include/configs/CPCI405.h
@@ -106,9 +106,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h
index d17458e..efab119 100644
--- a/include/configs/CPCI4052.h
+++ b/include/configs/CPCI4052.h
@@ -113,9 +113,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/CPCI405AB.h b/include/configs/CPCI405AB.h
index a0d16d2..83e9a04 100644
--- a/include/configs/CPCI405AB.h
+++ b/include/configs/CPCI405AB.h
@@ -114,9 +114,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/CPCI405DT.h b/include/configs/CPCI405DT.h
index 98b8ef5..1944a07 100644
--- a/include/configs/CPCI405DT.h
+++ b/include/configs/CPCI405DT.h
@@ -114,9 +114,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/CPCI750.h b/include/configs/CPCI750.h
index a6af86c..b276ae6 100644
--- a/include/configs/CPCI750.h
+++ b/include/configs/CPCI750.h
@@ -76,7 +76,6 @@
 /*#define CONFIG_SYS_HUSH_PARSER*/
 #define CONFIG_SYS_HUSH_PARSER
 
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define CONFIG_CMDLINE_EDITING		/* add command line history	*/
 #define CONFIG_AUTO_COMPLETE		/* add autocompletion support	*/
diff --git a/include/configs/CRAYL1.h b/include/configs/CRAYL1.h
index 4aaceb7..1daec69 100644
--- a/include/configs/CRAYL1.h
+++ b/include/configs/CRAYL1.h
@@ -87,7 +87,6 @@
 #define CONFIG_ENV_OVERWRITE     1
 #define	CONFIG_SYS_HZ		             1000	/* decrementer freq: 1 ms ticks	*/
 #define CONFIG_SYS_HUSH_PARSER			1
-#define CONFIG_SYS_PROMPT_HUSH_PS2		"> "
 #define CONFIG_SOURCE			1
 
 
diff --git a/include/configs/CU824.h b/include/configs/CU824.h
index c8821fd..a3ceed1 100644
--- a/include/configs/CU824.h
+++ b/include/configs/CU824.h
@@ -90,9 +90,6 @@
 #if 1
 #define	CONFIG_SYS_HUSH_PARSER		1	/* use "hush" command parser	*/
 #endif
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 /* Print Buffer Size
  */
diff --git a/include/configs/DB64360.h b/include/configs/DB64360.h
index c3f3a24..d5ef154 100644
--- a/include/configs/DB64360.h
+++ b/include/configs/DB64360.h
@@ -140,7 +140,6 @@ if we use PCI it has its own MAC addr */
 /*#define CONFIG_SYS_HUSH_PARSER */
 #undef CONFIG_SYS_HUSH_PARSER
 
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * The following defines let you select what serial you want to use
diff --git a/include/configs/DB64460.h b/include/configs/DB64460.h
index d48f092..02a013b 100644
--- a/include/configs/DB64460.h
+++ b/include/configs/DB64460.h
@@ -78,7 +78,6 @@
 /*#define CONFIG_SYS_HUSH_PARSER */
 #undef CONFIG_SYS_HUSH_PARSER
 
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * The following defines let you select what serial you want to use
diff --git a/include/configs/DP405.h b/include/configs/DP405.h
index f6e2652..6d67d6e 100644
--- a/include/configs/DP405.h
+++ b/include/configs/DP405.h
@@ -80,9 +80,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/EB+MCF-EV123.h b/include/configs/EB+MCF-EV123.h
index eb9fe46..a3420f4 100644
--- a/include/configs/EB+MCF-EV123.h
+++ b/include/configs/EB+MCF-EV123.h
@@ -90,7 +90,6 @@
 
 #define CONFIG_BOOTDELAY	5
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT	"\nEV123 U-Boot> "
 #define	CONFIG_SYS_LONGHELP	1
 
diff --git a/include/configs/EP88x.h b/include/configs/EP88x.h
index 1638d35..9019cc7 100644
--- a/include/configs/EP88x.h
+++ b/include/configs/EP88x.h
@@ -85,7 +85,6 @@
  */
 #define CONFIG_SYS_PROMPT		"=> "		/* Monitor Command Prompt	*/
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_LONGHELP				/* #undef to save memory	*/
 #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 */
diff --git a/include/configs/EVB64260.h b/include/configs/EVB64260.h
index b905402..b542b96 100644
--- a/include/configs/EVB64260.h
+++ b/include/configs/EVB64260.h
@@ -61,7 +61,6 @@
 #endif
 
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * The following defines let you select what serial you want to use
diff --git a/include/configs/FPS850L.h b/include/configs/FPS850L.h
index 6d7ca27..3b00ae3 100644
--- a/include/configs/FPS850L.h
+++ b/include/configs/FPS850L.h
@@ -131,9 +131,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/FPS860L.h b/include/configs/FPS860L.h
index b074c7d..c23711d 100644
--- a/include/configs/FPS860L.h
+++ b/include/configs/FPS860L.h
@@ -131,9 +131,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/G2000.h b/include/configs/G2000.h
index d64dd8d..08ba840 100644
--- a/include/configs/G2000.h
+++ b/include/configs/G2000.h
@@ -130,9 +130,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/GEN860T.h b/include/configs/GEN860T.h
index 1ea4108..b98cacc 100644
--- a/include/configs/GEN860T.h
+++ b/include/configs/GEN860T.h
@@ -282,7 +282,6 @@
  * Use the "hush" command parser
  */
 #define	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * Set buffer size for console I/O
diff --git a/include/configs/HH405.h b/include/configs/HH405.h
index 4a41b5c..444413d 100644
--- a/include/configs/HH405.h
+++ b/include/configs/HH405.h
@@ -155,9 +155,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/HUB405.h b/include/configs/HUB405.h
index afb8273..e90782f 100644
--- a/include/configs/HUB405.h
+++ b/include/configs/HUB405.h
@@ -99,9 +99,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/HWW1U1A.h b/include/configs/HWW1U1A.h
index ab7ba8f..940343d 100644
--- a/include/configs/HWW1U1A.h
+++ b/include/configs/HWW1U1A.h
@@ -405,7 +405,6 @@
 #define CONFIG_SYS_CBSIZE 4096		/* Allow up to 4k command lines	*/
 #define CONFIG_SYS_BARGSIZE 4096	/* Allow up to 4k boot args	*/
 #define CONFIG_SYS_HUSH_PARSER		/* Enable a fancier shell	*/
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "	/* Command-line continuation	*/
 
 /* A little extra magic here for the prompt */
 #define CONFIG_SYS_PROMPT hww1u1a_get_ps1()
diff --git a/include/configs/ISPAN.h b/include/configs/ISPAN.h
index d6474bd..43734d3 100644
--- a/include/configs/ISPAN.h
+++ b/include/configs/ISPAN.h
@@ -146,7 +146,6 @@
  */
 #define CONFIG_SYS_PROMPT		"=> "		/* Monitor Command Prompt	*/
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_LONGHELP				/* #undef to save memory	*/
 #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 */
diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h
index 135ef55..33c2ead 100644
--- a/include/configs/IceCube.h
+++ b/include/configs/IceCube.h
@@ -325,7 +325,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* use "hush" command parser	*/
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define CONFIG_SYS_MEMTEST_START	0x00100000	/* memtest works on */
 #define CONFIG_SYS_MEMTEST_END		0x00f00000	/* 1 ... 15 MB in DRAM	*/
diff --git a/include/configs/JSE.h b/include/configs/JSE.h
index ef652b2..e0a0d8e 100644
--- a/include/configs/JSE.h
+++ b/include/configs/JSE.h
@@ -175,9 +175,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #define CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/KAREF.h b/include/configs/KAREF.h
index 3ed3334..24c78e0 100644
--- a/include/configs/KAREF.h
+++ b/include/configs/KAREF.h
@@ -220,7 +220,6 @@
 #define CONFIG_SYS_PROMPT	      "KaRefDes=> "  /* Monitor Command Prompt	*/
 
 #define CONFIG_SYS_HUSH_PARSER	       1	     /* HUSH for ext'd cli	*/
-#define CONFIG_SYS_PROMPT_HUSH_PS2    "> "
 
 
 /*-----------------------------------------------------------------------
diff --git a/include/configs/M5271EVB.h b/include/configs/M5271EVB.h
index ac200f5..a5913df 100644
--- a/include/configs/M5271EVB.h
+++ b/include/configs/M5271EVB.h
@@ -85,7 +85,6 @@
 #define CONFIG_CMD_LOADB
 #define CONFIG_CMDLINE_EDITING	1 /* enables command line history */
 #define CONFIG_SYS_HUSH_PARSER /* Use the HUSH parser */
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 #define CONFIG_MCFFEC
 #ifdef CONFIG_MCFFEC
diff --git a/include/configs/MBX.h b/include/configs/MBX.h
index 28438a3..af03d66 100644
--- a/include/configs/MBX.h
+++ b/include/configs/MBX.h
@@ -101,9 +101,6 @@
 #define CONFIG_SYS_LONGHELP			/* undef to save memory		*/
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 #undef	CONFIG_SYS_HUSH_PARSER			/* Hush parse for U-Boot	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
 #else
diff --git a/include/configs/MERGERBOX.h b/include/configs/MERGERBOX.h
index e331464..0365ab6 100644
--- a/include/configs/MERGERBOX.h
+++ b/include/configs/MERGERBOX.h
@@ -213,7 +213,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 /* Pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/METROBOX.h b/include/configs/METROBOX.h
index 2328a17..7d78bdc 100644
--- a/include/configs/METROBOX.h
+++ b/include/configs/METROBOX.h
@@ -285,7 +285,6 @@
 #define CONFIG_SYS_PROMPT	      "MetroBox=> "  /* Monitor Command Prompt	*/
 
 #define CONFIG_SYS_HUSH_PARSER	       1	     /* HUSH for ext'd cli	*/
-#define CONFIG_SYS_PROMPT_HUSH_PS2    "> "
 
 
 /*-----------------------------------------------------------------------
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index 9961fb5..979495a 100644
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -91,7 +91,6 @@
 
 
 #define	 CONFIG_SYS_HUSH_PARSER
-#define	 CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 /**************************************************************
  * I2C Stuff:
  * the MIP405 is equiped with an Atmel 24C128/256 EEPROM at address
diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h
index e4ea178..bb72b35 100644
--- a/include/configs/MPC8260ADS.h
+++ b/include/configs/MPC8260ADS.h
@@ -286,7 +286,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 #define CONFIG_SYS_LONGHELP			/* undef to save memory	    */
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt   */
 #if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h
index 691d87f..70cdacb 100644
--- a/include/configs/MPC8308RDB.h
+++ b/include/configs/MPC8308RDB.h
@@ -321,7 +321,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 /* Pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index a4a5925..c363254 100644
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -380,7 +380,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 /* I2C */
 #define CONFIG_HARD_I2C			/* I2C with hardware support*/
diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index f8af355..fade375 100644
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -337,9 +337,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* Pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index f14993c..c5553e3 100644
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -223,9 +223,6 @@
 #define CONFIG_AUTO_COMPLETE		/* add autocompletion support   */
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index 86eafbc..5545208 100644
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -316,9 +316,6 @@
 #define CONFIG_AUTO_COMPLETE		/* add autocompletion support   */
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index e7bc15c..b281d3a 100644
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -344,9 +344,6 @@
 #define CONFIG_AUTO_COMPLETE		/* add autocompletion support   */
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index d2034cc..ef5b3f2 100644
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -555,7 +555,6 @@ boards, we say we have two, but don't display a message if we find only one. */
 #define CONFIG_CMDLINE_EDITING		/* Command-line editing */
 #define CONFIG_AUTO_COMPLETE		/* add autocompletion support */
 #define CONFIG_SYS_HUSH_PARSER		/* Use the HUSH parser */
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
 #define CONFIG_LOADADDR	800000	/* default location for tftp and bootm */
diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h
index 63118b7..00d1d10 100644
--- a/include/configs/MPC8360EMDS.h
+++ b/include/configs/MPC8360EMDS.h
@@ -413,9 +413,6 @@
 #define CONFIG_AUTO_COMPLETE		/* add autocompletion support   */
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/MPC8360ERDK.h b/include/configs/MPC8360ERDK.h
index 8e6bd6c..789413b 100644
--- a/include/configs/MPC8360ERDK.h
+++ b/include/configs/MPC8360ERDK.h
@@ -277,9 +277,6 @@
 #define CONFIG_AUTO_COMPLETE		/* add autocompletion support */
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* Pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index 8174d22..bf6b090 100644
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -331,9 +331,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* Pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 9d3939a..99a31f0 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -357,9 +357,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* Pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index 286a106..a761312 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -420,9 +420,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /*
  * Pass open firmware flat tree
diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index b61ab7b..f9a1938 100644
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -246,7 +246,6 @@
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 #endif
 
 /* pass open firmware flat tree */
diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h
index b418712..82ba380 100644
--- a/include/configs/MPC8541CDS.h
+++ b/include/configs/MPC8541CDS.h
@@ -269,7 +269,6 @@ extern unsigned long get_clock_freq(void);
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 #endif
 
 /* pass open firmware flat tree */
diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index 1bb36d2..65e570a 100644
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -221,9 +221,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT		1
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index f519e5e..1639fe3 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -346,9 +346,6 @@ extern unsigned long get_clock_freq(void);
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT		1
diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h
index 344dd3c..28c8a57 100644
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@@ -267,7 +267,6 @@ extern unsigned long get_clock_freq(void);
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 #endif
 
 /* pass open firmware flat tree */
diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index b8ec48c..103fa8b 100644
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -240,7 +240,6 @@
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 #endif
 
 /* pass open firmware flat tree */
diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index 1e310bd..76fa6bc 100644
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -252,7 +252,6 @@ extern unsigned long get_clock_freq(void);
 /* Use the HUSH parser*/
 #define CONFIG_SYS_HUSH_PARSER
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 #endif
 
 /* pass open firmware flat tree */
diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h
index 4c4dfcb..6551985 100644
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@ -289,7 +289,6 @@ extern unsigned long get_clock_freq(void);
 /* Use the HUSH parser*/
 #define CONFIG_SYS_HUSH_PARSER
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 #endif
 
 /* pass open firmware flat tree */
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index 405de4e..0be962a 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -415,9 +415,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /*
  * Pass open firmware flat tree
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index c069426..01ca037 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -233,9 +233,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /*
  * Pass open firmware flat tree to kernel
diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index 169197f..7c4ba1e 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -284,9 +284,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /*
  * Pass open firmware flat tree to kernel
diff --git a/include/configs/MVBC_P.h b/include/configs/MVBC_P.h
index ade4893..eb0233b 100644
--- a/include/configs/MVBC_P.h
+++ b/include/configs/MVBC_P.h
@@ -274,7 +274,6 @@
  */
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_PROMPT_HUSH_PS2 	"> "
 #undef 	CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_PROMPT		"=> "
 #ifdef CONFIG_CMD_KGDB
diff --git a/include/configs/MVBLM7.h b/include/configs/MVBLM7.h
index a355ff4..1e43f45 100644
--- a/include/configs/MVBLM7.h
+++ b/include/configs/MVBLM7.h
@@ -291,7 +291,6 @@
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_AUTO_COMPLETE	/* add autocompletion support   */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 /* default load address */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000
diff --git a/include/configs/MVS1.h b/include/configs/MVS1.h
index 8350830..2b131b9 100644
--- a/include/configs/MVS1.h
+++ b/include/configs/MVS1.h
@@ -104,9 +104,6 @@
 #define	CONFIG_SYS_PROMPT		"=> "	/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* Hush parse for U-Boot ?? */
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/MVSMR.h b/include/configs/MVSMR.h
index f94ad5c..0b75b76 100644
--- a/include/configs/MVSMR.h
+++ b/include/configs/MVSMR.h
@@ -244,7 +244,6 @@
  */
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_PROMPT_HUSH_PS2 	"> "
 #undef 	CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_PROMPT		"=> "
 #ifdef CONFIG_CMD_KGDB
diff --git a/include/configs/NETPHONE.h b/include/configs/NETPHONE.h
index 31fe893..437a852 100644
--- a/include/configs/NETPHONE.h
+++ b/include/configs/NETPHONE.h
@@ -137,7 +137,6 @@
 #define	CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #define CONFIG_SYS_HUSH_PARSER	1
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/NETTA.h b/include/configs/NETTA.h
index fd3ab16..604938d 100644
--- a/include/configs/NETTA.h
+++ b/include/configs/NETTA.h
@@ -150,7 +150,6 @@
 #define	CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #define CONFIG_SYS_HUSH_PARSER	1
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/NETTA2.h b/include/configs/NETTA2.h
index 5ca01a0..de0f950 100644
--- a/include/configs/NETTA2.h
+++ b/include/configs/NETTA2.h
@@ -138,7 +138,6 @@
 #define	CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #define CONFIG_SYS_HUSH_PARSER	1
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/NSCU.h b/include/configs/NSCU.h
index 5015b79..9f462f4 100644
--- a/include/configs/NSCU.h
+++ b/include/configs/NSCU.h
@@ -139,9 +139,6 @@
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history
 */
 #define	CONFIG_SYS_HUSH_PARSER		1	/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 0da2f3b..171399d 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -461,9 +461,6 @@ extern unsigned long get_sdram_size(void);
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /*
  * Pass open firmware flat tree
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 5d36b41..202c365 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -189,7 +189,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 /* Video */
 #define CONFIG_FSL_DIU_FB
diff --git a/include/configs/P1023RDS.h b/include/configs/P1023RDS.h
index cf43959..d44c7f8 100644
--- a/include/configs/P1023RDS.h
+++ b/include/configs/P1023RDS.h
@@ -296,9 +296,6 @@ extern unsigned long get_clock_freq(void);
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /*
  * Pass open firmware flat tree
diff --git a/include/configs/P1_P2_RDB.h b/include/configs/P1_P2_RDB.h
index c0393b7..0952974 100644
--- a/include/configs/P1_P2_RDB.h
+++ b/include/configs/P1_P2_RDB.h
@@ -351,9 +351,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /*
  * Pass open firmware flat tree
diff --git a/include/configs/P2020COME.h b/include/configs/P2020COME.h
index a1b8e4d..50499ad 100644
--- a/include/configs/P2020COME.h
+++ b/include/configs/P2020COME.h
@@ -209,9 +209,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /*
  * Pass open firmware flat tree
diff --git a/include/configs/P2020DS.h b/include/configs/P2020DS.h
index 7005804..dfa37c4 100644
--- a/include/configs/P2020DS.h
+++ b/include/configs/P2020DS.h
@@ -377,9 +377,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /*
  * Pass open firmware flat tree
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 36c4310..723670e 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -273,7 +273,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT
diff --git a/include/configs/P3G4.h b/include/configs/P3G4.h
index f7ef643..4be6f70 100644
--- a/include/configs/P3G4.h
+++ b/include/configs/P3G4.h
@@ -56,7 +56,6 @@
 #define CONFIG_SYS_BOARD_NAME		"P3G4"
 
 #undef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * The following defines let you select what serial you want to use
diff --git a/include/configs/PCI405.h b/include/configs/PCI405.h
index 6be5c25..119819e 100644
--- a/include/configs/PCI405.h
+++ b/include/configs/PCI405.h
@@ -92,9 +92,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #define CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/PCIPPC2.h b/include/configs/PCIPPC2.h
index 7e1c11e..90cee88 100644
--- a/include/configs/PCIPPC2.h
+++ b/include/configs/PCIPPC2.h
@@ -95,9 +95,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #define	CONFIG_SYS_HUSH_PARSER		1	/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 #define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size	*/
 
 /* Print Buffer Size
diff --git a/include/configs/PCIPPC6.h b/include/configs/PCIPPC6.h
index c3f295b..10b81c1 100644
--- a/include/configs/PCIPPC6.h
+++ b/include/configs/PCIPPC6.h
@@ -97,9 +97,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #define CONFIG_SYS_HUSH_PARSER		1	/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 #define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size	*/
 
 /* Print Buffer Size
diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index 242aa31..713ea12 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -79,7 +79,6 @@
 #define CONFIG_CMD_BSP
 
 #define	 CONFIG_SYS_HUSH_PARSER
-#define	 CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 /**************************************************************
  * I2C Stuff:
  * the PIP405 is equiped with an Atmel 24C128/256 EEPROM at address
diff --git a/include/configs/PK1C20.h b/include/configs/PK1C20.h
index 3fe2b3e..403fafa 100644
--- a/include/configs/PK1C20.h
+++ b/include/configs/PK1C20.h
@@ -238,6 +238,5 @@
 #define CONFIG_SYS_MEMTEST_END		CONFIG_SYS_INIT_SP - 0x00020000
 
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #endif	/* __CONFIG_H */
diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h
index 1cce57e..1ee0c48 100644
--- a/include/configs/PLU405.h
+++ b/include/configs/PLU405.h
@@ -114,9 +114,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/PMC405.h b/include/configs/PMC405.h
index 193a34c..f6b0403 100644
--- a/include/configs/PMC405.h
+++ b/include/configs/PMC405.h
@@ -109,9 +109,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt */
 
 #undef CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser */
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h
index 2d45618..27a12b3 100644
--- a/include/configs/PPChameleonEVB.h
+++ b/include/configs/PPChameleonEVB.h
@@ -173,9 +173,6 @@
 #define CONFIG_SYS_PROMPT		"=> "	/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/QS823.h b/include/configs/QS823.h
index fa77ffd..a27faac 100644
--- a/include/configs/QS823.h
+++ b/include/configs/QS823.h
@@ -237,7 +237,6 @@
 #define CONFIG_SYS_PROMPT		"=> "		/* Monitor Command Prompt */
 
 #define CONFIG_SYS_HUSH_PARSER		1		/* use "hush" command parser */
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE		1024		/* Console I/O Buffer Size */
diff --git a/include/configs/QS850.h b/include/configs/QS850.h
index efa7bd6..f4d3760 100644
--- a/include/configs/QS850.h
+++ b/include/configs/QS850.h
@@ -237,7 +237,6 @@
 #define CONFIG_SYS_PROMPT		"=> "		/* Monitor Command Prompt */
 
 #define CONFIG_SYS_HUSH_PARSER		1		/* use "hush" command parser */
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE		1024		/* Console I/O Buffer Size */
diff --git a/include/configs/QS860T.h b/include/configs/QS860T.h
index 3156320..38570e4 100644
--- a/include/configs/QS860T.h
+++ b/include/configs/QS860T.h
@@ -146,7 +146,6 @@ CONFIG_SPI
 #define CONFIG_SYS_PROMPT		"=> "		/* Monitor Command Prompt */
 
 #define CONFIG_SYS_HUSH_PARSER		1		/* use "hush" command parser */
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE		1024		/* Console I/O Buffer Size */
diff --git a/include/configs/Rattler.h b/include/configs/Rattler.h
index 9ddf626..a96bcbc 100644
--- a/include/configs/Rattler.h
+++ b/include/configs/Rattler.h
@@ -170,7 +170,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_LONGHELP			/* undef to save memory	    */
 #define CONFIG_SYS_PROMPT		"=> "	/* Monitor Command Prompt   */
 #if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/SBC8540.h b/include/configs/SBC8540.h
index a22512a..c3239ef 100644
--- a/include/configs/SBC8540.h
+++ b/include/configs/SBC8540.h
@@ -214,9 +214,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /*
  * I2C
diff --git a/include/configs/SIMPC8313.h b/include/configs/SIMPC8313.h
index a7bb09a..8ea46e9 100644
--- a/include/configs/SIMPC8313.h
+++ b/include/configs/SIMPC8313.h
@@ -239,7 +239,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /* I2C */
 #define CONFIG_HARD_I2C		/* I2C with hardware support*/
diff --git a/include/configs/TK885D.h b/include/configs/TK885D.h
index 0c52775..4176c7f 100644
--- a/include/configs/TK885D.h
+++ b/include/configs/TK885D.h
@@ -178,9 +178,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/TOP860.h b/include/configs/TOP860.h
index 3a01292..36921ca 100644
--- a/include/configs/TOP860.h
+++ b/include/configs/TOP860.h
@@ -138,9 +138,6 @@
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* Hush parse for U-Boot	*/
 
-#ifdef	CONFIG_SYS_HUSH_PARSER
- #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
  #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 6ea3faa..ca415e4 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -625,7 +625,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define	CONFIG_SYS_HUSH_PARSER		1	/* use "hush" command parser	*/
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define CONFIG_SYS_CACHELINE_SIZE	32	/* For MPC5xxx CPUs */
 #if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h
index b26e4f4..a01b4a6 100644
--- a/include/configs/TQM823L.h
+++ b/include/configs/TQM823L.h
@@ -146,9 +146,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h
index a9bf525..1da4acd 100644
--- a/include/configs/TQM823M.h
+++ b/include/configs/TQM823M.h
@@ -141,9 +141,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/TQM8260.h b/include/configs/TQM8260.h
index 58c9716..7e24131 100644
--- a/include/configs/TQM8260.h
+++ b/include/configs/TQM8260.h
@@ -248,9 +248,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/TQM8272.h b/include/configs/TQM8272.h
index c2618dc..be977f1 100644
--- a/include/configs/TQM8272.h
+++ b/include/configs/TQM8272.h
@@ -311,9 +311,6 @@
 #if 0
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 #endif
 
 #if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 76aa780..a0268c3 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -336,9 +336,6 @@
 #define CONFIG_AUTO_COMPLETE		/* add autocompletion support */
 
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser */
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 	#define CONFIG_SYS_CBSIZE	1024	/* Console I/O Buffer Size */
diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h
index d217d3b..1c054f0 100644
--- a/include/configs/TQM850L.h
+++ b/include/configs/TQM850L.h
@@ -131,9 +131,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h
index 52e1125..46066df 100644
--- a/include/configs/TQM850M.h
+++ b/include/configs/TQM850M.h
@@ -132,9 +132,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h
index e36a2bb..dd2da94 100644
--- a/include/configs/TQM855L.h
+++ b/include/configs/TQM855L.h
@@ -135,9 +135,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h
index 473301a..95bc4d9 100644
--- a/include/configs/TQM855M.h
+++ b/include/configs/TQM855M.h
@@ -169,9 +169,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/TQM85xx.h b/include/configs/TQM85xx.h
index 09b0416..2a498ff 100644
--- a/include/configs/TQM85xx.h
+++ b/include/configs/TQM85xx.h
@@ -287,9 +287,6 @@
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_AUTO_COMPLETE	1	/* add autocompletion support */
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT		1
diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h
index ed61f0f..487666c 100644
--- a/include/configs/TQM860L.h
+++ b/include/configs/TQM860L.h
@@ -134,9 +134,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h
index 4d7effb..e8b77ea 100644
--- a/include/configs/TQM860M.h
+++ b/include/configs/TQM860M.h
@@ -135,9 +135,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h
index db7c1c3..334b7ec 100644
--- a/include/configs/TQM862L.h
+++ b/include/configs/TQM862L.h
@@ -138,9 +138,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h
index af528fd..1e2ad40 100644
--- a/include/configs/TQM862M.h
+++ b/include/configs/TQM862M.h
@@ -138,9 +138,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h
index b1cb406..a13c16a 100644
--- a/include/configs/TQM866M.h
+++ b/include/configs/TQM866M.h
@@ -181,9 +181,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h
index c960a54..7df76fb 100644
--- a/include/configs/TQM885D.h
+++ b/include/configs/TQM885D.h
@@ -176,9 +176,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h
index 082f3f9..6ad4a6b 100644
--- a/include/configs/VCMA9.h
+++ b/include/configs/VCMA9.h
@@ -83,7 +83,6 @@
 #define CONFIG_BOARD_LATE_INIT
 
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 #define CONFIG_CMDLINE_EDITING
 
 /*
diff --git a/include/configs/VOH405.h b/include/configs/VOH405.h
index 5b8f41f..f1032f0 100644
--- a/include/configs/VOH405.h
+++ b/include/configs/VOH405.h
@@ -112,9 +112,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h
index 2ca4ed0..43d6bb3 100644
--- a/include/configs/VOM405.h
+++ b/include/configs/VOM405.h
@@ -101,9 +101,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/W7OLMC.h b/include/configs/W7OLMC.h
index 1d97d3e..462b155 100644
--- a/include/configs/W7OLMC.h
+++ b/include/configs/W7OLMC.h
@@ -112,7 +112,6 @@
 #define CONFIG_SYS_PROMPT		"Wave7Optics> " /* Monitor Command Prompt	*/
 #undef  CONFIG_SYS_HUSH_PARSER				/* No hush parse for U-Boot       */
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 #endif
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE		1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/W7OLMG.h b/include/configs/W7OLMG.h
index 93caacc..f28f3e4 100644
--- a/include/configs/W7OLMG.h
+++ b/include/configs/W7OLMG.h
@@ -120,7 +120,6 @@
 #define CONFIG_SYS_PROMPT		"Wave7Optics> " /* Monitor Command Prompt	*/
 #undef  CONFIG_SYS_HUSH_PARSER				/* No hush parse for U-Boot       */
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 #endif
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE		1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/WUH405.h b/include/configs/WUH405.h
index 504ad96..5def36a 100644
--- a/include/configs/WUH405.h
+++ b/include/configs/WUH405.h
@@ -103,9 +103,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/ZPC1900.h b/include/configs/ZPC1900.h
index 4cda22f..381b546 100644
--- a/include/configs/ZPC1900.h
+++ b/include/configs/ZPC1900.h
@@ -154,7 +154,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_LONGHELP			/* undef to save memory	    */
 #define CONFIG_SYS_PROMPT		"=> "	/* Monitor Command Prompt   */
 #if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/ZUMA.h b/include/configs/ZUMA.h
index 5350f61..f6898d9 100644
--- a/include/configs/ZUMA.h
+++ b/include/configs/ZUMA.h
@@ -59,7 +59,6 @@
 #define CONFIG_SYS_BOARD_NAME		"Zuma APv2"
 
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * The following defines let you select what serial you want to use
diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h
index 1c13904..57f28d4 100644
--- a/include/configs/a4m072.h
+++ b/include/configs/a4m072.h
@@ -286,9 +286,6 @@
  */
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_CMDLINE_EDITING	1
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 #define CONFIG_SYS_LONGHELP			/* undef to save memory	    */
 #define CONFIG_SYS_PROMPT		"=> "	/* Monitor Command Prompt   */
 #if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index 37ba3c2..ffa2684 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -228,7 +228,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		V_PROMPT
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
 /* Print Buffer Size */
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index c98e030..d18bf4e 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -226,7 +226,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		V_PROMPT
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
 /* Print Buffer Size */
diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h
index 76ef56f..056a22a 100644
--- a/include/configs/amcc-common.h
+++ b/include/configs/amcc-common.h
@@ -112,9 +112,6 @@
 #define CONFIG_SYS_CONSOLE_INFO_QUIET		/* don't print console @ startup*/
 
 #define CONFIG_SYS_HUSH_PARSER			/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #define CONFIG_LOADS_ECHO		/* echo on for serial download	*/
 #define CONFIG_SYS_LOADS_BAUD_CHANGE		/* allow baudrate change	*/
diff --git a/include/configs/aria.h b/include/configs/aria.h
index d7885a6..fa8b6c0 100644
--- a/include/configs/aria.h
+++ b/include/configs/aria.h
@@ -337,7 +337,6 @@
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #endif
 
 /*
diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index f89a567..5c4cac9 100644
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -105,7 +105,6 @@
 #define CONFIG_CMDLINE_EDITING
 
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 #define CONFIG_MCFRTC
 #undef RTC_DEBUG
diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h
index 9f908ce..2abcaff 100644
--- a/include/configs/at91rm9200ek.h
+++ b/include/configs/at91rm9200ek.h
@@ -209,7 +209,6 @@
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_PROMPT		"U-Boot> "
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #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/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index 41a58c6..247b40a 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -345,7 +345,6 @@
 #define CONFIG_CMDLINE_EDITING		1
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * Size of malloc() pool
diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index a61a602..aae660c 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -188,7 +188,6 @@
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * Size of malloc() pool
diff --git a/include/configs/balloon3.h b/include/configs/balloon3.h
index 1417240..97fdc2c 100644
--- a/include/configs/balloon3.h
+++ b/include/configs/balloon3.h
@@ -80,7 +80,6 @@
  * HUSH Shell Configuration
  */
 #define	CONFIG_SYS_HUSH_PARSER		1
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define	CONFIG_SYS_LONGHELP
 #ifdef	CONFIG_SYS_HUSH_PARSER
diff --git a/include/configs/bct-brettl2.h b/include/configs/bct-brettl2.h
index e8e2667..ce09c2e 100644
--- a/include/configs/bct-brettl2.h
+++ b/include/configs/bct-brettl2.h
@@ -136,7 +136,6 @@
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 
 /*
diff --git a/include/configs/c2mon.h b/include/configs/c2mon.h
index 01e5e90..566c42b 100644
--- a/include/configs/c2mon.h
+++ b/include/configs/c2mon.h
@@ -107,9 +107,6 @@
 #define	CONFIG_SYS_PROMPT		"=> "	/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/calimain.h b/include/configs/calimain.h
index 81c9b9b..e31e40b 100644
--- a/include/configs/calimain.h
+++ b/include/configs/calimain.h
@@ -219,7 +219,6 @@
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CRC32_VERIFY
diff --git a/include/configs/cam_enc_4xx.h b/include/configs/cam_enc_4xx.h
index a62be1d..b7bc23c 100644
--- a/include/configs/cam_enc_4xx.h
+++ b/include/configs/cam_enc_4xx.h
@@ -154,7 +154,6 @@
 		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_LONGHELP
 
 #define CONFIG_MENU
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index b7a29bc..5f0afcd 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -248,7 +248,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_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT		"CM-T3x # "
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 /* Print Buffer Size */
diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
index 4a3b01d..1f02f3f 100644
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -93,7 +93,6 @@
  * HUSH Shell Configuration
  */
 #define	CONFIG_SYS_HUSH_PARSER		1
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define	CONFIG_SYS_LONGHELP
 #ifdef	CONFIG_SYS_HUSH_PARSER
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 92e3208..a2dc184 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -329,7 +329,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT
diff --git a/include/configs/csb272.h b/include/configs/csb272.h
index fb5f868..f21fa64 100644
--- a/include/configs/csb272.h
+++ b/include/configs/csb272.h
@@ -123,9 +123,6 @@
  *
  */
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser */
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "	/* hush shell secondary prompt */
-#endif
 
 #define CONFIG_SYS_LONGHELP			/* undef to save memory	*/
 #define CONFIG_SYS_PROMPT		"=> "	/* Monitor Command Prompt */
diff --git a/include/configs/csb472.h b/include/configs/csb472.h
index 5d18ac7..aed5fa6 100644
--- a/include/configs/csb472.h
+++ b/include/configs/csb472.h
@@ -122,9 +122,6 @@
  *
  */
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser */
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "	/* hush shell secondary prompt */
-#endif
 
 #define CONFIG_SYS_LONGHELP			/* undef to save memory	*/
 #define CONFIG_SYS_PROMPT		"=> "	/* Monitor Command Prompt */
diff --git a/include/configs/da830evm.h b/include/configs/da830evm.h
index 49da352..3c7da04 100644
--- a/include/configs/da830evm.h
+++ b/include/configs/da830evm.h
@@ -171,7 +171,6 @@
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_AUTO_COMPLETE	/* Won't work with hush so far, may be later */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CRC32_VERIFY
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 0adbb1f..e6adb1f 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -237,7 +237,6 @@
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CRC32_VERIFY
diff --git a/include/configs/davinci_dm355evm.h b/include/configs/davinci_dm355evm.h
index bd17419..a30d24c 100644
--- a/include/configs/davinci_dm355evm.h
+++ b/include/configs/davinci_dm355evm.h
@@ -139,7 +139,6 @@
 		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_LONGHELP
 
 #ifdef CONFIG_NAND_DAVINCI
diff --git a/include/configs/davinci_dm355leopard.h b/include/configs/davinci_dm355leopard.h
index b232c50..1cd3d2e 100644
--- a/include/configs/davinci_dm355leopard.h
+++ b/include/configs/davinci_dm355leopard.h
@@ -107,7 +107,6 @@
 		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_LONGHELP
 
 #ifdef CONFIG_NAND_DAVINCI
diff --git a/include/configs/davinci_dm365evm.h b/include/configs/davinci_dm365evm.h
index 92d7227..bcf10ca 100644
--- a/include/configs/davinci_dm365evm.h
+++ b/include/configs/davinci_dm365evm.h
@@ -173,7 +173,6 @@
 		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_LONGHELP
 
 #ifdef CONFIG_NAND_DAVINCI
diff --git a/include/configs/davinci_dm6467evm.h b/include/configs/davinci_dm6467evm.h
index 57a6148..6734ea3 100644
--- a/include/configs/davinci_dm6467evm.h
+++ b/include/configs/davinci_dm6467evm.h
@@ -119,7 +119,6 @@ extern unsigned int davinci_arm_clk_get(void);
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CRC32_VERIFY
diff --git a/include/configs/davinci_dvevm.h b/include/configs/davinci_dvevm.h
index f0cc780..e4443ec 100644
--- a/include/configs/davinci_dvevm.h
+++ b/include/configs/davinci_dvevm.h
@@ -170,7 +170,6 @@
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_AUTO_COMPLETE		/* Won't work with hush so far, may be later */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CRC32_VERIFY
diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h
index c07002a..93df4ff 100644
--- a/include/configs/davinci_schmoogie.h
+++ b/include/configs/davinci_schmoogie.h
@@ -114,7 +114,6 @@
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_AUTO_COMPLETE		/* Won't work with hush so far, may be later */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CRC32_VERIFY
diff --git a/include/configs/davinci_sffsdr.h b/include/configs/davinci_sffsdr.h
index a62d7aa..23b0ba7 100644
--- a/include/configs/davinci_sffsdr.h
+++ b/include/configs/davinci_sffsdr.h
@@ -104,7 +104,6 @@
 #define CONFIG_AUTO_COMPLETE		/* Won't work with hush so far,
 					 * may be later */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CRC32_VERIFY
diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h
index fb26643..36a8c06 100644
--- a/include/configs/davinci_sonata.h
+++ b/include/configs/davinci_sonata.h
@@ -160,7 +160,6 @@
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_AUTO_COMPLETE		/* Won't work with hush so far, may be later */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CRC32_VERIFY
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index f9b20fc..c67a413 100644
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -247,7 +247,6 @@
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
 #define CONFIG_AUTO_COMPLETE		1
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT		"OMAP3 DevKit8000 # "
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
 /* Print Buffer Size */
diff --git a/include/configs/dig297.h b/include/configs/dig297.h
index 92f37fd..9c82b75 100644
--- a/include/configs/dig297.h
+++ b/include/configs/dig297.h
@@ -230,7 +230,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		"DIG297# "
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 /* Print Buffer Size */
diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h
index d517334..c2f49ae 100644
--- a/include/configs/digsy_mtc.h
+++ b/include/configs/digsy_mtc.h
@@ -412,7 +412,6 @@
 #define CONFIG_CMDLINE_EDITING	1
 #define CONFIG_SYS_PROMPT	"=> "
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define CONFIG_AUTOBOOT_KEYED
 #define CONFIG_AUTOBOOT_PROMPT "autoboot in %d seconds\n", bootdelay
diff --git a/include/configs/dns325.h b/include/configs/dns325.h
index b7a89d3..1f632ac 100644
--- a/include/configs/dns325.h
+++ b/include/configs/dns325.h
@@ -102,7 +102,6 @@
  * Use the HUSH parser
  */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * Console configuration
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index 08b7c65..349f105 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -140,7 +140,6 @@
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CRC32_VERIFY
diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index 9b7cc66..6a67aa5 100644
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -237,7 +237,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /* Enable command line editing */
 #define CONFIG_CMDLINE_EDITING
diff --git a/include/configs/efikamx.h b/include/configs/efikamx.h
index eb7d72b..143b0f0 100644
--- a/include/configs/efikamx.h
+++ b/include/configs/efikamx.h
@@ -229,7 +229,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		"Efika> "
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
diff --git a/include/configs/enbw_cmc.h b/include/configs/enbw_cmc.h
index 7dc6cca..c1a0f6a 100644
--- a/include/configs/enbw_cmc.h
+++ b/include/configs/enbw_cmc.h
@@ -246,7 +246,6 @@
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CRC32_VERIFY
diff --git a/include/configs/ep8248.h b/include/configs/ep8248.h
index 2b40f59..e669dc6 100644
--- a/include/configs/ep8248.h
+++ b/include/configs/ep8248.h
@@ -154,7 +154,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_LONGHELP			/* undef to save memory	    */
 #define CONFIG_SYS_PROMPT		"=> "	/* Monitor Command Prompt   */
 #if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/ep8260.h b/include/configs/ep8260.h
index b562037..2736b2a 100644
--- a/include/configs/ep8260.h
+++ b/include/configs/ep8260.h
@@ -290,7 +290,6 @@
    with a somewhat smapper memory footprint.
 */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 
 /*
diff --git a/include/configs/ep82xxm.h b/include/configs/ep82xxm.h
index 04c0708..8d78921 100644
--- a/include/configs/ep82xxm.h
+++ b/include/configs/ep82xxm.h
@@ -165,7 +165,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_LONGHELP			/* undef to save memory	    */
 #define CONFIG_SYS_PROMPT		"ep82xxm=> "	/* Monitor Command Prompt   */
 #if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index 5aed0ed..f89e9ea 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -274,7 +274,6 @@
 /* Misc. u-boot settings */
 #define CONFIG_SYS_PROMPT		"U-Boot> "
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + 16 \
diff --git a/include/configs/flea3.h b/include/configs/flea3.h
index c26b974..071fe9f 100644
--- a/include/configs/flea3.h
+++ b/include/configs/flea3.h
@@ -132,7 +132,6 @@
 #define CONFIG_SYS_PROMPT	"flea3 U-Boot > "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_HUSH_PARSER	/* Use the HUSH parser */
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
diff --git a/include/configs/galaxy5200.h b/include/configs/galaxy5200.h
index a38298f..e43cc28 100644
--- a/include/configs/galaxy5200.h
+++ b/include/configs/galaxy5200.h
@@ -373,7 +373,6 @@
 #define CONFIG_DISPLAY_BOARDINFO 1
 
 #define CONFIG_SYS_HUSH_PARSER 1
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 #define CONFIG_CRC32_VERIFY  1
 
diff --git a/include/configs/grasshopper.h b/include/configs/grasshopper.h
index cc84c9c..07e8a49 100644
--- a/include/configs/grasshopper.h
+++ b/include/configs/grasshopper.h
@@ -137,7 +137,6 @@
 
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"~> "
 #define CONFIG_CMDLINE_EDITING
 
 #define CONFIG_ATMEL_USART
diff --git a/include/configs/grsim.h b/include/configs/grsim.h
index f3639dd..f64d3d3 100644
--- a/include/configs/grsim.h
+++ b/include/configs/grsim.h
@@ -94,9 +94,6 @@
 
 #undef	CONFIG_BOOTARGS
 /*#define CONFIG_SYS_HUSH_PARSER 0*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #define	CONFIG_EXTRA_ENV_SETTINGS					\
 	"netdev=eth0\0"							\
diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h
index fb9a3f9..cde2f70 100644
--- a/include/configs/grsim_leon2.h
+++ b/include/configs/grsim_leon2.h
@@ -91,9 +91,6 @@
 
 #undef	CONFIG_BOOTARGS
 /*#define CONFIG_SYS_HUSH_PARSER 0*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #define	CONFIG_EXTRA_ENV_SETTINGS					\
 	"netdev=eth0\0"							\
diff --git a/include/configs/gw8260.h b/include/configs/gw8260.h
index 7935aea..18d6c65 100644
--- a/include/configs/gw8260.h
+++ b/include/configs/gw8260.h
@@ -331,7 +331,6 @@
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 #endif
 
 /* What is the address of IO controller */
diff --git a/include/configs/hawkboard.h b/include/configs/hawkboard.h
index 0916043..56266ee 100644
--- a/include/configs/hawkboard.h
+++ b/include/configs/hawkboard.h
@@ -171,7 +171,6 @@
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CRC32_VERIFY
diff --git a/include/configs/igep0020.h b/include/configs/igep0020.h
index 9dfc2e3..28bacbe 100644
--- a/include/configs/igep0020.h
+++ b/include/configs/igep0020.h
@@ -188,7 +188,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		"U-Boot # "
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 /* Print Buffer Size */
diff --git a/include/configs/igep0030.h b/include/configs/igep0030.h
index 891c3e4..c72c80c 100644
--- a/include/configs/igep0030.h
+++ b/include/configs/igep0030.h
@@ -186,7 +186,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		"U-Boot # "
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 /* Print Buffer Size */
diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h
index fea40fc..2252d93 100644
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -93,7 +93,6 @@
 #define CONFIG_SYS_LONGHELP	/* undef to save memory	    */
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_PROMPT	"Integrator-AP # "	/* Monitor Command Prompt   */
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"# "
 #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/jadecpu.h b/include/configs/jadecpu.h
index 2981f09..004d744 100644
--- a/include/configs/jadecpu.h
+++ b/include/configs/jadecpu.h
@@ -139,7 +139,6 @@
 #define CONFIG_CMD_CACHE
 
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 /* USB */
 #define CONFIG_USB_OHCI_NEW
diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h
index f5adccb..b5c6fae 100644
--- a/include/configs/jupiter.h
+++ b/include/configs/jupiter.h
@@ -263,9 +263,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size  */
 #else
diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 7a01705..6d83da4 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -57,7 +57,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_LONGHELP			/* undef to save memory	  */
 #define CONFIG_SYS_PROMPT		"=> "	/* Monitor Command Prompt */
 #if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index 6cbc752..cd8d59f 100644
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -143,7 +143,6 @@
  * Use the HUSH parser
  */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * Console configuration
diff --git a/include/configs/lubbock.h b/include/configs/lubbock.h
index 7c8eb64..4b9b290 100644
--- a/include/configs/lubbock.h
+++ b/include/configs/lubbock.h
@@ -108,7 +108,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_HUSH_PARSER		1
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define CONFIG_SYS_LONGHELP				/* undef to save memory		*/
 #ifdef CONFIG_SYS_HUSH_PARSER
diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h
index 405bc69..1d89176 100644
--- a/include/configs/lwmon.h
+++ b/include/configs/lwmon.h
@@ -216,9 +216,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #define	CONFIG_SYS_HUSH_PARSER		1	/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
index cf21df0..d80641c 100644
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -457,9 +457,6 @@
 #define CONFIG_SYS_PROMPT	        "=> "	/* Monitor Command Prompt	*/
 
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	        1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index 58ed100..2acb932 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -123,7 +123,6 @@
 #define	CONFIG_AUTO_COMPLETE			/* Command auto complete */
 #define	CONFIG_CMDLINE_EDITING			/* Command history etc */
 #define	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * Serial Driver
diff --git a/include/configs/mcc200.h b/include/configs/mcc200.h
index b56b273..1867eb6 100644
--- a/include/configs/mcc200.h
+++ b/include/configs/mcc200.h
@@ -189,7 +189,6 @@
 #define CONFIG_BOOTCOMMAND	"run flash_self"
 
 #define CONFIG_SYS_HUSH_PARSER		1	/* use "hush" command parser	*/
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * IPB Bus clocking configuration.
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index a51047f..7b875bb 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -226,7 +226,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		V_PROMPT
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
 /* Print Buffer Size */
diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h
index 67b793e..1aa19b0 100644
--- a/include/configs/mecp5123.h
+++ b/include/configs/mecp5123.h
@@ -236,7 +236,6 @@
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 #endif
 
 /* I2C */
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index efca136..295d123 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -331,9 +331,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef CONFIG_SYS_HUSH_PARSER
-# define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* Enable flat device tree support */
 #define CONFIG_LMB		1
diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h
index bdcae59..f6a4497 100644
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -100,7 +100,6 @@
 
 #define CONFIG_CMDLINE_EDITING		1	/* add command line history	*/
 #define	CONFIG_SYS_HUSH_PARSER		1	/* use "hush" command parser	*/
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define CONFIG_ETHADDR		00:50:C2:40:10:00
 #define CONFIG_OVERWRITE_ETHADDR_ONCE	1
diff --git a/include/configs/mpc5121-common.h b/include/configs/mpc5121-common.h
index ceaa0c3..435a093 100644
--- a/include/configs/mpc5121-common.h
+++ b/include/configs/mpc5121-common.h
@@ -42,8 +42,5 @@
 #define CONFIG_CMDLINE_EDITING		1	/* command line history */
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #endif /* __MPC5121_COMMON_H */
diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h
index 5dcc2ce..5a90b23 100644
--- a/include/configs/mpc5121ads.h
+++ b/include/configs/mpc5121ads.h
@@ -304,7 +304,6 @@
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 #endif
 
 /*
diff --git a/include/configs/mpc7448hpc2.h b/include/configs/mpc7448hpc2.h
index c0c95ed..5004fcd 100644
--- a/include/configs/mpc7448hpc2.h
+++ b/include/configs/mpc7448hpc2.h
@@ -79,7 +79,6 @@
 /*#define CONFIG_SYS_HUSH_PARSER */
 #undef CONFIG_SYS_HUSH_PARSER
 
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /* Pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h
index 11374a2..dd5bcb5 100644
--- a/include/configs/mpc8308_p1m.h
+++ b/include/configs/mpc8308_p1m.h
@@ -316,7 +316,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 /* Pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/mpq101.h b/include/configs/mpq101.h
index 6613f35..8b9d8a3 100644
--- a/include/configs/mpq101.h
+++ b/include/configs/mpq101.h
@@ -322,9 +322,6 @@
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
 
-#ifdef CONFIG_SYS_HUSH_PARSER
-# define CONFIG_SYS_PROMPT_HUSH_PS2  "> "
-#endif
 
 #define CONFIG_LOADS_ECHO            /* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */
diff --git a/include/configs/muas3001.h b/include/configs/muas3001.h
index 18bd37e..b8c52af 100644
--- a/include/configs/muas3001.h
+++ b/include/configs/muas3001.h
@@ -196,7 +196,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_LONGHELP			/* undef to save memory	    */
 #define CONFIG_SYS_PROMPT		"=> "	/* Monitor Command Prompt   */
 #if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/mx1ads.h b/include/configs/mx1ads.h
index 81476ec..665e33d 100644
--- a/include/configs/mx1ads.h
+++ b/include/configs/mx1ads.h
@@ -109,7 +109,6 @@
  */
 
 #define CONFIG_SYS_HUSH_PARSER		1
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define CONFIG_SYS_LONGHELP				/* undef to save memory		*/
 
diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index c75fbfa..a19de40 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -113,7 +113,6 @@
 #define CONFIG_AUTO_COMPLETE		/* Command auto complete */
 #define CONFIG_CMDLINE_EDITING		/* Command history etc */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * Serial Driver
diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
index 881032f..a0e14f5 100644
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@@ -147,7 +147,6 @@
 #define CONFIG_SYS_PROMPT	"MX35 U-Boot > "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_HUSH_PARSER	/* Use the HUSH parser */
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 24305d3..f6dacf6 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -188,7 +188,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		"MX51EVK U-Boot > "
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h
index 333ba61..f4512ff 100644
--- a/include/configs/mx53ard.h
+++ b/include/configs/mx53ard.h
@@ -139,7 +139,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_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT		"MX53ARD U-Boot > "
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
index 453cef9..a5f32e3 100644
--- a/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@@ -149,7 +149,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_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT		"MX53EVK U-Boot > "
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index ba6492e..6268a49 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -144,7 +144,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_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT		"MX53LOCO U-Boot > "
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h
index 7cd7173..0d7086d 100644
--- a/include/configs/mx53smd.h
+++ b/include/configs/mx53smd.h
@@ -137,7 +137,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_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT		"MX53SMD U-Boot > "
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h
index 357d8c5..abe29c1 100644
--- a/include/configs/mx6qarm2.h
+++ b/include/configs/mx6qarm2.h
@@ -125,7 +125,6 @@
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT		"MX6QARM2 U-Boot > "
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE		256
diff --git a/include/configs/mx6qsabrelite.h b/include/configs/mx6qsabrelite.h
index f30b7e7..d62e5b9 100644
--- a/include/configs/mx6qsabrelite.h
+++ b/include/configs/mx6qsabrelite.h
@@ -156,7 +156,6 @@
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 #define CONFIG_SYS_PROMPT	       "MX6QSABRELITE U-Boot > "
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE	       256
diff --git a/include/configs/nhk8815.h b/include/configs/nhk8815.h
index de20771..37a66ab 100644
--- a/include/configs/nhk8815.h
+++ b/include/configs/nhk8815.h
@@ -54,7 +54,6 @@
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_PROMPT		"Nomadik> "
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #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/nios2-generic.h b/include/configs/nios2-generic.h
index 17017a5..a383fa4 100644
--- a/include/configs/nios2-generic.h
+++ b/include/configs/nios2-generic.h
@@ -152,6 +152,5 @@
 #define CONFIG_CMDLINE_EDITING
 
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index c2a79c6..e8a6305 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -312,7 +312,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		"OMAP3 beagleboard.org # "
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
 /* Print Buffer Size */
diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h
index 23af7a2..20a5478 100644
--- a/include/configs/omap3_evm_common.h
+++ b/include/configs/omap3_evm_common.h
@@ -196,7 +196,6 @@
  * ----------------------------------------------------------------------------
  */
 #define CONFIG_SYS_PROMPT		"OMAP3_EVM # "
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #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 ccb7f6a..bd07d2d 100644
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -258,7 +258,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		"OMAP Logic # "
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
 /* Print Buffer Size */
diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h
index ee803c7..f4cfcdb 100644
--- a/include/configs/omap3_mvblx.h
+++ b/include/configs/omap3_mvblx.h
@@ -218,7 +218,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		"mvblx # "
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 /* Print Buffer Size */
diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
index fee375f..8602306 100644
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.h
@@ -203,7 +203,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		"Overo # "
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
 /* Print Buffer Size */
diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index cf46f4a..0034f33 100644
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -189,7 +189,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		"Pandora # "
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
 /* Print Buffer Size */
diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h
index d5e83de..779343f 100644
--- a/include/configs/omap3_sdp3430.h
+++ b/include/configs/omap3_sdp3430.h
@@ -261,7 +261,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		"OMAP34XX SDP # "
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
 /* Print Buffer Size */
diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h
index fa75413..f961e5a 100644
--- a/include/configs/omap3_zoom1.h
+++ b/include/configs/omap3_zoom1.h
@@ -214,7 +214,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		"OMAP3 Zoom1 # "
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
 /* Print Buffer Size */
diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
index 5bad901..65170c7 100644
--- a/include/configs/omap4_common.h
+++ b/include/configs/omap4_common.h
@@ -185,7 +185,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_CBSIZE		512
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/omap5_evm.h b/include/configs/omap5_evm.h
index 2925bef..fb0216d 100644
--- a/include/configs/omap5_evm.h
+++ b/include/configs/omap5_evm.h
@@ -189,7 +189,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		"OMAP5430 EVM # "
 #define CONFIG_SYS_CBSIZE		256
 /* Print Buffer Size */
diff --git a/include/configs/origen.h b/include/configs/origen.h
index 0f250db..93129e8 100644
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -101,7 +101,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_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT		"ORIGEN # "
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size*/
 #define CONFIG_SYS_PBSIZE		384	/* Print Buffer Size */
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 9fc6cec..dadf2f5 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -520,9 +520,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /*
  * Pass open firmware flat tree
diff --git a/include/configs/p3mx.h b/include/configs/p3mx.h
index e44009e..8c459cb 100644
--- a/include/configs/p3mx.h
+++ b/include/configs/p3mx.h
@@ -283,7 +283,6 @@
  * Miscellaneous configurable options
  *----------------------------------------------------------------------*/
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define CONFIG_SYS_LONGHELP			/* undef to save memory		*/
 #define CONFIG_SYS_PROMPT	        "=> "	/* Monitor Command Prompt	*/
diff --git a/include/configs/palmld.h b/include/configs/palmld.h
index c4ea5ff..70b794d 100644
--- a/include/configs/palmld.h
+++ b/include/configs/palmld.h
@@ -108,7 +108,6 @@
  * HUSH Shell Configuration
  */
 #define	CONFIG_SYS_HUSH_PARSER		1
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define	CONFIG_SYS_LONGHELP
 #ifdef	CONFIG_SYS_HUSH_PARSER
diff --git a/include/configs/palmtc.h b/include/configs/palmtc.h
index 9fa6733..7cf2c63 100644
--- a/include/configs/palmtc.h
+++ b/include/configs/palmtc.h
@@ -109,7 +109,6 @@
  * HUSH Shell Configuration
  */
 #define	CONFIG_SYS_HUSH_PARSER		1
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define	CONFIG_SYS_LONGHELP
 #ifdef	CONFIG_SYS_HUSH_PARSER
diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h
index a044346..c766330 100644
--- a/include/configs/pm9g45.h
+++ b/include/configs/pm9g45.h
@@ -177,7 +177,6 @@
 #define CONFIG_CMDLINE_EDITING		1
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * Size of malloc() pool
diff --git a/include/configs/pxa255_idp.h b/include/configs/pxa255_idp.h
index 387661b..f143ed0 100644
--- a/include/configs/pxa255_idp.h
+++ b/include/configs/pxa255_idp.h
@@ -222,7 +222,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_HUSH_PARSER		1
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define CONFIG_SYS_LONGHELP				/* undef to save memory		*/
 #ifdef CONFIG_SYS_HUSH_PARSER
diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index da32b30..306c173 100644
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -105,7 +105,6 @@
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #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 */
diff --git a/include/configs/qong.h b/include/configs/qong.h
index 3b63ac2..e824e17 100644
--- a/include/configs/qong.h
+++ b/include/configs/qong.h
@@ -210,9 +210,6 @@
 
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_HUSH_PARSER			/* Use the HUSH parser */
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #define CONFIG_MISC_INIT_R
 /*-----------------------------------------------------------------------
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 5ce5b48..cbaffb1 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -175,7 +175,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_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT	"Goni # "
 #define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE	384	/* Print Buffer Size */
diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index a79e183..a332f28 100644
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -200,7 +200,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_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT	"Universal # "
 #define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE	384	/* Print Buffer Size */
diff --git a/include/configs/sacsng.h b/include/configs/sacsng.h
index f3b0fc1..54d55a0 100644
--- a/include/configs/sacsng.h
+++ b/include/configs/sacsng.h
@@ -498,7 +498,6 @@
 
 #undef  CONFIG_SYS_HUSH_PARSER
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 #endif
 
 /* When CONFIG_TIMESTAMP is selected, the timestamp (date and time)
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 834fe8f..a829888 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -45,7 +45,6 @@
 
 #define CONFIG_SYS_PROMPT		"=>"	/* Command Prompt */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_LONGHELP			/* #undef to save memory */
 #define CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size */
 
diff --git a/include/configs/sbc405.h b/include/configs/sbc405.h
index cab6660..5abcda3 100644
--- a/include/configs/sbc405.h
+++ b/include/configs/sbc405.h
@@ -132,9 +132,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #undef CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index 37e7c9b..9593e2d 100644
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -294,9 +294,6 @@
 #define CONFIG_AUTO_COMPLETE		/* add autocompletion support   */
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index a1be11e..966ad69 100644
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -431,9 +431,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT		1
diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h
index 647304f..5103f45 100644
--- a/include/configs/sbc8560.h
+++ b/include/configs/sbc8560.h
@@ -201,9 +201,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT                1
diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
index 0331edb..adcfa2f 100644
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -273,7 +273,6 @@
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 #endif
 
 /*
diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index bfbb2c3..8792c85 100644
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -104,7 +104,6 @@
 #define CONFIG_CMD_USB
 
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_CMDLINE_EDITING
 
 /* autoboot */
diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h
index a5ff9b4..50426ad 100644
--- a/include/configs/smdk5250.h
+++ b/include/configs/smdk5250.h
@@ -110,7 +110,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_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT		"SMDK5250 # "
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE		384	/* Print Buffer Size */
diff --git a/include/configs/smdk6400.h b/include/configs/smdk6400.h
index 47a3d41..04caeef 100644
--- a/include/configs/smdk6400.h
+++ b/include/configs/smdk6400.h
@@ -88,9 +88,6 @@
 #define CONFIG_SERIAL1          1	/* we use SERIAL 1 on SMDK6400	*/
 
 #define CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #define CONFIG_CMDLINE_EDITING
 
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index 5ab8665..fd9f96d 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -169,7 +169,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		"SMDKC100 # "
 #define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE	384	/* Print Buffer Size */
diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
index 3e09d09..a539826 100644
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@@ -100,7 +100,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_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT		"SMDKV310 # "
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size*/
 #define CONFIG_SYS_PBSIZE		384	/* Print Buffer Size */
diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h
index bb2a463..8af3c02 100644
--- a/include/configs/snapper9260.h
+++ b/include/configs/snapper9260.h
@@ -159,7 +159,6 @@
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /* U-Boot memory settings */
 #define CONFIG_SYS_MALLOC_LEN		(1 << 20)
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index bbb5902..11b6315 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -226,9 +226,6 @@
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_AUTO_COMPLETE	1	/* add autocompletion support */
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 
 /*
diff --git a/include/configs/sorcery.h b/include/configs/sorcery.h
index fe40bf0..f67898e 100644
--- a/include/configs/sorcery.h
+++ b/include/configs/sorcery.h
@@ -140,9 +140,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /*
  * Flexbus Chipselect configuration
diff --git a/include/configs/spc1920.h b/include/configs/spc1920.h
index a92b53c..3bed5ea 100644
--- a/include/configs/spc1920.h
+++ b/include/configs/spc1920.h
@@ -110,7 +110,6 @@
 #define	CONFIG_SYS_LONGHELP				/* undef to save memory		*/
 #define	CONFIG_SYS_PROMPT		"=>"		/* Monitor Command Prompt	*/
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h
index 4acb86c..893e958 100644
--- a/include/configs/stxgp3.h
+++ b/include/configs/stxgp3.h
@@ -170,7 +170,6 @@
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 #endif
 
 /*
diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h
index 2b5d654..5f1858f 100644
--- a/include/configs/stxssa.h
+++ b/include/configs/stxssa.h
@@ -185,9 +185,6 @@
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_AUTO_COMPLETE	1	/* add autocompletion support   */
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT		1
diff --git a/include/configs/stxxtc.h b/include/configs/stxxtc.h
index cbaa643..93e7f3a 100644
--- a/include/configs/stxxtc.h
+++ b/include/configs/stxxtc.h
@@ -133,7 +133,6 @@
 #define	CONFIG_SYS_PROMPT	"xtc> "		/* Monitor Command Prompt	*/
 
 #define CONFIG_SYS_HUSH_PARSER	1
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/svm_sc8xx.h b/include/configs/svm_sc8xx.h
index 0d939ee..91686d6 100644
--- a/include/configs/svm_sc8xx.h
+++ b/include/configs/svm_sc8xx.h
@@ -158,7 +158,6 @@
 #define	CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 #endif
 
 #if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index b250594..24a4410 100644
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -153,7 +153,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_CMDLINE_EDITING
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
diff --git a/include/configs/tegra2-common.h b/include/configs/tegra2-common.h
index a3d73de..6dc0707 100644
--- a/include/configs/tegra2-common.h
+++ b/include/configs/tegra2-common.h
@@ -127,7 +127,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		V_PROMPT
 /*
  * Increasing the size of the IO buffer as default nfsargs size is more
diff --git a/include/configs/tnetv107x_evm.h b/include/configs/tnetv107x_evm.h
index 2dd1a33..2272ad2 100644
--- a/include/configs/tnetv107x_evm.h
+++ b/include/configs/tnetv107x_evm.h
@@ -114,7 +114,6 @@
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CRC32_VERIFY
diff --git a/include/configs/trats.h b/include/configs/trats.h
index 8e6c3da..6672e93 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -151,7 +151,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_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT		"TRATS # "
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE		384	/* Print Buffer Size */
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index 8583fa8..c160acb 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -218,7 +218,6 @@
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
 #define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT		"OMAP3 Tricorder # "
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
 /* Print Buffer Size */
diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h
index c020ff4..b4ec8f0 100644
--- a/include/configs/trizepsiv.h
+++ b/include/configs/trizepsiv.h
@@ -150,7 +150,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_HUSH_PARSER		1
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define CONFIG_SYS_LONGHELP				/* undef to save memory		*/
 #ifdef CONFIG_SYS_HUSH_PARSER
diff --git a/include/configs/tt01.h b/include/configs/tt01.h
index 9c1d525..2b2e7fd 100644
--- a/include/configs/tt01.h
+++ b/include/configs/tt01.h
@@ -248,7 +248,6 @@
 
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define CONFIG_SYS_LONGHELP			/* undef to save memory */
 #define CONFIG_SYS_PROMPT	"TT01> "
diff --git a/include/configs/u8500_href.h b/include/configs/u8500_href.h
index d3a56f5..8f7169f 100644
--- a/include/configs/u8500_href.h
+++ b/include/configs/u8500_href.h
@@ -156,7 +156,6 @@
 #define CONFIG_SYS_LOADS_BAUD_CHANGE
 
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_CMDLINE_EDITING
 
 #define CONFIG_SETUP_MEMORY_TAGS	2
diff --git a/include/configs/uc100.h b/include/configs/uc100.h
index 62ef2c5..8c8fb5a 100644
--- a/include/configs/uc100.h
+++ b/include/configs/uc100.h
@@ -162,9 +162,6 @@
 #if 0
 #define	CONFIG_SYS_HUSH_PARSER		1	/* use "hush" command parser	*/
 #endif
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h
index 7e1eea0..49a2ff5 100644
--- a/include/configs/ve8313.h
+++ b/include/configs/ve8313.h
@@ -276,7 +276,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 #if defined(CONFIG_PCI)
 /*
diff --git a/include/configs/virtlab2.h b/include/configs/virtlab2.h
index bf882b0..4bb96cc 100644
--- a/include/configs/virtlab2.h
+++ b/include/configs/virtlab2.h
@@ -140,9 +140,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define	CONFIG_SYS_HUSH_PARSER		1	/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/vision2.h b/include/configs/vision2.h
index 76ab1bd..24905a0 100644
--- a/include/configs/vision2.h
+++ b/include/configs/vision2.h
@@ -176,7 +176,6 @@
 #define CONFIG_SYS_HZ			1000
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"Vision II U-boot > "
 
 /*
  * Stack sizes
diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h
index b486ab2..610dfa7 100644
--- a/include/configs/vme8349.h
+++ b/include/configs/vme8349.h
@@ -227,9 +227,6 @@
 #define CONFIG_AUTO_COMPLETE		/* add autocompletion support */
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT
diff --git a/include/configs/vpac270.h b/include/configs/vpac270.h
index ed18dbe..01f0b6c 100644
--- a/include/configs/vpac270.h
+++ b/include/configs/vpac270.h
@@ -143,7 +143,6 @@
  * HUSH Shell Configuration
  */
 #define	CONFIG_SYS_HUSH_PARSER		1
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define	CONFIG_SYS_LONGHELP
 #ifdef	CONFIG_SYS_HUSH_PARSER
diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h
index a0cc247..0ed3bf4 100644
--- a/include/configs/xaeniax.h
+++ b/include/configs/xaeniax.h
@@ -119,7 +119,6 @@
 #define CONFIG_SYS_LONGHELP				/* undef to save memory	*/
 #define CONFIG_SYS_HUSH_PARSER		1
 
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #ifdef CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_PROMPT		"u-boot$ "	/* Monitor Command Prompt */
diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h
index bd7bac0..1235c37 100644
--- a/include/configs/xilinx-ppc.h
+++ b/include/configs/xilinx-ppc.h
@@ -84,7 +84,6 @@
 #define CONFIG_VERSION_VARIABLE		/* include version env variable */
 #define CONFIG_SYS_CONSOLE_INFO_QUIET	/* don't print console @ startup */
 #define CONFIG_SYS_HUSH_PARSER		/* Use the HUSH parser          */
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_LOADS_ECHO		/* echo on for serial download  */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	/* allow baudrate change        */
 #define CONFIG_SYS_BOOTMAPSZ		(8 << 20)
diff --git a/include/configs/xpedite1000.h b/include/configs/xpedite1000.h
index d72921e..4703d9d 100644
--- a/include/configs/xpedite1000.h
+++ b/include/configs/xpedite1000.h
@@ -128,7 +128,6 @@ extern void out32(unsigned int, unsigned long);
  * Use the HUSH parser
  */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * NOR flash configuration
diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h
index ccc478b..8a153e9 100644
--- a/include/configs/xpedite517x.h
+++ b/include/configs/xpedite517x.h
@@ -244,7 +244,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
  * Use the HUSH parser
  */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * Pass open firmware flat tree
diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h
index c5e3186..33bf91f 100644
--- a/include/configs/xpedite520x.h
+++ b/include/configs/xpedite520x.h
@@ -206,7 +206,6 @@
  * Use the HUSH parser
  */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * Pass open firmware flat tree
diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h
index 1d4b8e4..6979168 100644
--- a/include/configs/xpedite537x.h
+++ b/include/configs/xpedite537x.h
@@ -244,7 +244,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
  * Use the HUSH parser
  */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * Pass open firmware flat tree
diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h
index 48c723c..4a540ad 100644
--- a/include/configs/xpedite550x.h
+++ b/include/configs/xpedite550x.h
@@ -234,7 +234,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
  * Use the HUSH parser
  */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * Pass open firmware flat tree
diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h
index cacf7ea..a330bd0 100644
--- a/include/configs/zipitz2.h
+++ b/include/configs/zipitz2.h
@@ -132,7 +132,6 @@ unsigned char zipitz2_spi_read(void);
  * HUSH Shell Configuration
  */
 #define	CONFIG_SYS_HUSH_PARSER		1
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define	CONFIG_SYS_LONGHELP				/* undef to save memory	*/
 #ifdef	CONFIG_SYS_HUSH_PARSER
diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h
index 489a41c..9df201e 100644
--- a/include/configs/zmx25.h
+++ b/include/configs/zmx25.h
@@ -104,7 +104,6 @@
 #define CONFIG_CMD_USB
 
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 /*
  * USB
-- 
1.7.0.4

^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [U-Boot] [PATCH v2 1/2] CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there
  2012-04-26 22:46 [U-Boot] [PATCH v2 1/2] CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there Tom Rini
  2012-04-26 22:46 ` [U-Boot] [PATCH v2 2/2] hush.c: Move default CONFIG_SYS_PROMPT_HUSH_PS2 to hush.c Tom Rini
@ 2012-04-26 23:53 ` Tom Rini
  2012-04-27  5:34 ` Mike Frysinger
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 25+ messages in thread
From: Tom Rini @ 2012-04-26 23:53 UTC (permalink / raw)
  To: u-boot

On Thu, Apr 26, 2012 at 3:46 PM, Tom Rini <trini@ti.com> wrote:
> We provide a default table of { 9600, 19200, 38400, 57600, 115200 }
> in <config_fallbacks.h> which mkconfig places after <configs/...h> in
> the generated config file. ?This is used when a board has not set its
> own table. ?A number of boards set values below 9600 but it is my belief
> that this was done for completeness rather than as a requirement so they
> have opted to the new default table.
>
> Signed-off-by: Tom Rini <trini@ti.com>

The second part moves CONFIG_SYS_PROMPT_HUSH_P2's location and is at:
http://www.denx.de/wiki/pub/U-Boot/TooBigPatches/0002-hush.c-Move-default-CONFIG_SYS_PROMPT_HUSH_PS2-to-hu.patch

-- 
Tom

^ permalink raw reply	[flat|nested] 25+ messages in thread

* [U-Boot] [PATCH v2 1/2] CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there
  2012-04-26 22:46 [U-Boot] [PATCH v2 1/2] CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there Tom Rini
  2012-04-26 22:46 ` [U-Boot] [PATCH v2 2/2] hush.c: Move default CONFIG_SYS_PROMPT_HUSH_PS2 to hush.c Tom Rini
  2012-04-26 23:53 ` [U-Boot] [PATCH v2 1/2] CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there Tom Rini
@ 2012-04-27  5:34 ` Mike Frysinger
  2012-04-27 14:31   ` Tom Rini
  2012-04-27  6:31 ` Wolfgang Denk
                   ` (2 subsequent siblings)
  5 siblings, 1 reply; 25+ messages in thread
From: Mike Frysinger @ 2012-04-27  5:34 UTC (permalink / raw)
  To: u-boot

On Thursday 26 April 2012 18:46:35 Tom Rini wrote:
> --- /dev/null
> +++ b/include/config_fallbacks.h
> @@ -0,0 +1,16 @@
> +/*
> + * Copyright 2012 Texas Instruments
> + *
> + * This file is licensed under the terms of the GNU General Public
> + * License Version 2. This file is licensed "as is" without any
> + * warranty of any kind, whether express or implied.
> + */

loath as i am to point this out, but this is "GPLv2-only".  u-boot requires 
"GPLv2+" now.
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20120427/40604ad4/attachment.pgp>

^ permalink raw reply	[flat|nested] 25+ messages in thread

* [U-Boot] [PATCH v2 2/2] hush.c: Move default CONFIG_SYS_PROMPT_HUSH_PS2 to hush.c
  2012-04-26 22:46 ` [U-Boot] [PATCH v2 2/2] hush.c: Move default CONFIG_SYS_PROMPT_HUSH_PS2 to hush.c Tom Rini
@ 2012-04-27  5:35   ` Mike Frysinger
  2012-04-29 15:13   ` Stefano Babic
  1 sibling, 0 replies; 25+ messages in thread
From: Mike Frysinger @ 2012-04-27  5:35 UTC (permalink / raw)
  To: u-boot

Acked-by: Mike Frysinger <vapier@gentoo.org>
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20120427/1eda3e28/attachment.pgp>

^ permalink raw reply	[flat|nested] 25+ messages in thread

* [U-Boot] [PATCH v2 1/2] CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there
  2012-04-26 22:46 [U-Boot] [PATCH v2 1/2] CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there Tom Rini
                   ` (2 preceding siblings ...)
  2012-04-27  5:34 ` Mike Frysinger
@ 2012-04-27  6:31 ` Wolfgang Denk
  2012-04-27 14:53   ` Tom Rini
  2012-04-27 18:03   ` Tom Rini
  2012-06-19 20:50 ` Wolfgang Denk
  2012-06-19 22:54 ` [U-Boot] [PATCH v4 " Tom Rini
  5 siblings, 2 replies; 25+ messages in thread
From: Wolfgang Denk @ 2012-04-27  6:31 UTC (permalink / raw)
  To: u-boot

Dear Tom Rini,

In message <1335480396-29478-1-git-send-email-trini@ti.com> you wrote:
> We provide a default table of { 9600, 19200, 38400, 57600, 115200 }
> in <config_fallbacks.h> which mkconfig places after <configs/...h> in
> the generated config file.  This is used when a board has not set its
> own table.  A number of boards set values below 9600 but it is my belief
> that this was done for completeness rather than as a requirement so they
> have opted to the new default table.

Argh... But you cannot change this without explicit ACK from the
respective board maintainers.

Technically, I don't like the name "config_fallbacks.h"; how about
"config_defaults.h" instead?


Finally, your patch does not apply (I guess it is an incremental patch
over obsolete code?).

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Einstein argued that there must be simplified explanations of nature,
because God is not capricious or arbitrary. No  such  faith  comforts
the software engineer.                             - Fred Brooks, Jr.

^ permalink raw reply	[flat|nested] 25+ messages in thread

* [U-Boot] [PATCH v2 1/2] CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there
  2012-04-27  5:34 ` Mike Frysinger
@ 2012-04-27 14:31   ` Tom Rini
  0 siblings, 0 replies; 25+ messages in thread
From: Tom Rini @ 2012-04-27 14:31 UTC (permalink / raw)
  To: u-boot

On 04/26/2012 10:34 PM, Mike Frysinger wrote:
> On Thursday 26 April 2012 18:46:35 Tom Rini wrote:
>> --- /dev/null
>> +++ b/include/config_fallbacks.h
>> @@ -0,0 +1,16 @@
>> +/*
>> + * Copyright 2012 Texas Instruments
>> + *
>> + * This file is licensed under the terms of the GNU General Public
>> + * License Version 2. This file is licensed "as is" without any
>> + * warranty of any kind, whether express or implied.
>> + */
>
> loath as i am to point this out, but this is "GPLv2-only".  u-boot requires
> "GPLv2+" now.

Note this was a copy/paste from config_cmd_default or 
config_cmd_defaults.h.  I'll fix it for the next go-round.

-- 
Tom

^ permalink raw reply	[flat|nested] 25+ messages in thread

* [U-Boot] [PATCH v2 1/2] CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there
  2012-04-27  6:31 ` Wolfgang Denk
@ 2012-04-27 14:53   ` Tom Rini
  2012-04-27 16:17     ` Wolfgang Denk
  2012-04-27 18:03   ` Tom Rini
  1 sibling, 1 reply; 25+ messages in thread
From: Tom Rini @ 2012-04-27 14:53 UTC (permalink / raw)
  To: u-boot

On 04/26/2012 11:31 PM, Wolfgang Denk wrote:
> Dear Tom Rini,
>
> In message<1335480396-29478-1-git-send-email-trini@ti.com>  you wrote:
>> We provide a default table of { 9600, 19200, 38400, 57600, 115200 }
>> in<config_fallbacks.h>  which mkconfig places after<configs/...h>  in
>> the generated config file.  This is used when a board has not set its
>> own table.  A number of boards set values below 9600 but it is my belief
>> that this was done for completeness rather than as a requirement so they
>> have opted to the new default table.
>
> Argh... But you cannot change this without explicit ACK from the
> respective board maintainers.

Then we're really SOL here.  Even if we limit it to "I dropped 
300/600/900/1200/2400/4800 baud rate support, is that ok".

> Technically, I don't like the name "config_fallbacks.h"; how about
> "config_defaults.h" instead?

Sure.

> Finally, your patch does not apply (I guess it is an incremental patch
> over obsolete code?).

That's odd actually, it was on v2012.04'ish and a pull and rebase -q 
went quietly.  It was build-tested on MAKEALL -a powerpc/arm/x86.

-- 
Tom

^ permalink raw reply	[flat|nested] 25+ messages in thread

* [U-Boot] [PATCH v2 1/2] CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there
  2012-04-27 14:53   ` Tom Rini
@ 2012-04-27 16:17     ` Wolfgang Denk
  2012-04-27 16:47       ` Tom Rini
  0 siblings, 1 reply; 25+ messages in thread
From: Wolfgang Denk @ 2012-04-27 16:17 UTC (permalink / raw)
  To: u-boot

Dear Tom Rini,

In message <4F9AB2EE.3070202@ti.com> you wrote:
>
> > Argh... But you cannot change this without explicit ACK from the
> > respective board maintainers.
> 
> Then we're really SOL here.  Even if we limit it to "I dropped 
> 300/600/900/1200/2400/4800 baud rate support, is that ok".

What's wrong with keeping a customizes #define for the boards that use
nonstandard settings?

> > Finally, your patch does not apply (I guess it is an incremental patch
> > over obsolete code?).
> 
> That's odd actually, it was on v2012.04'ish and a pull and rebase -q 
> went quietly.  It was build-tested on MAKEALL -a powerpc/arm/x86.

But you see the problem in the patch, don't you?

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"It follows that any commander in chief who undertakes to carry out a
plan which he considers defective is at fault; he must put forth  his
reasons,  insist  of  the  plan being changed, and finally tender his
resignation rather than be the instrument of his army's downfall."
- Napoleon, "Military Maxims and Thought"

^ permalink raw reply	[flat|nested] 25+ messages in thread

* [U-Boot] [PATCH v2 1/2] CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there
  2012-04-27 16:17     ` Wolfgang Denk
@ 2012-04-27 16:47       ` Tom Rini
  2012-04-27 17:19         ` Wolfgang Denk
  0 siblings, 1 reply; 25+ messages in thread
From: Tom Rini @ 2012-04-27 16:47 UTC (permalink / raw)
  To: u-boot

On 04/27/2012 09:17 AM, Wolfgang Denk wrote:
> Dear Tom Rini,
>
> In message<4F9AB2EE.3070202@ti.com>  you wrote:
>>
>>> Argh... But you cannot change this without explicit ACK from the
>>> respective board maintainers.
>>
>> Then we're really SOL here.  Even if we limit it to "I dropped
>> 300/600/900/1200/2400/4800 baud rate support, is that ok".
>
> What's wrong with keeping a customizes #define for the boards that use
> nonstandard settings?

As I said in the commit message, I believe it was done for completeness 
rather than need, but if you like I can change it to just delete 
4800/9600/19200/38400/115200 (and reversed) and leave the rest alone. 
And then I'll drop it from the boards I own :)

>>> Finally, your patch does not apply (I guess it is an incremental patch
>>> over obsolete code?).
>>
>> That's odd actually, it was on v2012.04'ish and a pull and rebase -q
>> went quietly.  It was build-tested on MAKEALL -a powerpc/arm/x86.
>
> But you see the problem in the patch, don't you?

With it not applying? No...

-- 
Tom

^ permalink raw reply	[flat|nested] 25+ messages in thread

* [U-Boot] [PATCH v2 1/2] CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there
  2012-04-27 16:47       ` Tom Rini
@ 2012-04-27 17:19         ` Wolfgang Denk
  2012-04-27 17:31           ` Tom Rini
  0 siblings, 1 reply; 25+ messages in thread
From: Wolfgang Denk @ 2012-04-27 17:19 UTC (permalink / raw)
  To: u-boot

Dear Tom,

In message <4F9ACDB8.8000705@ti.com> you wrote:
>
> >> Then we're really SOL here.  Even if we limit it to "I dropped
> >> 300/600/900/1200/2400/4800 baud rate support, is that ok".
> >
> > What's wrong with keeping a customizes #define for the boards that use
> > nonstandard settings?
> 
> As I said in the commit message, I believe it was done for completeness 
> rather than need, but if you like I can change it to just delete 

As long as we don't know it exactly and for sure, we should not change
the configurationof boards that don't belong to us (unless the changes
are obviously harmless or clear bug fixes).

> 4800/9600/19200/38400/115200 (and reversed) and leave the rest alone. 
> And then I'll drop it from the boards I own :)

OK.

> > But you see the problem in the patch, don't you?
> 
> With it not applying? No...

Well, your patch reads for example:

diff --git a/include/configs/AP1000.h b/include/configs/AP1000.h
index b598371..fd074fb 100644
--- a/include/configs/AP1000.h
+++ b/include/configs/AP1000.h
@@ -142,7 +142,6 @@
 #define CONFIG_SYS_INIT_CHAN2		0
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE  \
     {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 


But include/configs/AP1000.h does not contain any such line as
"#undef CONFIG_SYS_BAUDRATE_TABLE"; the result looks like this:

-> patch -p1 --dry-run <~/Mail/U-Boot/15922
patching file include/config_cmd_defaults.h
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file include/config_cmd_defaults.h.rej
patching file include/config_fallbacks.h
patching file include/configs/AP1000.h
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file include/configs/AP1000.h.rej
patching file include/configs/APC405.h
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file include/configs/APC405.h.rej
...


Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de
The universe does not have laws - it has habits, and  habits  can  be
broken.

^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [U-Boot] [PATCH v2 1/2] CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there
  2012-04-27 17:19         ` Wolfgang Denk
@ 2012-04-27 17:31           ` Tom Rini
  0 siblings, 0 replies; 25+ messages in thread
From: Tom Rini @ 2012-04-27 17:31 UTC (permalink / raw)
  To: u-boot

On 04/27/2012 10:19 AM, Wolfgang Denk wrote:
> Dear Tom,
>
> In message<4F9ACDB8.8000705@ti.com>  you wrote:
>>
>>>> Then we're really SOL here.  Even if we limit it to "I dropped
>>>> 300/600/900/1200/2400/4800 baud rate support, is that ok".
>>>
>>> What's wrong with keeping a customizes #define for the boards that use
>>> nonstandard settings?
>>
>> As I said in the commit message, I believe it was done for completeness
>> rather than need, but if you like I can change it to just delete
>
> As long as we don't know it exactly and for sure, we should not change
> the configuration of boards that don't belong to us (unless the changes
> are obviously harmless or clear bug fixes).

Alright, I'll drop those boards then.

>> 4800/9600/19200/38400/115200 (and reversed) and leave the rest alone.
>> And then I'll drop it from the boards I own :)
>
> OK.
>
>>> But you see the problem in the patch, don't you?
>>
>> With it not applying? No...
>
> Well, your patch reads for example:
>
> diff --git a/include/configs/AP1000.h b/include/configs/AP1000.h
> index b598371..fd074fb 100644
> --- a/include/configs/AP1000.h
> +++ b/include/configs/AP1000.h
> @@ -142,7 +142,6 @@
>   #define CONFIG_SYS_INIT_CHAN2		0
>
>   /* The following table includes the supported baudrates */
> -#undef CONFIG_SYS_BAUDRATE_TABLE
>   #define CONFIG_SYS_BAUDRATE_TABLE  \
>       {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}

guh.. I'll go kick git some then.

-- 
Tom

^ permalink raw reply	[flat|nested] 25+ messages in thread

* [U-Boot] [PATCH v2 1/2] CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there
  2012-04-27  6:31 ` Wolfgang Denk
  2012-04-27 14:53   ` Tom Rini
@ 2012-04-27 18:03   ` Tom Rini
  2012-04-27 18:37     ` Mike Frysinger
  2012-04-27 18:40     ` Wolfgang Denk
  1 sibling, 2 replies; 25+ messages in thread
From: Tom Rini @ 2012-04-27 18:03 UTC (permalink / raw)
  To: u-boot

On 04/26/2012 11:31 PM, Wolfgang Denk wrote:
> Dear Tom Rini,
>
> In message<1335480396-29478-1-git-send-email-trini@ti.com>  you wrote:
>> We provide a default table of { 9600, 19200, 38400, 57600, 115200 }
>> in<config_fallbacks.h>  which mkconfig places after<configs/...h>  in
>> the generated config file.  This is used when a board has not set its
>> own table.  A number of boards set values below 9600 but it is my belief
>> that this was done for completeness rather than as a requirement so they
>> have opted to the new default table.
>
> Argh... But you cannot change this without explicit ACK from the
> respective board maintainers.
>
> Technically, I don't like the name "config_fallbacks.h"; how about
> "config_defaults.h" instead?

We have config_defaults.h today, which comes before <configs/...h>

-- 
Tom

^ permalink raw reply	[flat|nested] 25+ messages in thread

* [U-Boot] [PATCH v2 1/2] CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there
  2012-04-27 18:03   ` Tom Rini
@ 2012-04-27 18:37     ` Mike Frysinger
  2012-04-27 18:40     ` Wolfgang Denk
  1 sibling, 0 replies; 25+ messages in thread
From: Mike Frysinger @ 2012-04-27 18:37 UTC (permalink / raw)
  To: u-boot

On Friday 27 April 2012 14:03:28 Tom Rini wrote:
> On 04/26/2012 11:31 PM, Wolfgang Denk wrote:
> > Tom Rini wrote:
> >> We provide a default table of { 9600, 19200, 38400, 57600, 115200 }
> >> in<config_fallbacks.h>  which mkconfig places after<configs/...h>  in
> >> the generated config file.  This is used when a board has not set its
> >> own table.  A number of boards set values below 9600 but it is my belief
> >> that this was done for completeness rather than as a requirement so they
> >> have opted to the new default table.
> > 
> > Argh... But you cannot change this without explicit ACK from the
> > respective board maintainers.
> > 
> > Technically, I don't like the name "config_fallbacks.h"; how about
> > "config_defaults.h" instead?
> 
> We have config_defaults.h today, which comes before <configs/...h>

right ... that's why i didn't suggest it :)

i agree "config_fallbacks.h" sucks; i suggested it for lack of a better one
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20120427/39e82f11/attachment.pgp>

^ permalink raw reply	[flat|nested] 25+ messages in thread

* [U-Boot] [PATCH v2 1/2] CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there
  2012-04-27 18:03   ` Tom Rini
  2012-04-27 18:37     ` Mike Frysinger
@ 2012-04-27 18:40     ` Wolfgang Denk
  2012-04-27 19:02       ` Tom Rini
  1 sibling, 1 reply; 25+ messages in thread
From: Wolfgang Denk @ 2012-04-27 18:40 UTC (permalink / raw)
  To: u-boot

Dear Tom Rini,

In message <4F9ADF70.4080009@ti.com> you wrote:
>
> > Technically, I don't like the name "config_fallbacks.h"; how about
> > "config_defaults.h" instead?
> 
> We have config_defaults.h today, which comes before <configs/...h>

Yes, why not use it for this purpose as well?  It seems the
appropriate place to me.


Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
The language provides a programmer with a set of conceptual tools; if
these are inadequate for the task, they will simply be  ignored.  For
example, seriously restricting the concept of a pointer simply forces
the  programmer  to use a vector plus integer arithmetic to implement
structures, pointer, etc. Good  design  and  the  absence  of  errors
cannot  be guaranteed by mere language features. - Bjarne Stroustrup,
"The C++ Programming Language"

^ permalink raw reply	[flat|nested] 25+ messages in thread

* [U-Boot] [PATCH v2 1/2] CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there
  2012-04-27 18:40     ` Wolfgang Denk
@ 2012-04-27 19:02       ` Tom Rini
  0 siblings, 0 replies; 25+ messages in thread
From: Tom Rini @ 2012-04-27 19:02 UTC (permalink / raw)
  To: u-boot

On 04/27/2012 11:40 AM, Wolfgang Denk wrote:
> Dear Tom Rini,
>
> In message<4F9ADF70.4080009@ti.com>  you wrote:
>>
>>> Technically, I don't like the name "config_fallbacks.h"; how about
>>> "config_defaults.h" instead?
>>
>> We have config_defaults.h today, which comes before<configs/...h>
>
> Yes, why not use it for this purpose as well?  It seems the
> appropriate place to me.

Order of operations.  We would have to move it to after <configs/...h> 
(and change behavior, and break a few board files, git grep 
CONFIG_BOOTM_ include/) or make everyone not using the standard undef to 
get their table, which I started down (as you could see from the patch) 
but it's quite invasive.  Or we add a fallbacks file and have config.h be:
First: default commands <config_cmd_default.h>
Second: Global defaults <config_defaults.h>
Third: board <configs/...h>
Fourth: arch fallbacks <asm/config.h>
Fifth: Global fallbacks

Since developers should be tweaking just their board config file I'm 
calling what's before defaults and what's after fallbacks..

-- 
Tom

^ permalink raw reply	[flat|nested] 25+ messages in thread

* [U-Boot] [PATCH v2 2/2] hush.c: Move default CONFIG_SYS_PROMPT_HUSH_PS2 to hush.c
  2012-04-26 22:46 ` [U-Boot] [PATCH v2 2/2] hush.c: Move default CONFIG_SYS_PROMPT_HUSH_PS2 to hush.c Tom Rini
  2012-04-27  5:35   ` Mike Frysinger
@ 2012-04-29 15:13   ` Stefano Babic
  1 sibling, 0 replies; 25+ messages in thread
From: Stefano Babic @ 2012-04-29 15:13 UTC (permalink / raw)
  To: u-boot

On 27/04/2012 00:46, Tom Rini wrote:
> Exactly one board has defined CONFIG_SYS_PROMPT_HUSH_PS2 to a value
> different than "> " which is vision2.  I have Cc'd the maintainer here
> as I strongly suspect this is a bug rather than intentional behavior.

Hi Tom,

you're right, it was n ot my intention, thanks for fixing it.

Acked-by: Stefano Babic <sbabic@denx.de>

Best regards,
Stefano Babic

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

^ permalink raw reply	[flat|nested] 25+ messages in thread

* [U-Boot] [PATCH v2 1/2] CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there
  2012-04-26 22:46 [U-Boot] [PATCH v2 1/2] CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there Tom Rini
                   ` (3 preceding siblings ...)
  2012-04-27  6:31 ` Wolfgang Denk
@ 2012-06-19 20:50 ` Wolfgang Denk
  2012-06-19 21:31   ` Tom Rini
  2012-06-20 14:52   ` Tom Rini
  2012-06-19 22:54 ` [U-Boot] [PATCH v4 " Tom Rini
  5 siblings, 2 replies; 25+ messages in thread
From: Wolfgang Denk @ 2012-06-19 20:50 UTC (permalink / raw)
  To: u-boot

Dear Tom Rini,

In message <1335480396-29478-1-git-send-email-trini@ti.com> you wrote:
> We provide a default table of { 9600, 19200, 38400, 57600, 115200 }
> in <config_fallbacks.h> which mkconfig places after <configs/...h> in
> the generated config file.  This is used when a board has not set its
> own table.  A number of boards set values below 9600 but it is my belief
> that this was done for completeness rather than as a requirement so they
> have opted to the new default table.
> 
> Signed-off-by: Tom Rini <trini@ti.com>

Sorry, this doesn't apply any more,  Can you please rebase?

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
The word "fit", as I understand it, means "appropriate to a purpose",
and I would say the body of the Dean is supremely appropriate to  the
purpose of sitting around all day and eating big heavy meals.
                                 - Terry Pratchett, _Moving Pictures_

^ permalink raw reply	[flat|nested] 25+ messages in thread

* [U-Boot] [PATCH v2 1/2] CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there
  2012-06-19 20:50 ` Wolfgang Denk
@ 2012-06-19 21:31   ` Tom Rini
  2012-06-20 14:52   ` Tom Rini
  1 sibling, 0 replies; 25+ messages in thread
From: Tom Rini @ 2012-06-19 21:31 UTC (permalink / raw)
  To: u-boot

On Tue, Jun 19, 2012 at 10:50:37PM +0200, Wolfgang Denk wrote:
> Dear Tom Rini,
> 
> In message <1335480396-29478-1-git-send-email-trini@ti.com> you wrote:
> > We provide a default table of { 9600, 19200, 38400, 57600, 115200 }
> > in <config_fallbacks.h> which mkconfig places after <configs/...h> in
> > the generated config file.  This is used when a board has not set its
> > own table.  A number of boards set values below 9600 but it is my belief
> > that this was done for completeness rather than as a requirement so they
> > have opted to the new default table.
> > 
> > Signed-off-by: Tom Rini <trini@ti.com>
> 
> Sorry, this doesn't apply any more,  Can you please rebase?

Rebased, building a whole lot of things now to avoid brown paper bags.

-- 
Tom

^ permalink raw reply	[flat|nested] 25+ messages in thread

* [U-Boot] [PATCH v4 1/2] CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there
  2012-04-26 22:46 [U-Boot] [PATCH v2 1/2] CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there Tom Rini
                   ` (4 preceding siblings ...)
  2012-06-19 20:50 ` Wolfgang Denk
@ 2012-06-19 22:54 ` Tom Rini
  2012-06-19 22:54   ` [U-Boot] [PATCH v4 2/2] hush.c: Move default CONFIG_SYS_PROMPT_HUSH_PS2 to hush.c Tom Rini
  2012-06-20 18:36   ` [U-Boot] [PATCH v4 1/2] CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there Wolfgang Denk
  5 siblings, 2 replies; 25+ messages in thread
From: Tom Rini @ 2012-06-19 22:54 UTC (permalink / raw)
  To: u-boot

We provide a default table of { 9600, 19200, 38400, 57600, 115200 }
in <config_fallbacks.h> which mkconfig places after <configs/...h> in
the generated config file.  This is used when a board has not set its
own table.

Signed-off-by: Tom Rini <trini@ti.com>

---
Changes in v4:
- Rebase to current master
- Catch a few more boards after auditing all users after rebase

Changes in v3:
- Only modify boards that had the default values, ignoring ones that set
  slower rates too (per Wolfgang Denk)

Changes in v2:
- Create, use <config_fallbacks.h> rather than mkconfig directly for
  this table (per Mike Frysinger).
---
 arch/blackfin/include/asm/config.h     |    3 ---
 board/fads/fads.h                      |    2 --
 include/config_fallbacks.h             |   16 ++++++++++++++++
 include/configs/A3000.h                |    1 -
 include/configs/AMX860.h               |    2 --
 include/configs/Adder.h                |    2 --
 include/configs/BMW.h                  |    1 -
 include/configs/CPC45.h                |    1 -
 include/configs/CPU86.h                |    2 --
 include/configs/CPU87.h                |    2 --
 include/configs/CU824.h                |    1 -
 include/configs/EB+MCF-EV123.h         |    1 -
 include/configs/ELPT860.h              |    1 -
 include/configs/EP88x.h                |    2 --
 include/configs/ESTEEM192E.h           |    4 ----
 include/configs/ETX094.h               |    2 --
 include/configs/FADS823.h              |    2 --
 include/configs/FADS850SAR.h           |    2 --
 include/configs/FLAGADM.h              |    2 --
 include/configs/FPS850L.h              |    2 --
 include/configs/FPS860L.h              |    2 --
 include/configs/GEN860T.h              |   10 ----------
 include/configs/HIDDEN_DRAGON.h        |    1 -
 include/configs/IAD210.h               |    2 --
 include/configs/ICU862.h               |    2 --
 include/configs/IDS8247.h              |    2 --
 include/configs/IP860.h                |    2 --
 include/configs/IPHASE4539.h           |    2 --
 include/configs/ISPAN.h                |    2 --
 include/configs/IVML24.h               |    2 --
 include/configs/IVMS8.h                |    2 --
 include/configs/LANTEC.h               |    2 --
 include/configs/M5208EVBE.h            |    1 -
 include/configs/M52277EVB.h            |    1 -
 include/configs/M5235EVB.h             |    1 -
 include/configs/M5249EVB.h             |    1 -
 include/configs/M5253DEMO.h            |    1 -
 include/configs/M5253EVBE.h            |    1 -
 include/configs/M5271EVB.h             |    1 -
 include/configs/M5272C3.h              |    1 -
 include/configs/M5275EVB.h             |    1 -
 include/configs/M5282EVB.h             |    1 -
 include/configs/M53017EVB.h            |    1 -
 include/configs/M5329EVB.h             |    1 -
 include/configs/M5373EVB.h             |    1 -
 include/configs/M54451EVB.h            |    1 -
 include/configs/M54455EVB.h            |    1 -
 include/configs/M5475EVB.h             |    1 -
 include/configs/M5485EVB.h             |    1 -
 include/configs/MBX.h                  |    2 --
 include/configs/MBX860T.h              |    2 --
 include/configs/MHPC.h                 |    2 --
 include/configs/MOUSSE.h               |    2 --
 include/configs/MUSENKI.h              |    1 -
 include/configs/MVBLUE.h               |    1 -
 include/configs/MVS1.h                 |    2 --
 include/configs/NETPHONE.h             |    2 --
 include/configs/NETTA.h                |    2 --
 include/configs/NETTA2.h               |    2 --
 include/configs/NETVIA.h               |    2 --
 include/configs/NSCU.h                 |    2 --
 include/configs/NX823.h                |    2 --
 include/configs/PCIPPC2.h              |    1 -
 include/configs/PCIPPC6.h              |    1 -
 include/configs/PM826.h                |    2 --
 include/configs/PM828.h                |    2 --
 include/configs/PMC405DE.h             |    4 ----
 include/configs/PN62.h                 |    1 -
 include/configs/QS823.h                |    2 --
 include/configs/QS850.h                |    2 --
 include/configs/QS860T.h               |    2 --
 include/configs/R360MPI.h              |    2 --
 include/configs/RBC823.h               |    2 --
 include/configs/RPXClassic.h           |    2 --
 include/configs/RPXlite.h              |    2 --
 include/configs/RPXlite_DW.h           |    1 -
 include/configs/RPXsuper.h             |    3 ---
 include/configs/RRvision.h             |    2 --
 include/configs/SCM.h                  |    2 --
 include/configs/SM850.h                |    2 --
 include/configs/SPD823TS.h             |    2 --
 include/configs/SX1.h                  |    2 --
 include/configs/SXNI855T.h             |    2 --
 include/configs/Sandpoint8240.h        |    1 -
 include/configs/Sandpoint8245.h        |    1 -
 include/configs/TASREG.h               |    1 -
 include/configs/TK885D.h               |    2 --
 include/configs/TQM823L.h              |    2 --
 include/configs/TQM823M.h              |    2 --
 include/configs/TQM8260.h              |    2 --
 include/configs/TQM8272.h              |    2 --
 include/configs/TQM850L.h              |    2 --
 include/configs/TQM850M.h              |    2 --
 include/configs/TQM855L.h              |    2 --
 include/configs/TQM855M.h              |    2 --
 include/configs/TQM860L.h              |    2 --
 include/configs/TQM860M.h              |    2 --
 include/configs/TQM862L.h              |    2 --
 include/configs/TQM862M.h              |    2 --
 include/configs/TQM866M.h              |    2 --
 include/configs/TQM885D.h              |    2 --
 include/configs/VCMA9.h                |    3 ---
 include/configs/VoVPN-GW.h             |    3 ---
 include/configs/a320evb.h              |    3 ---
 include/configs/adp-ag101.h            |    3 ---
 include/configs/adp-ag101p.h           |    3 ---
 include/configs/adp-ag102.h            |    3 ---
 include/configs/afeb9260.h             |    1 -
 include/configs/apollon.h              |    1 -
 include/configs/astro_mcf5373l.h       |    1 -
 include/configs/at91rm9200ek.h         |    1 -
 include/configs/at91sam9260ek.h        |    1 -
 include/configs/at91sam9261ek.h        |    1 -
 include/configs/at91sam9263ek.h        |    1 -
 include/configs/at91sam9m10g45ek.h     |    1 -
 include/configs/at91sam9rlek.h         |    1 -
 include/configs/atc.h                  |    2 --
 include/configs/balloon3.h             |    1 -
 include/configs/c2mon.h                |    2 --
 include/configs/ca9x4_ct_vxp.h         |    1 -
 include/configs/calimain.h             |    1 -
 include/configs/cam_enc_4xx.h          |    1 -
 include/configs/cm4008.h               |    2 --
 include/configs/cm41xx.h               |    2 --
 include/configs/cobra5272.h            |    1 -
 include/configs/colibri_pxa270.h       |    1 -
 include/configs/cpu9260.h              |    1 -
 include/configs/cpuat91.h              |    1 -
 include/configs/da830evm.h             |    1 -
 include/configs/da850evm.h             |    1 -
 include/configs/davinci_dm355evm.h     |    1 -
 include/configs/davinci_dm355leopard.h |    1 -
 include/configs/davinci_dm365evm.h     |    1 -
 include/configs/davinci_dm6467evm.h    |    1 -
 include/configs/davinci_dvevm.h        |    1 -
 include/configs/davinci_schmoogie.h    |    1 -
 include/configs/davinci_sffsdr.h       |    1 -
 include/configs/davinci_sonata.h       |    1 -
 include/configs/dbau1x00.h             |    1 -
 include/configs/debris.h               |    1 -
 include/configs/eXalion.h              |    3 ---
 include/configs/ea20.h                 |    1 -
 include/configs/eb_cpux9k2.h           |    2 --
 include/configs/efikamx.h              |    1 -
 include/configs/enbw_cmc.h             |    1 -
 include/configs/ep8260.h               |    3 ---
 include/configs/ethernut5.h            |    1 -
 include/configs/flea3.h                |    1 -
 include/configs/grasshopper.h          |    1 -
 include/configs/gw8260.h               |    3 ---
 include/configs/hawkboard.h            |    1 -
 include/configs/hermes.h               |    2 --
 include/configs/highbank.h             |    1 -
 include/configs/idmr.h                 |    1 -
 include/configs/ima3-mx53.h            |    1 -
 include/configs/imx27lite-common.h     |    1 -
 include/configs/imx31_litekit.h        |    1 -
 include/configs/imx31_phycore.h        |    1 -
 include/configs/incaip.h               |    3 ---
 include/configs/integratorap.h         |    1 -
 include/configs/integratorcp.h         |    1 -
 include/configs/jadecpu.h              |    1 -
 include/configs/kvme080.h              |    2 --
 include/configs/linkstation.h          |    1 -
 include/configs/lubbock.h              |    3 ---
 include/configs/lwmon.h                |    2 --
 include/configs/m28evk.h               |    1 -
 include/configs/meesc.h                |    1 -
 include/configs/mpc7448hpc2.h          |    1 -
 include/configs/ms7750se.h             |    2 --
 include/configs/mx1ads.h               |    3 ---
 include/configs/mx25pdk.h              |    1 -
 include/configs/mx28evk.h              |    1 -
 include/configs/mx31ads.h              |    1 -
 include/configs/mx31pdk.h              |    1 -
 include/configs/mx35pdk.h              |    1 -
 include/configs/mx51evk.h              |    1 -
 include/configs/mx53ard.h              |    1 -
 include/configs/mx53evk.h              |    1 -
 include/configs/mx53loco.h             |    1 -
 include/configs/mx53smd.h              |    1 -
 include/configs/mx6qarm2.h             |    1 -
 include/configs/mx6qsabrelite.h        |    1 -
 include/configs/nhk8815.h              |    1 -
 include/configs/ns9750dev.h            |    3 ---
 include/configs/omap1510inn.h          |    2 --
 include/configs/omap2420h4.h           |    2 --
 include/configs/omap5912osk.h          |    2 --
 include/configs/omap730p2.h            |    2 --
 include/configs/origen.h               |    3 ---
 include/configs/otc570.h               |    1 -
 include/configs/palmld.h               |    1 -
 include/configs/palmtc.h               |    1 -
 include/configs/pb1x00.h               |    3 ---
 include/configs/pdnb3.h                |    2 --
 include/configs/pm9261.h               |    1 -
 include/configs/pm9263.h               |    1 -
 include/configs/pm9g45.h               |    1 -
 include/configs/ppmc7xx.h              |    2 --
 include/configs/ppmc8260.h             |    3 ---
 include/configs/pxa255_idp.h           |    3 ---
 include/configs/qemu-mips.h            |    3 ---
 include/configs/qi_lb60.h              |    1 -
 include/configs/qong.h                 |    1 -
 include/configs/quantum.h              |    2 --
 include/configs/r2dplus.h              |    2 --
 include/configs/r7780mp.h              |    2 --
 include/configs/rsdproto.h             |    3 ---
 include/configs/s5p_goni.h             |    3 ---
 include/configs/s5pc210_universal.h    |    3 ---
 include/configs/sacsng.h               |    3 ---
 include/configs/sbc35_a9g20.h          |    1 -
 include/configs/scb9328.h              |    1 -
 include/configs/smdk2410.h             |    3 ---
 include/configs/smdk5250.h             |    3 ---
 include/configs/smdk6400.h             |    3 ---
 include/configs/smdkc100.h             |    3 ---
 include/configs/smdkv310.h             |    3 ---
 include/configs/snapper9260.h          |    1 -
 include/configs/stxxtc.h               |    2 --
 include/configs/svm_sc8xx.h            |    2 --
 include/configs/tb0229.h               |    2 --
 include/configs/tnetv107x_evm.h        |    1 -
 include/configs/tny_a9260.h            |    1 -
 include/configs/top9000.h              |    1 -
 include/configs/trats.h                |    3 ---
 include/configs/trizepsiv.h            |    3 ---
 include/configs/tt01.h                 |    1 -
 include/configs/tx25.h                 |    1 -
 include/configs/u8500_href.h           |    1 -
 include/configs/uc100.h                |    2 --
 include/configs/utx8245.h              |    1 -
 include/configs/v37.h                  |    2 --
 include/configs/vct.h                  |    1 -
 include/configs/versatile.h            |    1 -
 include/configs/virtlab2.h             |    2 --
 include/configs/vision2.h              |    1 -
 include/configs/vpac270.h              |    1 -
 include/configs/xaeniax.h              |    3 ---
 include/configs/zipitz2.h              |    1 -
 include/configs/zmx25.h                |    1 -
 mkconfig                               |    1 +
 242 files changed, 17 insertions(+), 405 deletions(-)
 create mode 100644 include/config_fallbacks.h

diff --git a/arch/blackfin/include/asm/config.h b/arch/blackfin/include/asm/config.h
index 25cd833..d870d12 100644
--- a/arch/blackfin/include/asm/config.h
+++ b/arch/blackfin/include/asm/config.h
@@ -162,9 +162,6 @@
 # undef CONFIG_SYS_HZ
 #endif
 #define CONFIG_SYS_HZ 1000
-#ifndef CONFIG_SYS_BAUDRATE_TABLE
-# define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
-#endif
 
 /* Blackfin POST tests */
 #ifdef CONFIG_POST_BSPEC1_GPIO_LEDS
diff --git a/board/fads/fads.h b/board/fads/fads.h
index 3dc5358..1a3d22a 100644
--- a/board/fads/fads.h
+++ b/board/fads/fads.h
@@ -147,8 +147,6 @@
 
 #define	CONFIG_SYS_HZ		        1000	/* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h
new file mode 100644
index 0000000..430890c
--- /dev/null
+++ b/include/config_fallbacks.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2012 Texas Instruments
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License Version 2. This file is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#ifndef __CONFIG_FALLBACKS_H
+#define __CONFIG_FALLBACKS_H
+
+#ifndef CONFIG_SYS_BAUDRATE_TABLE
+#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
+#endif
+
+#endif	/* __CONFIG_FALLBACKS_H */
diff --git a/include/configs/A3000.h b/include/configs/A3000.h
index 0c21bd8..b85244a 100644
--- a/include/configs/A3000.h
+++ b/include/configs/A3000.h
@@ -49,7 +49,6 @@
 
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		9600
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_BOOTDELAY	5
 
diff --git a/include/configs/AMX860.h b/include/configs/AMX860.h
index e7c6f96..e7a6c80 100644
--- a/include/configs/AMX860.h
+++ b/include/configs/AMX860.h
@@ -121,8 +121,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/Adder.h b/include/configs/Adder.h
index 48e6df5..ecf5fb8 100644
--- a/include/configs/Adder.h
+++ b/include/configs/Adder.h
@@ -101,8 +101,6 @@
 
 #define CONFIG_SYS_HZ			1000		/* Decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*-----------------------------------------------------------------------
  * RAM configuration (note that CONFIG_SYS_SDRAM_BASE must be zero)
  */
diff --git a/include/configs/BMW.h b/include/configs/BMW.h
index e1951eb..633e9bd 100644
--- a/include/configs/BMW.h
+++ b/include/configs/BMW.h
@@ -51,7 +51,6 @@
 
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		9600
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_CLOCKS_IN_MHZ	1	/* clocks passsed to Linux in MHz	*/
 
diff --git a/include/configs/CPC45.h b/include/configs/CPC45.h
index ed3f9e1..b2b9e07 100644
--- a/include/configs/CPC45.h
+++ b/include/configs/CPC45.h
@@ -49,7 +49,6 @@
 
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		9600
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_PREBOOT	"echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
 
diff --git a/include/configs/CPU86.h b/include/configs/CPU86.h
index abf4ef4..7ac182f 100644
--- a/include/configs/CPU86.h
+++ b/include/configs/CPU86.h
@@ -203,8 +203,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define	CONFIG_SYS_RESET_ADDRESS 0xFFF00100	/* "bad" address		*/
 
 /*
diff --git a/include/configs/CPU87.h b/include/configs/CPU87.h
index 723bdf3..aa5ce29 100644
--- a/include/configs/CPU87.h
+++ b/include/configs/CPU87.h
@@ -216,8 +216,6 @@
 
 #define CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define CONFIG_SYS_RESET_ADDRESS 0xFFF00100	/* "bad" address		*/
 
 #define CONFIG_LOOPW
diff --git a/include/configs/CU824.h b/include/configs/CU824.h
index 77414ab..c8821fd 100644
--- a/include/configs/CU824.h
+++ b/include/configs/CU824.h
@@ -49,7 +49,6 @@
 
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		9600
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_PREBOOT	"echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
 
diff --git a/include/configs/EB+MCF-EV123.h b/include/configs/EB+MCF-EV123.h
index 346b49c..eb9fe46 100644
--- a/include/configs/EB+MCF-EV123.h
+++ b/include/configs/EB+MCF-EV123.h
@@ -40,7 +40,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE 9600
-#define CONFIG_SYS_BAUDRATE_TABLE { 9600 , 19200 , 38400 , 57600, 115200 }
 
 #undef	CONFIG_MONITOR_IS_IN_RAM		/* starts uboot direct */
 
diff --git a/include/configs/ELPT860.h b/include/configs/ELPT860.h
index c6a17b0..da40c18 100644
--- a/include/configs/ELPT860.h
+++ b/include/configs/ELPT860.h
@@ -145,7 +145,6 @@
 #define CONFIG_ENV_IS_IN_FLASH	1      /* Environment is in FLASH	*/
 
 #define CONFIG_BAUDRATE		9600   /* console baudrate = 9600 bps	*/
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_ETHADDR		00:01:77:00:60:40
 #define CONFIG_IPADDR		192.168.0.30
diff --git a/include/configs/EP88x.h b/include/configs/EP88x.h
index a0acfd2..1638d35 100644
--- a/include/configs/EP88x.h
+++ b/include/configs/EP88x.h
@@ -96,8 +96,6 @@
 
 #define CONFIG_SYS_HZ			1000		/* Decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*-----------------------------------------------------------------------
  * RAM configuration (note that CONFIG_SYS_SDRAM_BASE must be zero)
  */
diff --git a/include/configs/ESTEEM192E.h b/include/configs/ESTEEM192E.h
index 841bf11..9bac44e 100644
--- a/include/configs/ESTEEM192E.h
+++ b/include/configs/ESTEEM192E.h
@@ -102,10 +102,6 @@
 
 #define	CONFIG_SYS_HZ			1000		/* decrementer freq: 1 ms ticks	*/
 
-
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/ETX094.h b/include/configs/ETX094.h
index c427093..2703625 100644
--- a/include/configs/ETX094.h
+++ b/include/configs/ETX094.h
@@ -122,8 +122,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/FADS823.h b/include/configs/FADS823.h
index 57336f9..35c0c7e 100644
--- a/include/configs/FADS823.h
+++ b/include/configs/FADS823.h
@@ -154,8 +154,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/FADS850SAR.h b/include/configs/FADS850SAR.h
index 438d19e..559a83f 100644
--- a/include/configs/FADS850SAR.h
+++ b/include/configs/FADS850SAR.h
@@ -100,8 +100,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/FLAGADM.h b/include/configs/FLAGADM.h
index 339bb59..fa6105d 100644
--- a/include/configs/FLAGADM.h
+++ b/include/configs/FLAGADM.h
@@ -112,8 +112,6 @@
 
 #define CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/FPS850L.h b/include/configs/FPS850L.h
index 38d905a..6d7ca27 100644
--- a/include/configs/FPS850L.h
+++ b/include/configs/FPS850L.h
@@ -151,8 +151,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/FPS860L.h b/include/configs/FPS860L.h
index ca0b1cc..b074c7d 100644
--- a/include/configs/FPS860L.h
+++ b/include/configs/FPS860L.h
@@ -151,8 +151,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/GEN860T.h b/include/configs/GEN860T.h
index 68a0cfd..1ea4108 100644
--- a/include/configs/GEN860T.h
+++ b/include/configs/GEN860T.h
@@ -64,16 +64,6 @@
 #define CONFIG_BAUDRATE			38400
 
 /*
- * Set allowable console baud rates
- */
-#define CONFIG_SYS_BAUDRATE_TABLE		{ 9600,		\
-					  19200,	\
-					  38400,	\
-					  57600,	\
-					  115200,	\
-					}
-
-/*
  * Print console information
  */
 #undef	 CONFIG_SYS_CONSOLE_INFO_QUIET
diff --git a/include/configs/HIDDEN_DRAGON.h b/include/configs/HIDDEN_DRAGON.h
index 8f4e544..a62ef63 100644
--- a/include/configs/HIDDEN_DRAGON.h
+++ b/include/configs/HIDDEN_DRAGON.h
@@ -190,7 +190,6 @@
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS	3
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS	10	/* and takes up to 10 msec */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_SYS_FLASH_BANKS		{ FLASH_BASE0_PRELIM }
 
 /*-----------------------------------------------------------------------
diff --git a/include/configs/IAD210.h b/include/configs/IAD210.h
index 27bd146..94b05dc 100644
--- a/include/configs/IAD210.h
+++ b/include/configs/IAD210.h
@@ -166,8 +166,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/ICU862.h b/include/configs/ICU862.h
index b011d50..81f219c 100644
--- a/include/configs/ICU862.h
+++ b/include/configs/ICU862.h
@@ -170,8 +170,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/IDS8247.h b/include/configs/IDS8247.h
index be778fe..6d0937f 100644
--- a/include/configs/IDS8247.h
+++ b/include/configs/IDS8247.h
@@ -215,8 +215,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define	CONFIG_SYS_RESET_ADDRESS 0xFDFFFFFC	/* "bad" address		*/
 
 /*
diff --git a/include/configs/IP860.h b/include/configs/IP860.h
index ba8d633..2379718 100644
--- a/include/configs/IP860.h
+++ b/include/configs/IP860.h
@@ -135,8 +135,6 @@
 
 #define	CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/IPHASE4539.h b/include/configs/IPHASE4539.h
index d966306..6dd9812 100644
--- a/include/configs/IPHASE4539.h
+++ b/include/configs/IPHASE4539.h
@@ -175,8 +175,6 @@
 
 #define CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define CONFIG_SYS_RESET_ADDRESS	0x04400000
 
 #define CONFIG_MISC_INIT_R	1	/* We need misc_init_r()	*/
diff --git a/include/configs/ISPAN.h b/include/configs/ISPAN.h
index 922b079..d6474bd 100644
--- a/include/configs/ISPAN.h
+++ b/include/configs/ISPAN.h
@@ -160,8 +160,6 @@
 
 #define CONFIG_SYS_HZ			1000		/* Decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define CONFIG_SYS_RESET_ADDRESS	0x09900000
 
 #define CONFIG_MISC_INIT_R			/* We need misc_init_r()	*/
diff --git a/include/configs/IVML24.h b/include/configs/IVML24.h
index b827954..f98a66b 100644
--- a/include/configs/IVML24.h
+++ b/include/configs/IVML24.h
@@ -129,8 +129,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/IVMS8.h b/include/configs/IVMS8.h
index 9b0c32a..d6e9b23 100644
--- a/include/configs/IVMS8.h
+++ b/include/configs/IVMS8.h
@@ -126,8 +126,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/LANTEC.h b/include/configs/LANTEC.h
index 0f4ea41..c3855c3 100644
--- a/include/configs/LANTEC.h
+++ b/include/configs/LANTEC.h
@@ -139,8 +139,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index 6f462be..a1eaeff 100644
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -36,7 +36,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #undef CONFIG_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT		5000
diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h
index bfbb06c..d417e24 100644
--- a/include/configs/M52277EVB.h
+++ b/include/configs/M52277EVB.h
@@ -41,7 +41,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #undef CONFIG_WATCHDOG
 
diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index 7bb6dfe..733aece 100644
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -40,7 +40,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #undef CONFIG_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT	5000	/* timeout in milliseconds, max timeout is 6.71sec */
diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h
index 104fcde..9524e10 100644
--- a/include/configs/M5249EVB.h
+++ b/include/configs/M5249EVB.h
@@ -42,7 +42,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #undef  CONFIG_WATCHDOG
 
diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index b843e07..30584fe 100644
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -33,7 +33,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #undef CONFIG_WATCHDOG		/* disable watchdog */
 
diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h
index dd8a560..2feb783 100644
--- a/include/configs/M5253EVBE.h
+++ b/include/configs/M5253EVBE.h
@@ -33,7 +33,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #undef CONFIG_WATCHDOG		/* disable watchdog */
 
diff --git a/include/configs/M5271EVB.h b/include/configs/M5271EVB.h
index 1d3b5c3..ac200f5 100644
--- a/include/configs/M5271EVB.h
+++ b/include/configs/M5271EVB.h
@@ -43,7 +43,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #undef CONFIG_WATCHDOG		/* disable watchdog */
 
diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index de15163..1a03f5d 100644
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -41,7 +41,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #undef CONFIG_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT 10000	/* timeout in milliseconds */
diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h
index e34dc40..9c2a3bb 100644
--- a/include/configs/M5275EVB.h
+++ b/include/configs/M5275EVB.h
@@ -46,7 +46,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index 928b044..706e3d6 100644
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -41,7 +41,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #undef	CONFIG_MONITOR_IS_IN_RAM	/* define if monitor is started from a pre-loader */
 
diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index 216244c..896d0d8 100644
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -40,7 +40,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #undef CONFIG_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT		5000
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index 29b9b2a..64f8302 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -40,7 +40,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #undef CONFIG_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT	5000	/* timeout in milliseconds, max timeout is 6.71sec */
diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index d0044b1..0d09f0e 100644
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -40,7 +40,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #undef CONFIG_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT	3360	/* timeout in ms, max is 3.36 sec */
diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h
index e2e2445..64928e9 100644
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@@ -41,7 +41,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #undef CONFIG_WATCHDOG
 
diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index d934d8e..b623c33 100644
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -41,7 +41,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #undef CONFIG_WATCHDOG
 
diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h
index f31972c..3bdb867 100644
--- a/include/configs/M5475EVB.h
+++ b/include/configs/M5475EVB.h
@@ -41,7 +41,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #define CONFIG_HW_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT	5000	/* timeout in milliseconds, max timeout is 6.71sec */
diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h
index 813f0cb..3487e49 100644
--- a/include/configs/M5485EVB.h
+++ b/include/configs/M5485EVB.h
@@ -41,7 +41,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #define CONFIG_HW_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT	5000	/* timeout in milliseconds, max timeout is 6.71sec */
diff --git a/include/configs/MBX.h b/include/configs/MBX.h
index 79780bd..95ddc97 100644
--- a/include/configs/MBX.h
+++ b/include/configs/MBX.h
@@ -119,8 +119,6 @@
 
 #define CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/MBX860T.h b/include/configs/MBX860T.h
index 969ba7e..8d1ca48 100644
--- a/include/configs/MBX860T.h
+++ b/include/configs/MBX860T.h
@@ -74,8 +74,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/MHPC.h b/include/configs/MHPC.h
index b9c1638..3ff36ad 100644
--- a/include/configs/MHPC.h
+++ b/include/configs/MHPC.h
@@ -162,8 +162,6 @@
 
 #define CONFIG_SYS_HZ			1000		/* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/MOUSSE.h b/include/configs/MOUSSE.h
index f7fba0c..1391ce5 100644
--- a/include/configs/MOUSSE.h
+++ b/include/configs/MOUSSE.h
@@ -140,8 +140,6 @@
 					   1MB - 64K FLASH0 SEG =960K
 					   (size=0xf0000)*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE  { 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * NS16550 Configuration
  */
diff --git a/include/configs/MUSENKI.h b/include/configs/MUSENKI.h
index f304272..84a167d 100644
--- a/include/configs/MUSENKI.h
+++ b/include/configs/MUSENKI.h
@@ -49,7 +49,6 @@
 
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		9600
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_BOOTDELAY	5
 
diff --git a/include/configs/MVBLUE.h b/include/configs/MVBLUE.h
index 0724752..52d1729 100644
--- a/include/configs/MVBLUE.h
+++ b/include/configs/MVBLUE.h
@@ -66,7 +66,6 @@
 
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_BOOTDELAY	3
 #define CONFIG_BOOT_RETRY_TIME	-1
diff --git a/include/configs/MVS1.h b/include/configs/MVS1.h
index 46151da..8350830 100644
--- a/include/configs/MVS1.h
+++ b/include/configs/MVS1.h
@@ -124,8 +124,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/NETPHONE.h b/include/configs/NETPHONE.h
index e36476e..31fe893 100644
--- a/include/configs/NETPHONE.h
+++ b/include/configs/NETPHONE.h
@@ -155,8 +155,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/NETTA.h b/include/configs/NETTA.h
index acf5dcb..fd3ab16 100644
--- a/include/configs/NETTA.h
+++ b/include/configs/NETTA.h
@@ -168,8 +168,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/NETTA2.h b/include/configs/NETTA2.h
index c58899b..5ca01a0 100644
--- a/include/configs/NETTA2.h
+++ b/include/configs/NETTA2.h
@@ -156,8 +156,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/NETVIA.h b/include/configs/NETVIA.h
index 3494b7a..61b19ab 100644
--- a/include/configs/NETVIA.h
+++ b/include/configs/NETVIA.h
@@ -137,8 +137,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/NSCU.h b/include/configs/NSCU.h
index 7e3ba2a..5015b79 100644
--- a/include/configs/NSCU.h
+++ b/include/configs/NSCU.h
@@ -159,8 +159,6 @@
 
 #define	CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/NX823.h b/include/configs/NX823.h
index bb0d3a3..8b13eb0 100644
--- a/include/configs/NX823.h
+++ b/include/configs/NX823.h
@@ -101,8 +101,6 @@
 
 #define CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/PCIPPC2.h b/include/configs/PCIPPC2.h
index 77cedc0..7e1c11e 100644
--- a/include/configs/PCIPPC2.h
+++ b/include/configs/PCIPPC2.h
@@ -50,7 +50,6 @@
 
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		9600
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_PREBOOT		""
 #define CONFIG_BOOTDELAY	5
diff --git a/include/configs/PCIPPC6.h b/include/configs/PCIPPC6.h
index a8d20ca..c3f295b 100644
--- a/include/configs/PCIPPC6.h
+++ b/include/configs/PCIPPC6.h
@@ -50,7 +50,6 @@
 
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		9600
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_PREBOOT		""
 #define CONFIG_BOOTDELAY	5
diff --git a/include/configs/PM826.h b/include/configs/PM826.h
index cde0fd6..fbcf8e5 100644
--- a/include/configs/PM826.h
+++ b/include/configs/PM826.h
@@ -200,8 +200,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define	CONFIG_SYS_RESET_ADDRESS 0xFDFFFFFC	/* "bad" address		*/
 
 /*
diff --git a/include/configs/PM828.h b/include/configs/PM828.h
index 74ced5a..c37aafd 100644
--- a/include/configs/PM828.h
+++ b/include/configs/PM828.h
@@ -200,8 +200,6 @@
 
 #define CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define CONFIG_SYS_RESET_ADDRESS 0xFDFFFFFC	/* "bad" address		*/
 
 /*
diff --git a/include/configs/PMC405DE.h b/include/configs/PMC405DE.h
index 60aabf3..992443a 100644
--- a/include/configs/PMC405DE.h
+++ b/include/configs/PMC405DE.h
@@ -117,10 +117,6 @@
 #undef  CONFIG_SYS_EXT_SERIAL_CLOCK
 #define CONFIG_SYS_BASE_BAUD		691200
 
-/* The following table includes the supported baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	\
-	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define CONFIG_SYS_LOAD_ADDR	0x100000	/* default load address */
 #define CONFIG_SYS_EXTBDINFO	1	/* To use extended board_into (bd_t) */
 
diff --git a/include/configs/PN62.h b/include/configs/PN62.h
index dae4577..93876b1 100644
--- a/include/configs/PN62.h
+++ b/include/configs/PN62.h
@@ -171,7 +171,6 @@
 /*
  * Serial port configuration
  */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
diff --git a/include/configs/QS823.h b/include/configs/QS823.h
index 36efbf2..fa77ffd 100644
--- a/include/configs/QS823.h
+++ b/include/configs/QS823.h
@@ -255,8 +255,6 @@
 
 #define CONFIG_SYS_HZ			1000		/* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*-----------------------------------------------------------------------
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/QS850.h b/include/configs/QS850.h
index 5c6ed07..efa7bd6 100644
--- a/include/configs/QS850.h
+++ b/include/configs/QS850.h
@@ -255,8 +255,6 @@
 
 #define CONFIG_SYS_HZ			1000		/* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*-----------------------------------------------------------------------
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/QS860T.h b/include/configs/QS860T.h
index b0bee82..3156320 100644
--- a/include/configs/QS860T.h
+++ b/include/configs/QS860T.h
@@ -165,8 +165,6 @@ CONFIG_SPI
 
 #define CONFIG_SYS_HZ			1000		/* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*-----------------------------------------------------------------------
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/R360MPI.h b/include/configs/R360MPI.h
index a8e9a4a..9befacb 100644
--- a/include/configs/R360MPI.h
+++ b/include/configs/R360MPI.h
@@ -162,8 +162,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * JFFS2 partitions
  */
diff --git a/include/configs/RBC823.h b/include/configs/RBC823.h
index 40980fe..b042c67 100644
--- a/include/configs/RBC823.h
+++ b/include/configs/RBC823.h
@@ -151,8 +151,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/RPXClassic.h b/include/configs/RPXClassic.h
index 267ece1..b215c2d 100644
--- a/include/configs/RPXClassic.h
+++ b/include/configs/RPXClassic.h
@@ -134,8 +134,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/RPXlite.h b/include/configs/RPXlite.h
index 74926d8..8ffb014 100644
--- a/include/configs/RPXlite.h
+++ b/include/configs/RPXlite.h
@@ -103,8 +103,6 @@
 
 #define	CONFIG_SYS_HZ			1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/RPXlite_DW.h b/include/configs/RPXlite_DW.h
index efc59fe..f8bcf0f 100644
--- a/include/configs/RPXlite_DW.h
+++ b/include/configs/RPXlite_DW.h
@@ -178,7 +178,6 @@
 #define CONFIG_SYS_LOAD_ADDR		0x100000	/* default load address */
 
 #define CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * Low Level Configuration Settings
diff --git a/include/configs/RPXsuper.h b/include/configs/RPXsuper.h
index c1865fc..d4d3d57 100644
--- a/include/configs/RPXsuper.h
+++ b/include/configs/RPXsuper.h
@@ -216,9 +216,6 @@
 #define CONFIG_SYS_LOAD_ADDR     0x100000     /* default load address */
 #define CONFIG_SYS_HZ            1000         /* decrementer freq: 1 ms ticks */
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/RRvision.h b/include/configs/RRvision.h
index 0f8084e..671d521 100644
--- a/include/configs/RRvision.h
+++ b/include/configs/RRvision.h
@@ -180,8 +180,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/SCM.h b/include/configs/SCM.h
index 73216dc..87d52ba 100644
--- a/include/configs/SCM.h
+++ b/include/configs/SCM.h
@@ -234,8 +234,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define	CONFIG_SYS_RESET_ADDRESS 0xFFFFFFFC	/* "bad" address		*/
 
 #define CONFIG_MISC_INIT_R		/* have misc_init_r() function	*/
diff --git a/include/configs/SM850.h b/include/configs/SM850.h
index 833b18a..e42e2cd 100644
--- a/include/configs/SM850.h
+++ b/include/configs/SM850.h
@@ -109,8 +109,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/SPD823TS.h b/include/configs/SPD823TS.h
index fba5b5e..cffeb11 100644
--- a/include/configs/SPD823TS.h
+++ b/include/configs/SPD823TS.h
@@ -121,8 +121,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/SX1.h b/include/configs/SX1.h
index 01c2b3d..ea09368 100644
--- a/include/configs/SX1.h
+++ b/include/configs/SX1.h
@@ -90,8 +90,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 
 /*
  * BOOTP options
diff --git a/include/configs/SXNI855T.h b/include/configs/SXNI855T.h
index 774c98f..b7fbe5e 100644
--- a/include/configs/SXNI855T.h
+++ b/include/configs/SXNI855T.h
@@ -188,8 +188,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/Sandpoint8240.h b/include/configs/Sandpoint8240.h
index 35171b6..f54fcb3 100644
--- a/include/configs/Sandpoint8240.h
+++ b/include/configs/Sandpoint8240.h
@@ -226,7 +226,6 @@
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS	10	/* takes up to 10 msec		*/
 
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_SYS_FLASH_BANKS		{ FLASH_BASE0_PRELIM , FLASH_BASE1_PRELIM }
 
 /*-----------------------------------------------------------------------
diff --git a/include/configs/Sandpoint8245.h b/include/configs/Sandpoint8245.h
index 9ba307e..84e4891 100644
--- a/include/configs/Sandpoint8245.h
+++ b/include/configs/Sandpoint8245.h
@@ -194,7 +194,6 @@
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS	3
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS	10	/* and takes up to 10 msec */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_SYS_FLASH_BANKS		{ FLASH_BASE0_PRELIM , FLASH_BASE1_PRELIM }
 
 /*-----------------------------------------------------------------------
diff --git a/include/configs/TASREG.h b/include/configs/TASREG.h
index c93b12e..d95a226 100644
--- a/include/configs/TASREG.h
+++ b/include/configs/TASREG.h
@@ -48,7 +48,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		19200
-#define CONFIG_SYS_BAUDRATE_TABLE { 9600 , 19200 , 38400 , 57600, 115200 }
 
 #undef  CONFIG_WATCHDOG
 
diff --git a/include/configs/TK885D.h b/include/configs/TK885D.h
index 72c6523..0c52775 100644
--- a/include/configs/TK885D.h
+++ b/include/configs/TK885D.h
@@ -200,8 +200,6 @@
 
 #define CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Enable loopw command.
  */
diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h
index f2a2e33..b26e4f4 100644
--- a/include/configs/TQM823L.h
+++ b/include/configs/TQM823L.h
@@ -166,8 +166,6 @@
 
 #define	CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h
index f6b856c..a9bf525 100644
--- a/include/configs/TQM823M.h
+++ b/include/configs/TQM823M.h
@@ -161,8 +161,6 @@
 
 #define	CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/TQM8260.h b/include/configs/TQM8260.h
index 626cf19..58c9716 100644
--- a/include/configs/TQM8260.h
+++ b/include/configs/TQM8260.h
@@ -268,8 +268,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define	CONFIG_SYS_RESET_ADDRESS 0xFFFFFFFC	/* "bad" address		*/
 
 /*
diff --git a/include/configs/TQM8272.h b/include/configs/TQM8272.h
index 413ce64..c2618dc 100644
--- a/include/configs/TQM8272.h
+++ b/include/configs/TQM8272.h
@@ -332,8 +332,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define	CONFIG_SYS_RESET_ADDRESS 0x40000104	/* "bad" address		*/
 
 /*
diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h
index 6114bb0..d217d3b 100644
--- a/include/configs/TQM850L.h
+++ b/include/configs/TQM850L.h
@@ -151,8 +151,6 @@
 
 #define	CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h
index 911560c..52e1125 100644
--- a/include/configs/TQM850M.h
+++ b/include/configs/TQM850M.h
@@ -152,8 +152,6 @@
 
 #define	CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h
index fd90501..e36a2bb 100644
--- a/include/configs/TQM855L.h
+++ b/include/configs/TQM855L.h
@@ -155,8 +155,6 @@
 
 #define	CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h
index 3e3f6de..473301a 100644
--- a/include/configs/TQM855M.h
+++ b/include/configs/TQM855M.h
@@ -189,8 +189,6 @@
 
 #define	CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h
index cdf4885..ed61f0f 100644
--- a/include/configs/TQM860L.h
+++ b/include/configs/TQM860L.h
@@ -154,8 +154,6 @@
 
 #define	CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h
index 7ccc614..4d7effb 100644
--- a/include/configs/TQM860M.h
+++ b/include/configs/TQM860M.h
@@ -155,8 +155,6 @@
 
 #define	CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h
index 79bea34..db7c1c3 100644
--- a/include/configs/TQM862L.h
+++ b/include/configs/TQM862L.h
@@ -158,8 +158,6 @@
 
 #define	CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h
index 7693459..af528fd 100644
--- a/include/configs/TQM862M.h
+++ b/include/configs/TQM862M.h
@@ -158,8 +158,6 @@
 
 #define	CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h
index 8636ff4..b1cb406 100644
--- a/include/configs/TQM866M.h
+++ b/include/configs/TQM866M.h
@@ -201,8 +201,6 @@
 
 #define CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h
index 5204771..c960a54 100644
--- a/include/configs/TQM885D.h
+++ b/include/configs/TQM885D.h
@@ -198,8 +198,6 @@
 
 #define CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Enable loopw command.
  */
diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h
index 76cd394..082f3f9 100644
--- a/include/configs/VCMA9.h
+++ b/include/configs/VCMA9.h
@@ -181,9 +181,6 @@
 /* we configure PWM Timer 4 to 1ms 1000Hz  */
 #define CONFIG_SYS_HZ			1000
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /* support additional compression methods */
 #define CONFIG_BZIP2
 #define CONFIG_LZO
diff --git a/include/configs/VoVPN-GW.h b/include/configs/VoVPN-GW.h
index c06909f..0b6453b 100644
--- a/include/configs/VoVPN-GW.h
+++ b/include/configs/VoVPN-GW.h
@@ -86,9 +86,6 @@
 /* don't allow baudrate change	*/
 #undef	CONFIG_SYS_LOADS_BAUD_CHANGE
 
-/* supported baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE		{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * select ethernet configuration
  *
diff --git a/include/configs/a320evb.h b/include/configs/a320evb.h
index 1fafbed..a2b347a 100644
--- a/include/configs/a320evb.h
+++ b/include/configs/a320evb.h
@@ -71,9 +71,6 @@
 #define CONFIG_SYS_NS16550_REG_SIZE	-4
 #define CONFIG_SYS_NS16550_CLK		18432000
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Ethernet
  */
diff --git a/include/configs/adp-ag101.h b/include/configs/adp-ag101.h
index 8421c79..6bf0add 100644
--- a/include/configs/adp-ag101.h
+++ b/include/configs/adp-ag101.h
@@ -100,9 +100,6 @@
 #define CONFIG_SYS_NS16550_REG_SIZE	-4
 #define CONFIG_SYS_NS16550_CLK		((46080000 * 20) / 25)	/* AG101 */
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Ethernet
  */
diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h
index ffc70a6..747d061 100644
--- a/include/configs/adp-ag101p.h
+++ b/include/configs/adp-ag101p.h
@@ -100,9 +100,6 @@
 #define CONFIG_SYS_NS16550_REG_SIZE	-4
 #define CONFIG_SYS_NS16550_CLK		((18432000 * 20) / 25)	/* AG101P */
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Ethernet
  */
diff --git a/include/configs/adp-ag102.h b/include/configs/adp-ag102.h
index a4628e4..35f88cc 100644
--- a/include/configs/adp-ag102.h
+++ b/include/configs/adp-ag102.h
@@ -99,9 +99,6 @@
 #define CONFIG_SYS_NS16550_REG_SIZE	-4
 #define CONFIG_SYS_NS16550_CLK		33000000	/* AG102 */
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Ethernet
  */
diff --git a/include/configs/afeb9260.h b/include/configs/afeb9260.h
index 2adf8f9..6715cb4 100644
--- a/include/configs/afeb9260.h
+++ b/include/configs/afeb9260.h
@@ -157,7 +157,6 @@
 				"rw rootfstype=jffs2 panic=20"
 
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
 
 #define CONFIG_SYS_PROMPT		"U-Boot> "
 #define CONFIG_SYS_CBSIZE		256
diff --git a/include/configs/apollon.h b/include/configs/apollon.h
index 8f06cd7..aebca71 100644
--- a/include/configs/apollon.h
+++ b/include/configs/apollon.h
@@ -112,7 +112,6 @@
 #define	CONFIG_ENV_OVERWRITE
 #define	CONFIG_CONS_INDEX	1
 #define	CONFIG_BAUDRATE		115200
-#define	CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include	<config_cmd_default.h>
diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index d468e49..f89a567 100644
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -147,7 +147,6 @@
  */
 
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE { 9600 , 19200 , 38400 , 57600, 115200 }
 
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(2)
diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h
index 7e6c155..9f908ce 100644
--- a/include/configs/at91rm9200ek.h
+++ b/include/configs/at91rm9200ek.h
@@ -129,7 +129,6 @@
 #define CONFIG_USART_BASE	ATMEL_BASE_DBGU
 #define CONFIG_USART_ID		0/* ignored in arm */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
 #define CONFIG_BAUDRATE			115200
 
 /*
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index db52ee6..07b1968 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -73,7 +73,6 @@
 #define CONFIG_USART_BASE		ATMEL_BASE_DBGU
 #define	CONFIG_USART_ID			ATMEL_ID_SYS
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
 
 /* LED */
 #define CONFIG_AT91_LED
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 5140b26..6fd0b83 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -67,7 +67,6 @@
 #define CONFIG_USART_BASE		ATMEL_BASE_DBGU
 #define CONFIG_USART_ID			ATMEL_ID_SYS
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200, 57600, 38400, 19200, 9600}
 
 /* LCD */
 #define CONFIG_LCD
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index f424e5a..40308ca 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -71,7 +71,6 @@
 #define CONFIG_USART_BASE		ATMEL_BASE_DBGU
 #define CONFIG_USART_ID			ATMEL_ID_SYS
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200, 19200, 38400, 57600, 9600}
 
 /* LCD */
 #define CONFIG_LCD			1
diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index 159857d..f46b91b 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -178,7 +178,6 @@
 	"rw rootfstype=jffs2"
 
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
 
 #define CONFIG_SYS_PROMPT		"U-Boot> "
 #define CONFIG_SYS_CBSIZE		256
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index 79ea1f2..45f8baf 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -62,7 +62,6 @@
 #define CONFIG_USART_BASE		ATMEL_BASE_DBGU
 #define CONFIG_USART_ID			ATMEL_ID_SYS
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200, 19200, 38400, 57600, 9600}
 
 /* LCD */
 #define CONFIG_LCD			1
diff --git a/include/configs/atc.h b/include/configs/atc.h
index bf1f202..75f950b 100644
--- a/include/configs/atc.h
+++ b/include/configs/atc.h
@@ -171,8 +171,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define	CONFIG_SYS_RESET_ADDRESS 0xFFF00100	/* "bad" address		*/
 
 #define CONFIG_SYS_ALLOC_DPRAM
diff --git a/include/configs/balloon3.h b/include/configs/balloon3.h
index a5ec224..1417240 100644
--- a/include/configs/balloon3.h
+++ b/include/configs/balloon3.h
@@ -54,7 +54,6 @@
 #define	CONFIG_PXA_SERIAL
 #define	CONFIG_STUART			1
 #define	CONFIG_BAUDRATE			115200
-#define	CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * Bootloader Components Configuration
diff --git a/include/configs/c2mon.h b/include/configs/c2mon.h
index f325d2b..01e5e90 100644
--- a/include/configs/c2mon.h
+++ b/include/configs/c2mon.h
@@ -127,8 +127,6 @@
 
 #define	CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/ca9x4_ct_vxp.h b/include/configs/ca9x4_ct_vxp.h
index c5226ab..14b8146 100644
--- a/include/configs/ca9x4_ct_vxp.h
+++ b/include/configs/ca9x4_ct_vxp.h
@@ -62,7 +62,6 @@
 #define CONFIG_CONS_INDEX		0
 
 #define CONFIG_BAUDRATE			38400
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_SYS_SERIAL0		0x10009000
 #define CONFIG_SYS_SERIAL1		0x1000A000
 
diff --git a/include/configs/calimain.h b/include/configs/calimain.h
index 6b68f10..81c9b9b 100644
--- a/include/configs/calimain.h
+++ b/include/configs/calimain.h
@@ -173,7 +173,6 @@
 #define CONFIG_SYS_NS16550_CLK	clk_get(DAVINCI_UART2_CLKID)
 #define CONFIG_CONS_INDEX	1		/* use UART0 for console */
 #define CONFIG_BAUDRATE		115200		/* Default baud rate */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_FLASH_CFI_DRIVER
diff --git a/include/configs/cam_enc_4xx.h b/include/configs/cam_enc_4xx.h
index 71faf1c..2512a75 100644
--- a/include/configs/cam_enc_4xx.h
+++ b/include/configs/cam_enc_4xx.h
@@ -54,7 +54,6 @@
 #define CONFIG_SYS_NS16550_REG_SIZE	-4
 #define CONFIG_SYS_NS16550_COM1		0x01c20000
 #define CONFIG_SYS_NS16550_CLK		CONFIG_SYS_HZ_CLOCK
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
 
diff --git a/include/configs/cm4008.h b/include/configs/cm4008.h
index 81e4de4..408e918 100644
--- a/include/configs/cm4008.h
+++ b/include/configs/cm4008.h
@@ -56,8 +56,6 @@
 #define	CONFIG_SERIAL1
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 
 /*
  * BOOTP options
diff --git a/include/configs/cm41xx.h b/include/configs/cm41xx.h
index 785ab0a..d85a600 100644
--- a/include/configs/cm41xx.h
+++ b/include/configs/cm41xx.h
@@ -56,8 +56,6 @@
 #define	CONFIG_SERIAL1
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 
 /*
  * BOOTP options
diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
index 6d97a0c..c9fdc2c 100644
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -81,7 +81,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		19200
-#define CONFIG_SYS_BAUDRATE_TABLE { 9600 , 19200 , 38400 , 57600, 115200 }
 
 /* ---
  * set "#if 0" to "#if 1" if (Hardware)-WATCHDOG should be enabled & change
diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
index 7691fb3..4a3b01d 100644
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -56,7 +56,6 @@
 #define	CONFIG_PXA_SERIAL
 #define	CONFIG_FFUART			1
 #define	CONFIG_BAUDRATE			115200
-#define	CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * Bootloader Components Configuration
diff --git a/include/configs/cpu9260.h b/include/configs/cpu9260.h
index 8b6a687..a877066 100644
--- a/include/configs/cpu9260.h
+++ b/include/configs/cpu9260.h
@@ -487,7 +487,6 @@
 #endif
 
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
 
 #if defined(CONFIG_CPU9G20)
 #define CONFIG_SYS_PROMPT		"CPU9G20=> "
diff --git a/include/configs/cpuat91.h b/include/configs/cpuat91.h
index 1b43c54..dc676df 100644
--- a/include/configs/cpuat91.h
+++ b/include/configs/cpuat91.h
@@ -197,7 +197,6 @@
 #define CONFIG_SYS_LOAD_ADDR		0x21000000
 
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 115200, 57600, 38400, 19200, 9600 }
 
 #define CONFIG_SYS_PROMPT		"CPUAT91=> "
 #define CONFIG_SYS_CBSIZE		256
diff --git a/include/configs/da830evm.h b/include/configs/da830evm.h
index 781878e..aa7a6ba 100644
--- a/include/configs/da830evm.h
+++ b/include/configs/da830evm.h
@@ -65,7 +65,6 @@
 #define CONFIG_SYS_NS16550_CLK	clk_get(DAVINCI_UART2_CLKID)
 #define CONFIG_CONS_INDEX	1		/* use UART0 for console */
 #define CONFIG_BAUDRATE		115200		/* Default baud rate */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * I2C Configuration
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 989472b..0adbb1f 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -143,7 +143,6 @@
 #define CONFIG_SYS_NS16550_CLK	clk_get(DAVINCI_UART2_CLKID)
 #define CONFIG_CONS_INDEX	1		/* use UART0 for console */
 #define CONFIG_BAUDRATE		115200		/* Default baud rate */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_SPI
 #define CONFIG_SPI_FLASH
diff --git a/include/configs/davinci_dm355evm.h b/include/configs/davinci_dm355evm.h
index 42caf1e..bd17419 100644
--- a/include/configs/davinci_dm355evm.h
+++ b/include/configs/davinci_dm355evm.h
@@ -45,7 +45,6 @@
 #define CONFIG_SYS_NS16550_REG_SIZE	-4
 #define CONFIG_SYS_NS16550_COM1		0x01c20000
 #define CONFIG_SYS_NS16550_CLK		CONFIG_SYS_HZ_CLOCK
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
 
diff --git a/include/configs/davinci_dm355leopard.h b/include/configs/davinci_dm355leopard.h
index b05cfba..b232c50 100644
--- a/include/configs/davinci_dm355leopard.h
+++ b/include/configs/davinci_dm355leopard.h
@@ -44,7 +44,6 @@
 #define CONFIG_SYS_NS16550_REG_SIZE	-4
 #define CONFIG_SYS_NS16550_COM1		0x01c20000
 #define CONFIG_SYS_NS16550_CLK		CONFIG_SYS_HZ_CLOCK
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
 
diff --git a/include/configs/davinci_dm365evm.h b/include/configs/davinci_dm365evm.h
index a75bce6..92d7227 100644
--- a/include/configs/davinci_dm365evm.h
+++ b/include/configs/davinci_dm365evm.h
@@ -45,7 +45,6 @@
 #define CONFIG_SYS_NS16550_REG_SIZE	-4
 #define CONFIG_SYS_NS16550_COM1		0x01c20000
 #define CONFIG_SYS_NS16550_CLK		CONFIG_SYS_HZ_CLOCK
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
 
diff --git a/include/configs/davinci_dm6467evm.h b/include/configs/davinci_dm6467evm.h
index 4f14e04..57a6148 100644
--- a/include/configs/davinci_dm6467evm.h
+++ b/include/configs/davinci_dm6467evm.h
@@ -73,7 +73,6 @@ extern unsigned int davinci_arm_clk_get(void);
 #define CONFIG_SYS_NS16550_CLK		24000000
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /* I2C Configuration */
 #define CONFIG_HARD_I2C
diff --git a/include/configs/davinci_dvevm.h b/include/configs/davinci_dvevm.h
index 310d577..f0cc780 100644
--- a/include/configs/davinci_dvevm.h
+++ b/include/configs/davinci_dvevm.h
@@ -89,7 +89,6 @@
 #define CONFIG_SYS_NS16550_CLK	CONFIG_SYS_HZ_CLOCK	/* Input clock to NS16550 */
 #define CONFIG_CONS_INDEX	1		/* use UART0 for console */
 #define CONFIG_BAUDRATE		115200		/* Default baud rate */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 /*===================*/
 /* I2C Configuration */
 /*===================*/
diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h
index 949174a..c07002a 100644
--- a/include/configs/davinci_schmoogie.h
+++ b/include/configs/davinci_schmoogie.h
@@ -58,7 +58,6 @@
 #define CONFIG_SYS_NS16550_CLK	CONFIG_SYS_HZ_CLOCK	/* Input clock to NS16550 */
 #define CONFIG_CONS_INDEX	1		/* use UART0 for console */
 #define CONFIG_BAUDRATE		115200		/* Default baud rate */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 /*===================*/
 /* I2C Configuration */
 /*===================*/
diff --git a/include/configs/davinci_sffsdr.h b/include/configs/davinci_sffsdr.h
index c931ede..a62d7aa 100644
--- a/include/configs/davinci_sffsdr.h
+++ b/include/configs/davinci_sffsdr.h
@@ -56,7 +56,6 @@
 #define CONFIG_SYS_NS16550_CLK	CONFIG_SYS_HZ_CLOCK	/* Input clock to NS16550 */
 #define CONFIG_CONS_INDEX	1		/* use UART0 for console */
 #define CONFIG_BAUDRATE		115200		/* Default baud rate */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 /* I2C Configuration */
 #define CONFIG_HARD_I2C
 #define CONFIG_DRIVER_DAVINCI_I2C
diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h
index 854099b..fb26643 100644
--- a/include/configs/davinci_sonata.h
+++ b/include/configs/davinci_sonata.h
@@ -90,7 +90,6 @@
 #define CONFIG_SYS_NS16550_CLK	CONFIG_SYS_HZ_CLOCK	/* Input clock to NS16550 */
 #define CONFIG_CONS_INDEX	1		/* use UART0 for console */
 #define CONFIG_BAUDRATE		115200		/* Default baud rate */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 /*===================*/
 /* I2C Configuration */
 /*===================*/
diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index 1d5cf2c..13ddc5c 100644
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -59,7 +59,6 @@
 #define CONFIG_BAUDRATE		115200
 
 /* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define	CONFIG_TIMESTAMP		/* Print image info with timestamp */
 #undef	CONFIG_BOOTARGS
diff --git a/include/configs/debris.h b/include/configs/debris.h
index 303630d..32aa4e5 100644
--- a/include/configs/debris.h
+++ b/include/configs/debris.h
@@ -294,7 +294,6 @@
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS	3
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS	10	/* and takes up to 10 msec */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_SYS_FLASH_BANKS		{ FLASH_BASE0_PRELIM }
 
 /*-----------------------------------------------------------------------
diff --git a/include/configs/eXalion.h b/include/configs/eXalion.h
index afb1de6..3238ac7 100644
--- a/include/configs/eXalion.h
+++ b/include/configs/eXalion.h
@@ -93,9 +93,6 @@
 #define CONFIG_SYS_MAXARGS		8	/* max number of command args	*/
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size	*/
 #define CONFIG_SYS_LOAD_ADDR		0x00100000	/* default load address		*/
-
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define CONFIG_MISC_INIT_R	1
 
 /*-----------------------------------------------------------------------
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index 88b085d..4a03546 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -77,7 +77,6 @@
 #define CONFIG_SYS_NS16550_CLK	clk_get(DAVINCI_UART2_CLKID)
 #define CONFIG_CONS_INDEX	1		/* use UART0 for console */
 #define CONFIG_BAUDRATE		115200		/* Default baud rate */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_SPI
 #define CONFIG_SPI_FLASH
diff --git a/include/configs/eb_cpux9k2.h b/include/configs/eb_cpux9k2.h
index 21c471a..4d8be2b 100644
--- a/include/configs/eb_cpux9k2.h
+++ b/include/configs/eb_cpux9k2.h
@@ -188,8 +188,6 @@
  * UART/CONSOLE
  */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 115200, 19200, 38400, 57600, 9600 }
-
 #define CONFIG_BAUDRATE 115200
 #define CONFIG_ATMEL_USART
 #define CONFIG_USART_BASE	ATMEL_BASE_DBGU
diff --git a/include/configs/efikamx.h b/include/configs/efikamx.h
index 120055f..eb7d72b 100644
--- a/include/configs/efikamx.h
+++ b/include/configs/efikamx.h
@@ -94,7 +94,6 @@
 #define CONFIG_MXC_UART_BASE		UART1_BASE
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 #define CONFIG_MXC_GPIO
 
diff --git a/include/configs/enbw_cmc.h b/include/configs/enbw_cmc.h
index 29b0d33..7dc6cca 100644
--- a/include/configs/enbw_cmc.h
+++ b/include/configs/enbw_cmc.h
@@ -83,7 +83,6 @@
 #define CONFIG_SYS_NS16550_CLK	clk_get(DAVINCI_UART2_CLKID)
 #define CONFIG_CONS_INDEX	1		/* use UART0 for console */
 #define CONFIG_BAUDRATE		115200		/* Default baud rate */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * I2C Configuration
diff --git a/include/configs/ep8260.h b/include/configs/ep8260.h
index 221d3e0..7adedc9 100644
--- a/include/configs/ep8260.h
+++ b/include/configs/ep8260.h
@@ -376,9 +376,6 @@
 
 #define CONFIG_SYS_HZ            1000         /* decrementer freq: 1 ms ticks */
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index 604d2dd..5aed0ed 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -103,7 +103,6 @@
 #define CONFIG_ATMEL_USART
 #define CONFIG_USART3			/* USART 3 is DBGU */
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
 #define CONFIG_USART_BASE		ATMEL_BASE_DBGU
 #define	CONFIG_USART_ID			ATMEL_ID_SYS
 
diff --git a/include/configs/flea3.h b/include/configs/flea3.h
index dd7c73f..44c5532 100644
--- a/include/configs/flea3.h
+++ b/include/configs/flea3.h
@@ -82,7 +82,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /*
  * Command definition
diff --git a/include/configs/grasshopper.h b/include/configs/grasshopper.h
index e27216a..cc84c9c 100644
--- a/include/configs/grasshopper.h
+++ b/include/configs/grasshopper.h
@@ -191,7 +191,6 @@
 
 #define CONFIG_SYS_MEMTEST_START	EBI_SDRAM_BASE
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + 0x700000)
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 115200, 38400, 19200, 9600, 2400 }
 
 #endif /* __GRASSHOPPER_CONFIG_H */
 /* vim: set ts=8 noet: */
diff --git a/include/configs/gw8260.h b/include/configs/gw8260.h
index 2a40de1..7935aea 100644
--- a/include/configs/gw8260.h
+++ b/include/configs/gw8260.h
@@ -387,9 +387,6 @@
 #define CONFIG_SYS_MEMTEST_END     ( CONFIG_SYS_SDRAM_SIZE * 1024 * 1024 \
 			    - CONFIG_SYS_MEM_END_USAGE )
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE  { 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/hawkboard.h b/include/configs/hawkboard.h
index 6d2d4fb..0e9188d 100644
--- a/include/configs/hawkboard.h
+++ b/include/configs/hawkboard.h
@@ -98,7 +98,6 @@
 #define CONFIG_SYS_NS16550_CLK		clk_get(DAVINCI_UART2_CLKID)
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * Network & Ethernet Configuration
diff --git a/include/configs/hermes.h b/include/configs/hermes.h
index d849b5c..0f29cd1 100644
--- a/include/configs/hermes.h
+++ b/include/configs/hermes.h
@@ -105,8 +105,6 @@
 
 #define	CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define	CONFIG_SYS_ALLOC_DPRAM		1	/* use allocation routines	*/
 /*
  * Low Level Configuration Settings
diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index 520fa4c..791f3f5 100644
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -39,7 +39,6 @@
 #define CONFIG_CONS_INDEX		0
 
 #define CONFIG_BAUDRATE			38400
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_BOOTCOUNT_LIMIT
 #define CONFIG_SYS_BOOTCOUNT_ADDR	0xfff3cf0c
diff --git a/include/configs/idmr.h b/include/configs/idmr.h
index 50dd918..86bfa01 100644
--- a/include/configs/idmr.h
+++ b/include/configs/idmr.h
@@ -47,7 +47,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		19200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 #define CONFIG_ETHADDR		00:06:3b:01:41:55
 #define CONFIG_ETHPRIME
 #define CONFIG_IPADDR		192.168.30.1
diff --git a/include/configs/ima3-mx53.h b/include/configs/ima3-mx53.h
index ea48d64..186d8b9 100644
--- a/include/configs/ima3-mx53.h
+++ b/include/configs/ima3-mx53.h
@@ -92,7 +92,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /* Command definition */
 #include <config_cmd_default.h>
diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h
index c1f1aa6..7d2876b 100644
--- a/include/configs/imx27lite-common.h
+++ b/include/configs/imx27lite-common.h
@@ -105,7 +105,6 @@
 #define CONFIG_MXC_UART_BASE	UART1_BASE
 #define CONFIG_CONS_INDEX	1		/* use UART0 for console */
 #define CONFIG_BAUDRATE		115200		/* Default baud rate */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * Flash & Environment
diff --git a/include/configs/imx31_litekit.h b/include/configs/imx31_litekit.h
index bbcbce1..a340e97 100644
--- a/include/configs/imx31_litekit.h
+++ b/include/configs/imx31_litekit.h
@@ -87,7 +87,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /***********************************************************
  * Command definition
diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index 3153eb5..1728358 100644
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -65,7 +65,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /***********************************************************
  * Command definition
diff --git a/include/configs/incaip.h b/include/configs/incaip.h
index 70c9bb4..f632a2c 100644
--- a/include/configs/incaip.h
+++ b/include/configs/incaip.h
@@ -47,9 +47,6 @@
 
 #define CONFIG_BAUDRATE		115200
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define	CONFIG_TIMESTAMP		/* Print image info with timestamp */
 
 #define CONFIG_PREBOOT	"echo;"	\
diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h
index 0a704cb..fea40fc 100644
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -65,7 +65,6 @@
 #define CONFIG_CONS_INDEX	0
 #define CONFIG_BAUDRATE		38400
 #define CONFIG_PL01x_PORTS	{ (void *) (CONFIG_SYS_SERIAL0), (void *) (CONFIG_SYS_SERIAL1) }
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_SYS_SERIAL0		0x16000000
 #define CONFIG_SYS_SERIAL1		0x17000000
 
diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h
index 57610a6..ca2d92d 100644
--- a/include/configs/integratorcp.h
+++ b/include/configs/integratorcp.h
@@ -74,7 +74,6 @@
 #define CONFIG_PL01x_PORTS	{ (void *)CONFIG_SYS_SERIAL0, (void *)CONFIG_SYS_SERIAL1 }
 #define CONFIG_CONS_INDEX	0
 #define CONFIG_BAUDRATE		38400
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_SYS_SERIAL0		0x16000000
 #define CONFIG_SYS_SERIAL1		0x17000000
 
diff --git a/include/configs/jadecpu.h b/include/configs/jadecpu.h
index d644fea..296bbe1 100644
--- a/include/configs/jadecpu.h
+++ b/include/configs/jadecpu.h
@@ -182,7 +182,6 @@
 #define CONFIG_SYS_MEMTEST_END		(PHYS_SDRAM + PHYS_SDRAM_SIZE)
 
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200, 19200, 38400, 57600, 9600 }
 
 #define CONFIG_SYS_PROMPT	"jade> "
 #define CONFIG_SYS_CBSIZE	256
diff --git a/include/configs/kvme080.h b/include/configs/kvme080.h
index 203a4b2..e49dc28 100644
--- a/include/configs/kvme080.h
+++ b/include/configs/kvme080.h
@@ -114,8 +114,6 @@
 #define CONFIG_SYS_LOAD_ADDR		0x00100000
 #define CONFIG_SYS_HZ			1000
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define CONFIG_SYS_INIT_RAM_ADDR	0x40000000
 #define CONFIG_SYS_INIT_RAM_SIZE	0x1000
 #define CONFIG_SYS_GBL_DATA_OFFSET	(CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
diff --git a/include/configs/linkstation.h b/include/configs/linkstation.h
index cdf6827..bb96034 100644
--- a/include/configs/linkstation.h
+++ b/include/configs/linkstation.h
@@ -282,7 +282,6 @@
  */
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		57600
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
diff --git a/include/configs/lubbock.h b/include/configs/lubbock.h
index 361ffc5..7c8eb64 100644
--- a/include/configs/lubbock.h
+++ b/include/configs/lubbock.h
@@ -130,9 +130,6 @@
 #define CONFIG_SYS_HZ			1000
 #define CONFIG_SYS_CPUSPEED		0x161		/* set core clock to 400/200/100 MHz */
 
-						/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #ifdef CONFIG_MMC
 #define CONFIG_PXA_MMC
 #define CONFIG_CMD_MMC
diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h
index e23b0a1..405bc69 100644
--- a/include/configs/lwmon.h
+++ b/include/configs/lwmon.h
@@ -243,8 +243,6 @@
  */
 #ifdef CONFIG_WATCHDOG
 #define CONFIG_SYS_BAUDRATE_TABLE	{		38400, 57600, 115200 }
-#else
-#define CONFIG_SYS_BAUDRATE_TABLE	{  9600, 19200, 38400, 57600, 115200 }
 #endif
 
 /*----------------------------------------------------------------------*/
diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index c62f4d0..b8389e8 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -136,7 +136,6 @@
 #define	CONFIG_PL01x_PORTS		{ (void *)MXS_UARTDBG_BASE }
 #define	CONFIG_CONS_INDEX		0
 #define	CONFIG_BAUDRATE			115200	/* Default baud rate */
-#define	CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * MMC Driver
diff --git a/include/configs/meesc.h b/include/configs/meesc.h
index db1e87d..1e897e2 100644
--- a/include/configs/meesc.h
+++ b/include/configs/meesc.h
@@ -89,7 +89,6 @@
 #define CONFIG_USART_BASE		ATMEL_BASE_DBGU
 #define CONFIG_USART_ID			ATMEL_ID_SYS
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200, 19200, 38400, 57600, 9600}
 
 #define CONFIG_BOOTDELAY		3
 #define CONFIG_ZERO_BOOTDELAY_CHECK
diff --git a/include/configs/mpc7448hpc2.h b/include/configs/mpc7448hpc2.h
index 3e73775..c0c95ed 100644
--- a/include/configs/mpc7448hpc2.h
+++ b/include/configs/mpc7448hpc2.h
@@ -107,7 +107,6 @@
 
 #define CONFIG_SYS_NS16550_COM1	(CONFIG_SYS_TSI108_CSR_RST_BASE+0x7808)
 #define CONFIG_SYS_NS16550_COM2	(CONFIG_SYS_TSI108_CSR_RST_BASE+0x7C08)
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_BOOTDELAY	3	/* autoboot after 3 seconds */
 #define CONFIG_ZERO_BOOTDELAY_CHECK
diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h
index 52e15cc..aca367f 100644
--- a/include/configs/ms7750se.h
+++ b/include/configs/ms7750se.h
@@ -60,8 +60,6 @@
 #define CONFIG_SYS_PBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_BARGSIZE		512
-/* List of legal baudrate settings for this board */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 115200, 57600, 38400, 19200, 9600 }
 
 #define CONFIG_SYS_TEXT_BASE		0x8FFC0000
 #define CONFIG_SYS_MEMTEST_START	(CONFIG_SYS_SDRAM_BASE)
diff --git a/include/configs/mx1ads.h b/include/configs/mx1ads.h
index 9c1b255..81476ec 100644
--- a/include/configs/mx1ads.h
+++ b/include/configs/mx1ads.h
@@ -133,9 +133,6 @@
 #define CONFIG_SYS_HZ			3686400
 #define CONFIG_SYS_CPUSPEED		0x141
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*-----------------------------------------------------------------------
  * Stack sizes
  *
diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h
index 7210b6e..efca287 100644
--- a/include/configs/mx25pdk.h
+++ b/include/configs/mx25pdk.h
@@ -57,7 +57,6 @@
 #define CONFIG_MXC_UART_BASE	UART1_BASE
 #define CONFIG_CONS_INDEX	1	/* use UART0 for console */
 #define CONFIG_BAUDRATE		115200	/* Default baud rate */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /* No NOR flash present */
 #define CONFIG_ENV_OFFSET      (6 * 64 * 1024)
diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index 0c18e50..48e6b83 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -125,7 +125,6 @@
 #define CONFIG_PL01x_PORTS		{ (void *)MXS_UARTDBG_BASE }
 #define CONFIG_CONS_INDEX		0
 #define CONFIG_BAUDRATE			115200	/* Default baud rate */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * DMA
diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h
index 87638a4..cc720e8 100644
--- a/include/configs/mx31ads.h
+++ b/include/configs/mx31ads.h
@@ -84,7 +84,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /***********************************************************
  * Command definition
diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h
index 6ce97bc..7634de7 100644
--- a/include/configs/mx31pdk.h
+++ b/include/configs/mx31pdk.h
@@ -85,7 +85,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /***********************************************************
  * Command definition
diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
index bd57baa..a98230a 100644
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@@ -89,7 +89,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /*
  * Command definition
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 58b6f1c..ba1a129 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -138,7 +138,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /***********************************************************
  * Command definition
diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h
index f48a41e..333ba61 100644
--- a/include/configs/mx53ard.h
+++ b/include/configs/mx53ard.h
@@ -80,7 +80,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /* Command definition */
 #include <config_cmd_default.h>
diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
index a77e5b2..453cef9 100644
--- a/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@@ -94,7 +94,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /* Command definition */
 #include <config_cmd_default.h>
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 99daafb..c80e5e8 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -106,7 +106,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /* Command definition */
 #include <config_cmd_default.h>
diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h
index a04db3f..7cd7173 100644
--- a/include/configs/mx53smd.h
+++ b/include/configs/mx53smd.h
@@ -83,7 +83,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /* Command definition */
 #include <config_cmd_default.h>
diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h
index 90652c6..9fca0e1 100644
--- a/include/configs/mx6qarm2.h
+++ b/include/configs/mx6qarm2.h
@@ -70,7 +70,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /* Command definition */
 #include <config_cmd_default.h>
diff --git a/include/configs/mx6qsabrelite.h b/include/configs/mx6qsabrelite.h
index feabc05..7469038 100644
--- a/include/configs/mx6qsabrelite.h
+++ b/include/configs/mx6qsabrelite.h
@@ -115,7 +115,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX	       1
 #define CONFIG_BAUDRATE			       115200
-#define CONFIG_SYS_BAUDRATE_TABLE      {9600, 19200, 38400, 57600, 115200}
 
 /* Command definition */
 #include <config_cmd_default.h>
diff --git a/include/configs/nhk8815.h b/include/configs/nhk8815.h
index 20db397..de20771 100644
--- a/include/configs/nhk8815.h
+++ b/include/configs/nhk8815.h
@@ -106,7 +106,6 @@
 #define CONFIG_PL011_SERIAL
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 #define CFG_SERIAL0		0x101FD000
 #define CFG_SERIAL1		0x101FB000
 
diff --git a/include/configs/ns9750dev.h b/include/configs/ns9750dev.h
index c495423..f465a56 100644
--- a/include/configs/ns9750dev.h
+++ b/include/configs/ns9750dev.h
@@ -122,9 +122,6 @@
 
 #define	CONFIG_SYS_HZ			(CPU_CLK_FREQ/64)
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define NS9750_ETH_PHY_ADDRESS	(0x0000)
 
 /*-----------------------------------------------------------------------
diff --git a/include/configs/omap1510inn.h b/include/configs/omap1510inn.h
index 43de18b..f591a86 100644
--- a/include/configs/omap1510inn.h
+++ b/include/configs/omap1510inn.h
@@ -83,8 +83,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 
 /*
  * Command line configuration.
diff --git a/include/configs/omap2420h4.h b/include/configs/omap2420h4.h
index 46d1643..13762cc 100644
--- a/include/configs/omap2420h4.h
+++ b/include/configs/omap2420h4.h
@@ -118,8 +118,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX        1
 #define CONFIG_BAUDRATE          115200
-#define CONFIG_SYS_BAUDRATE_TABLE       {9600, 19200, 38400, 57600, 115200}
-
 
 /*
  * Command line configuration.
diff --git a/include/configs/omap5912osk.h b/include/configs/omap5912osk.h
index d3a2438..639d4a3 100644
--- a/include/configs/omap5912osk.h
+++ b/include/configs/omap5912osk.h
@@ -81,8 +81,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE	115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 
 /*
  * Command line configuration.
diff --git a/include/configs/omap730p2.h b/include/configs/omap730p2.h
index f7900e0..f1cadb2 100644
--- a/include/configs/omap730p2.h
+++ b/include/configs/omap730p2.h
@@ -85,8 +85,6 @@
 
 #define CONFIG_CONS_INDEX	   1
 #define CONFIG_BAUDRATE		   115200
-#define CONFIG_SYS_BAUDRATE_TABLE	   { 9600, 19200, 38400, 57600, 115200 }
-
 
 /*
  * Command line configuration.
diff --git a/include/configs/origen.h b/include/configs/origen.h
index d4d0f84..6dcd25d 100644
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -117,9 +117,6 @@
 
 #define CONFIG_SYS_HZ			1000
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /* Stack sizes */
 #define CONFIG_STACKSIZE		(256 << 10)	/* 256KB */
 
diff --git a/include/configs/otc570.h b/include/configs/otc570.h
index 8599378..7abc42a 100644
--- a/include/configs/otc570.h
+++ b/include/configs/otc570.h
@@ -88,7 +88,6 @@
 #define CONFIG_USART_BASE		ATMEL_BASE_DBGU
 #define CONFIG_USART_ID			ATMEL_ID_SYS
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200, 19200, 38400, 57600, 9600}
 
 #define CONFIG_BOOTDELAY		3
 #define CONFIG_ZERO_BOOTDELAY_CHECK
diff --git a/include/configs/palmld.h b/include/configs/palmld.h
index 88f4bfb..c4ea5ff 100644
--- a/include/configs/palmld.h
+++ b/include/configs/palmld.h
@@ -55,7 +55,6 @@
 #define	CONFIG_PXA_SERIAL
 #define	CONFIG_FFUART			1
 #define	CONFIG_BAUDRATE			9600
-#define	CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * Bootloader Components Configuration
diff --git a/include/configs/palmtc.h b/include/configs/palmtc.h
index d1fef25..9fa6733 100644
--- a/include/configs/palmtc.h
+++ b/include/configs/palmtc.h
@@ -59,7 +59,6 @@
 #define	CONFIG_PXA_SERIAL
 #define	CONFIG_FFUART			1
 #define	CONFIG_BAUDRATE			115200
-#define	CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * Bootloader Components Configuration
diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h
index d056884..810233f 100644
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -54,9 +54,6 @@
 
 #define CONFIG_BAUDRATE		115200
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define	CONFIG_TIMESTAMP		/* Print image info with timestamp */
 #undef	CONFIG_BOOTARGS
 
diff --git a/include/configs/pdnb3.h b/include/configs/pdnb3.h
index 43ec38f..19b80d1 100644
--- a/include/configs/pdnb3.h
+++ b/include/configs/pdnb3.h
@@ -117,8 +117,6 @@
 
 #define CONFIG_IXP425_TIMER_CLK		66666666
 #define CONFIG_SYS_HZ			1000		/* decrementer freq: 1 ms ticks */
-						/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * Stack sizes
diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index eba5616..cdb3593 100644
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -361,7 +361,6 @@
 #endif
 
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
 
 #define CONFIG_SYS_PROMPT		"pm9261> "
 #define CONFIG_SYS_CBSIZE		256
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index bf31c13..d202d0a 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -394,7 +394,6 @@
 #endif
 
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
 
 #define CONFIG_SYS_PROMPT		"u-boot-pm9263> "
 #define CONFIG_SYS_CBSIZE		256
diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h
index 4779878..a044346 100644
--- a/include/configs/pm9g45.h
+++ b/include/configs/pm9g45.h
@@ -167,7 +167,6 @@
 				"rootfstype=jffs2"
 
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
 
 #define CONFIG_SYS_PROMPT		"U-Boot> "
 #define CONFIG_SYS_CBSIZE		256
diff --git a/include/configs/ppmc7xx.h b/include/configs/ppmc7xx.h
index 4ceee17..5cd6609 100644
--- a/include/configs/ppmc7xx.h
+++ b/include/configs/ppmc7xx.h
@@ -368,7 +368,6 @@
 /*
  * Serial port config
  *
- * CONFIG_SYS_BAUDRATE_TABLE		- List of valid baud rates
  * CONFIG_SYS_NS16550			- Include the NS16550 driver
  * CONFIG_SYS_NS16550_SERIAL		- Include the serial (wrapper) driver
  * CONFIG_SYS_NS16550_CLK		- Frequency of reference clock
@@ -376,7 +375,6 @@
  * CONFIG_SYS_NS16550_COM1		- Base address of 1st serial port
  */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_CLK		3686400
diff --git a/include/configs/ppmc8260.h b/include/configs/ppmc8260.h
index 327863e..f4c9143 100644
--- a/include/configs/ppmc8260.h
+++ b/include/configs/ppmc8260.h
@@ -346,9 +346,6 @@
 #define CONFIG_SYS_MEMTEST_END		( CONFIG_SYS_SDRAM_SIZE * 1024 * 1024 \
 				- CONFIG_SYS_MEM_END_USAGE )
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/pxa255_idp.h b/include/configs/pxa255_idp.h
index 0666f7b..387661b 100644
--- a/include/configs/pxa255_idp.h
+++ b/include/configs/pxa255_idp.h
@@ -246,9 +246,6 @@
 
 #define RTC	1				/* enable 32KHz osc */
 
-						/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #ifdef CONFIG_MMC
 #define CONFIG_PXA_MMC
 #define CONFIG_CMD_MMC
diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index f5a137e..da32b30 100644
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -40,9 +40,6 @@
 
 #define CONFIG_BAUDRATE		115200
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define CONFIG_TIMESTAMP		/* Print image info with timestamp */
 #undef CONFIG_BOOTARGS
 
diff --git a/include/configs/qi_lb60.h b/include/configs/qi_lb60.h
index ebd8223..a3fc465 100644
--- a/include/configs/qi_lb60.h
+++ b/include/configs/qi_lb60.h
@@ -22,7 +22,6 @@
 
 #define CONFIG_SYS_UART_BASE	JZ4740_UART0_BASE /* Base of the UART channel */
 #define CONFIG_BAUDRATE		57600
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_SKIP_LOWLEVEL_INIT
 #define CONFIG_BOARD_EARLY_INIT_F
diff --git a/include/configs/qong.h b/include/configs/qong.h
index 3e36bb0..3b63ac2 100644
--- a/include/configs/qong.h
+++ b/include/configs/qong.h
@@ -122,7 +122,6 @@
 
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /***********************************************************
  * Command definition
diff --git a/include/configs/quantum.h b/include/configs/quantum.h
index dcfa29a..4f24651 100644
--- a/include/configs/quantum.h
+++ b/include/configs/quantum.h
@@ -142,8 +142,6 @@
 
 #define CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 9cdfc14..65dcffb 100644
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -46,8 +46,6 @@
 #define CONFIG_SYS_PBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_BARGSIZE		512
-/* List of legal baudrate settings for this board */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 115200, 57600, 38400, 19200, 9600 }
 
 #define CONFIG_SYS_MEMTEST_START	(CONFIG_SYS_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_TEXT_BASE - 0x100000)
diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h
index b0655c3..a7b3628 100644
--- a/include/configs/r7780mp.h
+++ b/include/configs/r7780mp.h
@@ -70,8 +70,6 @@
 #define CONFIG_SYS_PBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_BARGSIZE	512
-/* List of legal baudrate settings for this board */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 115200, 57600, 38400, 19200, 9600 }
 
 #define CONFIG_SYS_MEMTEST_START	(CONFIG_SYS_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_TEXT_BASE - 0x100000)
diff --git a/include/configs/rsdproto.h b/include/configs/rsdproto.h
index 3a70041..df7f40c 100644
--- a/include/configs/rsdproto.h
+++ b/include/configs/rsdproto.h
@@ -161,9 +161,6 @@
 
 #define	CONFIG_SYS_HZ			1000		/* decrementer freq: 1 ms ticks	*/
 
-						/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index e133a17..f3d3e4d 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -190,9 +190,6 @@
 
 #define CONFIG_SYS_HZ			1000
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /* Stack sizes */
 #define CONFIG_STACKSIZE	(256 << 10)	/* 256 KiB */
 
diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index 00db374..9337d5b 100644
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -215,9 +215,6 @@
 
 #define CONFIG_SYS_HZ			1000
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /* Stack sizes */
 #define CONFIG_STACKSIZE	(256 << 10)	/* regular stack 256KB */
 
diff --git a/include/configs/sacsng.h b/include/configs/sacsng.h
index 43036b2..f3b0fc1 100644
--- a/include/configs/sacsng.h
+++ b/include/configs/sacsng.h
@@ -620,9 +620,6 @@
 #define CONFIG_SYS_MEMTEST_END		( CONFIG_SYS_SDRAM_SIZE * 1024 * 1024 \
 				- CONFIG_SYS_MEM_END_USAGE )
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/sbc35_a9g20.h b/include/configs/sbc35_a9g20.h
index cdf8659..316e3fb 100644
--- a/include/configs/sbc35_a9g20.h
+++ b/include/configs/sbc35_a9g20.h
@@ -61,7 +61,6 @@
 #define CONFIG_USART_BASE               ATMEL_BASE_DBGU
 #define CONFIG_USART_ID                 ATMEL_ID_SYS
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
 
 #define CONFIG_BOOTDELAY	3
 
diff --git a/include/configs/scb9328.h b/include/configs/scb9328.h
index 180c5da..1494a2e 100644
--- a/include/configs/scb9328.h
+++ b/include/configs/scb9328.h
@@ -87,7 +87,6 @@
 #define CONFIG_SYS_HZ			3686400	     /* incrementer freq: 3.6864 MHz */
 #define CONFIG_SYS_CPUSPEED		0x141	     /* core clock - register value  */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_BAUDRATE 115200
 /*
  * Definitions related to passing arguments to kernel.
diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index 7d16320..bfbb2c3 100644
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -144,9 +144,6 @@
 
 #define CONFIG_SYS_HZ			1000
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /* support additional compression methods */
 #define CONFIG_BZIP2
 #define CONFIG_LZO
diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h
index 0f63040..23df401 100644
--- a/include/configs/smdk5250.h
+++ b/include/configs/smdk5250.h
@@ -126,9 +126,6 @@
 
 #define CONFIG_SYS_HZ			1000
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define CONFIG_RD_LVL
 
 /* Stack sizes */
diff --git a/include/configs/smdk6400.h b/include/configs/smdk6400.h
index a2b9441..47a3d41 100644
--- a/include/configs/smdk6400.h
+++ b/include/configs/smdk6400.h
@@ -144,9 +144,6 @@
 
 #define CONFIG_SYS_HZ			1000
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*-----------------------------------------------------------------------
  * Stack sizes
  *
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index 6663629..5ab8665 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -183,9 +183,6 @@
 
 #define CONFIG_SYS_HZ			1000
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*-----------------------------------------------------------------------
  * Stack sizes
  *
diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
index 702134b..868e6ae 100644
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@@ -116,9 +116,6 @@
 
 #define CONFIG_SYS_HZ			1000
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /* Stack sizes */
 #define CONFIG_STACKSIZE		(256 << 10)	/* 256KB */
 
diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h
index cee65d1..bb2a463 100644
--- a/include/configs/snapper9260.h
+++ b/include/configs/snapper9260.h
@@ -104,7 +104,6 @@
 #define CONFIG_USART_BASE		ATMEL_BASE_DBGU
 #define CONFIG_USART_ID			ATMEL_ID_SYS
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
 #define CONFIG_SYS_PROMPT		"Snapper> "
 
 /* I2C - Bit-bashed */
diff --git a/include/configs/stxxtc.h b/include/configs/stxxtc.h
index e7f5a0d..cbaa643 100644
--- a/include/configs/stxxtc.h
+++ b/include/configs/stxxtc.h
@@ -151,8 +151,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/svm_sc8xx.h b/include/configs/svm_sc8xx.h
index 2248680..0d939ee 100644
--- a/include/configs/svm_sc8xx.h
+++ b/include/configs/svm_sc8xx.h
@@ -177,8 +177,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/tb0229.h b/include/configs/tb0229.h
index fc2b57d..4ef835e 100644
--- a/include/configs/tb0229.h
+++ b/include/configs/tb0229.h
@@ -38,8 +38,6 @@
 
 #define CONFIG_BAUDRATE		115200
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define CONFIG_TIMESTAMP		/* Print image info with timestamp */
 
 #define CONFIG_PREBOOT	"echo;" \
diff --git a/include/configs/tnetv107x_evm.h b/include/configs/tnetv107x_evm.h
index 7c3f334..2dd1a33 100644
--- a/include/configs/tnetv107x_evm.h
+++ b/include/configs/tnetv107x_evm.h
@@ -71,7 +71,6 @@
 #define CONFIG_SYS_NS16550_CLK		clk_get_rate(TNETV107X_LPSC_UART1)
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /* Flash and environment info */
 #define CONFIG_SYS_NO_FLASH
diff --git a/include/configs/tny_a9260.h b/include/configs/tny_a9260.h
index 0043926..def5306 100644
--- a/include/configs/tny_a9260.h
+++ b/include/configs/tny_a9260.h
@@ -75,7 +75,6 @@
 #define CONFIG_USART_BASE		ATMEL_BASE_DBGU
 #define	CONFIG_USART_ID			ATMEL_ID_SYS
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
 
 #define CONFIG_BOOTDELAY	3
 
diff --git a/include/configs/top9000.h b/include/configs/top9000.h
index 2c66f33..1a5f680 100644
--- a/include/configs/top9000.h
+++ b/include/configs/top9000.h
@@ -90,7 +90,6 @@
 #define CONFIG_USART_BASE		ATMEL_BASE_DBGU
 #define	CONFIG_USART_ID			ATMEL_ID_SYS
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
 
 /* SD/MMC card */
 #define CONFIG_MMC
diff --git a/include/configs/trats.h b/include/configs/trats.h
index 5e38de2..2d0a1b1 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -166,9 +166,6 @@
 
 #define CONFIG_SYS_HZ			1000
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /* Stack sizes */
 #define CONFIG_STACKSIZE		(256 << 10) /* regular stack 256KB */
 
diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h
index af464e1..c020ff4 100644
--- a/include/configs/trizepsiv.h
+++ b/include/configs/trizepsiv.h
@@ -172,9 +172,6 @@
 #define CONFIG_SYS_HZ			1000
 #define CONFIG_SYS_CPUSPEED		0x207		/* need to look more closely, I think this is Turbo = 2x, L=91Mhz */
 
-						/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #ifdef CONFIG_MMC
 #define CONFIG_PXA_MMC
 #define CONFIG_CMD_MMC
diff --git a/include/configs/tt01.h b/include/configs/tt01.h
index 2623dbc..9c1d525 100644
--- a/include/configs/tt01.h
+++ b/include/configs/tt01.h
@@ -171,7 +171,6 @@
 /* console is UART2 on TT-01 */
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /* ethernet setup for the onboard smc9118 */
 #define CONFIG_MII
diff --git a/include/configs/tx25.h b/include/configs/tx25.h
index 3dfafa5..6821528 100644
--- a/include/configs/tx25.h
+++ b/include/configs/tx25.h
@@ -93,7 +93,6 @@
 #define CONFIG_MXC_UART_BASE	UART1_BASE
 #define CONFIG_CONS_INDEX	1	/* use UART0 for console */
 #define CONFIG_BAUDRATE		115200	/* Default baud rate */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_MXC_GPIO
 
diff --git a/include/configs/u8500_href.h b/include/configs/u8500_href.h
index 95028de..2cfbec8 100644
--- a/include/configs/u8500_href.h
+++ b/include/configs/u8500_href.h
@@ -70,7 +70,6 @@
 				  (void *)CFG_SERIAL2 }
 #define CONFIG_CONS_INDEX	2
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * Devices and file systems
diff --git a/include/configs/uc100.h b/include/configs/uc100.h
index 9da318d..62ef2c5 100644
--- a/include/configs/uc100.h
+++ b/include/configs/uc100.h
@@ -182,8 +182,6 @@
 
 #define	CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define CONFIG_AUTO_COMPLETE	1       /* add autocompletion support   */
 
 /*
diff --git a/include/configs/utx8245.h b/include/configs/utx8245.h
index 1e59ef3..d203bb4 100644
--- a/include/configs/utx8245.h
+++ b/include/configs/utx8245.h
@@ -58,7 +58,6 @@
 
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		57600
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_BOOTDELAY	2
 #define CONFIG_AUTOBOOT_PROMPT	"autoboot in %d seconds\n", bootdelay
diff --git a/include/configs/v37.h b/include/configs/v37.h
index a3fdc38..e36d249 100644
--- a/include/configs/v37.h
+++ b/include/configs/v37.h
@@ -142,8 +142,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/vct.h b/include/configs/vct.h
index 9ddc7b1..0a5ce64 100644
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -74,7 +74,6 @@
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_SYS_NS16550_CLK		921600
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * SDRAM
diff --git a/include/configs/versatile.h b/include/configs/versatile.h
index bb835e0..ff23a92 100644
--- a/include/configs/versatile.h
+++ b/include/configs/versatile.h
@@ -93,7 +93,6 @@
 #define CONFIG_CONS_INDEX	0
 
 #define CONFIG_BAUDRATE			38400
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_SYS_SERIAL0		0x101F1000
 #define CONFIG_SYS_SERIAL1		0x101F2000
 
diff --git a/include/configs/virtlab2.h b/include/configs/virtlab2.h
index 466d930..bf882b0 100644
--- a/include/configs/virtlab2.h
+++ b/include/configs/virtlab2.h
@@ -160,8 +160,6 @@
 
 #define	CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/vision2.h b/include/configs/vision2.h
index f6904f3..76ab1bd 100644
--- a/include/configs/vision2.h
+++ b/include/configs/vision2.h
@@ -136,7 +136,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX			3
 #define CONFIG_BAUDRATE				115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /***********************************************************
  * Command definition
diff --git a/include/configs/vpac270.h b/include/configs/vpac270.h
index 7802f44..ed18dbe 100644
--- a/include/configs/vpac270.h
+++ b/include/configs/vpac270.h
@@ -76,7 +76,6 @@
 #define	CONFIG_PXA_SERIAL
 #define	CONFIG_FFUART			1
 #define	CONFIG_BAUDRATE			115200
-#define	CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * Bootloader Components Configuration
diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h
index 941f80c..a0cc247 100644
--- a/include/configs/xaeniax.h
+++ b/include/configs/xaeniax.h
@@ -67,9 +67,6 @@
 
 #define CONFIG_BAUDRATE		115200
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 } /* valid baudrates */
-
-
 /*
  * BOOTP options
  */
diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h
index afe1e89..cacf7ea 100644
--- a/include/configs/zipitz2.h
+++ b/include/configs/zipitz2.h
@@ -67,7 +67,6 @@
 #define	CONFIG_PXA_SERIAL
 #define	CONFIG_STUART			1
 #define	CONFIG_BAUDRATE			115200
-#define	CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * Bootloader Components Configuration
diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h
index d7ce6c6..4573149 100644
--- a/include/configs/zmx25.h
+++ b/include/configs/zmx25.h
@@ -69,7 +69,6 @@
 #define CONFIG_MXC_UART_BASE	UART2_BASE
 #define CONFIG_CONS_INDEX	1	/* use UART2 for console */
 #define CONFIG_BAUDRATE		115200	/* Default baud rate */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * Ethernet
diff --git a/mkconfig b/mkconfig
index 438530b..daa1810 100755
--- a/mkconfig
+++ b/mkconfig
@@ -167,6 +167,7 @@ cat << EOF >> config.h
 #include <config_defaults.h>
 #include <configs/${CONFIG_NAME}.h>
 #include <asm/config.h>
+#include <config_fallbacks.h>
 EOF
 
 exit 0
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [U-Boot] [PATCH v4 2/2] hush.c: Move default CONFIG_SYS_PROMPT_HUSH_PS2 to hush.c
  2012-06-19 22:54 ` [U-Boot] [PATCH v4 " Tom Rini
@ 2012-06-19 22:54   ` Tom Rini
  2012-06-20  9:14     ` Stefano Babic
  2012-06-20 18:36     ` Wolfgang Denk
  2012-06-20 18:36   ` [U-Boot] [PATCH v4 1/2] CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there Wolfgang Denk
  1 sibling, 2 replies; 25+ messages in thread
From: Tom Rini @ 2012-06-19 22:54 UTC (permalink / raw)
  To: u-boot

Exactly one board has defined CONFIG_SYS_PROMPT_HUSH_PS2 to a value
different than "> " which is vision2.  I have Cc'd the maintainer here
as I strongly suspect this is a bug rather than intentional behavior.

Cc: Stefano Babic <sbabic@denx.de>
Signed-off-by: Tom Rini <trini@ti.com>

---
Changes in v4:
- Rebase to current master
---
 board/fads/fads.h                      |    1 -
 common/hush.c                          |    3 +++
 include/configs/AP1000.h               |    1 -
 include/configs/ASH405.h               |    3 ---
 include/configs/Adder.h                |    1 -
 include/configs/CATcenter.h            |    3 ---
 include/configs/CMS700.h               |    3 ---
 include/configs/CPC45.h                |    3 ---
 include/configs/CPCI2DP.h              |    3 ---
 include/configs/CPCI405.h              |    3 ---
 include/configs/CPCI4052.h             |    3 ---
 include/configs/CPCI405AB.h            |    3 ---
 include/configs/CPCI405DT.h            |    3 ---
 include/configs/CPCI750.h              |    1 -
 include/configs/CRAYL1.h               |    1 -
 include/configs/CU824.h                |    3 ---
 include/configs/DB64360.h              |    1 -
 include/configs/DB64460.h              |    1 -
 include/configs/DP405.h                |    3 ---
 include/configs/EB+MCF-EV123.h         |    1 -
 include/configs/EP88x.h                |    1 -
 include/configs/EVB64260.h             |    1 -
 include/configs/FPS850L.h              |    3 ---
 include/configs/FPS860L.h              |    3 ---
 include/configs/G2000.h                |    3 ---
 include/configs/GEN860T.h              |    1 -
 include/configs/HH405.h                |    3 ---
 include/configs/HUB405.h               |    3 ---
 include/configs/HWW1U1A.h              |    1 -
 include/configs/ISPAN.h                |    1 -
 include/configs/IceCube.h              |    1 -
 include/configs/JSE.h                  |    3 ---
 include/configs/KAREF.h                |    1 -
 include/configs/M5271EVB.h             |    1 -
 include/configs/MBX.h                  |    3 ---
 include/configs/MERGERBOX.h            |    1 -
 include/configs/METROBOX.h             |    1 -
 include/configs/MIP405.h               |    1 -
 include/configs/MPC8260ADS.h           |    1 -
 include/configs/MPC8308RDB.h           |    1 -
 include/configs/MPC8313ERDB.h          |    1 -
 include/configs/MPC8315ERDB.h          |    3 ---
 include/configs/MPC8323ERDB.h          |    3 ---
 include/configs/MPC832XEMDS.h          |    3 ---
 include/configs/MPC8349EMDS.h          |    3 ---
 include/configs/MPC8349ITX.h           |    1 -
 include/configs/MPC8360EMDS.h          |    3 ---
 include/configs/MPC8360ERDK.h          |    3 ---
 include/configs/MPC837XEMDS.h          |    3 ---
 include/configs/MPC837XERDB.h          |    3 ---
 include/configs/MPC8536DS.h            |    3 ---
 include/configs/MPC8540ADS.h           |    1 -
 include/configs/MPC8541CDS.h           |    1 -
 include/configs/MPC8544DS.h            |    3 ---
 include/configs/MPC8548CDS.h           |    3 ---
 include/configs/MPC8555CDS.h           |    1 -
 include/configs/MPC8560ADS.h           |    1 -
 include/configs/MPC8568MDS.h           |    1 -
 include/configs/MPC8569MDS.h           |    1 -
 include/configs/MPC8572DS.h            |    3 ---
 include/configs/MPC8610HPCD.h          |    3 ---
 include/configs/MPC8641HPCN.h          |    3 ---
 include/configs/MVBC_P.h               |    1 -
 include/configs/MVBLM7.h               |    1 -
 include/configs/MVS1.h                 |    3 ---
 include/configs/MVSMR.h                |    1 -
 include/configs/NETPHONE.h             |    1 -
 include/configs/NETTA.h                |    1 -
 include/configs/NETTA2.h               |    1 -
 include/configs/NSCU.h                 |    3 ---
 include/configs/P1010RDB.h             |    3 ---
 include/configs/P1022DS.h              |    1 -
 include/configs/P1023RDS.h             |    3 ---
 include/configs/P1_P2_RDB.h            |    3 ---
 include/configs/P2020COME.h            |    3 ---
 include/configs/P2020DS.h              |    3 ---
 include/configs/P2041RDB.h             |    1 -
 include/configs/P3G4.h                 |    1 -
 include/configs/PCI405.h               |    3 ---
 include/configs/PCIPPC2.h              |    3 ---
 include/configs/PCIPPC6.h              |    3 ---
 include/configs/PIP405.h               |    1 -
 include/configs/PK1C20.h               |    1 -
 include/configs/PLU405.h               |    3 ---
 include/configs/PMC405.h               |    3 ---
 include/configs/PPChameleonEVB.h       |    3 ---
 include/configs/QS823.h                |    1 -
 include/configs/QS850.h                |    1 -
 include/configs/QS860T.h               |    1 -
 include/configs/Rattler.h              |    1 -
 include/configs/SBC8540.h              |    3 ---
 include/configs/SIMPC8313.h            |    1 -
 include/configs/TK885D.h               |    3 ---
 include/configs/TOP860.h               |    3 ---
 include/configs/TQM5200.h              |    1 -
 include/configs/TQM823L.h              |    3 ---
 include/configs/TQM823M.h              |    3 ---
 include/configs/TQM8260.h              |    3 ---
 include/configs/TQM8272.h              |    3 ---
 include/configs/TQM834x.h              |    3 ---
 include/configs/TQM850L.h              |    3 ---
 include/configs/TQM850M.h              |    3 ---
 include/configs/TQM855L.h              |    3 ---
 include/configs/TQM855M.h              |    3 ---
 include/configs/TQM85xx.h              |    3 ---
 include/configs/TQM860L.h              |    3 ---
 include/configs/TQM860M.h              |    3 ---
 include/configs/TQM862L.h              |    3 ---
 include/configs/TQM862M.h              |    3 ---
 include/configs/TQM866M.h              |    3 ---
 include/configs/TQM885D.h              |    3 ---
 include/configs/VCMA9.h                |    1 -
 include/configs/VOH405.h               |    3 ---
 include/configs/VOM405.h               |    3 ---
 include/configs/W7OLMC.h               |    1 -
 include/configs/W7OLMG.h               |    1 -
 include/configs/WUH405.h               |    3 ---
 include/configs/ZPC1900.h              |    1 -
 include/configs/ZUMA.h                 |    1 -
 include/configs/a4m072.h               |    3 ---
 include/configs/am3517_crane.h         |    1 -
 include/configs/am3517_evm.h           |    1 -
 include/configs/amcc-common.h          |    3 ---
 include/configs/aria.h                 |    1 -
 include/configs/astro_mcf5373l.h       |    1 -
 include/configs/at91rm9200ek.h         |    1 -
 include/configs/at91sam9263ek.h        |    1 -
 include/configs/at91sam9m10g45ek.h     |    1 -
 include/configs/balloon3.h             |    1 -
 include/configs/bct-brettl2.h          |    1 -
 include/configs/c2mon.h                |    3 ---
 include/configs/calimain.h             |    1 -
 include/configs/cam_enc_4xx.h          |    1 -
 include/configs/cm_t35.h               |    1 -
 include/configs/colibri_pxa270.h       |    1 -
 include/configs/corenet_ds.h           |    1 -
 include/configs/csb272.h               |    3 ---
 include/configs/csb472.h               |    3 ---
 include/configs/da830evm.h             |    1 -
 include/configs/da850evm.h             |    1 -
 include/configs/davinci_dm355evm.h     |    1 -
 include/configs/davinci_dm355leopard.h |    1 -
 include/configs/davinci_dm365evm.h     |    1 -
 include/configs/davinci_dm6467evm.h    |    1 -
 include/configs/davinci_dvevm.h        |    1 -
 include/configs/davinci_schmoogie.h    |    1 -
 include/configs/davinci_sffsdr.h       |    1 -
 include/configs/davinci_sonata.h       |    1 -
 include/configs/devkit8000.h           |    1 -
 include/configs/dig297.h               |    1 -
 include/configs/digsy_mtc.h            |    1 -
 include/configs/dns325.h               |    1 -
 include/configs/ea20.h                 |    1 -
 include/configs/edminiv2.h             |    1 -
 include/configs/efikamx.h              |    1 -
 include/configs/enbw_cmc.h             |    1 -
 include/configs/ep8248.h               |    1 -
 include/configs/ep8260.h               |    1 -
 include/configs/ep82xxm.h              |    1 -
 include/configs/ethernut5.h            |    1 -
 include/configs/flea3.h                |    1 -
 include/configs/galaxy5200.h           |    1 -
 include/configs/grasshopper.h          |    1 -
 include/configs/grsim.h                |    3 ---
 include/configs/grsim_leon2.h          |    3 ---
 include/configs/gw8260.h               |    1 -
 include/configs/hawkboard.h            |    1 -
 include/configs/igep00x0.h             |    1 -
 include/configs/ima3-mx53.h            |    1 -
 include/configs/integratorap.h         |    1 -
 include/configs/jadecpu.h              |    1 -
 include/configs/jupiter.h              |    3 ---
 include/configs/km/keymile-common.h    |    1 -
 include/configs/lacie_kw.h             |    1 -
 include/configs/lubbock.h              |    1 -
 include/configs/lwmon.h                |    3 ---
 include/configs/lwmon5.h               |    3 ---
 include/configs/m28evk.h               |    1 -
 include/configs/mcc200.h               |    1 -
 include/configs/mcx.h                  |    1 -
 include/configs/mecp5123.h             |    1 -
 include/configs/microblaze-generic.h   |    3 ---
 include/configs/motionpro.h            |    1 -
 include/configs/mpc5121-common.h       |    3 ---
 include/configs/mpc5121ads.h           |    1 -
 include/configs/mpc7448hpc2.h          |    1 -
 include/configs/mpc8308_p1m.h          |    1 -
 include/configs/mpq101.h               |    3 ---
 include/configs/muas3001.h             |    1 -
 include/configs/mx1ads.h               |    1 -
 include/configs/mx28evk.h              |    1 -
 include/configs/mx35pdk.h              |    1 -
 include/configs/mx51evk.h              |    1 -
 include/configs/mx53ard.h              |    1 -
 include/configs/mx53evk.h              |    1 -
 include/configs/mx53loco.h             |    1 -
 include/configs/mx53smd.h              |    1 -
 include/configs/mx6qarm2.h             |    1 -
 include/configs/mx6qsabrelite.h        |    1 -
 include/configs/nhk8815.h              |    1 -
 include/configs/nios2-generic.h        |    1 -
 include/configs/omap3_beagle.h         |    1 -
 include/configs/omap3_evm_common.h     |    1 -
 include/configs/omap3_logic.h          |    1 -
 include/configs/omap3_mvblx.h          |    1 -
 include/configs/omap3_overo.h          |    1 -
 include/configs/omap3_pandora.h        |    1 -
 include/configs/omap3_sdp3430.h        |    1 -
 include/configs/omap3_zoom1.h          |    1 -
 include/configs/omap4_common.h         |    1 -
 include/configs/omap5_evm.h            |    1 -
 include/configs/origen.h               |    1 -
 include/configs/p1_p2_rdb_pc.h         |    3 ---
 include/configs/p3mx.h                 |    1 -
 include/configs/palmld.h               |    1 -
 include/configs/palmtc.h               |    1 -
 include/configs/pm9g45.h               |    1 -
 include/configs/pxa255_idp.h           |    1 -
 include/configs/qemu-mips.h            |    1 -
 include/configs/qong.h                 |    3 ---
 include/configs/s5p_goni.h             |    1 -
 include/configs/s5pc210_universal.h    |    1 -
 include/configs/sacsng.h               |    1 -
 include/configs/sandbox.h              |    1 -
 include/configs/sbc405.h               |    3 ---
 include/configs/sbc8349.h              |    3 ---
 include/configs/sbc8548.h              |    3 ---
 include/configs/sbc8560.h              |    3 ---
 include/configs/sbc8641d.h             |    1 -
 include/configs/smdk2410.h             |    1 -
 include/configs/smdk5250.h             |    1 -
 include/configs/smdk6400.h             |    3 ---
 include/configs/smdkc100.h             |    1 -
 include/configs/smdkv310.h             |    1 -
 include/configs/snapper9260.h          |    1 -
 include/configs/socrates.h             |    3 ---
 include/configs/sorcery.h              |    3 ---
 include/configs/spc1920.h              |    1 -
 include/configs/stxgp3.h               |    1 -
 include/configs/stxssa.h               |    3 ---
 include/configs/stxxtc.h               |    1 -
 include/configs/svm_sc8xx.h            |    1 -
 include/configs/tam3517-common.h       |    1 -
 include/configs/tegra2-common.h        |    1 -
 include/configs/tnetv107x_evm.h        |    1 -
 include/configs/trats.h                |    1 -
 include/configs/tricorder.h            |    1 -
 include/configs/trizepsiv.h            |    1 -
 include/configs/tt01.h                 |    1 -
 include/configs/u8500_href.h           |    1 -
 include/configs/uc100.h                |    3 ---
 include/configs/ve8313.h               |    1 -
 include/configs/virtlab2.h             |    3 ---
 include/configs/vision2.h              |    1 -
 include/configs/vme8349.h              |    3 ---
 include/configs/vpac270.h              |    1 -
 include/configs/xaeniax.h              |    1 -
 include/configs/xilinx-ppc.h           |    1 -
 include/configs/xpedite1000.h          |    1 -
 include/configs/xpedite517x.h          |    1 -
 include/configs/xpedite520x.h          |    1 -
 include/configs/xpedite537x.h          |    1 -
 include/configs/xpedite550x.h          |    1 -
 include/configs/zipitz2.h              |    1 -
 include/configs/zmx25.h                |    1 -
 265 files changed, 3 insertions(+), 450 deletions(-)

diff --git a/board/fads/fads.h b/board/fads/fads.h
index 1a3d22a..fa4a25a 100644
--- a/board/fads/fads.h
+++ b/board/fads/fads.h
@@ -132,7 +132,6 @@
  */
 #define	CONFIG_SYS_PROMPT		"=>"		/* Monitor Command Prompt	*/
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define	CONFIG_SYS_LONGHELP				/* #undef to save memory	*/
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024		/* Console I/O Buffer Size	*/
diff --git a/common/hush.c b/common/hush.c
index 672ab9e..1eff182 100644
--- a/common/hush.c
+++ b/common/hush.c
@@ -92,6 +92,9 @@
 #include <common.h>        /* readline */
 #include <hush.h>
 #include <command.h>        /* find_cmd */
+#ifndef CONFIG_SYS_PROMPT_HUSH_PS2
+#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
+#endif
 #endif
 #ifndef __U_BOOT__
 #include <ctype.h>     /* isalpha, isdigit */
diff --git a/include/configs/AP1000.h b/include/configs/AP1000.h
index fd074fb..09cfef6 100644
--- a/include/configs/AP1000.h
+++ b/include/configs/AP1000.h
@@ -39,7 +39,6 @@
 
 #define CONFIG_SYS_HUSH_PARSER 1		/* use "hush" command parser	*/
 #define CONFIG_SYS_PROMPT		"0> "
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define CONFIG_COMMAND_EDIT	1
 #define CONFIG_COMPLETE_ADDRESSES 1
diff --git a/include/configs/ASH405.h b/include/configs/ASH405.h
index 7f48499..09aa763 100644
--- a/include/configs/ASH405.h
+++ b/include/configs/ASH405.h
@@ -105,9 +105,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/Adder.h b/include/configs/Adder.h
index ecf5fb8..a23c7ff 100644
--- a/include/configs/Adder.h
+++ b/include/configs/Adder.h
@@ -90,7 +90,6 @@
  */
 #define CONFIG_SYS_PROMPT		"=> "		/* Monitor Command Prompt	*/
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_LONGHELP				/* #undef to save memory	*/
 #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 */
diff --git a/include/configs/CATcenter.h b/include/configs/CATcenter.h
index 84e4e78..1e3a564 100644
--- a/include/configs/CATcenter.h
+++ b/include/configs/CATcenter.h
@@ -170,9 +170,6 @@
 #define CONFIG_SYS_PROMPT		"=> "	/* Monitor Command Prompt	*/
 
 #define	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/CMS700.h b/include/configs/CMS700.h
index 63d838f..686d158 100644
--- a/include/configs/CMS700.h
+++ b/include/configs/CMS700.h
@@ -103,9 +103,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/CPC45.h b/include/configs/CPC45.h
index b2b9e07..fc226f1 100644
--- a/include/configs/CPC45.h
+++ b/include/configs/CPC45.h
@@ -96,9 +96,6 @@
 #if 1
 #define CONFIG_SYS_HUSH_PARSER		1	/* use "hush" command parser	*/
 #endif
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 /* Print Buffer Size
  */
diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h
index afe8d6e..11cf58b 100644
--- a/include/configs/CPCI2DP.h
+++ b/include/configs/CPCI2DP.h
@@ -91,9 +91,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/CPCI405.h b/include/configs/CPCI405.h
index cf1d1b3..9ecdad9 100644
--- a/include/configs/CPCI405.h
+++ b/include/configs/CPCI405.h
@@ -106,9 +106,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h
index d17458e..efab119 100644
--- a/include/configs/CPCI4052.h
+++ b/include/configs/CPCI4052.h
@@ -113,9 +113,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/CPCI405AB.h b/include/configs/CPCI405AB.h
index a0d16d2..83e9a04 100644
--- a/include/configs/CPCI405AB.h
+++ b/include/configs/CPCI405AB.h
@@ -114,9 +114,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/CPCI405DT.h b/include/configs/CPCI405DT.h
index 98b8ef5..1944a07 100644
--- a/include/configs/CPCI405DT.h
+++ b/include/configs/CPCI405DT.h
@@ -114,9 +114,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/CPCI750.h b/include/configs/CPCI750.h
index a6af86c..b276ae6 100644
--- a/include/configs/CPCI750.h
+++ b/include/configs/CPCI750.h
@@ -76,7 +76,6 @@
 /*#define CONFIG_SYS_HUSH_PARSER*/
 #define CONFIG_SYS_HUSH_PARSER
 
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define CONFIG_CMDLINE_EDITING		/* add command line history	*/
 #define CONFIG_AUTO_COMPLETE		/* add autocompletion support	*/
diff --git a/include/configs/CRAYL1.h b/include/configs/CRAYL1.h
index 4aaceb7..1daec69 100644
--- a/include/configs/CRAYL1.h
+++ b/include/configs/CRAYL1.h
@@ -87,7 +87,6 @@
 #define CONFIG_ENV_OVERWRITE     1
 #define	CONFIG_SYS_HZ		             1000	/* decrementer freq: 1 ms ticks	*/
 #define CONFIG_SYS_HUSH_PARSER			1
-#define CONFIG_SYS_PROMPT_HUSH_PS2		"> "
 #define CONFIG_SOURCE			1
 
 
diff --git a/include/configs/CU824.h b/include/configs/CU824.h
index c8821fd..a3ceed1 100644
--- a/include/configs/CU824.h
+++ b/include/configs/CU824.h
@@ -90,9 +90,6 @@
 #if 1
 #define	CONFIG_SYS_HUSH_PARSER		1	/* use "hush" command parser	*/
 #endif
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 /* Print Buffer Size
  */
diff --git a/include/configs/DB64360.h b/include/configs/DB64360.h
index c3f3a24..d5ef154 100644
--- a/include/configs/DB64360.h
+++ b/include/configs/DB64360.h
@@ -140,7 +140,6 @@ if we use PCI it has its own MAC addr */
 /*#define CONFIG_SYS_HUSH_PARSER */
 #undef CONFIG_SYS_HUSH_PARSER
 
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * The following defines let you select what serial you want to use
diff --git a/include/configs/DB64460.h b/include/configs/DB64460.h
index d48f092..02a013b 100644
--- a/include/configs/DB64460.h
+++ b/include/configs/DB64460.h
@@ -78,7 +78,6 @@
 /*#define CONFIG_SYS_HUSH_PARSER */
 #undef CONFIG_SYS_HUSH_PARSER
 
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * The following defines let you select what serial you want to use
diff --git a/include/configs/DP405.h b/include/configs/DP405.h
index f6e2652..6d67d6e 100644
--- a/include/configs/DP405.h
+++ b/include/configs/DP405.h
@@ -80,9 +80,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/EB+MCF-EV123.h b/include/configs/EB+MCF-EV123.h
index eb9fe46..a3420f4 100644
--- a/include/configs/EB+MCF-EV123.h
+++ b/include/configs/EB+MCF-EV123.h
@@ -90,7 +90,6 @@
 
 #define CONFIG_BOOTDELAY	5
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT	"\nEV123 U-Boot> "
 #define	CONFIG_SYS_LONGHELP	1
 
diff --git a/include/configs/EP88x.h b/include/configs/EP88x.h
index 1638d35..9019cc7 100644
--- a/include/configs/EP88x.h
+++ b/include/configs/EP88x.h
@@ -85,7 +85,6 @@
  */
 #define CONFIG_SYS_PROMPT		"=> "		/* Monitor Command Prompt	*/
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_LONGHELP				/* #undef to save memory	*/
 #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 */
diff --git a/include/configs/EVB64260.h b/include/configs/EVB64260.h
index b905402..b542b96 100644
--- a/include/configs/EVB64260.h
+++ b/include/configs/EVB64260.h
@@ -61,7 +61,6 @@
 #endif
 
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * The following defines let you select what serial you want to use
diff --git a/include/configs/FPS850L.h b/include/configs/FPS850L.h
index 6d7ca27..3b00ae3 100644
--- a/include/configs/FPS850L.h
+++ b/include/configs/FPS850L.h
@@ -131,9 +131,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/FPS860L.h b/include/configs/FPS860L.h
index b074c7d..c23711d 100644
--- a/include/configs/FPS860L.h
+++ b/include/configs/FPS860L.h
@@ -131,9 +131,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/G2000.h b/include/configs/G2000.h
index d64dd8d..08ba840 100644
--- a/include/configs/G2000.h
+++ b/include/configs/G2000.h
@@ -130,9 +130,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/GEN860T.h b/include/configs/GEN860T.h
index 1ea4108..b98cacc 100644
--- a/include/configs/GEN860T.h
+++ b/include/configs/GEN860T.h
@@ -282,7 +282,6 @@
  * Use the "hush" command parser
  */
 #define	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * Set buffer size for console I/O
diff --git a/include/configs/HH405.h b/include/configs/HH405.h
index 4a41b5c..444413d 100644
--- a/include/configs/HH405.h
+++ b/include/configs/HH405.h
@@ -155,9 +155,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/HUB405.h b/include/configs/HUB405.h
index afb8273..e90782f 100644
--- a/include/configs/HUB405.h
+++ b/include/configs/HUB405.h
@@ -99,9 +99,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/HWW1U1A.h b/include/configs/HWW1U1A.h
index f08d78b..791763a 100644
--- a/include/configs/HWW1U1A.h
+++ b/include/configs/HWW1U1A.h
@@ -407,7 +407,6 @@
 #define CONFIG_SYS_CBSIZE 4096		/* Allow up to 4k command lines	*/
 #define CONFIG_SYS_BARGSIZE 4096	/* Allow up to 4k boot args	*/
 #define CONFIG_SYS_HUSH_PARSER		/* Enable a fancier shell	*/
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "	/* Command-line continuation	*/
 
 /* A little extra magic here for the prompt */
 #define CONFIG_SYS_PROMPT hww1u1a_get_ps1()
diff --git a/include/configs/ISPAN.h b/include/configs/ISPAN.h
index d6474bd..43734d3 100644
--- a/include/configs/ISPAN.h
+++ b/include/configs/ISPAN.h
@@ -146,7 +146,6 @@
  */
 #define CONFIG_SYS_PROMPT		"=> "		/* Monitor Command Prompt	*/
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_LONGHELP				/* #undef to save memory	*/
 #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 */
diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h
index 135ef55..33c2ead 100644
--- a/include/configs/IceCube.h
+++ b/include/configs/IceCube.h
@@ -325,7 +325,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* use "hush" command parser	*/
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define CONFIG_SYS_MEMTEST_START	0x00100000	/* memtest works on */
 #define CONFIG_SYS_MEMTEST_END		0x00f00000	/* 1 ... 15 MB in DRAM	*/
diff --git a/include/configs/JSE.h b/include/configs/JSE.h
index ef652b2..e0a0d8e 100644
--- a/include/configs/JSE.h
+++ b/include/configs/JSE.h
@@ -175,9 +175,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #define CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/KAREF.h b/include/configs/KAREF.h
index 06fa676..3daf480 100644
--- a/include/configs/KAREF.h
+++ b/include/configs/KAREF.h
@@ -223,7 +223,6 @@
 #define CONFIG_SYS_PROMPT	      "KaRefDes=> "  /* Monitor Command Prompt	*/
 
 #define CONFIG_SYS_HUSH_PARSER	       1	     /* HUSH for ext'd cli	*/
-#define CONFIG_SYS_PROMPT_HUSH_PS2    "> "
 
 
 /*-----------------------------------------------------------------------
diff --git a/include/configs/M5271EVB.h b/include/configs/M5271EVB.h
index ac200f5..a5913df 100644
--- a/include/configs/M5271EVB.h
+++ b/include/configs/M5271EVB.h
@@ -85,7 +85,6 @@
 #define CONFIG_CMD_LOADB
 #define CONFIG_CMDLINE_EDITING	1 /* enables command line history */
 #define CONFIG_SYS_HUSH_PARSER /* Use the HUSH parser */
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 #define CONFIG_MCFFEC
 #ifdef CONFIG_MCFFEC
diff --git a/include/configs/MBX.h b/include/configs/MBX.h
index 95ddc97..e8d0cd7 100644
--- a/include/configs/MBX.h
+++ b/include/configs/MBX.h
@@ -100,9 +100,6 @@
 #define CONFIG_SYS_LONGHELP			/* undef to save memory		*/
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 #undef	CONFIG_SYS_HUSH_PARSER			/* Hush parse for U-Boot	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
 #else
diff --git a/include/configs/MERGERBOX.h b/include/configs/MERGERBOX.h
index 8176916..077e0d0 100644
--- a/include/configs/MERGERBOX.h
+++ b/include/configs/MERGERBOX.h
@@ -216,7 +216,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 /* Pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/METROBOX.h b/include/configs/METROBOX.h
index c75a256..34376bc 100644
--- a/include/configs/METROBOX.h
+++ b/include/configs/METROBOX.h
@@ -288,7 +288,6 @@
 #define CONFIG_SYS_PROMPT	      "MetroBox=> "  /* Monitor Command Prompt	*/
 
 #define CONFIG_SYS_HUSH_PARSER	       1	     /* HUSH for ext'd cli	*/
-#define CONFIG_SYS_PROMPT_HUSH_PS2    "> "
 
 
 /*-----------------------------------------------------------------------
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index 9961fb5..979495a 100644
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -91,7 +91,6 @@
 
 
 #define	 CONFIG_SYS_HUSH_PARSER
-#define	 CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 /**************************************************************
  * I2C Stuff:
  * the MIP405 is equiped with an Atmel 24C128/256 EEPROM at address
diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h
index e4ea178..bb72b35 100644
--- a/include/configs/MPC8260ADS.h
+++ b/include/configs/MPC8260ADS.h
@@ -286,7 +286,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 #define CONFIG_SYS_LONGHELP			/* undef to save memory	    */
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt   */
 #if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h
index 47ff2f5..7f2761c 100644
--- a/include/configs/MPC8308RDB.h
+++ b/include/configs/MPC8308RDB.h
@@ -324,7 +324,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 /* Pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index 863c9b9..99edfe6 100644
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -383,7 +383,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 /* I2C */
 #define CONFIG_HARD_I2C			/* I2C with hardware support*/
diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index 2ebe6ad..767b976 100644
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -340,9 +340,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* Pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index 40e9546..ddee1ae 100644
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -226,9 +226,6 @@
 #define CONFIG_AUTO_COMPLETE		/* add autocompletion support   */
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index 6f8622c..f592d3a 100644
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -319,9 +319,6 @@
 #define CONFIG_AUTO_COMPLETE		/* add autocompletion support   */
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index c76455a..ac08ce3 100644
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -347,9 +347,6 @@
 #define CONFIG_AUTO_COMPLETE		/* add autocompletion support   */
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index 04f2da9..03873b8 100644
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -558,7 +558,6 @@ boards, we say we have two, but don't display a message if we find only one. */
 #define CONFIG_CMDLINE_EDITING		/* Command-line editing */
 #define CONFIG_AUTO_COMPLETE		/* add autocompletion support */
 #define CONFIG_SYS_HUSH_PARSER		/* Use the HUSH parser */
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 #define CONFIG_SYS_LOAD_ADDR	0x2000000	/* default load address */
 #define CONFIG_LOADADDR	800000	/* default location for tftp and bootm */
diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h
index 9604fda..9c7aae3 100644
--- a/include/configs/MPC8360EMDS.h
+++ b/include/configs/MPC8360EMDS.h
@@ -416,9 +416,6 @@
 #define CONFIG_AUTO_COMPLETE		/* add autocompletion support   */
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/MPC8360ERDK.h b/include/configs/MPC8360ERDK.h
index ea634a6..5aad4fd 100644
--- a/include/configs/MPC8360ERDK.h
+++ b/include/configs/MPC8360ERDK.h
@@ -280,9 +280,6 @@
 #define CONFIG_AUTO_COMPLETE		/* add autocompletion support */
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* Pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index d7ee405..8243661 100644
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -334,9 +334,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* Pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index f249cbb..d821352 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -360,9 +360,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* Pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index c26cb63..134352b 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -423,9 +423,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /*
  * Pass open firmware flat tree
diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index ae94a4a..a0fe15e 100644
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -249,7 +249,6 @@
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 #endif
 
 /* pass open firmware flat tree */
diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h
index bd10dda..a6bea15 100644
--- a/include/configs/MPC8541CDS.h
+++ b/include/configs/MPC8541CDS.h
@@ -272,7 +272,6 @@ extern unsigned long get_clock_freq(void);
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 #endif
 
 /* pass open firmware flat tree */
diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index 71d8970..7410050 100644
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -224,9 +224,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT		1
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 1a6ba69..e263994 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -349,9 +349,6 @@ extern unsigned long get_clock_freq(void);
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT		1
diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h
index ea460e6..266cb54 100644
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@@ -270,7 +270,6 @@ extern unsigned long get_clock_freq(void);
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 #endif
 
 /* pass open firmware flat tree */
diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index ebe6a70..35d15f4 100644
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -243,7 +243,6 @@
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 #endif
 
 /* pass open firmware flat tree */
diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index f9c8dfb..5d69fb6 100644
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -255,7 +255,6 @@ extern unsigned long get_clock_freq(void);
 /* Use the HUSH parser*/
 #define CONFIG_SYS_HUSH_PARSER
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 #endif
 
 /* pass open firmware flat tree */
diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h
index 7a5d86d..d973364 100644
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@ -292,7 +292,6 @@ extern unsigned long get_clock_freq(void);
 /* Use the HUSH parser*/
 #define CONFIG_SYS_HUSH_PARSER
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 #endif
 
 /* pass open firmware flat tree */
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index d7910e1..956449e 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -418,9 +418,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /*
  * Pass open firmware flat tree
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 8fe72dc..e10a987 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -236,9 +236,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /*
  * Pass open firmware flat tree to kernel
diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index 61d6d5c..7fd8ea8 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -287,9 +287,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /*
  * Pass open firmware flat tree to kernel
diff --git a/include/configs/MVBC_P.h b/include/configs/MVBC_P.h
index ade4893..eb0233b 100644
--- a/include/configs/MVBC_P.h
+++ b/include/configs/MVBC_P.h
@@ -274,7 +274,6 @@
  */
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_PROMPT_HUSH_PS2 	"> "
 #undef 	CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_PROMPT		"=> "
 #ifdef CONFIG_CMD_KGDB
diff --git a/include/configs/MVBLM7.h b/include/configs/MVBLM7.h
index 8b20f72..9b458c3 100644
--- a/include/configs/MVBLM7.h
+++ b/include/configs/MVBLM7.h
@@ -294,7 +294,6 @@
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_AUTO_COMPLETE	/* add autocompletion support   */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 /* default load address */
 #define CONFIG_SYS_LOAD_ADDR	0x2000000
diff --git a/include/configs/MVS1.h b/include/configs/MVS1.h
index 8350830..2b131b9 100644
--- a/include/configs/MVS1.h
+++ b/include/configs/MVS1.h
@@ -104,9 +104,6 @@
 #define	CONFIG_SYS_PROMPT		"=> "	/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* Hush parse for U-Boot ?? */
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/MVSMR.h b/include/configs/MVSMR.h
index f94ad5c..0b75b76 100644
--- a/include/configs/MVSMR.h
+++ b/include/configs/MVSMR.h
@@ -244,7 +244,6 @@
  */
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_PROMPT_HUSH_PS2 	"> "
 #undef 	CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_PROMPT		"=> "
 #ifdef CONFIG_CMD_KGDB
diff --git a/include/configs/NETPHONE.h b/include/configs/NETPHONE.h
index 31fe893..437a852 100644
--- a/include/configs/NETPHONE.h
+++ b/include/configs/NETPHONE.h
@@ -137,7 +137,6 @@
 #define	CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #define CONFIG_SYS_HUSH_PARSER	1
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/NETTA.h b/include/configs/NETTA.h
index fd3ab16..604938d 100644
--- a/include/configs/NETTA.h
+++ b/include/configs/NETTA.h
@@ -150,7 +150,6 @@
 #define	CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #define CONFIG_SYS_HUSH_PARSER	1
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/NETTA2.h b/include/configs/NETTA2.h
index 5ca01a0..de0f950 100644
--- a/include/configs/NETTA2.h
+++ b/include/configs/NETTA2.h
@@ -138,7 +138,6 @@
 #define	CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #define CONFIG_SYS_HUSH_PARSER	1
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/NSCU.h b/include/configs/NSCU.h
index 5015b79..9f462f4 100644
--- a/include/configs/NSCU.h
+++ b/include/configs/NSCU.h
@@ -139,9 +139,6 @@
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history
 */
 #define	CONFIG_SYS_HUSH_PARSER		1	/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 08fc4e8..67dba9f 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -464,9 +464,6 @@ extern unsigned long get_sdram_size(void);
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /*
  * Pass open firmware flat tree
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 70d751d..920edad 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -192,7 +192,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 /* Video */
 #define CONFIG_FSL_DIU_FB
diff --git a/include/configs/P1023RDS.h b/include/configs/P1023RDS.h
index e632d1b..cdb56bb 100644
--- a/include/configs/P1023RDS.h
+++ b/include/configs/P1023RDS.h
@@ -299,9 +299,6 @@ extern unsigned long get_clock_freq(void);
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /*
  * Pass open firmware flat tree
diff --git a/include/configs/P1_P2_RDB.h b/include/configs/P1_P2_RDB.h
index 2ac93be..ab88166 100644
--- a/include/configs/P1_P2_RDB.h
+++ b/include/configs/P1_P2_RDB.h
@@ -354,9 +354,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /*
  * Pass open firmware flat tree
diff --git a/include/configs/P2020COME.h b/include/configs/P2020COME.h
index 28122ec..121e357 100644
--- a/include/configs/P2020COME.h
+++ b/include/configs/P2020COME.h
@@ -212,9 +212,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /*
  * Pass open firmware flat tree
diff --git a/include/configs/P2020DS.h b/include/configs/P2020DS.h
index f0eb029..d7d64d2 100644
--- a/include/configs/P2020DS.h
+++ b/include/configs/P2020DS.h
@@ -380,9 +380,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /*
  * Pass open firmware flat tree
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index fe39d4e..23a32bc 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -329,7 +329,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT
diff --git a/include/configs/P3G4.h b/include/configs/P3G4.h
index f7ef643..4be6f70 100644
--- a/include/configs/P3G4.h
+++ b/include/configs/P3G4.h
@@ -56,7 +56,6 @@
 #define CONFIG_SYS_BOARD_NAME		"P3G4"
 
 #undef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * The following defines let you select what serial you want to use
diff --git a/include/configs/PCI405.h b/include/configs/PCI405.h
index 6be5c25..119819e 100644
--- a/include/configs/PCI405.h
+++ b/include/configs/PCI405.h
@@ -92,9 +92,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #define CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/PCIPPC2.h b/include/configs/PCIPPC2.h
index 7e1c11e..90cee88 100644
--- a/include/configs/PCIPPC2.h
+++ b/include/configs/PCIPPC2.h
@@ -95,9 +95,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #define	CONFIG_SYS_HUSH_PARSER		1	/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 #define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size	*/
 
 /* Print Buffer Size
diff --git a/include/configs/PCIPPC6.h b/include/configs/PCIPPC6.h
index c3f295b..10b81c1 100644
--- a/include/configs/PCIPPC6.h
+++ b/include/configs/PCIPPC6.h
@@ -97,9 +97,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #define CONFIG_SYS_HUSH_PARSER		1	/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 #define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size	*/
 
 /* Print Buffer Size
diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index 242aa31..713ea12 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -79,7 +79,6 @@
 #define CONFIG_CMD_BSP
 
 #define	 CONFIG_SYS_HUSH_PARSER
-#define	 CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 /**************************************************************
  * I2C Stuff:
  * the PIP405 is equiped with an Atmel 24C128/256 EEPROM at address
diff --git a/include/configs/PK1C20.h b/include/configs/PK1C20.h
index 3fe2b3e..403fafa 100644
--- a/include/configs/PK1C20.h
+++ b/include/configs/PK1C20.h
@@ -238,6 +238,5 @@
 #define CONFIG_SYS_MEMTEST_END		CONFIG_SYS_INIT_SP - 0x00020000
 
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #endif	/* __CONFIG_H */
diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h
index 1cce57e..1ee0c48 100644
--- a/include/configs/PLU405.h
+++ b/include/configs/PLU405.h
@@ -114,9 +114,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/PMC405.h b/include/configs/PMC405.h
index 2dceff7..8235b85 100644
--- a/include/configs/PMC405.h
+++ b/include/configs/PMC405.h
@@ -109,9 +109,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt */
 
 #undef CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser */
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h
index 2d45618..27a12b3 100644
--- a/include/configs/PPChameleonEVB.h
+++ b/include/configs/PPChameleonEVB.h
@@ -173,9 +173,6 @@
 #define CONFIG_SYS_PROMPT		"=> "	/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/QS823.h b/include/configs/QS823.h
index fa77ffd..a27faac 100644
--- a/include/configs/QS823.h
+++ b/include/configs/QS823.h
@@ -237,7 +237,6 @@
 #define CONFIG_SYS_PROMPT		"=> "		/* Monitor Command Prompt */
 
 #define CONFIG_SYS_HUSH_PARSER		1		/* use "hush" command parser */
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE		1024		/* Console I/O Buffer Size */
diff --git a/include/configs/QS850.h b/include/configs/QS850.h
index efa7bd6..f4d3760 100644
--- a/include/configs/QS850.h
+++ b/include/configs/QS850.h
@@ -237,7 +237,6 @@
 #define CONFIG_SYS_PROMPT		"=> "		/* Monitor Command Prompt */
 
 #define CONFIG_SYS_HUSH_PARSER		1		/* use "hush" command parser */
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE		1024		/* Console I/O Buffer Size */
diff --git a/include/configs/QS860T.h b/include/configs/QS860T.h
index 3156320..38570e4 100644
--- a/include/configs/QS860T.h
+++ b/include/configs/QS860T.h
@@ -146,7 +146,6 @@ CONFIG_SPI
 #define CONFIG_SYS_PROMPT		"=> "		/* Monitor Command Prompt */
 
 #define CONFIG_SYS_HUSH_PARSER		1		/* use "hush" command parser */
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE		1024		/* Console I/O Buffer Size */
diff --git a/include/configs/Rattler.h b/include/configs/Rattler.h
index 9ddf626..a96bcbc 100644
--- a/include/configs/Rattler.h
+++ b/include/configs/Rattler.h
@@ -170,7 +170,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_LONGHELP			/* undef to save memory	    */
 #define CONFIG_SYS_PROMPT		"=> "	/* Monitor Command Prompt   */
 #if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/SBC8540.h b/include/configs/SBC8540.h
index f1d30ba..d448bf6 100644
--- a/include/configs/SBC8540.h
+++ b/include/configs/SBC8540.h
@@ -217,9 +217,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /*
  * I2C
diff --git a/include/configs/SIMPC8313.h b/include/configs/SIMPC8313.h
index 0976077..00b7a4c 100644
--- a/include/configs/SIMPC8313.h
+++ b/include/configs/SIMPC8313.h
@@ -242,7 +242,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /* I2C */
 #define CONFIG_HARD_I2C		/* I2C with hardware support*/
diff --git a/include/configs/TK885D.h b/include/configs/TK885D.h
index 0c52775..4176c7f 100644
--- a/include/configs/TK885D.h
+++ b/include/configs/TK885D.h
@@ -178,9 +178,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/TOP860.h b/include/configs/TOP860.h
index 3a01292..36921ca 100644
--- a/include/configs/TOP860.h
+++ b/include/configs/TOP860.h
@@ -138,9 +138,6 @@
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* Hush parse for U-Boot	*/
 
-#ifdef	CONFIG_SYS_HUSH_PARSER
- #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
  #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 6ea3faa..ca415e4 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -625,7 +625,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define	CONFIG_SYS_HUSH_PARSER		1	/* use "hush" command parser	*/
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define CONFIG_SYS_CACHELINE_SIZE	32	/* For MPC5xxx CPUs */
 #if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h
index b26e4f4..a01b4a6 100644
--- a/include/configs/TQM823L.h
+++ b/include/configs/TQM823L.h
@@ -146,9 +146,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h
index a9bf525..1da4acd 100644
--- a/include/configs/TQM823M.h
+++ b/include/configs/TQM823M.h
@@ -141,9 +141,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/TQM8260.h b/include/configs/TQM8260.h
index 58c9716..7e24131 100644
--- a/include/configs/TQM8260.h
+++ b/include/configs/TQM8260.h
@@ -248,9 +248,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/TQM8272.h b/include/configs/TQM8272.h
index c2618dc..be977f1 100644
--- a/include/configs/TQM8272.h
+++ b/include/configs/TQM8272.h
@@ -311,9 +311,6 @@
 #if 0
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 #endif
 
 #if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 0b53702..0738423 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -339,9 +339,6 @@
 #define CONFIG_AUTO_COMPLETE		/* add autocompletion support */
 
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser */
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 	#define CONFIG_SYS_CBSIZE	1024	/* Console I/O Buffer Size */
diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h
index d217d3b..1c054f0 100644
--- a/include/configs/TQM850L.h
+++ b/include/configs/TQM850L.h
@@ -131,9 +131,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h
index 52e1125..46066df 100644
--- a/include/configs/TQM850M.h
+++ b/include/configs/TQM850M.h
@@ -132,9 +132,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h
index e36a2bb..dd2da94 100644
--- a/include/configs/TQM855L.h
+++ b/include/configs/TQM855L.h
@@ -135,9 +135,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h
index 473301a..95bc4d9 100644
--- a/include/configs/TQM855M.h
+++ b/include/configs/TQM855M.h
@@ -169,9 +169,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/TQM85xx.h b/include/configs/TQM85xx.h
index 780abd9..95455c4 100644
--- a/include/configs/TQM85xx.h
+++ b/include/configs/TQM85xx.h
@@ -290,9 +290,6 @@
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_AUTO_COMPLETE	1	/* add autocompletion support */
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT		1
diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h
index ed61f0f..487666c 100644
--- a/include/configs/TQM860L.h
+++ b/include/configs/TQM860L.h
@@ -134,9 +134,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h
index 4d7effb..e8b77ea 100644
--- a/include/configs/TQM860M.h
+++ b/include/configs/TQM860M.h
@@ -135,9 +135,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h
index db7c1c3..334b7ec 100644
--- a/include/configs/TQM862L.h
+++ b/include/configs/TQM862L.h
@@ -138,9 +138,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h
index af528fd..1e2ad40 100644
--- a/include/configs/TQM862M.h
+++ b/include/configs/TQM862M.h
@@ -138,9 +138,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h
index b1cb406..a13c16a 100644
--- a/include/configs/TQM866M.h
+++ b/include/configs/TQM866M.h
@@ -181,9 +181,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h
index c960a54..7df76fb 100644
--- a/include/configs/TQM885D.h
+++ b/include/configs/TQM885D.h
@@ -176,9 +176,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h
index 082f3f9..6ad4a6b 100644
--- a/include/configs/VCMA9.h
+++ b/include/configs/VCMA9.h
@@ -83,7 +83,6 @@
 #define CONFIG_BOARD_LATE_INIT
 
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 #define CONFIG_CMDLINE_EDITING
 
 /*
diff --git a/include/configs/VOH405.h b/include/configs/VOH405.h
index 5b8f41f..f1032f0 100644
--- a/include/configs/VOH405.h
+++ b/include/configs/VOH405.h
@@ -112,9 +112,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h
index 2ca4ed0..43d6bb3 100644
--- a/include/configs/VOM405.h
+++ b/include/configs/VOM405.h
@@ -101,9 +101,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/W7OLMC.h b/include/configs/W7OLMC.h
index 1d97d3e..462b155 100644
--- a/include/configs/W7OLMC.h
+++ b/include/configs/W7OLMC.h
@@ -112,7 +112,6 @@
 #define CONFIG_SYS_PROMPT		"Wave7Optics> " /* Monitor Command Prompt	*/
 #undef  CONFIG_SYS_HUSH_PARSER				/* No hush parse for U-Boot       */
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 #endif
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE		1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/W7OLMG.h b/include/configs/W7OLMG.h
index 93caacc..f28f3e4 100644
--- a/include/configs/W7OLMG.h
+++ b/include/configs/W7OLMG.h
@@ -120,7 +120,6 @@
 #define CONFIG_SYS_PROMPT		"Wave7Optics> " /* Monitor Command Prompt	*/
 #undef  CONFIG_SYS_HUSH_PARSER				/* No hush parse for U-Boot       */
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 #endif
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE		1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/WUH405.h b/include/configs/WUH405.h
index 504ad96..5def36a 100644
--- a/include/configs/WUH405.h
+++ b/include/configs/WUH405.h
@@ -103,9 +103,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/ZPC1900.h b/include/configs/ZPC1900.h
index 4cda22f..381b546 100644
--- a/include/configs/ZPC1900.h
+++ b/include/configs/ZPC1900.h
@@ -154,7 +154,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_LONGHELP			/* undef to save memory	    */
 #define CONFIG_SYS_PROMPT		"=> "	/* Monitor Command Prompt   */
 #if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/ZUMA.h b/include/configs/ZUMA.h
index 5350f61..f6898d9 100644
--- a/include/configs/ZUMA.h
+++ b/include/configs/ZUMA.h
@@ -59,7 +59,6 @@
 #define CONFIG_SYS_BOARD_NAME		"Zuma APv2"
 
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * The following defines let you select what serial you want to use
diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h
index 1c13904..57f28d4 100644
--- a/include/configs/a4m072.h
+++ b/include/configs/a4m072.h
@@ -286,9 +286,6 @@
  */
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_CMDLINE_EDITING	1
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 #define CONFIG_SYS_LONGHELP			/* undef to save memory	    */
 #define CONFIG_SYS_PROMPT		"=> "	/* Monitor Command Prompt   */
 #if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index 827a615..54ab3eb 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -229,7 +229,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		V_PROMPT
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
 /* Print Buffer Size */
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index 6766ee2..ed0a601 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -226,7 +226,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		V_PROMPT
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
 /* Print Buffer Size */
diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h
index 76ef56f..056a22a 100644
--- a/include/configs/amcc-common.h
+++ b/include/configs/amcc-common.h
@@ -112,9 +112,6 @@
 #define CONFIG_SYS_CONSOLE_INFO_QUIET		/* don't print console @ startup*/
 
 #define CONFIG_SYS_HUSH_PARSER			/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #define CONFIG_LOADS_ECHO		/* echo on for serial download	*/
 #define CONFIG_SYS_LOADS_BAUD_CHANGE		/* allow baudrate change	*/
diff --git a/include/configs/aria.h b/include/configs/aria.h
index c9f0076..b21b495 100644
--- a/include/configs/aria.h
+++ b/include/configs/aria.h
@@ -339,7 +339,6 @@
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #endif
 
 /*
diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index f89a567..5c4cac9 100644
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -105,7 +105,6 @@
 #define CONFIG_CMDLINE_EDITING
 
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 #define CONFIG_MCFRTC
 #undef RTC_DEBUG
diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h
index 9f908ce..2abcaff 100644
--- a/include/configs/at91rm9200ek.h
+++ b/include/configs/at91rm9200ek.h
@@ -209,7 +209,6 @@
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_PROMPT		"U-Boot> "
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #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/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index 40308ca..61a622a 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -343,7 +343,6 @@
 #define CONFIG_CMDLINE_EDITING		1
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * Size of malloc() pool
diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index f46b91b..f8b3095 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -187,7 +187,6 @@
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * Size of malloc() pool
diff --git a/include/configs/balloon3.h b/include/configs/balloon3.h
index 1417240..97fdc2c 100644
--- a/include/configs/balloon3.h
+++ b/include/configs/balloon3.h
@@ -80,7 +80,6 @@
  * HUSH Shell Configuration
  */
 #define	CONFIG_SYS_HUSH_PARSER		1
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define	CONFIG_SYS_LONGHELP
 #ifdef	CONFIG_SYS_HUSH_PARSER
diff --git a/include/configs/bct-brettl2.h b/include/configs/bct-brettl2.h
index e8e2667..ce09c2e 100644
--- a/include/configs/bct-brettl2.h
+++ b/include/configs/bct-brettl2.h
@@ -136,7 +136,6 @@
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 
 /*
diff --git a/include/configs/c2mon.h b/include/configs/c2mon.h
index 01e5e90..566c42b 100644
--- a/include/configs/c2mon.h
+++ b/include/configs/c2mon.h
@@ -107,9 +107,6 @@
 #define	CONFIG_SYS_PROMPT		"=> "	/* Monitor Command Prompt	*/
 
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/calimain.h b/include/configs/calimain.h
index 81c9b9b..e31e40b 100644
--- a/include/configs/calimain.h
+++ b/include/configs/calimain.h
@@ -219,7 +219,6 @@
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CRC32_VERIFY
diff --git a/include/configs/cam_enc_4xx.h b/include/configs/cam_enc_4xx.h
index 2512a75..771ac9c 100644
--- a/include/configs/cam_enc_4xx.h
+++ b/include/configs/cam_enc_4xx.h
@@ -154,7 +154,6 @@
 		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_LONGHELP
 
 #define CONFIG_MENU
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index b28bd8e..782d28c 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -251,7 +251,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_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT		"CM-T3x # "
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 /* Print Buffer Size */
diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
index 4a3b01d..1f02f3f 100644
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -93,7 +93,6 @@
  * HUSH Shell Configuration
  */
 #define	CONFIG_SYS_HUSH_PARSER		1
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define	CONFIG_SYS_LONGHELP
 #ifdef	CONFIG_SYS_HUSH_PARSER
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 8ed37a5..a3705cb 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -349,7 +349,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT
diff --git a/include/configs/csb272.h b/include/configs/csb272.h
index fb5f868..f21fa64 100644
--- a/include/configs/csb272.h
+++ b/include/configs/csb272.h
@@ -123,9 +123,6 @@
  *
  */
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser */
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "	/* hush shell secondary prompt */
-#endif
 
 #define CONFIG_SYS_LONGHELP			/* undef to save memory	*/
 #define CONFIG_SYS_PROMPT		"=> "	/* Monitor Command Prompt */
diff --git a/include/configs/csb472.h b/include/configs/csb472.h
index 5d18ac7..aed5fa6 100644
--- a/include/configs/csb472.h
+++ b/include/configs/csb472.h
@@ -122,9 +122,6 @@
  *
  */
 #undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser */
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "	/* hush shell secondary prompt */
-#endif
 
 #define CONFIG_SYS_LONGHELP			/* undef to save memory	*/
 #define CONFIG_SYS_PROMPT		"=> "	/* Monitor Command Prompt */
diff --git a/include/configs/da830evm.h b/include/configs/da830evm.h
index aa7a6ba..51dc664 100644
--- a/include/configs/da830evm.h
+++ b/include/configs/da830evm.h
@@ -170,7 +170,6 @@
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_AUTO_COMPLETE	/* Won't work with hush so far, may be later */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CRC32_VERIFY
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 0adbb1f..e6adb1f 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -237,7 +237,6 @@
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CRC32_VERIFY
diff --git a/include/configs/davinci_dm355evm.h b/include/configs/davinci_dm355evm.h
index bd17419..a30d24c 100644
--- a/include/configs/davinci_dm355evm.h
+++ b/include/configs/davinci_dm355evm.h
@@ -139,7 +139,6 @@
 		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_LONGHELP
 
 #ifdef CONFIG_NAND_DAVINCI
diff --git a/include/configs/davinci_dm355leopard.h b/include/configs/davinci_dm355leopard.h
index b232c50..1cd3d2e 100644
--- a/include/configs/davinci_dm355leopard.h
+++ b/include/configs/davinci_dm355leopard.h
@@ -107,7 +107,6 @@
 		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_LONGHELP
 
 #ifdef CONFIG_NAND_DAVINCI
diff --git a/include/configs/davinci_dm365evm.h b/include/configs/davinci_dm365evm.h
index 92d7227..bcf10ca 100644
--- a/include/configs/davinci_dm365evm.h
+++ b/include/configs/davinci_dm365evm.h
@@ -173,7 +173,6 @@
 		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_LONGHELP
 
 #ifdef CONFIG_NAND_DAVINCI
diff --git a/include/configs/davinci_dm6467evm.h b/include/configs/davinci_dm6467evm.h
index 57a6148..6734ea3 100644
--- a/include/configs/davinci_dm6467evm.h
+++ b/include/configs/davinci_dm6467evm.h
@@ -119,7 +119,6 @@ extern unsigned int davinci_arm_clk_get(void);
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CRC32_VERIFY
diff --git a/include/configs/davinci_dvevm.h b/include/configs/davinci_dvevm.h
index f0cc780..e4443ec 100644
--- a/include/configs/davinci_dvevm.h
+++ b/include/configs/davinci_dvevm.h
@@ -170,7 +170,6 @@
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_AUTO_COMPLETE		/* Won't work with hush so far, may be later */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CRC32_VERIFY
diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h
index c07002a..93df4ff 100644
--- a/include/configs/davinci_schmoogie.h
+++ b/include/configs/davinci_schmoogie.h
@@ -114,7 +114,6 @@
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_AUTO_COMPLETE		/* Won't work with hush so far, may be later */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CRC32_VERIFY
diff --git a/include/configs/davinci_sffsdr.h b/include/configs/davinci_sffsdr.h
index a62d7aa..23b0ba7 100644
--- a/include/configs/davinci_sffsdr.h
+++ b/include/configs/davinci_sffsdr.h
@@ -104,7 +104,6 @@
 #define CONFIG_AUTO_COMPLETE		/* Won't work with hush so far,
 					 * may be later */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CRC32_VERIFY
diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h
index fb26643..36a8c06 100644
--- a/include/configs/davinci_sonata.h
+++ b/include/configs/davinci_sonata.h
@@ -160,7 +160,6 @@
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_AUTO_COMPLETE		/* Won't work with hush so far, may be later */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CRC32_VERIFY
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index 248a5b2..037a5bb 100644
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -249,7 +249,6 @@
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
 #define CONFIG_AUTO_COMPLETE		1
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT		"OMAP3 DevKit8000 # "
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
 /* Print Buffer Size */
diff --git a/include/configs/dig297.h b/include/configs/dig297.h
index 1626b0e..4845d51 100644
--- a/include/configs/dig297.h
+++ b/include/configs/dig297.h
@@ -232,7 +232,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		"DIG297# "
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 /* Print Buffer Size */
diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h
index 1f66023..3622b4a 100644
--- a/include/configs/digsy_mtc.h
+++ b/include/configs/digsy_mtc.h
@@ -411,7 +411,6 @@
 #define CONFIG_CMDLINE_EDITING	1
 #define CONFIG_SYS_PROMPT	"=> "
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define CONFIG_AUTOBOOT_KEYED
 #define CONFIG_AUTOBOOT_PROMPT "autoboot in %d seconds\n", bootdelay
diff --git a/include/configs/dns325.h b/include/configs/dns325.h
index b7a89d3..1f632ac 100644
--- a/include/configs/dns325.h
+++ b/include/configs/dns325.h
@@ -102,7 +102,6 @@
  * Use the HUSH parser
  */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * Console configuration
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index 4a03546..a9caa81 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -140,7 +140,6 @@
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CRC32_VERIFY
diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index 9b7cc66..6a67aa5 100644
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -237,7 +237,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /* Enable command line editing */
 #define CONFIG_CMDLINE_EDITING
diff --git a/include/configs/efikamx.h b/include/configs/efikamx.h
index eb7d72b..143b0f0 100644
--- a/include/configs/efikamx.h
+++ b/include/configs/efikamx.h
@@ -229,7 +229,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		"Efika> "
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
diff --git a/include/configs/enbw_cmc.h b/include/configs/enbw_cmc.h
index 7dc6cca..c1a0f6a 100644
--- a/include/configs/enbw_cmc.h
+++ b/include/configs/enbw_cmc.h
@@ -246,7 +246,6 @@
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CRC32_VERIFY
diff --git a/include/configs/ep8248.h b/include/configs/ep8248.h
index 2b40f59..e669dc6 100644
--- a/include/configs/ep8248.h
+++ b/include/configs/ep8248.h
@@ -154,7 +154,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_LONGHELP			/* undef to save memory	    */
 #define CONFIG_SYS_PROMPT		"=> "	/* Monitor Command Prompt   */
 #if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/ep8260.h b/include/configs/ep8260.h
index 7adedc9..ccfe032 100644
--- a/include/configs/ep8260.h
+++ b/include/configs/ep8260.h
@@ -290,7 +290,6 @@
    with a somewhat smapper memory footprint.
 */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 
 /*
diff --git a/include/configs/ep82xxm.h b/include/configs/ep82xxm.h
index 04c0708..8d78921 100644
--- a/include/configs/ep82xxm.h
+++ b/include/configs/ep82xxm.h
@@ -165,7 +165,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_LONGHELP			/* undef to save memory	    */
 #define CONFIG_SYS_PROMPT		"ep82xxm=> "	/* Monitor Command Prompt   */
 #if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index 5aed0ed..f89e9ea 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -274,7 +274,6 @@
 /* Misc. u-boot settings */
 #define CONFIG_SYS_PROMPT		"U-Boot> "
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_CBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + 16 \
diff --git a/include/configs/flea3.h b/include/configs/flea3.h
index 44c5532..6c5fcac 100644
--- a/include/configs/flea3.h
+++ b/include/configs/flea3.h
@@ -130,7 +130,6 @@
 #define CONFIG_SYS_PROMPT	"flea3 U-Boot > "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_HUSH_PARSER	/* Use the HUSH parser */
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
diff --git a/include/configs/galaxy5200.h b/include/configs/galaxy5200.h
index a38298f..e43cc28 100644
--- a/include/configs/galaxy5200.h
+++ b/include/configs/galaxy5200.h
@@ -373,7 +373,6 @@
 #define CONFIG_DISPLAY_BOARDINFO 1
 
 #define CONFIG_SYS_HUSH_PARSER 1
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 #define CONFIG_CRC32_VERIFY  1
 
diff --git a/include/configs/grasshopper.h b/include/configs/grasshopper.h
index cc84c9c..07e8a49 100644
--- a/include/configs/grasshopper.h
+++ b/include/configs/grasshopper.h
@@ -137,7 +137,6 @@
 
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"~> "
 #define CONFIG_CMDLINE_EDITING
 
 #define CONFIG_ATMEL_USART
diff --git a/include/configs/grsim.h b/include/configs/grsim.h
index f3639dd..f64d3d3 100644
--- a/include/configs/grsim.h
+++ b/include/configs/grsim.h
@@ -94,9 +94,6 @@
 
 #undef	CONFIG_BOOTARGS
 /*#define CONFIG_SYS_HUSH_PARSER 0*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #define	CONFIG_EXTRA_ENV_SETTINGS					\
 	"netdev=eth0\0"							\
diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h
index fb9a3f9..cde2f70 100644
--- a/include/configs/grsim_leon2.h
+++ b/include/configs/grsim_leon2.h
@@ -91,9 +91,6 @@
 
 #undef	CONFIG_BOOTARGS
 /*#define CONFIG_SYS_HUSH_PARSER 0*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #define	CONFIG_EXTRA_ENV_SETTINGS					\
 	"netdev=eth0\0"							\
diff --git a/include/configs/gw8260.h b/include/configs/gw8260.h
index 7935aea..18d6c65 100644
--- a/include/configs/gw8260.h
+++ b/include/configs/gw8260.h
@@ -331,7 +331,6 @@
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 #endif
 
 /* What is the address of IO controller */
diff --git a/include/configs/hawkboard.h b/include/configs/hawkboard.h
index 0e9188d..c6e8859 100644
--- a/include/configs/hawkboard.h
+++ b/include/configs/hawkboard.h
@@ -170,7 +170,6 @@
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CRC32_VERIFY
diff --git a/include/configs/igep00x0.h b/include/configs/igep00x0.h
index a99f332..88e2e3a 100644
--- a/include/configs/igep00x0.h
+++ b/include/configs/igep00x0.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_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT		"U-Boot # "
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 /* Print Buffer Size */
diff --git a/include/configs/ima3-mx53.h b/include/configs/ima3-mx53.h
index 186d8b9..17fa4a1 100644
--- a/include/configs/ima3-mx53.h
+++ b/include/configs/ima3-mx53.h
@@ -116,7 +116,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_HUSH_PS2	"> "
 #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/integratorap.h b/include/configs/integratorap.h
index fea40fc..2252d93 100644
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -93,7 +93,6 @@
 #define CONFIG_SYS_LONGHELP	/* undef to save memory	    */
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_PROMPT	"Integrator-AP # "	/* Monitor Command Prompt   */
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"# "
 #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/jadecpu.h b/include/configs/jadecpu.h
index 296bbe1..2badadb 100644
--- a/include/configs/jadecpu.h
+++ b/include/configs/jadecpu.h
@@ -138,7 +138,6 @@
 #define CONFIG_CMD_CACHE
 
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 /* USB */
 #define CONFIG_USB_OHCI_NEW
diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h
index f5adccb..b5c6fae 100644
--- a/include/configs/jupiter.h
+++ b/include/configs/jupiter.h
@@ -263,9 +263,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size  */
 #else
diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index b650539..7ed9958 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -57,7 +57,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_LONGHELP			/* undef to save memory	  */
 #define CONFIG_SYS_PROMPT		"=> "	/* Monitor Command Prompt */
 #if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index 6cbc752..cd8d59f 100644
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -143,7 +143,6 @@
  * Use the HUSH parser
  */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * Console configuration
diff --git a/include/configs/lubbock.h b/include/configs/lubbock.h
index 7c8eb64..4b9b290 100644
--- a/include/configs/lubbock.h
+++ b/include/configs/lubbock.h
@@ -108,7 +108,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_HUSH_PARSER		1
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define CONFIG_SYS_LONGHELP				/* undef to save memory		*/
 #ifdef CONFIG_SYS_HUSH_PARSER
diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h
index 405bc69..1d89176 100644
--- a/include/configs/lwmon.h
+++ b/include/configs/lwmon.h
@@ -216,9 +216,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #define	CONFIG_SYS_HUSH_PARSER		1	/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
index 68215fd..497eec4 100644
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -459,9 +459,6 @@
 #define CONFIG_SYS_PROMPT	        "=> "	/* Monitor Command Prompt	*/
 
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	        1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index b8389e8..3abaadc 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -126,7 +126,6 @@
 #define	CONFIG_AUTO_COMPLETE			/* Command auto complete */
 #define	CONFIG_CMDLINE_EDITING			/* Command history etc */
 #define	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * Serial Driver
diff --git a/include/configs/mcc200.h b/include/configs/mcc200.h
index b56b273..1867eb6 100644
--- a/include/configs/mcc200.h
+++ b/include/configs/mcc200.h
@@ -189,7 +189,6 @@
 #define CONFIG_BOOTCOMMAND	"run flash_self"
 
 #define CONFIG_SYS_HUSH_PARSER		1	/* use "hush" command parser	*/
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * IPB Bus clocking configuration.
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index f6a83a8..970c882 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -226,7 +226,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		V_PROMPT
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
 /* Print Buffer Size */
diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h
index f5765b0..b41bda9 100644
--- a/include/configs/mecp5123.h
+++ b/include/configs/mecp5123.h
@@ -238,7 +238,6 @@
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 #endif
 
 /* I2C */
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index efca136..295d123 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -331,9 +331,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef CONFIG_SYS_HUSH_PARSER
-# define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* Enable flat device tree support */
 #define CONFIG_LMB		1
diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h
index bdcae59..f6a4497 100644
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -100,7 +100,6 @@
 
 #define CONFIG_CMDLINE_EDITING		1	/* add command line history	*/
 #define	CONFIG_SYS_HUSH_PARSER		1	/* use "hush" command parser	*/
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define CONFIG_ETHADDR		00:50:C2:40:10:00
 #define CONFIG_OVERWRITE_ETHADDR_ONCE	1
diff --git a/include/configs/mpc5121-common.h b/include/configs/mpc5121-common.h
index a5e77c5..593a79f 100644
--- a/include/configs/mpc5121-common.h
+++ b/include/configs/mpc5121-common.h
@@ -44,8 +44,5 @@
 #define CONFIG_CMDLINE_EDITING		1	/* command line history */
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #endif /* __MPC5121_COMMON_H */
diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h
index 01df8b1..9d1327f 100644
--- a/include/configs/mpc5121ads.h
+++ b/include/configs/mpc5121ads.h
@@ -306,7 +306,6 @@
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 #endif
 
 /*
diff --git a/include/configs/mpc7448hpc2.h b/include/configs/mpc7448hpc2.h
index c0c95ed..5004fcd 100644
--- a/include/configs/mpc7448hpc2.h
+++ b/include/configs/mpc7448hpc2.h
@@ -79,7 +79,6 @@
 /*#define CONFIG_SYS_HUSH_PARSER */
 #undef CONFIG_SYS_HUSH_PARSER
 
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /* Pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h
index 20fc641..806ed64 100644
--- a/include/configs/mpc8308_p1m.h
+++ b/include/configs/mpc8308_p1m.h
@@ -319,7 +319,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 /* Pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/mpq101.h b/include/configs/mpq101.h
index a6dc146..339c736 100644
--- a/include/configs/mpq101.h
+++ b/include/configs/mpq101.h
@@ -325,9 +325,6 @@
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
 
-#ifdef CONFIG_SYS_HUSH_PARSER
-# define CONFIG_SYS_PROMPT_HUSH_PS2  "> "
-#endif
 
 #define CONFIG_LOADS_ECHO            /* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */
diff --git a/include/configs/muas3001.h b/include/configs/muas3001.h
index 18bd37e..b8c52af 100644
--- a/include/configs/muas3001.h
+++ b/include/configs/muas3001.h
@@ -196,7 +196,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_LONGHELP			/* undef to save memory	    */
 #define CONFIG_SYS_PROMPT		"=> "	/* Monitor Command Prompt   */
 #if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/mx1ads.h b/include/configs/mx1ads.h
index 81476ec..665e33d 100644
--- a/include/configs/mx1ads.h
+++ b/include/configs/mx1ads.h
@@ -109,7 +109,6 @@
  */
 
 #define CONFIG_SYS_HUSH_PARSER		1
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define CONFIG_SYS_LONGHELP				/* undef to save memory		*/
 
diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index 48e6b83..51b172d 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -115,7 +115,6 @@
 #define CONFIG_AUTO_COMPLETE		/* Command auto complete */
 #define CONFIG_CMDLINE_EDITING		/* Command history etc */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * Serial Driver
diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
index a98230a..016864a 100644
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@@ -145,7 +145,6 @@
 #define CONFIG_SYS_PROMPT	"MX35 U-Boot > "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_HUSH_PARSER	/* Use the HUSH parser */
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index ba1a129..bd04c02 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -199,7 +199,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		"MX51EVK U-Boot > "
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h
index 333ba61..f4512ff 100644
--- a/include/configs/mx53ard.h
+++ b/include/configs/mx53ard.h
@@ -139,7 +139,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_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT		"MX53ARD U-Boot > "
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
index 453cef9..a5f32e3 100644
--- a/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@@ -149,7 +149,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_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT		"MX53EVK U-Boot > "
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index c80e5e8..8b4e008 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -161,7 +161,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_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT		"MX53LOCO U-Boot > "
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h
index 7cd7173..0d7086d 100644
--- a/include/configs/mx53smd.h
+++ b/include/configs/mx53smd.h
@@ -137,7 +137,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_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT		"MX53SMD U-Boot > "
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h
index 9fca0e1..a155c77 100644
--- a/include/configs/mx6qarm2.h
+++ b/include/configs/mx6qarm2.h
@@ -125,7 +125,6 @@
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT		"MX6QARM2 U-Boot > "
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE		256
diff --git a/include/configs/mx6qsabrelite.h b/include/configs/mx6qsabrelite.h
index 7469038..5b566a8 100644
--- a/include/configs/mx6qsabrelite.h
+++ b/include/configs/mx6qsabrelite.h
@@ -172,7 +172,6 @@
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 #define CONFIG_SYS_PROMPT	       "MX6QSABRELITE U-Boot > "
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE	       256
diff --git a/include/configs/nhk8815.h b/include/configs/nhk8815.h
index de20771..37a66ab 100644
--- a/include/configs/nhk8815.h
+++ b/include/configs/nhk8815.h
@@ -54,7 +54,6 @@
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_PROMPT		"Nomadik> "
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #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/nios2-generic.h b/include/configs/nios2-generic.h
index 17017a5..a383fa4 100644
--- a/include/configs/nios2-generic.h
+++ b/include/configs/nios2-generic.h
@@ -152,6 +152,5 @@
 #define CONFIG_CMDLINE_EDITING
 
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index b891ee4..268215c 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -314,7 +314,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		"OMAP3 beagleboard.org # "
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
 /* Print Buffer Size */
diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h
index 7b21a5c..20192a9 100644
--- a/include/configs/omap3_evm_common.h
+++ b/include/configs/omap3_evm_common.h
@@ -198,7 +198,6 @@
  * ----------------------------------------------------------------------------
  */
 #define CONFIG_SYS_PROMPT		"OMAP3_EVM # "
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #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 4ac17cc..2e1e6b9 100644
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -260,7 +260,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		"OMAP Logic # "
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
 /* Print Buffer Size */
diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h
index b819d21..6a13046 100644
--- a/include/configs/omap3_mvblx.h
+++ b/include/configs/omap3_mvblx.h
@@ -220,7 +220,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		"mvblx # "
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 /* Print Buffer Size */
diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
index a0a7a1c..d29b326 100644
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.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_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT		"Overo # "
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
 /* Print Buffer Size */
diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index d02f338..604b53d 100644
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -190,7 +190,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		"Pandora # "
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
 /* Print Buffer Size */
diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h
index 404aed2..1d8b0ab 100644
--- a/include/configs/omap3_sdp3430.h
+++ b/include/configs/omap3_sdp3430.h
@@ -263,7 +263,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		"OMAP34XX SDP # "
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
 /* Print Buffer Size */
diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h
index 17608f5..0f72ebe 100644
--- a/include/configs/omap3_zoom1.h
+++ b/include/configs/omap3_zoom1.h
@@ -216,7 +216,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		"OMAP3 Zoom1 # "
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
 /* Print Buffer Size */
diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
index 072e17b..8448142 100644
--- a/include/configs/omap4_common.h
+++ b/include/configs/omap4_common.h
@@ -186,7 +186,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_CBSIZE		512
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/omap5_evm.h b/include/configs/omap5_evm.h
index 38b5028..60c7a29 100644
--- a/include/configs/omap5_evm.h
+++ b/include/configs/omap5_evm.h
@@ -187,7 +187,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		"OMAP5430 EVM # "
 #define CONFIG_SYS_CBSIZE		256
 /* Print Buffer Size */
diff --git a/include/configs/origen.h b/include/configs/origen.h
index 6dcd25d..172bf14 100644
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -102,7 +102,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_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT		"ORIGEN # "
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size*/
 #define CONFIG_SYS_PBSIZE		384	/* Print Buffer Size */
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 04fd8d0..2cb942b 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -523,9 +523,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /*
  * Pass open firmware flat tree
diff --git a/include/configs/p3mx.h b/include/configs/p3mx.h
index e44009e..8c459cb 100644
--- a/include/configs/p3mx.h
+++ b/include/configs/p3mx.h
@@ -283,7 +283,6 @@
  * Miscellaneous configurable options
  *----------------------------------------------------------------------*/
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define CONFIG_SYS_LONGHELP			/* undef to save memory		*/
 #define CONFIG_SYS_PROMPT	        "=> "	/* Monitor Command Prompt	*/
diff --git a/include/configs/palmld.h b/include/configs/palmld.h
index c4ea5ff..70b794d 100644
--- a/include/configs/palmld.h
+++ b/include/configs/palmld.h
@@ -108,7 +108,6 @@
  * HUSH Shell Configuration
  */
 #define	CONFIG_SYS_HUSH_PARSER		1
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define	CONFIG_SYS_LONGHELP
 #ifdef	CONFIG_SYS_HUSH_PARSER
diff --git a/include/configs/palmtc.h b/include/configs/palmtc.h
index 9fa6733..7cf2c63 100644
--- a/include/configs/palmtc.h
+++ b/include/configs/palmtc.h
@@ -109,7 +109,6 @@
  * HUSH Shell Configuration
  */
 #define	CONFIG_SYS_HUSH_PARSER		1
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define	CONFIG_SYS_LONGHELP
 #ifdef	CONFIG_SYS_HUSH_PARSER
diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h
index a044346..c766330 100644
--- a/include/configs/pm9g45.h
+++ b/include/configs/pm9g45.h
@@ -177,7 +177,6 @@
 #define CONFIG_CMDLINE_EDITING		1
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * Size of malloc() pool
diff --git a/include/configs/pxa255_idp.h b/include/configs/pxa255_idp.h
index 387661b..f143ed0 100644
--- a/include/configs/pxa255_idp.h
+++ b/include/configs/pxa255_idp.h
@@ -222,7 +222,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_HUSH_PARSER		1
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define CONFIG_SYS_LONGHELP				/* undef to save memory		*/
 #ifdef CONFIG_SYS_HUSH_PARSER
diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index da32b30..306c173 100644
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -105,7 +105,6 @@
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #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 */
diff --git a/include/configs/qong.h b/include/configs/qong.h
index 3b63ac2..e824e17 100644
--- a/include/configs/qong.h
+++ b/include/configs/qong.h
@@ -210,9 +210,6 @@
 
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_HUSH_PARSER			/* Use the HUSH parser */
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #define CONFIG_MISC_INIT_R
 /*-----------------------------------------------------------------------
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index f3d3e4d..16be764 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -176,7 +176,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_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT	"Goni # "
 #define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE	384	/* Print Buffer Size */
diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index 9337d5b..721301f 100644
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -201,7 +201,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_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT	"Universal # "
 #define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE	384	/* Print Buffer Size */
diff --git a/include/configs/sacsng.h b/include/configs/sacsng.h
index f3b0fc1..54d55a0 100644
--- a/include/configs/sacsng.h
+++ b/include/configs/sacsng.h
@@ -498,7 +498,6 @@
 
 #undef  CONFIG_SYS_HUSH_PARSER
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 #endif
 
 /* When CONFIG_TIMESTAMP is selected, the timestamp (date and time)
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index a58a34e..9c431bf 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -45,7 +45,6 @@
 
 #define CONFIG_SYS_PROMPT		"=>"	/* Command Prompt */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_LONGHELP			/* #undef to save memory */
 #define CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size */
 
diff --git a/include/configs/sbc405.h b/include/configs/sbc405.h
index cab6660..5abcda3 100644
--- a/include/configs/sbc405.h
+++ b/include/configs/sbc405.h
@@ -132,9 +132,6 @@
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #undef CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index e50d829..7d0dda7 100644
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -297,9 +297,6 @@
 #define CONFIG_AUTO_COMPLETE		/* add autocompletion support   */
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index d87394c..8e8e14c 100644
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -434,9 +434,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT		1
diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h
index 95c68bc..46d6098 100644
--- a/include/configs/sbc8560.h
+++ b/include/configs/sbc8560.h
@@ -204,9 +204,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT                1
diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
index 099bdec..9040ec6 100644
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -276,7 +276,6 @@
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 #endif
 
 /*
diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index bfbb2c3..8792c85 100644
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -104,7 +104,6 @@
 #define CONFIG_CMD_USB
 
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_CMDLINE_EDITING
 
 /* autoboot */
diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h
index 23df401..2360a8f 100644
--- a/include/configs/smdk5250.h
+++ b/include/configs/smdk5250.h
@@ -111,7 +111,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_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT		"SMDK5250 # "
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE		384	/* Print Buffer Size */
diff --git a/include/configs/smdk6400.h b/include/configs/smdk6400.h
index 47a3d41..04caeef 100644
--- a/include/configs/smdk6400.h
+++ b/include/configs/smdk6400.h
@@ -88,9 +88,6 @@
 #define CONFIG_SERIAL1          1	/* we use SERIAL 1 on SMDK6400	*/
 
 #define CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #define CONFIG_CMDLINE_EDITING
 
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index 5ab8665..fd9f96d 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -169,7 +169,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		"SMDKC100 # "
 #define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE	384	/* Print Buffer Size */
diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
index 868e6ae..41d7780 100644
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@@ -101,7 +101,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_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT		"SMDKV310 # "
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size*/
 #define CONFIG_SYS_PBSIZE		384	/* Print Buffer Size */
diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h
index bb2a463..8af3c02 100644
--- a/include/configs/snapper9260.h
+++ b/include/configs/snapper9260.h
@@ -159,7 +159,6 @@
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /* U-Boot memory settings */
 #define CONFIG_SYS_MALLOC_LEN		(1 << 20)
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 19b978a..25f15f2 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -229,9 +229,6 @@
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_AUTO_COMPLETE	1	/* add autocompletion support */
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 
 /*
diff --git a/include/configs/sorcery.h b/include/configs/sorcery.h
index fe40bf0..f67898e 100644
--- a/include/configs/sorcery.h
+++ b/include/configs/sorcery.h
@@ -140,9 +140,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /*
  * Flexbus Chipselect configuration
diff --git a/include/configs/spc1920.h b/include/configs/spc1920.h
index e39d3bd..87878d5 100644
--- a/include/configs/spc1920.h
+++ b/include/configs/spc1920.h
@@ -110,7 +110,6 @@
 #define	CONFIG_SYS_LONGHELP				/* undef to save memory		*/
 #define	CONFIG_SYS_PROMPT		"=>"		/* Monitor Command Prompt	*/
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h
index d85d527..939a964 100644
--- a/include/configs/stxgp3.h
+++ b/include/configs/stxgp3.h
@@ -173,7 +173,6 @@
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 #endif
 
 /*
diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h
index 08316b6..c1a90a7 100644
--- a/include/configs/stxssa.h
+++ b/include/configs/stxssa.h
@@ -188,9 +188,6 @@
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define CONFIG_AUTO_COMPLETE	1	/* add autocompletion support   */
 #define CONFIG_SYS_HUSH_PARSER		1	/* Use the HUSH parser		*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT		1
diff --git a/include/configs/stxxtc.h b/include/configs/stxxtc.h
index cbaa643..93e7f3a 100644
--- a/include/configs/stxxtc.h
+++ b/include/configs/stxxtc.h
@@ -133,7 +133,6 @@
 #define	CONFIG_SYS_PROMPT	"xtc> "		/* Monitor Command Prompt	*/
 
 #define CONFIG_SYS_HUSH_PARSER	1
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
diff --git a/include/configs/svm_sc8xx.h b/include/configs/svm_sc8xx.h
index 0d939ee..91686d6 100644
--- a/include/configs/svm_sc8xx.h
+++ b/include/configs/svm_sc8xx.h
@@ -158,7 +158,6 @@
 #define	CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 
 #ifdef  CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 #endif
 
 #if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index 3fc2c44..777f77c 100644
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -154,7 +154,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_CMDLINE_EDITING
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
diff --git a/include/configs/tegra2-common.h b/include/configs/tegra2-common.h
index 068ce88..52dc38e 100644
--- a/include/configs/tegra2-common.h
+++ b/include/configs/tegra2-common.h
@@ -153,7 +153,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		V_PROMPT
 /*
  * Increasing the size of the IO buffer as default nfsargs size is more
diff --git a/include/configs/tnetv107x_evm.h b/include/configs/tnetv107x_evm.h
index 2dd1a33..2272ad2 100644
--- a/include/configs/tnetv107x_evm.h
+++ b/include/configs/tnetv107x_evm.h
@@ -114,7 +114,6 @@
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CRC32_VERIFY
diff --git a/include/configs/trats.h b/include/configs/trats.h
index 2d0a1b1..d2dfc9f 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -152,7 +152,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_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT		"TRATS # "
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE		384	/* Print Buffer Size */
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index 9955fca..56336ae 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -220,7 +220,6 @@
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
 #define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT		"OMAP3 Tricorder # "
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
 /* Print Buffer Size */
diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h
index c020ff4..b4ec8f0 100644
--- a/include/configs/trizepsiv.h
+++ b/include/configs/trizepsiv.h
@@ -150,7 +150,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_HUSH_PARSER		1
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define CONFIG_SYS_LONGHELP				/* undef to save memory		*/
 #ifdef CONFIG_SYS_HUSH_PARSER
diff --git a/include/configs/tt01.h b/include/configs/tt01.h
index 9c1d525..2b2e7fd 100644
--- a/include/configs/tt01.h
+++ b/include/configs/tt01.h
@@ -248,7 +248,6 @@
 
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define CONFIG_SYS_LONGHELP			/* undef to save memory */
 #define CONFIG_SYS_PROMPT	"TT01> "
diff --git a/include/configs/u8500_href.h b/include/configs/u8500_href.h
index 2cfbec8..b26efec 100644
--- a/include/configs/u8500_href.h
+++ b/include/configs/u8500_href.h
@@ -155,7 +155,6 @@
 #define CONFIG_SYS_LOADS_BAUD_CHANGE
 
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_CMDLINE_EDITING
 
 #define CONFIG_SETUP_MEMORY_TAGS	2
diff --git a/include/configs/uc100.h b/include/configs/uc100.h
index 62ef2c5..8c8fb5a 100644
--- a/include/configs/uc100.h
+++ b/include/configs/uc100.h
@@ -162,9 +162,6 @@
 #if 0
 #define	CONFIG_SYS_HUSH_PARSER		1	/* use "hush" command parser	*/
 #endif
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h
index bf50d09..a587636 100644
--- a/include/configs/ve8313.h
+++ b/include/configs/ve8313.h
@@ -279,7 +279,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 #if defined(CONFIG_PCI)
 /*
diff --git a/include/configs/virtlab2.h b/include/configs/virtlab2.h
index bf882b0..4bb96cc 100644
--- a/include/configs/virtlab2.h
+++ b/include/configs/virtlab2.h
@@ -140,9 +140,6 @@
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
 #define	CONFIG_SYS_HUSH_PARSER		1	/* use "hush" command parser	*/
-#ifdef	CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define	CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size	*/
diff --git a/include/configs/vision2.h b/include/configs/vision2.h
index 76ab1bd..24905a0 100644
--- a/include/configs/vision2.h
+++ b/include/configs/vision2.h
@@ -176,7 +176,6 @@
 #define CONFIG_SYS_HZ			1000
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_HUSH_PARSER
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"Vision II U-boot > "
 
 /*
  * Stack sizes
diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h
index 67a5c89..059a53a 100644
--- a/include/configs/vme8349.h
+++ b/include/configs/vme8349.h
@@ -230,9 +230,6 @@
 #define CONFIG_AUTO_COMPLETE		/* add autocompletion support */
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT
diff --git a/include/configs/vpac270.h b/include/configs/vpac270.h
index ed18dbe..01f0b6c 100644
--- a/include/configs/vpac270.h
+++ b/include/configs/vpac270.h
@@ -143,7 +143,6 @@
  * HUSH Shell Configuration
  */
 #define	CONFIG_SYS_HUSH_PARSER		1
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define	CONFIG_SYS_LONGHELP
 #ifdef	CONFIG_SYS_HUSH_PARSER
diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h
index a0cc247..0ed3bf4 100644
--- a/include/configs/xaeniax.h
+++ b/include/configs/xaeniax.h
@@ -119,7 +119,6 @@
 #define CONFIG_SYS_LONGHELP				/* undef to save memory	*/
 #define CONFIG_SYS_HUSH_PARSER		1
 
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #ifdef CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_PROMPT		"u-boot$ "	/* Monitor Command Prompt */
diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h
index bd7bac0..1235c37 100644
--- a/include/configs/xilinx-ppc.h
+++ b/include/configs/xilinx-ppc.h
@@ -84,7 +84,6 @@
 #define CONFIG_VERSION_VARIABLE		/* include version env variable */
 #define CONFIG_SYS_CONSOLE_INFO_QUIET	/* don't print console @ startup */
 #define CONFIG_SYS_HUSH_PARSER		/* Use the HUSH parser          */
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_LOADS_ECHO		/* echo on for serial download  */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	/* allow baudrate change        */
 #define CONFIG_SYS_BOOTMAPSZ		(8 << 20)
diff --git a/include/configs/xpedite1000.h b/include/configs/xpedite1000.h
index d72921e..4703d9d 100644
--- a/include/configs/xpedite1000.h
+++ b/include/configs/xpedite1000.h
@@ -128,7 +128,6 @@ extern void out32(unsigned int, unsigned long);
  * Use the HUSH parser
  */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * NOR flash configuration
diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h
index 20b4340..038f4f4 100644
--- a/include/configs/xpedite517x.h
+++ b/include/configs/xpedite517x.h
@@ -246,7 +246,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
  * Use the HUSH parser
  */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * Pass open firmware flat tree
diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h
index cb29c98..16ec455 100644
--- a/include/configs/xpedite520x.h
+++ b/include/configs/xpedite520x.h
@@ -208,7 +208,6 @@
  * Use the HUSH parser
  */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * Pass open firmware flat tree
diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h
index 3481479..6a469bb 100644
--- a/include/configs/xpedite537x.h
+++ b/include/configs/xpedite537x.h
@@ -246,7 +246,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
  * Use the HUSH parser
  */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * Pass open firmware flat tree
diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h
index 87c894c..dda6657 100644
--- a/include/configs/xpedite550x.h
+++ b/include/configs/xpedite550x.h
@@ -236,7 +236,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
  * Use the HUSH parser
  */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /*
  * Pass open firmware flat tree
diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h
index cacf7ea..a330bd0 100644
--- a/include/configs/zipitz2.h
+++ b/include/configs/zipitz2.h
@@ -132,7 +132,6 @@ unsigned char zipitz2_spi_read(void);
  * HUSH Shell Configuration
  */
 #define	CONFIG_SYS_HUSH_PARSER		1
-#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define	CONFIG_SYS_LONGHELP				/* undef to save memory	*/
 #ifdef	CONFIG_SYS_HUSH_PARSER
diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h
index 4573149..c9f737d 100644
--- a/include/configs/zmx25.h
+++ b/include/configs/zmx25.h
@@ -102,7 +102,6 @@
 #define CONFIG_CMD_USB
 
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 /*
  * USB
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [U-Boot] [PATCH v4 2/2] hush.c: Move default CONFIG_SYS_PROMPT_HUSH_PS2 to hush.c
  2012-06-19 22:54   ` [U-Boot] [PATCH v4 2/2] hush.c: Move default CONFIG_SYS_PROMPT_HUSH_PS2 to hush.c Tom Rini
@ 2012-06-20  9:14     ` Stefano Babic
  2012-06-20 18:36     ` Wolfgang Denk
  1 sibling, 0 replies; 25+ messages in thread
From: Stefano Babic @ 2012-06-20  9:14 UTC (permalink / raw)
  To: u-boot

On 20/06/2012 00:54, Tom Rini wrote:
> Exactly one board has defined CONFIG_SYS_PROMPT_HUSH_PS2 to a value
> different than "> " which is vision2.  I have Cc'd the maintainer here
> as I strongly suspect this is a bug rather than intentional behavior.
> 
> Cc: Stefano Babic <sbabic@denx.de>
> Signed-off-by: Tom Rini <trini@ti.com>
> 
> ---
> Changes in v4:
> - Rebase to current master
> ---

Acked-by: Stefano Babic <sbabic@denx.de>

Best regards,
Stefano

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

^ permalink raw reply	[flat|nested] 25+ messages in thread

* [U-Boot] [PATCH v2 1/2] CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there
  2012-06-19 20:50 ` Wolfgang Denk
  2012-06-19 21:31   ` Tom Rini
@ 2012-06-20 14:52   ` Tom Rini
  1 sibling, 0 replies; 25+ messages in thread
From: Tom Rini @ 2012-06-20 14:52 UTC (permalink / raw)
  To: u-boot

On 06/19/2012 01:50 PM, Wolfgang Denk wrote:
> Dear Tom Rini,
> 
> In message <1335480396-29478-1-git-send-email-trini@ti.com> you wrote:
>> We provide a default table of { 9600, 19200, 38400, 57600, 115200 }
>> in <config_fallbacks.h> which mkconfig places after <configs/...h> in
>> the generated config file.  This is used when a board has not set its
>> own table.  A number of boards set values below 9600 but it is my belief
>> that this was done for completeness rather than as a requirement so they
>> have opted to the new default table.
>>
>> Signed-off-by: Tom Rini <trini@ti.com>
> 
> Sorry, this doesn't apply any more,  Can you please rebase?

As you can see from Stefano's ack, it's made, but stuck in the
moderation queue for size.  Should I post it to the wiki?

-- 
Tom

^ permalink raw reply	[flat|nested] 25+ messages in thread

* [U-Boot] [PATCH v4 1/2] CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there
  2012-06-19 22:54 ` [U-Boot] [PATCH v4 " Tom Rini
  2012-06-19 22:54   ` [U-Boot] [PATCH v4 2/2] hush.c: Move default CONFIG_SYS_PROMPT_HUSH_PS2 to hush.c Tom Rini
@ 2012-06-20 18:36   ` Wolfgang Denk
  1 sibling, 0 replies; 25+ messages in thread
From: Wolfgang Denk @ 2012-06-20 18:36 UTC (permalink / raw)
  To: u-boot

Dear Tom Rini,

In message <1340146475-15969-1-git-send-email-trini@ti.com> you wrote:
> We provide a default table of { 9600, 19200, 38400, 57600, 115200 }
> in <config_fallbacks.h> which mkconfig places after <configs/...h> in
> the generated config file.  This is used when a board has not set its
> own table.
> 
> Signed-off-by: Tom Rini <trini@ti.com>
> 
> ---
> Changes in v4:
> - Rebase to current master
> - Catch a few more boards after auditing all users after rebase
> 
> Changes in v3:
> - Only modify boards that had the default values, ignoring ones that set
>   slower rates too (per Wolfgang Denk)
> 
> Changes in v2:
> - Create, use <config_fallbacks.h> rather than mkconfig directly for
>   this table (per Mike Frysinger).
> ---
>  arch/blackfin/include/asm/config.h     |    3 ---
>  board/fads/fads.h                      |    2 --
>  include/config_fallbacks.h             |   16 ++++++++++++++++
>  include/configs/A3000.h                |    1 -
>  include/configs/AMX860.h               |    2 --
>  include/configs/Adder.h                |    2 --
>  include/configs/BMW.h                  |    1 -
>  include/configs/CPC45.h                |    1 -
>  include/configs/CPU86.h                |    2 --
>  include/configs/CPU87.h                |    2 --
>  include/configs/CU824.h                |    1 -
>  include/configs/EB+MCF-EV123.h         |    1 -
>  include/configs/ELPT860.h              |    1 -
>  include/configs/EP88x.h                |    2 --
>  include/configs/ESTEEM192E.h           |    4 ----
>  include/configs/ETX094.h               |    2 --
>  include/configs/FADS823.h              |    2 --
>  include/configs/FADS850SAR.h           |    2 --
>  include/configs/FLAGADM.h              |    2 --
>  include/configs/FPS850L.h              |    2 --
>  include/configs/FPS860L.h              |    2 --
>  include/configs/GEN860T.h              |   10 ----------
>  include/configs/HIDDEN_DRAGON.h        |    1 -
>  include/configs/IAD210.h               |    2 --
>  include/configs/ICU862.h               |    2 --
>  include/configs/IDS8247.h              |    2 --
>  include/configs/IP860.h                |    2 --
>  include/configs/IPHASE4539.h           |    2 --
>  include/configs/ISPAN.h                |    2 --
>  include/configs/IVML24.h               |    2 --
>  include/configs/IVMS8.h                |    2 --
>  include/configs/LANTEC.h               |    2 --
>  include/configs/M5208EVBE.h            |    1 -
>  include/configs/M52277EVB.h            |    1 -
>  include/configs/M5235EVB.h             |    1 -
>  include/configs/M5249EVB.h             |    1 -
>  include/configs/M5253DEMO.h            |    1 -
>  include/configs/M5253EVBE.h            |    1 -
>  include/configs/M5271EVB.h             |    1 -
>  include/configs/M5272C3.h              |    1 -
>  include/configs/M5275EVB.h             |    1 -
>  include/configs/M5282EVB.h             |    1 -
>  include/configs/M53017EVB.h            |    1 -
>  include/configs/M5329EVB.h             |    1 -
>  include/configs/M5373EVB.h             |    1 -
>  include/configs/M54451EVB.h            |    1 -
>  include/configs/M54455EVB.h            |    1 -
>  include/configs/M5475EVB.h             |    1 -
>  include/configs/M5485EVB.h             |    1 -
>  include/configs/MBX.h                  |    2 --
>  include/configs/MBX860T.h              |    2 --
>  include/configs/MHPC.h                 |    2 --
>  include/configs/MOUSSE.h               |    2 --
>  include/configs/MUSENKI.h              |    1 -
>  include/configs/MVBLUE.h               |    1 -
>  include/configs/MVS1.h                 |    2 --
>  include/configs/NETPHONE.h             |    2 --
>  include/configs/NETTA.h                |    2 --
>  include/configs/NETTA2.h               |    2 --
>  include/configs/NETVIA.h               |    2 --
>  include/configs/NSCU.h                 |    2 --
>  include/configs/NX823.h                |    2 --
>  include/configs/PCIPPC2.h              |    1 -
>  include/configs/PCIPPC6.h              |    1 -
>  include/configs/PM826.h                |    2 --
>  include/configs/PM828.h                |    2 --
>  include/configs/PMC405DE.h             |    4 ----
>  include/configs/PN62.h                 |    1 -
>  include/configs/QS823.h                |    2 --
>  include/configs/QS850.h                |    2 --
>  include/configs/QS860T.h               |    2 --
>  include/configs/R360MPI.h              |    2 --
>  include/configs/RBC823.h               |    2 --
>  include/configs/RPXClassic.h           |    2 --
>  include/configs/RPXlite.h              |    2 --
>  include/configs/RPXlite_DW.h           |    1 -
>  include/configs/RPXsuper.h             |    3 ---
>  include/configs/RRvision.h             |    2 --
>  include/configs/SCM.h                  |    2 --
>  include/configs/SM850.h                |    2 --
>  include/configs/SPD823TS.h             |    2 --
>  include/configs/SX1.h                  |    2 --
>  include/configs/SXNI855T.h             |    2 --
>  include/configs/Sandpoint8240.h        |    1 -
>  include/configs/Sandpoint8245.h        |    1 -
>  include/configs/TASREG.h               |    1 -
>  include/configs/TK885D.h               |    2 --
>  include/configs/TQM823L.h              |    2 --
>  include/configs/TQM823M.h              |    2 --
>  include/configs/TQM8260.h              |    2 --
>  include/configs/TQM8272.h              |    2 --
>  include/configs/TQM850L.h              |    2 --
>  include/configs/TQM850M.h              |    2 --
>  include/configs/TQM855L.h              |    2 --
>  include/configs/TQM855M.h              |    2 --
>  include/configs/TQM860L.h              |    2 --
>  include/configs/TQM860M.h              |    2 --
>  include/configs/TQM862L.h              |    2 --
>  include/configs/TQM862M.h              |    2 --
>  include/configs/TQM866M.h              |    2 --
>  include/configs/TQM885D.h              |    2 --
>  include/configs/VCMA9.h                |    3 ---
>  include/configs/VoVPN-GW.h             |    3 ---
>  include/configs/a320evb.h              |    3 ---
>  include/configs/adp-ag101.h            |    3 ---
>  include/configs/adp-ag101p.h           |    3 ---
>  include/configs/adp-ag102.h            |    3 ---
>  include/configs/afeb9260.h             |    1 -
>  include/configs/apollon.h              |    1 -
>  include/configs/astro_mcf5373l.h       |    1 -
>  include/configs/at91rm9200ek.h         |    1 -
>  include/configs/at91sam9260ek.h        |    1 -
>  include/configs/at91sam9261ek.h        |    1 -
>  include/configs/at91sam9263ek.h        |    1 -
>  include/configs/at91sam9m10g45ek.h     |    1 -
>  include/configs/at91sam9rlek.h         |    1 -
>  include/configs/atc.h                  |    2 --
>  include/configs/balloon3.h             |    1 -
>  include/configs/c2mon.h                |    2 --
>  include/configs/ca9x4_ct_vxp.h         |    1 -
>  include/configs/calimain.h             |    1 -
>  include/configs/cam_enc_4xx.h          |    1 -
>  include/configs/cm4008.h               |    2 --
>  include/configs/cm41xx.h               |    2 --
>  include/configs/cobra5272.h            |    1 -
>  include/configs/colibri_pxa270.h       |    1 -
>  include/configs/cpu9260.h              |    1 -
>  include/configs/cpuat91.h              |    1 -
>  include/configs/da830evm.h             |    1 -
>  include/configs/da850evm.h             |    1 -
>  include/configs/davinci_dm355evm.h     |    1 -
>  include/configs/davinci_dm355leopard.h |    1 -
>  include/configs/davinci_dm365evm.h     |    1 -
>  include/configs/davinci_dm6467evm.h    |    1 -
>  include/configs/davinci_dvevm.h        |    1 -
>  include/configs/davinci_schmoogie.h    |    1 -
>  include/configs/davinci_sffsdr.h       |    1 -
>  include/configs/davinci_sonata.h       |    1 -
>  include/configs/dbau1x00.h             |    1 -
>  include/configs/debris.h               |    1 -
>  include/configs/eXalion.h              |    3 ---
>  include/configs/ea20.h                 |    1 -
>  include/configs/eb_cpux9k2.h           |    2 --
>  include/configs/efikamx.h              |    1 -
>  include/configs/enbw_cmc.h             |    1 -
>  include/configs/ep8260.h               |    3 ---
>  include/configs/ethernut5.h            |    1 -
>  include/configs/flea3.h                |    1 -
>  include/configs/grasshopper.h          |    1 -
>  include/configs/gw8260.h               |    3 ---
>  include/configs/hawkboard.h            |    1 -
>  include/configs/hermes.h               |    2 --
>  include/configs/highbank.h             |    1 -
>  include/configs/idmr.h                 |    1 -
>  include/configs/ima3-mx53.h            |    1 -
>  include/configs/imx27lite-common.h     |    1 -
>  include/configs/imx31_litekit.h        |    1 -
>  include/configs/imx31_phycore.h        |    1 -
>  include/configs/incaip.h               |    3 ---
>  include/configs/integratorap.h         |    1 -
>  include/configs/integratorcp.h         |    1 -
>  include/configs/jadecpu.h              |    1 -
>  include/configs/kvme080.h              |    2 --
>  include/configs/linkstation.h          |    1 -
>  include/configs/lubbock.h              |    3 ---
>  include/configs/lwmon.h                |    2 --
>  include/configs/m28evk.h               |    1 -
>  include/configs/meesc.h                |    1 -
>  include/configs/mpc7448hpc2.h          |    1 -
>  include/configs/ms7750se.h             |    2 --
>  include/configs/mx1ads.h               |    3 ---
>  include/configs/mx25pdk.h              |    1 -
>  include/configs/mx28evk.h              |    1 -
>  include/configs/mx31ads.h              |    1 -
>  include/configs/mx31pdk.h              |    1 -
>  include/configs/mx35pdk.h              |    1 -
>  include/configs/mx51evk.h              |    1 -
>  include/configs/mx53ard.h              |    1 -
>  include/configs/mx53evk.h              |    1 -
>  include/configs/mx53loco.h             |    1 -
>  include/configs/mx53smd.h              |    1 -
>  include/configs/mx6qarm2.h             |    1 -
>  include/configs/mx6qsabrelite.h        |    1 -
>  include/configs/nhk8815.h              |    1 -
>  include/configs/ns9750dev.h            |    3 ---
>  include/configs/omap1510inn.h          |    2 --
>  include/configs/omap2420h4.h           |    2 --
>  include/configs/omap5912osk.h          |    2 --
>  include/configs/omap730p2.h            |    2 --
>  include/configs/origen.h               |    3 ---
>  include/configs/otc570.h               |    1 -
>  include/configs/palmld.h               |    1 -
>  include/configs/palmtc.h               |    1 -
>  include/configs/pb1x00.h               |    3 ---
>  include/configs/pdnb3.h                |    2 --
>  include/configs/pm9261.h               |    1 -
>  include/configs/pm9263.h               |    1 -
>  include/configs/pm9g45.h               |    1 -
>  include/configs/ppmc7xx.h              |    2 --
>  include/configs/ppmc8260.h             |    3 ---
>  include/configs/pxa255_idp.h           |    3 ---
>  include/configs/qemu-mips.h            |    3 ---
>  include/configs/qi_lb60.h              |    1 -
>  include/configs/qong.h                 |    1 -
>  include/configs/quantum.h              |    2 --
>  include/configs/r2dplus.h              |    2 --
>  include/configs/r7780mp.h              |    2 --
>  include/configs/rsdproto.h             |    3 ---
>  include/configs/s5p_goni.h             |    3 ---
>  include/configs/s5pc210_universal.h    |    3 ---
>  include/configs/sacsng.h               |    3 ---
>  include/configs/sbc35_a9g20.h          |    1 -
>  include/configs/scb9328.h              |    1 -
>  include/configs/smdk2410.h             |    3 ---
>  include/configs/smdk5250.h             |    3 ---
>  include/configs/smdk6400.h             |    3 ---
>  include/configs/smdkc100.h             |    3 ---
>  include/configs/smdkv310.h             |    3 ---
>  include/configs/snapper9260.h          |    1 -
>  include/configs/stxxtc.h               |    2 --
>  include/configs/svm_sc8xx.h            |    2 --
>  include/configs/tb0229.h               |    2 --
>  include/configs/tnetv107x_evm.h        |    1 -
>  include/configs/tny_a9260.h            |    1 -
>  include/configs/top9000.h              |    1 -
>  include/configs/trats.h                |    3 ---
>  include/configs/trizepsiv.h            |    3 ---
>  include/configs/tt01.h                 |    1 -
>  include/configs/tx25.h                 |    1 -
>  include/configs/u8500_href.h           |    1 -
>  include/configs/uc100.h                |    2 --
>  include/configs/utx8245.h              |    1 -
>  include/configs/v37.h                  |    2 --
>  include/configs/vct.h                  |    1 -
>  include/configs/versatile.h            |    1 -
>  include/configs/virtlab2.h             |    2 --
>  include/configs/vision2.h              |    1 -
>  include/configs/vpac270.h              |    1 -
>  include/configs/xaeniax.h              |    3 ---
>  include/configs/zipitz2.h              |    1 -
>  include/configs/zmx25.h                |    1 -
>  mkconfig                               |    1 +
>  242 files changed, 17 insertions(+), 405 deletions(-)
>  create mode 100644 include/config_fallbacks.h

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Software entities are more complex for their size  than  perhaps  any
other human construct because no two parts are alike. If they are, we
make  the  two  similar parts into a subroutine -- open or closed. In
this respect, software  systems  differ  profoundly  from  computers,
buildings, or automobiles, where repeated elements abound.
                                                   - Fred Brooks, Jr.

^ permalink raw reply	[flat|nested] 25+ messages in thread

* [U-Boot] [PATCH v4 2/2] hush.c: Move default CONFIG_SYS_PROMPT_HUSH_PS2 to hush.c
  2012-06-19 22:54   ` [U-Boot] [PATCH v4 2/2] hush.c: Move default CONFIG_SYS_PROMPT_HUSH_PS2 to hush.c Tom Rini
  2012-06-20  9:14     ` Stefano Babic
@ 2012-06-20 18:36     ` Wolfgang Denk
  1 sibling, 0 replies; 25+ messages in thread
From: Wolfgang Denk @ 2012-06-20 18:36 UTC (permalink / raw)
  To: u-boot

Dear Tom Rini,

In message <1340146475-15969-2-git-send-email-trini@ti.com> you wrote:
> Exactly one board has defined CONFIG_SYS_PROMPT_HUSH_PS2 to a value
> different than "> " which is vision2.  I have Cc'd the maintainer here
> as I strongly suspect this is a bug rather than intentional behavior.
> 
> Cc: Stefano Babic <sbabic@denx.de>
> Signed-off-by: Tom Rini <trini@ti.com>
> 
> ---
> Changes in v4:
> - Rebase to current master
> ---
>  board/fads/fads.h                      |    1 -
>  common/hush.c                          |    3 +++
>  include/configs/AP1000.h               |    1 -
>  include/configs/ASH405.h               |    3 ---
>  include/configs/Adder.h                |    1 -
>  include/configs/CATcenter.h            |    3 ---
>  include/configs/CMS700.h               |    3 ---
>  include/configs/CPC45.h                |    3 ---
>  include/configs/CPCI2DP.h              |    3 ---
>  include/configs/CPCI405.h              |    3 ---
>  include/configs/CPCI4052.h             |    3 ---
>  include/configs/CPCI405AB.h            |    3 ---
>  include/configs/CPCI405DT.h            |    3 ---
>  include/configs/CPCI750.h              |    1 -
>  include/configs/CRAYL1.h               |    1 -
>  include/configs/CU824.h                |    3 ---
>  include/configs/DB64360.h              |    1 -
>  include/configs/DB64460.h              |    1 -
>  include/configs/DP405.h                |    3 ---
>  include/configs/EB+MCF-EV123.h         |    1 -
>  include/configs/EP88x.h                |    1 -
>  include/configs/EVB64260.h             |    1 -
>  include/configs/FPS850L.h              |    3 ---
>  include/configs/FPS860L.h              |    3 ---
>  include/configs/G2000.h                |    3 ---
>  include/configs/GEN860T.h              |    1 -
>  include/configs/HH405.h                |    3 ---
>  include/configs/HUB405.h               |    3 ---
>  include/configs/HWW1U1A.h              |    1 -
>  include/configs/ISPAN.h                |    1 -
>  include/configs/IceCube.h              |    1 -
>  include/configs/JSE.h                  |    3 ---
>  include/configs/KAREF.h                |    1 -
>  include/configs/M5271EVB.h             |    1 -
>  include/configs/MBX.h                  |    3 ---
>  include/configs/MERGERBOX.h            |    1 -
>  include/configs/METROBOX.h             |    1 -
>  include/configs/MIP405.h               |    1 -
>  include/configs/MPC8260ADS.h           |    1 -
>  include/configs/MPC8308RDB.h           |    1 -
>  include/configs/MPC8313ERDB.h          |    1 -
>  include/configs/MPC8315ERDB.h          |    3 ---
>  include/configs/MPC8323ERDB.h          |    3 ---
>  include/configs/MPC832XEMDS.h          |    3 ---
>  include/configs/MPC8349EMDS.h          |    3 ---
>  include/configs/MPC8349ITX.h           |    1 -
>  include/configs/MPC8360EMDS.h          |    3 ---
>  include/configs/MPC8360ERDK.h          |    3 ---
>  include/configs/MPC837XEMDS.h          |    3 ---
>  include/configs/MPC837XERDB.h          |    3 ---
>  include/configs/MPC8536DS.h            |    3 ---
>  include/configs/MPC8540ADS.h           |    1 -
>  include/configs/MPC8541CDS.h           |    1 -
>  include/configs/MPC8544DS.h            |    3 ---
>  include/configs/MPC8548CDS.h           |    3 ---
>  include/configs/MPC8555CDS.h           |    1 -
>  include/configs/MPC8560ADS.h           |    1 -
>  include/configs/MPC8568MDS.h           |    1 -
>  include/configs/MPC8569MDS.h           |    1 -
>  include/configs/MPC8572DS.h            |    3 ---
>  include/configs/MPC8610HPCD.h          |    3 ---
>  include/configs/MPC8641HPCN.h          |    3 ---
>  include/configs/MVBC_P.h               |    1 -
>  include/configs/MVBLM7.h               |    1 -
>  include/configs/MVS1.h                 |    3 ---
>  include/configs/MVSMR.h                |    1 -
>  include/configs/NETPHONE.h             |    1 -
>  include/configs/NETTA.h                |    1 -
>  include/configs/NETTA2.h               |    1 -
>  include/configs/NSCU.h                 |    3 ---
>  include/configs/P1010RDB.h             |    3 ---
>  include/configs/P1022DS.h              |    1 -
>  include/configs/P1023RDS.h             |    3 ---
>  include/configs/P1_P2_RDB.h            |    3 ---
>  include/configs/P2020COME.h            |    3 ---
>  include/configs/P2020DS.h              |    3 ---
>  include/configs/P2041RDB.h             |    1 -
>  include/configs/P3G4.h                 |    1 -
>  include/configs/PCI405.h               |    3 ---
>  include/configs/PCIPPC2.h              |    3 ---
>  include/configs/PCIPPC6.h              |    3 ---
>  include/configs/PIP405.h               |    1 -
>  include/configs/PK1C20.h               |    1 -
>  include/configs/PLU405.h               |    3 ---
>  include/configs/PMC405.h               |    3 ---
>  include/configs/PPChameleonEVB.h       |    3 ---
>  include/configs/QS823.h                |    1 -
>  include/configs/QS850.h                |    1 -
>  include/configs/QS860T.h               |    1 -
>  include/configs/Rattler.h              |    1 -
>  include/configs/SBC8540.h              |    3 ---
>  include/configs/SIMPC8313.h            |    1 -
>  include/configs/TK885D.h               |    3 ---
>  include/configs/TOP860.h               |    3 ---
>  include/configs/TQM5200.h              |    1 -
>  include/configs/TQM823L.h              |    3 ---
>  include/configs/TQM823M.h              |    3 ---
>  include/configs/TQM8260.h              |    3 ---
>  include/configs/TQM8272.h              |    3 ---
>  include/configs/TQM834x.h              |    3 ---
>  include/configs/TQM850L.h              |    3 ---
>  include/configs/TQM850M.h              |    3 ---
>  include/configs/TQM855L.h              |    3 ---
>  include/configs/TQM855M.h              |    3 ---
>  include/configs/TQM85xx.h              |    3 ---
>  include/configs/TQM860L.h              |    3 ---
>  include/configs/TQM860M.h              |    3 ---
>  include/configs/TQM862L.h              |    3 ---
>  include/configs/TQM862M.h              |    3 ---
>  include/configs/TQM866M.h              |    3 ---
>  include/configs/TQM885D.h              |    3 ---
>  include/configs/VCMA9.h                |    1 -
>  include/configs/VOH405.h               |    3 ---
>  include/configs/VOM405.h               |    3 ---
>  include/configs/W7OLMC.h               |    1 -
>  include/configs/W7OLMG.h               |    1 -
>  include/configs/WUH405.h               |    3 ---
>  include/configs/ZPC1900.h              |    1 -
>  include/configs/ZUMA.h                 |    1 -
>  include/configs/a4m072.h               |    3 ---
>  include/configs/am3517_crane.h         |    1 -
>  include/configs/am3517_evm.h           |    1 -
>  include/configs/amcc-common.h          |    3 ---
>  include/configs/aria.h                 |    1 -
>  include/configs/astro_mcf5373l.h       |    1 -
>  include/configs/at91rm9200ek.h         |    1 -
>  include/configs/at91sam9263ek.h        |    1 -
>  include/configs/at91sam9m10g45ek.h     |    1 -
>  include/configs/balloon3.h             |    1 -
>  include/configs/bct-brettl2.h          |    1 -
>  include/configs/c2mon.h                |    3 ---
>  include/configs/calimain.h             |    1 -
>  include/configs/cam_enc_4xx.h          |    1 -
>  include/configs/cm_t35.h               |    1 -
>  include/configs/colibri_pxa270.h       |    1 -
>  include/configs/corenet_ds.h           |    1 -
>  include/configs/csb272.h               |    3 ---
>  include/configs/csb472.h               |    3 ---
>  include/configs/da830evm.h             |    1 -
>  include/configs/da850evm.h             |    1 -
>  include/configs/davinci_dm355evm.h     |    1 -
>  include/configs/davinci_dm355leopard.h |    1 -
>  include/configs/davinci_dm365evm.h     |    1 -
>  include/configs/davinci_dm6467evm.h    |    1 -
>  include/configs/davinci_dvevm.h        |    1 -
>  include/configs/davinci_schmoogie.h    |    1 -
>  include/configs/davinci_sffsdr.h       |    1 -
>  include/configs/davinci_sonata.h       |    1 -
>  include/configs/devkit8000.h           |    1 -
>  include/configs/dig297.h               |    1 -
>  include/configs/digsy_mtc.h            |    1 -
>  include/configs/dns325.h               |    1 -
>  include/configs/ea20.h                 |    1 -
>  include/configs/edminiv2.h             |    1 -
>  include/configs/efikamx.h              |    1 -
>  include/configs/enbw_cmc.h             |    1 -
>  include/configs/ep8248.h               |    1 -
>  include/configs/ep8260.h               |    1 -
>  include/configs/ep82xxm.h              |    1 -
>  include/configs/ethernut5.h            |    1 -
>  include/configs/flea3.h                |    1 -
>  include/configs/galaxy5200.h           |    1 -
>  include/configs/grasshopper.h          |    1 -
>  include/configs/grsim.h                |    3 ---
>  include/configs/grsim_leon2.h          |    3 ---
>  include/configs/gw8260.h               |    1 -
>  include/configs/hawkboard.h            |    1 -
>  include/configs/igep00x0.h             |    1 -
>  include/configs/ima3-mx53.h            |    1 -
>  include/configs/integratorap.h         |    1 -
>  include/configs/jadecpu.h              |    1 -
>  include/configs/jupiter.h              |    3 ---
>  include/configs/km/keymile-common.h    |    1 -
>  include/configs/lacie_kw.h             |    1 -
>  include/configs/lubbock.h              |    1 -
>  include/configs/lwmon.h                |    3 ---
>  include/configs/lwmon5.h               |    3 ---
>  include/configs/m28evk.h               |    1 -
>  include/configs/mcc200.h               |    1 -
>  include/configs/mcx.h                  |    1 -
>  include/configs/mecp5123.h             |    1 -
>  include/configs/microblaze-generic.h   |    3 ---
>  include/configs/motionpro.h            |    1 -
>  include/configs/mpc5121-common.h       |    3 ---
>  include/configs/mpc5121ads.h           |    1 -
>  include/configs/mpc7448hpc2.h          |    1 -
>  include/configs/mpc8308_p1m.h          |    1 -
>  include/configs/mpq101.h               |    3 ---
>  include/configs/muas3001.h             |    1 -
>  include/configs/mx1ads.h               |    1 -
>  include/configs/mx28evk.h              |    1 -
>  include/configs/mx35pdk.h              |    1 -
>  include/configs/mx51evk.h              |    1 -
>  include/configs/mx53ard.h              |    1 -
>  include/configs/mx53evk.h              |    1 -
>  include/configs/mx53loco.h             |    1 -
>  include/configs/mx53smd.h              |    1 -
>  include/configs/mx6qarm2.h             |    1 -
>  include/configs/mx6qsabrelite.h        |    1 -
>  include/configs/nhk8815.h              |    1 -
>  include/configs/nios2-generic.h        |    1 -
>  include/configs/omap3_beagle.h         |    1 -
>  include/configs/omap3_evm_common.h     |    1 -
>  include/configs/omap3_logic.h          |    1 -
>  include/configs/omap3_mvblx.h          |    1 -
>  include/configs/omap3_overo.h          |    1 -
>  include/configs/omap3_pandora.h        |    1 -
>  include/configs/omap3_sdp3430.h        |    1 -
>  include/configs/omap3_zoom1.h          |    1 -
>  include/configs/omap4_common.h         |    1 -
>  include/configs/omap5_evm.h            |    1 -
>  include/configs/origen.h               |    1 -
>  include/configs/p1_p2_rdb_pc.h         |    3 ---
>  include/configs/p3mx.h                 |    1 -
>  include/configs/palmld.h               |    1 -
>  include/configs/palmtc.h               |    1 -
>  include/configs/pm9g45.h               |    1 -
>  include/configs/pxa255_idp.h           |    1 -
>  include/configs/qemu-mips.h            |    1 -
>  include/configs/qong.h                 |    3 ---
>  include/configs/s5p_goni.h             |    1 -
>  include/configs/s5pc210_universal.h    |    1 -
>  include/configs/sacsng.h               |    1 -
>  include/configs/sandbox.h              |    1 -
>  include/configs/sbc405.h               |    3 ---
>  include/configs/sbc8349.h              |    3 ---
>  include/configs/sbc8548.h              |    3 ---
>  include/configs/sbc8560.h              |    3 ---
>  include/configs/sbc8641d.h             |    1 -
>  include/configs/smdk2410.h             |    1 -
>  include/configs/smdk5250.h             |    1 -
>  include/configs/smdk6400.h             |    3 ---
>  include/configs/smdkc100.h             |    1 -
>  include/configs/smdkv310.h             |    1 -
>  include/configs/snapper9260.h          |    1 -
>  include/configs/socrates.h             |    3 ---
>  include/configs/sorcery.h              |    3 ---
>  include/configs/spc1920.h              |    1 -
>  include/configs/stxgp3.h               |    1 -
>  include/configs/stxssa.h               |    3 ---
>  include/configs/stxxtc.h               |    1 -
>  include/configs/svm_sc8xx.h            |    1 -
>  include/configs/tam3517-common.h       |    1 -
>  include/configs/tegra2-common.h        |    1 -
>  include/configs/tnetv107x_evm.h        |    1 -
>  include/configs/trats.h                |    1 -
>  include/configs/tricorder.h            |    1 -
>  include/configs/trizepsiv.h            |    1 -
>  include/configs/tt01.h                 |    1 -
>  include/configs/u8500_href.h           |    1 -
>  include/configs/uc100.h                |    3 ---
>  include/configs/ve8313.h               |    1 -
>  include/configs/virtlab2.h             |    3 ---
>  include/configs/vision2.h              |    1 -
>  include/configs/vme8349.h              |    3 ---
>  include/configs/vpac270.h              |    1 -
>  include/configs/xaeniax.h              |    1 -
>  include/configs/xilinx-ppc.h           |    1 -
>  include/configs/xpedite1000.h          |    1 -
>  include/configs/xpedite517x.h          |    1 -
>  include/configs/xpedite520x.h          |    1 -
>  include/configs/xpedite537x.h          |    1 -
>  include/configs/xpedite550x.h          |    1 -
>  include/configs/zipitz2.h              |    1 -
>  include/configs/zmx25.h                |    1 -
>  265 files changed, 3 insertions(+), 450 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"We don't care.  We don't have to.  We're the Phone Company."

^ permalink raw reply	[flat|nested] 25+ messages in thread

end of thread, other threads:[~2012-06-20 18:36 UTC | newest]

Thread overview: 25+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-04-26 22:46 [U-Boot] [PATCH v2 1/2] CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there Tom Rini
2012-04-26 22:46 ` [U-Boot] [PATCH v2 2/2] hush.c: Move default CONFIG_SYS_PROMPT_HUSH_PS2 to hush.c Tom Rini
2012-04-27  5:35   ` Mike Frysinger
2012-04-29 15:13   ` Stefano Babic
2012-04-26 23:53 ` [U-Boot] [PATCH v2 1/2] CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there Tom Rini
2012-04-27  5:34 ` Mike Frysinger
2012-04-27 14:31   ` Tom Rini
2012-04-27  6:31 ` Wolfgang Denk
2012-04-27 14:53   ` Tom Rini
2012-04-27 16:17     ` Wolfgang Denk
2012-04-27 16:47       ` Tom Rini
2012-04-27 17:19         ` Wolfgang Denk
2012-04-27 17:31           ` Tom Rini
2012-04-27 18:03   ` Tom Rini
2012-04-27 18:37     ` Mike Frysinger
2012-04-27 18:40     ` Wolfgang Denk
2012-04-27 19:02       ` Tom Rini
2012-06-19 20:50 ` Wolfgang Denk
2012-06-19 21:31   ` Tom Rini
2012-06-20 14:52   ` Tom Rini
2012-06-19 22:54 ` [U-Boot] [PATCH v4 " Tom Rini
2012-06-19 22:54   ` [U-Boot] [PATCH v4 2/2] hush.c: Move default CONFIG_SYS_PROMPT_HUSH_PS2 to hush.c Tom Rini
2012-06-20  9:14     ` Stefano Babic
2012-06-20 18:36     ` Wolfgang Denk
2012-06-20 18:36   ` [U-Boot] [PATCH v4 1/2] CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there Wolfgang Denk

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.