From dcab138793d9fde507e48e3b956bb4d824ff5eb4 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Wed, 17 May 2017 03:25:12 -0600
Subject: [PATCH] Kconfig: Drop CONFIG_CMD_ENV

This option is not used in U-Boot. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 include/configs/ap_sh4a_4a.h        | 1 -
 include/configs/calimain.h          | 1 -
 include/configs/clearfog.h          | 1 -
 include/configs/colibri_pxa270.h    | 1 -
 include/configs/controlcenterdc.h   | 1 -
 include/configs/da850evm.h          | 2 --
 include/configs/db-88f6720.h        | 1 -
 include/configs/db-88f6820-amc.h    | 1 -
 include/configs/db-88f6820-gp.h     | 1 -
 include/configs/db-mv784mp-gp.h     | 1 -
 include/configs/dns325.h            | 1 -
 include/configs/dockstar.h          | 1 -
 include/configs/dragonboard410c.h   | 1 -
 include/configs/ds414.h             | 1 -
 include/configs/ea20.h              | 2 --
 include/configs/ecovec.h            | 1 -
 include/configs/espt.h              | 1 -
 include/configs/goflexhome.h        | 1 -
 include/configs/hikey.h             | 1 -
 include/configs/iconnect.h          | 1 -
 include/configs/ipam390.h           | 1 -
 include/configs/lacie_kw.h          | 1 -
 include/configs/ls1012a_common.h    | 1 -
 include/configs/ls1043a_common.h    | 3 ---
 include/configs/ls1046a_common.h    | 3 ---
 include/configs/ls2080a_common.h    | 1 -
 include/configs/lsxl.h              | 1 -
 include/configs/maxbcm.h            | 1 -
 include/configs/meson-gxbb-common.h | 2 --
 include/configs/mv-plug-common.h    | 1 -
 include/configs/omapl138_lcdk.h     | 2 --
 include/configs/openrd.h            | 1 -
 include/configs/pogo_e02.h          | 1 -
 include/configs/r0p7734.h           | 1 -
 include/configs/s32v234evb.h        | 1 -
 include/configs/shmin.h             | 1 -
 include/configs/spear-common.h      | 1 -
 include/configs/theadorable.h       | 1 -
 include/configs/vexpress_aemv8a.h   | 1 -
 include/configs/vme8349.h           | 4 ----
 include/configs/x600.h              | 1 -
 include/configs/xilinx_zynqmp.h     | 1 -
 include/configs/zipitz2.h           | 1 -
 scripts/config_whitelist.txt        | 1 -
 44 files changed, 55 deletions(-)

diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h
index d3d72b6..440505d 100644
--- a/include/configs/ap_sh4a_4a.h
+++ b/include/configs/ap_sh4a_4a.h
@@ -17,7 +17,6 @@
 #define CONFIG_SYS_TEXT_BASE 0x8BFC0000
 
 #define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_ENV
 
 #define CONFIG_BOOTARGS		"console=ttySC4,115200"
 
diff --git a/include/configs/calimain.h b/include/configs/calimain.h
index 6e2fd33..f5d108e 100644
--- a/include/configs/calimain.h
+++ b/include/configs/calimain.h
@@ -299,7 +299,6 @@
 /*
  * U-Boot commands
  */
-#define CONFIG_CMD_ENV
 #define CONFIG_CMD_SAVES
 
 #ifndef CONFIG_DRIVER_TI_EMAC
diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
index 0c51d2a..3397aaf 100644
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -24,7 +24,6 @@
 /*
  * Commands configuration
  */
-#define CONFIG_CMD_ENV
 #define CONFIG_CMD_PCI
 
 /* I2C */
diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
index 62a404a..5879639 100644
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -51,7 +51,6 @@
 /*
  * Bootloader Components Configuration
  */
-#define	CONFIG_CMD_ENV
 
 /* I2C support */
 #ifdef CONFIG_SYS_I2C
diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h
index f73516c..a04af31 100644
--- a/include/configs/controlcenterdc.h
+++ b/include/configs/controlcenterdc.h
@@ -32,7 +32,6 @@
 /*
  * Commands configuration
  */
-#define CONFIG_CMD_ENV
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_SCSI
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index d2aebc8..e0bbf94 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -273,7 +273,6 @@
 /*
  * U-Boot commands
  */
-#define CONFIG_CMD_ENV
 #define CONFIG_CMD_SAVES
 
 #ifdef CONFIG_CMD_BDI
@@ -302,7 +301,6 @@
 	!defined(CONFIG_USE_SPIFLASH)
 #define CONFIG_ENV_IS_NOWHERE
 #define CONFIG_ENV_SIZE		(16 << 10)
