diff options
| author | Adam Ford | 2018-02-06 07:58:59 -0600 |
|---|---|---|
| committer | Tom Rini | 2018-02-23 21:41:49 -0500 |
| commit | d021e942107a1f7304a879cec99286ca462f7be3 (patch) | |
| tree | 88a5ba4db74b3e3c1aa79b10afb92bc08f1bee50 /include/configs | |
| parent | 0c0eaee562291f5bbca38c5bab3b1cd75b617fc0 (diff) | |
Convert CONFIG_BOOTP_BOOTPATH et al to Kconfig
This converts the following to Kconfig:
CONFIG_BOOTP_BOOTPATH
CONFIG_BOOTP_DNS
CONFIG_BOOTP_GATEWAY
CONFIG_BOOTP_HOSTNAME
CONFIG_BOOTP_PXE
CONFIG_BOOTP_SUBNETMASK
CONFIG_CMDLINE_EDITING
CONFIG_AUTO_COMPLETE
CONFIG_SYS_LONGHELP
CONFIG_SUPPORT_RAW_INITRD
CONFIG_ENV_VARS_UBOOT_CONFIG
Signed-off-by: Adam Ford <aford173@gmail.com>
[trini: Re-run the migration]
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs')
300 files changed, 0 insertions, 1171 deletions
diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h index ec30ed06745..c9742f37f4d 100644 --- a/include/configs/10m50_devboard.h +++ b/include/configs/10m50_devboard.h @@ -37,9 +37,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* * FDT options @@ -77,7 +74,6 @@ /* * MISC */ -#define CONFIG_SYS_LONGHELP /* Provide extended help */ #define CONFIG_SYS_LOAD_ADDR 0xcc000000 /* Half of RAM */ #define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR #define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE @@ -85,7 +81,5 @@ CONFIG_ENV_SIZE - \ CONFIG_SYS_MALLOC_LEN - \ 0x10000) -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING #endif /* __CONFIG_H */ diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h index f934a171b84..afd6488e10e 100644 --- a/include/configs/3c120_devboard.h +++ b/include/configs/3c120_devboard.h @@ -40,9 +40,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* * FDT options @@ -80,7 +77,6 @@ /* * MISC */ -#define CONFIG_SYS_LONGHELP /* Provide extended help */ #define CONFIG_SYS_LOAD_ADDR 0xd4000000 /* Half of RAM */ #define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR #define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE @@ -88,7 +84,5 @@ CONFIG_ENV_SIZE - \ CONFIG_SYS_MALLOC_LEN - \ 0x10000) -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING #endif /* __CONFIG_H */ diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index c3176560704..d28e003ba91 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -697,9 +697,6 @@ unsigned long get_board_ddr_clk(void); /* * Miscellaneous configurable options */ -#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_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index 02bd822edae..56e6e149d5f 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -285,9 +285,6 @@ extern unsigned long get_sdram_size(void); /* * Miscellaneous configurable options */ -#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_LOAD_ADDR 0x2000000 /* default load address */ #if defined(CONFIG_CMD_KGDB) diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index d71f8ae5057..96a92f133c7 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -502,9 +502,6 @@ combinations. this should be removed later /* * Miscellaneous configurable options */ -#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_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index 27976a26259..125a26ba77b 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -420,9 +420,6 @@ /* * Miscellaneous configurable options */ -#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_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index 43693ee26c0..3385dcb5b7f 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -78,7 +78,6 @@ "" #define CONFIG_PRAM 512 /* 512 KB */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_LOAD_ADDR 0x40010000 diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index 9d6bb5e7e82..7798b066252 100644 --- a/include/configs/M52277EVB.h +++ b/include/configs/M52277EVB.h @@ -30,9 +30,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME #define CONFIG_HOSTNAME M52277EVB #define CONFIG_SYS_UBOOT_END 0x3FFFF @@ -127,8 +124,6 @@ #define CONFIG_PRAM 2048 /* 2048 KB */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ - #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x10000) #define CONFIG_SYS_MBAR 0xFC000000 diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index a9ccb461d18..d221f718f07 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -29,9 +29,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME #define CONFIG_MCFFEC #ifdef CONFIG_MCFFEC @@ -93,7 +90,6 @@ "" #define CONFIG_PRAM 512 /* 512 KB */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE+0x20000) diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h index ccd40b2429c..6b37e46c56c 100644 --- a/include/configs/M5249EVB.h +++ b/include/configs/M5249EVB.h @@ -31,18 +31,12 @@ * BOOTP options */ #undef CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_BOOTP_BOOTPATH -#undef CONFIG_BOOTP_GATEWAY -#undef CONFIG_BOOTP_HOSTNAME /* * Command line configuration. */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ - #define CONFIG_SYS_DEVICE_NULLDEV 1 /* include nulldev device */ -#define CONFIG_AUTO_COMPLETE 1 /* add autocompletion support */ #define CONFIG_MX_CYCLIC 1 /* enable mdc/mwc commands */ #define CONFIG_SYS_LOAD_ADDR 0x200000 /* default load address */ diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index 91e4bf80b21..cf10f306c76 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -90,8 +90,6 @@ #define CONFIG_SYS_I2C_PINMUX_CLR (0xFFFFE7FF) #define CONFIG_SYS_I2C_PINMUX_SET (0) -#define CONFIG_SYS_LONGHELP /* undef to save memory */ - #define CONFIG_SYS_LOAD_ADDR 0x00100000 #define CONFIG_SYS_MEMTEST_START 0x400 diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h index 8d7250a5ba3..daa44b315bc 100644 --- a/include/configs/M5253EVBE.h +++ b/include/configs/M5253EVBE.h @@ -35,9 +35,6 @@ * BOOTP options */ #undef CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_BOOTP_BOOTPATH -#undef CONFIG_BOOTP_GATEWAY -#undef CONFIG_BOOTP_HOSTNAME /* * Command line configuration. @@ -60,8 +57,6 @@ #define CONFIG_SYS_ATA_ALT_OFFSET 0xC0 /* Offset for alternate registers */ #define CONFIG_SYS_ATA_STRIDE 4 /* Interval between registers */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ - #define CONFIG_SYS_LOAD_ADDR 0x00100000 #define CONFIG_SYS_MEMTEST_START 0x400 diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index 52ca7de3ff2..936a91e27d7 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -46,9 +46,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* * Command line configuration. @@ -96,8 +93,6 @@ "save\0" \ "" -#define CONFIG_SYS_LONGHELP /* undef to save memory */ - #define CONFIG_SYS_LOAD_ADDR 0x20000 #define CONFIG_SYS_MEMTEST_START 0x400 #define CONFIG_SYS_MEMTEST_END 0x380000 diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h index 38e785c0682..1babb72fd0e 100644 --- a/include/configs/M5275EVB.h +++ b/include/configs/M5275EVB.h @@ -46,9 +46,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* Available command configuration */ @@ -87,8 +84,6 @@ #define CONFIG_SYS_I2C_PINMUX_CLR (0xFFF0) #define CONFIG_SYS_I2C_PINMUX_SET (0x000F) -#define CONFIG_SYS_LONGHELP /* undef to save memory */ - #define CONFIG_SYS_LOAD_ADDR 0x800000 #define CONFIG_BOOTCOMMAND "bootm ffe40000" diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index 38864693b64..b29515077a1 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -38,9 +38,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* * Command line configuration. @@ -88,8 +85,6 @@ "save\0" \ "" -#define CONFIG_SYS_LONGHELP /* undef to save memory */ - #define CONFIG_SYS_LOAD_ADDR 0x20000 #define CONFIG_SYS_MEMTEST_START 0x400 diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index b4d12e2f60d..96fb87bc7c7 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -95,7 +95,6 @@ "" #define CONFIG_PRAM 512 /* 512 KB */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_LOAD_ADDR 0x40010000 diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index 0a69395fcbe..5a994859f11 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -87,7 +87,6 @@ "" #define CONFIG_PRAM 512 /* 512 KB */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_LOAD_ADDR 0x40010000 diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index ecf2abc3c85..7b2d1bb398c 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -87,7 +87,6 @@ "" #define CONFIG_PRAM 512 /* 512 KB */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_LOAD_ADDR 0x40010000 diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h index fbd725839fc..ba9ba006986 100644 --- a/include/configs/M54418TWR.h +++ b/include/configs/M54418TWR.h @@ -33,9 +33,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* * NAND FLASH @@ -176,8 +173,6 @@ #define CONFIG_PRAM 2048 /* 2048 KB */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ - #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x10000) #define CONFIG_SYS_MBAR 0xFC000000 diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h index f2b133cad20..b144332b226 100644 --- a/include/configs/M54451EVB.h +++ b/include/configs/M54451EVB.h @@ -33,9 +33,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* Network configuration */ #define CONFIG_MCFFEC @@ -141,8 +138,6 @@ #define CONFIG_PRAM 2048 /* 2048 KB */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ - #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */ #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x10000) diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index ad88c6b9045..14dd2a516e9 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -33,9 +33,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* Network configuration */ #define CONFIG_MCFFEC @@ -191,8 +188,6 @@ #define CONFIG_PRAM 2048 /* 2048 KB */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ - #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x10000) #define CONFIG_SYS_MBAR 0xFC000000 diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h index 3da7e2a4103..566f24e3b12 100644 --- a/include/configs/M5475EVB.h +++ b/include/configs/M5475EVB.h @@ -124,7 +124,6 @@ "" #define CONFIG_PRAM 512 /* 512 KB */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_LOAD_ADDR 0x00010000 diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h index 2b26f0fe85f..31564748bc8 100644 --- a/include/configs/M5485EVB.h +++ b/include/configs/M5485EVB.h @@ -112,7 +112,6 @@ "" #define CONFIG_PRAM 512 /* 512 KB */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_LOAD_ADDR 0x00010000 diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h index 9d2c4864195..6b03873ce87 100644 --- a/include/configs/MCR3000.h +++ b/include/configs/MCR3000.h @@ -69,9 +69,7 @@ #define CONFIG_WATCHDOG 1 /* watchdog enabled */ /* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING 1 #ifdef CONFIG_HUSH_PARSER #define CONFIG_SYS_PROMPT_HUSH_PS2 "S3K> " #endif diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h index c079afe8a07..0f94d4da07b 100644 --- a/include/configs/MPC8308RDB.h +++ b/include/configs/MPC8308RDB.h @@ -405,20 +405,14 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* * Command line configuration. */ -#define CONFIG_CMDLINE_EDITING 1 /* add command line history */ - /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index a67688469a9..a1b5ad62072 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -448,21 +448,14 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* * Command line configuration. */ -#define CONFIG_CMDLINE_EDITING 1 -#define CONFIG_AUTO_COMPLETE /* add autocompletion support */ - /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index 4699a7da215..b0dade59ed4 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -425,23 +425,16 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* * Command line configuration. */ -#define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_AUTO_COMPLETE /* add autocompletion support */ - #undef CONFIG_WATCHDOG /* watchdog disabled */ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index fad0bdb56c4..b00306f1b3d 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -216,9 +216,6 @@ #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR+0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR+0x4600) -#define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_AUTO_COMPLETE /* add autocompletion support */ - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL @@ -309,9 +306,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* * Command line configuration. @@ -322,7 +316,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h index 28dbd03e1c6..0892000ba5b 100644 --- a/include/configs/MPC832XEMDS.h +++ b/include/configs/MPC832XEMDS.h @@ -297,9 +297,6 @@ #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR+0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR+0x4600) -#define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_AUTO_COMPLETE /* add autocompletion support */ - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL @@ -393,9 +390,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* * Command line configuration. @@ -406,7 +400,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index a95f45c7315..c496b231044 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -315,9 +315,6 @@ #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR+0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR+0x4600) -#define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_AUTO_COMPLETE /* add autocompletion support */ - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL @@ -450,9 +447,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* * Command line configuration. @@ -463,7 +457,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index c13e4a649a8..37dcde37594 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -462,9 +462,6 @@ boards, we say we have two, but don't display a message if we find only one. */ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* Watchdog */ #undef CONFIG_WATCHDOG /* watchdog disabled */ @@ -472,9 +469,6 @@ boards, we say we have two, but don't display a message if we find only one. */ /* * Miscellaneous configurable options */ -#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_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 cc960a59893..182f55843ff 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -452,17 +452,11 @@ extern int board_pci_host_broken(void); * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* * Command line configuration. */ -#define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_AUTO_COMPLETE /* add autocompletion support */ - #undef CONFIG_WATCHDOG /* watchdog disabled */ #ifdef CONFIG_MMC @@ -474,7 +468,6 @@ extern int board_pci_host_broken(void); /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index cdcae66153f..772ce6d4a8a 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -466,17 +466,11 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* * Command line configuration. */ -#define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_AUTO_COMPLETE /* add autocompletion support */ - #undef CONFIG_WATCHDOG /* watchdog disabled */ #ifdef CONFIG_MMC @@ -488,7 +482,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 0a6bdcf907b..9f0039c5495 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -589,9 +589,6 @@ /* * Miscellaneous configurable options */ -#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_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index 8da6c14ae57..d44de9abdbd 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -305,9 +305,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* * Command line configuration. @@ -318,9 +315,6 @@ /* * Miscellaneous configurable options */ -#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_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index acf6339f411..238dd67f0b8 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -332,18 +332,12 @@ extern unsigned long get_clock_freq(void); * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME #undef CONFIG_WATCHDOG /* watchdog disabled */ /* * Miscellaneous configurable options */ -#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_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index 5184d6d8f56..64e0aa1ca6f 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -331,9 +331,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* * USB @@ -349,9 +346,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Miscellaneous configurable options */ -#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_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index edc0331be5d..cdd70a1d904 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -448,18 +448,12 @@ extern unsigned long get_clock_freq(void); * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME #undef CONFIG_WATCHDOG /* watchdog disabled */ /* * Miscellaneous configurable options */ -#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_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index 13e0b9cc03e..bcef1e71be1 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -330,18 +330,12 @@ extern unsigned long get_clock_freq(void); * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME #undef CONFIG_WATCHDOG /* watchdog disabled */ /* * Miscellaneous configurable options */ -#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_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index f0d7a594643..7f854c524fe 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -344,18 +344,12 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME #undef CONFIG_WATCHDOG /* watchdog disabled */ /* * Miscellaneous configurable options */ -#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_LOAD_ADDR 0x1000000 /* default load address */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */ diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index abcba5ede20..6d9a964ca77 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -345,18 +345,12 @@ extern unsigned long get_clock_freq(void); * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME #undef CONFIG_WATCHDOG /* watchdog disabled */ /* * Miscellaneous configurable options */ -#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_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index a7eccb45017..ae92c37fe5b 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -435,9 +435,6 @@ extern unsigned long get_clock_freq(void); * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME #undef CONFIG_WATCHDOG /* watchdog disabled */ @@ -450,9 +447,6 @@ extern unsigned long get_clock_freq(void); /* * Miscellaneous configurable options */ -#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_LOAD_ADDR 0x2000000 /* default load address */ #if defined(CONFIG_CMD_KGDB) #define CONFIG_SYS_CBSIZE 2048 /* Console I/O Buffer Size */ diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 6d7da854945..303922a6c3c 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -547,9 +547,6 @@ /* * Miscellaneous configurable options */ -#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_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 3eaa4630f81..fb5dc9a5168 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -410,9 +410,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* * Command line configuration. @@ -424,8 +421,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_CMDLINE_EDITING /* Command-line editing */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index cad73e06e75..954896c1c0b 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -573,17 +573,12 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME #undef CONFIG_WATCHDOG /* watchdog disabled */ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_CMDLINE_EDITING /* Command-line editing */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h index 32820696912..84c364ce533 100644 --- a/include/configs/MigoR.h +++ b/include/configs/MigoR.h @@ -23,7 +23,6 @@ #define MIGO_R_FLASH_BASE_1 (0xA0000000) #define MIGO_R_FLASH_BANK_SIZE (64 * 1024 * 1024) -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_PBSIZE 256 /* Buffer size for Console output */ #define CONFIG_SYS_BAUDRATE_TABLE { 115200 } /* List of legal baudrate settings for this board */ diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index c0b04d98859..344d99d25e5 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -700,9 +700,6 @@ extern unsigned long get_sdram_size(void); /* * Miscellaneous configurable options */ -#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_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 1e2dddfea66..62165dfef7a 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -573,9 +573,6 @@ /* * Miscellaneous configurable options */ -#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_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h index a2387c1cc0d..8dbfb06343e 100644 --- a/include/configs/P1023RDB.h +++ b/include/configs/P1023RDB.h @@ -244,8 +244,6 @@ extern unsigned long get_clock_freq(void); /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_CMDLINE_EDITING /* Command-line editing */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index ad79afbdc02..bf9b1c483f5 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -581,9 +581,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); /* * Miscellaneous configurable options */ -#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_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 1c74bd6ed04..8001e7002fd 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -753,9 +753,6 @@ unsigned long get_board_ddr_clk(void); /* * Miscellaneous configurable options */ -#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_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 2841c658bdb..e80ba14bd64 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -767,9 +767,6 @@ unsigned long get_board_ddr_clk(void); /* * Miscellaneous configurable options */ -#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_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index d9af65000d8..c0a1bb44c51 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -633,9 +633,6 @@ unsigned long get_board_ddr_clk(void); /* * Miscellaneous configurable options */ -#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_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 7c855f24bc0..a8f78858217 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -754,9 +754,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg /* * Miscellaneous configurable options */ -#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_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index e018b39e7fe..50413eb2476 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -719,9 +719,6 @@ unsigned long get_board_ddr_clk(void); /* * Miscellaneous configurable options */ -#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_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 7aa69d2b8e1..ca1916afe73 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -666,9 +666,6 @@ unsigned long get_board_ddr_clk(void); /* * Miscellaneous configurable options */ -#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_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 29c02c343c5..87d65e4c040 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -262,9 +262,6 @@ /* * Miscellaneous configurable options */ -#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_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index c5c2047b2d9..f4d8012b25a 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -257,19 +257,12 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ -#define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_AUTO_COMPLETE /* add autocompletion support */ - #undef CONFIG_WATCHDOG /* watchdog disabled */ /* diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 0e334124ea2..499319f7d75 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -430,8 +430,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_CMDLINE_EDITING /* Command-line editing */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ #define CONFIG_SYS_HZ 1000 /* decrementer freq: 1ms tick */ diff --git a/include/configs/adp-ae3xx.h b/include/configs/adp-ae3xx.h index 218358b7359..f95b1ff6e3c 100644 --- a/include/configs/adp-ae3xx.h +++ b/include/configs/adp-ae3xx.h @@ -20,8 +20,6 @@ #define CONFIG_SKIP_TRUNOFF_WATCHDOG -#define CONFIG_CMDLINE_EDITING - #define CONFIG_ARCH_MAP_SYSMEM #define CONFIG_BOOTP_SEND_HOSTNAME @@ -92,7 +90,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ /* * Size of malloc() pool diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h index 12808b4f1bf..fb5fa21c631 100644 --- a/include/configs/adp-ag101p.h +++ b/include/configs/adp-ag101p.h @@ -18,8 +18,6 @@ #define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_CMDLINE_EDITING - #define CONFIG_ARCH_MAP_SYSMEM #define CONFIG_BOOTP_SEND_HOSTNAME @@ -94,7 +92,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ /* * Size of malloc() pool diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h index e7fb60b6605..aba2fc6c3f0 100644 --- a/include/configs/advantech_dms-ba16.h +++ b/include/configs/advantech_dms-ba16.h @@ -199,8 +199,6 @@ #define CONFIG_ARP_TIMEOUT 200UL /* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END 0x10010000 @@ -208,8 +206,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_CMDLINE_EDITING - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index 699afd6e083..55e803bc9f2 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -65,7 +65,6 @@ # define CONFIG_RESET_TO_RETRY #endif -#define CONFIG_ENV_VARS_UBOOT_CONFIG #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #ifndef CONFIG_SPL_BUILD @@ -256,11 +255,8 @@ #define CONFIG_DRIVER_TI_CPSW #define CONFIG_MII #define CONFIG_BOOTP_DEFAULT -#define CONFIG_BOOTP_DNS #define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_SUBNETMASK #define CONFIG_NET_RETRY_COUNT 10 #define CONFIG_PHY_ADDR 0 #define CONFIG_PHY_SMSC diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index b220b53acdc..03b7c265a0a 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -155,11 +155,9 @@ "fi; " \ "else run nandboot; fi" -#define CONFIG_AUTO_COMPLETE 1 /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ #define CONFIG_SYS_MAXARGS 32 /* max number of command */ /* args */ diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 031ae3478c0..214d9c54c2b 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -61,7 +61,6 @@ #define CONFIG_DRIVER_TI_EMAC_USE_RMII #define CONFIG_MII #define CONFIG_BOOTP_DEFAULT -#define CONFIG_BOOTP_DNS #define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 10 @@ -170,9 +169,6 @@ "else run nandboot; fi" /* Miscellaneous configurable options */ -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_LONGHELP /* We set the max number of command args high to avoid HUSH bugs. */ #define CONFIG_SYS_MAXARGS 64 diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 726dbba74d7..a0d2b36d998 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -216,11 +216,8 @@ /* CPSW Ethernet */ #define CONFIG_MII #define CONFIG_BOOTP_DEFAULT -#define CONFIG_BOOTP_DNS #define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_SUBNETMASK #define CONFIG_NET_RETRY_COUNT 10 #endif diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index 65465d1f790..c079a3ace07 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -75,11 +75,8 @@ #define CONFIG_HSMMC2_8BIT /* CPSW Ethernet */ -#define CONFIG_BOOTP_DNS /* Configurable parts of CMD_DHCP */ #define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_SUBNETMASK #define CONFIG_NET_RETRY_COUNT 10 #define CONFIG_DRIVER_TI_CPSW /* Driver for IP block */ #define CONFIG_MII /* Required in net/eth.c */ diff --git a/include/configs/amcore.h b/include/configs/amcore.h index b9fc5b5d084..569fd982b62 100644 --- a/include/configs/amcore.h +++ b/include/configs/amcore.h @@ -30,9 +30,7 @@ "cp.b 0x20000 0xfff00000 ${filesize}\0" /* undef to save memory */ -#undef CONFIG_SYS_LONGHELP -#define CONFIG_AUTO_COMPLETE 1 /* add autocompletion support */ #define CONFIG_MX_CYCLIC 1 /* enable mdc/mwc commands */ #define CONFIG_SYS_LOAD_ADDR 0x20000 /* default load address */ diff --git a/include/configs/ap121.h b/include/configs/ap121.h index 251d2583e28..e1a192d8f39 100644 --- a/include/configs/ap121.h +++ b/include/configs/ap121.h @@ -37,9 +37,6 @@ #define CONFIG_ENV_SIZE 0x10000 /* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING -#define CONFIG_AUTO_COMPLETE /* * Diagnostics diff --git a/include/configs/ap143.h b/include/configs/ap143.h index cfea0b2039f..94b5332147d 100644 --- a/include/configs/ap143.h +++ b/include/configs/ap143.h @@ -41,9 +41,6 @@ #define CONFIG_ENV_SIZE 0x10000 /* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING -#define CONFIG_AUTO_COMPLETE /* * Diagnostics diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h index cebf27b0df1..b7498262232 100644 --- a/include/configs/ap325rxa.h +++ b/include/configs/ap325rxa.h @@ -21,7 +21,6 @@ #define AP325RXA_FLASH_BANK_SIZE (128 * 1024 * 1024) /* undef to save memory */ -#define CONFIG_SYS_LONGHELP /* Monitor Command Prompt */ /* Buffer size for Console output */ #define CONFIG_SYS_PBSIZE 256 diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h index 7eba319bfac..d46a588a8d4 100644 --- a/include/configs/ap_sh4a_4a.h +++ b/include/configs/ap_sh4a_4a.h @@ -24,7 +24,6 @@ #define CONFIG_BITBANGMII_MULTI /* undef to save memory */ -#define CONFIG_SYS_LONGHELP /* Monitor Command Prompt */ /* Buffer size for Console output */ #define CONFIG_SYS_PBSIZE 256 diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index c13e446fcec..5f53a525116 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -147,7 +147,6 @@ #define CONFIG_CMD_TIME -#define CONFIG_SUPPORT_RAW_INITRD #define CONFIG_SYS_BOOT_RAMDISK_HIGH #include "tegra-common-usb-gadget.h" diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 5be9cebe4a0..21a79e1662a 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -41,7 +41,6 @@ /* Make the HW version stuff available in U-Boot env */ #define CONFIG_VERSION_VARIABLE /* ver environment variable */ -#define CONFIG_ENV_VARS_UBOOT_CONFIG #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG /* I2C Configs */ @@ -250,8 +249,6 @@ "fbmem=32M\0 " /* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_AUTO_COMPLETE #undef CONFIG_SYS_CBSIZE #define CONFIG_SYS_CBSIZE 1024 #undef CONFIG_SYS_MAXARGS @@ -264,8 +261,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_CMDLINE_EDITING - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR @@ -295,6 +290,4 @@ #define CONFIG_CMD_TIME -#define CONFIG_SUPPORT_RAW_INITRD - #endif /* __CONFIG_H */ diff --git a/include/configs/apf27.h b/include/configs/apf27.h index d95da27287e..6b47f4a660b 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -39,12 +39,7 @@ /* * BOOTP options */ -#define CONFIG_BOOTP_SUBNETMASK -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME -#define CONFIG_BOOTP_BOOTPATH #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_DNS #define CONFIG_BOOTP_DNS2 #define CONFIG_HOSTNAME CONFIG_BOARD_NAME @@ -88,13 +83,9 @@ /* * U-Boot general configurations */ -#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_CBSIZE 2048 /* console I/O buffer */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot argument buffer size */ -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING -#define CONFIG_ENV_VARS_UBOOT_CONFIG #define CONFIG_PREBOOT "run check_flash check_env;" /* diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index 52a5aa4a857..9aca91a18e6 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -33,7 +33,6 @@ #define ARMADILLO_800EVA_SDRAM_BASE 0x40000000 #define ARMADILLO_800EVA_SDRAM_SIZE (512 * 1024 * 1024) -#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_PBSIZE 256 #define CONFIG_SYS_BAUDRATE_TABLE { 115200 } diff --git a/include/configs/aspeed-common.h b/include/configs/aspeed-common.h index 1e182a140e0..f219349ae9c 100644 --- a/include/configs/aspeed-common.h +++ b/include/configs/aspeed-common.h @@ -16,8 +16,6 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG -#define CONFIG_CMDLINE_EDITING - /* Enable cache controller */ #define CONFIG_SYS_DCACHE_OFF @@ -48,15 +46,10 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME -#define CONFIG_BOOTP_SUBNETMASK /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP #define CONFIG_BOOTCOMMAND "bootm 20080000 20300000" #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index f3a869301fd..8b883ddd62c 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -53,8 +53,6 @@ #define ENABLE_JFFS 1 #endif -#define CONFIG_CMDLINE_EDITING - #define CONFIG_MCFRTC #undef RTC_DEBUG @@ -172,8 +170,6 @@ /* default RAM address for user programs */ #define CONFIG_SYS_LOAD_ADDR 0x20000 -#define CONFIG_SYS_LONGHELP - #define CONFIG_FPGA_COUNT 1 #define CONFIG_FPGA_SPARTAN3 #define CONFIG_SYS_FPGA_PROG_FEEDBACK diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h index ed46e89fd55..8e1334284a4 100644 --- a/include/configs/at91-sama5_common.h +++ b/include/configs/at91-sama5_common.h @@ -20,8 +20,6 @@ #define CONFIG_SKIP_LOWLEVEL_INIT #endif -#define CONFIG_ENV_VARS_UBOOT_CONFIG - /* general purpose I/O */ #ifndef CONFIG_DM_GPIO #define CONFIG_AT91_GPIO @@ -32,9 +30,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* * Command line configuration. @@ -82,10 +77,6 @@ #endif -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING -#define CONFIG_AUTO_COMPLETE - /* 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 325dcfc45df..9ce0a8f9bf5 100644 --- a/include/configs/at91rm9200ek.h +++ b/include/configs/at91rm9200ek.h @@ -168,9 +168,6 @@ /* * Shell Settings */ -#define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_LONGHELP -#define CONFIG_AUTO_COMPLETE /* * Size of malloc() pool diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index 1f213253749..912abd50b33 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -49,9 +49,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE 1 -#define CONFIG_BOOTP_BOOTPATH 1 -#define CONFIG_BOOTP_GATEWAY 1 -#define CONFIG_BOOTP_HOSTNAME 1 /* * SDRAM: 1 bank, min 32, max 128 MB @@ -158,10 +155,6 @@ "fatload mmc 0:1 0x22000000 uImage; bootm" #endif -#define CONFIG_SYS_LONGHELP 1 -#define CONFIG_CMDLINE_EDITING 1 -#define CONFIG_AUTO_COMPLETE - /* * Size of malloc() pool */ diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index b685268e9a7..6f3f2eb882d 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -50,9 +50,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 @@ -135,10 +132,6 @@ #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0x200000 0x300000; bootm" #endif -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING -#define CONFIG_AUTO_COMPLETE - /* * Size of malloc() pool */ diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index 20825191958..b6691feb681 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -53,9 +53,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE 1 -#define CONFIG_BOOTP_BOOTPATH 1 -#define CONFIG_BOOTP_GATEWAY 1 -#define CONFIG_BOOTP_HOSTNAME 1 /* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 @@ -246,10 +243,6 @@ #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0x200000 0x300000; bootm" #endif -#define CONFIG_SYS_LONGHELP 1 -#define CONFIG_CMDLINE_EDITING 1 -#define CONFIG_AUTO_COMPLETE - /* * Size of malloc() pool */ diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 0be8d0f702d..d93cdafb146 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -42,9 +42,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 @@ -96,10 +93,6 @@ "bootz 0x72000000 - 0x71000000" #endif -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING -#define CONFIG_AUTO_COMPLETE - /* * Size of malloc() pool */ diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index 8094f7e12ae..0758902fe61 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -33,9 +33,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME #define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x20000000 @@ -145,10 +142,6 @@ #endif -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING -#define CONFIG_AUTO_COMPLETE - /* * Size of malloc() pool */ diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 9d7aad5369d..08c8f48bb58 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -105,10 +105,6 @@ "bootz 0x22000000 - 0x21000000" #endif -#define CONFIG_SYS_LONGHELP 1 -#define CONFIG_CMDLINE_EDITING 1 -#define CONFIG_AUTO_COMPLETE - /* * Size of malloc() pool */ diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 3aeb1a59445..95e327aa658 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -25,9 +25,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* * define CONFIG_USB_EHCI_HCD to enable USB Hi-Speed (aka 2.0) @@ -119,10 +116,6 @@ #define CONFIG_ENV_SIZE 0x4000 #endif -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING -#define CONFIG_AUTO_COMPLETE - /* * Size of malloc() pool */ diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h index a9c4d1ab236..5f11f42e327 100644 --- a/include/configs/axs10x.h +++ b/include/configs/axs10x.h @@ -62,9 +62,6 @@ #define CONFIG_USB_OHCI_NEW #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1 -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING - /* * Environment settings */ @@ -79,7 +76,6 @@ /* * Console configuration */ -#define CONFIG_SYS_LONGHELP /* * Misc utility configuration diff --git a/include/configs/bcm23550_w1d.h b/include/configs/bcm23550_w1d.h index 430bd3bd8b5..9c23c9b56f8 100644 --- a/include/configs/bcm23550_w1d.h +++ b/include/configs/bcm23550_w1d.h @@ -96,9 +96,6 @@ */ /* version string, parser, etc */ -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_LONGHELP #define CONFIG_MX_CYCLIC diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h index f00ce2e6473..bd6d9aef0a4 100644 --- a/include/configs/bcm28155_ap.h +++ b/include/configs/bcm28155_ap.h @@ -95,9 +95,6 @@ */ /* version string, parser, etc */ -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_LONGHELP #define CONFIG_MX_CYCLIC diff --git a/include/configs/bcm_ep_board.h b/include/configs/bcm_ep_board.h index fd893e6b10c..ed3c4279615 100644 --- a/include/configs/bcm_ep_board.h +++ b/include/configs/bcm_ep_board.h @@ -53,9 +53,6 @@ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* version string, parser, etc */ -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_LONGHELP #define CONFIG_MX_CYCLIC diff --git a/include/configs/bcm_northstar2.h b/include/configs/bcm_northstar2.h index 6265eccc204..634186a2dc4 100644 --- a/include/configs/bcm_northstar2.h +++ b/include/configs/bcm_northstar2.h @@ -44,7 +44,5 @@ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* version string, parser, etc */ -#define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_LONGHELP #endif /* __BCM_NORTHSTAR2_H */ diff --git a/include/configs/boston.h b/include/configs/boston.h index fdd5ef5632d..9e841574f76 100644 --- a/include/configs/boston.h +++ b/include/configs/boston.h @@ -44,7 +44,6 @@ /* * Console */ -#define CONFIG_SYS_LONGHELP /* * Flash diff --git a/include/configs/bur_cfg_common.h b/include/configs/bur_cfg_common.h index f90542c9fd5..a832b2b2544 100644 --- a/include/configs/bur_cfg_common.h +++ b/include/configs/bur_cfg_common.h @@ -27,10 +27,7 @@ #define CONFIG_PREBOOT "run cfgscr; run brdefaultip" /* Network defines */ -#define CONFIG_BOOTP_DNS /* Configurable parts of CMD_DHCP */ #define CONFIG_BOOTP_SEND_HOSTNAME -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_SUBNETMASK #define CONFIG_NET_RETRY_COUNT 10 /* Network console */ @@ -40,9 +37,6 @@ #define CONFIG_ENV_OVERWRITE /* Overwrite ethaddr / serial# */ /* As stated above, the following choices are optional. */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING /* We set the max number of command args high to avoid HUSH bugs. */ #define CONFIG_SYS_MAXARGS 64 diff --git a/include/configs/calimain.h b/include/configs/calimain.h index 4c476179eb0..854dc1ffedf 100644 --- a/include/configs/calimain.h +++ b/include/configs/calimain.h @@ -157,7 +157,6 @@ */ #ifdef CONFIG_DRIVER_TI_EMAC #define CONFIG_MII -#define CONFIG_BOOTP_DNS #define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 10 @@ -171,9 +170,6 @@ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */ #define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000) #define CONFIG_LOADADDR 0xc0700000 -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_LONGHELP #define CONFIG_MX_CYCLIC /* diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h index 4f64672bafe..eaf2754285b 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -86,14 +86,11 @@ #define CONFIG_MII #define CONFIG_BOOTP_DEFAULT #define CONFIG_BOOTP_SEND_HOSTNAME -#define CONFIG_BOOTP_GATEWAY #define CONFIG_PHY_ATHEROS #define CONFIG_SYS_RX_ETH_BUFFER 64 #define PHY_ANEG_TIMEOUT 8000 -#define CONFIG_BOOTP_DNS #define CONFIG_BOOTP_DNS2 -#define CONFIG_BOOTP_SUBNETMASK #define CONFIG_NET_RETRY_COUNT 10 /* Default environment */ diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 4667ee4ebd1..400edf0bfc9 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -156,11 +156,8 @@ /* * Miscellaneous configurable options */ -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING #define CONFIG_TIMESTAMP #define CONFIG_SYS_AUTOLOAD "no" -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_MEMTEST_START (OMAP34XX_SDRC_CS0) /* memtest */ /* works on */ diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index 6fcb545304b..19117a0af41 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -159,11 +159,8 @@ /* * Miscellaneous configurable options */ -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING #define CONFIG_TIMESTAMP #define CONFIG_SYS_AUTOLOAD "no" -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ #define CONFIG_SYS_MAXARGS 32 /* max number of command args */ diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index a564b86c8c3..1b057ef8eb2 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -49,7 +49,6 @@ #define CONFIG_MII #define CONFIG_BOOTP_DEFAULT #define CONFIG_BOOTP_SEND_HOSTNAME -#define CONFIG_BOOTP_GATEWAY #define CONFIG_PHY_ATHEROS #define CONFIG_SYS_RX_ETH_BUFFER 64 diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h index 442f8e002f4..ee870f916f5 100644 --- a/include/configs/cobra5272.h +++ b/include/configs/cobra5272.h @@ -109,9 +109,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* * Command line configuration. @@ -167,8 +164,6 @@ from which user programs will be started */ /*---*/ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ - /* *----------------------------------------------------------------------------- * End of user parameters to be customized diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 1e218482ee9..b810384ce06 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -39,7 +39,6 @@ /* Make the HW version stuff available in U-Boot env */ #define CONFIG_VERSION_VARIABLE /* ver environment variable */ -#define CONFIG_ENV_VARS_UBOOT_CONFIG #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG /* I2C Configs */ @@ -225,8 +224,6 @@ "video=mxcfb1:off fbmem=8M\0 " /* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_AUTO_COMPLETE #undef CONFIG_SYS_CBSIZE #define CONFIG_SYS_CBSIZE 1024 #undef CONFIG_SYS_MAXARGS @@ -239,8 +236,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_CMDLINE_EDITING - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR @@ -269,6 +264,4 @@ #define CONFIG_CMD_TIME -#define CONFIG_SUPPORT_RAW_INITRD - #endif /* __CONFIG_H */ diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 5d9b2126323..27f44acde6e 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -19,7 +19,6 @@ #define CONFIG_DISPLAY_BOARDINFO_LATE /* Calls show_board_info() */ -#define CONFIG_ENV_VARS_UBOOT_CONFIG #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG /* Size of malloc() pool */ @@ -124,7 +123,6 @@ "updlevel=2\0" /* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x0c000000) diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h index f3d15611609..484483da586 100644 --- a/include/configs/colibri_pxa270.h +++ b/include/configs/colibri_pxa270.h @@ -26,7 +26,6 @@ * Environment settings */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_ENV_VARS_UBOOT_CONFIG #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_SYS_MALLOC_LEN (128 * 1024) #define CONFIG_ARCH_CPU_INIT @@ -77,15 +76,9 @@ #define CONFIG_NET_RETRY_COUNT 10 #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME #endif -#undef CONFIG_SYS_LONGHELP /* Saves 10 KB */ #define CONFIG_SYS_DEVICE_NULLDEV 1 -#undef CONFIG_CMDLINE_EDITING /* Saves 2.5 KB */ -#undef CONFIG_AUTO_COMPLETE /* Saves 2.5 KB */ /* * Clock Configuration diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 6d7682b8773..1078480f095 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -39,7 +39,6 @@ /* Allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_ENV_VARS_UBOOT_CONFIG #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG /* NAND support */ @@ -131,8 +130,6 @@ UBI_BOOTCMD /* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#undef CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE @@ -141,7 +138,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 -#define CONFIG_CMDLINE_EDITING /* Physical memory map */ #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/comtrend_ar5315u.h b/include/configs/comtrend_ar5315u.h index 3fda2d9b3a1..b008682d852 100644 --- a/include/configs/comtrend_ar5315u.h +++ b/include/configs/comtrend_ar5315u.h @@ -11,6 +11,3 @@ #define CONFIG_ENV_SIZE (8 * 1024) -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_LONGHELP diff --git a/include/configs/comtrend_ar5387un.h b/include/configs/comtrend_ar5387un.h index 99630c08229..790cb245dd9 100644 --- a/include/configs/comtrend_ar5387un.h +++ b/include/configs/comtrend_ar5387un.h @@ -11,6 +11,3 @@ #define CONFIG_ENV_SIZE (8 * 1024) -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_LONGHELP diff --git a/include/configs/comtrend_ct5361.h b/include/configs/comtrend_ct5361.h index 94ec498af1f..7923e63f8f7 100644 --- a/include/configs/comtrend_ct5361.h +++ b/include/configs/comtrend_ct5361.h @@ -11,9 +11,5 @@ #define CONFIG_ENV_SIZE (8 * 1024) -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_LONGHELP - #define CONFIG_SYS_FLASH_CFI 1 #define CONFIG_FLASH_CFI_DRIVER 1 diff --git a/include/configs/comtrend_vr3032u.h b/include/configs/comtrend_vr3032u.h index 6d46041af6d..152faa9525f 100644 --- a/include/configs/comtrend_vr3032u.h +++ b/include/configs/comtrend_vr3032u.h @@ -11,6 +11,3 @@ #define CONFIG_ENV_SIZE (8 * 1024) -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_LONGHELP diff --git a/include/configs/comtrend_wap5813n.h b/include/configs/comtrend_wap5813n.h index 2eafb816c99..addd75e8917 100644 --- a/include/configs/comtrend_wap5813n.h +++ b/include/configs/comtrend_wap5813n.h @@ -11,9 +11,5 @@ #define CONFIG_ENV_SIZE (8 * 1024) -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_LONGHELP - #define CONFIG_SYS_FLASH_CFI 1 #define CONFIG_FLASH_CFI_DRIVER 1 diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index dd842c932aa..276c7333bb4 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -311,11 +311,6 @@ /* * Command line configuration. */ -#ifndef CONFIG_TRAILBLAZER -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING /* Command-line editing */ -#define CONFIG_AUTO_COMPLETE /* add autocompletion support */ -#endif /* CONFIG_TRAILBLAZER */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 6067acd4fad..83c26424576 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -590,9 +590,6 @@ /* * Miscellaneous configurable options */ -#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_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/corvus.h b/include/configs/corvus.h index 71de980008a..2c6a1bf6651 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -54,9 +54,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 @@ -104,10 +101,6 @@ "nand read 0x70000000 0x200000 0x300000;" \ "bootm 0x70000000" -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING -#define CONFIG_AUTO_COMPLETE - /* * Size of malloc() pool */ diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index 1909e1b18ec..dde0dc3662c 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -413,9 +413,6 @@ /* * Miscellaneous configurable options */ -#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_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index c6f9c930a42..a58a54e3cec 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -200,7 +200,6 @@ */ #ifdef CONFIG_DRIVER_TI_EMAC #define CONFIG_MII -#define CONFIG_BOOTP_DNS #define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 10 @@ -240,9 +239,6 @@ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */ #define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000) -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_LONGHELP #define CONFIG_MX_CYCLIC /* diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h index 1f0c11c310a..ebd2c239608 100644 --- a/include/configs/dbau1x00.h +++ b/include/configs/dbau1x00.h @@ -58,9 +58,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* * Command line configuration. @@ -69,7 +66,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_MALLOC_LEN 128*1024 diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 49b4748a706..40dee673871 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -116,13 +116,9 @@ /* * U-Boot General Configurations */ -#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING - /* * Pass open firmware flat tree */ diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 8cd307b7182..dfbbb21a04c 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -77,16 +77,9 @@ #define CONFIG_JFFS2_PART_SIZE 0xf980000 /* size of jffs2 */ /* partition */ -#undef CONFIG_SUPPORT_RAW_INITRD - /* BOOTP/DHCP options */ -#define CONFIG_BOOTP_SUBNETMASK -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME #define CONFIG_BOOTP_NISDOMAIN -#define CONFIG_BOOTP_BOOTPATH #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_DNS #define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_BOOTP_NTPSERVER diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index 464b8d72f48..98bb665b283 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -30,16 +30,12 @@ #define CONFIG_SPL_TARGET "u-boot-with-spl.imx" /* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG -#define CONFIG_SUPPORT_RAW_INITRD /* bootz raw initrd support */ #define CONFIG_BOUNCE_BUFFER #define CONFIG_BZIP2 diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 975e6fdf58b..e82de2a637b 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -94,11 +94,8 @@ #define CONFIG_HSMMC2_8BIT /* CPSW Ethernet */ -#define CONFIG_BOOTP_DNS /* Configurable parts of CMD_DHCP */ #define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_SUBNETMASK #define CONFIG_NET_RETRY_COUNT 10 #define CONFIG_DRIVER_TI_CPSW /* Driver for IP block */ #define CONFIG_MII /* Required in net/eth.c */ diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index 204e136c96f..dfeea601a00 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -97,7 +97,6 @@ REFLASH(dragonboard/u-boot.img, 8)\ #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_SYS_MMC_ENV_DEV 0 /* mmc0 = emmc, mmc1 = sd */ -#define CONFIG_ENV_VARS_UBOOT_CONFIG /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_8M) diff --git a/include/configs/dragonboard820c.h b/include/configs/dragonboard820c.h index 669cbac4152..5b14bbf54ff 100644 --- a/include/configs/dragonboard820c.h +++ b/include/configs/dragonboard820c.h @@ -57,7 +57,6 @@ BOOTENV #define CONFIG_ENV_SIZE 0x4000 -#define CONFIG_ENV_VARS_UBOOT_CONFIG /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_8M) diff --git a/include/configs/ea20.h b/include/configs/ea20.h index 3f0f731ddf0..d27323a5fbc 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -75,7 +75,6 @@ */ #ifdef CONFIG_DRIVER_TI_EMAC #define CONFIG_MII -#define CONFIG_BOOTP_DNS #define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 10 @@ -102,9 +101,6 @@ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */ #define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000) -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_LONGHELP #define CONFIG_MX_CYCLIC /* diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h index 17c7fa757eb..d79cbf7791a 100644 --- a/include/configs/eb_cpu5282.h +++ b/include/configs/eb_cpu5282.h @@ -48,19 +48,13 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* * Command line configuration. */ -#define CONFIG_CMDLINE_EDITING #define CONFIG_MCFTMR -#define CONFIG_SYS_LONGHELP 1 - #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE diff --git a/include/configs/eco5pk.h b/include/configs/eco5pk.h index a75932f20fa..3c4ec171fef 100644 --- a/include/configs/eco5pk.h +++ b/include/configs/eco5pk.h @@ -27,7 +27,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_ECO5_PK #define CONFIG_BOOTFILE "uImage" -#define CONFIG_AUTO_COMPLETE /* * Set its own mtdparts, different from common diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h index 07f04378433..991cee57f09 100644 --- a/include/configs/ecovec.h +++ b/include/configs/ecovec.h @@ -59,7 +59,6 @@ #define CONFIG_SUPERH_ON_CHIP_R8A66597 /* undef to save memory */ -#define CONFIG_SYS_LONGHELP /* Monitor Command Prompt */ /* Buffer size for Console output */ #define CONFIG_SYS_PBSIZE 256 diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h index cb8d0255426..6e024d1b2fd 100644 --- a/include/configs/edb93xx.h +++ b/include/configs/edb93xx.h @@ -76,7 +76,6 @@ /* Monitor configuration */ -#define CONFIG_SYS_LONGHELP /* Enable "long" help in mon */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */ /* Serial port hardware configuration */ diff --git a/include/configs/edison.h b/include/configs/edison.h index 79dd690e71e..dcfd311f25e 100644 --- a/include/configs/edison.h +++ b/include/configs/edison.h @@ -18,14 +18,11 @@ /* DISK Partition support */ /* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_CBSIZE 2048 #define CONFIG_SYS_MAXARGS 128 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_AUTO_COMPLETE - /* Memory */ #define CONFIG_SYS_LOAD_ADDR 0x100000 #define CONFIG_PHYSMEM diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index 63d07ba1fdd..b262b379be4 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -200,10 +200,8 @@ #define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Enable command line editing */ -#define CONFIG_CMDLINE_EDITING /* provide extensive help */ -#define CONFIG_SYS_LONGHELP /* additions for new relocation code, must be added to all boards */ #define CONFIG_SYS_SDRAM_BASE 0 diff --git a/include/configs/espt.h b/include/configs/espt.h index 9e268b10c15..ba90dcc2c30 100644 --- a/include/configs/espt.h +++ b/include/configs/espt.h @@ -21,7 +21,6 @@ /* SCIF */ #define CONFIG_CONS_SCIF0 1 -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_PBSIZE 256 /* Buffer size for Console output */ #define CONFIG_SYS_BAUDRATE_TABLE { 115200 } /* List of legal baudrate settings for this board */ diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index 54334163b0f..e93d0a12ebd 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -142,9 +142,6 @@ /* DHCP/BOOTP options */ #ifdef CONFIG_CMD_DHCP #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME #define CONFIG_SYS_AUTOLOAD "n" #endif @@ -161,7 +158,5 @@ "bootm 0x22000000" /* Misc. u-boot settings */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING #endif diff --git a/include/configs/flea3.h b/include/configs/flea3.h index 95a1260445f..067d8369c76 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -60,9 +60,6 @@ /* * Command definition */ -#define CONFIG_BOOTP_SUBNETMASK -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_DNS #define CONFIG_NET_RETRY_COUNT 100 @@ -83,10 +80,7 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_CMDLINE_EDITING -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ /* Print Buffer Size */ #define CONFIG_SYS_MAXARGS 32 /* max number of command args */ diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index 8dc0a7f4c72..110933f6880 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -176,8 +176,6 @@ #define CONFIG_ARP_TIMEOUT 200UL /* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END 0x10010000 @@ -185,8 +183,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_CMDLINE_EDITING - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/hikey.h b/include/configs/hikey.h index 594885d26e7..d603641204b 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -19,8 +19,6 @@ #define CONFIG_REMAKE_ELF -#define CONFIG_SUPPORT_RAW_INITRD - /* Physical Memory Map */ /* CONFIG_SYS_TEXT_BASE needs to align with where ATF loads bl33.bin */ @@ -94,12 +92,9 @@ /* Preserve environment on sd card */ #define CONFIG_ENV_SIZE 0x1000 -#define CONFIG_ENV_VARS_UBOOT_CONFIG /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_MAXARGS 64 /* max command args */ #endif /* __HIKEY_H */ diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index 3a561c39193..44910859cc6 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -508,13 +508,9 @@ void fpga_control_clear(unsigned int bus, int pin); * Command line configuration. */ -#define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_AUTO_COMPLETE /* add autocompletion support */ - /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ #define CONFIG_SYS_HZ 1000 /* decrementer freq: 1ms ticks */ diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h index e17b56e9bdf..fb4829ab468 100644 --- a/include/configs/hsdk.h +++ b/include/configs/hsdk.h @@ -70,9 +70,6 @@ /* * Console configuration */ -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_LONGHELP /* * Misc utility configuration diff --git a/include/configs/huawei_hg556a.h b/include/configs/huawei_hg556a.h index 6bd2d76f530..f9942190090 100644 --- a/include/configs/huawei_hg556a.h +++ b/include/configs/huawei_hg556a.h @@ -11,9 +11,5 @@ #define CONFIG_ENV_SIZE (8 * 1024) -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_LONGHELP - #define CONFIG_SYS_FLASH_CFI 1 #define CONFIG_FLASH_CFI_DRIVER 1 diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index 628e0a25a83..1769224c573 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -409,11 +409,6 @@ /* * U-Boot environment setup */ -#define CONFIG_CMDLINE_EDITING -#define CONFIG_BOOTP_SUBNETMASK -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME -#define CONFIG_BOOTP_BOOTPATH #define CONFIG_BOOTP_BOOTFILESIZE /* @@ -447,7 +442,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE diff --git a/include/configs/imgtec_xilfpga.h b/include/configs/imgtec_xilfpga.h index 4ae64bbcb7d..75bb98c3d33 100644 --- a/include/configs/imgtec_xilfpga.h +++ b/include/configs/imgtec_xilfpga.h @@ -40,7 +40,6 @@ /*---------------------------------------------------------------------- * Commands */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ /*------------------------------------------------------------ * Console Configuration diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index 751fa92df4f..dca910f23cd 100644 --- a/include/configs/imx27lite-common.h +++ b/include/configs/imx27lite-common.h @@ -135,8 +135,6 @@ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ /* Boot Argument Buffer Size */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_LONGHELP #define CONFIG_LOADADDR 0xa0800000 /* loadaddr env var */ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h index c5357244bd2..3b5eb4fa6cf 100644 --- a/include/configs/imx31_phycore.h +++ b/include/configs/imx31_phycore.h @@ -84,15 +84,12 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_MEMTEST_START 0 /* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0x10000 #define CONFIG_SYS_LOAD_ADDR 0 /* default load address */ -#define CONFIG_CMDLINE_EDITING - /* * Physical Memory Map */ diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h index b8959989d36..63aa8dffaf9 100644 --- a/include/configs/integrator-common.h +++ b/include/configs/integrator-common.h @@ -11,7 +11,6 @@ #define CONFIG_SYS_MEMTEST_END 0x10000000 #define CONFIG_SYS_TIMERBASE 0x13000100 /* Timer1 */ #define CONFIG_SYS_LOAD_ADDR 0x7fc0 /* default load address */ -#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) /* Size of malloc() pool */ #define CONFIG_CONS_INDEX 0 diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h index ceb909624d9..4669f39fc47 100644 --- a/include/configs/integratorap.h +++ b/include/configs/integratorap.h @@ -24,9 +24,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* * Command line configuration. diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index cb7986a77f2..82ab24c688b 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -166,7 +166,6 @@ #ifdef CONFIG_DRIVER_TI_EMAC #define CONFIG_DRIVER_TI_EMAC_USE_RMII #define CONFIG_BOOTP_DEFAULT -#define CONFIG_BOOTP_DNS #define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 10 @@ -180,9 +179,6 @@ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */ #define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000) -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_LONGHELP #define CONFIG_MX_CYCLIC /* diff --git a/include/configs/kc1.h b/include/configs/kc1.h index 717e0b51376..36387305853 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -87,10 +87,6 @@ * Console */ -#define CONFIG_AUTO_COMPLETE - -#define CONFIG_SYS_LONGHELP - #define CONFIG_SYS_CBSIZE 512 /* diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 740202b69b2..61890d3621e 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -13,7 +13,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #if defined(CONFIG_CMD_KGDB) #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #else @@ -21,8 +20,6 @@ #endif #define CONFIG_SYS_MAXARGS 32 /* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_CMDLINE_EDITING -#define CONFIG_AUTO_COMPLETE #define CONFIG_HUSH_INIT_VAR @@ -45,9 +42,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* UBI Support for all Keymile boards */ #define CONFIG_MTD_PARTITIONS diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index 7b8f29788d2..0d8de370dd9 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -39,7 +39,6 @@ #define CONFIG_SYS_MAX_FLASH_SECT (512) /* prompt */ -#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_PBSIZE 256 #define CONFIG_SYS_BAUDRATE_TABLE { 115200 } diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index 96db24791ed..1d3fd96491f 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -125,9 +125,6 @@ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */ #define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000) -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_LONGHELP #define CONFIG_MX_CYCLIC /* diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h index 9761690c10e..1e1fb77076a 100644 --- a/include/configs/liteboard.h +++ b/include/configs/liteboard.h @@ -112,8 +112,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 -#define CONFIG_CMDLINE_EDITING - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h index dd65bb541bb..d174782a415 100644 --- a/include/configs/ls1012a_common.h +++ b/include/configs/ls1012a_common.h @@ -13,8 +13,6 @@ #include <asm/arch/config.h> #include <asm/arch/stream_id_lsch2.h> -#define CONFIG_SUPPORT_RAW_INITRD - #define CONFIG_DISPLAY_BOARDINFO_LATE #define CONFIG_SYS_CLK_FREQ 125000000 @@ -122,8 +120,6 @@ /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_MAXARGS 64 /* max command args */ #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */ diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 58c71dffa56..20c50ff686b 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -195,7 +195,6 @@ #define CONFIG_CMD_MII #define CONFIG_CMDLINE_TAG -#define CONFIG_CMDLINE_EDITING #define CONFIG_PEN_ADDR_BIG_ENDIAN #define CONFIG_LAYERSCAPE_NS_ACCESS @@ -215,9 +214,7 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " -#define CONFIG_AUTO_COMPLETE #define CONFIG_CMD_GREPENV #define CONFIG_CMD_MEMINFO diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index b298ed69ac7..d1c0acb9cd3 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -447,7 +447,6 @@ unsigned long get_board_ddr_clk(void); #endif #define CONFIG_CMDLINE_TAG -#define CONFIG_CMDLINE_EDITING #define CONFIG_PEN_ADDR_BIG_ENDIAN #define CONFIG_LAYERSCAPE_NS_ACCESS @@ -479,8 +478,6 @@ unsigned long get_board_ddr_clk(void); /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END 0x9fffffff diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 723a73b67a6..21b54c5a017 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -470,8 +470,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END 0x9fffffff diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 450051cf698..db6bd88f201 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -37,8 +37,6 @@ /* Link Definitions */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_FSL_OCRAM_BASE + 0xfff0) -#define CONFIG_SUPPORT_RAW_INITRD - #define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_VERY_BIG_RAM @@ -331,15 +329,7 @@ /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ -#define CONFIG_SYS_LONGHELP - -#ifndef SPL_NO_MISC -#ifndef CONFIG_CMDLINE_EDITING -#define CONFIG_CMDLINE_EDITING 1 -#endif -#endif -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_MAXARGS 64 /* max command args */ #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */ diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index 685bbc2bb17..43be0cd7f95 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -364,8 +364,6 @@ unsigned long get_board_ddr_clk(void); * Miscellaneous configurable options */ #define CONFIG_MISC_INIT_R -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END 0x9fffffff diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 003509ea3b8..6af6a4ea99d 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -35,8 +35,6 @@ /* Link Definitions */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_FSL_OCRAM_BASE + 0xfff0) -#define CONFIG_SUPPORT_RAW_INITRD - #define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_VERY_BIG_RAM @@ -288,9 +286,7 @@ /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_MAXARGS 64 /* max command args */ #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */ diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index f4ecbdb0e9f..39b52ddccbd 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -389,8 +389,6 @@ unsigned long get_board_ddr_clk(void); * Miscellaneous configurable options */ #define CONFIG_MISC_INIT_R -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END 0x9fffffff diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h index 441c401345f..a3a393e472e 100644 --- a/include/configs/ls1088a_common.h +++ b/include/configs/ls1088a_common.h @@ -34,8 +34,6 @@ /* Link Definitions */ -#define CONFIG_SUPPORT_RAW_INITRD - #ifdef CONFIG_QSPI_BOOT #define CONFIG_SYS_FSL_QSPI_BASE 0x20000000 #define CONFIG_ENV_OFFSET 0x300000 /* 3MB */ @@ -232,11 +230,6 @@ unsigned long long get_qixis_addr(void); sizeof(CONFIG_SYS_PROMPT) + 16) #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot args buffer */ -#define CONFIG_SYS_LONGHELP -#ifndef SPL_NO_ENV -#define CONFIG_CMDLINE_EDITING 1 -#endif -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_MAXARGS 64 /* max command args */ #ifdef CONFIG_SPL diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h index 5674a5d2079..a1772aeb86b 100644 --- a/include/configs/ls1088aqds.h +++ b/include/configs/ls1088aqds.h @@ -474,7 +474,6 @@ unsigned long get_board_ddr_clk(void); #endif -#undef CONFIG_CMDLINE_EDITING #include <config_distro_defaults.h> #define BOOT_TARGET_DEVICES(func) \ func(USB, usb, 0) \ diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h index a6271f5ae26..9f5a32a91ab 100644 --- a/include/configs/ls1088ardb.h +++ b/include/configs/ls1088ardb.h @@ -462,7 +462,6 @@ #endif #ifndef SPL_NO_ENV -#undef CONFIG_CMDLINE_EDITING #include <config_distro_defaults.h> #define BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 7d351ab279d..edf954dadd7 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -30,8 +30,6 @@ #define CONFIG_ENV_SECT_SIZE 0x40000 #endif -#define CONFIG_SUPPORT_RAW_INITRD - #define CONFIG_SKIP_LOWLEVEL_INIT #ifndef CONFIG_SPL @@ -210,9 +208,6 @@ unsigned long long get_qixis_addr(void); /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING 1 -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_MAXARGS 64 /* max command args */ #define CONFIG_SPL_BSS_START_ADDR 0x80100000 diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index 6f3301c2fdc..aa37c96453f 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -331,7 +331,6 @@ unsigned long get_board_sys_clk(void); #define CONFIG_MISC_INIT_R -#undef CONFIG_CMDLINE_EDITING #include <config_distro_defaults.h> #define BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index 0793fcb9e40..624356afd36 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -46,7 +46,6 @@ #include "mv-common.h" /* loading initramfs images without uimage header */ -#define CONFIG_SUPPORT_RAW_INITRD /* ST M25P40 */ #undef CONFIG_ENV_SPI_MAX_HZ diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index 6899eac7a47..bd36a8d5980 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -40,13 +40,10 @@ /* * U-Boot general configurations */ -#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */ #define CONFIG_SYS_MAXARGS 32 /* Max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot argument buffer size */ -#define CONFIG_AUTO_COMPLETE /* Command auto complete */ -#define CONFIG_CMDLINE_EDITING /* Command history etc */ /* * Serial Driver diff --git a/include/configs/malta.h b/include/configs/malta.h index e15c6bba754..17951bf75b2 100644 --- a/include/configs/malta.h +++ b/include/configs/malta.h @@ -52,9 +52,6 @@ #define CONFIG_SYS_BOOTPARAMS_LEN (128 * 1024) #define CONFIG_SYS_BOOTM_LEN (64 * 1024 * 1024) -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING - /* * Serial driver */ @@ -96,6 +93,4 @@ * Commands */ -#define CONFIG_SYS_LONGHELP /* verbose help, undef to save memory */ - #endif /* _MALTA_CONFIG_H */ diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 345f4820482..a6246713320 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -192,13 +192,9 @@ "bootcmd=mmc rescan;if fatload mmc 0 82000000 loadbootscr.scr;" \ "then source 82000000;else run nandboot;fi\0" -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING - /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_CBSIZE 1024/* Console I/O Buffer Size */ /* Boot Argument Buffer Size */ #define CONFIG_SYS_BARGSIZE (CONFIG_SYS_CBSIZE) @@ -301,7 +297,6 @@ #define CONFIG_DRIVER_TI_EMAC #define CONFIG_DRIVER_TI_EMAC_USE_RMII #define CONFIG_MII -#define CONFIG_BOOTP_DNS #define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 10 diff --git a/include/configs/meesc.h b/include/configs/meesc.h index de2e7a37336..6914f0eb883 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -52,9 +52,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* * SDRAM: 1 bank, min 32, max 128 MB @@ -117,9 +114,6 @@ #endif #define CONFIG_SYS_CBSIZE 512 -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING -#define CONFIG_AUTO_COMPLETE /* * Size of malloc() pool diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h index 7b9cd67c749..90a19e7d0f3 100644 --- a/include/configs/meson-gxbb-common.h +++ b/include/configs/meson-gxbb-common.h @@ -24,9 +24,6 @@ #define GICD_BASE 0xc4301000 #define GICC_BASE 0xc4302000 -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING - #include <config_distro_defaults.h> #define BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index a065dd3de9a..fe9aaaec1db 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -156,9 +156,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME #if defined(CONFIG_CMD_JFFS2) # define CONFIG_MTD_PARTITIONS @@ -180,7 +177,6 @@ #define CONFIG_SYS_CBSIZE 512 /* max number of command args */ #define CONFIG_SYS_MAXARGS 15 -#define CONFIG_SYS_LONGHELP /* default load address */ #define CONFIG_SYS_LOAD_ADDR 0 @@ -204,8 +200,6 @@ "setenv stdin serial\0" #endif -#define CONFIG_CMDLINE_EDITING - /* Enable flat device tree support */ #define CONFIG_LMB 1 diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h index db719725742..dfed513675a 100644 --- a/include/configs/mpc8308_p1m.h +++ b/include/configs/mpc8308_p1m.h @@ -370,20 +370,14 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* * Command line configuration. */ -#define CONFIG_CMDLINE_EDITING 1 /* add command line history */ - /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h index 0fc089ea3da..f1600b2a3bd 100644 --- a/include/configs/mpr2.h +++ b/include/configs/mpr2.h @@ -22,7 +22,6 @@ #define CONFIG_DISPLAY_BOARDINFO /* U-Boot internals */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_BAUDRATE_TABLE { 115200 } /* List of legal baudrate settings for this board */ #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 32 * 1024 * 1024) #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h index 6a36234b15d..8a1a7ee2086 100644 --- a/include/configs/ms7720se.h +++ b/include/configs/ms7720se.h @@ -22,7 +22,6 @@ #define MS7720SE_FLASH_BASE_1 0xA0000000 #define MS7720SE_FLASH_BANK_SIZE (8 * 1024 * 1024) -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_PBSIZE 256 /* Buffer size for Console output */ /* List of legal baudrate settings for this board */ #define CONFIG_SYS_BAUDRATE_TABLE { 115200 } diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h index c9c44f93a6e..5ba10b86484 100644 --- a/include/configs/ms7722se.h +++ b/include/configs/ms7722se.h @@ -23,7 +23,6 @@ #define MS7722SE_FLASH_BASE_1 (0xA0000000) #define MS7722SE_FLASH_BANK_SIZE (8*1024 * 1024) -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_PBSIZE 256 /* Buffer size for Console output */ #define CONFIG_SYS_BAUDRATE_TABLE { 115200 } /* List of legal baudrate settings for this board */ diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h index ca5659a60bd..c70191a4fd2 100644 --- a/include/configs/ms7750se.h +++ b/include/configs/ms7750se.h @@ -27,7 +27,6 @@ #define CONFIG_SYS_SDRAM_BASE (0x8C000000) #define CONFIG_SYS_SDRAM_SIZE (64 * 1024 * 1024) -#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_PBSIZE 256 #define CONFIG_SYS_MEMTEST_START (CONFIG_SYS_SDRAM_BASE) diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h index bee8ddd4f2c..e7f5e8d8f9f 100644 --- a/include/configs/mt_ventoux.h +++ b/include/configs/mt_ventoux.h @@ -22,7 +22,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_AM3517_MT_VENTOUX #define CONFIG_BOOTFILE "uImage" -#define CONFIG_AUTO_COMPLETE #define CONFIG_HOSTNAME mt_ventoux diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index 7e2bdac1a26..3035a113c34 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -74,9 +74,6 @@ /* * Other required minimal configurations */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING #define CONFIG_ARCH_CPU_INIT /* call arch_cpu_init() */ #define CONFIG_SYS_LOAD_ADDR 0x00800000 /* default load adr- 8M */ #define CONFIG_SYS_MEMTEST_START 0x00800000 /* 8M */ diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index a6c992f0fc5..f288cf5b17a 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -44,9 +44,6 @@ /* * Other required minimal configurations */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING #define CONFIG_ARCH_CPU_INIT /* call arch_cpu_init() */ #define CONFIG_SYS_LOAD_ADDR 0x00800000 /* default load adr- 8M */ #define CONFIG_SYS_MEMTEST_START 0x00800000 /* 8M */ diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h index 8661d0f148f..74346cf054e 100644 --- a/include/configs/mx25pdk.h +++ b/include/configs/mx25pdk.h @@ -57,12 +57,9 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 /* U-Boot general configuration */ -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ /* Boot Argument Buffer Size */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_LONGHELP /* Ethernet */ #define CONFIG_FEC_MXC @@ -190,7 +187,5 @@ "else run netboot; fi" /* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_AUTO_COMPLETE #endif /* __CONFIG_H */ diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h index 358095d17a1..0fe37c71da9 100644 --- a/include/configs/mx31ads.h +++ b/include/configs/mx31ads.h @@ -90,15 +90,12 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_MEMTEST_START 0 /* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0x10000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_CMDLINE_EDITING 1 - /*----------------------------------------------------------------------- * Physical Memory Map */ diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index f970d819d01..fe04ca7e1d5 100644 --- a/include/configs/mx31pdk.h +++ b/include/configs/mx31pdk.h @@ -79,7 +79,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ /* memtest works on */ #define CONFIG_SYS_MEMTEST_START 0x80000000 @@ -88,8 +87,6 @@ /* default load address */ #define CONFIG_SYS_LOAD_ADDR 0x81000000 -#define CONFIG_CMDLINE_EDITING - /*----------------------------------------------------------------------- * Physical Memory Map */ diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index ca5f2fcd81f..0ec28ffc169 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -70,9 +70,6 @@ /* * Command definition */ -#define CONFIG_BOOTP_SUBNETMASK -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_DNS #define CONFIG_NET_RETRY_COUNT 100 @@ -99,10 +96,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_CMDLINE_EDITING - -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_MEMTEST_START 0 /* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0x10000 diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 5541d26c079..e3b33a0a006 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -161,16 +161,12 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_MEMTEST_START 0x90000000 #define CONFIG_SYS_MEMTEST_END 0x90010000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_CMDLINE_EDITING - /*----------------------------------------------------------------------- * Physical Memory Map */ diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index e120e0b5841..1214ffdc316 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -150,16 +150,12 @@ #define CONFIG_ARP_TIMEOUT 200UL /* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_MEMTEST_START 0x70000000 #define CONFIG_SYS_MEMTEST_END 0x70010000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_CMDLINE_EDITING - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 2 #define PHYS_SDRAM_1 CSD0_BASE_ADDR diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h index 21c025eb61b..7965125c860 100644 --- a/include/configs/mx53cx9020.h +++ b/include/configs/mx53cx9020.h @@ -54,7 +54,6 @@ #define CONFIG_CONS_INDEX 1 /* Command definition */ -#define CONFIG_SUPPORT_RAW_INITRD #define CONFIG_LOADADDR 0x70010000 /* loadaddr env var */ @@ -136,8 +135,6 @@ #define CONFIG_ARP_TIMEOUT 200UL /* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ #define CONFIG_SYS_MEMTEST_START 0x70000000 @@ -145,8 +142,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_CMDLINE_EDITING - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 2 #define PHYS_SDRAM_1 CSD0_BASE_ADDR diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h index 7b0198377f0..9fa80316a8f 100644 --- a/include/configs/mx53evk.h +++ b/include/configs/mx53evk.h @@ -103,16 +103,12 @@ #define CONFIG_ARP_TIMEOUT 200UL /* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_MEMTEST_START 0x70000000 #define CONFIG_SYS_MEMTEST_END 0x70010000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_CMDLINE_EDITING - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM_1 CSD0_BASE_ADDR diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 0a592043cbb..e1aa7b8aff0 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -67,7 +67,6 @@ #define CONFIG_CONS_INDEX 1 /* Command definition */ -#define CONFIG_SUPPORT_RAW_INITRD #define CONFIG_ETHPRIME "FEC0" @@ -146,8 +145,6 @@ #define CONFIG_ARP_TIMEOUT 200UL /* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ #define CONFIG_SYS_MEMTEST_START 0x70000000 @@ -155,8 +152,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_CMDLINE_EDITING - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 2 #define PHYS_SDRAM_1 CSD0_BASE_ADDR diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h index 79c97b5aa3c..ed8ac48e015 100644 --- a/include/configs/mx53ppd.h +++ b/include/configs/mx53ppd.h @@ -39,8 +39,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 2 -#define CONFIG_SUPPORT_RAW_INITRD /* bootz raw initrd support */ - /* Eth Configs */ #define CONFIG_MII @@ -83,7 +81,6 @@ #define CONFIG_BAUDRATE 115200 /* Command definition */ -#define CONFIG_SUPPORT_RAW_INITRD #define CONFIG_ETHPRIME "FEC0" @@ -174,8 +171,6 @@ #define CONFIG_ARP_TIMEOUT 200UL /* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #define CONFIG_SYS_MAXARGS 48 /* max number of command args */ @@ -186,8 +181,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_CMDLINE_EDITING - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 2 #define PHYS_SDRAM_1 CSD0_BASE_ADDR diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h index 58c3c36cd5a..8de89c70bc2 100644 --- a/include/configs/mx53smd.h +++ b/include/configs/mx53smd.h @@ -95,16 +95,12 @@ #define CONFIG_ARP_TIMEOUT 200UL /* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_MEMTEST_START 0x70000000 #define CONFIG_SYS_MEMTEST_END 0x70010000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_CMDLINE_EDITING - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 2 #define PHYS_SDRAM_1 CSD0_BASE_ADDR diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 5949d259fa1..2dc10c6d646 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -54,12 +54,8 @@ #define CONFIG_CONS_INDEX 1 /* Filesystems and image support */ -#define CONFIG_SUPPORT_RAW_INITRD /* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 512 #define CONFIG_SYS_MAXARGS 32 diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 47379ca1885..1c1671e30f9 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -149,8 +149,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 -#define CONFIG_CMDLINE_EDITING - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index b043df0e13f..defb38c5b33 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -35,9 +35,6 @@ #define CONFIG_CONS_INDEX 1 /* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 512 #define CONFIG_SYS_MAXARGS 32 diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index bc5a5646795..31b6d3e448e 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -68,9 +68,6 @@ #define CONFIG_CONS_INDEX 1 #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_LONGHELP -#define CONFIG_AUTO_COMPLETE - #define CONFIG_SYS_CACHELINE_SIZE 64 /* Miscellaneous configurable options */ @@ -79,8 +76,6 @@ #define CONFIG_SYS_MAXARGS 256 -#define CONFIG_CMDLINE_EDITING - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/mxs.h b/include/configs/mxs.h index 31877b8ec10..5d07c9f1995 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -81,13 +81,10 @@ #define CONFIG_SPL_TEXT_BASE 0x00001000 /* U-Boot general configuration */ -#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */ #define CONFIG_SYS_MAXARGS 32 /* Max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot argument buffer size */ -#define CONFIG_AUTO_COMPLETE /* Command auto complete */ -#define CONFIG_CMDLINE_EDITING /* Command history etc */ /* Booting Linux */ #define CONFIG_CMDLINE_TAG diff --git a/include/configs/nas220.h b/include/configs/nas220.h index 90be7bd010f..99cf4d8e755 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -41,9 +41,6 @@ /* * Commands configuration */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING /* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/netgear_cg3100d.h b/include/configs/netgear_cg3100d.h index 457a50d4721..86d983eaad2 100644 --- a/include/configs/netgear_cg3100d.h +++ b/include/configs/netgear_cg3100d.h @@ -9,6 +9,3 @@ #define CONFIG_ENV_SIZE (8 * 1024) -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_LONGHELP diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index c9901e52510..c853e8d06fd 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -90,9 +90,6 @@ /* commands to include */ -#define CONFIG_CMDLINE_EDITING /* add command line history */ -#define CONFIG_AUTO_COMPLETE /* add autocompletion support */ - #define CONFIG_SYS_I2C /* @@ -311,7 +308,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_MEMTEST_START (OMAP34XX_SDRC_CS0) #define CONFIG_SYS_MEMTEST_END (OMAP34XX_SDRC_CS0 + 0x01F00000)/*31MB*/ diff --git a/include/configs/nsim.h b/include/configs/nsim.h index c4775e539f0..58d3e5f7de8 100644 --- a/include/configs/nsim.h +++ b/include/configs/nsim.h @@ -34,8 +34,6 @@ /* * Command line configuration */ -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING /* * Environment settings @@ -52,6 +50,5 @@ /* * Console configuration */ -#define CONFIG_SYS_LONGHELP #endif /* _CONFIG_NSIM_H_ */ diff --git a/include/configs/nx25-ae250.h b/include/configs/nx25-ae250.h index 5bf295c6ae8..a357d7125d3 100644 --- a/include/configs/nx25-ae250.h +++ b/include/configs/nx25-ae250.h @@ -13,7 +13,6 @@ */ #define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_CMDLINE_EDITING #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_BOOTP_SERVERIP @@ -27,7 +26,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ /* diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 9cecd233f3d..837286bd784 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -205,7 +205,6 @@ #define CONFIG_MII #undef CONFIG_DRIVER_TI_EMAC_USE_RMII #define CONFIG_BOOTP_DEFAULT -#define CONFIG_BOOTP_DNS #define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 10 @@ -219,9 +218,6 @@ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */ #define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000) -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_LONGHELP #define CONFIG_MX_CYCLIC /* diff --git a/include/configs/origen.h b/include/configs/origen.h index 5d071d60d94..27191381f89 100644 --- a/include/configs/origen.h +++ b/include/configs/origen.h @@ -45,8 +45,6 @@ #define S5P_CHECK_DIDLE 0xBAD00000 #define S5P_CHECK_LPA 0xABAD0000 -#define CONFIG_SUPPORT_RAW_INITRD - /* MMC SPL */ #define COPY_BL2_FNPTR_ADDR 0x02020030 #define CONFIG_SPL_TEXT_BASE 0x02021410 diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 09d58c7a4c8..d0f5529637e 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -789,8 +789,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_CMDLINE_EDITING /* Command-line editing */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index c1f50720188..e02c31db2ac 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -382,8 +382,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_CMDLINE_EDITING /* Command-line editing */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h index f6816ddb040..972c13a6251 100644 --- a/include/configs/pb1x00.h +++ b/include/configs/pb1x00.h @@ -44,7 +44,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_MALLOC_LEN 128*1024 @@ -133,9 +132,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* * Command line configuration. diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index b390b650d07..94f580d3595 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -186,9 +186,6 @@ "nand write ${ram_addr} root ${filesize}; fi\0" /* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_MEMTEST_START 0x80010000 #define CONFIG_SYS_MEMTEST_END 0x87C00000 diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h index 7a959c43151..d81c11b7373 100644 --- a/include/configs/pic32mzdask.h +++ b/include/configs/pic32mzdask.h @@ -52,13 +52,11 @@ /*---------------------------------------------------------------------- * Commands */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ /*------------------------------------------------------------ * Console Configuration */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ -#define CONFIG_CMDLINE_EDITING 1 /*----------------------------------------------------------------------- * Networking Configuration @@ -73,9 +71,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /*-------------------------------------------------- * USB Configuration diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index 62feb224ac7..4b18b2c90b2 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -121,8 +121,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 -#define CONFIG_CMDLINE_EDITING - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h index cabe8543c86..06ee8e7f9ef 100644 --- a/include/configs/picosam9g45.h +++ b/include/configs/picosam9g45.h @@ -59,9 +59,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* Enable the watchdog */ #define CONFIG_AT91SAM9_WATCHDOG @@ -109,10 +106,6 @@ "bootz 0x22000000 - 0x21000000" #endif -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING -#define CONFIG_AUTO_COMPLETE - /* * Size of malloc() pool */ diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index 4e822e67acb..d2702b4f2d6 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -154,9 +154,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE 1 -#define CONFIG_BOOTP_BOOTPATH 1 -#define CONFIG_BOOTP_GATEWAY 1 -#define CONFIG_BOOTP_HOSTNAME 1 /* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 @@ -268,9 +265,6 @@ #error "Undefined memory device" #endif -#define CONFIG_SYS_LONGHELP 1 -#define CONFIG_CMDLINE_EDITING 1 - /* * Size of malloc() pool */ diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index 880f9b569ae..c4990883af2 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -168,9 +168,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE 1 -#define CONFIG_BOOTP_BOOTPATH 1 -#define CONFIG_BOOTP_GATEWAY 1 -#define CONFIG_BOOTP_HOSTNAME 1 /* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 @@ -299,9 +296,6 @@ #error "Undefined memory device" #endif -#define CONFIG_SYS_LONGHELP 1 -#define CONFIG_CMDLINE_EDITING 1 - /* * Size of malloc() pool */ diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index d16dfc8ff0d..21c31daadd5 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -59,9 +59,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE 1 -#define CONFIG_BOOTP_BOOTPATH 1 -#define CONFIG_BOOTP_GATEWAY 1 -#define CONFIG_BOOTP_HOSTNAME 1 #define CONFIG_JFFS2_CMDLINE 1 #define CONFIG_JFFS2_NAND 1 @@ -118,10 +115,6 @@ #define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ #define CONFIG_BOOTCOMMAND "nand read 0x72000000 0x200000 0x200000; bootm" -#define CONFIG_SYS_LONGHELP 1 -#define CONFIG_CMDLINE_EDITING 1 -#define CONFIG_AUTO_COMPLETE - /* * Size of malloc() pool */ diff --git a/include/configs/poplar.h b/include/configs/poplar.h index e0268290ce5..727cec42f14 100644 --- a/include/configs/poplar.h +++ b/include/configs/poplar.h @@ -62,11 +62,8 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_OFFSET (0x780 * 512) /* env_mmc_blknum */ #define CONFIG_ENV_SIZE 0x10000 /* env_mmc_nblks bytes */ -#define CONFIG_ENV_VARS_UBOOT_CONFIG /* Monitor Command Prompt */ -#define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_CBSIZE 512 #define CONFIG_SYS_MAXARGS 64 diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h index 271440430fd..58895a88ba1 100644 --- a/include/configs/qemu-mips.h +++ b/include/configs/qemu-mips.h @@ -32,9 +32,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* * Command line configuration. @@ -65,10 +62,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ - -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_MALLOC_LEN (256 << 10) diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h index 063e504e7a0..382c5802b92 100644 --- a/include/configs/qemu-mips64.h +++ b/include/configs/qemu-mips64.h @@ -32,9 +32,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* * Command line configuration. @@ -65,10 +62,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ - -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_MALLOC_LEN (256 << 10) diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h index 245ce246512..f7187040685 100644 --- a/include/configs/qemu-ppce500.h +++ b/include/configs/qemu-ppce500.h @@ -123,9 +123,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void); /* * Miscellaneous configurable options */ -#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_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h index beee4abfc1d..c14b4d26488 100644 --- a/include/configs/r0p7734.h +++ b/include/configs/r0p7734.h @@ -25,7 +25,6 @@ #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII /* undef to save memory */ -#define CONFIG_SYS_LONGHELP /* List of legal baudrate settings for this board */ #define CONFIG_SYS_BAUDRATE_TABLE { 115200 } diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h index aea2092c501..129dcf33982 100644 --- a/include/configs/r2dplus.h +++ b/include/configs/r2dplus.h @@ -15,7 +15,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x8C000000 #define CONFIG_SYS_SDRAM_SIZE 0x04000000 -#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_PBSIZE 256 #define CONFIG_SYS_MEMTEST_START (CONFIG_SYS_SDRAM_BASE) diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h index b9f6489619a..e5da8f24764 100644 --- a/include/configs/r7780mp.h +++ b/include/configs/r7780mp.h @@ -24,7 +24,6 @@ #define CONFIG_SYS_SDRAM_BASE (0x08000000) #define CONFIG_SYS_SDRAM_SIZE (128 * 1024 * 1024) -#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_PBSIZE 256 #define CONFIG_SYS_MEMTEST_START (CONFIG_SYS_SDRAM_BASE) diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h index e47b02fcc9d..1ceee9a4297 100644 --- a/include/configs/rcar-gen2-common.h +++ b/include/configs/rcar-gen2-common.h @@ -14,7 +14,6 @@ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG -#define CONFIG_CMDLINE_EDITING #undef CONFIG_SHOW_BOOT_PROGRESS @@ -26,8 +25,6 @@ #endif /* console */ -#define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_PBSIZE 256 #define CONFIG_SYS_BAUDRATE_TABLE { 38400, 115200 } diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index 226069d67cb..1ae6323369f 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -15,13 +15,10 @@ #define CONFIG_REMAKE_ELF /* boot option */ -#define CONFIG_SUPPORT_RAW_INITRD -#define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG -#define CONFIG_CMDLINE_EDITING #undef CONFIG_SHOW_BOOT_PROGRESS @@ -35,7 +32,6 @@ /* console */ #define CONFIG_SYS_CBSIZE 2048 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_MAXARGS 64 #define CONFIG_SYS_BAUDRATE_TABLE { 115200, 38400 } diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 84cebd6eb79..6b4b5f44bf4 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -75,12 +75,10 @@ /* Environment */ #define CONFIG_ENV_SIZE SZ_16K -#define CONFIG_ENV_VARS_UBOOT_CONFIG #define CONFIG_SYS_LOAD_ADDR 0x1000000 #define CONFIG_PREBOOT "usb start" /* Shell */ -#define CONFIG_CMDLINE_EDITING /* ATAGs support for bootm/bootz */ #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h index 841c5c66b5e..b6641e98637 100644 --- a/include/configs/rsk7203.h +++ b/include/configs/rsk7203.h @@ -22,7 +22,6 @@ #define RSK7203_FLASH_BASE_1 0x20000000 /* Non cache */ #define RSK7203_FLASH_BANK_SIZE (4 * 1024 * 1024) -#define CONFIG_SYS_LONGHELP /* undef to save memory */ /* List of legal baudrate settings for this board */ #define CONFIG_SYS_BAUDRATE_TABLE { 115200 } diff --git a/include/configs/rsk7264.h b/include/configs/rsk7264.h index 21447115897..1599267ae14 100644 --- a/include/configs/rsk7264.h +++ b/include/configs/rsk7264.h @@ -17,7 +17,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE { CONFIG_BAUDRATE } -#define CONFIG_SYS_LONGHELP 1 /* undef to save memory */ #define CONFIG_SYS_PBSIZE 256 /* Buffer size for Console output */ /* Serial */ diff --git a/include/configs/rsk7269.h b/include/configs/rsk7269.h index a56f8e13429..908bdb19478 100644 --- a/include/configs/rsk7269.h +++ b/include/configs/rsk7269.h @@ -16,7 +16,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE { CONFIG_BAUDRATE } -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_PBSIZE 256 /* Print Buffer Size */ /* Serial */ diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h index e5b3d6c57ce..92c6956e9f3 100644 --- a/include/configs/s32v234evb.h +++ b/include/configs/s32v234evb.h @@ -157,11 +157,8 @@ #include <config_distro_bootcmd.h> /* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #define CONFIG_SYS_PROMPT "=> " -#undef CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING #define CONFIG_CMD_MEMTEST #define CONFIG_SYS_MEMTEST_START (DDR_BASE_ADDR) @@ -176,7 +173,6 @@ #if 0 /* Configure PXE */ -#define CONFIG_BOOTP_PXE #define CONFIG_BOOTP_PXE_CLIENTARCH 0x100 #endif @@ -203,8 +199,5 @@ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME #endif diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 322ff6f2544..1b40c29a554 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -33,7 +33,6 @@ #define CONFIG_CMDLINE_TAG #define CONFIG_REVISION_TAG #define CONFIG_INITRD_TAG -#define CONFIG_CMDLINE_EDITING /* Size of malloc() pool before and after relocation */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (80 << 20)) @@ -104,7 +103,6 @@ #define CONFIG_MISC_INIT_R #define CONFIG_ENV_OVERWRITE -#define CONFIG_ENV_VARS_UBOOT_CONFIG #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_UPDATEB \ @@ -153,7 +151,6 @@ "opts=always_resume=1\0" \ "dfu_alt_info=" CONFIG_DFU_ALT "\0" -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_PBSIZE 384 /* Print Buffer Size */ /* memtest works on */ #define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index a38093769c1..841deddbe85 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -71,7 +71,6 @@ #define CONFIG_ENV_COMMON_BOOT "${console} ${meminfo}" -#define CONFIG_ENV_VARS_UBOOT_CONFIG #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/sagem_f@st1704.h b/include/configs/sagem_f@st1704.h index fd1c75935e7..73b2832f572 100644 --- a/include/configs/sagem_f@st1704.h +++ b/include/configs/sagem_f@st1704.h @@ -9,6 +9,3 @@ #define CONFIG_ENV_SIZE (8 * 1024) -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_LONGHELP diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index ffcc0a970d1..2a42a642264 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -33,13 +33,10 @@ #define CONFIG_MALLOC_F_ADDR 0x0010000 #define CONFIG_SYS_MALLOC_LEN (32 << 20) /* 32MB */ -#define CONFIG_SYS_LONGHELP /* #undef to save memory */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #define CONFIG_DISPLAY_BOARDINFO_LATE /* turn on command-line edit/c/auto */ -#define CONFIG_CMDLINE_EDITING -#define CONFIG_AUTO_COMPLETE #define CONFIG_ENV_SIZE 8192 @@ -76,7 +73,6 @@ #define CONFIG_KEEP_SERVERADDR #define CONFIG_UDP_CHECKSUM #define CONFIG_TIMESTAMP -#define CONFIG_BOOTP_DNS #define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_BOOTP_SERVERIP diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index 3cb11d102fb..5b5689a3435 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -270,9 +270,6 @@ #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR+0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR+0x4600) -#define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_AUTO_COMPLETE /* add autocompletion support */ - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL @@ -387,9 +384,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* * Command line configuration. @@ -400,7 +394,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h index 01e77330f49..e52b3a9d09d 100644 --- a/include/configs/sbc8548.h +++ b/include/configs/sbc8548.h @@ -493,18 +493,12 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME #undef CONFIG_WATCHDOG /* watchdog disabled */ /* * Miscellaneous configurable options */ -#define CONFIG_CMDLINE_EDITING /* undef to save memory */ -#define CONFIG_AUTO_COMPLETE /* add autocompletion support */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index c51b39001e1..1d31d3ad3ee 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -450,9 +450,7 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ -#define CONFIG_CMDLINE_EDITING 1 /* add command line history */ /* * For booting Linux, the board info and command line data diff --git a/include/configs/sfr_nb4_ser.h b/include/configs/sfr_nb4_ser.h index 6bd2d76f530..f9942190090 100644 --- a/include/configs/sfr_nb4_ser.h +++ b/include/configs/sfr_nb4_ser.h @@ -11,9 +11,5 @@ #define CONFIG_ENV_SIZE (8 * 1024) -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_LONGHELP - #define CONFIG_SYS_FLASH_CFI 1 #define CONFIG_FLASH_CFI_DRIVER 1 diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h index f30c37b5954..9d5950937e6 100644 --- a/include/configs/sh7752evb.h +++ b/include/configs/sh7752evb.h @@ -13,14 +13,11 @@ #define CONFIG_DISPLAY_BOARDINFO #undef CONFIG_SHOW_BOOT_PROGRESS -#define CONFIG_CMDLINE_EDITING -#define CONFIG_AUTO_COMPLETE /* MEMORY */ #define SH7752EVB_SDRAM_BASE (0x40000000) #define SH7752EVB_SDRAM_SIZE (512 * 1024 * 1024) -#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_PBSIZE 256 #define CONFIG_SYS_BAUDRATE_TABLE { 115200 } diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h index 4dbdfb707b4..fee8059651f 100644 --- a/include/configs/sh7753evb.h +++ b/include/configs/sh7753evb.h @@ -13,14 +13,11 @@ #define CONFIG_DISPLAY_BOARDINFO #undef CONFIG_SHOW_BOOT_PROGRESS -#define CONFIG_CMDLINE_EDITING -#define CONFIG_AUTO_COMPLETE /* MEMORY */ #define SH7753EVB_SDRAM_BASE (0x40000000) #define SH7753EVB_SDRAM_SIZE (512 * 1024 * 1024) -#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_PBSIZE 256 #define CONFIG_SYS_BAUDRATE_TABLE { 115200 } diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h index 314bc53faaa..c750666052b 100644 --- a/include/configs/sh7757lcr.h +++ b/include/configs/sh7757lcr.h @@ -21,7 +21,6 @@ #define SH7757LCR_SDRAM_ECC_SETTING 0x0f000000 /* 240MByte */ #define SH7757LCR_SDRAM_DVC_SIZE (16 * 1024 * 1024) -#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_PBSIZE 256 #define CONFIG_SYS_BAUDRATE_TABLE { 115200 } diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h index ad6bb1c7745..3c8a766a118 100644 --- a/include/configs/sh7763rdp.h +++ b/include/configs/sh7763rdp.h @@ -21,7 +21,6 @@ /* SCIF */ #define CONFIG_CONS_SCIF2 1 -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_PBSIZE 256 /* Buffer size for Console output */ #define CONFIG_SYS_BAUDRATE_TABLE { 115200 } /* List of legal baudrate settings for this board */ diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h index e0f7e373191..b175a6f69d9 100644 --- a/include/configs/sh7785lcr.h +++ b/include/configs/sh7785lcr.h @@ -36,7 +36,6 @@ #define SH7785LCR_USB_BASE (0xb4000000) #endif -#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_PBSIZE 256 #define CONFIG_SYS_BAUDRATE_TABLE { 115200 } diff --git a/include/configs/shmin.h b/include/configs/shmin.h index cd79674bff2..3af460d7358 100644 --- a/include/configs/shmin.h +++ b/include/configs/shmin.h @@ -26,7 +26,6 @@ #define SHMIN_SDRAM_BASE (0x8C000000) #define SHMIN_FLASH_BASE_1 (0xA0000000) -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_PBSIZE 256 /* Buffer size for Console output */ /* List of legal baudrate settings for this board */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600,14400,19200,38400,57600,115200 } diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index d308b0e4086..15dfeec98cc 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -21,7 +21,6 @@ #define CONFIG_ENV_SIZE (0x2000) #define CONFIG_SYS_MALLOC_LEN (16 * 1024 * 1024) -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #ifdef CONFIG_SIEMENS_MACH_TYPE #define CONFIG_MACH_TYPE CONFIG_SIEMENS_MACH_TYPE #endif @@ -32,16 +31,12 @@ /* commands to include */ -#define CONFIG_ENV_VARS_UBOOT_CONFIG #ifndef CONFIG_SPL_BUILD #define CONFIG_ROOTPATH "/opt/eldk" #endif #define CONFIG_ENV_OVERWRITE 1 -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_AUTOLOAD "yes" /* Clock Defines */ @@ -201,11 +196,8 @@ #define CONFIG_DRIVER_TI_CPSW #define CONFIG_MII #define CONFIG_BOOTP_DEFAULT -#define CONFIG_BOOTP_DNS #define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_SUBNETMASK #define CONFIG_NET_RETRY_COUNT 10 /* NAND support */ diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 42636a08b7a..0b5fdc80745 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -51,9 +51,7 @@ /* setting board specific options */ #define CONFIG_MACH_TYPE MACH_TYPE_SMARTWEB -#define CONFIG_AUTO_COMPLETE #define CONFIG_ENV_OVERWRITE 1 /* Overwrite ethaddr / serial# */ -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_AUTOLOAD "yes" #define CONFIG_RESET_TO_RETRY @@ -113,9 +111,6 @@ /* BOOTP and DHCP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME #define CONFIG_NFSBOOTCOMMAND \ "setenv autoload yes; setenv autoboot yes; " \ "setenv bootargs ${basicargs} ${mtdparts} " \ @@ -153,8 +148,6 @@ /* General Boot Parameter */ #define CONFIG_BOOTCOMMAND "run flashboot" #define CONFIG_SYS_CBSIZE 512 -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING /* * RAM Memory address where to put the diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index f710297627e..8a0718e3de1 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -36,7 +36,6 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_CMDLINE_TAG #define CONFIG_INITRD_TAG -#define CONFIG_CMDLINE_EDITING /* * Size of malloc() pool @@ -117,7 +116,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_PBSIZE 384 /* Print Buffer Size */ /* memtest works on */ #define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index 9a805560d77..ca3d9c20f74 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -112,9 +112,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x23000000 #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* Environment settings */ #define CONFIG_ENV_OFFSET (512 << 10) @@ -122,9 +119,6 @@ #define CONFIG_ENV_OVERWRITE /* Console settings */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING -#define CONFIG_AUTO_COMPLETE /* U-Boot memory settings */ #define CONFIG_SYS_MALLOC_LEN (1 << 20) diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index e326ccc9839..a3b17730590 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -78,9 +78,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x23000000 #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* Environment settings */ #define CONFIG_ENV_OFFSET (512 << 10) @@ -108,9 +105,6 @@ "altbootcmd=run boot_mmc ; run boot_usb ; run boot_safe ; run boot_working\0" /* Console settings */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING -#define CONFIG_AUTO_COMPLETE /* U-Boot memory settings */ #define CONFIG_SYS_MALLOC_LEN (1 << 20) diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 3c1616646e9..834d723bb7b 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -82,10 +82,6 @@ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#define CONFIG_AUTO_COMPLETE - -#define CONFIG_SYS_LONGHELP - #define CONFIG_SYS_CBSIZE 512 /* diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 0a19f24eff6..ba78e0c6745 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -47,14 +47,11 @@ /* * U-Boot general configurations */ -#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */ /* Print buffer size */ #define CONFIG_SYS_MAXARGS 32 /* Max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot argument buffer size */ -#define CONFIG_AUTO_COMPLETE /* Command auto complete */ -#define CONFIG_CMDLINE_EDITING /* Command history etc */ #ifndef CONFIG_SYS_HOSTNAME #define CONFIG_SYS_HOSTNAME CONFIG_SYS_BOARD diff --git a/include/configs/socrates.h b/include/configs/socrates.h index bdbc368b571..3491944f93a 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -185,9 +185,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400,115200} -#define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_AUTO_COMPLETE 1 /* add autocompletion support */ - /* * I2C */ @@ -267,16 +264,12 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME #undef CONFIG_WATCHDOG /* watchdog disabled */ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h index f1203482dd3..45e226d7ec5 100644 --- a/include/configs/spear-common.h +++ b/include/configs/spear-common.h @@ -164,8 +164,6 @@ #define CONFIG_SYS_MEMTEST_START 0x00800000 #define CONFIG_SYS_MEMTEST_END 0x04000000 #define CONFIG_SYS_MALLOC_LEN (1024*1024) -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_LOAD_ADDR 0x00800000 #define CONFIG_SYS_FLASH_EMPTY_INFO diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h index ae76cb3fc46..38ca83c589f 100644 --- a/include/configs/stih410-b2260.h +++ b/include/configs/stih410-b2260.h @@ -22,8 +22,6 @@ #define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR -#define CONFIG_ENV_VARS_UBOOT_CONFIG - #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ func(USB, usb, 0) \ @@ -45,7 +43,6 @@ /* Extra Commands */ #define CONFIG_CMD_ASKENV -#define CONFIG_SYS_LONGHELP #define CONFIG_SETUP_MEMORY_TAGS @@ -73,9 +70,5 @@ #define CONFIG_USB_ETHER_SMSC95XX /* NET Configs */ -#define CONFIG_BOOTP_SUBNETMASK -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME -#define CONFIG_BOOTP_BOOTPATH #endif /* __CONFIG_H */ diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h index a92a5aed1a4..2f59f52ee15 100644 --- a/include/configs/stm32f429-discovery.h +++ b/include/configs/stm32f429-discovery.h @@ -58,7 +58,6 @@ #define CONFIG_BOOTCOMMAND \ "run bootcmd_romfs" -#define CONFIG_ENV_VARS_UBOOT_CONFIG #define CONFIG_EXTRA_ENV_SETTINGS \ "bootargs_romfs=uclinux.physaddr=0x08180000 root=/dev/mtdblock0\0" \ "bootcmd_romfs=setenv bootargs ${bootargs} ${bootargs_romfs};" \ @@ -67,8 +66,5 @@ /* * Command line configuration. */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING #endif /* __CONFIG_H */ diff --git a/include/configs/stm32f429-evaluation.h b/include/configs/stm32f429-evaluation.h index fb036238297..7b3115997d1 100644 --- a/include/configs/stm32f429-evaluation.h +++ b/include/configs/stm32f429-evaluation.h @@ -51,15 +51,11 @@ #define CONFIG_BOOTCOMMAND \ "run boot_sd" -#define CONFIG_ENV_VARS_UBOOT_CONFIG #define CONFIG_EXTRA_ENV_SETTINGS \ "boot_sd=mmc dev 0;fatload mmc 0 0x00700000 stm32429i-eval.dtb; fatload mmc 0 0x00008000 zImage; icache off; bootz 0x00008000 - 0x00700000" /* * Command line configuration. */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING #endif /* __CONFIG_H */ diff --git a/include/configs/stm32f469-discovery.h b/include/configs/stm32f469-discovery.h index 35902e10f3c..3d4ca7ee551 100644 --- a/include/configs/stm32f469-discovery.h +++ b/include/configs/stm32f469-discovery.h @@ -53,15 +53,11 @@ #define CONFIG_BOOTCOMMAND \ "run boot_sd" -#define CONFIG_ENV_VARS_UBOOT_CONFIG #define CONFIG_EXTRA_ENV_SETTINGS \ "boot_sd=mmc dev 0;fatload mmc 0 0x00700000 stm32f469-disco.dtb; fatload mmc 0 0x00008000 zImage; icache off; bootz 0x00008000 - 0x00700000" /* * Command line configuration. */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING #endif /* __CONFIG_H */ diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index 1baed0033df..801980ea338 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -50,7 +50,6 @@ #define CONFIG_BOOTCOMMAND \ "run bootcmd_romfs" -#define CONFIG_ENV_VARS_UBOOT_CONFIG #define CONFIG_EXTRA_ENV_SETTINGS \ "bootargs_romfs=uclinux.physaddr=0x08180000 root=/dev/mtdblock0\0" \ "bootcmd_romfs=setenv bootargs ${bootargs} ${bootargs_romfs};" \ @@ -60,9 +59,6 @@ /* * Command line configuration. */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING #define CONFIG_CMD_CACHE #define CONFIG_BOARD_LATE_INIT #define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/stm32h743-disco.h b/include/configs/stm32h743-disco.h index fee0304c229..aa2871d6695 100644 --- a/include/configs/stm32h743-disco.h +++ b/include/configs/stm32h743-disco.h @@ -38,14 +38,9 @@ #define CONFIG_BOOTARGS \ "console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel" -#define CONFIG_ENV_VARS_UBOOT_CONFIG - /* * Command line configuration. */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING #define CONFIG_CMD_CACHE #define CONFIG_BOARD_LATE_INIT diff --git a/include/configs/stm32h743-eval.h b/include/configs/stm32h743-eval.h index fee0304c229..aa2871d6695 100644 --- a/include/configs/stm32h743-eval.h +++ b/include/configs/stm32h743-eval.h @@ -38,14 +38,9 @@ #define CONFIG_BOOTARGS \ "console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel" -#define CONFIG_ENV_VARS_UBOOT_CONFIG - /* * Command line configuration. */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING #define CONFIG_CMD_CACHE #define CONFIG_BOARD_LATE_INIT diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h index 5d4e7db7bdb..d20dd9c3c59 100644 --- a/include/configs/stmark2.h +++ b/include/configs/stmark2.h @@ -90,8 +90,6 @@ #define CONFIG_EXTRA_CLOCK #define CONFIG_PRAM 2048 /* 2048 KB */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ /* Print Buffer Size */ diff --git a/include/configs/strider.h b/include/configs/strider.h index 24ba717c567..14b03c813b6 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -542,13 +542,9 @@ void fpga_control_clear(unsigned int bus, int pin); * Command line configuration. */ -#define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_AUTO_COMPLETE /* add autocompletion support */ - /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ #define CONFIG_SYS_HZ 1000 /* decrementer freq: 1ms ticks */ diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h index d5166ce72fa..0c08556d211 100644 --- a/include/configs/stv0991.h +++ b/include/configs/stv0991.h @@ -50,8 +50,6 @@ #define CONFIG_SYS_MEMTEST_END 1024*1024 /* Misc configuration */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING #define CONFIG_BOOTCOMMAND "go 0x40040000" diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h index e6c9bf4cb58..0e735bee17a 100644 --- a/include/configs/t4qds.h +++ b/include/configs/t4qds.h @@ -233,9 +233,6 @@ /* * Miscellaneous configurable options */ -#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_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 9827da9e461..02bfca16332 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -79,14 +79,9 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of */ /* NAND devices */ -#define CONFIG_AUTO_COMPLETE - /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_CMDLINE_EDITING -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ #define CONFIG_SYS_MAXARGS 32 /* max number of command */ @@ -142,7 +137,6 @@ #define CONFIG_DRIVER_TI_EMAC #define CONFIG_DRIVER_TI_EMAC_USE_RMII #define CONFIG_MII -#define CONFIG_BOOTP_DNS #define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 10 diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 61363d45c25..5a7f207d7ff 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -137,11 +137,8 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ /* turn on command-line edit/hist/auto */ -#define CONFIG_CMDLINE_EDITING -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_ALT_MEMTEST 1 #define CONFIG_SYS_MEMTEST_START (0x82000000) /* memtest */ diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 6675fa97df8..51e3987ab3f 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -141,10 +141,6 @@ #define CONFIG_ENV_SIZE (SZ_128K) /* 1 sector = 128 kB */ #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0x200000 0x300000; bootm" -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING -#define CONFIG_AUTO_COMPLETE - /* * Size of malloc() pool */ diff --git a/include/configs/tb100.h b/include/configs/tb100.h index a395e6737d5..8216d6e54b5 100644 --- a/include/configs/tb100.h +++ b/include/configs/tb100.h @@ -53,9 +53,6 @@ * Command line configuration */ -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING - /* * Environment settings */ @@ -71,6 +68,5 @@ /* * Console configuration */ -#define CONFIG_SYS_LONGHELP #endif /* _CONFIG_TB100_H_ */ diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 866c1fdfd09..9c0c6b9ed36 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -26,7 +26,6 @@ #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ /* Environment */ -#define CONFIG_ENV_VARS_UBOOT_CONFIG #define CONFIG_ENV_SIZE 0x2000 /* Total Size Environment */ /* @@ -50,7 +49,6 @@ #define CONFIG_ENV_OVERWRITE /* turn on command-line edit/hist/auto */ -#define CONFIG_CMDLINE_EDITING /* * Increasing the size of the IO buffer as default nfsargs size is more diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h index bd03f118822..51e1e4e5cf8 100644 --- a/include/configs/thunderx_88xx.h +++ b/include/configs/thunderx_88xx.h @@ -45,10 +45,6 @@ /* BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME -#define CONFIG_BOOTP_PXE /* Miscellaneous configurable options */ #define CONFIG_SYS_LOAD_ADDR (MEM_BASE) @@ -72,8 +68,6 @@ /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING 1 #define CONFIG_SYS_MAXARGS 64 /* max command args */ #define CONFIG_NO_RELOCATION 1 #define PLL_REF_CLK 50000000 /* 50 MHz */ diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index a17f616bff4..61d0b8025d4 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -20,7 +20,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_MACH_TYPE MACH_TYPE_TI8148EVM #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ @@ -29,7 +28,6 @@ /* commands to include */ -#define CONFIG_ENV_VARS_UBOOT_CONFIG #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_EXTRA_ENV_SETTINGS \ "loadaddr=0x80200000\0" \ @@ -160,11 +158,8 @@ /* Ethernet */ #define CONFIG_DRIVER_TI_CPSW #define CONFIG_MII -#define CONFIG_BOOTP_DNS #define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_SUBNETMASK #define CONFIG_NET_RETRY_COUNT 10 #define CONFIG_PHY_ET1011C #define CONFIG_PHY_ET1011C_TX_CLK_FIX diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index d63481af7c1..35c7a9175b1 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -101,11 +101,8 @@ #define CONFIG_DRIVER_TI_EMAC #define CONFIG_MII -#define CONFIG_BOOTP_DNS #define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_SUBNETMASK #define CONFIG_NET_RETRY_COUNT 10 /* Since SPL did pll and ddr initialization for us, diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h index 66cacdf3479..6c93fd3f9b6 100644 --- a/include/configs/ti_am335x_common.h +++ b/include/configs/ti_am335x_common.h @@ -30,11 +30,8 @@ #ifndef CONFIG_SPL_BUILD /* Network defines. */ -#define CONFIG_BOOTP_DNS /* Configurable parts of CMD_DHCP */ #define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_SUBNETMASK #define CONFIG_NET_RETRY_COUNT 10 #define CONFIG_MII /* Required in net/eth.c */ #endif diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 5d5b0603e50..d54831c7df2 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -113,13 +113,9 @@ * console baudrate of 115200 and use the default baud rate table. */ #define CONFIG_SYS_MALLOC_LEN SZ_32M -#define CONFIG_ENV_VARS_UBOOT_CONFIG /* Strongly encouraged */ #define CONFIG_ENV_OVERWRITE /* Overwrite ethaddr / serial# */ /* As stated above, the following choices are optional. */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING /* We set the max number of command args high to avoid HUSH bugs. */ #define CONFIG_SYS_MAXARGS 64 @@ -138,8 +134,6 @@ #define CONFIG_MTD_DEVICE /* Required for mtdparts */ #endif -#define CONFIG_SUPPORT_RAW_INITRD - /* * Our platforms make use of SPL to initalize the hardware (primarily * memory) enough for full U-Boot to be loaded. We make use of the general diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index aaeabbfedca..2fe8d9dde0f 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -96,7 +96,6 @@ #define CONFIG_PHY_MARVELL #define CONFIG_MII #define CONFIG_BOOTP_DEFAULT -#define CONFIG_BOOTP_DNS #define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 32 diff --git a/include/configs/tplink_wdr4300.h b/include/configs/tplink_wdr4300.h index ba76dcd2937..15b4ada3dc5 100644 --- a/include/configs/tplink_wdr4300.h +++ b/include/configs/tplink_wdr4300.h @@ -41,13 +41,10 @@ * Command */ /* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */ #define CONFIG_SYS_MAXARGS 32 /* Max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot argument buffer size */ -#define CONFIG_AUTO_COMPLETE /* Command auto complete */ -#define CONFIG_CMDLINE_EDITING /* Command history etc */ #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " /* USB, USB storage, USB ethernet */ diff --git a/include/configs/trats.h b/include/configs/trats.h index 9a714ffb265..e6649fffa28 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -57,7 +57,6 @@ #define CONFIG_ENV_OVERWRITE -#define CONFIG_ENV_VARS_UBOOT_CONFIG #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG /* Tizen - partitions definitions */ diff --git a/include/configs/trats2.h b/include/configs/trats2.h index b51aff5ee12..c3eb7c95fed 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -52,7 +52,6 @@ #define CONFIG_ENV_OVERWRITE -#define CONFIG_ENV_VARS_UBOOT_CONFIG #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG /* Tizen - partitions definitions */ diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index cc05eea7e41..80dfe12856a 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -189,9 +189,6 @@ #endif /* CONFIG_FLASHCARD */ /* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_CMDLINE_EDITING /* enable cmdline history */ -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ #define CONFIG_SYS_MEMTEST_START (OMAP34XX_SDRC_CS0 + 0x00000000) diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h index e41dce302ca..d71baab3d63 100644 --- a/include/configs/ts4800.h +++ b/include/configs/ts4800.h @@ -117,13 +117,9 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_CMDLINE_EDITING - /*----------------------------------------------------------------------- * Physical Memory Map */ diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 50040874a3c..8aeda4eb208 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -48,9 +48,6 @@ /* serial console configuration */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ - -#define CONFIG_CMDLINE_EDITING /* add command line history */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ /* Boot Argument Buffer Size */ #define CONFIG_SYS_BARGSIZE (CONFIG_SYS_CBSIZE) @@ -94,8 +91,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_BOOTM_LEN (32 << 20) -#define CONFIG_CMDLINE_EDITING /* add command line history */ - #if defined(CONFIG_ARM64) /* ARM Trusted Firmware */ #define BOOT_IMAGES \ diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h index 3aaf0cf4310..c8cbd34cdb1 100644 --- a/include/configs/usb_a9263.h +++ b/include/configs/usb_a9263.h @@ -38,9 +38,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 @@ -93,10 +90,6 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \ -#define CONFIG_CMDLINE_EDITING -#define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_LONGHELP - /* * Size of malloc() pool */ diff --git a/include/configs/vct.h b/include/configs/vct.h index a5b5aafb407..21682795ebb 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -87,18 +87,12 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME -#define CONFIG_BOOTP_SUBNETMASK /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ #define CONFIG_TIMESTAMP /* Print image info with timestamp */ -#define CONFIG_CMDLINE_EDITING /* add command line history */ /* * FLASH and environment organization @@ -210,7 +204,6 @@ int vct_gpio_get(int pin); #if defined(CONFIG_VCT_SMALL_IMAGE) #undef CONFIG_SYS_I2C_SOFT #undef CONFIG_SOURCE -#undef CONFIG_SYS_LONGHELP #undef CONFIG_TIMESTAMP #endif /* CONFIG_VCT_SMALL_IMAGE */ diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h index 6bb473fdb36..580a08b0d38 100644 --- a/include/configs/ve8313.h +++ b/include/configs/ve8313.h @@ -300,21 +300,14 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* * Command line configuration. */ -#define CONFIG_CMDLINE_EDITING 1 -#define CONFIG_AUTO_COMPLETE /* add autocompletion support */ - /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_LOAD_ADDR 0x100000 /* default load address */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 0b283994e91..d3422a5a2a8 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -17,8 +17,6 @@ #define CONFIG_REMAKE_ELF -#define CONFIG_SUPPORT_RAW_INITRD - /* Link Definitions */ #if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) || \ defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM) @@ -118,10 +116,6 @@ /* BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME -#define CONFIG_BOOTP_PXE /* Miscellaneous configurable options */ #define CONFIG_SYS_LOAD_ADDR (V2M_BASE + 0x10000000) @@ -220,8 +214,6 @@ /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_MAXARGS 64 /* max command args */ #ifdef CONFIG_TARGET_VEXPRESS64_JUNO diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index 8bc4519e719..70fdbe452ab 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -147,9 +147,6 @@ /* BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* Miscellaneous configurable options */ #define CONFIG_SYS_LOAD_ADDR (V2M_BASE + 0x8000) @@ -260,6 +257,5 @@ /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ -#define CONFIG_SYS_LONGHELP #endif /* VEXPRESS_COMMON_H */ diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index b712c0277ae..80a501e5601 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -178,8 +178,6 @@ "else run netboot; fi" /* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#undef CONFIG_AUTO_COMPLETE #define CONFIG_SYS_MEMTEST_START 0x80010000 #define CONFIG_SYS_MEMTEST_END 0x87C00000 diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h index b3e7abe2c5e..6bbf364c0cd 100644 --- a/include/configs/vme8349.h +++ b/include/configs/vme8349.h @@ -205,9 +205,6 @@ #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR + 0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR + 0x4600) -#define CONFIG_CMDLINE_EDITING /* add command line history */ -#define CONFIG_AUTO_COMPLETE /* add autocompletion support */ - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL @@ -331,9 +328,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* * Command line configuration. @@ -350,7 +344,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ /* diff --git a/include/configs/wb45n.h b/include/configs/wb45n.h index 75a432c17e8..b6c2a4aba05 100644 --- a/include/configs/wb45n.h +++ b/include/configs/wb45n.h @@ -31,9 +31,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 @@ -118,9 +115,6 @@ #define CONFIG_SYS_CBSIZE 256 #define CONFIG_SYS_MAXARGS 16 -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING -#define CONFIG_AUTO_COMPLETE /* * Size of malloc() pool diff --git a/include/configs/wb50n.h b/include/configs/wb50n.h index 0a2543bc7b9..c61865f0b22 100644 --- a/include/configs/wb50n.h +++ b/include/configs/wb50n.h @@ -38,9 +38,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 @@ -105,9 +102,6 @@ #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_PBSIZE \ (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING -#define CONFIG_AUTO_COMPLETE /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (2 * 1024 * 1024) diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h index a81d934203a..af06548bee2 100644 --- a/include/configs/woodburn_common.h +++ b/include/configs/woodburn_common.h @@ -70,9 +70,6 @@ /* * Command definition */ -#define CONFIG_BOOTP_SUBNETMASK -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_DNS #define CONFIG_NET_RETRY_COUNT 100 @@ -94,10 +91,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_CMDLINE_EDITING - -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_MEMTEST_START 0 /* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0x10000 diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 5e8638d33bb..cabd8156fa1 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -84,13 +84,9 @@ /* * U-Boot General Configurations */ -#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING - /* * NAND chip timings for FIXME: which one? */ diff --git a/include/configs/x600.h b/include/configs/x600.h index 3f637612241..4bf8b1051e5 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -114,9 +114,6 @@ #define CONFIG_SYS_MEMTEST_START 0x00800000 #define CONFIG_SYS_MEMTEST_END 0x04000000 #define CONFIG_SYS_MALLOC_LEN (8 << 20) -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_LOAD_ADDR 0x00800000 /* Use last 2 lwords in internal SRAM for bootcounter */ diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index e8f680f129f..8d8c689049a 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -55,9 +55,6 @@ 9600, 19200, 38400, 115200} #define CONFIG_SYS_NS16550_PORT_MAPPED -#define CONFIG_CMDLINE_EDITING -#define CONFIG_AUTO_COMPLETE - /*----------------------------------------------------------------------- * Command line configuration. */ @@ -74,7 +71,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_CBSIZE 512 #define CONFIG_SYS_MEMTEST_START 0x00100000 @@ -113,9 +109,6 @@ #define CONFIG_TFTP_TSIZE #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* Default environment */ #define CONFIG_ROOTPATH "/opt/nfsroot" diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 55338312a78..66f6fe574c6 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -52,20 +52,9 @@ /* BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME #define CONFIG_BOOTP_MAY_FAIL -#define CONFIG_BOOTP_DNS -#define CONFIG_BOOTP_PXE -#define CONFIG_BOOTP_SUBNETMASK /* Diff from config_distro_defaults.h */ -#define CONFIG_SUPPORT_RAW_INITRD -#if !defined(CONFIG_SPL_BUILD) -#define CONFIG_ENV_VARS_UBOOT_CONFIG -#endif -#define CONFIG_AUTO_COMPLETE #if defined(CONFIG_MMC_SDHCI_ZYNQ) # define CONFIG_SUPPORT_EMMC_BOOT @@ -126,8 +115,6 @@ /* Console I/O Buffer Size */ #define CONFIG_SYS_CBSIZE 2048 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING #define CONFIG_PANIC_HANG #define CONFIG_SYS_MAXARGS 64 diff --git a/include/configs/xilinx_zynqmp_mini.h b/include/configs/xilinx_zynqmp_mini.h index 268d7b7d52a..00f4c1c087b 100644 --- a/include/configs/xilinx_zynqmp_mini.h +++ b/include/configs/xilinx_zynqmp_mini.h @@ -17,14 +17,11 @@ #undef CONFIG_EXTRA_ENV_SETTINGS #undef CONFIG_SYS_MALLOC_LEN #undef CONFIG_ENV_SIZE -#undef CONFIG_CMDLINE_EDITING -#undef CONFIG_AUTO_COMPLETE #undef CONFIG_ZLIB #undef CONFIG_GZIP #undef CONFIG_CMD_ENV #undef CONFIG_MP #undef CONFIG_SYS_INIT_SP_ADDR -#undef CONFIG_SYS_LONGHELP #undef CONFIG_MTD_DEVICE #undef CONFIG_BOOTM_NETBSD #undef CONFIG_BOOTM_VXWORKS @@ -33,11 +30,7 @@ /* BOOTP options */ #undef CONFIG_BOOTP_BOOTFILESIZE -#undef CONFIG_BOOTP_BOOTPATH -#undef CONFIG_BOOTP_GATEWAY -#undef CONFIG_BOOTP_HOSTNAME #undef CONFIG_BOOTP_MAY_FAIL -#undef CONFIG_BOOTP_PXE #undef CONFIG_CMD_UNZIP #undef CONFIG_NR_DRAM_BANKS diff --git a/include/configs/xilinx_zynqmp_mini_emmc.h b/include/configs/xilinx_zynqmp_mini_emmc.h index 6f56cf61a61..e4d8be63e5d 100644 --- a/include/configs/xilinx_zynqmp_mini_emmc.h +++ b/include/configs/xilinx_zynqmp_mini_emmc.h @@ -18,6 +18,5 @@ #define CONFIG_ENV_SIZE 0x10000 #define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MALLOC_LEN 0x800000 -#define CONFIG_SYS_LONGHELP #endif /* __CONFIG_ZYNQMP_MINI_EMMC_H */ diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index cca8dc4e217..de10d8ce3e6 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -480,9 +480,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ -#define CONFIG_CMDLINE_EDITING 1 /* Command-line editing */ #define CONFIG_LOADADDR 0x1000000 /* default location for tftp and bootm */ #define CONFIG_PREBOOT /* enable preboot variable */ #define CONFIG_INTEGRITY /* support booting INTEGRITY OS */ diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h index 446c903c61a..dfacd2a012a 100644 --- a/include/configs/xpedite520x.h +++ b/include/configs/xpedite520x.h @@ -275,16 +275,11 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ -#define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_AUTO_COMPLETE 1 /* add autocompletion support */ #define CONFIG_LOADADDR 0x1000000 /* default location for tftp and bootm */ #define CONFIG_PREBOOT /* enable preboot variable */ #define CONFIG_INTEGRITY /* support booting INTEGRITY OS */ diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index ff4f96797db..ea4773c4457 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -332,10 +332,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ -#define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_AUTO_COMPLETE 1 /* add autocompletion support */ #define CONFIG_LOADADDR 0x1000000 /* default location for tftp and bootm */ #define CONFIG_PREBOOT /* enable preboot variable */ #define CONFIG_INTEGRITY /* support booting INTEGRITY OS */ diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index f8c591a8841..883843aac92 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -329,10 +329,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ -#define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_AUTO_COMPLETE 1 /* add autocompletion support */ #define CONFIG_LOADADDR 0x1000000 /* default location for tftp and bootm */ #define CONFIG_PREBOOT /* enable preboot variable */ #define CONFIG_INTEGRITY /* support booting INTEGRITY OS */ diff --git a/include/configs/xpress.h b/include/configs/xpress.h index c2575f01d9d..46e50b3d4a1 100644 --- a/include/configs/xpress.h +++ b/include/configs/xpress.h @@ -39,8 +39,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 -#define CONFIG_CMDLINE_EDITING - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h index 496f3772d5d..691adda332c 100644 --- a/include/configs/xtfpga.h +++ b/include/configs/xtfpga.h @@ -121,9 +121,6 @@ /* U-Boot autoboot configuration */ /*==============================*/ -#define CONFIG_AUTO_COMPLETE /* Support tab autocompletion */ -#define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_LONGHELP #define CONFIG_MX_CYCLIC #define CONFIG_SHOW_BOOT_PROGRESS diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h index ae61f0620fe..b5a326befa8 100644 --- a/include/configs/zipitz2.h +++ b/include/configs/zipitz2.h @@ -77,8 +77,6 @@ unsigned char zipitz2_spi_read(void); #endif #endif -#define CONFIG_SYS_LONGHELP /* undef to save memory */ - #define CONFIG_SYS_DEVICE_NULLDEV 1 /* diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h index 4173da85fcf..124431b8d14 100644 --- a/include/configs/zmx25.h +++ b/include/configs/zmx25.h @@ -53,9 +53,6 @@ * BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME /* * Command line configuration. @@ -108,9 +105,6 @@ #define CONFIG_SYS_MEMTEST_START (PHYS_SDRAM + (512*1024)) #define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM + PHYS_SDRAM_SIZE) -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING - #define CONFIG_PREBOOT "" diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 2dfac6fe6c9..a5f7b0288b9 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -38,9 +38,6 @@ #if defined(CONFIG_ZYNQ_GEM) # define CONFIG_MII # define CONFIG_SYS_FAULT_ECHO_LINK_DOWN -# define CONFIG_BOOTP_BOOTPATH -# define CONFIG_BOOTP_GATEWAY -# define CONFIG_BOOTP_HOSTNAME # define CONFIG_BOOTP_MAY_FAIL #endif @@ -255,9 +252,6 @@ /* Miscellaneous configurable options */ -#define CONFIG_CMDLINE_EDITING -#define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_LONGHELP #define CONFIG_CLOCKS #define CONFIG_SYS_MAXARGS 32 /* max number of command args */ diff --git a/include/configs/zynq_cse.h b/include/configs/zynq_cse.h index f0f19a67bf3..2ca36757e31 100644 --- a/include/configs/zynq_cse.h +++ b/include/configs/zynq_cse.h @@ -20,13 +20,9 @@ #undef CONFIG_EXTRA_ENV_SETTINGS #undef CONFIG_BOARD_LATE_INIT #undef CONFIG_ENV_SIZE -#undef CONFIG_CMDLINE_EDITING -#undef CONFIG_AUTO_COMPLETE #undef CONFIG_ZLIB #undef CONFIG_GZIP -#undef CONFIG_SYS_LONGHELP - #undef CONFIG_SYS_CBSIZE #undef CONFIG_BOOTM_VXWORKS #undef CONFIG_BOOTM_LINUX |