diff --git a/include/configs/bcm_ep_board.h b/include/configs/bcm_ep_board.h
index c187df233c59519b6fed138710d5c5b678f831f3..d9b88fa2d315936424fa6c19e08be86a578ef8da 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 ec2ce3f926c9201a1f593c620456abb565a40d6d..dc2860382d65f70a6619771cab547f1ac69d9649 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 4cdb27ccec78684b9261cab414111cdb938f9a33..584ce52bd069d1ab6eb246aa8b24a59945994c10 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 92eb79298975bda30182fb085073cef2941e8b25..244f5101974057305cb6b17c5f93e489af08a686 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 4c112cc1a99d916e2cfb5d7e5aaaafe5c10695f8..e9e78c4b40b290af0289e9b78ee597e53752aba2 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 3f2da5795d21ba8d4cb9adb93b6e1f87ff036826..109b8e810d24aaeacd906fbd887d1ffb4713f4d7 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 c0462bce903a5aa936cafd1cde15338cc0a31efe..5107a1f6093e2e92f48e2089c9a55ec844983141 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 d69e609bd902ee5f3783220b1f449924c3c576f3..0b67bb7e6f65bacb5c54a70ea4e5a473159b00e1 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 5e515d215c1d7882dc2bcec7dd0367b2855ce888..cad6117034c4c1f8b9edf5f0ec15adf2d7ba5301 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