Convert CONFIG_ENV_IS_IN_SPI_FLASH et al to Kconfig

This converts the following to Kconfig:
   CONFIG_ENV_IS_IN_SPI_FLASH
   CONFIG_ENV_IS_NOWHERE
   CONFIG_ENV_OFFSET
   CONFIG_ENV_OVERWRITE
   CONFIG_ENV_SECT_SIZE
   CONFIG_SYS_MMC_ENV_DEV
   CONFIG_SYS_MMC_ENV_PART

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/configs/cgtqmx8_defconfig b/configs/cgtqmx8_defconfig
index 3d1c438e8ba320e124146a8dc2451a56bbd14ef3..f69b5662fd0662440850be5f6ee0ee8241e02e8d 100644 (file)
--- a/configs/cgtqmx8_defconfig
+++ b/configs/cgtqmx8_defconfig
@@ -45,6 +45,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_FAT=y
 CONFIG_SPL_OF_CONTROL=y
+CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y

diff --git a/configs/imx8mn_beacon_2g_defconfig b/configs/imx8mn_beacon_2g_defconfig
index 61ab07ec937d404ac3e88fd01faf8cad463d13b7..5f116b77214895096b8936e6f6078084b0b4d4fe 100644 (file)
--- a/configs/imx8mn_beacon_2g_defconfig
+++ b/configs/imx8mn_beacon_2g_defconfig
@@ -61,6 +61,7 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_SPL_REMOVE_PROPS="interrupt-parent interrupts"
+CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_MMC_ENV_DEV=2

diff --git a/configs/imx8mn_beacon_defconfig b/configs/imx8mn_beacon_defconfig
index 3f5e23ff3b800cb78de885e9faf013da5ca1116f..52c7a7e971766466ad5ad70f17d4b5d5337dee64 100644 (file)
--- a/configs/imx8mn_beacon_defconfig
+++ b/configs/imx8mn_beacon_defconfig
@@ -61,6 +61,7 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_SPL_REMOVE_PROPS="interrupt-parent interrupts"
+CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_MMC_ENV_DEV=2

diff --git a/configs/imx8ulp_evk_defconfig b/configs/imx8ulp_evk_defconfig
index b8f18c0a06d6470c04632957b0743ee87fa374c2..129931f4c353fc2a6fe9e9bc0b7952bd2a6f4020 100644 (file)
--- a/configs/imx8ulp_evk_defconfig
+++ b/configs/imx8ulp_evk_defconfig
@@ -41,6 +41,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_REGULATOR=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_SPL_OF_CONTROL=y
+CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_NET_RANDOM_ETHADDR=y

diff --git a/configs/octeontx2_95xx_defconfig b/configs/octeontx2_95xx_defconfig
index 7bbf07b32ef4ffc1ca32993971875494cf45a25b..de5ce1cb28b1ebe98b25665a50d22d1311c0a348 100644 (file)
--- a/configs/octeontx2_95xx_defconfig
+++ b/configs/octeontx2_95xx_defconfig
@@ -63,6 +63,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_EFI_PARTITION=y
 CONFIG_PARTITION_TYPE_GUID=y
 CONFIG_OF_BOARD=y
+CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_BUS=y
 CONFIG_ENV_SPI_BUS=0

diff --git a/configs/octeontx2_96xx_defconfig b/configs/octeontx2_96xx_defconfig
index 4ab2395513153a509e09c5d99bfe879b69fb1070..011bc796ab4396ca9a237e58c113dfd088837424 100644 (file)
--- a/configs/octeontx2_96xx_defconfig
+++ b/configs/octeontx2_96xx_defconfig
@@ -64,6 +64,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_EFI_PARTITION=y
 CONFIG_PARTITION_TYPE_GUID=y
 CONFIG_OF_BOARD=y
+CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_BUS=y
 CONFIG_ENV_SPI_BUS=0

diff --git a/configs/octeontx_81xx_defconfig b/configs/octeontx_81xx_defconfig
index 706cc413b6330cbf98c3fa0da301a8c499b1d0c8..d0728ac3c670ad7d514bfee28f621bab6dbdb4ae 100644 (file)
--- a/configs/octeontx_81xx_defconfig
+++ b/configs/octeontx_81xx_defconfig
@@ -66,6 +66,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_EFI_PARTITION=y
 CONFIG_PARTITION_TYPE_GUID=y
 CONFIG_OF_BOARD=y
+CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_BUS=y
 CONFIG_ENV_SPI_BUS=0

diff --git a/configs/octeontx_83xx_defconfig b/configs/octeontx_83xx_defconfig
index 207337523bc2fb3d24dca6410ca825b29716d742..6c9609b0cd3014dbed2809ab9f91f86bb5f46d01 100644 (file)
--- a/configs/octeontx_83xx_defconfig
+++ b/configs/octeontx_83xx_defconfig
@@ -63,6 +63,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_EFI_PARTITION=y
 CONFIG_PARTITION_TYPE_GUID=y
 CONFIG_OF_BOARD=y
+CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_BUS=y
 CONFIG_ENV_SPI_BUS=0

diff --git a/configs/synquacer_developerbox_defconfig b/configs/synquacer_developerbox_defconfig
index c458bdddc1ad8d737b09f992d6498e284a82c124..4fb0fba4416daae90e8fd8cd09d91e2f328bd6af 100644 (file)
--- a/configs/synquacer_developerbox_defconfig
+++ b/configs/synquacer_developerbox_defconfig
@@ -38,6 +38,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_LOG=y
 CONFIG_PARTITION_TYPE_GUID=y
+CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_BUS=y
 CONFIG_ENV_SPI_BUS=0

diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h
index d9b59b98cdf870582ea1a17da4241d5be93391bf..45235957b4d71ac62d0a1a2d35a3ae9625d4637a 100644 (file)
--- a/include/configs/cgtqmx8.h
+++ b/include/configs/cgtqmx8.h
@@ -41,8 +41,6 @@
 #define USDHC2_BASE_ADDR               0x5B020000
 #define USDHC3_BASE_ADDR               0x5B030000
 
-#define CONFIG_ENV_OVERWRITE
-
 /* Boot M4 */
 #define M4_BOOT_ENV \
        "m4_0_image=m4_0.bin\0" \

diff --git a/include/configs/chromebook_coral.h b/include/configs/chromebook_coral.h
index 00760b8a30769cd8fa7e9754ba96c6107affa887..4d44b3b80137447e73ac628f39093282f831f01f 100644 (file)
--- a/include/configs/chromebook_coral.h
+++ b/include/configs/chromebook_coral.h
@@ -31,9 +31,6 @@
                                        "stdout=vidconsole,serial\0" \
                                        "stderr=vidconsole,serial\0"
 
-#define CONFIG_ENV_SECT_SIZE           0x1000
-#define CONFIG_ENV_OFFSET              0x003f8000
-
 #define CONFIG_TPL_TEXT_BASE           0xffff8000
 
 #define CONFIG_SYS_NS16550_MEM32

diff --git a/include/configs/imx7-cm.h b/include/configs/imx7-cm.h
index 553c7fe2ea95d78610f60c1bad6ed92050dfff5c..01f8732929225502ef14393cac21cf331222ef6f 100644 (file)
--- a/include/configs/imx7-cm.h
+++ b/include/configs/imx7-cm.h
@@ -88,8 +88,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR       USDHC1_BASE_ADDR
 #define CONFIG_SYS_FSL_USDHC_NUM               2
 
-#define CONFIG_SYS_MMC_ENV_DEV                 0   /* USDHC1 */
-#define CONFIG_SYS_MMC_ENV_PART                        0       /* user area */
 #define CONFIG_SYS_MMC_IMG_LOAD_PART   1
 #define CONFIG_MMCROOT                                 "/dev/mmcblk0p2"  /* USDHC1 */
 

diff --git a/include/configs/imx8mn_beacon.h b/include/configs/imx8mn_beacon.h
index cb85c35e54b7c47b1243602d83505f4160842d03..b027bea5b544cfcbbf6d9a3f4f16d1b4d7e62ff7 100644 (file)
--- a/include/configs/imx8mn_beacon.h
+++ b/include/configs/imx8mn_beacon.h
@@ -116,8 +116,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-#define CONFIG_ENV_OVERWRITE
-
 #define CONFIG_SYS_SDRAM_BASE          0x40000000
 #define PHYS_SDRAM                     0x40000000
 #if CONFIG_IS_ENABLED(IMX8MN_BEACON_2GB_LPDDR)

diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h
index 3d506ba37f3dc49e8e92fba943dc6ad00423ddb8..90a8fa72f1f58496acf0f90ba2d2483554690fd7 100644 (file)
--- a/include/configs/imx8ulp_evk.h
+++ b/include/configs/imx8ulp_evk.h
@@ -74,7 +74,6 @@
 #define CONFIG_SYS_INIT_SP_OFFSET      (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-#define CONFIG_ENV_OVERWRITE
 #define CONFIG_MMCROOT                 "/dev/mmcblk2p2"
 
 #define CONFIG_SYS_SDRAM_BASE          0x80000000

diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h
index a10607ff66fca0d704b8459948e3ce77328ae296..31452497a4d6e6e58091288a245c199e5a764480 100644 (file)
--- a/include/configs/npi_imx6ull.h
+++ b/include/configs/npi_imx6ull.h
@@ -35,15 +35,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR        \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-/* environment settings */
-#if defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#elif defined(CONFIG_ENV_IS_IN_NAND)
-#undef CONFIG_ENV_SIZE
-#define CONFIG_ENV_SECT_SIZE           (128 << 10)
-#define CONFIG_ENV_SIZE                        CONFIG_ENV_SECT_SIZE
-#endif
-
 /* NAND */
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 #define CONFIG_SYS_NAND_BASE           0x40000000

