diff options
| author | Tom Rini <trini@konsulko.com> | 2016-04-21 21:37:19 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-04-25 14:22:43 -0400 |
| commit | adad96e60d0eb1bbc4d0b96c89decf385a426e42 (patch) | |
| tree | 8c4ff2e78356f00cdb53c8935ea06db69633d1a2 /include/configs | |
| parent | 9f69ab86d0592d528a0372f01fa23684291243fa (diff) | |
| download | u-boot-adad96e60d0eb1bbc4d0b96c89decf385a426e42.tar.gz u-boot-adad96e60d0eb1bbc4d0b96c89decf385a426e42.tar.bz2 u-boot-adad96e60d0eb1bbc4d0b96c89decf385a426e42.zip | |
configs: Re-sync HUSH options
Move all cases of CONFIG_SYS_HUSH_PARSER out of the config.h files. Remove
all cases of CONFIG_SYS_PROMPT_HUSH_PS2 as everyone uses the default.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs')
193 files changed, 1 insertions, 403 deletions
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 2d9be205d3..ef87bda610 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -498,11 +498,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_CONSOLE_IS_IN_ENV /* determine from environment */ #endif - -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL /* Use FSL common I2C driver */ diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index e870ffee75..e7a90bdaaa 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -241,12 +241,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x4500) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER -#ifdef CONFIG_SYS_HUSH_PARSER -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " -#endif - #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL #define CONFIG_SYS_FSL_I2C_SPEED 400000 diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 108e92494d..17ae12eed6 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -425,12 +425,6 @@ combinations. this should be removed later #define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR + 0x4700) #define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR + 0x4800) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER /* hush parser */ -#ifdef CONFIG_SYS_HUSH_PARSER -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " -#endif - #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL #define CONFIG_SYS_FSL_I2C_SPEED 400800 /* I2C speed and slave address*/ diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index a7a5e8e123..9c69f91d16 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -393,9 +393,6 @@ #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER - #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL #define CONFIG_SYS_FSL_I2C_SPEED 400000 diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h index c3a7714294..40fff81ed6 100644 --- a/include/configs/CPCI2DP.h +++ b/include/configs/CPCI2DP.h @@ -68,7 +68,6 @@ */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ -#undef CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ #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 1b5b907c75..b0281bec6b 100644 --- a/include/configs/CPCI4052.h +++ b/include/configs/CPCI4052.h @@ -92,7 +92,6 @@ */ #undef CONFIG_SYS_LONGHELP /* undef to save memory */ -#undef CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ #if defined(CONFIG_CMD_KGDB) #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h index 826de5bd3b..9b87de6bb2 100644 --- a/include/configs/M54418TWR.h +++ b/include/configs/M54418TWR.h @@ -210,10 +210,6 @@ #define CONFIG_PRAM 2048 /* 2048 KB */ -/* HUSH */ -#define CONFIG_SYS_HUSH_PARSER 1 -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " - #define CONFIG_SYS_LONGHELP /* undef to save memory */ #if defined(CONFIG_CMD_KGDB) diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index 1a793d78dd..5726605246 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -71,7 +71,6 @@ #endif -#define CONFIG_SYS_HUSH_PARSER /************************************************************** * I2C Stuff: * the MIP405 is equiped with an Atmel 24C128/256 EEPROM at address diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h index 9e9765cb6e..fc625d4d2b 100644 --- a/include/configs/MPC8308RDB.h +++ b/include/configs/MPC8308RDB.h @@ -321,11 +321,6 @@ #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR + 0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR + 0x4600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER - -/* Pass open firmware flat tree */ - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index d440d883d4..a3cfe6a15f 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -374,9 +374,6 @@ #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR+0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR+0x4600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index 3b49f1c64a..a05ce637c3 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -302,9 +302,6 @@ #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR+0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR+0x4600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index 97f48e23b4..8b95920c1a 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -224,8 +224,6 @@ #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ #define CONFIG_AUTO_COMPLETE /* add autocompletion support */ -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER /* I2C */ #define CONFIG_SYS_I2C diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h index d218f59c26..4e5e986968 100644 --- a/include/configs/MPC832XEMDS.h +++ b/include/configs/MPC832XEMDS.h @@ -304,8 +304,6 @@ #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ #define CONFIG_AUTO_COMPLETE /* add autocompletion support */ -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER /* I2C */ #define CONFIG_SYS_I2C diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 5b0900a9ad..9bf4226ab0 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -330,8 +330,6 @@ #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ #define CONFIG_AUTO_COMPLETE /* add autocompletion support */ -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER /* I2C */ #define CONFIG_SYS_I2C diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 4346edaa4c..8cdfcea4b4 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -532,7 +532,6 @@ boards, we say we have two, but don't display a message if we find only one. */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #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_LOAD_ADDR 0x2000000 /* default load address */ #define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */ diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index 2475ae4f5f..68a8e7120b 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -318,9 +318,6 @@ #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR+0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR+0x4600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index aa66927f5f..366febc414 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -344,9 +344,6 @@ #define CONFIG_FSL_SERDES1 0xe3000 #define CONFIG_FSL_SERDES2 0xe3100 -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 980cb992a2..27db9efc4c 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -381,9 +381,6 @@ #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR + 0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR + 0x4600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER - /* * I2C */ diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index 0a6d5bcd69..06d54a9860 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -231,11 +231,6 @@ #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER -#ifdef CONFIG_SYS_HUSH_PARSER -#endif - /* * I2C */ diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index 79f81ec6ba..dd638eba8f 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -254,11 +254,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER -#ifdef CONFIG_SYS_HUSH_PARSER -#endif - /* * I2C */ diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index 2372d5f2a5..4d56284282 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -206,9 +206,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 8d29762438..a4868f9a70 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -331,9 +331,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER - /* * I2C */ diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index b64bbe5df6..3bce1629f1 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -252,11 +252,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER -#ifdef CONFIG_SYS_HUSH_PARSER -#endif - /* * I2C */ diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index 2284646c11..a5a3dc4429 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -226,11 +226,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400,115200} -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER -#ifdef CONFIG_SYS_HUSH_PARSER -#endif - /* * I2C */ diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index a130001dd5..24c32caabc 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -237,11 +237,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600) -/* Use the HUSH parser*/ -#define CONFIG_SYS_HUSH_PARSER -#ifdef CONFIG_SYS_HUSH_PARSER -#endif - /* * I2C */ diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index 0e003e5c05..1224a20f46 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -248,11 +248,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600) -/* Use the HUSH parser*/ -#define CONFIG_SYS_HUSH_PARSER -#ifdef CONFIG_SYS_HUSH_PARSER -#endif - /* * I2C */ diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 95f59e05b1..10ee86284a 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -377,9 +377,6 @@ #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index ac219d1e12..7528456fa0 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -233,9 +233,6 @@ #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER - /* maximum size of the flat tree (8K) */ #define OF_FLAT_TREE_MAX_SIZE 8192 diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index 1f4ed2a536..1f2505f15c 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -269,9 +269,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER - /* * I2C */ diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 249e11b2a3..6e69258c21 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -619,9 +619,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index bc4c733135..d009913c0a 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -406,9 +406,6 @@ #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER - /* Video */ #ifdef CONFIG_FSL_DIU_FB diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h index a53b1acdf6..833affdac5 100644 --- a/include/configs/P1023RDB.h +++ b/include/configs/P1023RDB.h @@ -172,9 +172,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR + 0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR + 0x4600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 2d27fcf555..6f9680fcbb 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -336,9 +336,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500) #define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index b5959c8c07..5d639b1875 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -59,7 +59,6 @@ #define CONFIG_CMD_SAVES #define CONFIG_CMD_BSP -#define CONFIG_SYS_HUSH_PARSER /************************************************************** * I2C Stuff: * the PIP405 is equiped with an Atmel 24C128/256 EEPROM at address diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h index 345affa7a4..0e6ad7af47 100644 --- a/include/configs/PLU405.h +++ b/include/configs/PLU405.h @@ -90,7 +90,6 @@ */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ -#undef CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ #if defined(CONFIG_CMD_KGDB) #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index f07b2d1b31..800c246ccf 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -510,10 +510,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600) #define CONFIG_SYS_CONSOLE_IS_IN_ENV /* determine from environment */ -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " - /* Video */ #ifdef CONFIG_PPC_T1024 /* no DIU on T1023 */ #define CONFIG_FSL_DIU_FB diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 1a22beeb8c..d288a9f281 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -511,10 +511,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600) #define CONFIG_SYS_CONSOLE_IS_IN_ENV /* determine from environment */ -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " - /* Video */ #undef CONFIG_FSL_DIU_FB /* RDB doesn't support DIU */ #ifdef CONFIG_FSL_DIU_FB diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index f52889dc61..5a4382eb26 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -411,10 +411,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600) #define CONFIG_SYS_CONSOLE_IS_IN_ENV /* determine from environment */ -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " - /* Video */ #define CONFIG_FSL_DIU_FB #ifdef CONFIG_FSL_DIU_FB diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 84e195dbdf..0ba3913e8b 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -465,10 +465,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg #define CONFIG_SYS_CONSOLE_IS_IN_ENV /* determine from environment */ #endif -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " - #if defined(CONFIG_T1042RDB_PI) || defined(CONFIG_T1042D4RDB) /* Video */ #define CONFIG_FSL_DIU_FB diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 5957fa8914..69d161b30f 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -455,10 +455,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500) #define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " - /* * I2C */ diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index e0769d04c7..df4c5dc88f 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -415,10 +415,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500) #define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " - /* * I2C */ diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index faf06a0429..e075442cba 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -209,10 +209,6 @@ #define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500) #define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index e646c0035d..8fd3a8b0d9 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -604,7 +604,6 @@ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_SYS_HUSH_PARSER 1 /* use "hush" command parser */ #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 d03f2e6a45..7e3fdda463 100644 --- a/include/configs/TQM823L.h +++ b/include/configs/TQM823L.h @@ -126,7 +126,6 @@ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_SYS_HUSH_PARSER 1 /* Use the HUSH parser */ #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 7d39766375..fc305f422d 100644 --- a/include/configs/TQM823M.h +++ b/include/configs/TQM823M.h @@ -121,7 +121,6 @@ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_SYS_HUSH_PARSER 1 /* Use the HUSH parser */ #if defined(CONFIG_CMD_KGDB) #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index 9ed469a560..b9baad6af3 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -311,7 +311,6 @@ #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ #define CONFIG_AUTO_COMPLETE /* add autocompletion support */ -#define CONFIG_SYS_HUSH_PARSER 1 /* Use the HUSH parser */ #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 c70c4d799a..472dbb3d9a 100644 --- a/include/configs/TQM850L.h +++ b/include/configs/TQM850L.h @@ -110,7 +110,6 @@ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_SYS_HUSH_PARSER 1 /* Use the HUSH parser */ #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 52cba86c72..3aec34c7c1 100644 --- a/include/configs/TQM850M.h +++ b/include/configs/TQM850M.h @@ -111,7 +111,6 @@ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_SYS_HUSH_PARSER 1 /* Use the HUSH parser */ #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 fb2652b237..a46f689bdd 100644 --- a/include/configs/TQM855L.h +++ b/include/configs/TQM855L.h @@ -114,7 +114,6 @@ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_SYS_HUSH_PARSER 1 /* Use the HUSH parser */ #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 301a0a8b93..b44a31b64a 100644 --- a/include/configs/TQM855M.h +++ b/include/configs/TQM855M.h @@ -144,7 +144,6 @@ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_SYS_HUSH_PARSER 1 /* Use the HUSH parser */ #if defined(CONFIG_CMD_KGDB) #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h index a390e3ff37..cdbae5c4f3 100644 --- a/include/configs/TQM860L.h +++ b/include/configs/TQM860L.h @@ -113,7 +113,6 @@ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_SYS_HUSH_PARSER 1 /* Use the HUSH parser */ #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 0d2e1190f8..c1866a524c 100644 --- a/include/configs/TQM860M.h +++ b/include/configs/TQM860M.h @@ -114,7 +114,6 @@ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_SYS_HUSH_PARSER 1 /* Use the HUSH parser */ #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 6fd08c7cd0..881d654a32 100644 --- a/include/configs/TQM862L.h +++ b/include/configs/TQM862L.h @@ -117,7 +117,6 @@ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_SYS_HUSH_PARSER 1 /* Use the HUSH parser */ #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 fcdc3e5375..e06de45a6e 100644 --- a/include/configs/TQM862M.h +++ b/include/configs/TQM862M.h @@ -117,7 +117,6 @@ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_SYS_HUSH_PARSER 1 /* Use the HUSH parser */ #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 2a0fdf5947..6b585f9c4e 100644 --- a/include/configs/TQM866M.h +++ b/include/configs/TQM866M.h @@ -157,7 +157,6 @@ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_SYS_HUSH_PARSER 1 /* Use the HUSH parser */ #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 c9925ab6e7..83b094cc2f 100644 --- a/include/configs/TQM885D.h +++ b/include/configs/TQM885D.h @@ -152,7 +152,6 @@ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_SYS_HUSH_PARSER 1 /* Use the HUSH parser */ #if defined(CONFIG_CMD_KGDB) #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 139e629730..a37fbe2d7d 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -342,9 +342,6 @@ #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR + 0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR + 0x4600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h index de7d5c2243..ef47e98821 100644 --- a/include/configs/VCMA9.h +++ b/include/configs/VCMA9.h @@ -63,7 +63,6 @@ #define CONFIG_BOARD_LATE_INIT -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_CMDLINE_EDITING /* diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h index a734c28ce0..0ed44a858c 100644 --- a/include/configs/VOM405.h +++ b/include/configs/VOM405.h @@ -77,7 +77,6 @@ */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ -#undef CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ #if defined(CONFIG_CMD_KGDB) #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h index 31348dad0f..df3e06eb5e 100644 --- a/include/configs/a3m071.h +++ b/include/configs/a3m071.h @@ -240,8 +240,6 @@ #define CONFIG_SYS_LONGHELP #define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_HUSH_PARSER -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #if defined(CONFIG_CMD_KGDB) #define CONFIG_SYS_CBSIZE 1024 diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h index a883afbfac..2b58830630 100644 --- a/include/configs/a4m072.h +++ b/include/configs/a4m072.h @@ -260,7 +260,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_CMDLINE_EDITING 1 #define CONFIG_SYS_LONGHELP /* undef to save memory */ #if defined(CONFIG_CMD_KGDB) diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 3cc2874dcb..6c1556a17b 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -208,7 +208,6 @@ * Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ /* Print Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 75fe5588d3..f33c7b7ca7 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -285,7 +285,6 @@ #define CONFIG_CMDLINE_EDITING #define CONFIG_VERSION_VARIABLE #define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_PARTITION_UUIDS /* We set the max number of command args high to avoid HUSH bugs. */ diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h index 0388ffc781..8b1920d08f 100644 --- a/include/configs/amcc-common.h +++ b/include/configs/amcc-common.h @@ -92,7 +92,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_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */ diff --git a/include/configs/apf27.h b/include/configs/apf27.h index 018d586ddc..fe3b71411f 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -148,8 +148,6 @@ /* Boot argument buffer size */ #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_HUSH_PARSER /* enable the "hush" shell */ -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " /* secondary prompt string */ #define CONFIG_ENV_VARS_UBOOT_CONFIG #define CONFIG_PREBOOT "run check_flash check_env;" diff --git a/include/configs/aria.h b/include/configs/aria.h index c56a2e339b..b3050dfcf2 100644 --- a/include/configs/aria.h +++ b/include/configs/aria.h @@ -326,10 +326,6 @@ #define CONSOLE_FIFO_RX_ADDR FIFOC_PSC3_RX_ADDR #define CONFIG_CMDLINE_EDITING 1 /* command line history */ -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER -#ifdef CONFIG_SYS_HUSH_PARSER -#endif /* * PCI diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index 828bc601aa..05d41cef5d 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -69,7 +69,6 @@ #define CONFIG_CMD_FPGA_LOADMK #define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_MCFRTC #undef RTC_DEBUG diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h index 6525b5c370..c55446dc4b 100644 --- a/include/configs/at91-sama5_common.h +++ b/include/configs/at91-sama5_common.h @@ -115,7 +115,6 @@ #define CONFIG_SYS_LONGHELP #define CONFIG_CMDLINE_EDITING #define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_HUSH_PARSER /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024) diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h index 5903f7cc0b..2a5acf595c 100644 --- a/include/configs/at91rm9200ek.h +++ b/include/configs/at91rm9200ek.h @@ -191,7 +191,6 @@ #define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_LONGHELP #define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_HUSH_PARSER #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 c8264276a7..3d393873c3 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -332,7 +332,6 @@ #define CONFIG_SYS_LONGHELP 1 #define CONFIG_CMDLINE_EDITING 1 #define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_HUSH_PARSER /* * Size of malloc() pool diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index d4baf48b26..e29263219f 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -183,7 +183,6 @@ #define CONFIG_SYS_LONGHELP #define CONFIG_CMDLINE_EDITING #define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_HUSH_PARSER /* * Size of malloc() pool diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index 14a843641a..9dda7779d5 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -222,7 +222,6 @@ #define CONFIG_SYS_LONGHELP #define CONFIG_CMDLINE_EDITING #define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_HUSH_PARSER /* * Size of malloc() pool diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index cd91a7b21a..fcd100815a 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -224,7 +224,6 @@ #define CONFIG_SYS_LONGHELP #define CONFIG_CMDLINE_EDITING #define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_HUSH_PARSER /* * Size of malloc() pool diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h index be8cb80a5c..9456a316a3 100644 --- a/include/configs/bcm28155_ap.h +++ b/include/configs/bcm28155_ap.h @@ -114,7 +114,6 @@ /* version string, parser, etc */ #define CONFIG_VERSION_VARIABLE #define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_LONGHELP diff --git a/include/configs/bcm_ep_board.h b/include/configs/bcm_ep_board.h index 344f89d8d8..efc5de5a34 100644 --- a/include/configs/bcm_ep_board.h +++ b/include/configs/bcm_ep_board.h @@ -72,7 +72,6 @@ /* version string, parser, etc */ #define CONFIG_VERSION_VARIABLE #define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_CMDLINE_EDITING #define CONFIG_COMMAND_HISTORY #define CONFIG_SYS_LONGHELP diff --git a/include/configs/bct-brettl2.h b/include/configs/bct-brettl2.h index 658b16d3ae..4563c54f12 100644 --- a/include/configs/bct-brettl2.h +++ b/include/configs/bct-brettl2.h @@ -133,7 +133,6 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS -#define CONFIG_SYS_HUSH_PARSER /* * Pull in common ADI header for remaining command/environment setup diff --git a/include/configs/calimain.h b/include/configs/calimain.h index e6b2d4d022..d5d4ded2b6 100644 --- a/include/configs/calimain.h +++ b/include/configs/calimain.h @@ -200,7 +200,6 @@ #define CONFIG_LOADADDR 0xc0700000 #define CONFIG_VERSION_VARIABLE #define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_LONGHELP #define CONFIG_CRC32_VERIFY diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 3910b46e5b..016e752cf0 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -217,7 +217,6 @@ #define CONFIG_TIMESTAMP #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_CBSIZE 256 /* Console I/O Buffer Size */ /* Print Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index d8a29f04dd..ca0b47e4ee 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -226,7 +226,6 @@ #define CONFIG_TIMESTAMP #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_CBSIZE 512 /* Console I/O Buffer Size */ /* Print Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h index e8851e790e..edd032919d 100644 --- a/include/configs/colibri_pxa270.h +++ b/include/configs/colibri_pxa270.h @@ -95,14 +95,9 @@ #define CONFIG_BOOTP_HOSTNAME #endif -/* - * HUSH Shell Configuration - */ -#define CONFIG_SYS_HUSH_PARSER 1 - #undef CONFIG_SYS_LONGHELP /* Saves 10 KB */ #undef CONFIG_SYS_PROMPT -#ifdef CONFIG_SYS_HUSH_PARSER +#ifdef CONFIG_HUSH_PARSER #define CONFIG_SYS_PROMPT "$ " #else #endif diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index f79c58a98a..70e970f78c 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -166,8 +166,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 "> " #undef CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #define CONFIG_SYS_PBSIZE \ diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index fa64a1eae3..3f03978421 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -365,7 +365,6 @@ * Command line configuration. */ #ifndef CONFIG_TRAILBLAZER -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_LONGHELP #define CONFIG_CMDLINE_EDITING /* Command-line editing */ #define CONFIG_AUTO_COMPLETE /* add autocompletion support */ diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index d30d7ffa80..c937957e09 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -341,9 +341,6 @@ #define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500) #define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/corvus.h b/include/configs/corvus.h index a5255558da..6ef6a7d8bb 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -152,7 +152,6 @@ #define CONFIG_SYS_LONGHELP #define CONFIG_CMDLINE_EDITING #define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_HUSH_PARSER /* * Size of malloc() pool diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index b4bf350eb3..1691cea211 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -227,10 +227,6 @@ #define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500) #define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 24e55e8b0c..3e84cbc67c 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -265,7 +265,6 @@ #define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000) #define CONFIG_VERSION_VARIABLE #define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_LONGHELP #define CONFIG_CRC32_VERIFY diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h index 0041ab9d35..db3759fc39 100644 --- a/include/configs/digsy_mtc.h +++ b/include/configs/digsy_mtc.h @@ -387,7 +387,6 @@ #define CONFIG_SYS_LONGHELP #define CONFIG_AUTO_COMPLETE 1 #define CONFIG_CMDLINE_EDITING 1 -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_LOOPW 1 #define CONFIG_MX_CYCLIC 1 diff --git a/include/configs/dns325.h b/include/configs/dns325.h index 80f7a1e8ec..85a2594ee4 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -80,11 +80,6 @@ #define CONFIG_KIRKWOOD_GPIO /* - * Use the HUSH parser - */ -#define CONFIG_SYS_HUSH_PARSER - -/* * Console configuration */ #define CONFIG_CONSOLE_MUX diff --git a/include/configs/ea20.h b/include/configs/ea20.h index 10b30c17cf..85db4700ad 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -128,7 +128,6 @@ #define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000) #define CONFIG_VERSION_VARIABLE #define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_LONGHELP #define CONFIG_CRC32_VERIFY diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h index 7bc58dc414..0645d341a4 100644 --- a/include/configs/edb93xx.h +++ b/include/configs/edb93xx.h @@ -34,8 +34,6 @@ #define CONFIG_BOOTARGS "root=/dev/nfs console=ttyAM0,115200 ip=dhcp" #define CONFIG_BOOTFILE "edb93xx.img" -#define CONFIG_SYS_HUSH_PARSER 1 -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #define CONFIG_SYS_LDSCRIPT "board/cirrus/edb93xx/u-boot.lds" diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index 1dfa721f73..d622ef880e 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -235,9 +235,6 @@ #define CONFIG_SYS_RESET_ADDRESS 0xffff0000 #define CONFIG_SYS_MAXARGS 16 -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER - /* Enable command line editing */ #define CONFIG_CMDLINE_EDITING diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index 23a2935806..06061944cc 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -235,7 +235,6 @@ #endif /* Misc. u-boot settings */ -#define CONFIG_SYS_HUSH_PARSER #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 15905b9840..df751529d2 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -110,7 +110,6 @@ */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_HUSH_PARSER /* Use the HUSH parser */ #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index fbdfdf0a26..c45a92b1f4 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -260,8 +260,6 @@ /* Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_HUSH_PARSER -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #define CONFIG_AUTO_COMPLETE /* Print Buffer Size */ diff --git a/include/configs/grasshopper.h b/include/configs/grasshopper.h index 274175ba0f..8cde96a765 100644 --- a/include/configs/grasshopper.h +++ b/include/configs/grasshopper.h @@ -99,7 +99,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING diff --git a/include/configs/grsim.h b/include/configs/grsim.h index 47c357322d..3e81f0d70d 100644 --- a/include/configs/grsim.h +++ b/include/configs/grsim.h @@ -66,7 +66,6 @@ "echo" #undef CONFIG_BOOTARGS -/*#define CONFIG_SYS_HUSH_PARSER 0*/ #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h index 0a5292e9fd..e06e2611d1 100644 --- a/include/configs/grsim_leon2.h +++ b/include/configs/grsim_leon2.h @@ -61,7 +61,6 @@ "echo" #undef CONFIG_BOOTARGS -/*#define CONFIG_SYS_HUSH_PARSER 0*/ #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ diff --git a/include/configs/h2200.h b/include/configs/h2200.h index fe0211a7f7..0bdb570fde 100644 --- a/include/configs/h2200.h +++ b/include/configs/h2200.h @@ -121,8 +121,6 @@ #define CONFIG_INITRD_TAG /* Monitor Command Prompt */ -#define CONFIG_SYS_HUSH_PARSER -#define CONFIG_SYS_PROMPT_HUSH_PS2 "$ " /* Console I/O Buffer Size */ #define CONFIG_SYS_CBSIZE 256 diff --git a/include/configs/hikey.h b/include/configs/hikey.h index 0851626ea8..ce4a006686 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -140,7 +140,6 @@ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ sizeof(CONFIG_SYS_PROMPT) + 16) -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE #define CONFIG_SYS_LONGHELP #define CONFIG_CMDLINE_EDITING diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index c9846130a3..75496d71d7 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -310,9 +310,6 @@ #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR + 0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR + 0x4600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER - /* Pass open firmware flat tree */ /* I2C */ diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index de51d10068..17e1f05320 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -472,8 +472,6 @@ + sizeof(CONFIG_SYS_PROMPT)+16) #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #define CONFIG_SYS_MEMTEST_START 0x00001000 #define CONFIG_SYS_MEMTEST_END 0x00C00000 diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h index 43d2c3d57e..4cd889b8c3 100644 --- a/include/configs/integrator-common.h +++ b/include/configs/integrator-common.h @@ -13,7 +13,6 @@ #define CONFIG_SYS_TIMERBASE 0x13000100 /* Timer1 */ #define CONFIG_SYS_LOAD_ADDR 0x7fc0 /* default load address */ #define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size*/ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index 3c4a70c45e..4f0aa690f8 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -212,7 +212,6 @@ #define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000) #define CONFIG_VERSION_VARIABLE #define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_LONGHELP #define CONFIG_CRC32_VERIFY diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h index b494683760..09f308f780 100644 --- a/include/configs/jupiter.h +++ b/include/configs/jupiter.h @@ -239,7 +239,6 @@ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_SYS_HUSH_PARSER 1 /* Use the HUSH parser */ #if defined(CONFIG_CMD_KGDB) #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #else diff --git a/include/configs/kc1.h b/include/configs/kc1.h index 6cbafdd911..108790293b 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -156,7 +156,6 @@ #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_CBSIZE 512 diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 5edc8f68a9..ab727aa48d 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -33,7 +33,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_HUSH_PARSER #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/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index d981951bce..44829e855e 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -255,9 +255,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_KM_CONSOLE_TTY "ttyS0" -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER - /* I2C */ #define CONFIG_SYS_I2C diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index 842169d1b2..12fef2942e 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -165,11 +165,6 @@ #define CONFIG_CMD_FAT /* - * Use the HUSH parser - */ -#define CONFIG_SYS_HUSH_PARSER - -/* * Console configuration */ #define CONFIG_CONSOLE_MUX diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index b6d4a79564..ee458d3f6e 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -155,7 +155,6 @@ #define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000) #define CONFIG_VERSION_VARIABLE #define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_LONGHELP #define CONFIG_CRC32_VERIFY diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 62cf6e5553..134cb081d9 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -605,8 +605,6 @@ unsigned long get_board_ddr_clk(void); * 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_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ #define CONFIG_SYS_PBSIZE \ diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index b2e431a1c9..4654f67eae 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -450,8 +450,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_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ #define CONFIG_SYS_PBSIZE \ diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index e900c50565..8aa557f1e2 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -273,8 +273,6 @@ #define CONFIG_SYS_PROMPT "=> " #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ sizeof(CONFIG_SYS_PROMPT) + 16) -#define CONFIG_SYS_HUSH_PARSER -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot args buffer */ #define CONFIG_SYS_LONGHELP #define CONFIG_CMDLINE_EDITING 1 diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index 7c19122f9e..7b792954b0 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -407,8 +407,6 @@ unsigned long get_board_ddr_clk(void); */ #define CONFIG_MISC_INIT_R #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 "=> " #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_PBSIZE \ diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 57e2a2919c..aee8e5ee19 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -267,8 +267,6 @@ unsigned long long get_qixis_addr(void); #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ sizeof(CONFIG_SYS_PROMPT) + 16) -#define CONFIG_SYS_HUSH_PARSER -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot args buffer */ #define CONFIG_SYS_LONGHELP #define CONFIG_CMDLINE_EDITING 1 diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index 8fb0135c97..f9ada1af00 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -39,7 +39,6 @@ #define CONFIG_KIRKWOOD_GPIO #define CONFIG_SYS_NO_FLASH -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_CONSOLE_IS_IN_ENV #define CONFIG_SYS_CONSOLE_INFO_QUIET @@ -83,7 +82,6 @@ #define CONFIG_SF_DEFAULT_SPEED 25000000 -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " /* * Environment variables configurations diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index 648e189e40..ebc0f8b529 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -429,7 +429,6 @@ #define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_HUSH_PARSER 1 /* Use the HUSH parser */ #if defined(CONFIG_CMD_KGDB) #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index dc85768024..5763ae3039 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -86,7 +86,6 @@ #define CONFIG_VERSION_VARIABLE /* U-BOOT version */ #define CONFIG_AUTO_COMPLETE /* Command auto complete */ #define CONFIG_CMDLINE_EDITING /* Command history etc */ -#define CONFIG_SYS_HUSH_PARSER /* * Serial Driver diff --git a/include/configs/malta.h b/include/configs/malta.h index aecc8cef90..7f93b94e1f 100644 --- a/include/configs/malta.h +++ b/include/configs/malta.h @@ -68,7 +68,6 @@ sizeof(CONFIG_SYS_PROMPT) + 16) #define CONFIG_SYS_MAXARGS 16 -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 9a4f638ca1..6bd6933d55 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -263,7 +263,6 @@ * Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ #define CONFIG_SYS_CBSIZE 1024/* Console I/O Buffer Size */ /* Print Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h index e561026060..61a4a8ea76 100644 --- a/include/configs/mecp5123.h +++ b/include/configs/mecp5123.h @@ -244,10 +244,6 @@ #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER -#ifdef CONFIG_SYS_HUSH_PARSER -#endif /* I2C */ #define CONFIG_HARD_I2C /* I2C with hardware support */ diff --git a/include/configs/meesc.h b/include/configs/meesc.h index 88fb3e8735..76b2e1d102 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -185,7 +185,6 @@ #define CONFIG_SYS_LONGHELP #define CONFIG_CMDLINE_EDITING #define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_HUSH_PARSER /* * Size of malloc() pool diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h index f4d5dbcb75..53907f99d8 100644 --- a/include/configs/motionpro.h +++ b/include/configs/motionpro.h @@ -73,8 +73,6 @@ #undef CONFIG_BOOTARGS #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_VERSION_VARIABLE 1 /* include version env variable */ diff --git a/include/configs/mpc5121-common.h b/include/configs/mpc5121-common.h index 0d70e83440..f06ca9c6af 100644 --- a/include/configs/mpc5121-common.h +++ b/include/configs/mpc5121-common.h @@ -29,7 +29,5 @@ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200} #define CONFIG_CMDLINE_EDITING 1 /* command line history */ -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER #endif /* __MPC5121_COMMON_H */ diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h index 4ac291c812..1b2e029b86 100644 --- a/include/configs/mpc5121ads.h +++ b/include/configs/mpc5121ads.h @@ -291,10 +291,6 @@ #define CONSOLE_FIFO_RX_ADDR FIFOC_PSC3_RX_ADDR #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER -#ifdef CONFIG_SYS_HUSH_PARSER -#endif /* * Clocks in use diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h index 1bab9aba56..bf7f7451e9 100644 --- a/include/configs/mpc8308_p1m.h +++ b/include/configs/mpc8308_p1m.h @@ -302,9 +302,6 @@ #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR + 0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR + 0x4600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h index 6dbeeca701..a85855db8d 100644 --- a/include/configs/mx25pdk.h +++ b/include/configs/mx25pdk.h @@ -224,7 +224,6 @@ /* Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_MAXARGS 16 diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index 1177b0a4a2..f7a050e1b6 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -133,7 +133,6 @@ */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_HUSH_PARSER /* Use the HUSH parser */ #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 31cd5bb69d..125d25d37e 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -213,7 +213,6 @@ * Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index 22e1b683a3..033a542ad1 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -184,7 +184,6 @@ /* Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ #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 fca567da54..a41c7787cf 100644 --- a/include/configs/mx53evk.h +++ b/include/configs/mx53evk.h @@ -131,7 +131,6 @@ /* Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ #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 cfb3ae365e..7f9e3b41e0 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -178,7 +178,6 @@ /* Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h index 33d2163d6b..e851da2628 100644 --- a/include/configs/mx53smd.h +++ b/include/configs/mx53smd.h @@ -118,7 +118,6 @@ /* Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 3abc773dd6..c6996e28d7 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -81,7 +81,6 @@ /* Miscellaneous configurable options */ #undef CONFIG_CMD_IMLS #define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_CMDLINE_EDITING #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 512 diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index 9bd61145d8..05c52812df 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -54,7 +54,6 @@ /* Miscellaneous configurable options */ #undef CONFIG_CMD_IMLS #define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_CMDLINE_EDITING #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 512 diff --git a/include/configs/mxs.h b/include/configs/mxs.h index a4ffe75823..0882d5d8f2 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -97,8 +97,6 @@ #define CONFIG_VERSION_VARIABLE /* U-BOOT version */ #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 "> " /* Booting Linux */ #define CONFIG_CMDLINE_TAG diff --git a/include/configs/nas220.h b/include/configs/nas220.h index 36a00d3d56..d4bea634c4 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -54,8 +54,6 @@ #define CONFIG_SYS_LONGHELP #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_HUSH_PARSER -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " /* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 5c4140526d..7a1ce3ca27 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -393,8 +393,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); * 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_CBSIZE 256 /* Console I/O Buffer Size */ /* Print Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ diff --git a/include/configs/o2dnt-common.h b/include/configs/o2dnt-common.h index 4ffab8ad1a..724c33d0bc 100644 --- a/include/configs/o2dnt-common.h +++ b/include/configs/o2dnt-common.h @@ -293,7 +293,6 @@ */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_HUSH_PARSER #if defined(CONFIG_CMD_KGDB) #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 996f772a28..c831f366fb 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -41,7 +41,6 @@ * ---------------------------------------------------------------------------- */ #define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_HUSH_PARSER /* Display CPU and Board information */ #define CONFIG_DISPLAY_CPUINFO diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index fc7bfce4e6..a4b26d2edf 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -190,8 +190,6 @@ #define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000) #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/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 799521e1e0..15b8164406 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -662,9 +662,6 @@ #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index 1e49ee6e22..732b36f1e0 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -225,12 +225,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER -#ifdef CONFIG_SYS_HUSH_PARSER -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " -#endif - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL /* Use FSL common I2C driver */ diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index 4e29cf34ab..edc555fa3c 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -213,8 +213,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_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h index b2ba6fc58a..54ebcbae76 100644 --- a/include/configs/picosam9g45.h +++ b/include/configs/picosam9g45.h @@ -160,7 +160,6 @@ #define CONFIG_SYS_LONGHELP #define CONFIG_CMDLINE_EDITING #define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_HUSH_PARSER /* * Size of malloc() pool diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index ede0ee1f12..53fdaa7694 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -155,7 +155,6 @@ #define CONFIG_SYS_LONGHELP 1 #define CONFIG_CMDLINE_EDITING 1 #define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_HUSH_PARSER /* * Size of malloc() pool diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h index 5a043d5ab4..a9ecf6ab6c 100644 --- a/include/configs/qemu-mips.h +++ b/include/configs/qemu-mips.h @@ -85,7 +85,6 @@ #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_HUSH_PARSER /* Console I/O Buffer Size */ #define CONFIG_SYS_CBSIZE 256 diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h index 070b5de4a9..8258bfe126 100644 --- a/include/configs/qemu-mips64.h +++ b/include/configs/qemu-mips64.h @@ -87,7 +87,6 @@ #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_HUSH_PARSER /* Console I/O Buffer Size */ #define CONFIG_SYS_CBSIZE 256 diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h index 293684e4d6..5542352998 100644 --- a/include/configs/qemu-ppce500.h +++ b/include/configs/qemu-ppce500.h @@ -113,10 +113,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void); #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " - /* * General PCI * Memory space is mapped 1-1, but I/O space must start from 0. diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 8520423fe5..916895ad6c 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -195,7 +195,6 @@ "dfu_alt_info=" CONFIG_DFU_ALT "\0" #define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ #define CONFIG_SYS_PBSIZE 384 /* Print Buffer Size */ #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 2dd7fc0f7c..d489b1d0ab 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -65,7 +65,6 @@ #define CONFIG_MALLOC_F_ADDR 0x0010000 #define CONFIG_SYS_MALLOC_LEN (32 << 20) /* 32MB */ -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_LONGHELP /* #undef to save memory */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #define CONFIG_SILENT_CONSOLE diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index b74a268730..05ddb3a4a0 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -279,8 +279,6 @@ #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ #define CONFIG_AUTO_COMPLETE /* add autocompletion support */ -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER /* I2C */ #define CONFIG_SYS_I2C diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h index 56c197c0c9..2c074a1402 100644 --- a/include/configs/sbc8548.h +++ b/include/configs/sbc8548.h @@ -416,9 +416,6 @@ #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER - /* * I2C */ diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index b7238fb942..e3c1250251 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -257,11 +257,6 @@ #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER -#ifdef CONFIG_SYS_HUSH_PARSER -#endif - /* * I2C */ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 16f697d8aa..481b89dc74 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -26,8 +26,6 @@ #define CONFIG_ENV_SIZE (0x2000) #define CONFIG_SYS_MALLOC_LEN (16 * 1024 * 1024) #define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #define CONFIG_BOARD_LATE_INIT #define CONFIG_SYS_NO_FLASH #ifdef CONFIG_SIEMENS_MACH_TYPE diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 42ed098a1d..b1760ccb97 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -56,8 +56,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_SMARTWEB #define CONFIG_AUTO_COMPLETE #define CONFIG_ENV_OVERWRITE 1 /* Overwrite ethaddr / serial# */ -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_AUTOLOAD "yes" #define CONFIG_RESET_TO_RETRY diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h index 9947dc05f1..34858cd202 100644 --- a/include/configs/smdk2410.h +++ b/include/configs/smdk2410.h @@ -83,7 +83,6 @@ #define CONFIG_CMD_REGINFO #define CONFIG_CMD_USB -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_CMDLINE_EDITING /* autoboot */ diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index d52f5009cb..e1c7c67d2e 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.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_CBSIZE 256 /* Console I/O Buffer Size */ #define CONFIG_SYS_PBSIZE 384 /* Print Buffer Size */ #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index a708c68d94..3674e914bb 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -140,7 +140,6 @@ #define CONFIG_SYS_LONGHELP #define CONFIG_CMDLINE_EDITING #define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_HUSH_PARSER /* U-Boot memory settings */ #define CONFIG_SYS_MALLOC_LEN (1 << 20) diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 2d82a66b09..2785925fe3 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -169,7 +169,6 @@ #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_CBSIZE 512 diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 0c94bac5a4..2b652419c4 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -68,7 +68,6 @@ #define CONFIG_VERSION_VARIABLE /* U-BOOT version */ #define CONFIG_AUTO_COMPLETE /* Command auto complete */ #define CONFIG_CMDLINE_EDITING /* Command history etc */ -#define CONFIG_SYS_HUSH_PARSER #ifndef CONFIG_SYS_HOSTNAME #define CONFIG_SYS_HOSTNAME CONFIG_SYS_BOARD diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 62be0081d1..60f82912af 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -207,7 +207,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 */ /* diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h index 05e2363c5d..00f293a313 100644 --- a/include/configs/stm32f429-discovery.h +++ b/include/configs/stm32f429-discovery.h @@ -89,7 +89,6 @@ * Command line configuration. */ #define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index e94812bf5a..15119594cf 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -75,7 +75,6 @@ * Command line configuration. */ #define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING diff --git a/include/configs/strider.h b/include/configs/strider.h index d5f1981c0d..ec5fbe9929 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -313,9 +313,6 @@ #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR + 0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR + 0x4600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER - /* Pass open firmware flat tree */ /* I2C */ diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h index ca6d285d3b..0eed86165f 100644 --- a/include/configs/t4qds.h +++ b/include/configs/t4qds.h @@ -153,10 +153,6 @@ #define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500) #define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 59b6c5fd0a..1426fbf632 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -133,7 +133,6 @@ * Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ #define CONFIG_CMDLINE_EDITING #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 73cd0a028b..ee9fc7d6a0 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -192,7 +192,6 @@ * Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ /* turn on command-line edit/hist/auto */ diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 5864f27a6f..4f1a5f3b38 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -79,8 +79,6 @@ #define CONFIG_SYS_ALT_MEMTEST #define CONFIG_PREBOOT -#define CONFIG_SYS_HUSH_PARSER /* Use the HUSH parser */ -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " /* Keep device tree and initrd in lower memory so the kernel can access them */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h index 46d91e22de..fc16678236 100644 --- a/include/configs/thunderx_88xx.h +++ b/include/configs/thunderx_88xx.h @@ -99,7 +99,6 @@ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ sizeof(CONFIG_SYS_PROMPT) + 16) -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE #define CONFIG_SYS_LONGHELP #define CONFIG_CMDLINE_EDITING 1 diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index f00072e21d..9897a0b785 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -29,7 +29,6 @@ #define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ #define CONFIG_SYS_MALLOC_LEN (1024 << 10) #define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_HUSH_PARSER /* Use HUSH for command parsing */ #define CONFIG_SYS_NO_FLASH #define CONFIG_MACH_TYPE MACH_TYPE_TI8148EVM diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index e09efc709e..b5216a801d 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -25,7 +25,6 @@ #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (32 * 1024)) #define CONFIG_SYS_LONGHELP /* undef save memory */ -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_MACH_TYPE MACH_TYPE_TI8168EVM #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 787d04a144..d866690210 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -138,7 +138,6 @@ #else #define CONFIG_SYS_MALLOC_LEN (16 << 20) #endif -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_CONSOLE_INFO_QUIET #define CONFIG_BAUDRATE 115200 #define CONFIG_ENV_VARS_UBOOT_CONFIG /* Strongly encouraged */ diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 915cbd851e..73f0d846ce 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -279,7 +279,6 @@ /* Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ #define CONFIG_CMDLINE_EDITING /* enable cmdline history */ #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h index fcc9d80624..8f3963a547 100644 --- a/include/configs/ts4800.h +++ b/include/configs/ts4800.h @@ -135,7 +135,6 @@ * Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ /* Print Buffer Size */ diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h index 7b2f1ca4a4..296ddcda5d 100644 --- a/include/configs/usb_a9263.h +++ b/include/configs/usb_a9263.h @@ -144,7 +144,6 @@ sizeof(CONFIG_SYS_PROMPT) + 16) #define CONFIG_CMDLINE_EDITING #define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_LONGHELP /* diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h index de5c3ce2d2..359239cb5d 100644 --- a/include/configs/ve8313.h +++ b/include/configs/ve8313.h @@ -256,9 +256,6 @@ #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR+0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR+0x4600) -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER - #if defined(CONFIG_PCI) /* * General PCI diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 31b1a24592..d066a5ab49 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -276,7 +276,6 @@ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ sizeof(CONFIG_SYS_PROMPT) + 16) -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE #define CONFIG_SYS_LONGHELP #define CONFIG_CMDLINE_EDITING diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index d78ca0bc5c..501b143527 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -284,7 +284,6 @@ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ sizeof(CONFIG_SYS_PROMPT) + 16) -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot args buffer */ #define CONFIG_SYS_LONGHELP diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index 0809fbb1a7..65830b76ae 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -224,8 +224,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 "> " #undef CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ #define CONFIG_SYS_PBSIZE \ diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h index 7433d7ec48..7a7c92b92a 100644 --- a/include/configs/vme8349.h +++ b/include/configs/vme8349.h @@ -212,8 +212,6 @@ #define CONFIG_CMDLINE_EDITING /* add command line history */ #define CONFIG_AUTO_COMPLETE /* add autocompletion support */ -/* Use the HUSH parser */ -#define CONFIG_SYS_HUSH_PARSER /* I2C */ #define CONFIG_SYS_I2C diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h index caa0434a00..4407557081 100644 --- a/include/configs/woodburn_common.h +++ b/include/configs/woodburn_common.h @@ -132,7 +132,6 @@ */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_HUSH_PARSER /* Use the HUSH parser */ #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index e9127c34b9..a35876f410 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -110,7 +110,6 @@ #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING diff --git a/include/configs/x600.h b/include/configs/x600.h index ac477eb0b9..9a8a7c7dd0 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -133,8 +133,6 @@ #define CONFIG_BOOTDELAY 3 -#define CONFIG_SYS_HUSH_PARSER /* Use the HUSH parser */ -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " /* * U-Boot Environment placing definitions. diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index ea815c2423..a596edddaa 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -69,7 +69,6 @@ #define CONFIG_CMDLINE_EDITING #define CONFIG_COMMAND_HISTORY #define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_SUPPORT_VFAT diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h index 831b9401d1..5980acb089 100644 --- a/include/configs/xilinx-ppc.h +++ b/include/configs/xilinx-ppc.h @@ -69,7 +69,6 @@ #define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */ #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_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 6f162dc6c2..4f6084a140 100644 --- a/include/configs/xpedite1000.h +++ b/include/configs/xpedite1000.h @@ -108,11 +108,6 @@ extern void out32(unsigned int, unsigned long); #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ /* - * Use the HUSH parser - */ -#define CONFIG_SYS_HUSH_PARSER - -/* * NOR flash configuration */ #define CONFIG_SYS_MAX_FLASH_BANKS 3 diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 70af1e12ef..18e342ad72 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -226,11 +226,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ /* - * Use the HUSH parser - */ -#define CONFIG_SYS_HUSH_PARSER - -/* * I2C */ #define CONFIG_SYS_I2C diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h index 19723732f3..7284aa2396 100644 --- a/include/configs/xpedite520x.h +++ b/include/configs/xpedite520x.h @@ -189,11 +189,6 @@ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ /* - * Use the HUSH parser - */ -#define CONFIG_SYS_HUSH_PARSER - -/* * I2C */ #define CONFIG_SYS_I2C diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index 1be043fa60..bdeee47374 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -225,11 +225,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ /* - * Use the HUSH parser - */ -#define CONFIG_SYS_HUSH_PARSER - -/* * I2C */ #define CONFIG_SYS_I2C diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index 0697714a6f..09480350d9 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -215,11 +215,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ -/* - * Use the HUSH parser - */ -#define CONFIG_SYS_HUSH_PARSER - #define CONFIG_FDT_FIXUP_PCI_IRQ 1 /* diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h index 46836d578c..8bb48a8ad4 100644 --- a/include/configs/zipitz2.h +++ b/include/configs/zipitz2.h @@ -98,11 +98,6 @@ unsigned char zipitz2_spi_read(void); #endif #endif -/* - * HUSH Shell Configuration - */ -#define CONFIG_SYS_HUSH_PARSER 1 - #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/zmx25.h b/include/configs/zmx25.h index bd8fdfb8bd..3a401f74dd 100644 --- a/include/configs/zmx25.h +++ b/include/configs/zmx25.h @@ -86,7 +86,6 @@ #define CONFIG_CMD_FAT #define CONFIG_CMD_USB -#define CONFIG_SYS_HUSH_PARSER /* * USB diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 23b1b2df45..d5353166ae 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -252,7 +252,6 @@ #define CONFIG_SYS_LOAD_ADDR 0 /* default? */ /* Miscellaneous configurable options */ -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_CMDLINE_EDITING #define CONFIG_AUTO_COMPLETE |