These were reminders that somehow slipped through the cracks or were erroneously introduced after previous clean-ups.

Getting rid of then once again. Hopefully for good now :)

Where missing and appropriate replace with CONFIG_CMDLINE_EDITING which really enables shell history as of now.

Signed-off-by: Alexey Brodkin abrodkin@synopsys.com Cc: Masahiro Yamada yamada.masahiro@socionext.com Cc: Peter Griffin peter.griffin@linaro.org Cc: Stephen Warren swarren@wwwdotorg.org Cc: Steve Rae steve.rae@raedomain.com Cc: Jon Mason jon.mason@broadcom.com Cc: Simon Glass sjg@chromium.org Cc: Stefan Roese sr@denx.de --- include/configs/bcm_ep_board.h | 1 - include/configs/bcm_northstar2.h | 1 - include/configs/hikey.h | 2 -- include/configs/rpi.h | 2 +- include/configs/sandbox.h | 1 - include/configs/tao3530.h | 1 - include/configs/tegra-common.h | 2 +- include/configs/x86-common.h | 1 - scripts/config_whitelist.txt | 1 - 9 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/include/configs/bcm_ep_board.h b/include/configs/bcm_ep_board.h index c187df233c59..d9b88fa2d315 100644 --- a/include/configs/bcm_ep_board.h +++ b/include/configs/bcm_ep_board.h @@ -58,7 +58,6 @@ /* version string, parser, etc */ #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING -#define CONFIG_COMMAND_HISTORY #define CONFIG_SYS_LONGHELP

#define CONFIG_CRC32_VERIFY diff --git a/include/configs/bcm_northstar2.h b/include/configs/bcm_northstar2.h index ec2ce3f926c9..dc2860382d65 100644 --- a/include/configs/bcm_northstar2.h +++ b/include/configs/bcm_northstar2.h @@ -49,7 +49,6 @@

/* version string, parser, etc */ #define CONFIG_CMDLINE_EDITING -#define CONFIG_COMMAND_HISTORY #define CONFIG_SYS_LONGHELP

#endif /* __BCM_NORTHSTAR2_H */ diff --git a/include/configs/hikey.h b/include/configs/hikey.h index 4cdb27ccec78..584ce52bd069 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -107,8 +107,6 @@ BOOTENV

/* Preserve environment on sd card */ -#define CONFIG_COMMAND_HISTORY - #define CONFIG_ENV_SIZE 0x1000 #define CONFIG_ENV_IS_IN_FAT #define FAT_ENV_INTERFACE "mmc" diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 92eb79298975..244f51019740 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -118,7 +118,7 @@

/* Shell */ #define CONFIG_SYS_MAXARGS 16 -#define CONFIG_COMMAND_HISTORY +#define CONFIG_CMDLINE_EDITING

/* ATAGs support for bootm/bootz */ #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 4c112cc1a99d..e9e78c4b40b2 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -54,7 +54,6 @@

/* turn on command-line edit/c/auto */ #define CONFIG_CMDLINE_EDITING -#define CONFIG_COMMAND_HISTORY #define CONFIG_AUTO_COMPLETE

#define CONFIG_ENV_SIZE 8192 diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 3f2da5795d21..109b8e810d24 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -167,7 +167,6 @@

/* turn on command-line edit/hist/auto */ #define CONFIG_CMDLINE_EDITING -#define CONFIG_COMMAND_HISTORY #define CONFIG_AUTO_COMPLETE

/* Print Buffer Size */ diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index c0462bce903a..5107a1f6093e 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -51,7 +51,7 @@ #define CONFIG_ENV_OVERWRITE

/* turn on command-line edit/hist/auto */ -#define CONFIG_COMMAND_HISTORY +#define CONFIG_CMDLINE_EDITING

/* * Increasing the size of the IO buffer as default nfsargs size is more diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index d69e609bd902..0b67bb7e6f65 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -60,7 +60,6 @@ #define CONFIG_SYS_NS16550_PORT_MAPPED

#define CONFIG_CMDLINE_EDITING -#define CONFIG_COMMAND_HISTORY #define CONFIG_AUTO_COMPLETE

#define CONFIG_SUPPORT_VFAT diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index d487be72ffd1..918204ce69ee 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -511,7 +511,6 @@ CONFIG_CM_TCRAM CONFIG_CNTL CONFIG_COLDFIRE CONFIG_COMMANDS -CONFIG_COMMAND_HISTORY CONFIG_COMMON_BOOT CONFIG_COMMON_ENV_MISC CONFIG_COMMON_ENV_SETTINGS