[U-Boot] [PATCH 16/47] Convert CONFIG_CMD_ENV to Kconfig

Simon Glass
2017-05-15T10:57:31Z

This converts the following to Kconfig:
CONFIG_CMD_ENV

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 5f5882dc8e..111242d9a6 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 6e2fd33563..f5d108e359 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 0c51d2a288..3397aaf2eb 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 62a404a7b1..587963963a 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 add5f90cc2..710bae8519 100644
--- a/include/configs/controlcenterdc.h
+++ b/include/configs/controlcenterdc.h
@@ -33,7 +33,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 9442c05943..c2a2cb1bdb 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 6e2561cb5a..699c03f844 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 1cdefa0549..0f0ab01f62 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 676dfc996b..0890a4db62 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 fc8a3ec7dc..821aa9dec1 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 9450b62e4a..de682334eb 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 69429ed34e..2db31d3c11 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 b97c6c4240..11c842d952 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 d1d4bf0156..112966f7c1 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 3a5b5c7285..53ee1adc0b 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 f8fb97b08e..2404441860 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 ace71862dd..845bcc1c9a 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 f9bced3f8f..dbcd2b2dbe 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 584ce52bd0..0fb6fb3b60 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 950a7195fd..46374f2c37 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 5caf02e8d9..0beb31b5c0 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 0737a3e2ce..69c08c69da 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 09f890d55c..561b81a6f4 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 e26924877d..78c34eba3e 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 957ffd3634..c380fedf27 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 427f623e8c..53686e3412 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 ce6d7c9998..59542a62e4 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 cdb3a473ea..b82a684cc9 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 f1734c0e21..12a4dfce6b 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 83c559ed66..ce85e38875 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 0cc0042bca..5995c662b6 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 19660db080..6c17f3b24b 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 36f6e95ced..e62e21704c 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 642572fc95..f8e1f16d9c 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 398b3aa343..45c99ff42d 100644
--- a/include/configs/s32v234evb.h
+++ b/include/configs/s32v234evb.h
@@ -127,7 +127,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 bc1eba32ff..995f76a1ea 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 75fd27a373..86e14ffac8 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 2a671e84ec..27cae9d528 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 ae13246478..11cb53587c 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 ae18bd6338..1aed81fc14 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 6e52e56222..0c2fa5ba48 100644
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -107,7 +107,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 3a6a4972e6..8a433691f4 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 841cc6dbb2..8a745e5097 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 d68f3b1553..1eaf182ad9 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -384,7 +384,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.13.0.rc2.291.g57267f2277-goog