summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--board/fads/fads.h1
-rw-r--r--common/hush.c3
-rw-r--r--include/configs/AP1000.h1
-rw-r--r--include/configs/ASH405.h3
-rw-r--r--include/configs/Adder.h1
-rw-r--r--include/configs/CATcenter.h3
-rw-r--r--include/configs/CMS700.h3
-rw-r--r--include/configs/CPC45.h3
-rw-r--r--include/configs/CPCI2DP.h3
-rw-r--r--include/configs/CPCI405.h3
-rw-r--r--include/configs/CPCI4052.h3
-rw-r--r--include/configs/CPCI405AB.h3
-rw-r--r--include/configs/CPCI405DT.h3
-rw-r--r--include/configs/CPCI750.h1
-rw-r--r--include/configs/CRAYL1.h1
-rw-r--r--include/configs/CU824.h3
-rw-r--r--include/configs/DB64360.h1
-rw-r--r--include/configs/DB64460.h1
-rw-r--r--include/configs/DP405.h3
-rw-r--r--include/configs/EB+MCF-EV123.h1
-rw-r--r--include/configs/EP88x.h1
-rw-r--r--include/configs/EVB64260.h1
-rw-r--r--include/configs/FPS850L.h3
-rw-r--r--include/configs/FPS860L.h3
-rw-r--r--include/configs/G2000.h3
-rw-r--r--include/configs/GEN860T.h1
-rw-r--r--include/configs/HH405.h3
-rw-r--r--include/configs/HUB405.h3
-rw-r--r--include/configs/HWW1U1A.h1
-rw-r--r--include/configs/ISPAN.h1
-rw-r--r--include/configs/IceCube.h1
-rw-r--r--include/configs/JSE.h3
-rw-r--r--include/configs/KAREF.h1
-rw-r--r--include/configs/M5271EVB.h1
-rw-r--r--include/configs/MBX.h3
-rw-r--r--include/configs/MERGERBOX.h1
-rw-r--r--include/configs/METROBOX.h1
-rw-r--r--include/configs/MIP405.h1
-rw-r--r--include/configs/MPC8260ADS.h1
-rw-r--r--include/configs/MPC8308RDB.h1
-rw-r--r--include/configs/MPC8313ERDB.h1
-rw-r--r--include/configs/MPC8315ERDB.h3
-rw-r--r--include/configs/MPC8323ERDB.h3
-rw-r--r--include/configs/MPC832XEMDS.h3
-rw-r--r--include/configs/MPC8349EMDS.h3
-rw-r--r--include/configs/MPC8349ITX.h1
-rw-r--r--include/configs/MPC8360EMDS.h3
-rw-r--r--include/configs/MPC8360ERDK.h3
-rw-r--r--include/configs/MPC837XEMDS.h3
-rw-r--r--include/configs/MPC837XERDB.h3
-rw-r--r--include/configs/MPC8536DS.h3
-rw-r--r--include/configs/MPC8540ADS.h1
-rw-r--r--include/configs/MPC8541CDS.h1
-rw-r--r--include/configs/MPC8544DS.h3
-rw-r--r--include/configs/MPC8548CDS.h3
-rw-r--r--include/configs/MPC8555CDS.h1
-rw-r--r--include/configs/MPC8560ADS.h1
-rw-r--r--include/configs/MPC8568MDS.h1
-rw-r--r--include/configs/MPC8569MDS.h1
-rw-r--r--include/configs/MPC8572DS.h3
-rw-r--r--include/configs/MPC8610HPCD.h3
-rw-r--r--include/configs/MPC8641HPCN.h3
-rw-r--r--include/configs/MVBC_P.h1
-rw-r--r--include/configs/MVBLM7.h1
-rw-r--r--include/configs/MVS1.h3
-rw-r--r--include/configs/MVSMR.h1
-rw-r--r--include/configs/NETPHONE.h1
-rw-r--r--include/configs/NETTA.h1
-rw-r--r--include/configs/NETTA2.h1
-rw-r--r--include/configs/NSCU.h3
-rw-r--r--include/configs/P1010RDB.h3
-rw-r--r--include/configs/P1022DS.h1
-rw-r--r--include/configs/P1023RDS.h3
-rw-r--r--include/configs/P1_P2_RDB.h3
-rw-r--r--include/configs/P2020COME.h3
-rw-r--r--include/configs/P2020DS.h3
-rw-r--r--include/configs/P2041RDB.h1
-rw-r--r--include/configs/P3G4.h1
-rw-r--r--include/configs/PCI405.h3
-rw-r--r--include/configs/PCIPPC2.h3
-rw-r--r--include/configs/PCIPPC6.h3
-rw-r--r--include/configs/PIP405.h1
-rw-r--r--include/configs/PK1C20.h1
-rw-r--r--include/configs/PLU405.h3
-rw-r--r--include/configs/PMC405.h3
-rw-r--r--include/configs/PPChameleonEVB.h3
-rw-r--r--include/configs/QS823.h1
-rw-r--r--include/configs/QS850.h1
-rw-r--r--include/configs/QS860T.h1
-rw-r--r--include/configs/Rattler.h1
-rw-r--r--include/configs/SBC8540.h3
-rw-r--r--include/configs/SIMPC8313.h1
-rw-r--r--include/configs/TK885D.h3
-rw-r--r--include/configs/TOP860.h3
-rw-r--r--include/configs/TQM5200.h1
-rw-r--r--include/configs/TQM823L.h3
-rw-r--r--include/configs/TQM823M.h3
-rw-r--r--include/configs/TQM8260.h3
-rw-r--r--include/configs/TQM8272.h3
-rw-r--r--include/configs/TQM834x.h3
-rw-r--r--include/configs/TQM850L.h3
-rw-r--r--include/configs/TQM850M.h3
-rw-r--r--include/configs/TQM855L.h3
-rw-r--r--include/configs/TQM855M.h3
-rw-r--r--include/configs/TQM85xx.h3
-rw-r--r--include/configs/TQM860L.h3
-rw-r--r--include/configs/TQM860M.h3
-rw-r--r--include/configs/TQM862L.h3
-rw-r--r--include/configs/TQM862M.h3
-rw-r--r--include/configs/TQM866M.h3
-rw-r--r--include/configs/TQM885D.h3
-rw-r--r--include/configs/VCMA9.h1
-rw-r--r--include/configs/VOH405.h3
-rw-r--r--include/configs/VOM405.h3
-rw-r--r--include/configs/W7OLMC.h1
-rw-r--r--include/configs/W7OLMG.h1
-rw-r--r--include/configs/WUH405.h3
-rw-r--r--include/configs/ZPC1900.h1
-rw-r--r--include/configs/ZUMA.h1
-rw-r--r--include/configs/a4m072.h3
-rw-r--r--include/configs/am3517_crane.h1
-rw-r--r--include/configs/am3517_evm.h1
-rw-r--r--include/configs/amcc-common.h3
-rw-r--r--include/configs/aria.h1
-rw-r--r--include/configs/astro_mcf5373l.h1
-rw-r--r--include/configs/at91rm9200ek.h1
-rw-r--r--include/configs/at91sam9263ek.h1
-rw-r--r--include/configs/at91sam9m10g45ek.h1
-rw-r--r--include/configs/balloon3.h1
-rw-r--r--include/configs/bct-brettl2.h1
-rw-r--r--include/configs/c2mon.h3
-rw-r--r--include/configs/calimain.h1
-rw-r--r--include/configs/cam_enc_4xx.h1
-rw-r--r--include/configs/cm_t35.h1
-rw-r--r--include/configs/colibri_pxa270.h1
-rw-r--r--include/configs/corenet_ds.h1
-rw-r--r--include/configs/csb272.h3
-rw-r--r--include/configs/csb472.h3
-rw-r--r--include/configs/da830evm.h1
-rw-r--r--include/configs/da850evm.h1
-rw-r--r--include/configs/davinci_dm355evm.h1
-rw-r--r--include/configs/davinci_dm355leopard.h1
-rw-r--r--include/configs/davinci_dm365evm.h1
-rw-r--r--include/configs/davinci_dm6467evm.h1
-rw-r--r--include/configs/davinci_dvevm.h1
-rw-r--r--include/configs/davinci_schmoogie.h1
-rw-r--r--include/configs/davinci_sffsdr.h1
-rw-r--r--include/configs/davinci_sonata.h1
-rw-r--r--include/configs/devkit8000.h1
-rw-r--r--include/configs/dig297.h1
-rw-r--r--include/configs/digsy_mtc.h1
-rw-r--r--include/configs/dns325.h1
-rw-r--r--include/configs/ea20.h1
-rw-r--r--include/configs/edminiv2.h1
-rw-r--r--include/configs/efikamx.h1
-rw-r--r--include/configs/enbw_cmc.h1
-rw-r--r--include/configs/ep8248.h1
-rw-r--r--include/configs/ep8260.h1
-rw-r--r--include/configs/ep82xxm.h1
-rw-r--r--include/configs/ethernut5.h1
-rw-r--r--include/configs/flea3.h1
-rw-r--r--include/configs/galaxy5200.h1
-rw-r--r--include/configs/grasshopper.h1
-rw-r--r--include/configs/grsim.h3
-rw-r--r--include/configs/grsim_leon2.h3
-rw-r--r--include/configs/gw8260.h1
-rw-r--r--include/configs/hawkboard.h1
-rw-r--r--include/configs/igep00x0.h1
-rw-r--r--include/configs/ima3-mx53.h1
-rw-r--r--include/configs/integratorap.h1
-rw-r--r--include/configs/jadecpu.h1
-rw-r--r--include/configs/jupiter.h3
-rw-r--r--include/configs/km/keymile-common.h1
-rw-r--r--include/configs/lacie_kw.h1
-rw-r--r--include/configs/lubbock.h1
-rw-r--r--include/configs/lwmon.h3
-rw-r--r--include/configs/lwmon5.h3
-rw-r--r--include/configs/m28evk.h1
-rw-r--r--include/configs/mcc200.h1
-rw-r--r--include/configs/mcx.h1
-rw-r--r--include/configs/mecp5123.h1
-rw-r--r--include/configs/microblaze-generic.h3
-rw-r--r--include/configs/motionpro.h1
-rw-r--r--include/configs/mpc5121-common.h3
-rw-r--r--include/configs/mpc5121ads.h1
-rw-r--r--include/configs/mpc7448hpc2.h1
-rw-r--r--include/configs/mpc8308_p1m.h1
-rw-r--r--include/configs/mpq101.h3
-rw-r--r--include/configs/muas3001.h1
-rw-r--r--include/configs/mx1ads.h1
-rw-r--r--include/configs/mx28evk.h1
-rw-r--r--include/configs/mx35pdk.h1
-rw-r--r--include/configs/mx51evk.h1
-rw-r--r--include/configs/mx53ard.h1
-rw-r--r--include/configs/mx53evk.h1
-rw-r--r--include/configs/mx53loco.h1
-rw-r--r--include/configs/mx53smd.h1
-rw-r--r--include/configs/mx6qarm2.h1
-rw-r--r--include/configs/mx6qsabrelite.h1
-rw-r--r--include/configs/nhk8815.h1
-rw-r--r--include/configs/nios2-generic.h1
-rw-r--r--include/configs/omap3_beagle.h1
-rw-r--r--include/configs/omap3_evm_common.h1
-rw-r--r--include/configs/omap3_logic.h1
-rw-r--r--include/configs/omap3_mvblx.h1
-rw-r--r--include/configs/omap3_overo.h1
-rw-r--r--include/configs/omap3_pandora.h1
-rw-r--r--include/configs/omap3_sdp3430.h1
-rw-r--r--include/configs/omap3_zoom1.h1
-rw-r--r--include/configs/omap4_common.h1
-rw-r--r--include/configs/omap5_evm.h1
-rw-r--r--include/configs/origen.h1
-rw-r--r--include/configs/p1_p2_rdb_pc.h3
-rw-r--r--include/configs/p3mx.h1
-rw-r--r--include/configs/palmld.h1
-rw-r--r--include/configs/palmtc.h1
-rw-r--r--include/configs/pm9g45.h1
-rw-r--r--include/configs/pxa255_idp.h1
-rw-r--r--include/configs/qemu-mips.h1
-rw-r--r--include/configs/qong.h3
-rw-r--r--include/configs/s5p_goni.h1
-rw-r--r--include/configs/s5pc210_universal.h1
-rw-r--r--include/configs/sacsng.h1
-rw-r--r--include/configs/sandbox.h1
-rw-r--r--include/configs/sbc405.h3
-rw-r--r--include/configs/sbc8349.h3
-rw-r--r--include/configs/sbc8548.h3
-rw-r--r--include/configs/sbc8560.h3
-rw-r--r--include/configs/sbc8641d.h1
-rw-r--r--include/configs/smdk2410.h1
-rw-r--r--include/configs/smdk5250.h1
-rw-r--r--include/configs/smdk6400.h3
-rw-r--r--include/configs/smdkc100.h1
-rw-r--r--include/configs/smdkv310.h1
-rw-r--r--include/configs/snapper9260.h1
-rw-r--r--include/configs/socrates.h3
-rw-r--r--include/configs/sorcery.h3
-rw-r--r--include/configs/spc1920.h1
-rw-r--r--include/configs/stxgp3.h1
-rw-r--r--include/configs/stxssa.h3
-rw-r--r--include/configs/stxxtc.h1
-rw-r--r--include/configs/svm_sc8xx.h1
-rw-r--r--include/configs/tam3517-common.h1
-rw-r--r--include/configs/tegra2-common.h1
-rw-r--r--include/configs/tnetv107x_evm.h1
-rw-r--r--include/configs/trats.h1
-rw-r--r--include/configs/tricorder.h1
-rw-r--r--include/configs/trizepsiv.h1
-rw-r--r--include/configs/tt01.h1
-rw-r--r--include/configs/u8500_href.h1
-rw-r--r--include/configs/uc100.h3
-rw-r--r--include/configs/ve8313.h1
-rw-r--r--include/configs/virtlab2.h3
-rw-r--r--include/configs/vision2.h1
-rw-r--r--include/configs/vme8349.h3
-rw-r--r--include/configs/vpac270.h1
-rw-r--r--include/configs/xaeniax.h1
-rw-r--r--include/configs/xilinx-ppc.h1
-rw-r--r--include/configs/xpedite1000.h1
-rw-r--r--include/configs/xpedite517x.h1
-rw-r--r--include/configs/xpedite520x.h1
-rw-r--r--include/configs/xpedite537x.h1
-rw-r--r--include/configs/xpedite550x.h1
-rw-r--r--include/configs/zipitz2.h1
-rw-r--r--include/configs/zmx25.h1
265 files changed, 3 insertions, 450 deletions
diff --git a/board/fads/fads.h b/board/fads/fads.h
index 1a3d22a604c..fa4a25abdeb 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 672ab9e157e..1eff182efaf 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 fd074fb5cee..09cfef6575c 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 7f4849921ec..09aa763c112 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 ecf5fb873af..a23c7ffffdb 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 84e4e78f662..1e3a5640eb2 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 63d838fe6be..686d15883c7 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 b2b9e0761e4..fc226f1984c 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 afe8d6ef2c7..11cf58b1469 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 cf1d1b39b4c..9ecdad9c974 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 d17458eaa35..efab11991d5 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 a0d16d24aca..83e9a046ad0 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 98b8ef5a762..1944a071b47 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 a6af86c9314..b276ae66968 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 4aaceb77cb9..1daec696778 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 c8821fd059b..a3ceed17f13 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 c3f3a241591..d5ef154dba0 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 d48f09277f3..02a013b7479 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 f6e265281e6..6d67d6ee406 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 eb9fe46487b..a3420f45797 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 1638d356d2c..9019cc75fa6 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 b90540295b2..b542b9641b1 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 6d7ca27addc..3b00ae35dc0 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 b074c7db4d9..c23711d8a44 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 d64dd8de11f..08ba8404bf8 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 1ea4108e7f7..b98caccb817 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 4a41b5c6d70..444413d8d66 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 afb827324af..e90782f56a9 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 f08d78b91c2..791763aaaf4 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 d6474bd5c38..43734d3d6c2 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 135ef554011..33c2ead3291 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 ef652b2dc84..e0a0d8e46bd 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 06fa676fd99..3daf480656b 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 ac200f5777a..a5913df2cbc 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 95ddc974e4b..e8d0cd775ba 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 81769164ec4..077e0d0f96f 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 c75a256a50b..34376bc4ec4 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 9961fb55ca5..979495a72c2 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 e4ea178f5e0..bb72b358492 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 47ff2f550b7..7f2761c5391 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 863c9b9ec01..99edfe66022 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 2ebe6adc536..767b9763e41 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 40e95464316..ddee1ae092b 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 6f8622c0a5b..f592d3a3a46 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 c76455ab80c..ac08ce36047 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 04f2da9b818..03873b8a347 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 9604fda03c3..9c7aae3d90c 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 ea634a63355..5aad4fd614e 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 d7ee405636f..82436618bea 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 f249cbb5ef6..d8213526de8 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 c26cb639b3e..134352baefc 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 ae94a4a276b..a0fe15e86e6 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 bd10ddaed12..a6bea153d7e 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 71d89708f1e..7410050f7be 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 1a6ba692ab6..e2639946515 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 ea460e6dcb2..266cb54c923 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 ebe6a70fa81..35d15f4271f 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 f9c8dfbc248..5d69fb66d98 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 7a5d86d2b7b..d9733649da1 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 d7910e1c731..956449e8843 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 8fe72dca445..e10a9876721 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 61d6d5c101f..7fd8ea8f2af 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 ade48930c3c..eb0233bef27 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 8b20f72451e..9b458c33f91 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 8350830d755..2b131b9f7e6 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 f94ad5caf2a..0b75b7622b7 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 31fe893473f..437a8522c30 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 fd3ab1635f3..604938d8b1e 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 5ca01a098fa..de0f950ae52 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 5015b79d4d6..9f462f4b5e4 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 08fc4e84276..67dba9f7280 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 70d751da208..920edad0e90 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 e632d1bd37e..cdb56bb8f41 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 2ac93be4ec5..ab881662d14 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 28122ecc115..121e3577531 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 f0eb0294aa7..d7d64d29361 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 fe39d4e6e6b..23a32bcf6c2 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 f7ef6434a1a..4be6f70dd74 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 6be5c2570a0..119819e3716 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 7e1c11e5722..90cee881ae7 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 c3f295b86c3..10b81c1a7f3 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 242aa314a1a..713ea12ee56 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 3fe2b3eeedd..403fafa2f52 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 1cce57efdad..1ee0c48fa19 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 2dceff747df..8235b857d39 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 2d456189f20..27a12b310be 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 fa77ffd5eb5..a27faac9d2e 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 efa7bd63f23..f4d3760ca12 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 31563203bdc..38570e4cfb9 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 9ddf626eb9a..a96bcbce864 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 f1d30ba8992..d448bf66503 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 09760774fb5..00b7a4c93ad 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 0c527755161..4176c7fe567 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 3a01292e29c..36921ca8b9c 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 6ea3faac1ab..ca415e432b9 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 b26e4f4c239..a01b4a6befb 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 a9bf525ccee..1da4acd4559 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 58c9716efb1..7e241317960 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 c2618dc0d5f..be977f1d76e 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 0b5370241b6..07384234c95 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 d217d3b7811..1c054f0bc69 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 52e112568c1..46066dfb4c4 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 e36a2bb17d8..dd2da9410c0 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 473301a10ca..95bc4d964c2 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 780abd978d2..95455c49c39 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 ed61f0f63e8..487666ce55e 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 4d7effb9801..e8b77ea71aa 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 db7c1c31c92..334b7ecc17a 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 af528fdc01f..1e2ad40d910 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 b1cb406caea..a13c16aa5a8 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 c960a54b72e..7df76fbf029 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 082f3f98cee..6ad4a6befe3 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 5b8f41fdd88..f1032f0f3ff 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 2ca4ed0285d..43d6bb31fd4 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 1d97d3e3595..462b155a301 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 93caacce608..f28f3e4f9a2 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 504ad96b038..5def36ad0c5 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 4cda22fe4be..381b546e99d 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 5350f619f8c..f6898d99b83 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 1c139048ec3..57f28d4bb2d 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 827a6159f2c..54ab3ebd3f1 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 6766ee23d31..ed0a601df20 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 76ef56f2f4f..056a22a68ba 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 c9f0076ee6a..b21b495c7f0 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 f89a5676f5e..5c4cac937df 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 9f908ce9d59..2abcaffeefa 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 40308ca9197..61a622a843b 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 f46b91b0025..f8b3095b49e 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 1417240b724..97fdc2c9c6b 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 e8e26672138..ce09c2e1383 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 01e5e90bc37..566c42b6bec 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 81c9b9b98f3..e31e40b9fe9 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 2512a75c9f2..771ac9c3b1e 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 b28bd8e3139..782d28c55d0 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 4a3b01d0c55..1f02f3feefd 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 8ed37a58c20..a3705cb512d 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 fb5f868af3c..f21fa648b10 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 5d18ac7eaf3..aed5fa6a453 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 aa7a6ba03e9..51dc6643d93 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 0adbb1fc729..e6adb1fe511 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 bd17419da18..a30d24c29bb 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 b232c5093f4..1cd3d2eae7e 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 92d722706fe..bcf10ca55e3 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 57a614852a2..6734ea31901 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 f0cc780b5e9..e4443ec89e4 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 c07002a3c15..93df4ffe3ca 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 a62d7aa5e83..23b0ba7003b 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 fb26643dab1..36a8c0668a5 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 248a5b2fa36..037a5bb3264 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 1626b0e625c..4845d5198a5 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 1f660235f02..3622b4ab924 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 b7a89d358be..1f632ac574b 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 4a03546fb9f..a9caa814d5a 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 9b7cc66c658..6a67aa572c4 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 eb7d72b2fe0..143b0f01f40 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 7dc6cca6cc1..c1a0f6a7701 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 2b40f59186b..e669dc6cf71 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 7adedc99e61..ccfe032ca73 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 04c07086c83..8d78921f6b5 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 5aed0ed308a..f89e9ead927 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 44c5532d86f..6c5fcac6c1d 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 a38298fb8ed..e43cc284f22 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 cc84c9c964c..07e8a4908d9 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 f3639dd685d..f64d3d3eb58 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 fb9a3f917c4..cde2f701e7c 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 7935aea9aec..18d6c6578f9 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 0e9188d0325..c6e8859f63a 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 a99f332a856..88e2e3a1d5d 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 186d8b9113a..17fa4a13d3a 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 fea40fcfe38..2252d93833e 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 296bbe1cf53..2badadbc3ba 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 f5adccb5183..b5c6fae4bfa 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 b6505391264..7ed99587a24 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 6cbc752fbd9..cd8d59f9af6 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 7c8eb6434d8..4b9b2908263 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 405bc69a2eb..1d89176f13e 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 68215fda9d2..497eec4ad00 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 b8389e8e5d6..3abaadc877f 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 b56b2738754..1867eb66d65 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 f6a83a8505e..970c882d3c5 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 f5765b0d4e1..b41bda9c643 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 efca13608b7..295d123e501 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 bdcae59e0df..f6a44976fb0 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 a5e77c5a791..593a79f153b 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 01df8b12732..9d1327fada0 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 c0c95ed9426..5004fcd211d 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 20fc6418b97..806ed6400e3 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 a6dc1467594..339c7363115 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 18bd37e91ce..b8c52af3f8f 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 81476ecf3ab..665e33d8685 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 48e6b83be4c..51b172ddb4e 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 a98230a761e..016864a6584 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 ba1a129b410..bd04c027899 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 333ba617cb6..f4512ffff2c 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 453cef98c67..a5f32e317da 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 c80e5e84bd5..8b4e00855d2 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 7cd7173cd25..0d7086dde82 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 9fca0e1a4ec..a155c772341 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 7469038d7b2..5b566a8f2b7 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 de2077152e2..37a66aba132 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 17017a5d62e..a383fa465cf 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 b891ee49255..268215cb867 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 7b21a5c8c4b..20192a90a7c 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 4ac17cc6365..2e1e6b901dc 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 b819d213408..6a1304681af 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 a0a7a1c42ae..d29b3266c0c 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 d02f3384374..604b53d3cb4 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 404aed2f5f9..1d8b0abf3df 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 17608f5f280..0f72ebe8eb7 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 072e17bab8f..84481420e48 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 38b5028060a..60c7a291c02 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 6dcd25d8b63..172bf1472bf 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 04fd8d07f58..2cb942b4fe4 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 e44009e8b1c..8c459cb46ef 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 c4ea5ff3079..70b794db0fa 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 9fa67334a89..7cf2c63bd87 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 a044346f394..c766330bb22 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 387661b8fce..f143ed003c8 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 da32b30e563..306c17336e6 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 3b63ac210a0..e824e17edd5 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 f3d3e4d8e44..16be76457c2 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 9337d5bcdd5..721301f9543 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 f3b0fc1db61..54d55a0a1e4 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 a58a34e58c9..9c431bf27ad 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 cab666060a9..5abcda3c365 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 e50d8296322..7d0dda72a94 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 d87394c8d11..8e8e14cf30f 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 95c68bce3cb..46d60985d32 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 099bdecc8c2..9040ec60958 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 bfbb2c3ef9c..8792c857c8d 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 23df401e3f3..2360a8f7800 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 47a3d414cd9..04caeef968d 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 5ab86651cbe..fd9f96d462f 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 868e6ae8b6c..41d7780a0e6 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 bb2a46310e4..8af3c02f34f 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 19b978a5b9a..25f15f2c354 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 fe40bf0e4cc..f67898e840f 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 e39d3bd944b..87878d50c39 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 d85d5276405..939a964e7f9 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 08316b6bf15..c1a90a70471 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 cbaa643e746..93e7f3a7b9f 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 0d939eeb773..91686d66a71 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 3fc2c443490..777f77cfc0d 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 068ce8855ff..52dc38e60e2 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 2dd1a33ca6a..2272ad27c23 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 2d0a1b163fa..d2dfc9ff22e 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 9955fca4768..56336ae199e 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 c020ff4eecd..b4ec8f0c3cc 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 9c1d5259cd0..2b2e7fd8cde 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 2cfbec82b8e..b26efec5708 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 62ef2c5ed4a..8c8fb5ae69b 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 bf50d09d076..a5876366b14 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 bf882b07461..4bb96cc1ab8 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 76ab1bd2e69..24905a0129b 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 67a5c892d04..059a53abc8d 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 ed18dbeb326..01f0b6ce5e6 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 a0cc2478b2d..0ed3bf4a8a7 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 bd7bac09763..1235c373e9e 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 d72921eebe6..4703d9d9b01 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 20b43405b2f..038f4f4270e 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 cb29c98c1e5..16ec455bdeb 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 34814797d9e..6a469bb6026 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 87c894cccf7..dda665719bf 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 cacf7ea6c0f..a330bd01a4b 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 4573149dedd..c9f737d429c 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