-#undef CONFIG_CMD_ENV
 #endif
 
 #ifndef CONFIG_DIRECT_NOR_BOOT
diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h
index 6e2561c..699c03f 100644
--- a/include/configs/db-88f6720.h
+++ b/include/configs/db-88f6720.h
@@ -23,7 +23,6 @@
 /*
  * Commands configuration
  */
-#define CONFIG_CMD_ENV
 
 /* I2C */
 #define CONFIG_SYS_I2C
diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h
index 1cdefa0..0f0ab01 100644
--- a/include/configs/db-88f6820-amc.h
+++ b/include/configs/db-88f6820-amc.h
@@ -24,7 +24,6 @@
 /*
  * Commands configuration
  */
-#define CONFIG_CMD_ENV
 #define CONFIG_CMD_PCI
 
 /* SPI NOR flash default params, used by sf commands */
diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h
index 676dfc9..0890a4d 100644
--- a/include/configs/db-88f6820-gp.h
+++ b/include/configs/db-88f6820-gp.h
@@ -24,7 +24,6 @@
 /*
  * Commands configuration
  */
-#define CONFIG_CMD_ENV
 #define CONFIG_CMD_PCI
 #define CONFIG_SCSI
 
diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h
index fc8a3ec..821aa9d 100644
--- a/include/configs/db-mv784mp-gp.h
+++ b/include/configs/db-mv784mp-gp.h
@@ -25,7 +25,6 @@
 /*
  * Commands configuration
  */
-#define CONFIG_CMD_ENV
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_SATA
diff --git a/include/configs/dns325.h b/include/configs/dns325.h
index 9450b62..de68233 100644
--- a/include/configs/dns325.h
+++ b/include/configs/dns325.h
@@ -28,7 +28,6 @@
 /*
  * Commands configuration
  */
-#define CONFIG_CMD_ENV
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_IDE
 #define CONFIG_SYS_MVFS
diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h
index 69429ed..2db31d3 100644
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
@@ -23,7 +23,6 @@
 /*
  * Commands configuration
  */
-#define CONFIG_CMD_ENV
 #define CONFIG_CMD_NAND
 /*
  * mv-common.h should be defined after CMD configs since it used them
diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h
index b97c6c4..11c842d 100644
--- a/include/configs/dragonboard410c.h
+++ b/include/configs/dragonboard410c.h
@@ -46,7 +46,6 @@
 #define CONFIG_USB_ETHER_SMSC95XX
 
 /* Extra Commands */
-#define CONFIG_CMD_ENV
 /* Enable that for switching of boot partitions */
 /* Disabled by default as some sub-commands can brick eMMC */
 /*#define CONFIG_SUPPORT_EMMC_BOOT */
diff --git a/include/configs/ds414.h b/include/configs/ds414.h
index 2c83a71..aaba5d8 100644
--- a/include/configs/ds414.h
+++ b/include/configs/ds414.h
@@ -23,7 +23,6 @@
 /*
  * Commands configuration
  */
-#define CONFIG_CMD_ENV
 
 /* I2C */
 #define CONFIG_SYS_I2C
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index 3a5b5c7..53ee1ad 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -128,7 +128,6 @@
 /*
  * U-Boot commands
  */
-#define CONFIG_CMD_ENV
 #define CONFIG_CMD_SAVES
 
 #ifdef CONFIG_CMD_BDI
@@ -169,7 +168,6 @@
 	!defined(CONFIG_USE_SPIFLASH)
 #define CONFIG_ENV_IS_NOWHERE
 #define CONFIG_ENV_SIZE		(16 << 10)
-#undef CONFIG_CMD_ENV
 #endif
 
 /* additions for new relocation code, must added to all boards */
diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h
index f8fb97b..2404441 100644
--- a/include/configs/ecovec.h
+++ b/include/configs/ecovec.h
@@ -29,7 +29,6 @@
 #define CONFIG_SYS_TEXT_BASE 0x8FFC0000
 
 #define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_ENV
 
 #define CONFIG_BOOTARGS		"console=ttySC0,115200"
 
diff --git a/include/configs/espt.h b/include/configs/espt.h
index ace7186..845bcc1 100644
--- a/include/configs/espt.h
+++ b/include/configs/espt.h
@@ -18,7 +18,6 @@
  * Command line configuration.
  */
 #define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_ENV
 
 #define CONFIG_BOOTARGS         "console=ttySC0,115200 root=1f01"
 #define CONFIG_ENV_OVERWRITE    1
diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h
index f9bced3..dbcd2b2 100644
--- a/include/configs/goflexhome.h
+++ b/include/configs/goflexhome.h
@@ -43,7 +43,6 @@
  * Commands configuration
  */
 
