diff options
| author | Tom Rini <trini@ti.com> | 2012-06-19 15:54:35 -0700 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-06-20 20:36:51 +0200 |
| commit | 219f4788d33b04e394d4ade1feaedc0292acc790 (patch) | |
| tree | f3829771b07673cb0571fc9a02aba66689d8249b | |
| parent | 26750c8aee2383a026e0cf89e9310628d3a5a6a0 (diff) | |
hush.c: Move default CONFIG_SYS_PROMPT_HUSH_PS2 to hush.c
Exactly one board has defined CONFIG_SYS_PROMPT_HUSH_PS2 to a value
different than "> " which is vision2. I have Cc'd the maintainer here
as I strongly suspect this is a bug rather than intentional behavior.
Cc: Stefano Babic <sbabic@denx.de>
Signed-off-by: Tom Rini <trini@ti.com>
Acked-by: Stefano Babic <sbabic@denx.de>
265 files changed, 3 insertions, 450 deletions
diff --git a/board/fads/fads.h b/board/fads/fads.h index 1a3d22a60..fa4a25abd 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 672ab9e15..1eff182ef 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 fd074fb5c..09cfef657 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 7f4849921..09aa763c1 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 ecf5fb873..a23c7ffff 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 84e4e78f6..1e3a5640e 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 63d838fe6..686d15883 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 b2b9e0761..fc226f198 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 afe8d6ef2..11cf58b14 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 cf1d1b39b..9ecdad9c9 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 d17458eaa..efab11991 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 a0d16d24a..83e9a046a 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 98b8ef5a7..1944a071b 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 a6af86c93..b276ae669 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 4aaceb77c..1daec6967 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 c8821fd05..a3ceed17f 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 c3f3a2415..d5ef154db 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 d48f09277..02a013b74 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 f6e265281..6d67d6ee4 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 eb9fe4648..a3420f457 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 1638d356d..9019cc75f 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 b90540295..b542b9641 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 6d7ca27ad..3b00ae35d 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 b074c7db4..c23711d8a 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 d64dd8de1..08ba8404b 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 1ea4108e7..b98caccb8 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 4a41b5c6d..444413d8d 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 afb827324..e90782f56 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 f08d78b91..791763aaa 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 d6474bd5c..43734d3d6 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 135ef5540..33c2ead32 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 ef652b2dc..e0a0d8e46 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 06fa676fd..3daf48065 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 ac200f577..a5913df2c 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 95ddc974e..e8d0cd775 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 81769164e..077e0d0f9 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 c75a256a5..34376bc4e 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 9961fb55c..979495a72 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 e4ea178f5..bb72b3584 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 47ff2f550..7f2761c53 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 863c9b9ec..99edfe660 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 2ebe6adc5..767b9763e 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 40e954643..ddee1ae09 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 6f8622c0a..f592d3a3a 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 c76455ab8..ac08ce360 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 04f2da9b8..03873b8a3 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 9604fda03..9c7aae3d9 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 ea634a633..5aad4fd61 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 d7ee40563..82436618b 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 f249cbb5e..d8213526d 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 c26cb639b..134352bae 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 ae94a4a27..a0fe15e86 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 bd10ddaed..a6bea153d 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 71d89708f..7410050f7 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 1a6ba692a..e26399465 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 ea460e6dc..266cb54c9 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 ebe6a70fa..35d15f427 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 f9c8dfbc2..5d69fb66d 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 7a5d86d2b..d9733649d 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 d7910e1c7..956449e88 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 8fe72dca4..e10a98767 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 61d6d5c10..7fd8ea8f2 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 ade48930c..eb0233bef 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 8b20f7245..9b458c33f 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 8350830d7..2b131b9f7 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 f94ad5caf..0b75b7622 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 31fe89347..437a8522c 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 fd3ab1635..604938d8b 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 5ca01a098..de0f950ae 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 5015b79d4..9f462f4b5 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 08fc4e842..67dba9f72 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 70d751da2..920edad0e 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 e632d1bd3..cdb56bb8f 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 2ac93be4e..ab881662d 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 28122ecc1..121e35775 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 f0eb0294a..d7d64d293 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 fe39d4e6e..23a32bcf6 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 f7ef6434a..4be6f70dd 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 6be5c2570..119819e37 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 7e1c11e57..90cee881a 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 c3f295b86..10b81c1a7 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 242aa314a..713ea12ee 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 3fe2b3eee..403fafa2f 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 1cce57efd..1ee0c48fa 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 2dceff747..8235b857d 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 2d456189f..27a12b310 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 fa77ffd5e..a27faac9d 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 efa7bd63f..f4d3760ca 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 31563203b..38570e4cf 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 9ddf626eb..a96bcbce8 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 f1d30ba89..d448bf665 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 09760774f..00b7a4c93 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 0c5277551..4176c7fe5 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 3a01292e2..36921ca8b 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 6ea3faac1..ca415e432 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 b26e4f4c2..a01b4a6be 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 a9bf525cc..1da4acd45 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 58c9716ef..7e2413179 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 c2618dc0d..be977f1d7 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 0b5370241..07384234c 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 d217d3b78..1c054f0bc 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 52e112568..46066dfb4 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 e36a2bb17..dd2da9410 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 473301a10..95bc4d964 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 780abd978..95455c49c 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 ed61f0f63..487666ce5 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 4d7effb98..e8b77ea71 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 db7c1c31c..334b7ecc1 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 af528fdc0..1e2ad40d9 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 b1cb406ca..a13c16aa5 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 c960a54b7..7df76fbf0 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 082f3f98c..6ad4a6bef 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 5b8f41fdd..f1032f0f3 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 2ca4ed028..43d6bb31f 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 1d97d3e35..462b155a3 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 93caacce6..f28f3e4f9 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 504ad96b0..5def36ad0 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 4cda22fe4..381b546e9 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 5350f619f..f6898d99b 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 1c139048e..57f28d4bb 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 827a6159f..54ab3ebd3 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 6766ee23d..ed0a601df 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 76ef56f2f..056a22a68 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 c9f0076ee..b21b495c7 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 f89a5676f..5c4cac937 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 9f908ce9d..2abcaffee 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 40308ca91..61a622a84 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 f46b91b00..f8b3095b4 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 1417240b7..97fdc2c9c 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 e8e266721..ce09c2e13 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 01e5e90bc..566c42b6b 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 81c9b9b98..e31e40b9f 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 2512a75c9..771ac9c3b 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 b28bd8e31..782d28c55 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 4a3b01d0c..1f02f3fee 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 8ed37a58c..a3705cb51 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 fb5f868af..f21fa648b 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 5d18ac7ea..aed5fa6a4 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 aa7a6ba03..51dc6643d 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 0adbb1fc7..e6adb1fe5 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 bd17419da..a30d24c29 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 b232c5093..1cd3d2eae 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 92d722706..bcf10ca55 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 57a614852..6734ea319 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 f0cc780b5..e4443ec89 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 c07002a3c..93df4ffe3 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 a62d7aa5e..23b0ba700 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 fb26643da..36a8c0668 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 248a5b2fa..037a5bb32 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 1626b0e62..4845d5198 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 1f660235f..3622b4ab9 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 b7a89d358..1f632ac57 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 4a03546fb..a9caa814d 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 9b7cc66c6..6a67aa572 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 eb7d72b2f..143b0f01f 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 7dc6cca6c..c1a0f6a77 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 2b40f5918..e669dc6cf 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 7adedc99e..ccfe032ca 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 04c07086c..8d78921f6 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 5aed0ed30..f89e9ead9 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 44c5532d8..6c5fcac6c 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 a38298fb8..e43cc284f 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 cc84c9c96..07e8a4908 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 f3639dd68..f64d3d3eb 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 fb9a3f917..cde2f701e 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 7935aea9a..18d6c6578 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 0e9188d03..c6e8859f6 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 a99f332a8..88e2e3a1d 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 186d8b911..17fa4a13d 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 fea40fcfe..2252d9383 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 296bbe1cf..2badadbc3 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 f5adccb51..b5c6fae4b 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 b65053912..7ed99587a 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 6cbc752fb..cd8d59f9a 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 7c8eb6434..4b9b29082 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 405bc69a2..1d89176f1 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 68215fda9..497eec4ad 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 b8389e8e5..3abaadc87 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 b56b27387..1867eb66d 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 f6a83a850..970c882d3 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 f5765b0d4..b41bda9c6 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 efca13608..295d123e5 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 bdcae59e0..f6a44976f 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 a5e77c5a7..593a79f15 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 01df8b127..9d1327fad 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 c0c95ed94..5004fcd21 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 20fc6418b..806ed6400 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 a6dc14675..339c73631 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 18bd37e91..b8c52af3f 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 81476ecf3..665e33d86 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 48e6b83be..51b172ddb 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 a98230a76..016864a65 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 ba1a129b4..bd04c0278 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 333ba617c..f4512ffff 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 453cef98c..a5f32e317 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 c80e5e84b..8b4e00855 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 7cd7173cd..0d7086dde 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 9fca0e1a4..a155c7723 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 7469038d7..5b566a8f2 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 de2077152..37a66aba1 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 17017a5d6..a383fa465 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 b891ee492..268215cb8 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 7b21a5c8c..20192a90a 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 4ac17cc63..2e1e6b901 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 b819d2134..6a1304681 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 a0a7a1c42..d29b3266c 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 d02f33843..604b53d3c 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 404aed2f5..1d8b0abf3 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 17608f5f2..0f72ebe8e 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 072e17bab..84481420e 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 38b502806..60c7a291c 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 6dcd25d8b..172bf1472 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 04fd8d07f..2cb942b4f 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 e44009e8b..8c459cb46 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 c4ea5ff30..70b794db0 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 9fa67334a..7cf2c63bd 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 a044346f3..c766330bb 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 387661b8f..f143ed003 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 da32b30e5..306c17336 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 3b63ac210..e824e17ed 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 f3d3e4d8e..16be76457 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 9337d5bcd..721301f95 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 f3b0fc1db..54d55a0a1 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 a58a34e58..9c431bf27 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 cab666060..5abcda3c3 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 e50d82963..7d0dda72a 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 d87394c8d..8e8e14cf3 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 95c68bce3..46d60985d 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 099bdecc8..9040ec609 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 bfbb2c3ef..8792c857c 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 23df401e3..2360a8f78 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 47a3d414c..04caeef96 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 5ab86651c..fd9f96d46 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 868e6ae8b..41d7780a0 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 bb2a46310..8af3c02f3 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 19b978a5b..25f15f2c3 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 fe40bf0e4..f67898e84 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 e39d3bd94..87878d50c 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 d85d52764..939a964e7 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 08316b6bf..c1a90a704 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 cbaa643e7..93e7f3a7b 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 0d939eeb7..91686d66a 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 3fc2c4434..777f77cfc 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 068ce8855..52dc38e60 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 2dd1a33ca..2272ad27c 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 2d0a1b163..d2dfc9ff2 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 9955fca47..56336ae19 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 c020ff4ee..b4ec8f0c3 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 9c1d5259c..2b2e7fd8c 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 2cfbec82b..b26efec57 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 62ef2c5ed..8c8fb5ae6 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 bf50d09d0..a5876366b 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 bf882b074..4bb96cc1a 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 76ab1bd2e..24905a012 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 67a5c892d..059a53abc 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 ed18dbeb3..01f0b6ce5 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 a0cc2478b..0ed3bf4a8 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 bd7bac097..1235c373e 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 d72921eeb..4703d9d9b 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 20b43405b..038f4f427 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 cb29c98c1..16ec455bd 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 34814797d..6a469bb60 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 87c894ccc..dda665719 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 cacf7ea6c..a330bd01a 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 4573149de..c9f737d42 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 |