All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tom Rini <trini@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v4 2/2] hush.c: Move default CONFIG_SYS_PROMPT_HUSH_PS2 to hush.c
Date: Tue, 19 Jun 2012 15:54:35 -0700	[thread overview]
Message-ID: <1340146475-15969-2-git-send-email-trini@ti.com> (raw)
In-Reply-To: <1340146475-15969-1-git-send-email-trini@ti.com>

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

  reply	other threads:[~2012-06-19 22:54 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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   ` Tom Rini [this message]
2012-06-20  9:14     ` [U-Boot] [PATCH v4 2/2] hush.c: Move default CONFIG_SYS_PROMPT_HUSH_PS2 to hush.c 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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1340146475-15969-2-git-send-email-trini@ti.com \
    --to=trini@ti.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.