-#define CONFIG_CMD_ENV
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_IDE
 #define CONFIG_SYS_MVFS         /* Picks up Filesystem from mv-common.h */
diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index 584ce52..0fb6fb3 100644
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -73,7 +73,6 @@
 #define CONFIG_FS_EXT4
 
 /* Command line configuration */
-#define CONFIG_CMD_ENV
 
 #define CONFIG_MTD_PARTITIONS
 
diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h
index 950a719..46374f2 100644
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
@@ -32,7 +32,6 @@
  * Commands configuration
  */
 #define CONFIG_SYS_MVFS
-#define CONFIG_CMD_ENV
 #define CONFIG_CMD_NAND
 
 /*
diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h
index bc8f5d5..a3c0cfa 100644
--- a/include/configs/ipam390.h
+++ b/include/configs/ipam390.h
@@ -241,7 +241,6 @@
 /*
  * U-Boot commands
  */
-#define CONFIG_CMD_ENV
 #define CONFIG_CMD_SAVES
 
 #ifdef CONFIG_CMD_BDI
diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index 0737a3e..69c08c6 100644
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -43,7 +43,6 @@
 /*
  * Commands configuration
  */
-#define CONFIG_CMD_ENV
 #define CONFIG_CMD_IDE
 #ifndef CONFIG_NETSPACE_MINI_V2 /* No USB ports on Network Space v2 Mini */
 #endif
diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h
index 09f890d..561b81a 100644
--- a/include/configs/ls1012a_common.h
+++ b/include/configs/ls1012a_common.h
@@ -85,7 +85,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /* Command line configuration */
-#define CONFIG_CMD_ENV
 #undef CONFIG_CMD_IMLS
 
 #define CONFIG_SYS_HZ			1000
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index 0522d1e..4758c55 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -174,9 +174,6 @@
 #endif
 
 /* Command line configuration */
-#ifndef SPL_NO_ENV
-#define CONFIG_CMD_ENV
-#endif
 
 /*  MMC  */
 #ifndef SPL_NO_MMC
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index da1e860..98b00ed 100644
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -139,9 +139,6 @@
 #define CONFIG_SYS_I2C_MXC_I2C4
 
 /* Command line configuration */
-#ifndef SPL_NO_ENV
-#define CONFIG_CMD_ENV
-#endif
 
 /* MMC */
 #ifndef SPL_NO_MMC
diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h
index 512eed8..ed7d1d7 100644
--- a/include/configs/ls2080a_common.h
+++ b/include/configs/ls2080a_common.h
@@ -160,7 +160,6 @@ unsigned long long get_qixis_addr(void);
 #endif
 
 /* Command line configuration */
-#define CONFIG_CMD_ENV
 
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LOAD_ADDR	(CONFIG_SYS_DDR_SDRAM_BASE + 0x10000000)
diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h
index ce6d7c9..59542a6 100644
--- a/include/configs/lsxl.h
+++ b/include/configs/lsxl.h
@@ -38,7 +38,6 @@
 /*
  * Commands configuration
  */
-#define CONFIG_CMD_ENV
 #define CONFIG_CMD_IDE
 
 /*
diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h
index cdb3a47..b82a684 100644
--- a/include/configs/maxbcm.h
+++ b/include/configs/maxbcm.h
@@ -23,7 +23,6 @@
 /*
  * Commands configuration
  */
-#define CONFIG_CMD_ENV
 
 /* I2C */
 #define CONFIG_SYS_I2C
diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h
index f1734c0..12a4dfc 100644
--- a/include/configs/meson-gxbb-common.h
+++ b/include/configs/meson-gxbb-common.h
@@ -26,8 +26,6 @@
 #define GICD_BASE			0xc4301000
 #define GICC_BASE			0xc4302000
 
-#define CONFIG_CMD_ENV
-
 /* Monitor Command Prompt */
 /* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/mv-plug-common.h b/include/configs/mv-plug-common.h
index 83c559e..ce85e38 100644
--- a/include/configs/mv-plug-common.h
+++ b/include/configs/mv-plug-common.h
@@ -28,7 +28,6 @@
 /*
  * Commands configuration
  */
-#define CONFIG_CMD_ENV
 #define CONFIG_CMD_IDE
 
 /*
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index c8d0598..9db4eeb 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -284,7 +284,6 @@
 /*
  * U-Boot commands
  */
-#define CONFIG_CMD_ENV
 #define CONFIG_CMD_SAVES
 #ifdef CONFIG_CMD_BDI
 #define CONFIG_CLOCKS
@@ -309,7 +308,6 @@
 	!defined(CONFIG_USE_SPIFLASH)
 #define CONFIG_ENV_IS_NOWHERE
 #define CONFIG_ENV_SIZE		(16 << 10)
