From a1b343d754dd153a9bcd884b30a352714676e468 Mon Sep 17 00:00:00 2001
From: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
Date: Tue, 18 Apr 2017 22:09:10 +0300
Subject: [PATCH] clean-up: Remove uselsess mentions of CONFIG_COMMAND_HISTORY

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>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
 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 c187df233c..d9b88fa2d3 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 ec2ce3f926..dc2860382d 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 4cdb27ccec..584ce52bd0 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 92eb792989..244f510197 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 4c112cc1a9..e9e78c4b40 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 3f2da5795d..109b8e810d 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 c0462bce90..5107a1f609 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 d69e609bd9..0b67bb7e6f 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 5e515d215c..cad6117034 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
-- 
2.39.5