diff --git a/include/configs/octeontx2_common.h b/include/configs/octeontx2_common.h
index 6608b3410280baf7c6f5f6fed945d9b2ea4e2167..c64134792df1468196b80ee1dccf3df06b8806c8 100644 (file)
--- a/include/configs/octeontx2_common.h
+++ b/include/configs/octeontx2_common.h
@@ -20,9 +20,6 @@
 
 #define CONFIG_LAST_STAGE_INIT
 
-/* Allow environment variable to be overwritten */
-#define CONFIG_ENV_OVERWRITE
-
 /* Autoboot options */
 #define CONFIG_RESET_TO_RETRY
 #define CONFIG_BOOT_RETRY_TIME         -1
@@ -37,11 +34,6 @@
                                        "ethrotate=yes\0"       \
                                        "autoload=0\0"
 
-/** Environment defines */
-#if defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#endif
-
 /* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE              1024    /** Console I/O Buffer Size */
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE

diff --git a/include/configs/octeontx_common.h b/include/configs/octeontx_common.h
index 3a0f081046d1d80b2467b07634bafbe686a46316..26b3add722b7afd3fa93ccfe4cd7a79d314c95e6 100644 (file)
--- a/include/configs/octeontx_common.h
+++ b/include/configs/octeontx_common.h
@@ -45,9 +45,6 @@
 
 /** Heap size for U-Boot */
 
-/* Allow environment variable to be overwritten */
-#define CONFIG_ENV_OVERWRITE
-
 /* Autoboot options */
 #define CONFIG_RESET_TO_RETRY
 #define CONFIG_BOOT_RETRY_TIME         -1
@@ -70,11 +67,6 @@
 # define CONFIG_SF_DEFAULT_CS  0
 #endif
 
-/** Environment defines */
-#if defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#endif
-
 /* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE              1024    /** Console I/O Buffer Size */
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE

diff --git a/include/configs/openpiton-riscv64.h b/include/configs/openpiton-riscv64.h
index a24b13497516a7de265b0b0fe910623279fb49c8..c9d966fff6761458897ebad73e367c0e6897a2bf 100644 (file)
--- a/include/configs/openpiton-riscv64.h
+++ b/include/configs/openpiton-riscv64.h
@@ -32,12 +32,6 @@
 #define CONFIG_SPL_GD_ADDR 0x85000000
 #endif
 
-/* -------------------------------------------------
- * Environment
- */
-//Disable persistent environment variable storage
-#define CONFIG_ENV_IS_NOWHERE   1
-
 /* ---------------------------------------------------------------------
  * Board boot configuration
  */

diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h
index 4a0235de8f5939e03c499efbaf06bb9ec34c4192..4d7072c4dbf811c8edb7c113975de447333805f0 100644 (file)
--- a/include/configs/socfpga_soc64_common.h
+++ b/include/configs/socfpga_soc64_common.h
@@ -59,8 +59,6 @@
 
 /* Flash device info */
 
-/*#define CONFIG_ENV_IS_IN_SPI_FLASH*/
-
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_MTD_PARTITIONS
 #define MTDIDS_DEFAULT                 "nor0=ff705000.spi.0"

diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h
index 4573093d4ca46fde0347d8361d4fe0bdbb16d820..0a4cd84c15d991ec983d64239c6034b7e01fc949 100644 (file)
--- a/include/configs/stmark2.h
+++ b/include/configs/stmark2.h
@@ -122,10 +122,6 @@
  * Environment is embedded in u-boot in the second sector of the flash
  */
 
-#if defined(CONFIG_CF_SBF)
-#define CONFIG_ENV_IS_IN_SPI_FLASH     1
-#endif
-
 /* Cache Configuration */
 #define ICACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
                                         CONFIG_SYS_INIT_RAM_SIZE - 8)

diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h
index aac7b5dc3877bac6450b3ef6dd40aac3143f9bf0..43379cc03e5d33bfbbc540adb0b7f46f8f732997 100644 (file)
--- a/include/configs/synquacer.h
+++ b/include/configs/synquacer.h
@@ -38,8 +38,6 @@
 #define CONFIG_PL011_CLOCK             UART_CLK
 #define CONFIG_PL01x_PORTS             {(void *)(0x2a400000)}
 
-#define CONFIG_ENV_OVERWRITE           /* ethaddr can be reprogrammed */
-
 /* Support MTD */
 #define CONFIG_SYS_MAX_FLASH_BANKS     1
 #define CONFIG_SYS_FLASH_BASE          (0x08000000)

diff --git a/include/env_internal.h b/include/env_internal.h
index f74927cd64194f57537fe936f621ecd1ecbee5e0..174c3b1a79fc0ac339e579e906022b2c36e61732 100644 (file)
--- a/include/env_internal.h
+++ b/include/env_internal.h
@@ -54,7 +54,6 @@
 #   error "is set"
 #  endif
 extern unsigned long nand_env_oob_offset;
-#  define CONFIG_ENV_OFFSET nand_env_oob_offset
 # endif /* CONFIG_ENV_OFFSET_OOB */
 #endif /* CONFIG_ENV_IS_IN_NAND */