-#undef CONFIG_CMD_ENV
 #endif
 
 /* SD/MMC */
diff --git a/include/configs/openrd.h b/include/configs/openrd.h
index 19660db..6c17f3b 100644
--- a/include/configs/openrd.h
+++ b/include/configs/openrd.h
@@ -26,7 +26,6 @@
  * Commands configuration
  */
 #define CONFIG_SYS_MVFS
-#define CONFIG_CMD_ENV
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_IDE
 
diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h
index 36f6e95..e62e217 100644
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
@@ -29,7 +29,6 @@
  * Commands configuration
  */
 #define CONFIG_SYS_MVFS
-#define CONFIG_CMD_ENV
 #define CONFIG_CMD_NAND
 
 /*
diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h
index b159b1e..6212dba 100644
--- a/include/configs/r0p7734.h
+++ b/include/configs/r0p7734.h
@@ -17,7 +17,6 @@
 #define CONFIG_SYS_TEXT_BASE 0x8FFC0000
 
 #define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_ENV
 
 #define CONFIG_BOOTARGS		"console=ttySC3,115200"
 
diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h
index 33487cd..b25a7ea 100644
--- a/include/configs/s32v234evb.h
+++ b/include/configs/s32v234evb.h
@@ -117,7 +117,6 @@
 #define CONFIG_LOADADDR			0xC307FFC0
 #define CONFIG_BOOTARGS			"console=ttyLF0 root=/dev/ram rw"
 
-#define CONFIG_CMD_ENV
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"boot_scripts=boot.scr.uimg boot.scr\0" \
 	"scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
diff --git a/include/configs/shmin.h b/include/configs/shmin.h
index bc1eba3..995f76a 100644
--- a/include/configs/shmin.h
+++ b/include/configs/shmin.h
@@ -16,7 +16,6 @@
 /* #define CONFIG_T_SH7706LSR	1 */
 
 #define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_ENV
 
 #define CONFIG_BOOTARGS		"console=ttySC0,115200"
 
diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
index 75fd27a..86e14ff 100644
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@@ -97,7 +97,6 @@
  * Command support defines
  */
 #define CONFIG_CMD_NAND
-#define CONFIG_CMD_ENV
 #define CONFIG_CMD_SAVES
 
 /*
diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h
index 2a671e8..27cae9d 100644
--- a/include/configs/theadorable.h
+++ b/include/configs/theadorable.h
@@ -23,7 +23,6 @@
 /*
  * Commands configuration
  */
-#define CONFIG_CMD_ENV
 #define CONFIG_CMD_SATA
 
 /*
diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index ae13246..11cb535 100644
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -125,7 +125,6 @@
 #endif
 
 /*#define CONFIG_MENU_SHOW*/
-#define CONFIG_CMD_ENV
 
 /* BOOTP options */
 #define CONFIG_BOOTP_BOOTFILESIZE
diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h
index ae18bd6..1aed81f 100644
--- a/include/configs/vme8349.h
+++ b/include/configs/vme8349.h
@@ -351,10 +351,6 @@
     #define CONFIG_CMD_PCI
 #endif
 
-#if defined(CONFIG_SYS_RAMBOOT)
-    #undef CONFIG_CMD_ENV
-#endif
-
 /* Pass Ethernet MAC to VxWorks */
 #define CONFIG_SYS_VXWORKS_MAC_PTR	0x000043f0
 
diff --git a/include/configs/x600.h b/include/configs/x600.h
index bf6fafc..afbd837 100644
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -106,7 +106,6 @@
 /*
  * Command support defines
  */
-#define CONFIG_CMD_ENV
 #define CONFIG_CMD_FPGA_LOADMK
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_CMD_NAND
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 0b3154b..1b43620 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -52,7 +52,6 @@
 	{ 4800, 9600, 19200, 38400, 57600, 115200 }
 
 /* Command line configuration */
-#define CONFIG_CMD_ENV
 #define CONFIG_MP
 
 /* BOOTP options */
diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h
index 841cc6d..8a745e5 100644
--- a/include/configs/zipitz2.h
+++ b/include/configs/zipitz2.h
@@ -54,7 +54,6 @@
 /*
  * Bootloader Components Configuration
  */
-#define	CONFIG_CMD_ENV
 
 /*
  * MMC Card Configuration
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 6c50d99..ec9ee88 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -383,7 +383,6 @@ CONFIG_CM922T_XA10
 CONFIG_CMDLINE_EDITING
 CONFIG_CMDLINE_PS_SUPPORT
 CONFIG_CMDLINE_TAG
-CONFIG_CMD_ENV
 CONFIG_CMD_ENV_CALLBACK
 CONFIG_CMD_ENV_FLAGS
 CONFIG_CMD_ERRATA
-- 
2.7.4