Skip to contentSkip to conversation

env: Move environment code to use location drivers

PATCH New Simon Glass 5 participants 44 messages Jul 9, 2017 – Jul 18, 2017 Page 2 of 2

Subsystems (26)
lore
Share & tools
lore
#13 lore raw

PATCH 9/30 Convert CONFIG_ENV_IS_IN_SPI_FLASH to Kconfig

In reply to Simon Glass

This converts the following to Kconfig:
CONFIG_ENV_IS_IN_SPI_FLASH

---

 README                                             | 37 ---------------------
 arch/arm/mach-mvebu/Kconfig                        |  1 +
 arch/x86/cpu/baytrail/Kconfig                      |  1 +
 configs/B4420QDS_SPIFLASH_defconfig                |  1 +
 configs/B4860QDS_SPIFLASH_defconfig                |  1 +
 configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig    |  1 +
 configs/BSC9131RDB_SPIFLASH_defconfig              |  1 +
 configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig    |  1 +
 configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig    |  1 +
 configs/C29XPCIE_SPIFLASH_defconfig                |  1 +
 configs/M52277EVB_stmicro_defconfig                |  1 +
 configs/M54418TWR_defconfig                        |  1 +
 configs/M54418TWR_serial_mii_defconfig             |  1 +
 configs/M54418TWR_serial_rmii_defconfig            |  1 +
 configs/M54451EVB_stmicro_defconfig                |  1 +
 configs/M54455EVB_stm33_defconfig                  |  1 +
 configs/MPC8536DS_SPIFLASH_defconfig               |  1 +
 configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig       |  1 +
 configs/P1010RDB-PA_SPIFLASH_defconfig             |  1 +
 configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig       |  1 +
 configs/P1010RDB-PB_SPIFLASH_defconfig             |  1 +
 configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig       |  1 +
 configs/P1020RDB-PC_SPIFLASH_defconfig             |  1 +
 configs/P1020RDB-PD_SPIFLASH_defconfig             |  1 +
 configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig       |  1 +
 configs/P1021RDB-PC_SPIFLASH_defconfig             |  1 +
 configs/P1022DS_36BIT_SPIFLASH_defconfig           |  1 +
 configs/P1022DS_SPIFLASH_defconfig                 |  1 +
 configs/P1024RDB_SPIFLASH_defconfig                |  1 +
 configs/P1025RDB_SPIFLASH_defconfig                |  1 +
 configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig       |  1 +
 configs/P2020RDB-PC_SPIFLASH_defconfig             |  1 +
 configs/P2041RDB_SPIFLASH_defconfig                |  1 +
 configs/P3041DS_SPIFLASH_defconfig                 |  1 +
 configs/P4080DS_SPIFLASH_defconfig                 |  1 +
 configs/P5020DS_SPIFLASH_defconfig                 |  1 +
 configs/P5040DS_SPIFLASH_defconfig                 |  1 +
 configs/T1023RDB_SPIFLASH_defconfig                |  1 +
 configs/T1024QDS_SPIFLASH_defconfig                |  1 +
 configs/T1024RDB_SPIFLASH_defconfig                |  1 +
 configs/T1040D4RDB_SPIFLASH_defconfig              |  1 +
 configs/T1040RDB_SPIFLASH_defconfig                |  1 +
 configs/T1042D4RDB_SPIFLASH_defconfig              |  1 +
 configs/T1042RDB_PI_SPIFLASH_defconfig             |  1 +
 configs/T2080QDS_SPIFLASH_defconfig                |  1 +
 configs/T2080RDB_SPIFLASH_defconfig                |  1 +
 configs/T2081QDS_SPIFLASH_defconfig                |  1 +
 configs/UCP1020_SPIFLASH_defconfig                 |  1 +
 configs/alt_defconfig                              |  1 +
 configs/am335x_evm_spiboot_defconfig               |  1 +
 configs/am43xx_evm_qspiboot_defconfig              |  1 +
 configs/ap121_defconfig                            |  1 +
 configs/ap143_defconfig                            |  1 +
 configs/aristainetos2_defconfig                    |  1 +
 configs/aristainetos2b_defconfig                   |  1 +
 configs/aristainetos_defconfig                     |  1 +
 configs/at91sam9n12ek_spiflash_defconfig           |  1 +
 configs/at91sam9x5ek_dataflash_defconfig           |  1 +
 configs/at91sam9x5ek_spiflash_defconfig            |  1 +
 configs/bayleybay_defconfig                        |  2 +-
 configs/brppt1_spi_defconfig                       |  1 +
 configs/cgtqmx6eval_defconfig                      |  1 +
 configs/chromebook_link64_defconfig                |  5 +--
 configs/chromebook_link_defconfig                  |  5 +--
 configs/chromebook_samus_defconfig                 |  3 +-
 configs/chromebox_panther_defconfig                |  5 +--
 configs/cl-som-am57x_defconfig                     |  1 +
 configs/cm_fx6_defconfig                           |  1 +
 configs/cm_t43_defconfig                           |  1 +
 ...conga-qeval20-qa3-e3845-internal-uart_defconfig |  1 +
 configs/controlcenterdc_defconfig                  |  3 +-
 configs/cougarcanyon2_defconfig                    |  3 +-
 configs/crownbay_defconfig                         |  3 +-
 configs/d2net_v2_defconfig                         |  1 +
 configs/da850_am18xxevm_defconfig                  |  1 +
 configs/da850evm_defconfig                         |  1 +
 configs/db-88f6720_defconfig                       |  1 +
 configs/db-88f6820-amc_defconfig                   |  1 +
 configs/db-88f6820-gp_defconfig                    |  3 +-
 configs/dms-ba16-1g_defconfig                      |  1 +
 configs/dms-ba16_defconfig                         |  1 +
 configs/dreamplug_defconfig                        |  1 +
 configs/ds109_defconfig                            |  1 +
 configs/ea20_defconfig                             |  1 +
 configs/ethernut5_defconfig                        |  1 +
 configs/galileo_defconfig                          |  1 +
 configs/ge_b450v3_defconfig                        |  1 +
 configs/ge_b650v3_defconfig                        |  1 +
 configs/ge_b850v3_defconfig                        |  1 +
 configs/gose_defconfig                             |  1 +
 configs/inetspace_v2_defconfig                     |  1 +
 configs/kmcoge4_defconfig                          |  1 +
 configs/kmcoge5un_defconfig                        |  1 +
 configs/kmlion1_defconfig                          |  1 +
 configs/kmnusa_defconfig                           |  1 +
 configs/kmsugp1_defconfig                          |  1 +
 configs/kmsuv31_defconfig                          |  1 +
 configs/koelsch_defconfig                          |  1 +
 configs/lager_defconfig                            |  1 +
 configs/ls1012afrdm_qspi_defconfig                 |  1 +
 configs/ls1012aqds_qspi_defconfig                  |  3 +-
 configs/ls1012ardb_qspi_defconfig                  |  1 +
 configs/ls1021aiot_qspi_defconfig                  |  1 +
 configs/ls1021aqds_qspi_defconfig                  |  1 +
 configs/ls1021atwr_qspi_defconfig                  |  1 +
 configs/ls1043aqds_qspi_defconfig                  |  1 +
 configs/ls1046aqds_qspi_defconfig                  |  1 +
 configs/ls1046ardb_qspi_defconfig                  |  1 +
 configs/ls2080aqds_qspi_defconfig                  |  1 +
 configs/ls2081ardb_defconfig                       |  3 +-
 configs/ls2088ardb_qspi_defconfig                  |  1 +
 configs/lschlv2_defconfig                          |  1 +
 configs/lsxhl_defconfig                            |  1 +
 configs/marsboard_defconfig                        |  3 +-
 configs/minnowmax_defconfig                        |  2 +-
 configs/mvebu_db-88f3720_defconfig                 |  1 +
 configs/mvebu_db-88f7040_defconfig                 |  1 +
 configs/mvebu_db-88f8040_defconfig                 |  1 +
 configs/mvebu_espressobin-88f3720_defconfig        |  1 +
 configs/mvebu_mcbin-88f8040_defconfig              |  1 +
 configs/mx28evk_spi_defconfig                      |  2 +-
 configs/mx6slevk_spinor_defconfig                  |  1 +
 configs/net2big_v2_defconfig                       |  1 +
 configs/netspace_lite_v2_defconfig                 |  1 +
 configs/netspace_max_v2_defconfig                  |  1 +
 configs/netspace_mini_v2_defconfig                 |  1 +
 configs/netspace_v2_defconfig                      |  1 +
 configs/nitrogen6dl2g_defconfig                    |  1 +
 configs/nitrogen6dl_defconfig                      |  1 +
 configs/nitrogen6q2g_defconfig                     |  1 +
 configs/nitrogen6q_defconfig                       |  1 +
 configs/nitrogen6s1g_defconfig                     |  1 +
 configs/nitrogen6s_defconfig                       |  1 +
 configs/ot1200_defconfig                           |  1 +
 configs/ot1200_spl_defconfig                       |  1 +
 configs/pcm058_defconfig                           |  1 +
 configs/peach-pi_defconfig                         |  1 +
 configs/peach-pit_defconfig                        |  1 +
 configs/porter_defconfig                           |  1 +
 configs/sama5d2_ptc_spiflash_defconfig             |  1 +
 configs/sama5d2_xplained_spiflash_defconfig        |  1 +
 configs/sama5d36ek_cmp_spiflash_defconfig          |  1 +
 configs/sama5d3xek_spiflash_defconfig              |  1 +
 configs/sama5d4_xplained_spiflash_defconfig        |  1 +
 configs/sama5d4ek_spiflash_defconfig               |  1 +
 configs/sh7752evb_defconfig                        |  1 +
 configs/sh7753evb_defconfig                        |  1 +
 configs/sh7757lcr_defconfig                        |  1 +
 configs/silk_defconfig                             |  1 +
 configs/smdk5250_defconfig                         |  1 +
 configs/smdk5420_defconfig                         |  1 +
 configs/snow_defconfig                             |  1 +
 configs/socfpga_is1_defconfig                      |  1 +
 configs/socfpga_sr1500_defconfig                   |  1 +
 configs/socfpga_vining_fpga_defconfig              |  1 +
 configs/som-db5800-som-6867_defconfig              |  2 +-
 configs/spring_defconfig                           |  1 +
 configs/stout_defconfig                            |  1 +
 configs/stv0991_defconfig                          |  1 +
 configs/tqma6dl_mba6_spi_defconfig                 |  1 +
 configs/tqma6q_mba6_spi_defconfig                  |  1 +
 configs/tqma6s_mba6_spi_defconfig                  |  1 +
 configs/trimslice_defconfig                        |  1 +
 configs/vinco_defconfig                            |  1 +
 configs/zynq_microzed_defconfig                    |  1 +
 configs/zynq_zc702_defconfig                       |  1 +
 configs/zynq_zc706_defconfig                       |  1 +
 configs/zynq_zc770_xm010_defconfig                 |  1 +
 configs/zynq_zed_defconfig                         |  1 +
 configs/zynq_zybo_defconfig                        |  1 +
 env/Kconfig                                        | 38 ++++++++++++++++++++++
 include/config_fsl_chain_trust.h                   |  5 ---
 include/configs/B4860QDS.h                         |  1 -
 include/configs/BSC9131RDB.h                       |  1 -
 include/configs/BSC9132QDS.h                       |  1 -
 include/configs/C29XPCIE.h                         |  1 -
 include/configs/M52277EVB.h                        |  1 -
 include/configs/M54418TWR.h                        |  1 -
 include/configs/M54451EVB.h                        |  1 -
 include/configs/M54455EVB.h                        |  1 -
 include/configs/MPC8536DS.h                        |  1 -
 include/configs/P1010RDB.h                         |  1 -
 include/configs/P1022DS.h                          |  1 -
 include/configs/P2041RDB.h                         |  1 -
 include/configs/T102xQDS.h                         |  1 -
 include/configs/T102xRDB.h                         |  1 -
 include/configs/T1040QDS.h                         |  1 -
 include/configs/T104xRDB.h                         |  1 -
 include/configs/T208xQDS.h                         |  1 -
 include/configs/T208xRDB.h                         |  1 -
 include/configs/T4240QDS.h                         |  1 -
 include/configs/T4240RDB.h                         |  1 -
 include/configs/UCP1020.h                          |  1 -
 include/configs/advantech_dms-ba16.h               |  1 -
 include/configs/am335x_evm.h                       |  1 -
 include/configs/am43xx_evm.h                       |  1 -
 include/configs/ap121.h                            |  1 -
 include/configs/ap143.h                            |  1 -
 include/configs/aristainetos-common.h              |  1 -
 include/configs/at91-sama5_common.h                |  1 -
 include/configs/at91sam9n12ek.h                    |  1 -
 include/configs/at91sam9x5ek.h                     |  2 --
 include/configs/bav335x.h                          |  1 -
 include/configs/blanche.h                          |  1 -
 include/configs/brppt1.h                           |  1 -
 include/configs/cgtqmx6eval.h                      |  1 -
 include/configs/cl-som-am57x.h                     |  1 -
 include/configs/cm_fx6.h                           |  1 -
 include/configs/cm_t43.h                           |  1 -
 include/configs/controlcenterd.h                   |  1 -
 include/configs/controlcenterdc.h                  |  1 -
 include/configs/corenet_ds.h                       |  1 -
 include/configs/da850evm.h                         |  1 -
 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/dra7xx_evm.h                       |  1 -
 include/configs/dreamplug.h                        |  1 -
 include/configs/ds109.h                            |  1 -
 include/configs/ds414.h                            |  1 -
 include/configs/ea20.h                             |  1 -
 include/configs/efi-x86.h                          |  1 -
 include/configs/ethernut5.h                        |  1 -
 include/configs/exynos5-dt-common.h                |  1 -
 include/configs/ge_bx50v3.h                        |  1 -
 include/configs/gw_ventana.h                       |  3 --
 include/configs/km/km_arm.h                        |  1 -
 include/configs/km/kmp204x-common.h                |  1 -
 include/configs/lacie_kw.h                         |  1 -
 include/configs/ls1012a_common.h                   |  1 -
 include/configs/ls1021aiot.h                       |  1 -
 include/configs/ls1021aqds.h                       |  1 -
 include/configs/ls1021atwr.h                       |  1 -
 include/configs/ls1043aqds.h                       |  1 -
 include/configs/ls1046aqds.h                       |  1 -
 include/configs/ls1046ardb.h                       |  1 -
 include/configs/ls2080a_common.h                   |  1 -
 include/configs/lsxl.h                             |  1 -
 include/configs/maxbcm.h                           |  1 -
 include/configs/microblaze-generic.h               |  1 -
 include/configs/mvebu_armada-37xx.h                |  1 -
 include/configs/mvebu_armada-8k.h                  |  1 -
 include/configs/mx6slevk.h                         |  1 -
 include/configs/nitrogen6x.h                       |  5 ---
 include/configs/odroid_xu3.h                       |  2 --
 include/configs/omapl138_lcdk.h                    |  2 --
 include/configs/ot1200.h                           |  1 -
 include/configs/p1_p2_rdb_pc.h                     |  1 -
 include/configs/pcm058.h                           |  1 -
 include/configs/qemu-x86.h                         |  1 -
 include/configs/rcar-gen2-common.h                 |  1 -
 include/configs/sh7752evb.h                        |  1 -
 include/configs/sh7753evb.h                        |  1 -
 include/configs/sh7757lcr.h                        |  1 -
 include/configs/siemens-am33x-common.h             |  1 -
 include/configs/socfpga_is1.h                      |  1 -
 include/configs/socfpga_sr1500.h                   |  1 -
 include/configs/socfpga_vining_fpga.h              |  1 -
 include/configs/stv0991.h                          |  1 -
 include/configs/theadorable.h                      |  1 -
 include/configs/tqma6.h                            |  1 -
 include/configs/trimslice.h                        |  1 -
 include/configs/x86-chromebook.h                   |  1 -
 include/configs/x86-common.h                       |  1 -
 include/configs/zynq-common.h                      |  1 -
 scripts/config_whitelist.txt                       |  1 -
 267 files changed, 221 insertions(+), 164 deletions(-)
README +0 -37
index ff09c7bfba..713eeb2f45 100644
@@ -3444,43 +3444,6 @@ environment in RAM: we could work on NVRAM directly, but we want to
 keep settings there always unmodified except somebody uses "saveenv"
 to save the current settings.
 
-- CONFIG_ENV_IS_IN_SPI_FLASH:
-
-	Define this if you have a SPI Flash memory device which you
-	want to use for the environment.
-
-	- CONFIG_ENV_OFFSET:
-	- CONFIG_ENV_SIZE:
-
-	  These two #defines specify the offset and size of the
-	  environment area within the SPI Flash. CONFIG_ENV_OFFSET must be
-	  aligned to an erase sector boundary.
-
-	- CONFIG_ENV_SECT_SIZE:
-
-	  Define the SPI flash's sector size.
-
-	- CONFIG_ENV_OFFSET_REDUND (optional):
-
-	  This setting describes a second storage area of CONFIG_ENV_SIZE
-	  size used to hold a redundant copy of the environment data, so
-	  that there is a valid backup copy in case there is a power failure
-	  during a "saveenv" operation. CONFIG_ENV_OFFSET_REDUND must be
-	  aligned to an erase sector boundary.
-
-	- CONFIG_ENV_SPI_BUS (optional):
-	- CONFIG_ENV_SPI_CS (optional):
-
-	  Define the SPI bus and chip select. If not defined they will be 0.
-
-	- CONFIG_ENV_SPI_MAX_HZ (optional):
-
-	  Define the SPI max work clock. If not defined then use 1MHz.
-
-	- CONFIG_ENV_SPI_MODE (optional):
-
-	  Define the SPI work mode. If not defined then use SPI_MODE_3.
-
 - CONFIG_ENV_IS_IN_REMOTE:
 
 	Define this if you have a remote memory space which you
arch/arm/mach-mvebu/Kconfig +1 -0
index 3e48d58fcc..11bd437329 100644
@@ -32,6 +32,7 @@ config ARMADA_38X
 config ARMADA_XP
 	bool
 	select ARMADA_32BIT
+	imply ENV_IS_IN_SPI_FLASH
 
 # ARMv8 SoCs...
 config ARMADA_3700
arch/x86/cpu/baytrail/Kconfig +1 -0
index 6c85186486..4e7d4a4e25 100644
@@ -7,6 +7,7 @@
 config INTEL_BAYTRAIL
 	bool
 	select HAVE_FSP if !EFI
+	imply ENV_IS_IN_SPI_FLASH
 
 if INTEL_BAYTRAIL
 config INTERNAL_UART
configs/B4420QDS_SPIFLASH_defconfig +1 -0
index bf0b26f0a2..72a01a9582 100644
@@ -18,6 +18,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
configs/B4860QDS_SPIFLASH_defconfig +1 -0
index 04849d6315..97cff60290 100644
@@ -18,6 +18,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig +1 -0
index 4434790b65..75fdf736b8 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
configs/BSC9131RDB_SPIFLASH_defconfig +1 -0
index 4bce5427b8..3e4ca3ecde 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig +1 -0
index e848d8a2af..66c8ff8747 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig +1 -0
index 444d552293..6088e2bc8b 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
configs/C29XPCIE_SPIFLASH_defconfig +1 -0
index 41bf176650..9c54432cd0 100644
@@ -15,6 +15,7 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
configs/M52277EVB_stmicro_defconfig +1 -0
index d657f863d0..8a8eec7c3b 100644
@@ -13,6 +13,7 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_JFFS2=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/M54418TWR_defconfig +1 -0
index 3445394b90..99ab91874c 100644
@@ -16,5 +16,6 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
configs/M54418TWR_serial_mii_defconfig +1 -0
index 729acfebdd..d433ca5837 100644
@@ -16,5 +16,6 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
configs/M54418TWR_serial_rmii_defconfig +1 -0
index 3445394b90..99ab91874c 100644
@@ -16,5 +16,6 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
configs/M54451EVB_stmicro_defconfig +1 -0
index d675825018..5f227980d0 100644
@@ -14,6 +14,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_DATE=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/M54455EVB_stm33_defconfig +1 -0
index eed2eabe68..a6330aba43 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
 CONFIG_ISO_PARTITION=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/MPC8536DS_SPIFLASH_defconfig +1 -0
index 156c8590ba..8f2ead0a9b 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_PING=y
 # CONFIG_CMD_HASH is not set
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_FSL_DDR2=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig +1 -0
index dc4a6a72c9..80306c7edd 100644
@@ -30,6 +30,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
configs/P1010RDB-PA_SPIFLASH_defconfig +1 -0
index f15da83b99..eaa21cbb3b 100644
@@ -29,6 +29,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig +1 -0
index 8f33a9be78..6b1a273d6b 100644
@@ -30,6 +30,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
configs/P1010RDB-PB_SPIFLASH_defconfig +1 -0
index 6070bf1f57..e8185d2ee7 100644
@@ -29,6 +29,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig +1 -0
index 324c6a055c..3ecd7d050c 100644
@@ -30,6 +30,7 @@ CONFIG_CMD_DATE=y
 # CONFIG_CMD_HASH is not set
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/P1020RDB-PC_SPIFLASH_defconfig +1 -0
index 79cba1a071..8d2f84e824 100644
@@ -29,6 +29,7 @@ CONFIG_CMD_DATE=y
 # CONFIG_CMD_HASH is not set
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/P1020RDB-PD_SPIFLASH_defconfig +1 -0
index 60f5ab3206..7db7be237f 100644
@@ -29,6 +29,7 @@ CONFIG_CMD_DATE=y
 # CONFIG_CMD_HASH is not set
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig +1 -0
index ec326a089a..e251dfa44b 100644
@@ -30,6 +30,7 @@ CONFIG_CMD_DATE=y
 # CONFIG_CMD_HASH is not set
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/P1021RDB-PC_SPIFLASH_defconfig +1 -0
index 86052a4c7d..2e8c69fe78 100644
@@ -29,6 +29,7 @@ CONFIG_CMD_DATE=y
 # CONFIG_CMD_HASH is not set
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/P1022DS_36BIT_SPIFLASH_defconfig +1 -0
index 25521d8787..9755931a37 100644
@@ -28,6 +28,7 @@ CONFIG_CMD_PING=y
 # CONFIG_CMD_HASH is not set
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/P1022DS_SPIFLASH_defconfig +1 -0
index 22c3b6b278..d573045ba3 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_PING=y
 # CONFIG_CMD_HASH is not set
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/P1024RDB_SPIFLASH_defconfig +1 -0
index ae12d7c03e..b91bf1df35 100644
@@ -29,6 +29,7 @@ CONFIG_CMD_DATE=y
 # CONFIG_CMD_HASH is not set
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/P1025RDB_SPIFLASH_defconfig +1 -0
index 672b7bbbf9..305ca553c0 100644
@@ -29,6 +29,7 @@ CONFIG_CMD_DATE=y
 # CONFIG_CMD_HASH is not set
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig +1 -0
index ee8227a5ba..6e6f17fb2a 100644
@@ -30,6 +30,7 @@ CONFIG_CMD_DATE=y
 # CONFIG_CMD_HASH is not set
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/P2020RDB-PC_SPIFLASH_defconfig +1 -0
index 5091022f81..a5a1fc1a98 100644
@@ -29,6 +29,7 @@ CONFIG_CMD_DATE=y
 # CONFIG_CMD_HASH is not set
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/P2041RDB_SPIFLASH_defconfig +1 -0
index 5a7821a48b..ef8acbd695 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
configs/P3041DS_SPIFLASH_defconfig +1 -0
index e2308a26fb..34fe785199 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
configs/P4080DS_SPIFLASH_defconfig +1 -0
index 37575eca2f..b0977b0b82 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
configs/P5020DS_SPIFLASH_defconfig +1 -0
index c5e0b6aaeb..29119cf088 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
configs/P5040DS_SPIFLASH_defconfig +1 -0
index e31215ac68..c27f8c21d1 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
configs/T1023RDB_SPIFLASH_defconfig +1 -0
index c63b98c8ef..cf72ebee57 100644
@@ -33,6 +33,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
configs/T1024QDS_SPIFLASH_defconfig +1 -0
index f55a2bb424..bf36f7634d 100644
@@ -35,6 +35,7 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_MTD_NOR_FLASH=y
configs/T1024RDB_SPIFLASH_defconfig +1 -0
index 25e81fdc19..b5433037df 100644
@@ -33,6 +33,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_MTD_NOR_FLASH=y
configs/T1040D4RDB_SPIFLASH_defconfig +1 -0
index 2a872b930f..957c9aba6d 100644
@@ -32,6 +32,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_ETHSW=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
configs/T1040RDB_SPIFLASH_defconfig +1 -0
index 9f5a8c4e9c..b4a9bb0ba8 100644
@@ -32,6 +32,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_ETHSW=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_MTD_NOR_FLASH=y
configs/T1042D4RDB_SPIFLASH_defconfig +1 -0
index c6fcaf3b98..49ccb00af4 100644
@@ -34,6 +34,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_BMP=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
configs/T1042RDB_PI_SPIFLASH_defconfig +1 -0
index 807519162a..c1b1d79ece 100644
@@ -35,6 +35,7 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_MTD_NOR_FLASH=y
configs/T2080QDS_SPIFLASH_defconfig +1 -0
index 10b29c4a9a..c3b5744a4a 100644
@@ -28,6 +28,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
configs/T2080RDB_SPIFLASH_defconfig +1 -0
index ca7a38b7d2..ca83834a5d 100644
@@ -29,6 +29,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 # CONFIG_CMD_IRQ is not set
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
configs/T2081QDS_SPIFLASH_defconfig +1 -0
index 3e3031e134..8f00fecb77 100644
@@ -28,6 +28,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
configs/UCP1020_SPIFLASH_defconfig +1 -0
index 29bf82a456..80bf962e26 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_CRAMFS=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/alt_defconfig +1 -0
index 04dda72532..110bdd62c2 100644
@@ -20,6 +20,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/am335x_evm_spiboot_defconfig +1 -0
index 64b44ff8fd..7726ad4557 100644
@@ -18,6 +18,7 @@ CONFIG_SPL_MUSB_NEW_SUPPORT=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_MMC_OMAP_HS=y
configs/am43xx_evm_qspiboot_defconfig +1 -0
index 87d5ba7ea9..fb0bf46ed9 100644
@@ -33,6 +33,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ISO_PARTITION=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y
configs/ap121_defconfig +1 -0
index 3e1f0587a1..703149c2fc 100644
@@ -23,6 +23,7 @@ CONFIG_CMD_SPI=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
 # CONFIG_ISO_PARTITION is not set
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/ap143_defconfig +1 -0
index 58eb77b5a2..b294b19de4 100644
@@ -24,6 +24,7 @@ CONFIG_CMD_SPI=y
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
 # CONFIG_ISO_PARTITION is not set
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
configs/aristainetos2_defconfig +1 -0
index 4bd3087cb9..59c6edb3a0 100644
@@ -30,6 +30,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_UBI=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_MTD_UBI_FASTMAP=y
configs/aristainetos2b_defconfig +1 -0
index dfdc972327..3a6d35f441 100644
@@ -30,6 +30,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_UBI=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_MTD_UBI_FASTMAP=y
configs/aristainetos_defconfig +1 -0
index 0a8b38d9c6..2871e489c7 100644
@@ -30,6 +30,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_UBI=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_MTD_UBI_FASTMAP=y
configs/at91sam9n12ek_spiflash_defconfig +1 -0
index 8b8229b2cb..e23801fd6d 100644
@@ -23,6 +23,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
configs/at91sam9x5ek_dataflash_defconfig +1 -0
index f52d9210fc..1efcf3dee3 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_UBI=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
configs/at91sam9x5ek_spiflash_defconfig +1 -0
index f8d2ce3702..5f1c4706f5 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_UBI=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
configs/bayleybay_defconfig +1 -1
index 14b74c4a16..03a71edb24 100644
@@ -46,7 +46,6 @@ CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
-CONFIG_SCSI=y
 CONFIG_CPU=y
 CONFIG_MMC=y
 CONFIG_MMC_PCI=y
@@ -60,6 +59,7 @@ CONFIG_DM_ETH=y
 CONFIG_E1000=y
 CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
+CONFIG_SCSI=y
 CONFIG_SYS_NS16550=y
 CONFIG_ICH_SPI=y
 CONFIG_TIMER=y
configs/brppt1_spi_defconfig +1 -0
index 66e086db68..ec9e620a9f 100644
@@ -53,6 +53,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NETCONSOLE=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_SPI_FLASH=y
configs/cgtqmx6eval_defconfig +1 -0
index 94d7e76b18..d4369fc731 100644
@@ -44,6 +44,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_SF=y
 CONFIG_USB=y
configs/chromebook_link64_defconfig +3 -2
index 557919c5d8..1f1d7183bc 100644
@@ -52,13 +52,12 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPL_DM=y
 CONFIG_REGMAP=y
 CONFIG_SPL_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_SPL_SYSCON=y
-CONFIG_SCSI=y
-CONFIG_DM_SCSI=y
 CONFIG_BLK=y
 CONFIG_CPU=y
 CONFIG_DM_I2C=y
@@ -71,6 +70,8 @@ CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
+CONFIG_SCSI=y
+CONFIG_DM_SCSI=y
 CONFIG_DEBUG_UART_BASE=0x3f8
 CONFIG_DEBUG_UART_CLOCK=1843200
 CONFIG_DEBUG_UART_BOARD_INIT=y
configs/chromebook_link_defconfig +3 -2
index 3105fed469..70d6baa0af 100644
@@ -38,10 +38,9 @@ CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
-CONFIG_SCSI=y
-CONFIG_DM_SCSI=y
 CONFIG_BLK=y
 CONFIG_CPU=y
 CONFIG_DM_I2C=y
@@ -54,6 +53,8 @@ CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
+CONFIG_SCSI=y
+CONFIG_DM_SCSI=y
 CONFIG_DEBUG_UART_BASE=0x3f8
 CONFIG_DEBUG_UART_CLOCK=1843200
 CONFIG_DEBUG_UART_BOARD_INIT=y
configs/chromebook_samus_defconfig +2 -1
index ab2d27eb03..8cfe8bf16a 100644
@@ -38,9 +38,9 @@ CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
-CONFIG_SCSI=y
 CONFIG_CPU=y
 CONFIG_INTEL_BROADWELL_GPIO=y
 CONFIG_CROS_EC=y
@@ -51,6 +51,7 @@ CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
+CONFIG_SCSI=y
 CONFIG_DEBUG_UART_BASE=0x3f8
 CONFIG_DEBUG_UART_CLOCK=1843200
 CONFIG_DEBUG_UART_BOARD_INIT=y
configs/chromebox_panther_defconfig +3 -2
index 30d4019856..8f34fc3d6a 100644
@@ -34,10 +34,9 @@ CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
-CONFIG_SCSI=y
-CONFIG_DM_SCSI=y
 CONFIG_BLK=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_LPC=y
@@ -49,6 +48,8 @@ CONFIG_DM_ETH=y
 CONFIG_RTL8169=y
 CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
+CONFIG_SCSI=y
+CONFIG_DM_SCSI=y
 CONFIG_SYS_NS16550=y
 CONFIG_ICH_SPI=y
 CONFIG_TIMER=y
configs/cl-som-am57x_defconfig +1 -0
index bf753bc074..f3fd2c4985 100644
@@ -33,6 +33,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ISO_PARTITION=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_LED_STATUS=y
 CONFIG_LED_STATUS_GPIO=y
 CONFIG_LED_STATUS0=y
configs/cm_fx6_defconfig +1 -0
index f83fa92c8f..3e1396f220 100644
@@ -49,6 +49,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM_MMC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
configs/cm_t43_defconfig +1 -0
index c652c4fa1e..73f3868809 100644
@@ -48,6 +48,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ISO_PARTITION=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM=y
 CONFIG_DM_GPIO=y
 CONFIG_MMC_OMAP_HS=y
configs/conga-qeval20-qa3-e3845-internal-uart_defconfig +1 -0
index a0cce754ff..2cb00de288 100644
@@ -44,6 +44,7 @@ CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_CPU=y
configs/controlcenterdc_defconfig +2 -1
index a46c46875d..1e4b9ee0db 100644
@@ -33,8 +33,8 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_EFI_PARTITION=y
 CONFIG_OF_BOARD_FIXUP=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPL_OF_TRANSLATE=y
-CONFIG_SCSI=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_PCA953X=y
 CONFIG_DM_I2C=y
@@ -45,6 +45,7 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_MV=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SCSI=y
 CONFIG_DEBUG_UART_BASE=0xd0012000
 CONFIG_DEBUG_UART_CLOCK=250000000
 CONFIG_DEBUG_UART_SHIFT=2
configs/cougarcanyon2_defconfig +2 -1
index 1008ef7301..21bbc325e5 100644
@@ -27,13 +27,14 @@ CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
-CONFIG_SCSI=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
+CONFIG_SCSI=y
 CONFIG_SYS_NS16550=y
 CONFIG_ICH_SPI=y
 CONFIG_TIMER=y
configs/crownbay_defconfig +2 -1
index ac50681e19..5bb354bc39 100644
@@ -33,9 +33,9 @@ CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
-CONFIG_SCSI=y
 CONFIG_CPU=y
 CONFIG_MMC=y
 CONFIG_MMC_PCI=y
@@ -51,6 +51,7 @@ CONFIG_E1000=y
 CONFIG_PCH_GBE=y
 CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
+CONFIG_SCSI=y
 CONFIG_SYS_NS16550=y
 CONFIG_ICH_SPI=y
 CONFIG_TIMER=y
configs/d2net_v2_defconfig +1 -0
index a0b5c752cc..a83865493f 100644
@@ -24,6 +24,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
configs/da850_am18xxevm_defconfig +1 -0
index 74b3f0398d..7d830da174 100644
@@ -29,6 +29,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_DIAG=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
configs/da850evm_defconfig +1 -0
index 3745b859ed..bd011d745a 100644
@@ -31,6 +31,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_DIAG=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
configs/db-88f6720_defconfig +1 -0
index 55378efb0f..5dbaf0822d 100644
@@ -33,6 +33,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 # CONFIG_DOS_PARTITION is not set
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_OF_TRANSLATE=y
 CONFIG_MISC=y
configs/db-88f6820-amc_defconfig +1 -0
index 3831f403b8..271d440203 100644
@@ -36,6 +36,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
 # CONFIG_SPL_PARTITION_UUIDS is not set
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPL_OF_TRANSLATE=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MVTWSI=y
configs/db-88f6820-gp_defconfig +2 -1
index f0b0d698b1..4611503831 100644
@@ -36,8 +36,8 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
 # CONFIG_SPL_PARTITION_UUIDS is not set
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPL_OF_TRANSLATE=y
-CONFIG_SCSI=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_MV=y
@@ -45,6 +45,7 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PCI=y
+CONFIG_SCSI=y
 CONFIG_DEBUG_UART_BASE=0xd0012000
 CONFIG_DEBUG_UART_CLOCK=250000000
 CONFIG_DEBUG_UART_SHIFT=2
configs/dms-ba16-1g_defconfig +1 -0
index 60db28979c..743276d164 100644
@@ -29,6 +29,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_USB=y
configs/dms-ba16_defconfig +1 -0
index 7a8c268672..d9e14d87a0 100644
@@ -28,6 +28,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_USB=y
configs/dreamplug_defconfig +1 -0
index 8f3ffcf5ba..ff8ec6002f 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_ISO_PARTITION=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
configs/ds109_defconfig +1 -0
index d8f373b492..eeac7cc0be 100644
@@ -14,6 +14,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_FAT=y
 CONFIG_ISO_PARTITION=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
configs/ea20_defconfig +1 -0
index 4ee7d5aac1..a6abe02e30 100644
@@ -28,6 +28,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_BMP=y
 CONFIG_CMD_DIAG=y
 CONFIG_CMD_UBI=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/ethernut5_defconfig +1 -0
index 197052dba6..5006c87118 100644
@@ -30,6 +30,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
 CONFIG_CMD_UBI=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
configs/galileo_defconfig +1 -0
index f60abc3422..d8460ad309 100644
@@ -37,6 +37,7 @@ CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
configs/ge_b450v3_defconfig +1 -0
index aaeb34d7c0..8e4f2260ac 100644
@@ -24,6 +24,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_OF_LIBFDT=y
configs/ge_b650v3_defconfig +1 -0
index 78187051eb..9bafa18b8d 100644
@@ -24,6 +24,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_OF_LIBFDT=y
configs/ge_b850v3_defconfig +1 -0
index 967ddba13a..c709cd5d4e 100644
@@ -24,6 +24,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_OF_LIBFDT=y
configs/gose_defconfig +1 -0
index 5627a18631..9f66c6fabe 100644
@@ -20,6 +20,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/inetspace_v2_defconfig +1 -0
index 8daf4332ca..2e116a4b7e 100644
@@ -24,6 +24,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
configs/kmcoge4_defconfig +1 -0
index 8d46b6ad3e..8854db4e9b 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_JFFS2=y
 # CONFIG_CMD_IRQ is not set
 CONFIG_CMD_UBI=y
 CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/kmcoge5un_defconfig +1 -0
index af0df7ef22..3470717605 100644
@@ -21,6 +21,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_JFFS2=y
 CONFIG_CMD_UBI=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/kmlion1_defconfig +1 -0
index 23859e9bed..f3b9ac322e 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_JFFS2=y
 # CONFIG_CMD_IRQ is not set
 CONFIG_CMD_UBI=y
 CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/kmnusa_defconfig +1 -0
index eb70cd600a..ce79da1738 100644
@@ -21,6 +21,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_JFFS2=y
 CONFIG_CMD_UBI=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/kmsugp1_defconfig +1 -0
index ed90f9d5b6..3d97fd5cf3 100644
@@ -21,6 +21,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_JFFS2=y
 CONFIG_CMD_UBI=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/kmsuv31_defconfig +1 -0
index c5edce8e4f..e2bfe7b362 100644
@@ -21,6 +21,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_JFFS2=y
 CONFIG_CMD_UBI=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/koelsch_defconfig +1 -0
index 465a6be8e7..0383380cfb 100644
@@ -20,6 +20,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/lager_defconfig +1 -0
index c2f216bd51..9602020193 100644
@@ -20,6 +20,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/ls1012afrdm_qspi_defconfig +1 -0
index 7932ab5ada..636823b450 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 # CONFIG_MMC is not set
configs/ls1012aqds_qspi_defconfig +2 -1
index 17627ec4e5..f796c3373d 100644
@@ -28,10 +28,10 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 # CONFIG_BLK is not set
-CONFIG_SCSI=y
 CONFIG_DM_MMC=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
@@ -41,6 +41,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE=y
+CONFIG_SCSI=y
 CONFIG_SYS_NS16550=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1012ardb_qspi_defconfig +1 -0
index 328fa52bfe..ad6b87c8a3 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 # CONFIG_BLK is not set
configs/ls1021aiot_qspi_defconfig +1 -0
index 3628367df0..744653af3f 100644
@@ -6,6 +6,7 @@ CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM=y
 CONFIG_FSL_CAAM=y
 CONFIG_SPI_FLASH=y
configs/ls1021aqds_qspi_defconfig +1 -0
index 7993a69ee3..65d0450715 100644
@@ -31,6 +31,7 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM=y
 CONFIG_FSL_CAAM=y
 CONFIG_SYS_FSL_DDR3=y
configs/ls1021atwr_qspi_defconfig +1 -0
index 07a414397a..cd0a46d9f6 100644
@@ -31,6 +31,7 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM=y
 CONFIG_FSL_CAAM=y
 CONFIG_SPI_FLASH=y
configs/ls1043aqds_qspi_defconfig +1 -0
index 348be3b1b9..80fae3c44e 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM=y
 CONFIG_FSL_CAAM=y
 CONFIG_SPI_FLASH=y
configs/ls1046aqds_qspi_defconfig +1 -0
index d145c5a3a2..da34852a27 100644
@@ -23,6 +23,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM=y
 CONFIG_FSL_CAAM=y
 CONFIG_SPI_FLASH=y
configs/ls1046ardb_qspi_defconfig +1 -0
index 0a8f1a0501..d80cf53be0 100644
@@ -20,6 +20,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM=y
 CONFIG_FSL_CAAM=y
 CONFIG_SPI_FLASH=y
configs/ls2080aqds_qspi_defconfig +1 -0
index f08e7bfa87..3383aa509d 100644
@@ -21,6 +21,7 @@ CONFIG_CMD_DATE=y
 # CONFIG_ISO_PARTITION is not set
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_FSL_CAAM=y
configs/ls2081ardb_defconfig +2 -1
index bc2792e533..cd19a20389 100644
@@ -19,9 +19,9 @@ CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_CACHE=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
-CONFIG_SCSI=y
 CONFIG_FSL_CAAM=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_NETDEVICES=y
@@ -30,6 +30,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE=y
+CONFIG_SCSI=y
 CONFIG_SYS_NS16550=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls2088ardb_qspi_defconfig +1 -0
index 76b2f32677..0ca4113d58 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_CACHE=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_FSL_CAAM=y
configs/lschlv2_defconfig +1 -0
index 1d55003d67..bf91343e2a 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
configs/lsxhl_defconfig +1 -0
index 75fe55d819..67ed1c9702 100644
@@ -16,6 +16,7 @@ CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
configs/marsboard_defconfig +2 -1
index b6fbbb965b..04b09cbd2a 100644
@@ -3,7 +3,7 @@ CONFIG_ARCH_MX6=y
 CONFIG_TARGET_EMBESTMX6BOARDS=y
 CONFIG_VIDEO=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,ENV_IS_IN_SPI_FLASH"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024"
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
@@ -17,6 +17,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
configs/minnowmax_defconfig +1 -1
index a64a0a3455..81e8253719 100644
@@ -47,7 +47,6 @@ CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
-CONFIG_SCSI=y
 CONFIG_CPU=y
 CONFIG_MMC=y
 CONFIG_MMC_PCI=y
@@ -62,6 +61,7 @@ CONFIG_DM_ETH=y
 CONFIG_RTL8169=y
 CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
+CONFIG_SCSI=y
 CONFIG_DEBUG_UART_BASE=0x3f8
 CONFIG_DEBUG_UART_CLOCK=1843200
 CONFIG_SYS_NS16550=y
configs/mvebu_db-88f3720_defconfig +1 -0
index f2b2e5db90..451cf39e63 100644
@@ -36,6 +36,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BLOCK_CACHE=y
 CONFIG_DM_GPIO=y
 # CONFIG_MVEBU_GPIO is not set
configs/mvebu_db-88f7040_defconfig +1 -0
index 28af6431ea..bbe9c8e683 100644
@@ -37,6 +37,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BLOCK_CACHE=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MVTWSI=y
configs/mvebu_db-88f8040_defconfig +1 -0
index 7f36eda665..6bb62ce80e 100644
@@ -37,6 +37,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BLOCK_CACHE=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MVTWSI=y
configs/mvebu_espressobin-88f3720_defconfig +1 -0
index 9ab7f4603a..14f5d28192 100644
@@ -35,6 +35,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BLOCK_CACHE=y
 CONFIG_DM_I2C=y
 CONFIG_MISC=y
configs/mvebu_mcbin-88f8040_defconfig +1 -0
index a4fec5dc1f..cfb665cee3 100644
@@ -39,6 +39,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BLOCK_CACHE=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
configs/mx28evk_spi_defconfig +1 -1
index 1b5de66553..4164965cc2 100644
@@ -5,7 +5,6 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_VIDEO=y
-CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_SPI_FLASH"
 CONFIG_BOOTDELAY=1
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
@@ -33,6 +32,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_UBI=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MMC_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
configs/mx6slevk_spinor_defconfig +1 -0
index 7acdc98d65..7d9fe2cbdf 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM=y
 # CONFIG_BLK is not set
 CONFIG_DM_GPIO=y
configs/net2big_v2_defconfig +1 -0
index ab8eb958ca..5a624aed3a 100644
@@ -24,6 +24,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
configs/netspace_lite_v2_defconfig +1 -0
index 66db6447ac..63861dde4d 100644
@@ -24,6 +24,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
configs/netspace_max_v2_defconfig +1 -0
index 04abc9405b..02e6e5be94 100644
@@ -24,6 +24,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
configs/netspace_mini_v2_defconfig +1 -0
index 5f79e6f0e2..cb4e464e93 100644
@@ -22,6 +22,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
configs/netspace_v2_defconfig +1 -0
index a81ad0b1e8..01683f6083 100644
@@ -24,6 +24,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
configs/nitrogen6dl2g_defconfig +1 -0
index 5744ede776..d851661850 100644
@@ -30,6 +30,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_USB=y
configs/nitrogen6dl_defconfig +1 -0
index dca89ec34e..0dd8affe0c 100644
@@ -30,6 +30,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_USB=y
configs/nitrogen6q2g_defconfig +1 -0
index baa509d48e..54684cfd72 100644
@@ -31,6 +31,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_USB=y
configs/nitrogen6q_defconfig +1 -0
index ebfa843061..d5ff2476f8 100644
@@ -31,6 +31,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_USB=y
configs/nitrogen6s1g_defconfig +1 -0
index 0f7532062a..77e0940f7a 100644
@@ -30,6 +30,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_USB=y
configs/nitrogen6s_defconfig +1 -0
index 45a5acb96c..79c7f39c99 100644
@@ -30,6 +30,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_USB=y
configs/ot1200_defconfig +1 -0
index d6271b8d55..a4fb76cff3 100644
@@ -23,6 +23,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/ot1200_spl_defconfig +1 -0
index b64ded2cf7..fada4de87b 100644
@@ -31,6 +31,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/pcm058_defconfig +1 -0
index c55537c032..41ddc1cd53 100644
@@ -42,6 +42,7 @@ CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
 # CONFIG_SPL_PARTITION_UUIDS is not set
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM=y
 CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
configs/peach-pi_defconfig +1 -0
index 0b53af833e..1a28fe9966 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_REGULATOR=y
 CONFIG_CMD_TPM=y
 CONFIG_CMD_TPM_TEST=y
 CONFIG_CMD_EXT4_WRITE=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_I2C_CROS_EC_TUNNEL=y
 CONFIG_I2C_MUX=y
configs/peach-pit_defconfig +1 -0
index 1e93856f71..4b765da46e 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_REGULATOR=y
 CONFIG_CMD_TPM=y
 CONFIG_CMD_TPM_TEST=y
 CONFIG_CMD_EXT4_WRITE=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_I2C_CROS_EC_TUNNEL=y
 CONFIG_I2C_MUX=y
configs/porter_defconfig +1 -0
index a50d9ed99b..185ec9f7fb 100644
@@ -20,6 +20,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/sama5d2_ptc_spiflash_defconfig +1 -0
index 8771e0846c..951c792ebb 100644
@@ -18,6 +18,7 @@ CONFIG_SPL=y
 CONFIG_CMD_SF=y
 # CONFIG_CMD_FPGA is not set
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_USB=y
configs/sama5d2_xplained_spiflash_defconfig +1 -0
index 2680ab99af..7fc2b07f8d 100644
@@ -33,6 +33,7 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-parent dmas dma-names"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
configs/sama5d36ek_cmp_spiflash_defconfig +1 -0
index 8db4f524f8..3f6df43942 100644
@@ -23,6 +23,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
configs/sama5d3xek_spiflash_defconfig +1 -0
index 0166cb6e12..79e6a67faf 100644
@@ -33,6 +33,7 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-parent dmas dma-names"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
configs/sama5d4_xplained_spiflash_defconfig +1 -0
index e7e3169bbc..b6dae2386b 100644
@@ -32,6 +32,7 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-parent dma-names dmas"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
configs/sama5d4ek_spiflash_defconfig +1 -0
index 98813bcd7e..7da9c45d2c 100644
@@ -32,6 +32,7 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-parent dma-names dmas"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
configs/sh7752evb_defconfig +1 -0
index 4e19243f0d..1db697205c 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_MAC_PARTITION=y
 CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MMC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
configs/sh7753evb_defconfig +1 -0
index 23b7d7df48..5f36a8cd7d 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_MAC_PARTITION=y
 CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MMC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
configs/sh7757lcr_defconfig +1 -0
index 44224e1e43..3ea2158fca 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_MAC_PARTITION=y
 CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MMC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/silk_defconfig +1 -0
index d161c3bb88..3726b235a6 100644
@@ -20,6 +20,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/smdk5250_defconfig +1 -0
index c51df50678..b095f02c9b 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_SOUND=y
 CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
 CONFIG_CMD_EXT4_WRITE=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
configs/smdk5420_defconfig +1 -0
index bff944491e..5889de8cdb 100644
@@ -22,6 +22,7 @@ CONFIG_CMD_GPIO=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_EXT4_WRITE=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
configs/snow_defconfig +1 -0
index 5cccd910a5..d5c9c082ae 100644
@@ -29,6 +29,7 @@ CONFIG_CMD_REGULATOR=y
 CONFIG_CMD_TPM=y
 CONFIG_CMD_TPM_TEST=y
 CONFIG_CMD_EXT4_WRITE=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_I2C_CROS_EC_LDO=y
 CONFIG_I2C_MUX=y
configs/socfpga_is1_defconfig +1 -0
index 058791e968..73b940506c 100644
@@ -32,6 +32,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_UBI=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_DM_GPIO=y
configs/socfpga_sr1500_defconfig +1 -0
index 4468d3b71d..44b195bd92 100644
@@ -38,6 +38,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_UBI=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_DM_GPIO=y
configs/socfpga_vining_fpga_defconfig +1 -0
index 18186e83db..d4ce9afe04 100644
@@ -39,6 +39,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_UBI=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
configs/som-db5800-som-6867_defconfig +1 -1
index 56a7e4b017..47daca0969 100644
@@ -43,7 +43,6 @@ CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
-CONFIG_SCSI=y
 CONFIG_CPU=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
@@ -54,6 +53,7 @@ CONFIG_DM_ETH=y
 CONFIG_E1000=y
 CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
+CONFIG_SCSI=y
 CONFIG_DEBUG_UART_BASE=0x3f8
 CONFIG_DEBUG_UART_CLOCK=1843200
 CONFIG_SYS_NS16550=y
configs/spring_defconfig +1 -0
index 554ac7771b..41c793004d 100644
@@ -29,6 +29,7 @@ CONFIG_CMD_REGULATOR=y
 CONFIG_CMD_TPM=y
 CONFIG_CMD_TPM_TEST=y
 CONFIG_CMD_EXT4_WRITE=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_I2C_CROS_EC_LDO=y
 CONFIG_I2C_MUX=y
configs/stout_defconfig +1 -0
index 48989aaea6..8c27a1052c 100644
@@ -20,6 +20,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/stv0991_defconfig +1 -0
index c91b8b7335..fe8d8243bf 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_SPI=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_PING=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
configs/tqma6dl_mba6_spi_defconfig +1 -0
index dee295ee35..46d6b77561 100644
@@ -29,6 +29,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_USB=y
configs/tqma6q_mba6_spi_defconfig +1 -0
index 3ec25c8217..2c345de7a5 100644
@@ -28,6 +28,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_USB=y
configs/tqma6s_mba6_spi_defconfig +1 -0
index f824018849..365d36f2bd 100644
@@ -29,6 +29,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_USB=y
configs/trimslice_defconfig +1 -0
index cb42ac559a..efb0006e3e 100644
@@ -23,6 +23,7 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPL_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
configs/vinco_defconfig +1 -0
index c8da54d9b6..71d7e6cb35 100644
@@ -21,6 +21,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
configs/zynq_microzed_defconfig +1 -0
index 2d7fffc1f4..d4ede3ebf7 100644
@@ -32,6 +32,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_DFU_MMC=y
configs/zynq_zc702_defconfig +1 -0
index 8f20b09244..0be8e028d7 100644
@@ -36,6 +36,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_DFU_MMC=y
configs/zynq_zc706_defconfig +1 -0
index 825346abd6..98ef6d7887 100644
@@ -35,6 +35,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_DFU_MMC=y
configs/zynq_zc770_xm010_defconfig +1 -0
index a1ef49f250..c4c2714952 100644
@@ -31,6 +31,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_MMC_SDHCI=y
configs/zynq_zed_defconfig +1 -0
index 2887ca4167..42f5ba1ec3 100644
@@ -32,6 +32,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_DFU_MMC=y
configs/zynq_zybo_defconfig +1 -0
index f3f89cb5e4..3689c53643 100644
@@ -36,6 +36,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_DFU_MMC=y
env/Kconfig +38 -0
index ea973458ca..1f744cc576 100644
@@ -250,6 +250,44 @@ config ENV_IS_IN_NVRAM
 	  can just be read and written to, without any special
 	  provision.
 
+config ENV_IS_IN_SPI_FLASH
+	bool "Environment is in SPI flash"
+	help
+	  Define this if you have a SPI Flash memory device which you
+	  want to use for the environment.
+
+	  - CONFIG_ENV_OFFSET:
+	  - CONFIG_ENV_SIZE:
+
+	  These two #defines specify the offset and size of the
+	  environment area within the SPI Flash. CONFIG_ENV_OFFSET must be
+	  aligned to an erase sector boundary.
+
+	  - CONFIG_ENV_SECT_SIZE:
+
+	  Define the SPI flash's sector size.
+
+	  - CONFIG_ENV_OFFSET_REDUND (optional):
+
+	  This setting describes a second storage area of CONFIG_ENV_SIZE
+	  size used to hold a redundant copy of the environment data, so
+	  that there is a valid backup copy in case there is a power failure
+	  during a "saveenv" operation. CONFIG_ENV_OFFSET_REDUND must be
+	  aligned to an erase sector boundary.
+
+	  - CONFIG_ENV_SPI_BUS (optional):
+	  - CONFIG_ENV_SPI_CS (optional):
+
+	  Define the SPI bus and chip select. If not defined they will be 0.
+
+	  - CONFIG_ENV_SPI_MAX_HZ (optional):
+
+	  Define the SPI max work clock. If not defined then use 1MHz.
+
+	  - CONFIG_ENV_SPI_MODE (optional):
+
+	  Define the SPI work mode. If not defined then use SPI_MODE_3.
+
 config ENV_IS_IN_UBI
 	bool "Environment in a UBI volume"
 	help
include/config_fsl_chain_trust.h +0 -5
index 195419b888..1aabe6e747 100644
@@ -11,11 +11,6 @@
  * not verified, undef CONFIG_ENV_xxx and set default env
  * (CONFIG_ENV_IS_NOWHERE)
  */
-#ifdef CONFIG_SECURE_BOOT
-
-#undef CONFIG_ENV_IS_IN_SPI_FLASH
-
-#endif
 
 #ifdef CONFIG_CHAIN_OF_TRUST
 
include/configs/B4860QDS.h +0 -1
index d580e9b36e..6ae9851545 100644
@@ -115,7 +115,6 @@
 
 #if defined(CONFIG_SPIFLASH)
 #define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SPI_BUS              0
 #define CONFIG_ENV_SPI_CS               0
 #define CONFIG_ENV_SPI_MAX_HZ           10000000
include/configs/BSC9131RDB.h +0 -1
index 5dd112c0c6..512e7cec1e 100644
@@ -267,7 +267,6 @@ extern unsigned long get_sdram_size(void);
  * Environment
  */
 #if defined(CONFIG_RAMBOOT_SPIFLASH)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SPI_BUS	0
 #define CONFIG_ENV_SPI_CS	0
 #define CONFIG_ENV_SPI_MAX_HZ	10000000
include/configs/BSC9132QDS.h +0 -1
index 54d613707b..890d2e1206 100644
@@ -489,7 +489,6 @@ combinations. this should be removed later
 #define CONFIG_SYS_MMC_ENV_DEV		0
 #define CONFIG_ENV_SIZE			0x2000
 #elif defined(CONFIG_RAMBOOT_SPIFLASH)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SPI_BUS	0
 #define CONFIG_ENV_SPI_CS	0
 #define CONFIG_ENV_SPI_MAX_HZ	10000000
include/configs/C29XPCIE.h +0 -1
index 937e93ef0a..629a326d7b 100644
@@ -404,7 +404,6 @@
  */
 #if defined(CONFIG_SYS_RAMBOOT)
 #if defined(CONFIG_RAMBOOT_SPIFLASH)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SPI_BUS	0
 #define CONFIG_ENV_SPI_CS	0
 #define CONFIG_ENV_SPI_MAX_HZ	10000000
include/configs/M52277EVB.h +0 -1
index 75acc59910..6f9ebee635 100644
@@ -199,7 +199,6 @@
  * crc error warning if there is no correct environment on the flash.
  */
 #ifdef CONFIG_CF_SBF
-#	define CONFIG_ENV_IS_IN_SPI_FLASH
 #	define CONFIG_ENV_SPI_CS	2
 #endif
 #define CONFIG_ENV_OVERWRITE		1
include/configs/M54418TWR.h +0 -1
index 985df810cb..66e05d0954 100644
@@ -279,7 +279,6 @@
 #endif
 
 #if defined(CONFIG_CF_SBF)
-#define CONFIG_ENV_IS_IN_SPI_FLASH	1
 #define CONFIG_ENV_SPI_CS		1
 #define CONFIG_ENV_OFFSET		0x40000
 #define CONFIG_ENV_SIZE		0x2000
include/configs/M54451EVB.h +0 -1
index fbd5287147..b32ac11e8d 100644
@@ -216,7 +216,6 @@
  * crc error warning if there is no correct environment on the flash.
  */
 #if defined(CONFIG_SYS_STMICRO_BOOT)
-#	define CONFIG_ENV_IS_IN_SPI_FLASH	1
 #	define CONFIG_ENV_SPI_CS		1
 #	define CONFIG_ENV_OFFSET		0x20000
 #	define CONFIG_ENV_SIZE		0x2000
include/configs/M54455EVB.h +0 -1
index cc08df7d3d..1a0cc340fd 100644
@@ -271,7 +271,6 @@
  * crc error warning if there is no correct environment on the flash.
  */
 #ifdef CONFIG_CF_SBF
-#	define CONFIG_ENV_IS_IN_SPI_FLASH
 #	define CONFIG_ENV_SPI_CS		1
 #endif
 #undef CONFIG_ENV_OVERWRITE
include/configs/MPC8536DS.h +0 -1
index d96c15ec01..0245fc68eb 100644
@@ -557,7 +557,6 @@
 
 #if defined(CONFIG_SYS_RAMBOOT)
 #if defined(CONFIG_RAMBOOT_SPIFLASH)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SPI_BUS	0
 #define CONFIG_ENV_SPI_CS	0
 #define CONFIG_ENV_SPI_MAX_HZ	10000000
include/configs/P1010RDB.h +0 -1
index c4c8f3e617..846f94a00a 100644
@@ -682,7 +682,6 @@ extern unsigned long get_sdram_size(void);
 #define CONFIG_SYS_MMC_ENV_DEV		0
 #define CONFIG_ENV_SIZE			0x2000
 #elif defined(CONFIG_SPIFLASH)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SPI_BUS	0
 #define CONFIG_ENV_SPI_CS	0
 #define CONFIG_ENV_SPI_MAX_HZ	10000000
include/configs/P1022DS.h +0 -1
index b7507a2b29..32712e78ed 100644
@@ -552,7 +552,6 @@
  * Environment
  */
 #ifdef CONFIG_SPIFLASH
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SPI_BUS	0
 #define CONFIG_ENV_SPI_CS	0
 #define CONFIG_ENV_SPI_MAX_HZ	10000000
include/configs/P2041RDB.h +0 -1
index 36d08d8e7f..a31989835b 100644
@@ -63,7 +63,6 @@
 
 #if defined(CONFIG_SPIFLASH)
 	#define CONFIG_SYS_EXTRA_ENV_RELOC
-	#define CONFIG_ENV_IS_IN_SPI_FLASH
 	#define CONFIG_ENV_SPI_BUS              0
 	#define CONFIG_ENV_SPI_CS               0
 	#define CONFIG_ENV_SPI_MAX_HZ           10000000
include/configs/T102xQDS.h +0 -1
index 48c7b2dcc2..79537755cc 100644
@@ -145,7 +145,6 @@
 
 #if defined(CONFIG_SPIFLASH)
 #define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SPI_BUS		0
 #define CONFIG_ENV_SPI_CS		0
 #define CONFIG_ENV_SPI_MAX_HZ		10000000
include/configs/T102xRDB.h +0 -1
index dcfedc0410..a7f1bbcba7 100644
@@ -160,7 +160,6 @@
 
 #if defined(CONFIG_SPIFLASH)
 #define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SPI_BUS		0
 #define CONFIG_ENV_SPI_CS		0
 #define CONFIG_ENV_SPI_MAX_HZ		10000000
include/configs/T1040QDS.h +0 -1
index 56591f38d9..a0651a425e 100644
@@ -72,7 +72,6 @@
 #ifdef CONFIG_MTD_NOR_FLASH
 #if defined(CONFIG_SPIFLASH)
 #define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SPI_BUS              0
 #define CONFIG_ENV_SPI_CS               0
 #define CONFIG_ENV_SPI_MAX_HZ           10000000
include/configs/T104xRDB.h +0 -1
index 9cdd67f5b7..ca178a7f24 100644
@@ -180,7 +180,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
 
 #if defined(CONFIG_SPIFLASH)
 #define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SIZE                 0x2000          /* 8KB */
 #define CONFIG_ENV_OFFSET               0x100000        /* 1MB */
 #define CONFIG_ENV_SECT_SIZE            0x10000
include/configs/T208xQDS.h +0 -1
index 0dcef00186..a7b894e316 100644
@@ -141,7 +141,6 @@
 
 #if defined(CONFIG_SPIFLASH)
 #define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SPI_BUS	0
 #define CONFIG_ENV_SPI_CS	0
 #define CONFIG_ENV_SPI_MAX_HZ	10000000
include/configs/T208xRDB.h +0 -1
index 90401a3256..274ff49aba 100644
@@ -127,7 +127,6 @@
 
 #if defined(CONFIG_SPIFLASH)
 #define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SPI_BUS	0
 #define CONFIG_ENV_SPI_CS	0
 #define CONFIG_ENV_SPI_MAX_HZ	10000000
include/configs/T4240QDS.h +0 -1
index d9983653f0..0c1ec41e66 100644
@@ -86,7 +86,6 @@
 
 #if defined(CONFIG_SPIFLASH)
 #define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SPI_BUS              0
 #define CONFIG_ENV_SPI_CS               0
 #define CONFIG_ENV_SPI_MAX_HZ           10000000
include/configs/T4240RDB.h +0 -1
index ee1110a317..df3888310c 100644
@@ -327,7 +327,6 @@
 
 #if defined(CONFIG_SPIFLASH)
 #define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SPI_BUS              0
 #define CONFIG_ENV_SPI_CS               0
 #define CONFIG_ENV_SPI_MAX_HZ           10000000
include/configs/UCP1020.h +0 -1
index 31d7cdbd10..6fd3fa4712 100644
@@ -375,7 +375,6 @@
 
 #ifdef CONFIG_RAMBOOT_SPIFLASH
 
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SIZE		0x3000		/* 12KB */
 #define CONFIG_ENV_OFFSET	0x2000		/* 8KB */
 #define CONFIG_ENV_SECT_SIZE	0x1000
include/configs/advantech_dms-ba16.h +0 -1
index 66ee167f96..272570e9b7 100644
@@ -239,7 +239,6 @@
 
 /* FLASH and environment organization */
 
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SIZE                 (8 * 1024)
 #define CONFIG_ENV_OFFSET               (768 * 1024)
 #define CONFIG_ENV_SECT_SIZE            (64 * 1024)
include/configs/am335x_evm.h +0 -1
index f09822413f..1243a5e804 100644
@@ -324,7 +324,6 @@
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x20000
 
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 #define CONFIG_ENV_SPI_MAX_HZ		CONFIG_SF_DEFAULT_SPEED
 #define CONFIG_ENV_SECT_SIZE		(4 << 10) /* 4 KB sectors */
include/configs/am43xx_evm.h +0 -1
index b72aeda851..571f7b53d8 100644
@@ -128,7 +128,6 @@
 #define CONFIG_SYS_TEXT_BASE		CONFIG_ISW_ENTRY_ADDR
 #endif
 #undef CONFIG_ENV_IS_IN_FAT
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 #define CONFIG_ENV_SPI_MAX_HZ           CONFIG_SF_DEFAULT_SPEED
 #define CONFIG_ENV_SECT_SIZE           (64 << 10) /* 64 KB sectors */
include/configs/ap121.h +0 -1
index 2284b8bc66..e6778fe0c6 100644
@@ -41,7 +41,6 @@
 					"64k(NVRAM),64k(ART)"
 
 #define CONFIG_ENV_SPI_MAX_HZ           25000000
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_OFFSET               0x40000
 #define CONFIG_ENV_SECT_SIZE            0x10000
 #define CONFIG_ENV_SIZE                 0x10000
include/configs/ap143.h +0 -1
index 2950783097..bd6b83729c 100644
@@ -45,7 +45,6 @@
 					"64k(ART)"
 
 #define CONFIG_ENV_SPI_MAX_HZ           25000000
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_OFFSET               0x40000
 #define CONFIG_ENV_SECT_SIZE            0x10000
 #define CONFIG_ENV_SIZE                 0x10000
include/configs/aristainetos-common.h +0 -1
index 7360e11ff1..461de801f8 100644
@@ -160,7 +160,6 @@
 
 /* Environment organization */
 #define CONFIG_ENV_SIZE			(12 * 1024)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 #define CONFIG_ENV_SPI_BUS		CONFIG_SF_DEFAULT_BUS
 #define CONFIG_ENV_SPI_CS		CONFIG_SF_DEFAULT_CS
include/configs/at91-sama5_common.h +0 -1
index e511d18234..33f2d85319 100644
@@ -87,7 +87,6 @@
 					"bootz 0x22000000 - 0x21000000"
 #elif CONFIG_SYS_USE_SERIALFLASH
 /* u-boot env in serial flash, by default is bus 0 and cs 0 */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_OFFSET		0x6000
 #define CONFIG_ENV_SIZE			0x2000
 #define CONFIG_ENV_SECT_SIZE		0x1000
include/configs/at91sam9n12ek.h +0 -1
index 7bccee905e..03846b55f5 100644
@@ -126,7 +126,6 @@
 #ifdef CONFIG_SYS_USE_SPIFLASH
 
 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_OFFSET		0x5000
 #define CONFIG_ENV_SIZE			0x3000
 #define CONFIG_ENV_SECT_SIZE		0x1000
include/configs/at91sam9x5ek.h +0 -2
index a01072f059..7357e18115 100644
@@ -125,7 +125,6 @@
 				"bootm 0x22000000"
 #elif defined(CONFIG_SYS_USE_SPIFLASH)
 /* bootstrap + u-boot + env + linux in spi flash */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_OFFSET	0x5000
 #define CONFIG_ENV_SIZE		0x3000
 #define CONFIG_ENV_SECT_SIZE	0x1000
@@ -135,7 +134,6 @@
 				"bootm 0x22000000"
 #elif defined(CONFIG_SYS_USE_DATAFLASH)
 /* bootstrap + u-boot + env + linux in data flash */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_OFFSET	0x4200
 #define CONFIG_ENV_SIZE		0x4200
 #define CONFIG_ENV_SECT_SIZE	0x210
include/configs/bav335x.h +0 -1
index 04a6e06e0f..878731389e 100644
@@ -500,7 +500,6 @@ DEFAULT_LINUX_BOOT_ENV \
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x20000
 
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 #define CONFIG_ENV_SPI_MAX_HZ		CONFIG_SF_DEFAULT_SPEED
 #define CONFIG_ENV_SECT_SIZE		(4 << 10) /* 4 KB sectors */
include/configs/blanche.h +0 -1
index 50692cba65..9a18046d9c 100755
@@ -81,7 +81,6 @@
 /* ENV setting */
 #if !defined(CONFIG_MTD_NOR_FLASH)
 #else
-#undef  CONFIG_ENV_IS_IN_SPI_FLASH
 #undef  CONFIG_ENV_ADDR
 #define CONFIG_ENV_SECT_SIZE	(256 * 1024)
 #define CONFIG_ENV_ADDR		(CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN)
include/configs/brppt1.h +0 -1
index dba0ee6820..8ea3722098 100644
@@ -242,7 +242,6 @@ MMCARGS
 
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x20000
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 #define CONFIG_ENV_SPI_MAX_HZ		CONFIG_SF_DEFAULT_SPEED
 #define CONFIG_ENV_SECT_SIZE		(4 << 10) /* 4 KB sectors */
include/configs/cgtqmx6eval.h +0 -1
index 5d797b4403..b36cbb9679 100644
@@ -245,7 +245,6 @@
 
 #define CONFIG_ENV_SIZE			(8 * 1024)
 
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #if defined(CONFIG_ENV_IS_IN_SPI_FLASH)
 #define CONFIG_ENV_OFFSET		(768 * 1024)
 #define CONFIG_ENV_SECT_SIZE		(64 * 1024)
include/configs/cl-som-am57x.h +0 -1
index a04f4cd23d..c1cf4132fe 100644
@@ -50,7 +50,6 @@
 #define CONFIG_ENV_SIZE			(16 << 10) /* 16 KiB env size */
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SECT_SIZE		(64 * 1024)
 #define CONFIG_ENV_OFFSET		(768 * 1024)
 #define CONFIG_ENV_SPI_MAX_HZ		48000000
include/configs/cm_fx6.h +0 -1
index 1d9c1650d5..b217083ac1 100644
@@ -67,7 +67,6 @@
 				"-(reserved)"
 
 /* Environment */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SPI_MAX_HZ		CONFIG_SF_DEFAULT_SPEED
 #define CONFIG_ENV_SPI_MODE		CONFIG_SF_DEFAULT_MODE
 #define CONFIG_ENV_SPI_BUS		CONFIG_SF_DEFAULT_BUS
include/configs/cm_t43.h +0 -1
index 7b5ca0db0f..f6e0743b53 100644
@@ -97,7 +97,6 @@
 #define V_OSCK				24000000  /* Clock output from T2 */
 #define V_SCLK				(V_OSCK)
 
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SECT_SIZE		(64 * 1024)
 #define CONFIG_ENV_OFFSET		(768 * 1024)
 #define CONFIG_ENV_SPI_MAX_HZ           48000000
include/configs/controlcenterd.h +0 -1
index f9245e06ba..1ac416260e 100644
@@ -300,7 +300,6 @@
 #if defined(CONFIG_TRAILBLAZER)
 #define CONFIG_ENV_SIZE		0x2000		/* 8KB */
 #elif defined(CONFIG_RAMBOOT_SPIFLASH)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SPI_BUS	0
 #define CONFIG_ENV_SPI_CS	0
 #define CONFIG_ENV_SPI_MAX_HZ	10000000
include/configs/controlcenterdc.h +0 -1
index f10cddafe0..021150ed61 100644
@@ -65,7 +65,6 @@
 #define CONFIG_EHCI_IS_TDI
 
 /* Environment in SPI NOR flash */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SPI_BUS		1
 #define CONFIG_ENV_OFFSET		(1 << 20) /* 1MiB in */
 #define CONFIG_ENV_SIZE			(64 << 10) /* 64KiB */
include/configs/corenet_ds.h +0 -1
index 70fdb58163..07183c9095 100644
@@ -74,7 +74,6 @@
 
 #if defined(CONFIG_SPIFLASH)
 #define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SPI_BUS              0
 #define CONFIG_ENV_SPI_CS               0
 #define CONFIG_ENV_SPI_MAX_HZ           10000000
include/configs/da850evm.h +0 -1
index 2277215445..100b114e25 100644
@@ -231,7 +231,6 @@
 #endif
 
 #ifdef CONFIG_USE_SPIFLASH
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SIZE			(64 << 10)
 #define CONFIG_ENV_OFFSET		(512 << 10)
 #define CONFIG_ENV_SECT_SIZE		(64 << 10)
include/configs/db-88f6720.h +0 -1
index 699c03f844..cdaaced2eb 100644
@@ -40,7 +40,6 @@
 #define CONFIG_SF_DEFAULT_MODE		SPI_MODE_3
 
 /* Environment in SPI NOR flash */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_OFFSET		(1 << 20) /* 1MiB in */
 #define CONFIG_ENV_SIZE			(64 << 10) /* 64KiB */
 #define CONFIG_ENV_SECT_SIZE		(64 << 10) /* 64KiB sectors */
include/configs/db-88f6820-amc.h +0 -1
index 0f0ab01f62..864222955f 100644
@@ -40,7 +40,6 @@
 #define CONFIG_EHCI_IS_TDI
 
 /* Environment in SPI NOR flash */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SPI_BUS		1
 #define CONFIG_ENV_OFFSET		(1 << 20) /* 1MiB in */
 #define CONFIG_ENV_SIZE			(64 << 10) /* 64KiB */
include/configs/db-88f6820-gp.h +0 -1
index 292bfb8f7d..4a9d2f75bf 100644
@@ -62,7 +62,6 @@
 #define CONFIG_EHCI_IS_TDI
 
 /* Environment in SPI NOR flash */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_OFFSET		(1 << 20) /* 1MiB in */
 #define CONFIG_ENV_SIZE			(64 << 10) /* 64KiB */
 #define CONFIG_ENV_SECT_SIZE		(256 << 10) /* 256KiB sectors */
include/configs/db-mv784mp-gp.h +0 -1
index 187ead3e4b..6ad5206fc0 100644
@@ -44,7 +44,6 @@
 #define CONFIG_SF_DEFAULT_MODE		SPI_MODE_3
 
 /* Environment in SPI NOR flash */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_OFFSET		(1 << 20) /* 1MiB in */
 #define CONFIG_ENV_SIZE			(64 << 10) /* 64KiB */
 #define CONFIG_ENV_SECT_SIZE		(64 << 10) /* 64KiB sectors */
include/configs/dra7xx_evm.h +0 -1
index 1c2cc6f4b0..8566bdc569 100644
@@ -137,7 +137,6 @@
 #define CONFIG_SYS_SPI_ARGS_OFFS	0x140000
 #define CONFIG_SYS_SPI_ARGS_SIZE	0x80000
 #if defined(CONFIG_QSPI_BOOT)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 #define CONFIG_ENV_SPI_MAX_HZ           CONFIG_SF_DEFAULT_SPEED
 #define CONFIG_ENV_SIZE			(64 << 10)
include/configs/dreamplug.h +0 -1
index 9715f297a9..7a739e39d7 100644
@@ -32,7 +32,6 @@
  *  Environment variables configurations
  */
 #ifdef CONFIG_SPI_FLASH
-#define CONFIG_ENV_IS_IN_SPI_FLASH	1
 #define CONFIG_ENV_SECT_SIZE		0x10000	/* 64k */
 #endif
 
include/configs/ds109.h +0 -1
index ad7fce84e8..a2c6837348 100644
@@ -35,7 +35,6 @@
  *  Environment variables configurations
  */
 #ifdef CONFIG_SPI_FLASH
-#define CONFIG_ENV_IS_IN_SPI_FLASH	1
 #define CONFIG_ENV_SECT_SIZE		0x10000	/* 64k */
 #endif
 
include/configs/ds414.h +0 -1
index aaba5d8eab..a209e6f09c 100644
@@ -36,7 +36,6 @@
 #define CONFIG_SF_DEFAULT_MODE		SPI_MODE_3
 
 /* Environment in SPI NOR flash */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_OFFSET		0x7E0000   /* RedBoot config partition in DTS */
 #define CONFIG_ENV_SIZE			(64 << 10) /* 64KiB */
 #define CONFIG_ENV_SECT_SIZE		(64 << 10) /* 64KiB sectors */
include/configs/ea20.h +0 -1
index 699888b9ea..e98f14f63d 100644
@@ -87,7 +87,6 @@
 #endif
 
 #ifdef CONFIG_USE_SPIFLASH
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SIZE			(8 << 10)
 #define CONFIG_ENV_OFFSET		0x80000
 #define CONFIG_ENV_SECT_SIZE		(64 << 10)
include/configs/efi-x86.h +0 -1
index 7763365fe1..f5331915e2 100644
@@ -13,7 +13,6 @@
 
 #undef CONFIG_TPM_TIS_BASE_ADDRESS
 
-#undef CONFIG_ENV_IS_IN_SPI_FLASH
 #undef CONFIG_SCSI_AHCI
 #undef CONFIG_INTEL_ICH6_GPIO
 #undef CONFIG_USB_EHCI_PCI
include/configs/ethernut5.h +0 -1
index e7f7a7cbe6..8a5eb89f8f 100644
@@ -61,7 +61,6 @@
 #define DATAFLASH_TCSS			(0x1a << 16)
 #define DATAFLASH_TCHS			(0x1 << 24)
 
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_OFFSET		0x3DE000
 #define CONFIG_ENV_SECT_SIZE		(132 << 10)
 #define CONFIG_ENV_SIZE			CONFIG_ENV_SECT_SIZE
include/configs/exynos5-dt-common.h +0 -1
index 1b94d07f67..11aa6b8a9a 100644
@@ -18,7 +18,6 @@
 
 #define CONFIG_EXYNOS5_DT
 
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SPI_BASE	0x12D30000
 #define FLASH_SIZE		(4 << 20)
 #define CONFIG_ENV_OFFSET	(FLASH_SIZE - CONFIG_ENV_SECT_SIZE)
include/configs/ge_bx50v3.h +0 -1
index f60a0298d6..43458a7b64 100644
@@ -269,7 +269,6 @@
 	(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* environment organization */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SIZE		(8 * 1024)
 #define CONFIG_ENV_OFFSET		(768 * 1024)
 #define CONFIG_ENV_SECT_SIZE		(64 * 1024)
include/configs/gw_ventana.h +0 -3
index 7036ed0ef8..b9e85f249d 100644
@@ -218,9 +218,6 @@
 #endif
 
 /* Persistent Environment Config */
-#ifdef CONFIG_SPI_FLASH
-  #define CONFIG_ENV_IS_IN_SPI_FLASH
-#endif
 #if defined(CONFIG_ENV_IS_IN_MMC)
   #define CONFIG_SYS_MMC_ENV_DEV         0
   #define CONFIG_SYS_MMC_ENV_PART        1
include/configs/km/km_arm.h +0 -1
index 9a90e08d65..63319735de 100644
@@ -214,7 +214,6 @@ int get_scl(void);
  *  Environment variables configurations
  */
 #if defined CONFIG_KM_ENV_IS_IN_SPI_NOR
-#define CONFIG_ENV_IS_IN_SPI_FLASH  /* use SPI-Flash for environment vars */
 #define CONFIG_ENV_OFFSET		0xc0000     /* no bracets! */
 #define CONFIG_ENV_SIZE			0x02000     /* Size of Environment */
 #define CONFIG_ENV_SECT_SIZE		0x10000
include/configs/km/kmp204x-common.h +0 -1
index 664a64c55a..373e4bc3b4 100644
@@ -44,7 +44,6 @@
 
 /* Environment in SPI Flash */
 #define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SPI_BUS              0
 #define CONFIG_ENV_SPI_CS               0
 #define CONFIG_ENV_SPI_MAX_HZ           20000000
include/configs/lacie_kw.h +0 -1
index 66e65c878c..d3ec21142b 100644
@@ -137,7 +137,6 @@
 /*
  * Environment variables configurations
  */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SECT_SIZE		0x10000	/* 64KB */
 #define CONFIG_ENV_SIZE			0x1000	/* 4KB */
 #define CONFIG_ENV_ADDR			0x70000
include/configs/ls1012a_common.h +0 -1
index 42bbc028d3..74af0b9dc6 100644
@@ -64,7 +64,6 @@
  */
 #define CONFIG_ENV_OVERWRITE
 
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SIZE			0x40000          /* 256KB */
 #define CONFIG_ENV_OFFSET		0x200000        /* 2MB */
 #define CONFIG_ENV_SECT_SIZE		0x40000
include/configs/ls1021aiot.h +0 -1
index e5544f327d..1f2eb52c24 100644
@@ -290,7 +290,6 @@
 #define CONFIG_SYS_MMC_ENV_DEV	0
 #define CONFIG_ENV_SIZE			0x2000
 #elif defined(CONFIG_QSPI_BOOT)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SIZE			0x2000
 #define CONFIG_ENV_OFFSET		0x100000
 #define CONFIG_ENV_SECT_SIZE	0x10000
include/configs/ls1021aqds.h +0 -1
index b823ff23bf..251a66e595 100644
@@ -553,7 +553,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_MMC_ENV_DEV		0
 #define CONFIG_ENV_SIZE			0x2000
 #elif defined(CONFIG_QSPI_BOOT)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SIZE			0x2000          /* 8KB */
 #define CONFIG_ENV_OFFSET		0x300000        /* 3MB */
 #define CONFIG_ENV_SECT_SIZE		0x10000
include/configs/ls1021atwr.h +0 -1
index 8fe34ef658..b9e5cdbb1e 100644
@@ -421,7 +421,6 @@
 #define CONFIG_SYS_MMC_ENV_DEV		0
 #define CONFIG_ENV_SIZE			0x20000
 #elif defined(CONFIG_QSPI_BOOT)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SIZE			0x2000
 #define CONFIG_ENV_OFFSET		0x300000
 #define CONFIG_ENV_SECT_SIZE		0x10000
include/configs/ls1043aqds.h +0 -1
index 740facfa58..415a705508 100644
@@ -417,7 +417,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_MMC_ENV_DEV		0
 #define CONFIG_ENV_SIZE			0x2000
 #elif defined(CONFIG_QSPI_BOOT)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SIZE			0x2000          /* 8KB */
 #define CONFIG_ENV_OFFSET		0x300000        /* 3MB */
 #define CONFIG_ENV_SECT_SIZE		0x10000
include/configs/ls1046aqds.h +0 -1
index 782669ad2c..ea99676b7a 100644
@@ -451,7 +451,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_MMC_ENV_DEV		0
 #define CONFIG_ENV_SIZE			0x2000
 #elif defined(CONFIG_QSPI_BOOT)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SIZE			0x2000          /* 8KB */
 #define CONFIG_ENV_OFFSET		0x300000        /* 3MB */
 #define CONFIG_ENV_SECT_SIZE		0x10000
include/configs/ls1046ardb.h +0 -1
index 1c30462af2..20a5e7f659 100644
@@ -171,7 +171,6 @@
 #define CONFIG_ENV_OFFSET		(3 * 1024 * 1024)
 #define CONFIG_ENV_SIZE			0x2000
 #else
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SIZE			0x2000		/* 8KB */
 #define CONFIG_ENV_OFFSET		0x300000	/* 3MB */
 #define CONFIG_ENV_SECT_SIZE		0x40000		/* 256KB */
include/configs/ls2080a_common.h +0 -1
index dbca05a3f6..6ae5586d64 100644
@@ -31,7 +31,6 @@
 #endif
 #else
 #define CONFIG_SYS_TEXT_BASE		0x20100000
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SIZE			0x2000          /* 8KB */
 #define CONFIG_ENV_OFFSET		0x300000        /* 3MB */
 #define CONFIG_ENV_SECT_SIZE		0x10000
include/configs/lsxl.h +0 -1
index b21a285d19..8b94412028 100644
@@ -60,7 +60,6 @@
 #ifdef CONFIG_SPI_FLASH
 #define CONFIG_SYS_MAX_FLASH_BANKS	1
 #define CONFIG_SYS_MAX_FLASH_SECT	8
-#define CONFIG_ENV_IS_IN_SPI_FLASH	1
 #define CONFIG_ENV_SECT_SIZE		0x10000 /* 64K */
 #endif
 
include/configs/maxbcm.h +0 -1
index b82a684cc9..66641ff1c9 100644
@@ -36,7 +36,6 @@
 #define CONFIG_SF_DEFAULT_MODE		SPI_MODE_3
 
 /* Environment in SPI NOR flash */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_OFFSET		(1 << 20) /* 1MiB in */
 #define CONFIG_ENV_SIZE			(64 << 10) /* 64KiB */
 #define CONFIG_ENV_SECT_SIZE		(64 << 10) /* 64KiB sectors */
include/configs/microblaze-generic.h +0 -1
index 5736621d41..d2442068b2 100644
@@ -119,7 +119,6 @@
 #  define CONFIG_ENV_ADDR	(CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SIZE)
 
 # else	/* SPIFLASH && !RAMENV */
-#  define CONFIG_ENV_IS_IN_SPI_FLASH	1
 #  define CONFIG_ENV_SPI_MODE		SPI_MODE_3
 #  define CONFIG_ENV_SPI_MAX_HZ		CONFIG_SF_DEFAULT_SPEED
 #  define CONFIG_ENV_SPI_CS		CONFIG_SF_DEFAULT_CS
include/configs/mvebu_armada-37xx.h +0 -1
index eb80ac5b48..778cc9e378 100644
@@ -79,7 +79,6 @@
 #define CONFIG_ENV_SPI_MODE		CONFIG_SF_DEFAULT_MODE
 
 /* Environment in SPI NOR flash */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_OFFSET		0x180000 /* as Marvell U-Boot version */
 #define CONFIG_ENV_SIZE			(64 << 10) /* 64KiB */
 #define CONFIG_ENV_SECT_SIZE		(64 << 10) /* 64KiB sectors */
include/configs/mvebu_armada-8k.h +0 -1
index eca13442ab..53db10f9bc 100644
@@ -77,7 +77,6 @@
 
 /* Environment in SPI NOR flash */
 #ifdef CONFIG_MVEBU_SPI_BOOT
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 /* Environment in NAND flash */
 #endif
 
include/configs/mx6slevk.h +0 -1
index 0f1a67dbb3..98797b07c1 100644
@@ -137,7 +137,6 @@
 #define CONFIG_ENV_SIZE			SZ_8K
 
 #if defined CONFIG_SPI_BOOT
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_OFFSET               (768 * 1024)
 #define CONFIG_ENV_SECT_SIZE            (64 * 1024)
 #define CONFIG_ENV_SPI_BUS              CONFIG_SF_DEFAULT_BUS
include/configs/nitrogen6x.h +0 -5
index 6d5b0bd831..a1a0cdaf2e 100644
@@ -270,11 +270,6 @@
 /* Environment organization */
 #define CONFIG_ENV_SIZE			(8 * 1024)
 
-#if defined(CONFIG_SABRELITE)
-#else
-#define CONFIG_ENV_IS_IN_SPI_FLASH
-#endif
-
 #if defined(CONFIG_ENV_IS_IN_MMC)
 #define CONFIG_ENV_OFFSET		(6 * 64 * 1024)
 #define CONFIG_SYS_MMC_ENV_DEV		0
include/configs/odroid_xu3.h +0 -2
index 3b920ccf16..697f8d2582 100644
@@ -11,8 +11,6 @@
 #include "exynos5420-common.h"
 #include <configs/exynos5-common.h>
 
-#undef CONFIG_ENV_IS_IN_SPI_FLASH
-
 #define CONFIG_BOARD_COMMON
 
 #define CONFIG_SYS_SDRAM_BASE		0x40000000
include/configs/omapl138_lcdk.h +0 -2
index 83692c8982..6af8e80952 100644
@@ -212,7 +212,6 @@
 #endif
 
 #ifdef CONFIG_USE_SPIFLASH
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SIZE			(64 << 10)
 #define CONFIG_ENV_OFFSET		(256 << 10)
 #define CONFIG_ENV_SECT_SIZE		(64 << 10)
@@ -310,7 +309,6 @@
 #undef CONFIG_ENV_OFFSET
 #define CONFIG_ENV_SIZE		(16 << 10)	/* 16 KiB */
 #define CONFIG_ENV_OFFSET	(51 << 9)	/* Sector 51 */
-#undef CONFIG_ENV_IS_IN_SPI_FLASH
 #endif
 
 #ifndef CONFIG_DIRECT_NOR_BOOT
include/configs/ot1200.h +0 -1
index 7aeae7b1fd..0edd237647 100644
@@ -112,7 +112,6 @@
 	(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* Environment organization */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SIZE                 (64 * 1024)	/* 64 kb */
 #define CONFIG_ENV_OFFSET               (1024 * 1024)
 /* M25P16 has an erase size of 64 KiB */
include/configs/p1_p2_rdb_pc.h +0 -1
index 201310d1d1..066674cb2f 100644
@@ -772,7 +772,6 @@
  * Environment
  */
 #ifdef CONFIG_SPIFLASH
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SPI_BUS	0
 #define CONFIG_ENV_SPI_CS	0
 #define CONFIG_ENV_SPI_MAX_HZ	10000000
include/configs/pcm058.h +0 -1
index 39018ac62f..92087d1066 100644
@@ -106,7 +106,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM	1
 
 /* Environment organization */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SIZE                (16 * 1024)
 #define CONFIG_ENV_OFFSET		(1024 * SZ_1K)
 #define CONFIG_ENV_SECT_SIZE		(64 * SZ_1K)
include/configs/qemu-x86.h +0 -1
index 9690757109..64cbc807a6 100644
@@ -48,7 +48,6 @@
 #undef CONFIG_INTEL_ICH6_GPIO
 
 /* SPI is not supported */
-#undef CONFIG_ENV_IS_IN_SPI_FLASH
 
 #define CONFIG_SPL_FRAMEWORK
 
include/configs/rcar-gen2-common.h +0 -1
index 365950d729..16f45f2bea 100644
@@ -52,7 +52,6 @@
 #define CONFIG_SYS_BOOTMAPSZ		(8 * 1024 * 1024)
 
 /* ENV setting */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_ADDR	0xC0000
 
 /* Common ENV setting */
include/configs/sh7752evb.h +0 -1
index 3342a2966c..46d0f2aede 100644
@@ -84,7 +84,6 @@
 
 /* ENV setting */
 #define CONFIG_ENV_IS_EMBEDDED
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SECT_SIZE	(64 * 1024)
 #define CONFIG_ENV_ADDR		(0x00080000)
 #define CONFIG_ENV_OFFSET	(CONFIG_ENV_ADDR)
include/configs/sh7753evb.h +0 -1
index 78670422f7..aa8d05c221 100644
@@ -84,7 +84,6 @@
 
 /* ENV setting */
 #define CONFIG_ENV_IS_EMBEDDED
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SECT_SIZE	(64 * 1024)
 #define CONFIG_ENV_ADDR		(0x00080000)
 #define CONFIG_ENV_OFFSET	(CONFIG_ENV_ADDR)
include/configs/sh7757lcr.h +0 -1
index e9cd3d749a..1759a6f5d9 100644
@@ -94,7 +94,6 @@
 
 /* ENV setting */
 #define CONFIG_ENV_IS_EMBEDDED
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SECT_SIZE	(64 * 1024)
 #define CONFIG_ENV_ADDR		(0x00080000)
 #define CONFIG_ENV_OFFSET	(CONFIG_ENV_ADDR)
include/configs/siemens-am33x-common.h +0 -1
index 73cfb44881..cd163d64f5 100644
@@ -215,7 +215,6 @@
  * 0x442000 - 0x800000 : Userland
  */
 #if defined(CONFIG_SPI_BOOT)
-# define CONFIG_ENV_IS_IN_SPI_FLASH
 # define CONFIG_ENV_SPI_MAX_HZ		CONFIG_SF_DEFAULT_SPEED
 # define CONFIG_ENV_OFFSET		(892 << 10) /* 892 KiB in */
 # define CONFIG_ENV_SECT_SIZE		(4 << 10) /* 4 KB sectors */
include/configs/socfpga_is1.h +0 -1
index 68403aa744..febb8f7fcc 100644
@@ -19,7 +19,6 @@
 #define CONFIG_BOOTARGS		"console=ttyS0," __stringify(CONFIG_BAUDRATE)
 #define CONFIG_LOADADDR		0x01000000
 #define CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 
 /* Ethernet on SoC (EMAC) */
 #if defined(CONFIG_CMD_NET)
include/configs/socfpga_sr1500.h +0 -1
index 4366061f77..39bf612291 100644
@@ -24,7 +24,6 @@
 #define PHY_ANEG_TIMEOUT	8000
 
 /* Environment */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 
 /* Enable SPI NOR flash reset, needed for SPI booting */
 #define CONFIG_SPI_N25Q256A_RESET
include/configs/socfpga_vining_fpga.h +0 -1
index e2bdfb12f9..10240a1077 100644
@@ -182,7 +182,6 @@
 		"256k(samtec2),"		\
 		"-(rcvrfs);"	/* Recovery */	\
 
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 #define CONFIG_ENV_SIZE_REDUND		CONFIG_ENV_SIZE
 #define CONFIG_ENV_SECT_SIZE		(64 * 1024)
include/configs/stv0991.h +0 -1
index 2f808c6c72..0ac262e095 100644
@@ -19,7 +19,6 @@
 #define PHYS_SDRAM_1_SIZE			0x00198000
 
 #define CONFIG_ENV_SIZE				0x10000
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SECT_SIZE			CONFIG_ENV_SIZE
 #define CONFIG_ENV_OFFSET			0x30000
 #define CONFIG_ENV_ADDR				\
include/configs/theadorable.h +0 -1
index 94e207c8c4..3f9b69aeda 100644
@@ -50,7 +50,6 @@
 #define CONFIG_SF_DEFAULT_MODE		SPI_MODE_3
 
 /* Environment in SPI NOR flash */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_OFFSET		(1 << 20) /* 1MiB in */
 #define CONFIG_ENV_SIZE			(64 << 10) /* 64KiB */
 #define CONFIG_ENV_SECT_SIZE		(256 << 10) /* 256KiB sectors */
include/configs/tqma6.h +0 -1
index 29e22aa311..b5b71570d1 100644
@@ -166,7 +166,6 @@
 #define TQMA6_UBOOT_SIZE		(TQMA6_UBOOT_SECTOR_SIZE * \
 					 TQMA6_UBOOT_SECTOR_COUNT)
 
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 #define CONFIG_ENV_OFFSET		(TQMA6_UBOOT_SIZE)
 #define CONFIG_ENV_SECT_SIZE		TQMA6_SPI_FLASH_SECTOR_SIZE
include/configs/trimslice.h +0 -1
index ab9c5c3ab8..fd36634ae9 100644
@@ -28,7 +28,6 @@
 #define CONFIG_SYS_I2C_TEGRA
 
 /* Environment in SPI */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SPI_MAX_HZ		48000000
 #define CONFIG_ENV_SPI_MODE		SPI_MODE_0
 #define CONFIG_ENV_SECT_SIZE		CONFIG_ENV_SIZE
include/configs/x86-chromebook.h +0 -1
index 51366d4d4e..4d02cd45f5 100644
@@ -42,7 +42,6 @@
 #undef CONFIG_ENV_SIZE
 #define CONFIG_ENV_SIZE			0x1000
 #define CONFIG_ENV_SECT_SIZE		0x1000
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_OFFSET		0x003f8000
 
 #define CONFIG_STD_DEVICES_SETTINGS	"stdin=usbkbd,i8042-kbd,serial\0" \
include/configs/x86-common.h +0 -1
index d104449e3b..01558a8d6c 100644
@@ -118,7 +118,6 @@
 /*-----------------------------------------------------------------------
  * Environment configuration
  */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SIZE			0x01000
 
 /*-----------------------------------------------------------------------
include/configs/zynq-common.h +0 -1
index 9b527feec8..83a2a028e9 100644
@@ -163,7 +163,6 @@
 /* Environment in NOR flash */
 # elif defined(CONFIG_ZYNQ_QSPI)
 /* Environment in Serial Flash */
-#  define CONFIG_ENV_IS_IN_SPI_FLASH
 # endif
 
 # define CONFIG_ENV_SECT_SIZE		CONFIG_ENV_SIZE
scripts/config_whitelist.txt +0 -1
index b5ade9cf29..ecb554f197 100644
@@ -645,7 +645,6 @@ CONFIG_ENV_IS_IN_FAT
 CONFIG_ENV_IS_IN_MRAM
 CONFIG_ENV_IS_IN_ONENAND
 CONFIG_ENV_IS_IN_REMOTE
-CONFIG_ENV_IS_IN_SPI_FLASH
 CONFIG_ENV_MAX_ENTRIES
 CONFIG_ENV_MIN_ENTRIES
 CONFIG_ENV_OFFSET_OOB
Signature · 1 line
2.13.2.725.g09c95d1e9-goog
#14 lore raw

PATCH 10/30 Convert CONFIG_ENV_IS_IN_REMOTE to Kconfig

In reply to Simon Glass

This converts the following to Kconfig:
CONFIG_ENV_IS_IN_REMOTE

---

 configs/B4860QDS_SRIO_PCIE_BOOT_defconfig |  1 +
 configs/P2041RDB_SRIO_PCIE_BOOT_defconfig |  1 +
 configs/P3041DS_SRIO_PCIE_BOOT_defconfig  |  1 +
 configs/P4080DS_SRIO_PCIE_BOOT_defconfig  |  1 +
 configs/P5020DS_SRIO_PCIE_BOOT_defconfig  |  1 +
 configs/T2080QDS_SRIO_PCIE_BOOT_defconfig |  1 +
 configs/T2080RDB_SRIO_PCIE_BOOT_defconfig |  1 +
 configs/T2081QDS_SRIO_PCIE_BOOT_defconfig |  1 +
 configs/T4240QDS_SRIO_PCIE_BOOT_defconfig |  1 +
 env/Kconfig                               | 14 ++++++++++++++
 include/configs/B4860QDS.h                |  1 -
 include/configs/P2041RDB.h                |  1 -
 include/configs/T102xQDS.h                |  1 -
 include/configs/T102xRDB.h                |  1 -
 include/configs/T208xQDS.h                |  1 -
 include/configs/T208xRDB.h                |  1 -
 include/configs/T4240QDS.h                |  1 -
 include/configs/corenet_ds.h              |  1 -
 scripts/config_whitelist.txt              |  1 -
 19 files changed, 23 insertions(+), 9 deletions(-)
configs/B4860QDS_SRIO_PCIE_BOOT_defconfig +1 -0
index 3f35106fbf..ac9271def7 100644
@@ -20,6 +20,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
+CONFIG_ENV_IS_IN_REMOTE=y
 CONFIG_FSL_CAAM=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
configs/P2041RDB_SRIO_PCIE_BOOT_defconfig +1 -0
index ebca0cec7b..547467ec25 100644
@@ -21,6 +21,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_REMOTE=y
 CONFIG_FSL_CAAM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/P3041DS_SRIO_PCIE_BOOT_defconfig +1 -0
index 390eea869b..321a05807a 100644
@@ -21,6 +21,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_REMOTE=y
 CONFIG_FSL_CAAM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/P4080DS_SRIO_PCIE_BOOT_defconfig +1 -0
index c2fd7d0586..e993748c06 100644
@@ -21,6 +21,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_REMOTE=y
 CONFIG_FSL_CAAM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/P5020DS_SRIO_PCIE_BOOT_defconfig +1 -0
index 068301c44d..de0d5437b3 100644
@@ -21,6 +21,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_REMOTE=y
 CONFIG_FSL_CAAM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/T2080QDS_SRIO_PCIE_BOOT_defconfig +1 -0
index 97527e28a1..682cdd5ca9 100644
@@ -20,6 +20,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_REMOTE=y
 CONFIG_FSL_CAAM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_EON=y
configs/T2080RDB_SRIO_PCIE_BOOT_defconfig +1 -0
index 2829d06d27..c700c45707 100644
@@ -21,6 +21,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 # CONFIG_CMD_IRQ is not set
+CONFIG_ENV_IS_IN_REMOTE=y
 CONFIG_FSL_CAAM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/T2081QDS_SRIO_PCIE_BOOT_defconfig +1 -0
index 19c48a8f66..95536ff267 100644
@@ -20,6 +20,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_REMOTE=y
 CONFIG_FSL_CAAM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_EON=y
configs/T4240QDS_SRIO_PCIE_BOOT_defconfig +1 -0
index e13d7b7444..3536795b29 100644
@@ -20,6 +20,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_REMOTE=y
 CONFIG_FSL_CAAM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
env/Kconfig +14 -0
index 1f744cc576..3eb46111ff 100644
@@ -250,6 +250,20 @@ config ENV_IS_IN_NVRAM
 	  can just be read and written to, without any special
 	  provision.
 
+config ENV_IS_IN_REMOTE
+	bool "Environment is in remove memory space"
+	help
+	  Define this if you have a remote memory space which you
+	  want to use for the local device's environment.
+
+	  - CONFIG_ENV_ADDR:
+	  - CONFIG_ENV_SIZE:
+
+	  These two #defines specify the address and size of the
+	  environment area within the remote memory space. The
+	  local device can get the environment from remote memory
+	  space by SRIO or PCIE links.
+
 config ENV_IS_IN_SPI_FLASH
 	bool "Environment is in SPI flash"
 	help
include/configs/B4860QDS.h +0 -1
index 6ae9851545..f9a677124b 100644
@@ -132,7 +132,6 @@
 #define CONFIG_ENV_SIZE			0x2000
 #define CONFIG_ENV_OFFSET		(10 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
-#define CONFIG_ENV_IS_IN_REMOTE
 #define CONFIG_ENV_ADDR		0xffe20000
 #define CONFIG_ENV_SIZE		0x2000
 #elif defined(CONFIG_ENV_IS_NOWHERE)
include/configs/P2041RDB.h +0 -1
index a31989835b..38fbf3785f 100644
@@ -81,7 +81,6 @@
 #define CONFIG_ENV_SIZE			CONFIG_SYS_NAND_BLOCK_SIZE
 #define CONFIG_ENV_OFFSET		(7 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
-#define CONFIG_ENV_IS_IN_REMOTE
 #define CONFIG_ENV_ADDR		0xffe20000
 #define CONFIG_ENV_SIZE		0x2000
 #elif defined(CONFIG_ENV_IS_NOWHERE)
include/configs/T102xQDS.h +0 -1
index 79537755cc..4bcd00426e 100644
@@ -162,7 +162,6 @@
 #define CONFIG_ENV_SIZE			0x2000
 #define CONFIG_ENV_OFFSET		(10 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
-#define CONFIG_ENV_IS_IN_REMOTE
 #define CONFIG_ENV_ADDR		0xffe20000
 #define CONFIG_ENV_SIZE		0x2000
 #elif defined(CONFIG_ENV_IS_NOWHERE)
include/configs/T102xRDB.h +0 -1
index a7f1bbcba7..c3716f76f1 100644
@@ -185,7 +185,6 @@
 #define CONFIG_ENV_OFFSET		(10 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #endif
 #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
-#define CONFIG_ENV_IS_IN_REMOTE
 #define CONFIG_ENV_ADDR		0xffe20000
 #define CONFIG_ENV_SIZE		0x2000
 #elif defined(CONFIG_ENV_IS_NOWHERE)
include/configs/T208xQDS.h +0 -1
index a7b894e316..fd2e3d323f 100644
@@ -158,7 +158,6 @@
 #define CONFIG_ENV_SIZE		0x2000
 #define CONFIG_ENV_OFFSET	(10 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
-#define CONFIG_ENV_IS_IN_REMOTE
 #define CONFIG_ENV_ADDR		0xffe20000
 #define CONFIG_ENV_SIZE		0x2000
 #elif defined(CONFIG_ENV_IS_NOWHERE)
include/configs/T208xRDB.h +0 -1
index 274ff49aba..93e0cf6c93 100644
@@ -144,7 +144,6 @@
 #define CONFIG_ENV_SIZE		0x2000
 #define CONFIG_ENV_OFFSET	(2 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
-#define CONFIG_ENV_IS_IN_REMOTE
 #define CONFIG_ENV_ADDR		0xffe20000
 #define CONFIG_ENV_SIZE		0x2000
 #elif defined(CONFIG_ENV_IS_NOWHERE)
include/configs/T4240QDS.h +0 -1
index 0c1ec41e66..944dab8068 100644
@@ -103,7 +103,6 @@
 #define CONFIG_ENV_SIZE			0x2000
 #define CONFIG_ENV_OFFSET		(10 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
-#define CONFIG_ENV_IS_IN_REMOTE
 #define CONFIG_ENV_ADDR		0xffe20000
 #define CONFIG_ENV_SIZE		0x2000
 #elif defined(CONFIG_ENV_IS_NOWHERE)
include/configs/corenet_ds.h +0 -1
index 07183c9095..0ea76b3300 100644
@@ -92,7 +92,6 @@
 #define CONFIG_ENV_SIZE			CONFIG_SYS_NAND_BLOCK_SIZE
 #define CONFIG_ENV_OFFSET		(7 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
-#define CONFIG_ENV_IS_IN_REMOTE
 #define CONFIG_ENV_ADDR		0xffe20000
 #define CONFIG_ENV_SIZE		0x2000
 #elif defined(CONFIG_ENV_IS_NOWHERE)
scripts/config_whitelist.txt +0 -1
index ecb554f197..f1f188bb5c 100644
@@ -644,7 +644,6 @@ CONFIG_ENV_IS_IN_
 CONFIG_ENV_IS_IN_FAT
 CONFIG_ENV_IS_IN_MRAM
 CONFIG_ENV_IS_IN_ONENAND
-CONFIG_ENV_IS_IN_REMOTE
 CONFIG_ENV_MAX_ENTRIES
 CONFIG_ENV_MIN_ENTRIES
 CONFIG_ENV_OFFSET_OOB
Signature · 1 line
2.13.2.725.g09c95d1e9-goog
#15 lore raw

PATCH 11/30 Convert CONFIG_ENV_IS_IN_FAT to Kconfig

In reply to Simon Glass

This converts the following to Kconfig:
CONFIG_ENV_IS_IN_FAT

---

 README                                           | 44 ------------------------
 arch/arm/Kconfig                                 |  1 +
 configs/am335x_evm_defconfig                     |  1 +
 configs/am335x_evm_nor_defconfig                 |  1 +
 configs/am335x_evm_usbspl_defconfig              |  1 +
 configs/am335x_hs_evm_defconfig                  |  1 +
 configs/am43xx_evm_defconfig                     |  1 +
 configs/am43xx_evm_ethboot_defconfig             |  1 +
 configs/am43xx_evm_usbhost_boot_defconfig        |  1 +
 configs/am43xx_hs_evm_defconfig                  |  1 +
 configs/at91sam9m10g45ek_mmc_defconfig           |  1 +
 configs/at91sam9n12ek_mmc_defconfig              |  1 +
 configs/at91sam9rlek_mmc_defconfig               |  1 +
 configs/at91sam9x5ek_mmc_defconfig               |  1 +
 configs/axs101_defconfig                         |  1 +
 configs/axs103_defconfig                         |  1 +
 configs/hikey_defconfig                          |  1 +
 configs/hsdk_defconfig                           |  1 +
 configs/k2g_evm_defconfig                        |  1 +
 configs/k2g_hs_evm_defconfig                     |  1 +
 configs/omap4_panda_defconfig                    |  1 +
 configs/picosam9g45_defconfig                    |  1 +
 configs/sama5d2_xplained_mmc_defconfig           |  1 +
 configs/sama5d36ek_cmp_mmc_defconfig             |  1 +
 configs/sama5d3_xplained_mmc_defconfig           |  1 +
 configs/sama5d3xek_mmc_defconfig                 |  1 +
 configs/sama5d4_xplained_mmc_defconfig           |  1 +
 configs/sama5d4ek_mmc_defconfig                  |  1 +
 configs/xilinx_zynqmp_ep_defconfig               |  5 +--
 configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig |  1 +
 configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig |  1 +
 configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig |  1 +
 configs/xilinx_zynqmp_zcu102_defconfig           |  5 +--
 configs/xilinx_zynqmp_zcu102_revB_defconfig      |  5 +--
 env/Kconfig                                      | 33 ++++++++++++++++++
 include/configs/am335x_evm.h                     |  1 -
 include/configs/am43xx_evm.h                     |  6 ----
 include/configs/at91-sama5_common.h              |  1 -
 include/configs/at91sam9m10g45ek.h               |  1 -
 include/configs/at91sam9n12ek.h                  |  1 -
 include/configs/at91sam9rlek.h                   |  1 -
 include/configs/at91sam9x5ek.h                   |  1 -
 include/configs/axs10x.h                         |  1 -
 include/configs/hikey.h                          |  1 -
 include/configs/hsdk.h                           |  1 -
 include/configs/k2g_evm.h                        |  1 -
 include/configs/omap4_panda.h                    |  1 -
 include/configs/picosam9g45.h                    |  1 -
 include/configs/rpi.h                            |  1 -
 include/configs/xilinx_zynqmp.h                  |  1 -
 scripts/config_whitelist.txt                     |  1 -
 51 files changed, 72 insertions(+), 71 deletions(-)
README +0 -44
index 713eeb2f45..d8fc199fcd 100644
@@ -3444,19 +3444,6 @@ environment in RAM: we could work on NVRAM directly, but we want to
 keep settings there always unmodified except somebody uses "saveenv"
 to save the current settings.
 
-- CONFIG_ENV_IS_IN_REMOTE:
-
-	Define this if you have a remote memory space which you
-	want to use for the local device's environment.
-
-	- CONFIG_ENV_ADDR:
-	- CONFIG_ENV_SIZE:
-
-	  These two #defines specify the address and size of the
-	  environment area within the remote memory space. The
-	  local device can get the environment from remote memory
-	  space by SRIO or PCIE links.
-
 BE CAREFUL! For some special cases, the local device can not use
 "saveenv" command. For example, the local device will get the
 environment stored in a remote NOR flash by SRIO or PCIE link,
@@ -3468,37 +3455,6 @@ but it can not erase, write this NOR flash by SRIO or PCIE interface.
 	environment. If redundant environment is used, it will be copied to
 	CONFIG_NAND_ENV_DST + CONFIG_ENV_SIZE.
 
-- CONFIG_ENV_IS_IN_FAT:
-       Define this if you want to use the FAT file system for the environment.
-
-       - FAT_ENV_INTERFACE:
-
-         Define this to a string that is the name of the block device.
-
-       - FAT_ENV_DEVICE_AND_PART:
-
-         Define this to a string to specify the partition of the device. It can
-         be as following:
-
-           "D:P", "D:0", "D", "D:" or "D:auto" (D, P are integers. And P >= 1)
-               - "D:P": device D partition P. Error occurs if device D has no
-                        partition table.
-               - "D:0": device D.
-               - "D" or "D:": device D partition 1 if device D has partition
-                              table, or the whole device D if has no partition
-                              table.
-               - "D:auto": first partition in device D with bootable flag set.
-                           If none, first valid partition in device D. If no
-                           partition table then means device D.
-
-       - FAT_ENV_FILE:
-
-         It's a string of the FAT file name. This file use to store the
-         environment.
-
-       - CONFIG_FAT_WRITE:
-         This must be enabled. Otherwise it cannot save the environment file.
-
 Please note that the environment is read-only until the monitor
 has been relocated to RAM and a RAM copy of the environment has been
 created; also, when using EEPROM you will have to use getenv_f()
arch/arm/Kconfig +1 -0
index 74791394a5..43071de279 100644
@@ -488,6 +488,7 @@ config ARCH_BCM283X
 	select DM_GPIO
 	select OF_CONTROL
 	imply FAT_WRITE
+	imply ENV_IS_IN_FAT
 
 config TARGET_VEXPRESS_CA15_TC2
 	bool "Support vexpress_ca15_tc2"
configs/am335x_evm_defconfig +1 -0
index ff1e43f226..3dfa5cd949 100644
@@ -20,6 +20,7 @@ CONFIG_SPL_OS_BOOT=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
 CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2"
+CONFIG_ENV_IS_IN_FAT=y
 # CONFIG_BLK is not set
 CONFIG_DFU_MMC=y
 CONFIG_DFU_NAND=y
configs/am335x_evm_nor_defconfig +1 -0
index 6ff0aca978..afba0ceaad 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_DFU=y
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_EXT4_WRITE=y
+CONFIG_ENV_IS_IN_FAT=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_NAND=y
 CONFIG_DFU_RAM=y
configs/am335x_evm_usbspl_defconfig +1 -0
index a578322e1a..179dfca726 100644
@@ -20,6 +20,7 @@ CONFIG_SPL_USBETH_SUPPORT=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_ENV_IS_IN_FAT=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_NAND=y
 CONFIG_DFU_RAM=y
configs/am335x_hs_evm_defconfig +1 -0
index b0c88a6273..d8a5c2893a 100644
@@ -26,6 +26,7 @@ CONFIG_SPL_MTD_SUPPORT=y
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_OF_CONTROL=y
 CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2"
+CONFIG_ENV_IS_IN_FAT=y
 # CONFIG_BLK is not set
 CONFIG_DFU_MMC=y
 CONFIG_DFU_NAND=y
configs/am43xx_evm_defconfig +1 -0
index 3878d2724a..2d40097734 100644
@@ -20,6 +20,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_ISO_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_LIST="am437x-gp-evm am437x-sk-evm am43x-epos-evm am437x-idk-evm"
+CONFIG_ENV_IS_IN_FAT=y
 CONFIG_DM=y
 # CONFIG_BLK is not set
 CONFIG_DFU_MMC=y
configs/am43xx_evm_ethboot_defconfig +1 -0
index 6df60e83de..1f06fd3415 100644
@@ -36,6 +36,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ISO_PARTITION=y
+CONFIG_ENV_IS_IN_FAT=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y
configs/am43xx_evm_usbhost_boot_defconfig +1 -0
index 2006957638..74b1c4ccb5 100644
@@ -42,6 +42,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_ISO_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_LIST="am437x-gp-evm am437x-sk-evm am43x-epos-evm am437x-idk-evm"
+CONFIG_ENV_IS_IN_FAT=y
 CONFIG_DM=y
 # CONFIG_BLK is not set
 CONFIG_DFU_MMC=y
configs/am43xx_hs_evm_defconfig +1 -0
index fb4bb037dd..20286bdc92 100644
@@ -30,6 +30,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_ISO_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_LIST="am437x-gp-evm am437x-sk-evm am43x-epos-evm am437x-idk-evm"
+CONFIG_ENV_IS_IN_FAT=y
 CONFIG_DM=y
 # CONFIG_BLK is not set
 CONFIG_DFU_MMC=y
configs/at91sam9m10g45ek_mmc_defconfig +1 -0
index 46f082f683..9e3feadb23 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_FAT=y
 CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
configs/at91sam9n12ek_mmc_defconfig +1 -0
index f323ce8686..1d19fb3384 100644
@@ -23,6 +23,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_FAT=y
 CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
configs/at91sam9rlek_mmc_defconfig +1 -0
index afe28d6136..769940ef42 100644
@@ -24,6 +24,7 @@ CONFIG_CMD_MMC=y
 # CONFIG_CMD_NFS is not set
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_FAT=y
 CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
configs/at91sam9x5ek_mmc_defconfig +1 -0
index 1aa1dd82b0..dadab0a293 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_UBI=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_FAT=y
 CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
configs/axs101_defconfig +1 -0
index 0b15652493..fb1555f1af 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
+CONFIG_ENV_IS_IN_FAT=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_MMC=y
configs/axs103_defconfig +1 -0
index add24cfe22..234057b600 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
+CONFIG_ENV_IS_IN_FAT=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_MMC=y
configs/hikey_defconfig +1 -0
index 5981d2f530..12ca2daf3c 100644
@@ -12,6 +12,7 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_CACHE=y
+CONFIG_ENV_IS_IN_FAT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_K3=y
 CONFIG_USB=y
configs/hsdk_defconfig +1 -0
index 0018c0482e..40aec3f7f2 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
+CONFIG_ENV_IS_IN_FAT=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_MMC=y
configs/k2g_evm_defconfig +1 -0
index a5f1ac59f1..350cc8ddab 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_UBI=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_FAT=y
 CONFIG_DM=y
 # CONFIG_BLK is not set
 CONFIG_DM_MMC=y
configs/k2g_hs_evm_defconfig +1 -0
index 51c701ed90..56aa779d5c 100644
@@ -18,6 +18,7 @@ CONFIG_CMD_UBI=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_FAT=y
 CONFIG_DM=y
 # CONFIG_BLK is not set
 CONFIG_DM_MMC=y
configs/omap4_panda_defconfig +1 -0
index 3d91f137e8..a78e0aba78 100644
@@ -22,6 +22,7 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_CMD_EXT4_WRITE=y
+CONFIG_ENV_IS_IN_FAT=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
configs/picosam9g45_defconfig +1 -0
index aa61e4b65a..ca6d1c5e07 100644
@@ -31,6 +31,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_FAT=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
configs/sama5d2_xplained_mmc_defconfig +1 -0
index 2602aff9bc..a8c5d91355 100644
@@ -35,6 +35,7 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-parent dmas dma-names"
+CONFIG_ENV_IS_IN_FAT=y
 CONFIG_DM=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
configs/sama5d36ek_cmp_mmc_defconfig +1 -0
index 1c5d85b4ad..0c467e71ce 100644
@@ -23,6 +23,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_FAT=y
 CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
configs/sama5d3_xplained_mmc_defconfig +1 -0
index 2e42a2e02e..fbb3db233c 100644
@@ -37,6 +37,7 @@ CONFIG_CMD_UBI=y
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-parent dmas dma-names"
+CONFIG_ENV_IS_IN_FAT=y
 CONFIG_DM=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
configs/sama5d3xek_mmc_defconfig +1 -0
index 4cbfa0723f..fc41f1df06 100644
@@ -37,6 +37,7 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-parent dmas dma-names"
+CONFIG_ENV_IS_IN_FAT=y
 CONFIG_DM=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
configs/sama5d4_xplained_mmc_defconfig +1 -0
index 157fbe4577..bcddd7438e 100644
@@ -34,6 +34,7 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-parent dma-names dmas"
+CONFIG_ENV_IS_IN_FAT=y
 CONFIG_DM=y
 CONFIG_SPL_DM=y
 CONFIG_CLK=y
configs/sama5d4ek_mmc_defconfig +1 -0
index e78460dc94..75ca0e81b0 100644
@@ -36,6 +36,7 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-parent dma-names dmas"
+CONFIG_ENV_IS_IN_FAT=y
 CONFIG_DM=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
configs/xilinx_zynqmp_ep_defconfig +3 -2
index 578db22e41..61acff9beb 100644
@@ -43,11 +43,10 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_ISO_PARTITION is not set
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_EMBED=y
+CONFIG_ENV_IS_IN_FAT=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
-CONFIG_SCSI=y
-CONFIG_DM_SCSI=y
 CONFIG_SATA_CEVA=y
 CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=y
@@ -63,6 +62,8 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_DM_ETH=y
 CONFIG_ZYNQ_GEM=y
+CONFIG_SCSI=y
+CONFIG_DM_SCSI=y
 CONFIG_DEBUG_UART_ZYNQ=y
 CONFIG_DEBUG_UART_BASE=0xff000000
 CONFIG_DEBUG_UART_CLOCK=25000000
configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig +1 -0
index 9daaa06c73..238f7d0940 100644
@@ -35,6 +35,7 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_ISO_PARTITION is not set
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_EMBED=y
+CONFIG_ENV_IS_IN_FAT=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig +1 -0
index 0f9e4b24fe..49bf7c922d 100644
@@ -28,6 +28,7 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_ISO_PARTITION is not set
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_EMBED=y
+CONFIG_ENV_IS_IN_FAT=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig +1 -0
index 463a9c7aee..7662a0d5d5 100644
@@ -28,6 +28,7 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_ISO_PARTITION is not set
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_EMBED=y
+CONFIG_ENV_IS_IN_FAT=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_FPGA_XILINX=y
configs/xilinx_zynqmp_zcu102_defconfig +3 -2
index 4f1524b149..792ae5f978 100644
@@ -36,11 +36,10 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_ISO_PARTITION is not set
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_EMBED=y
+CONFIG_ENV_IS_IN_FAT=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
-CONFIG_SCSI=y
-CONFIG_DM_SCSI=y
 CONFIG_SATA_CEVA=y
 CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=y
@@ -56,6 +55,8 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_ETH=y
 CONFIG_ZYNQ_GEM=y
+CONFIG_SCSI=y
+CONFIG_DM_SCSI=y
 CONFIG_DEBUG_UART_ZYNQ=y
 CONFIG_DEBUG_UART_BASE=0xff000000
 CONFIG_DEBUG_UART_CLOCK=100000000
configs/xilinx_zynqmp_zcu102_revB_defconfig +3 -2
index 4b944cb6e1..07b8e299bc 100644
@@ -36,11 +36,10 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_ISO_PARTITION is not set
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_EMBED=y
+CONFIG_ENV_IS_IN_FAT=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
-CONFIG_SCSI=y
-CONFIG_DM_SCSI=y
 CONFIG_SATA_CEVA=y
 CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=y
@@ -56,6 +55,8 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_ETH=y
 CONFIG_ZYNQ_GEM=y
+CONFIG_SCSI=y
+CONFIG_DM_SCSI=y
 CONFIG_DEBUG_UART_ZYNQ=y
 CONFIG_DEBUG_UART_BASE=0xff000000
 CONFIG_DEBUG_UART_CLOCK=100000000
env/Kconfig +33 -0
index 3eb46111ff..f0dc49b4d9 100644
@@ -74,6 +74,39 @@ config ENV_IS_IN_EEPROM
 	  EEPROM which holds the environment, is reached over
 	  a pca9547 i2c mux with address 0x70, channel 3.
 
+config ENV_IS_IN_FAT
+	bool "Environment is in a FAT filesystem"
+	help
+         Define this if you want to use the FAT file system for the environment.
+
+         - FAT_ENV_INTERFACE:
+
+         Define this to a string that is the name of the block device.
+
+         - FAT_ENV_DEVICE_AND_PART:
+
+         Define this to a string to specify the partition of the device. It can
+         be as following:
+
+           "D:P", "D:0", "D", "D:" or "D:auto" (D, P are integers. And P >= 1)
+               - "D:P": device D partition P. Error occurs if device D has no
+                        partition table.
+               - "D:0": device D.
+               - "D" or "D:": device D partition 1 if device D has partition
+                              table, or the whole device D if has no partition
+                              table.
+               - "D:auto": first partition in device D with bootable flag set.
+                           If none, first valid partition in device D. If no
+                           partition table then means device D.
+
+         - FAT_ENV_FILE:
+
+         It's a string of the FAT file name. This file use to store the
+         environment.
+
+         - CONFIG_FAT_WRITE:
+         This must be enabled. Otherwise it cannot save the environment file.
+
 config ENV_IS_IN_FLASH
 	bool "Environment in flash memory"
 	help
include/configs/am335x_evm.h +0 -1
index 1243a5e804..054fe01b9a 100644
@@ -357,7 +357,6 @@
 #define CONFIG_SYS_ENV_SECT_SIZE	CONFIG_SYS_NAND_BLOCK_SIZE
 #elif !defined(CONFIG_ENV_IS_NOWHERE)
 /* Not NAND, SPI, NOR or eMMC env, so put ENV in a file on FAT */
-#define CONFIG_ENV_IS_IN_FAT
 #define FAT_ENV_INTERFACE		"mmc"
 #define FAT_ENV_DEVICE_AND_PART		"0:1"
 #define FAT_ENV_FILE			"uboot.env"
include/configs/am43xx_evm.h +0 -6
index 571f7b53d8..a91b7df347 100644
@@ -71,7 +71,6 @@
 /* NS16550 Configuration */
 #define CONFIG_SYS_NS16550_COM1		0x44e09000	/* Base EVM has UART0 */
 
-#define CONFIG_ENV_IS_IN_FAT
 #define FAT_ENV_INTERFACE		"mmc"
 #define FAT_ENV_DEVICE_AND_PART		"0:1"
 #define FAT_ENV_FILE			"uboot.env"
@@ -127,7 +126,6 @@
 #ifndef CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_TEXT_BASE		CONFIG_ISW_ENTRY_ADDR
 #endif
-#undef CONFIG_ENV_IS_IN_FAT
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 #define CONFIG_ENV_SPI_MAX_HZ           CONFIG_SF_DEFAULT_SPEED
 #define CONFIG_ENV_SECT_SIZE           (64 << 10) /* 64 KB sectors */
@@ -256,10 +254,6 @@
 #define CONFIG_PHYLIB
 #define PHY_ANEG_TIMEOUT	8000 /* PHY needs longer aneg time@1G */
 
-#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_ETH_SUPPORT)
-#undef CONFIG_ENV_IS_IN_FAT
-#endif
-
 #define CONFIG_SYS_RX_ETH_BUFFER	64
 
 /* NAND support */
include/configs/at91-sama5_common.h +0 -1
index 33f2d85319..b4135235d4 100644
@@ -53,7 +53,6 @@
 #define CONFIG_SYS_MMC_ENV_DEV		0
 #else
 /* u-boot env in sd/mmc card */
-#define CONFIG_ENV_IS_IN_FAT
 #define FAT_ENV_INTERFACE	"mmc"
 #define FAT_ENV_DEVICE_AND_PART	"0"
 #define FAT_ENV_FILE		"uboot.env"
include/configs/at91sam9m10g45ek.h +0 -1
index 9e7fd1e1ae..8b00370cdd 100644
@@ -113,7 +113,6 @@
  */
 #define FAT_ENV_DEVICE_AND_PART	"0"
 #define FAT_ENV_FILE		"uboot.env"
-#define CONFIG_ENV_IS_IN_FAT
 #define CONFIG_ENV_SIZE		0x4000
 
 #define CONFIG_BOOTARGS		"console=ttyS0,115200 " \
include/configs/at91sam9n12ek.h +0 -1
index 03846b55f5..2616ae4b0a 100644
@@ -157,7 +157,6 @@
 #define CONFIG_SYS_MMC_ENV_DEV		0
 #else
 /* Use file in FAT file to save environment */
-#define CONFIG_ENV_IS_IN_FAT
 #define FAT_ENV_INTERFACE		"mmc"
 #define FAT_ENV_FILE			"uboot.env"
 #define FAT_ENV_DEVICE_AND_PART		"0"
include/configs/at91sam9rlek.h +0 -1
index 1d068f4c50..6132076e82 100644
@@ -124,7 +124,6 @@
 #else /* CONFIG_SYS_USE_MMC */
 
 /* bootstrap + u-boot + env + linux in mmc */
-#define CONFIG_ENV_IS_IN_FAT
 #define FAT_ENV_INTERFACE	"mmc"
 #define FAT_ENV_FILE		"uboot.env"
 #define FAT_ENV_DEVICE_AND_PART	"0"
include/configs/at91sam9x5ek.h +0 -1
index 7357e18115..a80fe6a8a6 100644
@@ -143,7 +143,6 @@
 				"bootm 0x22000000"
 #else /* CONFIG_SYS_USE_MMC */
 /* bootstrap + u-boot + env + linux in mmc */
-#define CONFIG_ENV_IS_IN_FAT
 #define FAT_ENV_INTERFACE	"mmc"
 #define FAT_ENV_FILE		"uboot.env"
 #define FAT_ENV_DEVICE_AND_PART "0"
include/configs/axs10x.h +0 -1
index 908b018800..b583267b3e 100644
@@ -75,7 +75,6 @@
 /*
  * Environment settings
  */
-#define CONFIG_ENV_IS_IN_FAT
 #define CONFIG_ENV_SIZE			SZ_16K
 #define FAT_ENV_INTERFACE		"mmc"
 #define FAT_ENV_DEVICE_AND_PART		"0:1"
include/configs/hikey.h +0 -1
index 2b4fec4bd4..17b33e8166 100644
@@ -107,7 +107,6 @@
 
 /* Preserve environment on sd card */
 #define CONFIG_ENV_SIZE			0x1000
-#define CONFIG_ENV_IS_IN_FAT
 #define FAT_ENV_INTERFACE               "mmc"
 #define FAT_ENV_DEVICE_AND_PART         "1:1"
 #define FAT_ENV_FILE                    "uboot.env"
include/configs/hsdk.h +0 -1
index 28ac090c05..68900ac980 100644
@@ -60,7 +60,6 @@
  * Environment settings
  */
 #define CONFIG_ENV_SIZE			SZ_16K
-#define CONFIG_ENV_IS_IN_FAT
 #define FAT_ENV_INTERFACE		"mmc"
 #define FAT_ENV_DEVICE_AND_PART		"0:1"
 #define FAT_ENV_FILE			"uboot.env"
include/configs/k2g_evm.h +0 -1
index 1cc3576984..49a11f3d85 100644
@@ -61,7 +61,6 @@
 #define CONFIG_PHY_MICREL
 #define PHY_ANEG_TIMEOUT	10000 /* PHY needs longer aneg time */
 
-#define CONFIG_ENV_IS_IN_FAT
 #define CONFIG_ENV_SIZE			(256 << 10)  /* 256 KiB */
 #define FAT_ENV_INTERFACE		"mmc"
 #define FAT_ENV_DEVICE_AND_PART		"0:1"
include/configs/omap4_panda.h +0 -1
index e1263b68bc..a973ce6a62 100644
@@ -35,7 +35,6 @@
 /* ENV related config options */
 
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
-#define CONFIG_ENV_IS_IN_FAT
 #define FAT_ENV_INTERFACE               "mmc"
 #define FAT_ENV_DEVICE_AND_PART         "0:1"
 #define FAT_ENV_FILE                    "uboot.env"
include/configs/picosam9g45.h +0 -1
index c83e559a5a..88f841dfd8 100644
@@ -115,7 +115,6 @@
  */
 #define FAT_ENV_DEVICE_AND_PART	"0"
 #define FAT_ENV_FILE		"uboot.env"
-#define CONFIG_ENV_IS_IN_FAT
 #define CONFIG_ENV_SIZE		0x4000
 
 #define CONFIG_BOOTARGS		"console=ttyS0,115200 " \
include/configs/rpi.h +0 -1
index d715eaad14..d79a67fe0d 100644
@@ -93,7 +93,6 @@
 
 /* Environment */
 #define CONFIG_ENV_SIZE			SZ_16K
-#define CONFIG_ENV_IS_IN_FAT
 #define FAT_ENV_INTERFACE		"mmc"
 #define FAT_ENV_DEVICE_AND_PART		"0:1"
 #define FAT_ENV_FILE			"uboot.env"
include/configs/xilinx_zynqmp.h +0 -1
index 0f4ca7452b..c30e37ccca 100644
@@ -73,7 +73,6 @@
 # ifndef CONFIG_ZYNQ_SDHCI_MAX_FREQ
 #  define CONFIG_ZYNQ_SDHCI_MAX_FREQ	200000000
 # endif
-# define CONFIG_ENV_IS_IN_FAT
 # define FAT_ENV_DEVICE_AND_PART	"0:auto"
 # define FAT_ENV_FILE			"uboot.env"
 # define FAT_ENV_INTERFACE		"mmc"
scripts/config_whitelist.txt +0 -1
index f1f188bb5c..f83b8019b4 100644
@@ -641,7 +641,6 @@ CONFIG_ENV_FLAGS_LIST_STATIC
 CONFIG_ENV_FLASHBOOT
 CONFIG_ENV_IS_EMBEDDED
 CONFIG_ENV_IS_IN_
-CONFIG_ENV_IS_IN_FAT
 CONFIG_ENV_IS_IN_MRAM
 CONFIG_ENV_IS_IN_ONENAND
 CONFIG_ENV_MAX_ENTRIES
Signature · 1 line
2.13.2.725.g09c95d1e9-goog
#16 lore raw

PATCH 12/30 env: common: Make env_get_addr/get_char_memory() static

In reply to Simon Glass

These functions are not used outside this file. Make them static and order them to avoid forward declarations.

---

 env/common.c          | 18 +++++++++---------
 include/environment.h |  4 ----
 2 files changed, 9 insertions(+), 13 deletions(-)
env/common.c +9 -9
index 6845f8d8d5..ff3f47e536 100644
@@ -41,7 +41,15 @@ static uchar env_get_char_init(int index)
 		return default_environment[index];
 }
 
-uchar env_get_char_memory(int index)
+static const uchar *env_get_addr(int index)
+{
+	if (gd->env_valid)
+		return (uchar *)(gd->env_addr + index);
+	else
+		return &default_environment[index];
+}
+
+static uchar env_get_char_memory(int index)
 {
 	return *env_get_addr(index);
 }
@@ -55,14 +63,6 @@ uchar env_get_char(int index)
 		return env_get_char_init(index);
 }
 
-const uchar *env_get_addr(int index)
-{
-	if (gd->env_valid)
-		return (uchar *)(gd->env_addr + index);
-	else
-		return &default_environment[index];
-}
-
 /*
  * Read an environment variable as a boolean
  * Return -1 if variable does not exist (default to true)
include/environment.h +0 -4
index 6f94986c6b..d6aa1f0fff 100644
@@ -202,10 +202,6 @@ extern struct hsearch_data env_htab;
 /* Function that returns a character from the environment */
 unsigned char env_get_char(int);
 
-/* Function that returns a pointer to a value from the environment */
-const unsigned char *env_get_addr(int);
-unsigned char env_get_char_memory(int index);
-
 /* Function that updates CRC of the enironment */
 void env_crc_update(void);
 
Signature · 1 line
2.13.2.725.g09c95d1e9-goog
#17 lore raw

PATCH 13/30 env: common: Drop env_get_addr()

In reply to Simon Glass

This function is not used anywhere other than env_get_char(). Move the code into that function.

---

 env/common.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
env/common.c +3 -8
index ff3f47e536..ce6b5f927a 100644
@@ -41,17 +41,12 @@ static uchar env_get_char_init(int index)
 		return default_environment[index];
 }
 
-static const uchar *env_get_addr(int index)
+static uchar env_get_char_memory(int index)
 {
 	if (gd->env_valid)
-		return (uchar *)(gd->env_addr + index);
+		return *(uchar *)(gd->env_addr + index);
 	else
-		return &default_environment[index];
-}
-
-static uchar env_get_char_memory(int index)
-{
-	return *env_get_addr(index);
+		return default_environment[index];
 }
 
 uchar env_get_char(int index)
Signature · 1 line
2.13.2.725.g09c95d1e9-goog
#18 lore raw

PATCH 14/30 env: common: Factor out the common env_valid check

In reply to Simon Glass

The check for gd->env_valid is used in both the 'if' and 'else' part of env_get_char(). Move it into that function instead for simplicity. Drop that code from the two leaf functions.

---

 env/common.c | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)
env/common.c +6 -11
index ce6b5f927a..10c4e134f4 100644
@@ -34,25 +34,20 @@ __weak uchar env_get_char_spec(int index)
 
 static uchar env_get_char_init(int index)
 {
-	/* if crc was bad, use the default environment */
-	if (gd->env_valid)
-		return env_get_char_spec(index);
-	else
-		return default_environment[index];
+	return env_get_char_spec(index);
 }
 
 static uchar env_get_char_memory(int index)
 {
-	if (gd->env_valid)
-		return *(uchar *)(gd->env_addr + index);
-	else
-		return default_environment[index];
+	return *(uchar *)(gd->env_addr + index);
 }
 
 uchar env_get_char(int index)
 {
-	/* if relocated to RAM */
-	if (gd->flags & GD_FLG_RELOC)
+	/* if env is not set up, or crc was bad, use the default environment */
+	if (!gd->env_valid)
+		return default_environment[index];
+	else if (gd->flags & GD_FLG_RELOC)  /* if relocated to RAM */
 		return env_get_char_memory(index);
 	else
 		return env_get_char_init(index);
Signature · 1 line
2.13.2.725.g09c95d1e9-goog
#19 lore raw

PATCH 15/30 env: common: Drop env_get_char_init()

In reply to Simon Glass

This function does nothing but call env_get_char_spec(). Drop it and adjust its only caller.

---

 env/common.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
env/common.c +1 -6
index 10c4e134f4..e919269c7f 100644
@@ -32,11 +32,6 @@ __weak uchar env_get_char_spec(int index)
 	return *((uchar *)(gd->env_addr + index));
 }
 
-static uchar env_get_char_init(int index)
-{
-	return env_get_char_spec(index);
-}
-
 static uchar env_get_char_memory(int index)
 {
 	return *(uchar *)(gd->env_addr + index);
@@ -50,7 +45,7 @@ uchar env_get_char(int index)
 	else if (gd->flags & GD_FLG_RELOC)  /* if relocated to RAM */
 		return env_get_char_memory(index);
 	else
-		return env_get_char_init(index);
+		return env_get_char_spec(index);
 }
 
 /*
Signature · 1 line
2.13.2.725.g09c95d1e9-goog
#20 lore raw

PATCH 16/30 env: common: Drop env_get_char_memory()

In reply to Simon Glass

This function is the same as env_get_char_spec() apart from dropping the brackets. Drop the brackets from env_get_char_spec() and use that instead of env_get_char_memory().

---

 env/common.c | 7 -------
 1 file changed, 7 deletions(-)
env/common.c +0 -7
index e919269c7f..7ed4bb28dd 100644
@@ -28,11 +28,6 @@ struct hsearch_data env_htab = {
 };
 
 __weak uchar env_get_char_spec(int index)
-{
-	return *((uchar *)(gd->env_addr + index));
-}
-
-static uchar env_get_char_memory(int index)
 {
 	return *(uchar *)(gd->env_addr + index);
 }
@@ -42,8 +37,6 @@ uchar env_get_char(int index)
 	/* if env is not set up, or crc was bad, use the default environment */
 	if (!gd->env_valid)
 		return default_environment[index];
-	else if (gd->flags & GD_FLG_RELOC)  /* if relocated to RAM */
-		return env_get_char_memory(index);
 	else
 		return env_get_char_spec(index);
 }
Signature · 1 line
2.13.2.725.g09c95d1e9-goog
#21 lore raw

PATCH 17/30 env: Add an enum for environment state

In reply to Simon Glass

At present we have three states for the environment, numbered 0, 1 and 2. Add an enum to record this to avoid open-coded values.

---

 board/Arcturus/ucp1020/spl.c       |  3 ++-
 board/freescale/b4860qds/spl.c     |  3 ++-
 board/freescale/c29xpcie/spl.c     |  3 ++-
 board/freescale/p1010rdb/spl.c     |  3 ++-
 board/freescale/p1022ds/spl.c      |  3 ++-
 board/freescale/p1_p2_rdb_pc/spl.c |  3 ++-
 board/freescale/t102xqds/spl.c     |  3 ++-
 board/freescale/t102xrdb/spl.c     |  3 ++-
 board/freescale/t104xrdb/spl.c     |  3 ++-
 board/freescale/t208xqds/spl.c     |  3 ++-
 board/freescale/t208xrdb/spl.c     |  3 ++-
 board/freescale/t4qds/spl.c        |  3 ++-
 board/freescale/t4rdb/spl.c        |  3 ++-
 env/dataflash.c                    |  2 +-
 env/eeprom.c                       | 30 ++++++++++++++--------------
 env/ext4.c                         |  2 +-
 env/fat.c                          |  2 +-
 env/flash.c                        | 22 ++++++++++----------
 env/mmc.c                          | 22 ++++++++++----------
 env/nand.c                         | 41 +++++++++++++++++++-------------------
 env/nvram.c                        |  2 +-
 env/onenand.c                      |  4 ++--
 env/remote.c                       |  2 +-
 env/sata.c                         |  2 +-
 env/sf.c                           | 26 ++++++++++++------------
 env/ubi.c                          | 22 ++++++++++----------
 include/asm-generic/global_data.h  |  2 +-
 include/environment.h              |  7 +++++++
 28 files changed, 124 insertions(+), 103 deletions(-)
board/Arcturus/ucp1020/spl.c +2 -1
index cd484fc44b..b5e7a5db06 100644
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <console.h>
+#include <environment.h>
 #include <ns16550.h>
 #include <malloc.h>
 #include <mmc.h>
@@ -99,7 +100,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
 	nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE,
 			    (uchar *)CONFIG_ENV_ADDR);
 	gd->env_addr = (ulong)(CONFIG_ENV_ADDR);
-	gd->env_valid = 1;
+	gd->env_valid = ENV_VALID;
 #else
 	env_relocate();
 #endif
board/freescale/b4860qds/spl.c +2 -1
index 60d7f0d48a..b1824b07a2 100644
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <console.h>
+#include <environment.h>
 #include <asm/spl.h>
 #include <malloc.h>
 #include <ns16550.h>
@@ -101,7 +102,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
 	nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE,
 			    (uchar *)CONFIG_ENV_ADDR);
 	gd->env_addr  = (ulong)(CONFIG_ENV_ADDR);
-	gd->env_valid = 1;
+	gd->env_valid = ENV_VALID;
 #endif
 
 	i2c_init_all();
board/freescale/c29xpcie/spl.c +2 -1
index 94093f11a8..28541a72cb 100644
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <console.h>
+#include <environment.h>
 #include <ns16550.h>
 #include <malloc.h>
 #include <mmc.h>
@@ -63,7 +64,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
 	nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE,
 			    (uchar *)CONFIG_ENV_ADDR);
 	gd->env_addr  = (ulong)(CONFIG_ENV_ADDR);
-	gd->env_valid = 1;
+	gd->env_valid = ENV_VALID;
 
 	i2c_init_all();
 
board/freescale/p1010rdb/spl.c +2 -1
index 2cebc2c002..001308874e 100644
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <console.h>
+#include <environment.h>
 #include <ns16550.h>
 #include <malloc.h>
 #include <mmc.h>
@@ -87,7 +88,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
 	nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE,
 			    (uchar *)CONFIG_ENV_ADDR);
 			    gd->env_addr  = (ulong)(CONFIG_ENV_ADDR);
-	gd->env_valid = 1;
+	gd->env_valid = ENV_VALID;
 #else
 	env_relocate();
 #endif
board/freescale/p1022ds/spl.c +2 -1
index a117dc3a2c..94b357d446 100644
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <console.h>
+#include <environment.h>
 #include <ns16550.h>
 #include <malloc.h>
 #include <mmc.h>
@@ -100,7 +101,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
 			    (uchar *)CONFIG_ENV_ADDR);
 
 	gd->env_addr  = (ulong)(CONFIG_ENV_ADDR);
-	gd->env_valid = 1;
+	gd->env_valid = ENV_VALID;
 #else
 	env_relocate();
 #endif
board/freescale/p1_p2_rdb_pc/spl.c +2 -1
index ca7ba5754e..c1d4c36b06 100644
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <console.h>
+#include <environment.h>
 #include <ns16550.h>
 #include <malloc.h>
 #include <mmc.h>
@@ -92,7 +93,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
 	nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE,
 			    (uchar *)CONFIG_ENV_ADDR);
 	gd->env_addr  = (ulong)(CONFIG_ENV_ADDR);
-	gd->env_valid = 1;
+	gd->env_valid = ENV_VALID;
 #else
 	env_relocate();
 #endif
board/freescale/t102xqds/spl.c +2 -1
index b987ecea1d..3aa19e6715 100644
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <console.h>
+#include <environment.h>
 #include <malloc.h>
 #include <ns16550.h>
 #include <nand.h>
@@ -138,7 +139,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
 #endif
 
 	gd->env_addr  = (ulong)(CONFIG_ENV_ADDR);
-	gd->env_valid = 1;
+	gd->env_valid = ENV_VALID;
 
 	i2c_init_all();
 
board/freescale/t102xrdb/spl.c +2 -1
index dc6d9eeef6..ca1e49ffa7 100644
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <console.h>
+#include <environment.h>
 #include <malloc.h>
 #include <ns16550.h>
 #include <nand.h>
@@ -125,7 +126,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
 #endif
 
 	gd->env_addr  = (ulong)(CONFIG_ENV_ADDR);
-	gd->env_valid = 1;
+	gd->env_valid = ENV_VALID;
 
 	i2c_init_all();
 
board/freescale/t104xrdb/spl.c +2 -1
index 2e43307b2d..4fb9323873 100644
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <console.h>
+#include <environment.h>
 #include <malloc.h>
 #include <ns16550.h>
 #include <nand.h>
@@ -119,7 +120,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
 			       (uchar *)CONFIG_ENV_ADDR);
 #endif
 	gd->env_addr  = (ulong)(CONFIG_ENV_ADDR);
-	gd->env_valid = 1;
+	gd->env_valid = ENV_VALID;
 
 	i2c_init_all();
 
board/freescale/t208xqds/spl.c +2 -1
index d7d716b690..36961dc9b0 100644
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <console.h>
+#include <environment.h>
 #include <malloc.h>
 #include <ns16550.h>
 #include <nand.h>
@@ -124,7 +125,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
 #endif
 
 	gd->env_addr  = (ulong)(CONFIG_ENV_ADDR);
-	gd->env_valid = 1;
+	gd->env_valid = ENV_VALID;
 
 	i2c_init_all();
 
board/freescale/t208xrdb/spl.c +2 -1
index b43140148b..f0cc34d788 100644
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <console.h>
+#include <environment.h>
 #include <malloc.h>
 #include <ns16550.h>
 #include <nand.h>
@@ -94,7 +95,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
 #endif
 
 	gd->env_addr  = (ulong)(CONFIG_ENV_ADDR);
-	gd->env_valid = 1;
+	gd->env_valid = ENV_VALID;
 
 	i2c_init_all();
 
board/freescale/t4qds/spl.c +2 -1
index 9ecdaedda3..750f155493 100644
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <console.h>
+#include <environment.h>
 #include <asm/spl.h>
 #include <malloc.h>
 #include <ns16550.h>
@@ -129,7 +130,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
 #endif
 
 	gd->env_addr  = (ulong)(CONFIG_ENV_ADDR);
-	gd->env_valid = 1;
+	gd->env_valid = ENV_VALID;
 
 	i2c_init_all();
 
board/freescale/t4rdb/spl.c +2 -1
index 5feab1cfcd..932954e93d 100644
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <console.h>
+#include <environment.h>
 #include <asm/spl.h>
 #include <malloc.h>
 #include <ns16550.h>
@@ -87,7 +88,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
 			   (uchar *)CONFIG_ENV_ADDR);
 
 	gd->env_addr  = (ulong)(CONFIG_ENV_ADDR);
-	gd->env_valid = 1;
+	gd->env_valid = ENV_VALID;
 
 	i2c_init_all();
 
env/dataflash.c +1 -1
index 034e323169..c140b74c98 100644
@@ -78,7 +78,7 @@ int env_init(void)
 {
 	/* use default */
 	gd->env_addr = (ulong)&default_environment[0];
-	gd->env_valid = 1;
+	gd->env_valid = ENV_VALID;
 
 	return 0;
 }
env/eeprom.c +15 -15
index 5f63a6cd4a..ac6b30fa8f 100644
@@ -71,7 +71,7 @@ uchar env_get_char_spec(int index)
 	unsigned int off = CONFIG_ENV_OFFSET;
 
 #ifdef CONFIG_ENV_OFFSET_REDUND
-	if (gd->env_valid == 2)
+	if (gd->env_valid == ENV_REDUND)
 		off = CONFIG_ENV_OFFSET_REDUND;
 #endif
 	eeprom_bus_read(CONFIG_SYS_DEF_EEPROM_ADDR,
@@ -128,21 +128,21 @@ void env_relocate_spec(void)
 		gd->env_addr	= 0;
 		gd->env_valid	= 0;
 	} else if (crc_ok[0] && !crc_ok[1]) {
-		gd->env_valid = 1;
+		gd->env_valid = ENV_VALID;
 	} else if (!crc_ok[0] && crc_ok[1]) {
-		gd->env_valid = 2;
+		gd->env_valid = ENV_REDUND;
 	} else {
 		/* both ok - check serial */
 		if (flags[0] == ACTIVE_FLAG && flags[1] == OBSOLETE_FLAG)
-			gd->env_valid = 1;
+			gd->env_valid = ENV_VALID;
 		else if (flags[0] == OBSOLETE_FLAG && flags[1] == ACTIVE_FLAG)
-			gd->env_valid = 2;
+			gd->env_valid = ENV_REDUND;
 		else if (flags[0] == 0xFF && flags[1] == 0)
-			gd->env_valid = 2;
+			gd->env_valid = ENV_REDUND;
 		else if (flags[1] == 0xFF && flags[0] == 0)
-			gd->env_valid = 1;
+			gd->env_valid = ENV_VALID;
 		else /* flags are equal - almost impossible */
-			gd->env_valid = 1;
+			gd->env_valid = ENV_VALID;
 	}
 
 #else /* CONFIG_ENV_OFFSET_REDUND */
@@ -170,7 +170,7 @@ void env_relocate_spec(void)
 	}
 
 	if (crc == new) {
-		gd->env_valid	= 1;
+		gd->env_valid	= ENV_VALID;
 	} else {
 		gd->env_valid	= 0;
 	}
@@ -178,7 +178,7 @@ void env_relocate_spec(void)
 
 	off = CONFIG_ENV_OFFSET;
 #ifdef CONFIG_ENV_OFFSET_REDUND
-	if (gd->env_valid == 2)
+	if (gd->env_valid == ENV_REDUND)
 		off = CONFIG_ENV_OFFSET_REDUND;
 #endif
 
@@ -205,7 +205,7 @@ int saveenv(void)
 		return rc;
 
 #ifdef CONFIG_ENV_OFFSET_REDUND
-	if (gd->env_valid == 1) {
+	if (gd->env_valid == ENV_VALID) {
 		off	= CONFIG_ENV_OFFSET_REDUND;
 		off_red	= CONFIG_ENV_OFFSET;
 	}
@@ -222,10 +222,10 @@ int saveenv(void)
 				 off_red + offsetof(env_t, flags),
 				 (uchar *)&flag_obsolete, 1);
 
-		if (gd->env_valid == 1)
-			gd->env_valid = 2;
+		if (gd->env_valid == ENV_VALID)
+			gd->env_valid = ENV_REDUND;
 		else
-			gd->env_valid = 1;
+			gd->env_valid = ENV_VALID;
 	}
 #endif
 	return rc;
@@ -240,6 +240,6 @@ int saveenv(void)
 int env_init(void)
 {
 	gd->env_addr = (ulong)&default_environment[0];
-	gd->env_valid = 1;
+	gd->env_valid = ENV_VALID;
 	return 0;
 }
env/ext4.c +1 -1
index adefa7dc99..7bb4ce7cff 100644
@@ -41,7 +41,7 @@ int env_init(void)
 {
 	/* use default */
 	gd->env_addr = (ulong)&default_environment[0];
-	gd->env_valid = 1;
+	gd->env_valid = ENV_VALID;
 
 	return 0;
 }
env/fat.c +1 -1
index 75616d4c5b..5a2131a5a9 100644
@@ -29,7 +29,7 @@ int env_init(void)
 {
 	/* use default */
 	gd->env_addr = (ulong)&default_environment[0];
-	gd->env_valid = 1;
+	gd->env_valid = ENV_VALID;
 
 	return 0;
 }
env/flash.c +11 -11
index 004e8849a7..dcf3cd2c62 100644
@@ -75,28 +75,28 @@ int env_init(void)
 
 	if (crc1_ok && !crc2_ok) {
 		gd->env_addr	= addr1;
-		gd->env_valid	= 1;
+		gd->env_valid	= ENV_VALID;
 	} else if (!crc1_ok && crc2_ok) {
 		gd->env_addr	= addr2;
-		gd->env_valid	= 1;
+		gd->env_valid	= ENV_VALID;
 	} else if (!crc1_ok && !crc2_ok) {
 		gd->env_addr	= addr_default;
 		gd->env_valid	= 0;
 	} else if (flag1 == ACTIVE_FLAG && flag2 == OBSOLETE_FLAG) {
 		gd->env_addr	= addr1;
-		gd->env_valid	= 1;
+		gd->env_valid	= ENV_VALID;
 	} else if (flag1 == OBSOLETE_FLAG && flag2 == ACTIVE_FLAG) {
 		gd->env_addr	= addr2;
-		gd->env_valid	= 1;
+		gd->env_valid	= ENV_VALID;
 	} else if (flag1 == flag2) {
 		gd->env_addr	= addr1;
-		gd->env_valid	= 2;
+		gd->env_valid	= ENV_REDUND;
 	} else if (flag1 == 0xFF) {
 		gd->env_addr	= addr1;
-		gd->env_valid	= 2;
+		gd->env_valid	= ENV_REDUND;
 	} else if (flag2 == 0xFF) {
 		gd->env_addr	= addr2;
-		gd->env_valid	= 2;
+		gd->env_valid	= ENV_REDUND;
 	}
 
 	return 0;
@@ -211,7 +211,7 @@ int env_init(void)
 {
 	if (crc32(0, env_ptr->data, ENV_SIZE) == env_ptr->crc) {
 		gd->env_addr	= (ulong)&(env_ptr->data);
-		gd->env_valid	= 1;
+		gd->env_valid	= ENV_VALID;
 		return 0;
 	}
 
@@ -309,7 +309,7 @@ void env_relocate_spec(void)
 	    crc32(0, flash_addr_new->data, ENV_SIZE) == flash_addr_new->crc) {
 		char flag = OBSOLETE_FLAG;
 
-		gd->env_valid = 2;
+		gd->env_valid = ENV_REDUND;
 		flash_sect_protect(0, (ulong)flash_addr_new, end_addr_new);
 		flash_write(&flag,
 			    (ulong)&(flash_addr_new->flags),
@@ -321,7 +321,7 @@ void env_relocate_spec(void)
 	    (flash_addr->flags & ACTIVE_FLAG) == ACTIVE_FLAG) {
 		char flag = ACTIVE_FLAG;
 
-		gd->env_valid = 2;
+		gd->env_valid = ENV_REDUND;
 		flash_sect_protect(0, (ulong)flash_addr, end_addr);
 		flash_write(&flag,
 			    (ulong)&(flash_addr->flags),
@@ -329,7 +329,7 @@ void env_relocate_spec(void)
 		flash_sect_protect(1, (ulong)flash_addr, end_addr);
 	}
 
-	if (gd->env_valid == 2)
+	if (gd->env_valid == ENV_REDUND)
 		puts("*** Warning - some problems detected "
 		     "reading environment; recovered successfully\n\n");
 #endif /* CONFIG_ENV_ADDR_REDUND */
env/mmc.c +11 -11
index 88b043ec35..32764a15c9 100644
@@ -86,7 +86,7 @@ int env_init(void)
 {
 	/* use default */
 	gd->env_addr	= (ulong)&default_environment[0];
-	gd->env_valid	= 1;
+	gd->env_valid	= ENV_VALID;
 
 	return 0;
 }
@@ -186,7 +186,7 @@ int saveenv(void)
 #ifdef CONFIG_ENV_OFFSET_REDUND
 	env_new->flags	= ++env_flags; /* increase the serial */
 
-	if (gd->env_valid == 1)
+	if (gd->env_valid == ENV_VALID)
 		copy = 1;
 #endif
 
@@ -206,7 +206,7 @@ int saveenv(void)
 	ret = 0;
 
 #ifdef CONFIG_ENV_OFFSET_REDUND
-	gd->env_valid = gd->env_valid == 2 ? 1 : 2;
+	gd->env_valid = gd->env_valid == ENV_REDUND ? ENV_VALID : ENV_REDUND;
 #endif
 
 fini:
@@ -278,26 +278,26 @@ void env_relocate_spec(void)
 		ret = 1;
 		goto fini;
 	} else if (crc1_ok && !crc2_ok) {
-		gd->env_valid = 1;
+		gd->env_valid = ENV_VALID;
 	} else if (!crc1_ok && crc2_ok) {
-		gd->env_valid = 2;
+		gd->env_valid = ENV_REDUND;
 	} else {
 		/* both ok - check serial */
 		if (tmp_env1->flags == 255 && tmp_env2->flags == 0)
-			gd->env_valid = 2;
+			gd->env_valid = ENV_REDUND;
 		else if (tmp_env2->flags == 255 && tmp_env1->flags == 0)
-			gd->env_valid = 1;
+			gd->env_valid = ENV_VALID;
 		else if (tmp_env1->flags > tmp_env2->flags)
-			gd->env_valid = 1;
+			gd->env_valid = ENV_VALID;
 		else if (tmp_env2->flags > tmp_env1->flags)
-			gd->env_valid = 2;
+			gd->env_valid = ENV_REDUND;
 		else /* flags are equal - almost impossible */
-			gd->env_valid = 1;
+			gd->env_valid = ENV_VALID;
 	}
 
 	free(env_ptr);
 
-	if (gd->env_valid == 1)
+	if (gd->env_valid == ENV_VALID)
 		ep = tmp_env1;
 	else
 		ep = tmp_env2;
env/nand.c +21 -20

98 lines not on this page · raw message

env/nvram.c +1 -1
index 524f07d5f8..d046c9393c 100644
@@ -104,7 +104,7 @@ int env_init(void)
 	if (crc32(0, env_ptr->data, ENV_SIZE) == env_ptr->crc) {
 		gd->env_addr	= (ulong)&env_ptr->data;
 #endif
-		gd->env_valid	= 1;
+		gd->env_valid = ENV_VALID;
 	} else {
 		gd->env_addr	= (ulong)&default_environment[0];
 		gd->env_valid	= 0;
env/onenand.c +2 -2
index cc3d670de8..d7ad45a0e5 100644
@@ -60,7 +60,7 @@ void env_relocate_spec(void)
 
 	rc = env_import(buf, 1);
 	if (rc)
-		gd->env_valid = 1;
+		gd->env_valid = ENV_VALID;
 }
 
 int saveenv(void)
@@ -110,7 +110,7 @@ int env_init(void)
 {
 	/* use default */
 	gd->env_addr = (ulong)&default_environment[0];
-	gd->env_valid = 1;
+	gd->env_valid = ENV_VALID;
 
 	return 0;
 }
env/remote.c +1 -1
index eb977ee1fe..e003e02fb9 100644
@@ -29,7 +29,7 @@ int env_init(void)
 {
 	if (crc32(0, env_ptr->data, ENV_SIZE) == env_ptr->crc) {
 		gd->env_addr = (ulong)&(env_ptr->data);
-		gd->env_valid = 1;
+		gd->env_valid = ENV_VALID;
 		return 0;
 	}
 
env/sata.c +1 -1
index b0cee35a60..64589117f2 100644
@@ -37,7 +37,7 @@ int env_init(void)
 {
 	/* use default */
 	gd->env_addr = (ulong)&default_environment[0];
-	gd->env_valid = 1;
+	gd->env_valid = ENV_VALID;
 
 	return 0;
 }
env/sf.c +13 -13
index 45f441a042..1da3549138 100644
@@ -93,7 +93,7 @@ int saveenv(void)
 		return ret;
 	env_new.flags	= ACTIVE_FLAG;
 
-	if (gd->env_valid == 1) {
+	if (gd->env_valid == ENV_VALID) {
 		env_new_offset = CONFIG_ENV_OFFSET_REDUND;
 		env_offset = CONFIG_ENV_OFFSET;
 	} else {
@@ -145,7 +145,7 @@ int saveenv(void)
 
 	puts("done\n");
 
-	gd->env_valid = gd->env_valid == 2 ? 1 : 2;
+	gd->env_valid = gd->env_valid == ENV_REDUND ? ENV_VALID : ENV_REDUND;
 
 	printf("Valid environment: %d\n", (int)gd->env_valid);
 
@@ -198,30 +198,30 @@ void env_relocate_spec(void)
 		set_default_env("!bad CRC");
 		goto err_read;
 	} else if (crc1_ok && !crc2_ok) {
-		gd->env_valid = 1;
+		gd->env_valid = ENV_VALID;
 	} else if (!crc1_ok && crc2_ok) {
-		gd->env_valid = 2;
+		gd->env_valid = ENV_REDUND;
 	} else if (tmp_env1->flags == ACTIVE_FLAG &&
 		   tmp_env2->flags == OBSOLETE_FLAG) {
-		gd->env_valid = 1;
+		gd->env_valid = ENV_VALID;
 	} else if (tmp_env1->flags == OBSOLETE_FLAG &&
 		   tmp_env2->flags == ACTIVE_FLAG) {
-		gd->env_valid = 2;
+		gd->env_valid = ENV_REDUND;
 	} else if (tmp_env1->flags == tmp_env2->flags) {
-		gd->env_valid = 1;
+		gd->env_valid = ENV_VALID;
 	} else if (tmp_env1->flags == 0xFF) {
-		gd->env_valid = 1;
+		gd->env_valid = ENV_VALID;
 	} else if (tmp_env2->flags == 0xFF) {
-		gd->env_valid = 2;
+		gd->env_valid = ENV_REDUND;
 	} else {
 		/*
 		 * this differs from code in env_flash.c, but I think a sane
 		 * default path is desirable.
 		 */
-		gd->env_valid = 1;
+		gd->env_valid = ENV_VALID;
 	}
 
-	if (gd->env_valid == 1)
+	if (gd->env_valid == ENV_VALID)
 		ep = tmp_env1;
 	else
 		ep = tmp_env2;
@@ -324,7 +324,7 @@ void env_relocate_spec(void)
 
 	ret = env_import(buf, 1);
 	if (ret)
-		gd->env_valid = 1;
+		gd->env_valid = ENV_VALID;
 
 err_read:
 	spi_flash_free(env_flash);
@@ -338,7 +338,7 @@ int env_init(void)
 {
 	/* SPI flash isn't usable before relocation */
 	gd->env_addr = (ulong)&default_environment[0];
-	gd->env_valid = 1;
+	gd->env_valid = ENV_VALID;
 
 	return 0;
 }
env/ubi.c +11 -11
index 0ac2f65f0b..d37095db0c 100644
@@ -26,7 +26,7 @@ int env_init(void)
 {
 	/* use default */
 	gd->env_addr = (ulong)&default_environment[0];
-	gd->env_valid = 1;
+	gd->env_valid = ENV_VALID;
 
 	return 0;
 }
@@ -52,7 +52,7 @@ int saveenv(void)
 
 	env_new->flags = ++env_flags; /* increase the serial */
 
-	if (gd->env_valid == 1) {
+	if (gd->env_valid == ENV_VALID) {
 		puts("Writing to redundant UBI... ");
 		if (ubi_volume_write(CONFIG_ENV_UBI_VOLUME_REDUND,
 				     (void *)env_new, CONFIG_ENV_SIZE)) {
@@ -74,7 +74,7 @@ int saveenv(void)
 
 	puts("done\n");
 
-	gd->env_valid = gd->env_valid == 2 ? 1 : 2;
+	gd->env_valid = gd->env_valid == ENV_REDUND ? ENV_VALID : ENV_REDUND;
 
 	return 0;
 }
@@ -155,24 +155,24 @@ void env_relocate_spec(void)
 		set_default_env("!bad CRC");
 		return;
 	} else if (crc1_ok && !crc2_ok) {
-		gd->env_valid = 1;
+		gd->env_valid = ENV_VALID;
 	} else if (!crc1_ok && crc2_ok) {
-		gd->env_valid = 2;
+		gd->env_valid = ENV_REDUND;
 	} else {
 		/* both ok - check serial */
 		if (tmp_env1->flags == 255 && tmp_env2->flags == 0)
-			gd->env_valid = 2;
+			gd->env_valid = ENV_REDUND;
 		else if (tmp_env2->flags == 255 && tmp_env1->flags == 0)
-			gd->env_valid = 1;
+			gd->env_valid = ENV_VALID;
 		else if (tmp_env1->flags > tmp_env2->flags)
-			gd->env_valid = 1;
+			gd->env_valid = ENV_VALID;
 		else if (tmp_env2->flags > tmp_env1->flags)
-			gd->env_valid = 2;
+			gd->env_valid = ENV_REDUND;
 		else /* flags are equal - almost impossible */
-			gd->env_valid = 1;
+			gd->env_valid = ENV_VALID;
 	}
 
-	if (gd->env_valid == 1)
+	if (gd->env_valid == ENV_VALID)
 		ep = tmp_env1;
 	else
 		ep = tmp_env2;
include/asm-generic/global_data.h +1 -1
index fb90be9d3e..d8d1b444f2 100644
@@ -49,7 +49,7 @@ typedef struct global_data {
 	unsigned long precon_buf_idx;	/* Pre-Console buffer index */
 #endif
 	unsigned long env_addr;		/* Address  of Environment struct */
-	unsigned long env_valid;	/* Checksum of Environment valid? */
+	unsigned long env_valid;	/* Environment valid? enum env_valid */
 
 	unsigned long ram_top;		/* Top address of RAM used by U-Boot */
 	unsigned long relocaddr;	/* Start address of U-Boot in RAM */
include/environment.h +7 -0
index d6aa1f0fff..b4c8c48717 100644
@@ -197,6 +197,13 @@ extern uint mmc_get_env_part(struct mmc *mmc);
 #include <env_flags.h>
 #include <search.h>
 
+/* Value for environment validity */
+enum env_valid {
+	ENV_INVALID,	/* No valid environment */
+	ENV_VALID,	/* First or only environment is valid */
+	ENV_REDUND,	/* Redundant environment is valid */
+};
+
 extern struct hsearch_data env_htab;
 
 /* Function that returns a character from the environment */
Signature · 1 line
2.13.2.725.g09c95d1e9-goog
#22 lore raw

PATCH 18/30 env: Rename nand env_location to nand_env_location

In reply to Simon Glass

We want to use this name for all environment drivers. Update the nand driver to use a more specific name.

---

 env/nand.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
env/nand.c +3 -3
index a67b5ad1ab..e9188539ca 100644
@@ -153,12 +153,12 @@ static int writeenv(size_t offset, u_char *buf)
 	return 0;
 }
 
-struct env_location {
+struct nand_env_location {
 	const char *name;
 	const nand_erase_options_t erase_opts;
 };
 
-static int erase_and_write_env(const struct env_location *location,
+static int erase_and_write_env(const struct nand_env_location *location,
 		u_char *env_new)
 {
 	int ret = 0;
@@ -186,7 +186,7 @@ int saveenv(void)
 	int	ret = 0;
 	ALLOC_CACHE_ALIGN_BUFFER(env_t, env_new, 1);
 	int	env_idx = 0;
-	static const struct env_location location[] = {
+	static const struct nand_env_location location[] = {
 		{
 			.name = "NAND",
 			.erase_opts = {
Signature · 1 line
2.13.2.725.g09c95d1e9-goog
#23 lore raw

PATCH 19/30 env: Create a location driver for each location

In reply to Simon Glass

Set up a location driver for each supported environment locatoin. At present this just points to the global functions and is not used. A later patch will switch this over to use private functions in each driver.

---

 configs/CHIP_pro_defconfig |  1 -
 env/dataflash.c            |  8 ++++++
 env/eeprom.c               |  8 ++++++
 env/ext4.c                 |  8 ++++++
 env/fat.c                  | 10 +++++++
 env/flash.c                | 39 +++++++++++++++++++++++---
 env/mmc.c                  | 10 +++++++
 env/nand.c                 | 12 +++++++-
 env/nowhere.c              |  6 ++++
 env/nvram.c                | 10 +++++++
 env/onenand.c              |  8 ++++++
 env/remote.c               |  8 ++++++
 env/sata.c                 |  8 ++++++
 env/sf.c                   | 20 +++++++++++++
 env/ubi.c                  |  8 ++++++
 include/environment.h      | 70 ++++++++++++++++++++++++++++++++++++++++++++++
 16 files changed, 228 insertions(+), 6 deletions(-)
configs/CHIP_pro_defconfig +0 -1
index f151d1a67c..002e6f3e7a 100644
@@ -18,7 +18,6 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_CMD_FPGA is not set
 CONFIG_CMD_MTDPARTS=y
 # CONFIG_ENV_IS_IN_MMC is not set
-CONFIG_ENV_IS_NOWHERE=y
 CONFIG_MTDIDS_DEFAULT="nand0=sunxi-nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=sunxi-nand.0:256k(spl),256k(spl-backup),2m(uboot),2m(uboot-backup),-(UBI)"
 # CONFIG_MMC is not set
env/dataflash.c +8 -0
index c140b74c98..9c59d8e63a 100644
@@ -82,3 +82,11 @@ int env_init(void)
 
 	return 0;
 }
+
+U_BOOT_ENV_LOCATION(dataflash) = {
+	.location	= ENVL_DATAFLASH,
+	.get_char	= env_get_char_spec,
+	.load		= env_relocate_spec,
+	.save		= env_save_ptr(saveenv),
+	.init		= env_init,
+};
env/eeprom.c +8 -0
index ac6b30fa8f..78569b286b 100644
@@ -243,3 +243,11 @@ int env_init(void)
 	gd->env_valid = ENV_VALID;
 	return 0;
 }
+
+U_BOOT_ENV_LOCATION(eeprom) = {
+	.location	= ENVL_EEPROM,
+	.get_char	= env_get_char_spec,
+	.load		= env_relocate_spec,
+	.save		= env_save_ptr(saveenv),
+	.init		= env_init,
+};
env/ext4.c +8 -0
index 7bb4ce7cff..c6a84925d9 100644
@@ -127,3 +127,11 @@ void env_relocate_spec(void)
 err_env_relocate:
 	set_default_env(NULL);
 }
+
+U_BOOT_ENV_LOCATION(ext4) = {
+	.location	= ENVL_EXT4,
+	.get_char	= env_get_char_spec,
+	.load		= env_relocate_spec,
+	.save		= env_save_ptr(saveenv),
+	.init		= env_init,
+};
env/fat.c +10 -0
index 5a2131a5a9..f5014dee32 100644
@@ -108,3 +108,13 @@ void env_relocate_spec(void)
 err_env_relocate:
 	set_default_env(NULL);
 }
+
+U_BOOT_ENV_LOCATION(fat) = {
+	.location	= ENVL_FAT,
+	.get_char	= env_get_char_spec,
+	.load		= env_relocate_spec,
+#ifndef CONFIG_SPL_BUILD
+	.save		= env_save_ptr(saveenv),
+#endif
+	.init		= env_init,
+};
env/flash.c +35 -4
index dcf3cd2c62..cf068d11ee 100644
@@ -20,10 +20,12 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if defined(CONFIG_CMD_SAVEENV) && defined(CONFIG_CMD_FLASH)
-#define CMD_SAVEENV
-#elif defined(CONFIG_ENV_ADDR_REDUND)
-#error CONFIG_ENV_ADDR_REDUND must have CONFIG_CMD_SAVEENV & CONFIG_CMD_FLASH
+#ifndef CONFIG_SPL_BUILD
+# if defined(CONFIG_CMD_SAVEENV) && defined(CONFIG_CMD_FLASH)
+#  define CMD_SAVEENV
+# elif defined(CONFIG_ENV_ADDR_REDUND)
+#  error CONFIG_ENV_ADDR_REDUND must have CONFIG_CMD_SAVEENV & CONFIG_CMD_FLASH
+# endif
 #endif
 
 #if defined(CONFIG_ENV_SIZE_REDUND) &&	\
@@ -31,6 +33,18 @@ DECLARE_GLOBAL_DATA_PTR;
 #error CONFIG_ENV_SIZE_REDUND should not be less then CONFIG_ENV_SIZE
 #endif
 
+/* TODO(sjg at chromium.org): Figure out all these special cases */
+#if (!defined(CONFIG_MICROBLAZE) && !defined(CONFIG_ARCH_ZYNQ) && \
+	!defined(CONFIG_TARGET_MCCMON6) && !defined(CONFIG_TARGET_X600) && \
+	!defined(CONFIG_TARGET_EDMINIV2)) || \
+	!defined(CONFIG_SPL_BUILD)
+#define LOADENV
+#endif
+
+#if !defined(CONFIG_TARGET_X600) || !defined(CONFIG_SPL_BUILD)
+#define INITENV
+#endif
+
 char *env_name_spec = "Flash";
 
 #ifdef ENV_IS_EMBEDDED
@@ -58,6 +72,7 @@ static ulong end_addr_new = CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1;
 
 
 #ifdef CONFIG_ENV_ADDR_REDUND
+#ifdef INITENV
 int env_init(void)
 {
 	int crc1_ok = 0, crc2_ok = 0;
@@ -101,6 +116,7 @@ int env_init(void)
 
 	return 0;
 }
+#endif
 
 #ifdef CMD_SAVEENV
 int saveenv(void)
@@ -207,6 +223,7 @@ done:
 
 #else /* ! CONFIG_ENV_ADDR_REDUND */
 
+#ifdef INITENV
 int env_init(void)
 {
 	if (crc32(0, env_ptr->data, ENV_SIZE) == env_ptr->crc) {
@@ -219,6 +236,7 @@ int env_init(void)
 	gd->env_valid	= 0;
 	return 0;
 }
+#endif
 
 #ifdef CMD_SAVEENV
 int saveenv(void)
@@ -336,3 +354,16 @@ void env_relocate_spec(void)
 
 	env_import((char *)flash_addr, 1);
 }
+
+U_BOOT_ENV_LOCATION(flash) = {
+	.location	= ENVL_FLASH,
+#ifdef LOADENV
+	.load		= env_relocate_spec,
+#endif
+#ifdef CMD_SAVEENV
+	.save		= env_save_ptr(saveenv),
+#endif
+#ifdef INITENV
+	.init		= env_init,
+#endif
+};
env/mmc.c +10 -0
index 32764a15c9..4249182d58 100644
@@ -354,3 +354,13 @@ err:
 #endif
 }
 #endif /* CONFIG_ENV_OFFSET_REDUND */
+
+U_BOOT_ENV_LOCATION(mmc) = {
+	.location	= ENVL_MMC,
+	.get_char	= env_get_char_spec,
+	.load		= env_relocate_spec,
+#ifndef CONFIG_SPL_BUILD
+	.save		= env_save_ptr(saveenv),
+#endif
+	.init		= env_init,
+};
env/nand.c +11 -1
index e9188539ca..8a046a13d1 100644
@@ -24,7 +24,8 @@
 #include <search.h>
 #include <errno.h>
 
-#if defined(CONFIG_CMD_SAVEENV) && defined(CONFIG_CMD_NAND)
+#if defined(CONFIG_CMD_SAVEENV) && defined(CONFIG_CMD_NAND) && \
+		!defined(CONFIG_SPL_BUILD)
 #define CMD_SAVEENV
 #elif defined(CONFIG_ENV_OFFSET_REDUND)
 #error CONFIG_ENV_OFFSET_REDUND must have CONFIG_CMD_SAVEENV & CONFIG_CMD_NAND
@@ -414,3 +415,12 @@ void env_relocate_spec(void)
 #endif /* ! ENV_IS_EMBEDDED */
 }
 #endif /* CONFIG_ENV_OFFSET_REDUND */
+
+U_BOOT_ENV_LOCATION(nand) = {
+	.location	= ENVL_NAND,
+	.load		= env_relocate_spec,
+#if defined(CMD_SAVEENV)
+	.save		= env_save_ptr(saveenv),
+#endif
+	.init		= env_init,
+};
env/nowhere.c +6 -0
index bdc1ed5e67..c58d299308 100644
@@ -33,3 +33,9 @@ int env_init(void)
 
 	return 0;
 }
+
+U_BOOT_ENV_LOCATION(nowhere) = {
+	.location	= ENVL_NOWHERE,
+	.load		= env_relocate_spec,
+	.init		= env_init,
+};
env/nvram.c +10 -0
index d046c9393c..4f45eae73e 100644
@@ -112,3 +112,13 @@ int env_init(void)
 
 	return 0;
 }
+
+U_BOOT_ENV_LOCATION(nvram) = {
+	.location	= ENVL_NVRAM,
+#ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
+	.get_char	= env_get_char_spec,
+#endif
+	.load		= env_relocate_spec,
+	.save		= env_save_ptr(saveenv),
+	.init		= env_init,
+};
env/onenand.c +8 -0
index d7ad45a0e5..d4dfc02a46 100644
@@ -114,3 +114,11 @@ int env_init(void)
 
 	return 0;
 }
+
+U_BOOT_ENV_LOCATION(onenand) = {
+	.location	= ENVL_ONENAND,
+	.get_char	= env_get_char_spec,
+	.load		= env_relocate_spec,
+	.save		= env_save_ptr(saveenv),
+	.init		= env_init,
+};
env/remote.c +8 -0
index e003e02fb9..c221d55c4f 100644
@@ -56,3 +56,11 @@ void env_relocate_spec(void)
 	env_import((char *)env_ptr, 1);
 #endif
 }
+
+U_BOOT_ENV_LOCATION(remote) = {
+	.location	= ENVL_REMOTE,
+	.get_char	= env_get_char_spec,
+	.load		= env_relocate_spec,
+	.save		= env_save_ptr(saveenv),
+	.init		= env_init,
+};
env/sata.c +8 -0
index 64589117f2..f7b159a347 100644
@@ -125,3 +125,11 @@ void env_relocate_spec(void)
 
 	env_import(buf, 1);
 }
+
+U_BOOT_ENV_LOCATION(sata) = {
+	.location	= ENVL_ESATA,
+	.get_char	= env_get_char_spec,
+	.load		= env_relocate_spec,
+	.save		= env_save_ptr(saveenv),
+	.init		= env_init,
+};
env/sf.c +20 -0
index 1da3549138..8f81cf5e40 100644
@@ -32,9 +32,15 @@
 # define CONFIG_ENV_SPI_MODE	CONFIG_SF_DEFAULT_MODE
 #endif
 
+#ifndef CONFIG_SPL_BUILD
+#define CMD_SAVEENV
+#endif
+
 #ifdef CONFIG_ENV_OFFSET_REDUND
+#ifdef CMD_SAVEENV
 static ulong env_offset		= CONFIG_ENV_OFFSET;
 static ulong env_new_offset	= CONFIG_ENV_OFFSET_REDUND;
+#endif
 
 #define ACTIVE_FLAG	1
 #define OBSOLETE_FLAG	0
@@ -77,6 +83,7 @@ static int setup_flash_device(void)
 }
 
 #if defined(CONFIG_ENV_OFFSET_REDUND)
+#ifdef CMD_SAVEENV
 int saveenv(void)
 {
 	env_t	env_new;
@@ -155,6 +162,7 @@ int saveenv(void)
 
 	return ret;
 }
+#endif /* CMD_SAVEENV */
 
 void env_relocate_spec(void)
 {
@@ -240,6 +248,7 @@ out:
 	free(tmp_env2);
 }
 #else
+#ifdef CMD_SAVEENV
 int saveenv(void)
 {
 	u32	saved_size, saved_offset, sector;
@@ -299,6 +308,7 @@ int saveenv(void)
 
 	return ret;
 }
+#endif /* CMD_SAVEENV */
 
 void env_relocate_spec(void)
 {
@@ -342,3 +352,13 @@ int env_init(void)
 
 	return 0;
 }
+
+U_BOOT_ENV_LOCATION(sf) = {
+	.location	= ENVL_SPI_FLASH,
+	.get_char	= env_get_char_spec,
+	.load		= env_relocate_spec,
+#ifdef CMD_SAVEENV
+	.save		= env_save_ptr(saveenv),
+#endif
+	.init		= env_init,
+};
env/ubi.c +8 -0
index d37095db0c..16f6d74d2e 100644
@@ -212,3 +212,11 @@ void env_relocate_spec(void)
 	env_import(buf, 1);
 }
 #endif /* CONFIG_SYS_REDUNDAND_ENVIRONMENT */
+
+U_BOOT_ENV_LOCATION(ubi) = {
+	.location	= ENVL_UBI,
+	.get_char	= env_get_char_spec,
+	.load		= env_relocate_spec,
+	.save		= env_save_ptr(saveenv),
+	.init		= env_init,
+};
include/environment.h +70 -0

76 lines not on this page · raw message

Signature · 1 line
2.13.2.725.g09c95d1e9-goog
#24 lore raw

PATCH 20/30 env: Add a new implementation of environment access

In reply to Simon Glass

We plan to move to a environment access via drivers for each location where the environment can be stored. Add an implementation for this. So far it is not used, but will be pressed into service in a future patch.

---

 env/Makefile |   2 +-
 env/env.c    | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 146 insertions(+), 1 deletion(-)
 create mode 100644 env/env.c
env/Makefile +1 -1
index 4c1bdcfdf4..8df5b9d4c9 100644
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-y += common.o
+obj-y += common.o env.o
 
 ifndef CONFIG_SPL_BUILD
 obj-y += attr.o
env/env.c new file +145 -0

145 lines not on this page · raw message

Signature · 1 line
2.13.2.725.g09c95d1e9-goog
#25 lore raw

PATCH 21/30 env: Switch over to use environment location drivers

In reply to Simon Glass

Move over to use a the master implementation of the location drivers, with each method calling out to the appropriate driver.

---

 env/dataflash.c | 16 ++++++++--------
 env/eeprom.c    | 16 ++++++++--------
 env/env.c       | 26 ++++++++++++++++++++++++++
 env/ext4.c      | 13 ++++++-------
 env/fat.c       | 17 ++++++++---------
 env/flash.c     | 34 ++++++++++++++++++----------------
 env/mmc.c       | 27 +++++++++++++--------------
 env/nand.c      | 14 +++++++-------
 env/nowhere.c   |  8 ++++----
 env/nvram.c     | 16 ++++++++--------
 env/onenand.c   | 13 ++++++-------
 env/remote.c    | 13 ++++++-------
 env/sata.c      | 13 ++++++-------
 env/sf.c        | 17 ++++++++---------
 env/ubi.c       | 17 ++++++++---------
 15 files changed, 140 insertions(+), 120 deletions(-)
env/dataflash.c +8 -8
index 9c59d8e63a..6d95d6409b 100644
@@ -18,7 +18,7 @@ env_t *env_ptr;
 
 char *env_name_spec = "dataflash";
 
-uchar env_get_char_spec(int index)
+static unsigned char env_dataflash_get_char(int index)
 {
 	uchar c;
 
@@ -27,7 +27,7 @@ uchar env_get_char_spec(int index)
 	return c;
 }
 
-void env_relocate_spec(void)
+static void env_dataflash_load(void)
 {
 	ulong crc, new = 0;
 	unsigned off;
@@ -54,7 +54,7 @@ void env_relocate_spec(void)
 #error No support for redundant environment on dataflash yet!
 #endif
 
-int saveenv(void)
+static int env_dataflash_save(void)
 {
 	env_t env_new;
 	int ret;
@@ -74,7 +74,7 @@ int saveenv(void)
  * We are still running from ROM, so data use is limited.
  * Use a (moderately small) buffer on the stack
  */
-int env_init(void)
+int env_dataflash_init(void)
 {
 	/* use default */
 	gd->env_addr = (ulong)&default_environment[0];
@@ -85,8 +85,8 @@ int env_init(void)
 
 U_BOOT_ENV_LOCATION(dataflash) = {
 	.location	= ENVL_DATAFLASH,
-	.get_char	= env_get_char_spec,
-	.load		= env_relocate_spec,
-	.save		= env_save_ptr(saveenv),
-	.init		= env_init,
+	.get_char	= env_dataflash_get_char,
+	.load		= env_dataflash_load,
+	.save		= env_save_ptr(env_dataflash_save),
+	.init		= env_dataflash_init,
 };
env/eeprom.c +8 -8
index 78569b286b..eb69f75f7b 100644
@@ -65,7 +65,7 @@ static int eeprom_bus_write(unsigned dev_addr, unsigned offset,
 	return rcode;
 }
 
-uchar env_get_char_spec(int index)
+static uchar env_eeprom_get_char(int index)
 {
 	uchar c;
 	unsigned int off = CONFIG_ENV_OFFSET;
@@ -80,7 +80,7 @@ uchar env_get_char_spec(int index)
 	return c;
 }
 
-void env_relocate_spec(void)
+static void env_eeprom_load(void)
 {
 	char buf_env[CONFIG_ENV_SIZE];
 	unsigned int off = CONFIG_ENV_OFFSET;
@@ -188,7 +188,7 @@ void env_relocate_spec(void)
 	env_import(buf_env, 1);
 }
 
-int saveenv(void)
+static int env_eeprom_save(void)
 {
 	env_t	env_new;
 	int	rc;
@@ -237,7 +237,7 @@ int saveenv(void)
  * We are still running from ROM, so data use is limited.
  * Use a (moderately small) buffer on the stack
  */
-int env_init(void)
+static int env_eeprom_init(void)
 {
 	gd->env_addr = (ulong)&default_environment[0];
 	gd->env_valid = ENV_VALID;
@@ -246,8 +246,8 @@ int env_init(void)
 
 U_BOOT_ENV_LOCATION(eeprom) = {
 	.location	= ENVL_EEPROM,
-	.get_char	= env_get_char_spec,
-	.load		= env_relocate_spec,
-	.save		= env_save_ptr(saveenv),
-	.init		= env_init,
+	.get_char	= env_eeprom_get_char,
+	.load		= env_eeprom_load,
+	.save		= env_save_ptr(env_eeprom_save),
+	.init		= env_eeprom_init,
 };
env/env.c +26 -0
index 9f0a04c33c..608ab7bb39 100644
@@ -143,3 +143,29 @@ int env_init_new(void)
 
 	return 0;
 }
+
+unsigned char env_get_char_spec(int index)
+{
+	int ch;
+
+	ch = env_get_char(index);
+	if (ch < 0)
+		return 0;
+
+	return ch;
+}
+
+void env_relocate_spec(void)
+{
+	env_load();
+}
+
+int saveenv(void)
+{
+	return env_save();
+}
+
+int env_init(void)
+{
+	return env_init_new();
+}
env/ext4.c +6 -7
index c6a84925d9..aa69219021 100644
@@ -37,7 +37,7 @@ env_t *env_ptr;
 
 DECLARE_GLOBAL_DATA_PTR;
 
-int env_init(void)
+static int env_ext4_init(void)
 {
 	/* use default */
 	gd->env_addr = (ulong)&default_environment[0];
@@ -47,7 +47,7 @@ int env_init(void)
 }
 
 #ifdef CONFIG_CMD_SAVEENV
-int saveenv(void)
+static int env_ext4_save(void)
 {
 	env_t	env_new;
 	struct blk_desc *dev_desc = NULL;
@@ -88,7 +88,7 @@ int saveenv(void)
 }
 #endif /* CONFIG_CMD_SAVEENV */
 
-void env_relocate_spec(void)
+static void env_ext4_load(void)
 {
 	ALLOC_CACHE_ALIGN_BUFFER(char, buf, CONFIG_ENV_SIZE);
 	struct blk_desc *dev_desc = NULL;
@@ -130,8 +130,7 @@ err_env_relocate:
 
 U_BOOT_ENV_LOCATION(ext4) = {
 	.location	= ENVL_EXT4,
-	.get_char	= env_get_char_spec,
-	.load		= env_relocate_spec,
-	.save		= env_save_ptr(saveenv),
-	.init		= env_init,
+	.load		= env_ext4_load,
+	.save		= env_save_ptr(env_ext4_save),
+	.init		= env_ext4_init,
 };
env/fat.c +8 -9
index f5014dee32..8f49bc55f3 100644
@@ -25,7 +25,7 @@ env_t *env_ptr;
 
 DECLARE_GLOBAL_DATA_PTR;
 
-int env_init(void)
+static int env_fat_init(void)
 {
 	/* use default */
 	gd->env_addr = (ulong)&default_environment[0];
@@ -34,8 +34,8 @@ int env_init(void)
 	return 0;
 }
 
-#ifdef CONFIG_CMD_SAVEENV
-int saveenv(void)
+#if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_SPL_BUILD)
+static int env_fat_save(void)
 {
 	env_t	env_new;
 	struct blk_desc *dev_desc = NULL;
@@ -72,9 +72,9 @@ int saveenv(void)
 	puts("done\n");
 	return 0;
 }
-#endif /* CONFIG_CMD_SAVEENV */
+#endif /* CONFIG_CMD_SAVEENV && !CONFIG_SPL_BUILD */
 
-void env_relocate_spec(void)
+static void env_fat_load(void)
 {
 	ALLOC_CACHE_ALIGN_BUFFER(char, buf, CONFIG_ENV_SIZE);
 	struct blk_desc *dev_desc = NULL;
@@ -111,10 +111,9 @@ err_env_relocate:
 
 U_BOOT_ENV_LOCATION(fat) = {
 	.location	= ENVL_FAT,
-	.get_char	= env_get_char_spec,
-	.load		= env_relocate_spec,
+	.load		= env_fat_load,
 #ifndef CONFIG_SPL_BUILD
-	.save		= env_save_ptr(saveenv),
+	.save		= env_save_ptr(env_fat_save),
 #endif
-	.init		= env_init,
+	.init		= env_fat_init,
 };
env/flash.c +18 -16
index cf068d11ee..6ec9b61883 100644
@@ -50,30 +50,30 @@ char *env_name_spec = "Flash";
 #ifdef ENV_IS_EMBEDDED
 env_t *env_ptr = &environment;
 
-static env_t *flash_addr = (env_t *)CONFIG_ENV_ADDR;
+static __maybe_unused env_t *flash_addr = (env_t *)CONFIG_ENV_ADDR;
 
 #else /* ! ENV_IS_EMBEDDED */
 
 env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
-static env_t *flash_addr = (env_t *)CONFIG_ENV_ADDR;
+static __maybe_unused env_t *flash_addr = (env_t *)CONFIG_ENV_ADDR;
 #endif /* ENV_IS_EMBEDDED */
 
-#if defined(CMD_SAVEENV) || defined(CONFIG_ENV_ADDR_REDUND)
 /* CONFIG_ENV_ADDR is supposed to be on sector boundary */
-static ulong end_addr = CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1;
-#endif
+static ulong __maybe_unused end_addr =
+		CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1;
 
 #ifdef CONFIG_ENV_ADDR_REDUND
-static env_t *flash_addr_new = (env_t *)CONFIG_ENV_ADDR_REDUND;
+
+static env_t __maybe_unused *flash_addr_new = (env_t *)CONFIG_ENV_ADDR_REDUND;
 
 /* CONFIG_ENV_ADDR_REDUND is supposed to be on sector boundary */
-static ulong end_addr_new = CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1;
+static ulong __maybe_unused end_addr_new =
+		CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1;
 #endif /* CONFIG_ENV_ADDR_REDUND */
 
-
 #ifdef CONFIG_ENV_ADDR_REDUND
 #ifdef INITENV
-int env_init(void)
+static int env_flash_init(void)
 {
 	int crc1_ok = 0, crc2_ok = 0;
 
@@ -119,7 +119,7 @@ int env_init(void)
 #endif
 
 #ifdef CMD_SAVEENV
-int saveenv(void)
+static int env_flash_save(void)
 {
 	env_t	env_new;
 	char	*saved_data = NULL;
@@ -224,7 +224,7 @@ done:
 #else /* ! CONFIG_ENV_ADDR_REDUND */
 
 #ifdef INITENV
-int env_init(void)
+static int env_flash_init(void)
 {
 	if (crc32(0, env_ptr->data, ENV_SIZE) == env_ptr->crc) {
 		gd->env_addr	= (ulong)&(env_ptr->data);
@@ -239,7 +239,7 @@ int env_init(void)
 #endif
 
 #ifdef CMD_SAVEENV
-int saveenv(void)
+static int env_flash_save(void)
 {
 	env_t	env_new;
 	int	rc = 1;
@@ -309,7 +309,8 @@ done:
 
 #endif /* CONFIG_ENV_ADDR_REDUND */
 
-void env_relocate_spec(void)
+#ifdef LOADENV
+static void env_flash_load(void)
 {
 #ifdef CONFIG_ENV_ADDR_REDUND
 	if (gd->env_addr != (ulong)&(flash_addr->data)) {
@@ -354,16 +355,17 @@ void env_relocate_spec(void)
 
 	env_import((char *)flash_addr, 1);
 }
+#endif /* LOADENV */
 
 U_BOOT_ENV_LOCATION(flash) = {
 	.location	= ENVL_FLASH,
 #ifdef LOADENV
-	.load		= env_relocate_spec,
+	.load		= env_flash_load,
 #endif
 #ifdef CMD_SAVEENV
-	.save		= env_save_ptr(saveenv),
+	.save		= env_save_ptr(env_flash_save),
 #endif
 #ifdef INITENV
-	.init		= env_init,
+	.init		= env_flash_init,
 #endif
 };
env/mmc.c +13 -14
index 4249182d58..2bdeeb7dc6 100644
@@ -82,7 +82,7 @@ __weak int mmc_get_env_dev(void)
 	return CONFIG_SYS_MMC_ENV_DEV;
 }
 
-int env_init(void)
+static int env_mmc_init(void)
 {
 	/* use default */
 	gd->env_addr	= (ulong)&default_environment[0];
@@ -145,7 +145,11 @@ static void fini_mmc_for_env(struct mmc *mmc)
 #endif
 }
 
-#ifdef CONFIG_CMD_SAVEENV
+#ifdef CONFIG_ENV_OFFSET_REDUND
+static unsigned char env_flags;
+#endif
+
+#if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_SPL_BUILD)
 static inline int write_env(struct mmc *mmc, unsigned long size,
 			    unsigned long offset, const void *buffer)
 {
@@ -160,11 +164,7 @@ static inline int write_env(struct mmc *mmc, unsigned long size,
 	return (n == blk_cnt) ? 0 : -1;
 }
 
-#ifdef CONFIG_ENV_OFFSET_REDUND
-static unsigned char env_flags;
-#endif
-
-int saveenv(void)
+static int env_mmc_save(void)
 {
 	ALLOC_CACHE_ALIGN_BUFFER(env_t, env_new, 1);
 	int dev = mmc_get_env_dev();
@@ -213,7 +213,7 @@ fini:
 	fini_mmc_for_env(mmc);
 	return ret;
 }
-#endif /* CONFIG_CMD_SAVEENV */
+#endif /* CONFIG_CMD_SAVEENV && !CONFIG_SPL_BUILD */
 
 static inline int read_env(struct mmc *mmc, unsigned long size,
 			   unsigned long offset, const void *buffer)
@@ -230,7 +230,7 @@ static inline int read_env(struct mmc *mmc, unsigned long size,
 }
 
 #ifdef CONFIG_ENV_OFFSET_REDUND
-void env_relocate_spec(void)
+static void env_mmc_load(void)
 {
 #if !defined(ENV_IS_EMBEDDED)
 	struct mmc *mmc;
@@ -314,7 +314,7 @@ err:
 #endif
 }
 #else /* ! CONFIG_ENV_OFFSET_REDUND */
-void env_relocate_spec(void)
+static void env_mmc_load(void)
 {
 #if !defined(ENV_IS_EMBEDDED)
 	ALLOC_CACHE_ALIGN_BUFFER(char, buf, CONFIG_ENV_SIZE);
@@ -357,10 +357,9 @@ err:
 
 U_BOOT_ENV_LOCATION(mmc) = {
 	.location	= ENVL_MMC,
-	.get_char	= env_get_char_spec,
-	.load		= env_relocate_spec,
+	.load		= env_mmc_load,
 #ifndef CONFIG_SPL_BUILD
-	.save		= env_save_ptr(saveenv),
+	.save		= env_save_ptr(env_mmc_save),
 #endif
-	.init		= env_init,
+	.init		= env_mmc_init,
 };
env/nand.c +7 -7
index 8a046a13d1..6382669913 100644
@@ -64,7 +64,7 @@ DECLARE_GLOBAL_DATA_PTR;
  * This way the SPL loads not only the U-Boot image from NAND but
  * also the environment.
  */
-int env_init(void)
+static int env_nand_init(void)
 {
 #if defined(ENV_IS_EMBEDDED) || defined(CONFIG_NAND_ENV_DST)
 	int crc1_ok = 0, crc2_ok = 0;
@@ -182,7 +182,7 @@ static int erase_and_write_env(const struct nand_env_location *location,
 static unsigned char env_flags;
 #endif
 
-int saveenv(void)
+static int env_nand_save(void)
 {
 	int	ret = 0;
 	ALLOC_CACHE_ALIGN_BUFFER(env_t, env_new, 1);
@@ -313,7 +313,7 @@ int get_nand_env_oob(struct mtd_info *mtd, unsigned long *result)
 #endif
 
 #ifdef CONFIG_ENV_OFFSET_REDUND
-void env_relocate_spec(void)
+static void env_nand_load(void)
 {
 #if !defined(ENV_IS_EMBEDDED)
 	int read1_fail = 0, read2_fail = 0;
@@ -385,7 +385,7 @@ done:
  * device i.e., nand_dev_desc + 0. This is also the behaviour using
  * the new NAND code.
  */
-void env_relocate_spec(void)
+static void env_nand_load(void)
 {
 #if !defined(ENV_IS_EMBEDDED)
 	int ret;
@@ -418,9 +418,9 @@ void env_relocate_spec(void)
 
 U_BOOT_ENV_LOCATION(nand) = {
 	.location	= ENVL_NAND,
-	.load		= env_relocate_spec,
+	.load		= env_nand_load,
 #if defined(CMD_SAVEENV)
-	.save		= env_save_ptr(saveenv),
+	.save		= env_save_ptr(env_nand_save),
 #endif
-	.init		= env_init,
+	.init		= env_nand_init,
 };
env/nowhere.c +4 -4
index c58d299308..6a67ab09ff 100644
@@ -17,7 +17,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 env_t *env_ptr;
 
-void env_relocate_spec(void)
+static void env_nowhere_load(void)
 {
 }
 
@@ -26,7 +26,7 @@ void env_relocate_spec(void)
  *
  * We are still running from ROM, so data use is limited
  */
-int env_init(void)
+static int env_nowhere_init(void)
 {
 	gd->env_addr	= (ulong)&default_environment[0];
 	gd->env_valid	= 0;
@@ -36,6 +36,6 @@ int env_init(void)
 
 U_BOOT_ENV_LOCATION(nowhere) = {
 	.location	= ENVL_NOWHERE,
-	.load		= env_relocate_spec,
-	.init		= env_init,
+	.load		= env_nowhere_load,
+	.init		= env_nowhere_init,
 };
env/nvram.c +8 -8
index 4f45eae73e..09091b8eb7 100644
@@ -44,7 +44,7 @@ env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
 char *env_name_spec = "NVRAM";
 
 #ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
-uchar env_get_char_spec(int index)
+static uchar env_nvram_get_char(int index)
 {
 	uchar c;
 
@@ -54,7 +54,7 @@ uchar env_get_char_spec(int index)
 }
 #endif
 
-void env_relocate_spec(void)
+static void env_nvram_load(void)
 {
 	char buf[CONFIG_ENV_SIZE];
 
@@ -66,7 +66,7 @@ void env_relocate_spec(void)
 	env_import(buf, 1);
 }
 
-int saveenv(void)
+static int env_nvram_save(void)
 {
 	env_t	env_new;
 	int	rcode = 0;
@@ -89,7 +89,7 @@ int saveenv(void)
  *
  * We are still running from ROM, so data use is limited
  */
-int env_init(void)
+static int env_nvram_init(void)
 {
 #if defined(CONFIG_SYS_NVRAM_ACCESS_ROUTINE)
 	ulong crc;
@@ -116,9 +116,9 @@ int env_init(void)
 U_BOOT_ENV_LOCATION(nvram) = {
 	.location	= ENVL_NVRAM,
 #ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
-	.get_char	= env_get_char_spec,
+	.get_char	= env_nvram_get_char,
 #endif
-	.load		= env_relocate_spec,
-	.save		= env_save_ptr(saveenv),
-	.init		= env_init,
+	.load		= env_nvram_load,
+	.save		= env_save_ptr(env_nvram_save),
+	.init		= env_nvram_init,
 };
env/onenand.c +6 -7
index d4dfc02a46..f72aa4b036 100644
@@ -28,7 +28,7 @@ char *env_name_spec = "OneNAND";
 
 DECLARE_GLOBAL_DATA_PTR;
 
-void env_relocate_spec(void)
+static void env_onenand_load(void)
 {
 	struct mtd_info *mtd = &onenand_mtd;
 #ifdef CONFIG_ENV_ADDR_FLEX
@@ -63,7 +63,7 @@ void env_relocate_spec(void)
 		gd->env_valid = ENV_VALID;
 }
 
-int saveenv(void)
+static int env_onenand_save(void)
 {
 	env_t	env_new;
 	int ret;
@@ -106,7 +106,7 @@ int saveenv(void)
 	return 0;
 }
 
-int env_init(void)
+static int env_onenand_init(void)
 {
 	/* use default */
 	gd->env_addr = (ulong)&default_environment[0];
@@ -117,8 +117,7 @@ int env_init(void)
 
 U_BOOT_ENV_LOCATION(onenand) = {
 	.location	= ENVL_ONENAND,
-	.get_char	= env_get_char_spec,
-	.load		= env_relocate_spec,
-	.save		= env_save_ptr(saveenv),
-	.init		= env_init,
+	.load		= env_onenand_load,
+	.save		= env_save_ptr(env_onenand_save),
+	.init		= env_onenand_init,
 };
env/remote.c +6 -7
index c221d55c4f..0324cba099 100644
@@ -25,7 +25,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #define CONFIG_ENV_OFFSET 0
 #endif
 
-int env_init(void)
+static int env_remote_init(void)
 {
 	if (crc32(0, env_ptr->data, ENV_SIZE) == env_ptr->crc) {
 		gd->env_addr = (ulong)&(env_ptr->data);
@@ -39,7 +39,7 @@ int env_init(void)
 }
 
 #ifdef CONFIG_CMD_SAVEENV
-int saveenv(void)
+static int env_remote_save(void)
 {
 #ifdef CONFIG_SRIO_PCIE_BOOT_SLAVE
 	printf("Can not support the 'saveenv' when boot from SRIO or PCIE!\n");
@@ -50,7 +50,7 @@ int saveenv(void)
 }
 #endif /* CONFIG_CMD_SAVEENV */
 
-void env_relocate_spec(void)
+static void env_remote_load(void)
 {
 #ifndef ENV_IS_EMBEDDED
 	env_import((char *)env_ptr, 1);
@@ -59,8 +59,7 @@ void env_relocate_spec(void)
 
 U_BOOT_ENV_LOCATION(remote) = {
 	.location	= ENVL_REMOTE,
-	.get_char	= env_get_char_spec,
-	.load		= env_relocate_spec,
-	.save		= env_save_ptr(saveenv),
-	.init		= env_init,
+	.load		= env_remote_load,
+	.save		= env_save_ptr(env_remote_save),
+	.init		= env_remote_init,
 };
env/sata.c +6 -7
index f7b159a347..6f9099873d 100644
@@ -33,7 +33,7 @@ __weak int sata_get_env_dev(void)
 	return CONFIG_SYS_SATA_ENV_DEV;
 }
 
-int env_init(void)
+static int env_sata_init(void)
 {
 	/* use default */
 	gd->env_addr = (ulong)&default_environment[0];
@@ -56,7 +56,7 @@ static inline int write_env(struct blk_desc *sata, unsigned long size,
 	return (n == blk_cnt) ? 0 : -1;
 }
 
-int saveenv(void)
+static int env_sata_save(void)
 {
 	ALLOC_CACHE_ALIGN_BUFFER(env_t, env_new, 1);
 	struct blk_desc *sata = NULL;
@@ -102,7 +102,7 @@ static inline int read_env(struct blk_desc *sata, unsigned long size,
 	return (n == blk_cnt) ? 0 : -1;
 }
 
-void env_relocate_spec(void)
+static void env_sata_load(void)
 {
 	ALLOC_CACHE_ALIGN_BUFFER(char, buf, CONFIG_ENV_SIZE);
 	struct blk_desc *sata = NULL;
@@ -128,8 +128,7 @@ void env_relocate_spec(void)
 
 U_BOOT_ENV_LOCATION(sata) = {
 	.location	= ENVL_ESATA,
-	.get_char	= env_get_char_spec,
-	.load		= env_relocate_spec,
-	.save		= env_save_ptr(saveenv),
-	.init		= env_init,
+	.load		= env_sata_load,
+	.save		= env_save_ptr(env_sata_save),
+	.init		= env_sata_init,
 };
env/sf.c +8 -9
index 8f81cf5e40..82babaab67 100644
@@ -84,7 +84,7 @@ static int setup_flash_device(void)
 
 #if defined(CONFIG_ENV_OFFSET_REDUND)
 #ifdef CMD_SAVEENV
-int saveenv(void)
+static int env_sf_save(void)
 {
 	env_t	env_new;
 	char	*saved_buffer = NULL, flag = OBSOLETE_FLAG;
@@ -164,7 +164,7 @@ int saveenv(void)
 }
 #endif /* CMD_SAVEENV */
 
-void env_relocate_spec(void)
+static void env_sf_load(void)
 {
 	int ret;
 	int crc1_ok = 0, crc2_ok = 0;
@@ -249,7 +249,7 @@ out:
 }
 #else
 #ifdef CMD_SAVEENV
-int saveenv(void)
+static int env_sf_save(void)
 {
 	u32	saved_size, saved_offset, sector;
 	char	*saved_buffer = NULL;
@@ -310,7 +310,7 @@ int saveenv(void)
 }
 #endif /* CMD_SAVEENV */
 
-void env_relocate_spec(void)
+static void env_sf_load(void)
 {
 	int ret;
 	char *buf = NULL;
@@ -344,7 +344,7 @@ out:
 }
 #endif
 
-int env_init(void)
+static int env_sf_init(void)
 {
 	/* SPI flash isn't usable before relocation */
 	gd->env_addr = (ulong)&default_environment[0];
@@ -355,10 +355,9 @@ int env_init(void)
 
 U_BOOT_ENV_LOCATION(sf) = {
 	.location	= ENVL_SPI_FLASH,
-	.get_char	= env_get_char_spec,
-	.load		= env_relocate_spec,
+	.load		= env_sf_load,
 #ifdef CMD_SAVEENV
-	.save		= env_save_ptr(saveenv),
+	.save		= env_save_ptr(env_sf_save),
 #endif
-	.init		= env_init,
+	.init		= env_sf_init,
 };
env/ubi.c +8 -9
index 16f6d74d2e..82a9c3bd03 100644
@@ -22,7 +22,7 @@ env_t *env_ptr;
 
 DECLARE_GLOBAL_DATA_PTR;
 
-int env_init(void)
+static int env_ubi_init(void)
 {
 	/* use default */
 	gd->env_addr = (ulong)&default_environment[0];
@@ -35,7 +35,7 @@ int env_init(void)
 #ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
 static unsigned char env_flags;
 
-int saveenv(void)
+static int env_ubi_save(void)
 {
 	ALLOC_CACHE_ALIGN_BUFFER(env_t, env_new, 1);
 	int ret;
@@ -79,7 +79,7 @@ int saveenv(void)
 	return 0;
 }
 #else /* ! CONFIG_SYS_REDUNDAND_ENVIRONMENT */
-int saveenv(void)
+static int env_ubi_save(void)
 {
 	ALLOC_CACHE_ALIGN_BUFFER(env_t, env_new, 1);
 	int ret;
@@ -108,7 +108,7 @@ int saveenv(void)
 #endif /* CONFIG_CMD_SAVEENV */
 
 #ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
-void env_relocate_spec(void)
+static void env_ubi_load(void)
 {
 	ALLOC_CACHE_ALIGN_BUFFER(char, env1_buf, CONFIG_ENV_SIZE);
 	ALLOC_CACHE_ALIGN_BUFFER(char, env2_buf, CONFIG_ENV_SIZE);
@@ -181,7 +181,7 @@ void env_relocate_spec(void)
 	env_import((char *)ep, 0);
 }
 #else /* ! CONFIG_SYS_REDUNDAND_ENVIRONMENT */
-void env_relocate_spec(void)
+static void env_ubi_load(void)
 {
 	ALLOC_CACHE_ALIGN_BUFFER(char, buf, CONFIG_ENV_SIZE);
 
@@ -215,8 +215,7 @@ void env_relocate_spec(void)
 
 U_BOOT_ENV_LOCATION(ubi) = {
 	.location	= ENVL_UBI,
-	.get_char	= env_get_char_spec,
-	.load		= env_relocate_spec,
-	.save		= env_save_ptr(saveenv),
-	.init		= env_init,
+	.load		= env_ubi_load,
+	.save		= env_save_ptr(env_ubi_save),
+	.init		= env_ubi_init,
 };
Signature · 1 line
2.13.2.725.g09c95d1e9-goog
#26 lore raw

PATCH 22/30 env: Drop common init() functions

In reply to Simon Glass

Most of the init() implementations just use the default environment. Adjust env_init_new() to do this automatically, and drop the redundant code.

---

 env/dataflash.c       | 16 ----------------
 env/eeprom.c          | 14 --------------
 env/env.c             | 14 +++++++++-----
 env/ext4.c            | 10 ----------
 env/fat.c             | 10 ----------
 env/mmc.c             | 10 ----------
 env/nowhere.c         | 19 -------------------
 env/onenand.c         | 10 ----------
 env/remote.c          |  4 +---
 env/sata.c            | 10 ----------
 env/sf.c              | 10 ----------
 env/ubi.c             | 10 ----------
 include/environment.h |  3 ++-
 13 files changed, 12 insertions(+), 128 deletions(-)
env/dataflash.c +0 -16
index 6d95d6409b..8ab482b3b4 100644
@@ -68,25 +68,9 @@ static int env_dataflash_save(void)
 				CONFIG_ENV_SIZE);
 }
 
-/*
- * Initialize environment use
- *
- * We are still running from ROM, so data use is limited.
- * Use a (moderately small) buffer on the stack
- */
-int env_dataflash_init(void)
-{
-	/* use default */
-	gd->env_addr = (ulong)&default_environment[0];
-	gd->env_valid = ENV_VALID;
-
-	return 0;
-}
-
 U_BOOT_ENV_LOCATION(dataflash) = {
 	.location	= ENVL_DATAFLASH,
 	.get_char	= env_dataflash_get_char,
 	.load		= env_dataflash_load,
 	.save		= env_save_ptr(env_dataflash_save),
-	.init		= env_dataflash_init,
 };
env/eeprom.c +0 -14
index eb69f75f7b..3cc412620a 100644
@@ -231,23 +231,9 @@ static int env_eeprom_save(void)
 	return rc;
 }
 
-/*
- * Initialize Environment use
- *
- * We are still running from ROM, so data use is limited.
- * Use a (moderately small) buffer on the stack
- */
-static int env_eeprom_init(void)
-{
-	gd->env_addr = (ulong)&default_environment[0];
-	gd->env_valid = ENV_VALID;
-	return 0;
-}
-
 U_BOOT_ENV_LOCATION(eeprom) = {
 	.location	= ENVL_EEPROM,
 	.get_char	= env_eeprom_get_char,
 	.load		= env_eeprom_load,
 	.save		= env_save_ptr(env_eeprom_save),
-	.init		= env_eeprom_init,
 };
env/env.c +9 -5
index 608ab7bb39..73547002d1 100644
@@ -128,14 +128,18 @@ int env_save(void)
 int env_init_new(void)
 {
 	struct env_driver *drv = env_driver_lookup_default();
-	int ret;
+	int ret = -ENOSYS;
 
 	if (!drv)
 		return -ENODEV;
-	if (!drv->init)
-		return -ENOSYS;
-	ret = drv->init();
-	if (ret) {
+	if (drv->init)
+		ret = drv->init();
+	if (ret == -ENOENT) {
+		gd->env_addr = (ulong)&default_environment[0];
+		gd->env_valid = ENV_VALID;
+
+		return 0;
+	} else if (ret) {
 		debug("%s: Environment failed to init (err=%d)\n", __func__,
 		      ret);
 		return ret;
env/ext4.c +0 -10
index aa69219021..25a5cbecdd 100644
@@ -37,15 +37,6 @@ env_t *env_ptr;
 
 DECLARE_GLOBAL_DATA_PTR;
 
-static int env_ext4_init(void)
-{
-	/* use default */
-	gd->env_addr = (ulong)&default_environment[0];
-	gd->env_valid = ENV_VALID;
-
-	return 0;
-}
-
 #ifdef CONFIG_CMD_SAVEENV
 static int env_ext4_save(void)
 {
@@ -132,5 +123,4 @@ U_BOOT_ENV_LOCATION(ext4) = {
 	.location	= ENVL_EXT4,
 	.load		= env_ext4_load,
 	.save		= env_save_ptr(env_ext4_save),
-	.init		= env_ext4_init,
 };
env/fat.c +0 -10
index 8f49bc55f3..146ecbab89 100644
@@ -25,15 +25,6 @@ env_t *env_ptr;
 
 DECLARE_GLOBAL_DATA_PTR;
 
-static int env_fat_init(void)
-{
-	/* use default */
-	gd->env_addr = (ulong)&default_environment[0];
-	gd->env_valid = ENV_VALID;
-
-	return 0;
-}
-
 #if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_SPL_BUILD)
 static int env_fat_save(void)
 {
@@ -115,5 +106,4 @@ U_BOOT_ENV_LOCATION(fat) = {
 #ifndef CONFIG_SPL_BUILD
 	.save		= env_save_ptr(env_fat_save),
 #endif
-	.init		= env_fat_init,
 };
env/mmc.c +0 -10
index 2bdeeb7dc6..2dd0382bfb 100644
@@ -82,15 +82,6 @@ __weak int mmc_get_env_dev(void)
 	return CONFIG_SYS_MMC_ENV_DEV;
 }
 
-static int env_mmc_init(void)
-{
-	/* use default */
-	gd->env_addr	= (ulong)&default_environment[0];
-	gd->env_valid	= ENV_VALID;
-
-	return 0;
-}
-
 #ifdef CONFIG_SYS_MMC_ENV_PART
 __weak uint mmc_get_env_part(struct mmc *mmc)
 {
@@ -361,5 +352,4 @@ U_BOOT_ENV_LOCATION(mmc) = {
 #ifndef CONFIG_SPL_BUILD
 	.save		= env_save_ptr(env_mmc_save),
 #endif
-	.init		= env_mmc_init,
 };
env/nowhere.c +0 -19
index 6a67ab09ff..1d2ae85a57 100644
@@ -17,25 +17,6 @@ DECLARE_GLOBAL_DATA_PTR;
 
 env_t *env_ptr;
 
-static void env_nowhere_load(void)
-{
-}
-
-/*
- * Initialize Environment use
- *
- * We are still running from ROM, so data use is limited
- */
-static int env_nowhere_init(void)
-{
-	gd->env_addr	= (ulong)&default_environment[0];
-	gd->env_valid	= 0;
-
-	return 0;
-}
-
 U_BOOT_ENV_LOCATION(nowhere) = {
 	.location	= ENVL_NOWHERE,
-	.load		= env_nowhere_load,
-	.init		= env_nowhere_init,
 };
env/onenand.c +0 -10
index f72aa4b036..cb1ab53216 100644
@@ -106,18 +106,8 @@ static int env_onenand_save(void)
 	return 0;
 }
 
-static int env_onenand_init(void)
-{
-	/* use default */
-	gd->env_addr = (ulong)&default_environment[0];
-	gd->env_valid = ENV_VALID;
-
-	return 0;
-}
-
 U_BOOT_ENV_LOCATION(onenand) = {
 	.location	= ENVL_ONENAND,
 	.load		= env_onenand_load,
 	.save		= env_save_ptr(env_onenand_save),
-	.init		= env_onenand_init,
 };
env/remote.c +1 -3
index 0324cba099..c5dce5b966 100644
@@ -33,9 +33,7 @@ static int env_remote_init(void)
 		return 0;
 	}
 
-	gd->env_addr = (ulong)default_environment;
-	gd->env_valid = 0;
-	return 0;
+	return -ENOENT;
 }
 
 #ifdef CONFIG_CMD_SAVEENV
env/sata.c +0 -10
index 6f9099873d..a5ff54c287 100644
@@ -33,15 +33,6 @@ __weak int sata_get_env_dev(void)
 	return CONFIG_SYS_SATA_ENV_DEV;
 }
 
-static int env_sata_init(void)
-{
-	/* use default */
-	gd->env_addr = (ulong)&default_environment[0];
-	gd->env_valid = ENV_VALID;
-
-	return 0;
-}
-
 #ifdef CONFIG_CMD_SAVEENV
 static inline int write_env(struct blk_desc *sata, unsigned long size,
 			    unsigned long offset, void *buffer)
@@ -130,5 +121,4 @@ U_BOOT_ENV_LOCATION(sata) = {
 	.location	= ENVL_ESATA,
 	.load		= env_sata_load,
 	.save		= env_save_ptr(env_sata_save),
-	.init		= env_sata_init,
 };
env/sf.c +0 -10
index 82babaab67..a07641b7d4 100644
@@ -344,20 +344,10 @@ out:
 }
 #endif
 
-static int env_sf_init(void)
-{
-	/* SPI flash isn't usable before relocation */
-	gd->env_addr = (ulong)&default_environment[0];
-	gd->env_valid = ENV_VALID;
-
-	return 0;
-}
-
 U_BOOT_ENV_LOCATION(sf) = {
 	.location	= ENVL_SPI_FLASH,
 	.load		= env_sf_load,
 #ifdef CMD_SAVEENV
 	.save		= env_save_ptr(env_sf_save),
 #endif
-	.init		= env_sf_init,
 };
env/ubi.c +0 -10
index 82a9c3bd03..773fcf0ed2 100644
@@ -22,15 +22,6 @@ env_t *env_ptr;
 
 DECLARE_GLOBAL_DATA_PTR;
 
-static int env_ubi_init(void)
-{
-	/* use default */
-	gd->env_addr = (ulong)&default_environment[0];
-	gd->env_valid = ENV_VALID;
-
-	return 0;
-}
-
 #ifdef CONFIG_CMD_SAVEENV
 #ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
 static unsigned char env_flags;
@@ -217,5 +208,4 @@ U_BOOT_ENV_LOCATION(ubi) = {
 	.location	= ENVL_UBI,
 	.load		= env_ubi_load,
 	.save		= env_save_ptr(env_ubi_save),
-	.init		= env_ubi_init,
 };
include/environment.h +2 -1
index c3a75c8a66..87727f2b29 100644
@@ -259,7 +259,8 @@ struct env_driver {
 	 *
 	 * This method is optional.
 	 *
-	 * @return 0 if OK, -ve on error
+	 * @return 0 if OK, -ENOENT if no initial environment could be found,
+	 * other -ve on error
 	 */
 	int (*init)(void);
 };
Signature · 1 line
2.13.2.725.g09c95d1e9-goog
#27 lore raw

PATCH 23/30 env: Drop the env_name_spec global

In reply to Simon Glass

Add a name to the driver and use that instead of the global variable declared by each driver.

---

 cmd/nvedit.c          |  4 +++-
 env/dataflash.c       |  3 +--
 env/eeprom.c          |  3 +--
 env/env.c             |  2 +-
 env/ext4.c            |  3 +--
 env/fat.c             |  3 +--
 env/flash.c           |  3 +--
 env/mmc.c             |  3 +--
 env/nand.c            |  3 +--
 env/nowhere.c         |  1 +
 env/nvram.c           |  3 +--
 env/onenand.c         |  3 +--
 env/remote.c          |  3 +--
 env/sata.c            |  3 +--
 env/sf.c              |  3 +--
 env/ubi.c             |  2 --
 include/environment.h | 19 +++++++++++++++----
 17 files changed, 32 insertions(+), 32 deletions(-)
cmd/nvedit.c +3 -1
index cd17db6409..75df997592 100644
@@ -706,7 +706,9 @@ ulong getenv_ulong(const char *name, int base, ulong default_val)
 static int do_env_save(cmd_tbl_t *cmdtp, int flag, int argc,
 		       char * const argv[])
 {
-	printf("Saving Environment to %s...\n", env_name_spec);
+	struct env_driver *env = env_driver_lookup_default();
+
+	printf("Saving Environment to %s...\n", env->name);
 
 	return saveenv() ? 1 : 0;
 }
env/dataflash.c +1 -2
index 8ab482b3b4..9421a6a5b2 100644
@@ -16,8 +16,6 @@ DECLARE_GLOBAL_DATA_PTR;
 
 env_t *env_ptr;
 
-char *env_name_spec = "dataflash";
-
 static unsigned char env_dataflash_get_char(int index)
 {
 	uchar c;
@@ -70,6 +68,7 @@ static int env_dataflash_save(void)
 
 U_BOOT_ENV_LOCATION(dataflash) = {
 	.location	= ENVL_DATAFLASH,
+	ENV_NAME("dataflash")
 	.get_char	= env_dataflash_get_char,
 	.load		= env_dataflash_load,
 	.save		= env_save_ptr(env_dataflash_save),
env/eeprom.c +1 -2
index 3cc412620a..2c795b9236 100644
@@ -23,8 +23,6 @@ DECLARE_GLOBAL_DATA_PTR;
 
 env_t *env_ptr;
 
-char *env_name_spec = "EEPROM";
-
 static int eeprom_bus_read(unsigned dev_addr, unsigned offset,
 			   uchar *buffer, unsigned cnt)
 {
@@ -233,6 +231,7 @@ static int env_eeprom_save(void)
 
 U_BOOT_ENV_LOCATION(eeprom) = {
 	.location	= ENVL_EEPROM,
+	ENV_NAME("EEPROM")
 	.get_char	= env_eeprom_get_char,
 	.load		= env_eeprom_load,
 	.save		= env_save_ptr(env_eeprom_save),
env/env.c +1 -1
index 73547002d1..a649457270 100644
@@ -54,7 +54,7 @@ static enum env_location env_get_default_location(void)
 		return ENVL_UNKNOWN;
 }
 
-static struct env_driver *env_driver_lookup_default(void)
+struct env_driver *env_driver_lookup_default(void)
 {
 	enum env_location loc = env_get_default_location();
 	struct env_driver *drv;
env/ext4.c +1 -2
index 25a5cbecdd..5acdf0eda0 100644
@@ -31,8 +31,6 @@
 #include <ext4fs.h>
 #include <mmc.h>
 
-char *env_name_spec = "EXT4";
-
 env_t *env_ptr;
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -121,6 +119,7 @@ err_env_relocate:
 
 U_BOOT_ENV_LOCATION(ext4) = {
 	.location	= ENVL_EXT4,
+	ENV_NAME("EXT4")
 	.load		= env_ext4_load,
 	.save		= env_save_ptr(env_ext4_save),
 };
env/fat.c +1 -2
index 146ecbab89..cf33549fda 100644
@@ -19,8 +19,6 @@
 #include <fat.h>
 #include <mmc.h>
 
-char *env_name_spec = "FAT";
-
 env_t *env_ptr;
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -102,6 +100,7 @@ err_env_relocate:
 
 U_BOOT_ENV_LOCATION(fat) = {
 	.location	= ENVL_FAT,
+	ENV_NAME("FAT")
 	.load		= env_fat_load,
 #ifndef CONFIG_SPL_BUILD
 	.save		= env_save_ptr(env_fat_save),
env/flash.c +1 -2
index 6ec9b61883..2d72c51622 100644
@@ -45,8 +45,6 @@ DECLARE_GLOBAL_DATA_PTR;
 #define INITENV
 #endif
 
-char *env_name_spec = "Flash";
-
 #ifdef ENV_IS_EMBEDDED
 env_t *env_ptr = &environment;
 
@@ -359,6 +357,7 @@ static void env_flash_load(void)
 
 U_BOOT_ENV_LOCATION(flash) = {
 	.location	= ENVL_FLASH,
+	ENV_NAME("Flash")
 #ifdef LOADENV
 	.load		= env_flash_load,
 #endif
env/mmc.c +1 -2
index 2dd0382bfb..ae10b5b1f8 100644
@@ -23,8 +23,6 @@
 #error CONFIG_ENV_SIZE_REDUND should be the same as CONFIG_ENV_SIZE
 #endif
 
-char *env_name_spec = "MMC";
-
 #ifdef ENV_IS_EMBEDDED
 env_t *env_ptr = &environment;
 #else /* ! ENV_IS_EMBEDDED */
@@ -348,6 +346,7 @@ err:
 
 U_BOOT_ENV_LOCATION(mmc) = {
 	.location	= ENVL_MMC,
+	ENV_NAME("MMC")
 	.load		= env_mmc_load,
 #ifndef CONFIG_SPL_BUILD
 	.save		= env_save_ptr(env_mmc_save),
env/nand.c +1 -2
index 6382669913..98b1dfc618 100644
@@ -40,8 +40,6 @@
 #define CONFIG_ENV_RANGE	CONFIG_ENV_SIZE
 #endif
 
-char *env_name_spec = "NAND";
-
 #if defined(ENV_IS_EMBEDDED)
 env_t *env_ptr = &environment;
 #elif defined(CONFIG_NAND_ENV_DST)
@@ -418,6 +416,7 @@ static void env_nand_load(void)
 
 U_BOOT_ENV_LOCATION(nand) = {
 	.location	= ENVL_NAND,
+	ENV_NAME("NAND")
 	.load		= env_nand_load,
 #if defined(CMD_SAVEENV)
 	.save		= env_save_ptr(env_nand_save),
env/nowhere.c +1 -0
index 1d2ae85a57..1a17d6978b 100644
@@ -19,4 +19,5 @@ env_t *env_ptr;
 
 U_BOOT_ENV_LOCATION(nowhere) = {
 	.location	= ENVL_NOWHERE,
+	ENV_NAME("nowhere")
 };
env/nvram.c +1 -2
index 09091b8eb7..0f4b491fd3 100644
@@ -41,8 +41,6 @@ env_t *env_ptr;
 env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
 #endif
 
-char *env_name_spec = "NVRAM";
-
 #ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
 static uchar env_nvram_get_char(int index)
 {
@@ -115,6 +113,7 @@ static int env_nvram_init(void)
 
 U_BOOT_ENV_LOCATION(nvram) = {
 	.location	= ENVL_NVRAM,
+	ENV_NAME("NVRAM")
 #ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
 	.get_char	= env_nvram_get_char,
 #endif
env/onenand.c +1 -2
index cb1ab53216..319f553262 100644
@@ -21,8 +21,6 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/onenand.h>
 
-char *env_name_spec = "OneNAND";
-
 #define ONENAND_MAX_ENV_SIZE	CONFIG_ENV_SIZE
 #define ONENAND_ENV_SIZE(mtd)	(ONENAND_MAX_ENV_SIZE - ENV_HEADER_SIZE)
 
@@ -108,6 +106,7 @@ static int env_onenand_save(void)
 
 U_BOOT_ENV_LOCATION(onenand) = {
 	.location	= ENVL_ONENAND,
+	ENV_NAME("OneNAND")
 	.load		= env_onenand_load,
 	.save		= env_save_ptr(env_onenand_save),
 };
env/remote.c +1 -2
index c5dce5b966..0d8865bd67 100644
@@ -11,8 +11,6 @@
 #include <environment.h>
 #include <linux/stddef.h>
 
-char *env_name_spec = "Remote";
-
 #ifdef ENV_IS_EMBEDDED
 env_t *env_ptr = &environment;
 #else /* ! ENV_IS_EMBEDDED */
@@ -57,6 +55,7 @@ static void env_remote_load(void)
 
 U_BOOT_ENV_LOCATION(remote) = {
 	.location	= ENVL_REMOTE,
+	ENV_NAME("Remote")
 	.load		= env_remote_load,
 	.save		= env_save_ptr(env_remote_save),
 	.init		= env_remote_init,
env/sata.c +1 -2
index a5ff54c287..16d8f939db 100644
@@ -24,8 +24,6 @@
 #error CONFIG_ENV_OFFSET or CONFIG_ENV_SIZE not defined
 #endif
 
-char *env_name_spec = "SATA";
-
 DECLARE_GLOBAL_DATA_PTR;
 
 __weak int sata_get_env_dev(void)
@@ -119,6 +117,7 @@ static void env_sata_load(void)
 
 U_BOOT_ENV_LOCATION(sata) = {
 	.location	= ENVL_ESATA,
+	ENV_NAME("SATA")
 	.load		= env_sata_load,
 	.save		= env_save_ptr(env_sata_save),
 };
env/sf.c +1 -2
index a07641b7d4..07386c629a 100644
@@ -48,8 +48,6 @@ static ulong env_new_offset	= CONFIG_ENV_OFFSET_REDUND;
 
 DECLARE_GLOBAL_DATA_PTR;
 
-char *env_name_spec = "SPI Flash";
-
 static struct spi_flash *env_flash;
 
 static int setup_flash_device(void)
@@ -346,6 +344,7 @@ out:
 
 U_BOOT_ENV_LOCATION(sf) = {
 	.location	= ENVL_SPI_FLASH,
+	ENV_NAME("SPI Flash")
 	.load		= env_sf_load,
 #ifdef CMD_SAVEENV
 	.save		= env_save_ptr(env_sf_save),
env/ubi.c +0 -2
index 773fcf0ed2..0f1e5bcd22 100644
@@ -16,8 +16,6 @@
 #include <ubi_uboot.h>
 #undef crc32
 
-char *env_name_spec = "UBI";
-
 env_t *env_ptr;
 
 DECLARE_GLOBAL_DATA_PTR;
include/environment.h +15 -4
index 87727f2b29..03fe00f215 100644
@@ -143,10 +143,6 @@ extern unsigned long nand_env_oob_offset;
 # define ENV_HEADER_SIZE	(sizeof(uint32_t))
 #endif
 
-#if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_ENV_IS_NOWHERE)
-extern char *env_name_spec;
-#endif
-
 #ifdef CONFIG_ENV_AES
 /* Make sure the payload is multiple of AES block size */
 #define ENV_SIZE ((CONFIG_ENV_SIZE - ENV_HEADER_SIZE) & ~(16 - 1))
@@ -224,6 +220,7 @@ enum env_location {
 };
 
 struct env_driver {
+	const char *name;
 	enum env_location location;
 
 	/**
@@ -269,6 +266,13 @@ struct env_driver {
 #define U_BOOT_ENV_LOCATION(__name)					\
 	ll_entry_declare(struct env_driver, __name, env_driver)
 
+/* Declare the name of a location */
+#ifdef CONFIG_CMD_SAVEENV
+#define ENV_NAME(_name) .name = _name,
+#else
+#define ENV_NAME(_name)
+#endif
+
 #ifdef CONFIG_CMD_SAVEENV
 #define env_save_ptr(x) x
 #else
@@ -298,6 +302,13 @@ int env_import(const char *buf, int check);
 /* Export from hash table into binary representation */
 int env_export(env_t *env_out);
 
+/**
+ * env_driver_lookup_default() - Look up the default environment driver
+ *
+ * @return pointer to driver, or NULL if none (which should not happen)
+ */
+struct env_driver *env_driver_lookup_default(void);
+
 #endif /* DO_DEPS_ONLY */
 
 #endif /* _ENVIRONMENT_H_ */
Signature · 1 line
2.13.2.725.g09c95d1e9-goog
#28 lore raw

PATCH 24/30 env: Drop unused env_ptr variables

In reply to Simon Glass

This variable is declared as a global in most environment location drivers. But it is not used outside the drivers and most of the declarations are unnecessary.

Also some drivers call free() on env_ptr which seems wrong since it is not in the heap.

Drop the variable where possible, and all calls to free().

---

 env/dataflash.c | 2 --
 env/eeprom.c    | 4 ----
 env/ext4.c      | 2 --
 env/fat.c       | 2 --
 env/mmc.c       | 8 --------
 env/nand.c      | 2 --
 env/nowhere.c   | 2 --
 env/nvram.c     | 1 -
 env/ubi.c       | 2 --
 9 files changed, 25 deletions(-)
env/dataflash.c +0 -2
index 9421a6a5b2..28dcf6fa1c 100644
@@ -14,8 +14,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-env_t *env_ptr;
-
 static unsigned char env_dataflash_get_char(int index)
 {
 	uchar c;
env/eeprom.c +0 -4
index 2c795b9236..39adccabbe 100644
@@ -21,8 +21,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-env_t *env_ptr;
-
 static int eeprom_bus_read(unsigned dev_addr, unsigned offset,
 			   uchar *buffer, unsigned cnt)
 {
@@ -196,8 +194,6 @@ static int env_eeprom_save(void)
 	char flag_obsolete	= OBSOLETE_FLAG;
 #endif
 
-	BUG_ON(env_ptr != NULL);
-
 	rc = env_export(&env_new);
 	if (rc)
 		return rc;
env/ext4.c +0 -2
index 5acdf0eda0..ee073a8b7c 100644
@@ -31,8 +31,6 @@
 #include <ext4fs.h>
 #include <mmc.h>
 
-env_t *env_ptr;
-
 DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CONFIG_CMD_SAVEENV
env/fat.c +0 -2
index cf33549fda..323288a0f0 100644
@@ -19,8 +19,6 @@
 #include <fat.h>
 #include <mmc.h>
 
-env_t *env_ptr;
-
 DECLARE_GLOBAL_DATA_PTR;
 
 #if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_SPL_BUILD)
env/mmc.c +0 -8
index ae10b5b1f8..cf85bc232f 100644
@@ -23,12 +23,6 @@
 #error CONFIG_ENV_SIZE_REDUND should be the same as CONFIG_ENV_SIZE
 #endif
 
-#ifdef ENV_IS_EMBEDDED
-env_t *env_ptr = &environment;
-#else /* ! ENV_IS_EMBEDDED */
-env_t *env_ptr;
-#endif /* ENV_IS_EMBEDDED */
-
 DECLARE_GLOBAL_DATA_PTR;
 
 #if !defined(CONFIG_ENV_OFFSET)
@@ -284,8 +278,6 @@ static void env_mmc_load(void)
 			gd->env_valid = ENV_VALID;
 	}
 
-	free(env_ptr);
-
 	if (gd->env_valid == ENV_VALID)
 		ep = tmp_env1;
 	else
env/nand.c +0 -2
index 98b1dfc618..695957ea1c 100644
@@ -361,8 +361,6 @@ static void env_nand_load(void)
 			gd->env_valid = ENV_VALID;
 	}
 
-	free(env_ptr);
-
 	if (gd->env_valid == ENV_VALID)
 		ep = tmp_env1;
 	else
env/nowhere.c +0 -2
index 1a17d6978b..d60de494e6 100644
@@ -15,8 +15,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-env_t *env_ptr;
-
 U_BOOT_ENV_LOCATION(nowhere) = {
 	.location	= ENVL_NOWHERE,
 	ENV_NAME("nowhere")
env/nvram.c +0 -1
index 0f4b491fd3..ac389ace62 100644
@@ -36,7 +36,6 @@ DECLARE_GLOBAL_DATA_PTR;
 #ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
 extern void *nvram_read(void *dest, const long src, size_t count);
 extern void nvram_write(long dest, const void *src, size_t count);
-env_t *env_ptr;
 #else
 env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
 #endif
env/ubi.c +0 -2
index 0f1e5bcd22..65be2b1bbf 100644
@@ -16,8 +16,6 @@
 #include <ubi_uboot.h>
 #undef crc32
 
-env_t *env_ptr;
-
 DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CONFIG_CMD_SAVEENV
Signature · 1 line
2.13.2.725.g09c95d1e9-goog
#29 lore raw

PATCH 25/30 env: Drop env_init_new()

In reply to Simon Glass

Now that env_init() is only defined once we can drop the env_init_new() name and just use env_init().

---

 env/env.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
env/env.c +1 -5
index a649457270..70ce2857c3 100644
@@ -125,7 +125,7 @@ int env_save(void)
 	return 0;
 }
 
-int env_init_new(void)
+int env_init(void)
 {
 	struct env_driver *drv = env_driver_lookup_default();
 	int ret = -ENOSYS;
@@ -169,7 +169,3 @@ int saveenv(void)
 	return env_save();
 }
 
-int env_init(void)
-{
-	return env_init_new();
-}
Signature · 1 line
2.13.2.725.g09c95d1e9-goog
#30 lore raw

PATCH 26/30 env: Drop env_get_char_spec()

In reply to Simon Glass

We only have a single implementation of this function now and it is called env_get_char(). Drop the old function and the weak version.

---

 env/common.c          | 14 --------------
 env/env.c             | 15 +++------------
 include/environment.h | 14 ++++++++++----
 3 files changed, 13 insertions(+), 30 deletions(-)
env/common.c +0 -14
index 7ed4bb28dd..9f1d21adbd 100644
@@ -27,20 +27,6 @@ struct hsearch_data env_htab = {
 	.change_ok = env_flags_validate,
 };
 
-__weak uchar env_get_char_spec(int index)
-{
-	return *(uchar *)(gd->env_addr + index);
-}
-
-uchar env_get_char(int index)
-{
-	/* if env is not set up, or crc was bad, use the default environment */
-	if (!gd->env_valid)
-		return default_environment[index];
-	else
-		return env_get_char_spec(index);
-}
-
 /*
  * Read an environment variable as a boolean
  * Return -1 if variable does not exist (default to true)
env/env.c +3 -12
index 70ce2857c3..809889f55e 100644
@@ -69,11 +69,13 @@ struct env_driver *env_driver_lookup_default(void)
 	return drv;
 }
 
-int env_get_char_new(int index)
+int env_get_char(int index)
 {
 	struct env_driver *drv = env_driver_lookup_default();
 	int ret;
 
+	if (!gd->env_valid)
+		return default_environment[index];
 	if (!drv)
 		return -ENODEV;
 	if (!drv->get_char)
@@ -148,17 +150,6 @@ int env_init(void)
 	return 0;
 }
 
-unsigned char env_get_char_spec(int index)
-{
-	int ch;
-
-	ch = env_get_char(index);
-	if (ch < 0)
-		return 0;
-
-	return ch;
-}
-
 void env_relocate_spec(void)
 {
 	env_load();
include/environment.h +10 -4
index 03fe00f215..a494500825 100644
@@ -171,7 +171,6 @@ extern const unsigned char default_environment[];
 extern env_t *env_ptr;
 
 extern void env_relocate_spec(void);
-extern unsigned char env_get_char_spec(int);
 
 #if defined(CONFIG_NEEDS_MANUAL_RELOC)
 extern void env_reloc(void);
@@ -281,9 +280,6 @@ struct env_driver {
 
 extern struct hsearch_data env_htab;
 
-/* Function that returns a character from the environment */
-unsigned char env_get_char(int);
-
 /* Function that updates CRC of the enironment */
 void env_crc_update(void);
 
@@ -309,6 +305,16 @@ int env_export(env_t *env_out);
  */
 struct env_driver *env_driver_lookup_default(void);
 
+/**
+ * env_get_char() - Get a character from the early environment
+ *
+ * This reads from the pre-relocation environemnt
+ *
+ * @index: Index of character to read (0 = first)
+ * @return character read, or -ve on error
+ */
+int env_get_char(int index);
+
 #endif /* DO_DEPS_ONLY */
 
 #endif /* _ENVIRONMENT_H_ */
Signature · 1 line
2.13.2.725.g09c95d1e9-goog
#31 lore raw

PATCH 27/30 env: Drop env_relocate_spec() in favour of env_load()

In reply to Simon Glass

This is a strange name for a function that loads the environment. There is now only one implementation of this function, so use the new env_load() function directly instead.

---

 board/birdland/bav335x/board.c              | 2 +-
 board/gateworks/gw_ventana/gw_ventana_spl.c | 2 +-
 board/tcl/sl50/board.c                      | 2 +-
 board/ti/am335x/board.c                     | 2 +-
 board/ti/am57xx/board.c                     | 2 +-
 board/ti/dra7xx/evm.c                       | 2 +-
 env/common.c                                | 2 +-
 env/env.c                                   | 5 -----
 include/environment.h                       | 9 +++++++--
 9 files changed, 14 insertions(+), 14 deletions(-)
board/birdland/bav335x/board.c +1 -1
index 67aca3cc43..b49365e157 100644
@@ -162,7 +162,7 @@ int spl_start_uboot(void)
 
 #ifdef CONFIG_SPL_ENV_SUPPORT
 	env_init();
-	env_relocate_spec();
+	env_load();
 	if (getenv_yesno("boot_os") != 1)
 		return 1;
 #endif
board/gateworks/gw_ventana/gw_ventana_spl.c +1 -1
index 6060b44216..d6effc8f55 100644
@@ -690,7 +690,7 @@ int spl_start_uboot(void)
 	debug("%s\n", __func__);
 #ifdef CONFIG_SPL_ENV_SUPPORT
 	env_init();
-	env_relocate_spec();
+	env_load();
 	debug("boot_os=%s\n", getenv("boot_os"));
 	if (getenv_yesno("boot_os") == 1)
 		ret = 0;
board/tcl/sl50/board.c +1 -1
index e89ee35d30..d3c953e993 100644
@@ -76,7 +76,7 @@ int spl_start_uboot(void)
 
 #ifdef CONFIG_SPL_ENV_SUPPORT
 	env_init();
-	env_relocate_spec();
+	env_load();
 	if (getenv_yesno("boot_os") != 1)
 		return 1;
 #endif
board/ti/am335x/board.c +1 -1
index 0a16529b5f..ac0592b725 100644
@@ -249,7 +249,7 @@ int spl_start_uboot(void)
 
 #ifdef CONFIG_SPL_ENV_SUPPORT
 	env_init();
-	env_relocate_spec();
+	env_load();
 	if (getenv_yesno("boot_os") != 1)
 		return 1;
 #endif
board/ti/am57xx/board.c +1 -1
index bf8c8e1a67..e4f1681860 100644
@@ -737,7 +737,7 @@ int spl_start_uboot(void)
 
 #ifdef CONFIG_SPL_ENV_SUPPORT
 	env_init();
-	env_relocate_spec();
+	env_load();
 	if (getenv_yesno("boot_os") != 1)
 		return 1;
 #endif
board/ti/dra7xx/evm.c +1 -1
index 7d36f03fa1..23be2c70e4 100644
@@ -825,7 +825,7 @@ int spl_start_uboot(void)
 
 #ifdef CONFIG_SPL_ENV_SUPPORT
 	env_init();
-	env_relocate_spec();
+	env_load();
 	if (getenv_yesno("boot_os") != 1)
 		return 1;
 #endif
env/common.c +1 -1
index 9f1d21adbd..b63b5fc12f 100644
@@ -229,7 +229,7 @@ void env_relocate(void)
 		set_default_env("!bad CRC");
 #endif
 	} else {
-		env_relocate_spec();
+		env_load();
 	}
 }
 
env/env.c +0 -5
index 809889f55e..d2704f4861 100644
@@ -150,11 +150,6 @@ int env_init(void)
 	return 0;
 }
 
-void env_relocate_spec(void)
-{
-	env_load();
-}
-
 int saveenv(void)
 {
 	return env_save();
include/environment.h +7 -2
index a494500825..fa82f72baf 100644
@@ -170,8 +170,6 @@ extern env_t environment;
 extern const unsigned char default_environment[];
 extern env_t *env_ptr;
 
-extern void env_relocate_spec(void);
-
 #if defined(CONFIG_NEEDS_MANUAL_RELOC)
 extern void env_reloc(void);
 #endif
@@ -315,6 +313,13 @@ struct env_driver *env_driver_lookup_default(void);
  */
 int env_get_char(int index);
 
+/**
+ * env_load() - Load the environment from storage
+ *
+ * @return 0 if OK, -ve on error
+ */
+int env_load(void);
+
 #endif /* DO_DEPS_ONLY */
 
 #endif /* _ENVIRONMENT_H_ */
Signature · 1 line
2.13.2.725.g09c95d1e9-goog
#32 lore raw

PATCH 28/30 env: Drop saveenv() in favour of env_save()

In reply to Simon Glass

Use the env_save() function directly now that there is only one implementation of saveenv().

---

 arch/arm/mach-omap2/boot-common.c       | 3 ++-
 board/siemens/taurus/taurus.c           | 5 +++--
 board/toradex/apalis_imx6/apalis_imx6.c | 3 ++-
 cmd/nvedit.c                            | 2 +-
 drivers/bootcount/bootcount_env.c       | 3 ++-
 env/env.c                               | 6 ------
 include/common.h                        | 1 -
 include/environment.h                   | 7 +++++++
 8 files changed, 17 insertions(+), 13 deletions(-)
arch/arm/mach-omap2/boot-common.c +2 -1
index b77506df83..435adf19ff 100644
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <ahci.h>
+#include <environment.h>
 #include <spl.h>
 #include <asm/omap_common.h>
 #include <asm/arch/omap.h>
@@ -248,7 +249,7 @@ int fb_set_reboot_flag(void)
 {
 	printf("Setting reboot to fastboot flag ...\n");
 	setenv("dofastboot", "1");
-	saveenv();
+	env_save();
 	return 0;
 }
 #endif
board/siemens/taurus/taurus.c +3 -2
index 4aa8d64869..3b742ebc22 100644
@@ -15,6 +15,7 @@
 #include <command.h>
 #include <common.h>
 #include <dm.h>
+#include <environment.h>
 #include <asm/io.h>
 #include <asm/arch/at91sam9260_matrix.h>
 #include <asm/arch/at91sam9_smc.h>
@@ -405,7 +406,7 @@ static int upgrade_failure_fallback(void)
 	setenv("bootargs", '\0');
 	setenv("upgrade_available", '\0');
 	setenv("boot_retries", '\0');
-	saveenv();
+	env_save();
 
 	return 0;
 }
@@ -424,7 +425,7 @@ static int do_upgrade_available(cmd_tbl_t *cmdtp, int flag, int argc,
 		boot_retry++;
 		sprintf(boot_buf, "%lx", boot_retry);
 		setenv("boot_retries", boot_buf);
-		saveenv();
+		env_save();
 
 		/*
 		 * Here the boot_retries count is checked, and if the
board/toradex/apalis_imx6/apalis_imx6.c +2 -1
index 166b93f0c5..d64896bb5b 100644
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <environment.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/mxc_hdmi.h>
@@ -818,7 +819,7 @@ int board_late_init(void)
 			setenv("fdt_file", FDT_FILE_V1_0);
 			printf("patching fdt_file to " FDT_FILE_V1_0 "\n");
 #ifndef CONFIG_ENV_IS_NOWHERE
-			saveenv();
+			env_save();
 #endif
 		}
 	}
cmd/nvedit.c +1 -1
index 75df997592..4431ef66d8 100644
@@ -710,7 +710,7 @@ static int do_env_save(cmd_tbl_t *cmdtp, int flag, int argc,
 
 	printf("Saving Environment to %s...\n", env->name);
 
-	return saveenv() ? 1 : 0;
+	return env_save() ? 1 : 0;
 }
 
 U_BOOT_CMD(
drivers/bootcount/bootcount_env.c +2 -1
index 2d6e8db126..7f22dd0748 100644
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <environment.h>
 
 void bootcount_store(ulong a)
 {
@@ -13,7 +14,7 @@ void bootcount_store(ulong a)
 
 	if (upgrade_available) {
 		setenv_ulong("bootcount", a);
-		saveenv();
+		env_save();
 	}
 }
 
env/env.c +0 -6
index d2704f4861..9d232c1f34 100644
@@ -149,9 +149,3 @@ int env_init(void)
 
 	return 0;
 }
-
-int saveenv(void)
-{
-	return env_save();
-}
-
include/common.h +0 -1
index 638c45b954..883b95dce6 100644
@@ -335,7 +335,6 @@ ulong getenv_hex(const char *varname, ulong default_val);
  * Return -1 if variable does not exist (default to true)
  */
 int getenv_yesno(const char *var);
-int	saveenv	     (void);
 int	setenv	     (const char *, const char *);
 int setenv_ulong(const char *varname, ulong value);
 int setenv_hex(const char *varname, ulong value);
include/environment.h +7 -0
index fa82f72baf..faf4d6adbb 100644
@@ -320,6 +320,13 @@ int env_get_char(int index);
  */
 int env_load(void);
 
+/**
+ * env_save() - Save the environment to storage
+ *
+ * @return 0 if OK, -ve on error
+ */
+int env_save(void);
+
 #endif /* DO_DEPS_ONLY */
 
 #endif /* _ENVIRONMENT_H_ */
Signature · 1 line
2.13.2.725.g09c95d1e9-goog
#33 lore raw

PATCH 28/30 env: Drop saveenv() in favour of env_save()

Dear Simon,

Quoted 2 lines · In message <[email protected]> you wrote:

Use the env_save() function directly now that there is only one implementation of saveenv().

...

arch/arm/mach-omap2/boot-common.c int fb_set_reboot_flag(void) · line 252

Quoted 4 lines
arch/arm/mach-omap2/boot-common.c +1 -1
 	printf("Setting reboot to fastboot flag ...\n");
 	setenv("dofastboot", "1");
-	saveenv();
+	env_save();

Hm... the old name saveenv() was once derived from the command line command with the same name, in the same way as setenv() is/was.

One can argument that your new name env_save( corresponds to the more modern "env <subcommand>" syntax - but should we then not also rename setenv() into env_set() , so we use a consistent naming scheme again?

Best regards,

Wolfgang Denk

Signature · 6 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
He'd heard her use that sweet, innocent  tone  of  voice  before.  It
meant that, pretty soon, there was going to be trouble.
                                        - Terry Pratchett, _Truckers_
#34 lore raw

PATCH 28/30 env: Drop saveenv() in favour of env_save()

Hi Wolfgang,

Quoted 12 lines · Wolfgang Denk

Dear Simon,

Quoted 2 lines · In message <[email protected]> you wrote:

Use the env_save() function directly now that there is only one implementation of saveenv().

...

Review

Quoted 4 lines
      printf("Setting reboot to fastboot flag ...\n");
      setenv("dofastboot", "1");
(quoted diff) +1 -1
-     saveenv();
+     env_save();
Quoted 7 lines

Hm... the old name saveenv() was once derived from the command line command with the same name, in the same way as setenv() is/was.

One can argument that your new name env_save( corresponds to the more modern "env <subcommand>" syntax - but should we then not also rename setenv() into env_set() , so we use a consistent naming scheme again?

Yes that makes sense. I'll add it to my list, thanks.

Quoted 7 lines

Best regards,

Wolfgang Denk

Quoted 7 lines

--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de He'd heard her use that sweet, innocent tone of voice before. It meant that, pretty soon, there was going to be trouble.
- Terry Pratchett, _Truckers_

Regards,
Simon

#35 lore raw

PATCH 29/30 env: Adjust the get_char() method to return an int

In reply to Simon Glass

In principle this can fail, e.g. if the index is out of range. Adjust the driver signature to allow returning an error code.

---

 env/dataflash.c       | 2 +-
 env/eeprom.c          | 2 +-
 env/nvram.c           | 2 +-
 include/environment.h | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
env/dataflash.c +1 -1
index 28dcf6fa1c..afa08f8fd5 100644
@@ -14,7 +14,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-static unsigned char env_dataflash_get_char(int index)
+static int env_dataflash_get_char(int index)
 {
 	uchar c;
 
env/eeprom.c +1 -1
index 39adccabbe..fbe4fd4efc 100644
@@ -61,7 +61,7 @@ static int eeprom_bus_write(unsigned dev_addr, unsigned offset,
 	return rcode;
 }
 
-static uchar env_eeprom_get_char(int index)
+static int env_eeprom_get_char(int index)
 {
 	uchar c;
 	unsigned int off = CONFIG_ENV_OFFSET;
env/nvram.c +1 -1
index ac389ace62..85af37d4a0 100644
@@ -41,7 +41,7 @@ env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
 #endif
 
 #ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
-static uchar env_nvram_get_char(int index)
+static int env_nvram_get_char(int index)
 {
 	uchar c;
 
include/environment.h +2 -2
index faf4d6adbb..6889089d38 100644
@@ -227,9 +227,9 @@ struct env_driver {
 	 * will read from gd->env_addr.
 	 *
 	 * @index: Index of character to read (0=first)
-	 * @return character read
+	 * @return character read, or -ve on error
 	 */
-	unsigned char (*get_char)(int index);
+	int (*get_char)(int index);
 
 	/**
 	 * load() - Load the environment from storage
Signature · 1 line
2.13.2.725.g09c95d1e9-goog
#36 lore raw

PATCH 30/30 env: Adjust the load() method to return an error

In reply to Simon Glass

The load() methods have inconsistent behaviour on error. Some of them load an empty default environment. Some load an environment containing an error message. Others do nothing.

As a step in the right direction, have the method return an error code. Then the caller could handle this itself in a consistent way.

---

 env/dataflash.c       |  4 +++-
 env/eeprom.c          |  4 +++-
 env/ext4.c            |  6 ++++--
 env/fat.c             |  6 ++++--
 env/flash.c           |  4 +++-
 env/mmc.c             | 19 +++++++++++--------
 env/nand.c            | 18 +++++++++++++-----
 env/nvram.c           |  4 +++-
 env/onenand.c         |  4 +++-
 env/remote.c          |  4 +++-
 env/sata.c            | 15 +++++++++------
 env/sf.c              | 20 +++++++++++++-------
 env/ubi.c             | 16 ++++++++++------
 include/environment.h |  4 +++-
 14 files changed, 85 insertions(+), 43 deletions(-)
env/dataflash.c +3 -1
index afa08f8fd5..77bc595e0d 100644
@@ -23,7 +23,7 @@ static int env_dataflash_get_char(int index)
 	return c;
 }
 
-static void env_dataflash_load(void)
+static int env_dataflash_load(void)
 {
 	ulong crc, new = 0;
 	unsigned off;
@@ -44,6 +44,8 @@ static void env_dataflash_load(void)
 		env_import(buf, 1);
 	else
 		set_default_env("!bad CRC");
+
+	return 0;
 }
 
 #ifdef CONFIG_ENV_OFFSET_REDUND
env/eeprom.c +3 -1
index fbe4fd4efc..08ef6307fc 100644
@@ -76,7 +76,7 @@ static int env_eeprom_get_char(int index)
 	return c;
 }
 
-static void env_eeprom_load(void)
+static int env_eeprom_load(void)
 {
 	char buf_env[CONFIG_ENV_SIZE];
 	unsigned int off = CONFIG_ENV_OFFSET;
@@ -182,6 +182,8 @@ static void env_eeprom_load(void)
 		off, (uchar *)buf_env, CONFIG_ENV_SIZE);
 
 	env_import(buf_env, 1);
+
+	return 0;
 }
 
 static int env_eeprom_save(void)
env/ext4.c +4 -2
index ee073a8b7c..65202213d3 100644
@@ -75,7 +75,7 @@ static int env_ext4_save(void)
 }
 #endif /* CONFIG_CMD_SAVEENV */
 
-static void env_ext4_load(void)
+static int env_ext4_load(void)
 {
 	ALLOC_CACHE_ALIGN_BUFFER(char, buf, CONFIG_ENV_SIZE);
 	struct blk_desc *dev_desc = NULL;
@@ -109,10 +109,12 @@ static void env_ext4_load(void)
 	}
 
 	env_import(buf, 1);
-	return;
+	return 0;
 
 err_env_relocate:
 	set_default_env(NULL);
+
+	return -EIO;
 }
 
 U_BOOT_ENV_LOCATION(ext4) = {
env/fat.c +4 -2
index 323288a0f0..ccbfca644a 100644
@@ -61,7 +61,7 @@ static int env_fat_save(void)
 }
 #endif /* CONFIG_CMD_SAVEENV && !CONFIG_SPL_BUILD */
 
-static void env_fat_load(void)
+static int env_fat_load(void)
 {
 	ALLOC_CACHE_ALIGN_BUFFER(char, buf, CONFIG_ENV_SIZE);
 	struct blk_desc *dev_desc = NULL;
@@ -90,10 +90,12 @@ static void env_fat_load(void)
 	}
 
 	env_import(buf, 1);
-	return;
+	return 0;
 
 err_env_relocate:
 	set_default_env(NULL);
+
+	return -EIO;
 }
 
 U_BOOT_ENV_LOCATION(fat) = {
env/flash.c +3 -1
index 2d72c51622..b60be57a8d 100644
@@ -308,7 +308,7 @@ done:
 #endif /* CONFIG_ENV_ADDR_REDUND */
 
 #ifdef LOADENV
-static void env_flash_load(void)
+static int env_flash_load(void)
 {
 #ifdef CONFIG_ENV_ADDR_REDUND
 	if (gd->env_addr != (ulong)&(flash_addr->data)) {
@@ -352,6 +352,8 @@ static void env_flash_load(void)
 #endif /* CONFIG_ENV_ADDR_REDUND */
 
 	env_import((char *)flash_addr, 1);
+
+	return 0;
 }
 #endif /* LOADENV */
 
env/mmc.c +11 -8
index cf85bc232f..c7746492af 100644
@@ -213,7 +213,7 @@ static inline int read_env(struct mmc *mmc, unsigned long size,
 }
 
 #ifdef CONFIG_ENV_OFFSET_REDUND
-static void env_mmc_load(void)
+static int env_mmc_load(void)
 {
 #if !defined(ENV_IS_EMBEDDED)
 	struct mmc *mmc;
@@ -232,13 +232,13 @@ static void env_mmc_load(void)
 
 	errmsg = init_mmc_for_env(mmc);
 	if (errmsg) {
-		ret = 1;
+		ret = -EIO;
 		goto err;
 	}
 
 	if (mmc_get_env_addr(mmc, 0, &offset1) ||
 	    mmc_get_env_addr(mmc, 1, &offset2)) {
-		ret = 1;
+		ret = -EIO;
 		goto fini;
 	}
 
@@ -258,7 +258,7 @@ static void env_mmc_load(void)
 
 	if (!crc1_ok && !crc2_ok) {
 		errmsg = "!bad CRC";
-		ret = 1;
+		ret = -EIO;
 		goto fini;
 	} else if (crc1_ok && !crc2_ok) {
 		gd->env_valid = ENV_VALID;
@@ -292,10 +292,12 @@ fini:
 err:
 	if (ret)
 		set_default_env(errmsg);
+
 #endif
+	return ret;
 }
 #else /* ! CONFIG_ENV_OFFSET_REDUND */
-static void env_mmc_load(void)
+static int env_mmc_load(void)
 {
 #if !defined(ENV_IS_EMBEDDED)
 	ALLOC_CACHE_ALIGN_BUFFER(char, buf, CONFIG_ENV_SIZE);
@@ -309,18 +311,18 @@ static void env_mmc_load(void)
 
 	errmsg = init_mmc_for_env(mmc);
 	if (errmsg) {
-		ret = 1;
+		ret = -EIO;
 		goto err;
 	}
 
 	if (mmc_get_env_addr(mmc, 0, &offset)) {
-		ret = 1;
+		ret = -EIO;
 		goto fini;
 	}
 
 	if (read_env(mmc, CONFIG_ENV_SIZE, offset, buf)) {
 		errmsg = "!read failed";
-		ret = 1;
+		ret = -EIO;
 		goto fini;
 	}
 
@@ -333,6 +335,7 @@ err:
 	if (ret)
 		set_default_env(errmsg);
 #endif
+	return ret;
 }
 #endif /* CONFIG_ENV_OFFSET_REDUND */
 
env/nand.c +13 -5
index 695957ea1c..63d59fd6f3 100644
@@ -298,7 +298,7 @@ int get_nand_env_oob(struct mtd_info *mtd, unsigned long *result)
 	}
 
 	if (oob_buf[0] == ENV_OOB_MARKER) {
-		*result = oob_buf[1] * mtd->erasesize;
+		*result = ovoid ob_buf[1] * mtd->erasesize;
 	} else if (oob_buf[0] == ENV_OOB_MARKER_OLD) {
 		*result = oob_buf[1];
 	} else {
@@ -311,18 +311,22 @@ int get_nand_env_oob(struct mtd_info *mtd, unsigned long *result)
 #endif
 
 #ifdef CONFIG_ENV_OFFSET_REDUND
-static void env_nand_load(void)
+static int env_nand_load(void)
 {
-#if !defined(ENV_IS_EMBEDDED)
+#if defined(ENV_IS_EMBEDDED)
+	return 0;
+#else
 	int read1_fail = 0, read2_fail = 0;
 	int crc1_ok = 0, crc2_ok = 0;
 	env_t *ep, *tmp_env1, *tmp_env2;
+	int ret = 0;
 
 	tmp_env1 = (env_t *)malloc(CONFIG_ENV_SIZE);
 	tmp_env2 = (env_t *)malloc(CONFIG_ENV_SIZE);
 	if (tmp_env1 == NULL || tmp_env2 == NULL) {
 		puts("Can't allocate buffers for environment\n");
 		set_default_env("!malloc() failed");
+		ret = -EIO;
 		goto done;
 	}
 
@@ -342,6 +346,7 @@ static void env_nand_load(void)
 
 	if (!crc1_ok && !crc2_ok) {
 		set_default_env("!bad CRC");
+		ret = -EIO;
 		goto done;
 	} else if (crc1_ok && !crc2_ok) {
 		gd->env_valid = ENV_VALID;
@@ -373,6 +378,7 @@ done:
 	free(tmp_env1);
 	free(tmp_env2);
 
+	return ret;
 #endif /* ! ENV_IS_EMBEDDED */
 }
 #else /* ! CONFIG_ENV_OFFSET_REDUND */
@@ -381,7 +387,7 @@ done:
  * device i.e., nand_dev_desc + 0. This is also the behaviour using
  * the new NAND code.
  */
-static void env_nand_load(void)
+static int env_nand_load(void)
 {
 #if !defined(ENV_IS_EMBEDDED)
 	int ret;
@@ -404,11 +410,13 @@ static void env_nand_load(void)
 	ret = readenv(CONFIG_ENV_OFFSET, (u_char *)buf);
 	if (ret) {
 		set_default_env("!readenv() failed");
-		return;
+		return -EIO;
 	}
 
 	env_import(buf, 1);
 #endif /* ! ENV_IS_EMBEDDED */
+
+	return 0;
 }
 #endif /* CONFIG_ENV_OFFSET_REDUND */
 
env/nvram.c +3 -1
index 85af37d4a0..5fb3115ce6 100644
@@ -51,7 +51,7 @@ static int env_nvram_get_char(int index)
 }
 #endif
 
-static void env_nvram_load(void)
+static int env_nvram_load(void)
 {
 	char buf[CONFIG_ENV_SIZE];
 
@@ -61,6 +61,8 @@ static void env_nvram_load(void)
 	memcpy(buf, (void *)CONFIG_ENV_ADDR, CONFIG_ENV_SIZE);
 #endif
 	env_import(buf, 1);
+
+	return 0;
 }
 
 static int env_nvram_save(void)
env/onenand.c +3 -1
index 319f553262..2e3045c5f5 100644
@@ -26,7 +26,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-static void env_onenand_load(void)
+static int env_onenand_load(void)
 {
 	struct mtd_info *mtd = &onenand_mtd;
 #ifdef CONFIG_ENV_ADDR_FLEX
@@ -59,6 +59,8 @@ static void env_onenand_load(void)
 	rc = env_import(buf, 1);
 	if (rc)
 		gd->env_valid = ENV_VALID;
+
+	return rc ? 0 : -EIO;
 }
 
 static int env_onenand_save(void)
env/remote.c +3 -1
index 0d8865bd67..c013fdd4b0 100644
@@ -46,11 +46,13 @@ static int env_remote_save(void)
 }
 #endif /* CONFIG_CMD_SAVEENV */
 
-static void env_remote_load(void)
+static int env_remote_load(void)
 {
 #ifndef ENV_IS_EMBEDDED
 	env_import((char *)env_ptr, 1);
 #endif
+
+	return 0;
 }
 
 U_BOOT_ENV_LOCATION(remote) = {
env/sata.c +9 -6
index 16d8f939db..a77029774e 100644
@@ -98,21 +98,24 @@ static void env_sata_load(void)
 	int env_sata;
 
 	if (sata_initialize())
-		return;
+		return -EIO;
 
 	env_sata = sata_get_env_dev();
 
 	sata = sata_get_dev(env_sata);
 	if (sata == NULL) {
-		printf("Unknown SATA(%d) device for environment!\n",
-		       env_sata);
-		return;
+		printf("Unknown SATA(%d) device for environment!\n", env_sata);
+		return -EIO;
 	}
 
-	if (read_env(sata, CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET, buf))
-		return set_default_env(NULL);
+	if (read_env(sata, CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET, buf)) {
+		set_default_env(NULL);
+		return -EIO;
+	}
 
 	env_import(buf, 1);
+
+	return 0;
 }
 
 U_BOOT_ENV_LOCATION(sata) = {
env/sf.c +13 -7
index 07386c629a..6f74371c09 100644
@@ -61,7 +61,7 @@ static int setup_flash_device(void)
 				     0, 0, &new);
 	if (ret) {
 		set_default_env("!spi_flash_probe_bus_cs() failed");
-		return 1;
+		return ret;
 	}
 
 	env_flash = dev_get_uclass_priv(new);
@@ -73,7 +73,7 @@ static int setup_flash_device(void)
 			CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE);
 		if (!env_flash) {
 			set_default_env("!spi_flash_probe() failed");
-			return 1;
+			return -EIO;
 		}
 	}
 #endif
@@ -95,7 +95,7 @@ static int env_sf_save(void)
 
 	ret = env_export(&env_new);
 	if (ret)
-		return ret;
+		return -EIO;
 	env_new.flags	= ACTIVE_FLAG;
 
 	if (gd->env_valid == ENV_VALID) {
@@ -112,7 +112,7 @@ static int env_sf_save(void)
 		saved_offset = env_new_offset + CONFIG_ENV_SIZE;
 		saved_buffer = memalign(ARCH_DMA_MINALIGN, saved_size);
 		if (!saved_buffer) {
-			ret = 1;
+			ret = -ENOMEM;
 			goto done;
 		}
 		ret = spi_flash_read(env_flash, saved_offset,
@@ -162,7 +162,7 @@ static int env_sf_save(void)
 }
 #endif /* CMD_SAVEENV */
 
-static void env_sf_load(void)
+static int env_sf_load(void)
 {
 	int ret;
 	int crc1_ok = 0, crc2_ok = 0;
@@ -176,6 +176,7 @@ static void env_sf_load(void)
 			CONFIG_ENV_SIZE);
 	if (!tmp_env1 || !tmp_env2) {
 		set_default_env("!malloc() failed");
+		ret = -EIO;
 		goto out;
 	}
 
@@ -202,6 +203,7 @@ static void env_sf_load(void)
 
 	if (!crc1_ok && !crc2_ok) {
 		set_default_env("!bad CRC");
+		ret = -EIO;
 		goto err_read;
 	} else if (crc1_ok && !crc2_ok) {
 		gd->env_valid = ENV_VALID;
@@ -244,6 +246,8 @@ err_read:
 out:
 	free(tmp_env1);
 	free(tmp_env2);
+
+	return ret;
 }
 #else
 #ifdef CMD_SAVEENV
@@ -308,7 +312,7 @@ static int env_sf_save(void)
 }
 #endif /* CMD_SAVEENV */
 
-static void env_sf_load(void)
+static int env_sf_load(void)
 {
 	int ret;
 	char *buf = NULL;
@@ -316,7 +320,7 @@ static void env_sf_load(void)
 	buf = (char *)memalign(ARCH_DMA_MINALIGN, CONFIG_ENV_SIZE);
 	if (!buf) {
 		set_default_env("!malloc() failed");
-		return;
+		return -EIO;
 	}
 
 	ret = setup_flash_device();
@@ -339,6 +343,8 @@ err_read:
 	env_flash = NULL;
 out:
 	free(buf);
+
+	return ret;
 }
 #endif
 
env/ubi.c +10 -6
index 65be2b1bbf..6ac86c8571 100644
@@ -95,7 +95,7 @@ static int env_ubi_save(void)
 #endif /* CONFIG_CMD_SAVEENV */
 
 #ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
-static void env_ubi_load(void)
+static int env_ubi_load(void)
 {
 	ALLOC_CACHE_ALIGN_BUFFER(char, env1_buf, CONFIG_ENV_SIZE);
 	ALLOC_CACHE_ALIGN_BUFFER(char, env2_buf, CONFIG_ENV_SIZE);
@@ -120,7 +120,7 @@ static void env_ubi_load(void)
 		printf("\n** Cannot find mtd partition \"%s\"\n",
 		       CONFIG_ENV_UBI_PART);
 		set_default_env(NULL);
-		return;
+		return -EIO;
 	}
 
 	if (ubi_volume_read(CONFIG_ENV_UBI_VOLUME, (void *)tmp_env1,
@@ -140,7 +140,7 @@ static void env_ubi_load(void)
 
 	if (!crc1_ok && !crc2_ok) {
 		set_default_env("!bad CRC");
-		return;
+		return -EIO;
 	} else if (crc1_ok && !crc2_ok) {
 		gd->env_valid = ENV_VALID;
 	} else if (!crc1_ok && crc2_ok) {
@@ -166,9 +166,11 @@ static void env_ubi_load(void)
 
 	env_flags = ep->flags;
 	env_import((char *)ep, 0);
+
+	return 0;
 }
 #else /* ! CONFIG_SYS_REDUNDAND_ENVIRONMENT */
-static void env_ubi_load(void)
+static int env_ubi_load(void)
 {
 	ALLOC_CACHE_ALIGN_BUFFER(char, buf, CONFIG_ENV_SIZE);
 
@@ -186,17 +188,19 @@ static void env_ubi_load(void)
 		printf("\n** Cannot find mtd partition \"%s\"\n",
 		       CONFIG_ENV_UBI_PART);
 		set_default_env(NULL);
-		return;
+		return -EIO;
 	}
 
 	if (ubi_volume_read(CONFIG_ENV_UBI_VOLUME, buf, CONFIG_ENV_SIZE)) {
 		printf("\n** Unable to read env from %s:%s **\n",
 		       CONFIG_ENV_UBI_PART, CONFIG_ENV_UBI_VOLUME);
 		set_default_env(NULL);
-		return;
+		return -EIO;
 	}
 
 	env_import(buf, 1);
+
+	return 0;
 }
 #endif /* CONFIG_SYS_REDUNDAND_ENVIRONMENT */
 
include/environment.h +3 -1
index 6889089d38..94448f7458 100644
@@ -236,8 +236,10 @@ struct env_driver {
 	 *
 	 * This method is optional. If not provided, no environment will be
 	 * loaded.
+	 *
+	 * @return 0 if OK, -ve on error
 	 */
-	void (*load)(void);
+	int (*load)(void);
 
 	/**
 	 * save() - Save the environment to storage
Signature · 1 line
2.13.2.725.g09c95d1e9-goog
#37 lore raw

cover env: Move environment code to use location drivers

In reply to Simon Glass

Simon,

Quoted 67 lines · Simon Glass

The environment code is ripe for improvement in various ways. It has lots of duplication and inconsistencies between how things work with different environment locations. It does not properly use Kconfig. Error checking and handling is patchy.

This series makes a start at improving things:

- moves the rest of the CONFIG_ENV_IS_IN_... options to Kconfig
- introduces the concept of a location driver for the environment
- drops some of the duplicated code
- improves error handling a little (more to be done here)
- moves code into a new env/ directory

There is still much more to do:
- complete Kconfig conversion (e.g. CONFIG_ENV_SIZE)
- unify environment settings so that all locations support the same options
- try to rationalise the redundancy code (can we create a common implementation used by all drivers?)
- allow environment in multiple locations (e.g. as a fallback)
- figure out why CONFIG_ENV_IS_IN_FLASH enables the environment in flash even in SPL, which other locations do not

Simon Glass (30):
Makefile: Rename 'env' target to 'environ' Move environment files from common/ to env/ Convert CONFIG_ENV_IS_IN_MMC et al to Kconfig
env: Move help from README to Kconfig
Convert CONFIG_ENV_IS_IN_FLASH to Kconfig Convert CONFIG_ENV_IS_IN_NVRAM to Kconfig Convert CONFIG_ENV_IS_IN_EEPROM to Kconfig Convert CONFIG_ENV_IS_IN_DATAFLASH to Kconfig Convert CONFIG_ENV_IS_IN_SPI_FLASH to Kconfig Convert CONFIG_ENV_IS_IN_REMOTE to Kconfig Convert CONFIG_ENV_IS_IN_FAT to Kconfig
env: common: Make env_get_addr/get_char_memory() static
env: common: Drop env_get_addr()
env: common: Factor out the common env_valid check
env: common: Drop env_get_char_init()
env: common: Drop env_get_char_memory()
env: Add an enum for environment state
env: Rename nand env_location to nand_env_location
env: Create a location driver for each location
env: Add a new implementation of environment access
env: Switch over to use environment location drivers
env: Drop common init() functions
env: Drop the env_name_spec global
env: Drop unused env_ptr variables
env: Drop env_init_new()
env: Drop env_get_char_spec()
env: Drop env_relocate_spec() in favour of env_load()
env: Drop saveenv() in favour of env_save()
env: Adjust the get_char() method to return an int
env: Adjust the load() method to return an error

  Kconfig                                            |   2 +
  Makefile                                           |   5 +-
  README                                             | 352 ------------------
  arch/Kconfig                                       |   1 +
  arch/arm/Kconfig                                   |   2 +
  arch/arm/cpu/armv7/mx6/Kconfig                     |   1 +
  arch/arm/cpu/armv7/mx7/Kconfig                     |   1 +
  arch/arm/mach-exynos/Kconfig                       |   1 +
  arch/arm/mach-integrator/Kconfig                   |   2 +
  arch/arm/mach-mvebu/Kconfig                        |   1 +
  arch/arm/mach-omap2/boot-common.c                  |   3 +-
  arch/arm/mach-sunxi/Kconfig                        |   6 +
Quoted 8 lines
  arch/arm/mach-tegra/Kconfig                        |   3 +
  arch/m68k/Kconfig                                  |   8 +
  arch/microblaze/Kconfig                            |   1 +
  arch/mips/Kconfig                                  |   7 +
  arch/powerpc/Kconfig                               |   1 +
  arch/powerpc/cpu/mpc83xx/Kconfig                   |   6 +
  arch/powerpc/cpu/mpc85xx/Kconfig                   |   4 +
  arch/powerpc/cpu/mpc86xx/Kconfig                   |   1 +

It looks like the mpc8xx has been left behind.

Christophe

Quoted 1,419 lines
  arch/sh/Kconfig                                    |   3 +
  arch/sh/cpu/u-boot.lds                             |   4 +-
  arch/x86/cpu/baytrail/Kconfig                      |   1 +
  board/Arcturus/ucp1020/spl.c                       |   3 +-
  board/birdland/bav335x/board.c                     |   2 +-
  board/freescale/b4860qds/spl.c                     |   3 +-
  board/freescale/c29xpcie/spl.c                     |   3 +-
  board/freescale/mx31ads/u-boot.lds                 |   2 +-
  board/freescale/p1010rdb/spl.c                     |   3 +-
  board/freescale/p1022ds/spl.c                      |   3 +-
  board/freescale/p1_p2_rdb_pc/spl.c                 |   3 +-
  board/freescale/t102xqds/spl.c                     |   3 +-
  board/freescale/t102xrdb/spl.c                     |   3 +-
  board/freescale/t104xrdb/spl.c                     |   3 +-
  board/freescale/t208xqds/spl.c                     |   3 +-
  board/freescale/t208xrdb/spl.c                     |   3 +-
  board/freescale/t4qds/spl.c                        |   3 +-
  board/freescale/t4rdb/spl.c                        |   3 +-
  board/gateworks/gw_ventana/gw_ventana_spl.c        |   2 +-
  board/siemens/taurus/taurus.c                      |   5 +-
  board/tcl/sl50/board.c                             |   2 +-
  board/ti/am335x/board.c                            |   2 +-
  board/ti/am57xx/board.c                            |   2 +-
  board/ti/dra7xx/evm.c                              |   2 +-
  board/toradex/apalis_imx6/apalis_imx6.c            |   3 +-
  cmd/nvedit.c                                       |   6 +-
  common/Kconfig                                     |  69 ----
  common/Makefile                                    |  49 +--
  configs/10m50_defconfig                            |   1 +
  configs/3c120_defconfig                            |   1 +
  configs/B4420QDS_NAND_defconfig                    |   1 +
  configs/B4420QDS_SPIFLASH_defconfig                |   1 +
  configs/B4420QDS_defconfig                         |   1 +
  configs/B4860QDS_NAND_defconfig                    |   1 +
  configs/B4860QDS_SECURE_BOOT_defconfig             |   1 +
  configs/B4860QDS_SPIFLASH_defconfig                |   1 +
  configs/B4860QDS_SRIO_PCIE_BOOT_defconfig          |   1 +
  configs/B4860QDS_defconfig                         |   1 +
  configs/BSC9131RDB_NAND_SYSCLK100_defconfig        |   1 +
  configs/BSC9131RDB_NAND_defconfig                  |   1 +
  configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig    |   1 +
  configs/BSC9131RDB_SPIFLASH_defconfig              |   1 +
  configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig |   1 +
  configs/BSC9132QDS_NAND_DDRCLK100_defconfig        |   1 +
  configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig |   1 +
  configs/BSC9132QDS_NAND_DDRCLK133_defconfig        |   1 +
  configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig  |   1 +
  configs/BSC9132QDS_NOR_DDRCLK100_defconfig         |   1 +
  configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig  |   1 +
  configs/BSC9132QDS_NOR_DDRCLK133_defconfig         |   1 +
  .../BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig   |   1 +
  configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig      |   1 +
  .../BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig   |   1 +
  configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig      |   1 +
  .../BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig |   1 +
  configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig    |   1 +
  .../BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig |   1 +
  configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig    |   1 +
  configs/C29XPCIE_NAND_defconfig                    |   1 +
  configs/C29XPCIE_NOR_SECBOOT_defconfig             |   1 +
  configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig        |   1 +
  configs/C29XPCIE_SPIFLASH_defconfig                |   1 +
  configs/C29XPCIE_defconfig                         |   1 +
  configs/CHIP_defconfig                             |   2 +
  configs/CHIP_pro_defconfig                         |   1 +
  configs/Cyrus_P5020_defconfig                      |   1 +
  configs/Cyrus_P5040_defconfig                      |   1 +
  configs/M5208EVBE_defconfig                        |   1 +
  configs/M52277EVB_defconfig                        |   1 +
  configs/M52277EVB_stmicro_defconfig                |   1 +
  configs/M5235EVB_Flash32_defconfig                 |   1 +
  configs/M5235EVB_defconfig                         |   1 +
  configs/M53017EVB_defconfig                        |   1 +
  configs/M54418TWR_defconfig                        |   1 +
  configs/M54418TWR_nand_mii_defconfig               |   1 +
  configs/M54418TWR_nand_rmii_defconfig              |   1 +
  configs/M54418TWR_nand_rmii_lowfreq_defconfig      |   1 +
  configs/M54418TWR_serial_mii_defconfig             |   1 +
  configs/M54418TWR_serial_rmii_defconfig            |   1 +
  configs/M54451EVB_defconfig                        |   1 +
  configs/M54451EVB_stmicro_defconfig                |   1 +
  configs/M54455EVB_a66_defconfig                    |   1 +
  configs/M54455EVB_defconfig                        |   1 +
  configs/M54455EVB_i66_defconfig                    |   1 +
  configs/M54455EVB_intel_defconfig                  |   1 +
  configs/M54455EVB_stm33_defconfig                  |   1 +
  configs/MPC8308RDB_defconfig                       |   1 +
  configs/MPC8313ERDB_33_defconfig                   |   1 +
  configs/MPC8313ERDB_66_defconfig                   |   1 +
  configs/MPC8313ERDB_NAND_33_defconfig              |   1 +
  configs/MPC8313ERDB_NAND_66_defconfig              |   1 +
  configs/MPC8315ERDB_defconfig                      |   1 +
  configs/MPC8323ERDB_defconfig                      |   1 +
  configs/MPC8349EMDS_defconfig                      |   1 +
  configs/MPC837XEMDS_HOST_defconfig                 |   1 +
  configs/MPC837XEMDS_defconfig                      |   1 +
  configs/MPC837XERDB_defconfig                      |   1 +
  configs/MPC8536DS_36BIT_defconfig                  |   1 +
  configs/MPC8536DS_SDCARD_defconfig                 |   1 +
  configs/MPC8536DS_SPIFLASH_defconfig               |   1 +
  configs/MPC8536DS_defconfig                        |   1 +
  configs/MPC8541CDS_defconfig                       |   1 +
  configs/MPC8541CDS_legacy_defconfig                |   1 +
  configs/MPC8544DS_defconfig                        |   3 +-
  configs/MPC8555CDS_defconfig                       |   1 +
  configs/MPC8555CDS_legacy_defconfig                |   1 +
  configs/MPC8568MDS_defconfig                       |   1 +
  configs/MPC8569MDS_ATM_defconfig                   |   1 +
  configs/MPC8569MDS_defconfig                       |   1 +
  configs/MPC8610HPCD_defconfig                      |   2 +-
  configs/MigoR_defconfig                            |   1 +
  configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig   |   1 +
  configs/P1010RDB-PA_36BIT_NAND_defconfig           |   1 +
  configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig    |   1 +
  configs/P1010RDB-PA_36BIT_NOR_defconfig            |   1 +
  configs/P1010RDB-PA_36BIT_SDCARD_defconfig         |   1 +
  .../P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig   |   1 +
  configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig       |   1 +
  configs/P1010RDB-PA_NAND_SECBOOT_defconfig         |   1 +
  configs/P1010RDB-PA_NAND_defconfig                 |   1 +
  configs/P1010RDB-PA_NOR_SECBOOT_defconfig          |   1 +
  configs/P1010RDB-PA_NOR_defconfig                  |   1 +
  configs/P1010RDB-PA_SDCARD_defconfig               |   1 +
  configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig     |   1 +
  configs/P1010RDB-PA_SPIFLASH_defconfig             |   1 +
  configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig   |   1 +
  configs/P1010RDB-PB_36BIT_NAND_defconfig           |   1 +
  configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig    |   1 +
  configs/P1010RDB-PB_36BIT_NOR_defconfig            |   1 +
  configs/P1010RDB-PB_36BIT_SDCARD_defconfig         |   1 +
  .../P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig   |   1 +
  configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig       |   1 +
  configs/P1010RDB-PB_NAND_SECBOOT_defconfig         |   1 +
  configs/P1010RDB-PB_NAND_defconfig                 |   1 +
  configs/P1010RDB-PB_NOR_SECBOOT_defconfig          |   1 +
  configs/P1010RDB-PB_NOR_defconfig                  |   1 +
  configs/P1010RDB-PB_SDCARD_defconfig               |   1 +
  configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig     |   1 +
  configs/P1010RDB-PB_SPIFLASH_defconfig             |   1 +
  configs/P1020MBG-PC_36BIT_SDCARD_defconfig         |   1 +
  configs/P1020MBG-PC_36BIT_defconfig                |   1 +
  configs/P1020MBG-PC_SDCARD_defconfig               |   1 +
  configs/P1020MBG-PC_defconfig                      |   1 +
  configs/P1020RDB-PC_36BIT_NAND_defconfig           |   1 +
  configs/P1020RDB-PC_36BIT_SDCARD_defconfig         |   1 +
  configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig       |   1 +
  configs/P1020RDB-PC_36BIT_defconfig                |   1 +
  configs/P1020RDB-PC_NAND_defconfig                 |   1 +
  configs/P1020RDB-PC_SDCARD_defconfig               |   1 +
  configs/P1020RDB-PC_SPIFLASH_defconfig             |   1 +
  configs/P1020RDB-PC_defconfig                      |   1 +
  configs/P1020RDB-PD_NAND_defconfig                 |   1 +
  configs/P1020RDB-PD_SDCARD_defconfig               |   1 +
  configs/P1020RDB-PD_SPIFLASH_defconfig             |   1 +
  configs/P1020RDB-PD_defconfig                      |   1 +
  configs/P1020UTM-PC_36BIT_SDCARD_defconfig         |   1 +
  configs/P1020UTM-PC_36BIT_defconfig                |   1 +
  configs/P1020UTM-PC_SDCARD_defconfig               |   1 +
  configs/P1020UTM-PC_defconfig                      |   1 +
  configs/P1021RDB-PC_36BIT_NAND_defconfig           |   1 +
  configs/P1021RDB-PC_36BIT_SDCARD_defconfig         |   1 +
  configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig       |   1 +
  configs/P1021RDB-PC_36BIT_defconfig                |   1 +
  configs/P1021RDB-PC_NAND_defconfig                 |   1 +
  configs/P1021RDB-PC_SDCARD_defconfig               |   1 +
  configs/P1021RDB-PC_SPIFLASH_defconfig             |   1 +
  configs/P1021RDB-PC_defconfig                      |   1 +
  configs/P1022DS_36BIT_NAND_defconfig               |   1 +
  configs/P1022DS_36BIT_SDCARD_defconfig             |   1 +
  configs/P1022DS_36BIT_SPIFLASH_defconfig           |   1 +
  configs/P1022DS_36BIT_defconfig                    |   1 +
  configs/P1022DS_NAND_defconfig                     |   1 +
  configs/P1022DS_SDCARD_defconfig                   |   1 +
  configs/P1022DS_SPIFLASH_defconfig                 |   1 +
  configs/P1022DS_defconfig                          |   1 +
  configs/P1023RDB_defconfig                         |   1 +
  configs/P1024RDB_36BIT_defconfig                   |   1 +
  configs/P1024RDB_NAND_defconfig                    |   1 +
  configs/P1024RDB_SDCARD_defconfig                  |   1 +
  configs/P1024RDB_SPIFLASH_defconfig                |   1 +
  configs/P1024RDB_defconfig                         |   1 +
  configs/P1025RDB_36BIT_defconfig                   |   1 +
  configs/P1025RDB_NAND_defconfig                    |   1 +
  configs/P1025RDB_SDCARD_defconfig                  |   1 +
  configs/P1025RDB_SPIFLASH_defconfig                |   1 +
  configs/P1025RDB_defconfig                         |   1 +
  configs/P2020RDB-PC_36BIT_NAND_defconfig           |   1 +
  configs/P2020RDB-PC_36BIT_SDCARD_defconfig         |   1 +
  configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig       |   1 +
  configs/P2020RDB-PC_36BIT_defconfig                |   1 +
  configs/P2020RDB-PC_NAND_defconfig                 |   1 +
  configs/P2020RDB-PC_SDCARD_defconfig               |   1 +
  configs/P2020RDB-PC_SPIFLASH_defconfig             |   1 +
  configs/P2020RDB-PC_defconfig                      |   1 +
  configs/P2041RDB_NAND_defconfig                    |   1 +
  configs/P2041RDB_SDCARD_defconfig                  |   1 +
  configs/P2041RDB_SECURE_BOOT_defconfig             |   1 +
  configs/P2041RDB_SPIFLASH_defconfig                |   1 +
  configs/P2041RDB_SRIO_PCIE_BOOT_defconfig          |   1 +
  configs/P2041RDB_defconfig                         |   1 +
  configs/P3041DS_NAND_SECURE_BOOT_defconfig         |   1 +
  configs/P3041DS_NAND_defconfig                     |   1 +
  configs/P3041DS_SDCARD_defconfig                   |   1 +
  configs/P3041DS_SECURE_BOOT_defconfig              |   1 +
  configs/P3041DS_SPIFLASH_defconfig                 |   1 +
  configs/P3041DS_SRIO_PCIE_BOOT_defconfig           |   1 +
  configs/P3041DS_defconfig                          |   1 +
  configs/P4080DS_SDCARD_defconfig                   |   1 +
  configs/P4080DS_SECURE_BOOT_defconfig              |   1 +
  configs/P4080DS_SPIFLASH_defconfig                 |   1 +
  configs/P4080DS_SRIO_PCIE_BOOT_defconfig           |   1 +
  configs/P4080DS_defconfig                          |   1 +
  configs/P5020DS_NAND_SECURE_BOOT_defconfig         |   1 +
  configs/P5020DS_NAND_defconfig                     |   1 +
  configs/P5020DS_SDCARD_defconfig                   |   1 +
  configs/P5020DS_SECURE_BOOT_defconfig              |   1 +
  configs/P5020DS_SPIFLASH_defconfig                 |   1 +
  configs/P5020DS_SRIO_PCIE_BOOT_defconfig           |   1 +
  configs/P5020DS_defconfig                          |   1 +
  configs/P5040DS_NAND_SECURE_BOOT_defconfig         |   1 +
  configs/P5040DS_NAND_defconfig                     |   1 +
  configs/P5040DS_SDCARD_defconfig                   |   1 +
  configs/P5040DS_SECURE_BOOT_defconfig              |   1 +
  configs/P5040DS_SPIFLASH_defconfig                 |   1 +
  configs/P5040DS_defconfig                          |   1 +
  configs/T1023RDB_NAND_defconfig                    |   1 +
  configs/T1023RDB_SDCARD_defconfig                  |   1 +
  configs/T1023RDB_SECURE_BOOT_defconfig             |   1 +
  configs/T1023RDB_SPIFLASH_defconfig                |   1 +
  configs/T1023RDB_defconfig                         |   1 +
  configs/T1024QDS_DDR4_SECURE_BOOT_defconfig        |   1 +
  configs/T1024QDS_DDR4_defconfig                    |   1 +
  configs/T1024QDS_NAND_defconfig                    |   1 +
  configs/T1024QDS_SDCARD_defconfig                  |   1 +
  configs/T1024QDS_SECURE_BOOT_defconfig             |   1 +
  configs/T1024QDS_SPIFLASH_defconfig                |   1 +
  configs/T1024QDS_defconfig                         |   1 +
  configs/T1024RDB_NAND_defconfig                    |   1 +
  configs/T1024RDB_SDCARD_defconfig                  |   1 +
  configs/T1024RDB_SECURE_BOOT_defconfig             |   1 +
  configs/T1024RDB_SPIFLASH_defconfig                |   1 +
  configs/T1024RDB_defconfig                         |   1 +
  configs/T1040D4RDB_NAND_defconfig                  |   1 +
  configs/T1040D4RDB_SDCARD_defconfig                |   1 +
  configs/T1040D4RDB_SECURE_BOOT_defconfig           |   1 +
  configs/T1040D4RDB_SPIFLASH_defconfig              |   1 +
  configs/T1040D4RDB_defconfig                       |   1 +
  configs/T1040QDS_DDR4_defconfig                    |   1 +
  configs/T1040QDS_SECURE_BOOT_defconfig             |   1 +
  configs/T1040QDS_defconfig                         |   1 +
  configs/T1040RDB_NAND_defconfig                    |   1 +
  configs/T1040RDB_SDCARD_defconfig                  |   1 +
  configs/T1040RDB_SECURE_BOOT_defconfig             |   1 +
  configs/T1040RDB_SPIFLASH_defconfig                |   1 +
  configs/T1040RDB_defconfig                         |   1 +
  configs/T1042D4RDB_NAND_defconfig                  |   1 +
  configs/T1042D4RDB_SDCARD_defconfig                |   1 +
  configs/T1042D4RDB_SECURE_BOOT_defconfig           |   1 +
  configs/T1042D4RDB_SPIFLASH_defconfig              |   1 +
  configs/T1042D4RDB_defconfig                       |   1 +
  configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig     |   2 +
  configs/T1042RDB_PI_NAND_defconfig                 |   1 +
  configs/T1042RDB_PI_SDCARD_defconfig               |   1 +
  configs/T1042RDB_PI_SPIFLASH_defconfig             |   1 +
  configs/T1042RDB_PI_defconfig                      |   1 +
  configs/T1042RDB_SECURE_BOOT_defconfig             |   1 +
  configs/T1042RDB_defconfig                         |   1 +
  configs/T2080QDS_NAND_defconfig                    |   1 +
  configs/T2080QDS_SDCARD_defconfig                  |   1 +
  configs/T2080QDS_SECURE_BOOT_defconfig             |   1 +
  configs/T2080QDS_SPIFLASH_defconfig                |   1 +
  configs/T2080QDS_SRIO_PCIE_BOOT_defconfig          |   1 +
  configs/T2080QDS_defconfig                         |   1 +
  configs/T2080RDB_NAND_defconfig                    |   1 +
  configs/T2080RDB_SDCARD_defconfig                  |   1 +
  configs/T2080RDB_SECURE_BOOT_defconfig             |   1 +
  configs/T2080RDB_SPIFLASH_defconfig                |   1 +
  configs/T2080RDB_SRIO_PCIE_BOOT_defconfig          |   1 +
  configs/T2080RDB_defconfig                         |   1 +
  configs/T2081QDS_NAND_defconfig                    |   1 +
  configs/T2081QDS_SDCARD_defconfig                  |   1 +
  configs/T2081QDS_SPIFLASH_defconfig                |   1 +
  configs/T2081QDS_SRIO_PCIE_BOOT_defconfig          |   1 +
  configs/T2081QDS_defconfig                         |   1 +
  configs/T4160QDS_NAND_defconfig                    |   1 +
  configs/T4160QDS_SDCARD_defconfig                  |   1 +
  configs/T4160QDS_SECURE_BOOT_defconfig             |   1 +
  configs/T4160QDS_defconfig                         |   1 +
  configs/T4160RDB_defconfig                         |   1 +
  configs/T4240QDS_NAND_defconfig                    |   1 +
  configs/T4240QDS_SDCARD_defconfig                  |   1 +
  configs/T4240QDS_SECURE_BOOT_defconfig             |   1 +
  configs/T4240QDS_SRIO_PCIE_BOOT_defconfig          |   1 +
  configs/T4240QDS_defconfig                         |   1 +
  configs/T4240RDB_SDCARD_defconfig                  |   1 +
  configs/T4240RDB_defconfig                         |   1 +
  configs/TQM834x_defconfig                          |   1 +
  configs/TWR-P1025_defconfig                        |   1 +
  configs/UCP1020_SPIFLASH_defconfig                 |   1 +
  configs/UCP1020_defconfig                          |   1 +
  configs/adp-ae3xx_defconfig                        |   1 +
  configs/adp-ag101p_defconfig                       |   1 +
  configs/alt_defconfig                              |   1 +
  configs/am335x_baltos_defconfig                    |   1 +
  configs/am335x_boneblack_defconfig                 |   1 +
  configs/am335x_boneblack_vboot_defconfig           |   1 +
  configs/am335x_evm_defconfig                       |   1 +
  configs/am335x_evm_nor_defconfig                   |   1 +
  configs/am335x_evm_norboot_defconfig               |   1 +
  configs/am335x_evm_spiboot_defconfig               |   1 +
  configs/am335x_evm_usbspl_defconfig                |   1 +
  configs/am335x_hs_evm_defconfig                    |   1 +
  configs/am335x_igep003x_defconfig                  |   1 +
  configs/am335x_shc_defconfig                       |   1 +
  configs/am335x_shc_ict_defconfig                   |   1 +
  configs/am335x_shc_netboot_defconfig               |   1 +
  configs/am335x_shc_prompt_defconfig                |   1 +
  configs/am335x_shc_sdboot_defconfig                |   1 +
  configs/am335x_shc_sdboot_prompt_defconfig         |   1 +
  configs/am335x_sl50_defconfig                      |   1 +
  configs/am3517_crane_defconfig                     |   1 +
  configs/am3517_evm_defconfig                       |   1 +
  configs/am43xx_evm_defconfig                       |   1 +
  configs/am43xx_evm_ethboot_defconfig               |   1 +
  configs/am43xx_evm_qspiboot_defconfig              |   1 +
  configs/am43xx_evm_usbhost_boot_defconfig          |   1 +
  configs/am43xx_hs_evm_defconfig                    |   1 +
  configs/am57xx_evm_defconfig                       |   1 +
  configs/am57xx_evm_nodt_defconfig                  |   1 +
  configs/am57xx_hs_evm_defconfig                    |   1 +
  configs/amcore_defconfig                           |   1 +
  configs/ap121_defconfig                            |   1 +
  configs/ap143_defconfig                            |   1 +
  configs/ap325rxa_defconfig                         |   1 +
  configs/ap_sh4a_4a_defconfig                       |   1 +
  configs/apalis_imx6_defconfig                      |   1 +
  configs/apalis_imx6_nospl_com_defconfig            |   1 +
  configs/apalis_imx6_nospl_it_defconfig             |   1 +
  configs/apf27_defconfig                            |   1 +
  configs/apx4devkit_defconfig                       |   1 +
  configs/aristainetos2_defconfig                    |   1 +
  configs/aristainetos2b_defconfig                   |   1 +
  configs/aristainetos_defconfig                     |   1 +
  configs/armadillo-800eva_defconfig                 |   1 +
  configs/arndale_defconfig                          |   1 +
  configs/aspenite_defconfig                         |   1 +
  configs/at91rm9200ek_defconfig                     |   1 +
  configs/at91rm9200ek_ram_defconfig                 |   1 +
  configs/at91sam9260ek_dataflash_cs0_defconfig      |   1 +
  configs/at91sam9260ek_dataflash_cs1_defconfig      |   1 +
  configs/at91sam9260ek_nandflash_defconfig          |   1 +
  configs/at91sam9261ek_dataflash_cs0_defconfig      |   1 +
  configs/at91sam9261ek_dataflash_cs3_defconfig      |   1 +
  configs/at91sam9261ek_nandflash_defconfig          |   1 +
  configs/at91sam9263ek_dataflash_cs0_defconfig      |   1 +
  configs/at91sam9263ek_dataflash_defconfig          |   1 +
  configs/at91sam9263ek_nandflash_defconfig          |   1 +
  configs/at91sam9263ek_norflash_boot_defconfig      |   1 +
  configs/at91sam9263ek_norflash_defconfig           |   1 +
  configs/at91sam9g10ek_dataflash_cs0_defconfig      |   1 +
  configs/at91sam9g10ek_dataflash_cs3_defconfig      |   1 +
  configs/at91sam9g10ek_nandflash_defconfig          |   1 +
  configs/at91sam9g20ek_2mmc_defconfig               |   1 +
  configs/at91sam9g20ek_2mmc_nandflash_defconfig     |   1 +
  configs/at91sam9g20ek_dataflash_cs0_defconfig      |   1 +
  configs/at91sam9g20ek_dataflash_cs1_defconfig      |   1 +
  configs/at91sam9g20ek_nandflash_defconfig          |   1 +
  configs/at91sam9m10g45ek_mmc_defconfig             |   1 +
  configs/at91sam9m10g45ek_nandflash_defconfig       |   1 +
  configs/at91sam9n12ek_mmc_defconfig                |   1 +
  configs/at91sam9n12ek_nandflash_defconfig          |   1 +
  configs/at91sam9n12ek_spiflash_defconfig           |   1 +
  configs/at91sam9rlek_dataflash_defconfig           |   1 +
  configs/at91sam9rlek_mmc_defconfig                 |   1 +
  configs/at91sam9rlek_nandflash_defconfig           |   1 +
  configs/at91sam9x5ek_dataflash_defconfig           |   1 +
  configs/at91sam9x5ek_mmc_defconfig                 |   1 +
  configs/at91sam9x5ek_nandflash_defconfig           |   1 +
  configs/at91sam9x5ek_spiflash_defconfig            |   1 +
  configs/at91sam9xeek_dataflash_cs0_defconfig       |   1 +
  configs/at91sam9xeek_dataflash_cs1_defconfig       |   1 +
  configs/at91sam9xeek_nandflash_defconfig           |   1 +
  configs/axm_defconfig                              |   1 +
  configs/axs101_defconfig                           |   1 +
  configs/axs103_defconfig                           |   1 +
  configs/bayleybay_defconfig                        |   2 +-
  configs/bcm11130_defconfig                         |   1 +
  configs/bcm11130_nand_defconfig                    |   1 +
  configs/bcm23550_w1d_defconfig                     |   1 +
  configs/bcm28155_ap_defconfig                      |   1 +
  configs/bcm28155_w1d_defconfig                     |   1 +
  configs/bcm911360_entphn-ns_defconfig              |   1 +
  configs/bcm911360_entphn_defconfig                 |   1 +
  configs/bcm911360k_defconfig                       |   1 +
  configs/bcm958300k-ns_defconfig                    |   1 +
  configs/bcm958300k_defconfig                       |   1 +
  configs/bcm958305k_defconfig                       |   1 +
  configs/bcm958622hr_defconfig                      |   1 +
  configs/bcm958712k_defconfig                       |   1 +
  configs/bg0900_defconfig                           |   1 +
  configs/birdland_bav335a_defconfig                 |   1 +
  configs/birdland_bav335b_defconfig                 |   1 +
  configs/bk4r1_defconfig                            |   3 +-
  configs/blanche_defconfig                          |   1 +
  configs/brppt1_mmc_defconfig                       |   1 +
  configs/brppt1_nand_defconfig                      |   1 +
  configs/brppt1_spi_defconfig                       |   1 +
  configs/brxre1_defconfig                           |   1 +
  configs/caddy2_defconfig                           |   1 +
  configs/cairo_defconfig                            |   1 +
  configs/calimain_defconfig                         |   1 +
  configs/cgtqmx6eval_defconfig                      |   1 +
  configs/chiliboard_defconfig                       |   1 +
  configs/chromebit_mickey_defconfig                 |   1 +
  configs/chromebook_jerry_defconfig                 |   1 +
  configs/chromebook_link64_defconfig                |   5 +-
  configs/chromebook_link_defconfig                  |   5 +-
  configs/chromebook_minnie_defconfig                |   1 +
  configs/chromebook_samus_defconfig                 |   3 +-
  configs/chromebox_panther_defconfig                |   5 +-
  configs/cl-som-am57x_defconfig                     |   1 +
  configs/clearfog_defconfig                         |   1 +
  configs/cm_fx6_defconfig                           |   1 +
  configs/cm_t335_defconfig                          |   1 +
  configs/cm_t3517_defconfig                         |   1 +
  configs/cm_t35_defconfig                           |   1 +
  configs/cm_t43_defconfig                           |   1 +
  configs/cm_t54_defconfig                           |   3 +-
  configs/colibri_imx6_defconfig                     |   1 +
  configs/colibri_imx6_nospl_defconfig               |   1 +
  configs/colibri_imx7_defconfig                     |   1 +
  configs/colibri_pxa270_defconfig                   |   1 +
  configs/colibri_t20_defconfig                      |   1 +
  configs/colibri_vf_defconfig                       |   3 +-
  ...conga-qeval20-qa3-e3845-internal-uart_defconfig |   1 +
  .../controlcenterd_36BIT_SDCARD_DEVELOP_defconfig  |   1 +
  configs/controlcenterd_36BIT_SDCARD_defconfig      |   1 +
  .../controlcenterd_TRAILBLAZER_DEVELOP_defconfig   |   1 +
  configs/controlcenterd_TRAILBLAZER_defconfig       |   1 +
  configs/controlcenterdc_defconfig                  |   3 +-
  configs/coreboot-x86_defconfig                     |   1 +
  configs/corvus_defconfig                           |   1 +
  configs/cougarcanyon2_defconfig                    |   3 +-
  configs/crownbay_defconfig                         |   3 +-
  configs/d2net_v2_defconfig                         |   1 +
  configs/da850_am18xxevm_defconfig                  |   1 +
  configs/da850evm_defconfig                         |   1 +
  configs/da850evm_direct_nor_defconfig              |   1 +
  configs/dalmore_defconfig                          |   1 +
  configs/db-88f6720_defconfig                       |   1 +
  configs/db-88f6820-amc_defconfig                   |   1 +
  configs/db-88f6820-gp_defconfig                    |   3 +-
  configs/dbau1000_defconfig                         |   1 +
  configs/dbau1100_defconfig                         |   1 +
  configs/dbau1500_defconfig                         |   1 +
  configs/dbau1550_defconfig                         |   1 +
  configs/dbau1550_el_defconfig                      |   1 +
  configs/devkit3250_defconfig                       |   1 +
  configs/devkit8000_defconfig                       |   1 +
  configs/dms-ba16-1g_defconfig                      |   1 +
  configs/dms-ba16_defconfig                         |   1 +
  configs/dns325_defconfig                           |   1 +
  configs/dockstar_defconfig                         |   1 +
  configs/dra7xx_evm_defconfig                       |   3 +-
  configs/dra7xx_hs_evm_defconfig                    |   3 +-
  configs/draco_defconfig                            |   1 +
  configs/dragonboard410c_defconfig                  |   1 +
  configs/dreamplug_defconfig                        |   1 +
  configs/ds109_defconfig                            |   1 +
  configs/duovero_defconfig                          |   1 +
  configs/ea20_defconfig                             |   1 +
  configs/eco5pk_defconfig                           |   1 +
  configs/ecovec_defconfig                           |   1 +
  configs/edb9315a_defconfig                         |   1 +
  configs/edminiv2_defconfig                         |   1 +
  configs/efi-x86_defconfig                          |   1 +
  configs/espresso7420_defconfig                     |   1 +
  configs/espt_defconfig                             |   1 +
  configs/etamin_defconfig                           |   1 +
  configs/ethernut5_defconfig                        |   1 +
  configs/evb-ast2500_defconfig                      |   1 +
  configs/evb-px5_defconfig                          |   1 +
  configs/evb-rk3036_defconfig                       |   1 +
  configs/evb-rk3288_defconfig                       |   1 +
  configs/evb-rk3328_defconfig                       |   1 +
  configs/evb-rk3399_defconfig                       |   1 +
  configs/evb-rv1108_defconfig                       |   1 +
  configs/fennec-rk3288_defconfig                    |   1 +
  configs/firefly-rk3288_defconfig                   |   1 +
  configs/firefly-rk3399_defconfig                   |   1 +
  configs/flea3_defconfig                            |   1 +
  configs/galileo_defconfig                          |   1 +
  configs/ge_b450v3_defconfig                        |   1 +
  configs/ge_b650v3_defconfig                        |   1 +
  configs/ge_b850v3_defconfig                        |   1 +
  configs/geekbox_defconfig                          |   1 +
  configs/goflexhome_defconfig                       |   1 +
  configs/gose_defconfig                             |   1 +
  configs/gplugd_defconfig                           |   1 +
  configs/gurnard_defconfig                          |   1 +
  configs/guruplug_defconfig                         |   1 +
  configs/gwventana_emmc_defconfig                   |   1 +
  configs/gwventana_gw5904_defconfig                 |   1 +
  configs/gwventana_nand_defconfig                   |   1 +
  configs/h2200_defconfig                            |   1 +
  configs/harmony_defconfig                          |   1 +
  configs/highbank_defconfig                         |   3 +-
  configs/hikey_defconfig                            |   1 +
  configs/hrcon_defconfig                            |   1 +
  configs/hrcon_dh_defconfig                         |   1 +
  configs/hsdk_defconfig                             |   1 +
  configs/ib62x0_defconfig                           |   1 +
  configs/iconnect_defconfig                         |   1 +
  configs/ids8313_defconfig                          |   1 +
  configs/igep0020_defconfig                         |   1 +
  configs/igep0030_defconfig                         |   1 +
  configs/igep0032_defconfig                         |   1 +
  configs/imgtec_xilfpga_defconfig                   |   1 +
  configs/imx31_phycore_defconfig                    |   1 +
  configs/imx31_phycore_eet_defconfig                |   1 +
  configs/imx6q_logic_defconfig                      |   1 +
  configs/imx6qdl_icore_mmc_defconfig                |   7 +-
  configs/imx6qdl_icore_nand_defconfig               |  12 +-
  configs/imx6qdl_icore_rqs_mmc_defconfig            |   9 +-
  configs/imx6ul_geam_mmc_defconfig                  |   7 +-
  configs/imx6ul_geam_nand_defconfig                 |   7 +-
  configs/imx6ul_isiot_emmc_defconfig                |   7 +-
  configs/imx6ul_isiot_mmc_defconfig                 |   7 +-
  configs/imx6ul_isiot_nand_defconfig                |   7 +-
  configs/inetspace_v2_defconfig                     |   1 +
  configs/integratorap_cm720t_defconfig              |   1 +
  configs/integratorap_cm920t_defconfig              |   1 +
  configs/integratorap_cm926ejs_defconfig            |   1 +
  configs/integratorap_cm946es_defconfig             |   1 +
  configs/ipam390_defconfig                          |   1 +
  configs/k2e_evm_defconfig                          |   1 +
  configs/k2e_hs_evm_defconfig                       |   1 +
  configs/k2g_evm_defconfig                          |   1 +
  configs/k2g_hs_evm_defconfig                       |   1 +
  configs/k2hk_evm_defconfig                         |   1 +
  configs/k2hk_hs_evm_defconfig                      |   1 +
  configs/k2l_evm_defconfig                          |   1 +
  configs/kc1_defconfig                              |   1 +
  configs/km_kirkwood_128m16_defconfig               |   1 +
  configs/km_kirkwood_defconfig                      |   1 +
  configs/km_kirkwood_pci_defconfig                  |   1 +
  configs/kmcoge4_defconfig                          |   1 +
  configs/kmcoge5ne_defconfig                        |   1 +
  configs/kmcoge5un_defconfig                        |   1 +
  configs/kmeter1_defconfig                          |   1 +
  configs/kmlion1_defconfig                          |   1 +
  configs/kmnusa_defconfig                           |   1 +
  configs/kmsugp1_defconfig                          |   1 +
  configs/kmsuv31_defconfig                          |   1 +
  configs/koelsch_defconfig                          |   1 +
  configs/kylin-rk3036_defconfig                     |   1 +
  configs/kzm9g_defconfig                            |   1 +
  configs/lager_defconfig                            |   1 +
  configs/legoev3_defconfig                          |   1 +
  configs/liteboard_defconfig                        |   1 +
  configs/ls1012afrdm_qspi_defconfig                 |   1 +
  configs/ls1012aqds_qspi_defconfig                  |   3 +-
  configs/ls1012ardb_qspi_SECURE_BOOT_defconfig      |   1 +
  configs/ls1012ardb_qspi_defconfig                  |   1 +
  configs/ls1021aiot_qspi_defconfig                  |   1 +
  configs/ls1021aiot_sdcard_defconfig                |   1 +
  configs/ls1021aqds_ddr4_nor_defconfig              |   1 +
  configs/ls1021aqds_ddr4_nor_lpuart_defconfig       |   1 +
  configs/ls1021aqds_nand_defconfig                  |   1 +
  configs/ls1021aqds_nor_SECURE_BOOT_defconfig       |   1 +
  configs/ls1021aqds_nor_defconfig                   |   1 +
  configs/ls1021aqds_nor_lpuart_defconfig            |   1 +
  configs/ls1021aqds_qspi_defconfig                  |   1 +
  configs/ls1021aqds_sdcard_ifc_defconfig            |   1 +
  configs/ls1021aqds_sdcard_qspi_defconfig           |   1 +
  configs/ls1021atwr_nor_SECURE_BOOT_defconfig       |   1 +
  configs/ls1021atwr_nor_defconfig                   |   1 +
  configs/ls1021atwr_nor_lpuart_defconfig            |   1 +
  configs/ls1021atwr_qspi_defconfig                  |   1 +
  .../ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig    |   2 +
  configs/ls1021atwr_sdcard_ifc_defconfig            |   1 +
  configs/ls1021atwr_sdcard_qspi_defconfig           |   1 +
  configs/ls1043aqds_defconfig                       |   1 +
  configs/ls1043aqds_lpuart_defconfig                |   1 +
  configs/ls1043aqds_nand_defconfig                  |   1 +
  configs/ls1043aqds_nor_ddr3_defconfig              |   1 +
  configs/ls1043aqds_qspi_defconfig                  |   1 +
  configs/ls1043aqds_sdcard_ifc_defconfig            |   1 +
  configs/ls1043aqds_sdcard_qspi_defconfig           |   1 +
  configs/ls1043ardb_SECURE_BOOT_defconfig           |   1 +
  configs/ls1043ardb_defconfig                       |   1 +
  configs/ls1043ardb_nand_SECURE_BOOT_defconfig      |   2 +
  configs/ls1043ardb_nand_defconfig                  |   1 +
  configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig    |   2 +
  configs/ls1043ardb_sdcard_defconfig                |   1 +
  configs/ls1046aqds_SECURE_BOOT_defconfig           |   1 +
  configs/ls1046aqds_defconfig                       |   1 +
  configs/ls1046aqds_lpuart_defconfig                |   1 +
  configs/ls1046aqds_nand_defconfig                  |   1 +
  configs/ls1046aqds_qspi_defconfig                  |   1 +
  configs/ls1046aqds_sdcard_ifc_defconfig            |   1 +
  configs/ls1046aqds_sdcard_qspi_defconfig           |   1 +
  configs/ls1046ardb_emmc_defconfig                  |   1 +
  configs/ls1046ardb_qspi_SECURE_BOOT_defconfig      |   1 +
  configs/ls1046ardb_qspi_defconfig                  |   1 +
  configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig    |   2 +
  configs/ls1046ardb_sdcard_defconfig                |   1 +
  configs/ls2080a_emu_defconfig                      |   1 +
  configs/ls2080a_simu_defconfig                     |   1 +
  configs/ls2080aqds_SECURE_BOOT_defconfig           |   1 +
  configs/ls2080aqds_defconfig                       |   1 +
  configs/ls2080aqds_nand_defconfig                  |   1 +
  configs/ls2080aqds_qspi_defconfig                  |   1 +
  configs/ls2080aqds_sdcard_defconfig                |   1 +
  configs/ls2080ardb_SECURE_BOOT_defconfig           |   1 +
  configs/ls2080ardb_defconfig                       |   1 +
  configs/ls2080ardb_nand_defconfig                  |   1 +
  configs/ls2081ardb_defconfig                       |   3 +-
  configs/ls2088ardb_qspi_defconfig                  |   1 +
  configs/lschlv2_defconfig                          |   1 +
  configs/lsxhl_defconfig                            |   1 +
  configs/m28evk_defconfig                           |   1 +
  configs/m53evk_defconfig                           |   1 +
  configs/ma5d4evk_defconfig                         |  17 +-
  configs/marsboard_defconfig                        |   3 +-
  configs/mccmon6_nor_defconfig                      |   1 +
  configs/mccmon6_sd_defconfig                       |   1 +
  configs/mcx_defconfig                              |   1 +
  configs/medcom-wide_defconfig                      |   1 +
  configs/meesc_dataflash_defconfig                  |   1 +
  configs/meesc_defconfig                            |   1 +
  configs/mgcoge3un_defconfig                        |   1 +
  configs/microblaze-generic_defconfig               |   1 +
  configs/minnowmax_defconfig                        |   2 +-
  configs/miqi-rk3288_defconfig                      |   1 +
  configs/mpc8308_p1m_defconfig                      |   1 +
  configs/ms7722se_defconfig                         |   1 +
  configs/ms7750se_defconfig                         |   1 +
  configs/mt_ventoux_defconfig                       |   1 +
  configs/mvebu_db-88f3720_defconfig                 |   1 +
  configs/mvebu_db-88f7040-nand_defconfig            |   1 +
  configs/mvebu_db-88f7040_defconfig                 |   1 +
  configs/mvebu_db-88f8040_defconfig                 |   1 +
  configs/mvebu_espressobin-88f3720_defconfig        |   1 +
  configs/mvebu_mcbin-88f8040_defconfig              |   1 +
  configs/mx23_olinuxino_defconfig                   |   1 +
  configs/mx23evk_defconfig                          |   1 +
  configs/mx25pdk_defconfig                          |   1 +
  configs/mx28evk_auart_console_defconfig            |   3 +-
  configs/mx28evk_defconfig                          |   2 +-
  configs/mx28evk_nand_defconfig                     |   2 +-
  configs/mx28evk_spi_defconfig                      |   2 +-
  configs/mx31ads_defconfig                          |   1 +
  configs/mx31pdk_defconfig                          |   1 +
  configs/mx35pdk_defconfig                          |   1 +
  configs/mx51evk_defconfig                          |   1 +
  configs/mx53ard_defconfig                          |   1 +
  configs/mx53cx9020_defconfig                       |   1 +
  configs/mx53evk_defconfig                          |   1 +
  configs/mx53loco_defconfig                         |   1 +
  configs/mx53smd_defconfig                          |   1 +
  configs/mx6cuboxi_defconfig                        |   1 +
  configs/mx6dlarm2_defconfig                        |   1 +
  configs/mx6dlarm2_lpddr2_defconfig                 |   1 +
  configs/mx6dlsabreauto_defconfig                   |   1 +
  configs/mx6qarm2_defconfig                         |   1 +
  configs/mx6qarm2_lpddr2_defconfig                  |   1 +
  configs/mx6qpsabreauto_defconfig                   |   1 +
  configs/mx6qsabreauto_defconfig                    |   1 +
  configs/mx6qsabrelite_defconfig                    |   1 +
  configs/mx6sabresd_defconfig                       |   1 +
  configs/mx6slevk_defconfig                         |   1 +
  configs/mx6slevk_spinor_defconfig                  |   1 +
  configs/mx6slevk_spl_defconfig                     |   1 +
  configs/mx6sllevk_defconfig                        |   1 +
  configs/mx6sllevk_plugin_defconfig                 |   1 +
  configs/mx6ul_14x14_evk_defconfig                  |   1 +
  configs/mx6ul_9x9_evk_defconfig                    |   1 +
  configs/mx6ull_14x14_evk_defconfig                 |   1 +
  configs/mx6ull_14x14_evk_plugin_defconfig          |   1 +
  configs/mx7ulp_evk_defconfig                       |   1 +
  configs/mx7ulp_evk_plugin_defconfig                |   1 +
  configs/nas220_defconfig                           |   1 +
  configs/net2big_v2_defconfig                       |   1 +
  configs/netspace_lite_v2_defconfig                 |   1 +
  configs/netspace_max_v2_defconfig                  |   1 +
  configs/netspace_mini_v2_defconfig                 |   1 +
  configs/netspace_v2_defconfig                      |   1 +
  configs/nitrogen6dl2g_defconfig                    |   1 +
  configs/nitrogen6dl_defconfig                      |   1 +
  configs/nitrogen6q2g_defconfig                     |   1 +
  configs/nitrogen6q_defconfig                       |   1 +
  configs/nitrogen6s1g_defconfig                     |   1 +
  configs/nitrogen6s_defconfig                       |   1 +
  configs/nokia_rx51_defconfig                       |   1 +
  configs/novena_defconfig                           |   1 +
  configs/nsa310s_defconfig                          |   1 +
  configs/nsim_700_defconfig                         |   1 +
  configs/nsim_700be_defconfig                       |   1 +
  configs/nsim_hs38_defconfig                        |   1 +
  configs/nsim_hs38be_defconfig                      |   1 +
  configs/odroid-c2_defconfig                        |   1 +
  configs/odroid-xu3_defconfig                       |   2 +-
  configs/omap3_beagle_defconfig                     |   1 +
  configs/omap3_evm_defconfig                        |   1 +
  configs/omap3_ha_defconfig                         |   1 +
  configs/omap3_logic_defconfig                      |   1 +
  configs/omap3_overo_defconfig                      |   1 +
  configs/omap3_pandora_defconfig                    |   1 +
  configs/omap3_zoom1_defconfig                      |   1 +
  configs/omap4_panda_defconfig                      |   1 +
  configs/omap4_sdp4430_defconfig                    |   1 +
  configs/omap5_uevm_defconfig                       |   3 +-
  configs/omapl138_lcdk_defconfig                    |   1 +
  configs/openrd_base_defconfig                      |   1 +
  configs/openrd_client_defconfig                    |   1 +
  configs/openrd_ultimate_defconfig                  |   1 +
  configs/opos6uldev_defconfig                       |   1 +
  configs/ot1200_defconfig                           |   1 +
  configs/ot1200_spl_defconfig                       |   1 +
  configs/paz00_defconfig                            |   1 +
  configs/pb1000_defconfig                           |   1 +
  configs/pcm051_rev1_defconfig                      |   1 +
  configs/pcm051_rev3_defconfig                      |   1 +
  configs/pcm052_defconfig                           |   3 +-
  configs/pcm058_defconfig                           |   1 +
  configs/peach-pi_defconfig                         |   1 +
  configs/peach-pit_defconfig                        |   1 +
  configs/pengwyn_defconfig                          |   1 +
  configs/pepper_defconfig                           |   1 +
  configs/pic32mzdask_defconfig                      |   1 +
  configs/pico-imx6ul_defconfig                      |   1 +
  configs/pico-imx7d_defconfig                       |   8 +-
  configs/picosam9g45_defconfig                      |   1 +
  configs/platinum_picon_defconfig                   |   1 +
  configs/platinum_titanium_defconfig                |   1 +
  configs/plutux_defconfig                           |   1 +
  configs/pm9261_defconfig                           |   1 +
  configs/pm9263_defconfig                           |   1 +
  configs/pm9g45_defconfig                           |   1 +
  configs/pogo_e02_defconfig                         |   1 +
  configs/popmetal-rk3288_defconfig                  |   1 +
  configs/porter_defconfig                           |   1 +
  configs/portl2_defconfig                           |   1 +
  configs/puma-rk3399_defconfig                      |   1 +
  configs/pxm2_defconfig                             |   1 +
  configs/qemu-ppce500_defconfig                     |   1 +
  configs/qemu-x86_64_defconfig                      |   1 +
  configs/qemu-x86_defconfig                         |   1 +
  configs/qemu-x86_efi_payload32_defconfig           |   1 +
  configs/qemu-x86_efi_payload64_defconfig           |   1 +
  configs/r0p7734_defconfig                          |   1 +
  configs/r2dplus_defconfig                          |   1 +
  configs/r7780mp_defconfig                          |   1 +
  configs/r8a7795_salvator-x_defconfig               |   1 +
  configs/r8a7796_salvator-x_defconfig               |   1 +
  configs/rastaban_defconfig                         |   1 +
  configs/riotboard_defconfig                        |   3 +-
  configs/rock2_defconfig                            |   1 +
  configs/rock_defconfig                             |   1 +
  configs/rut_defconfig                              |   1 +
  configs/s32v234evb_defconfig                       |   1 +
  configs/s5p_goni_defconfig                         |   1 +
  configs/sama5d2_ptc_nandflash_defconfig            |   1 +
  configs/sama5d2_ptc_spiflash_defconfig             |   1 +
  configs/sama5d2_xplained_mmc_defconfig             |   1 +
  configs/sama5d2_xplained_spiflash_defconfig        |   1 +
  configs/sama5d36ek_cmp_mmc_defconfig               |   1 +
  configs/sama5d36ek_cmp_nandflash_defconfig         |   1 +
  configs/sama5d36ek_cmp_spiflash_defconfig          |   1 +
  configs/sama5d3_xplained_mmc_defconfig             |   1 +
  configs/sama5d3_xplained_nandflash_defconfig       |   1 +
  configs/sama5d3xek_mmc_defconfig                   |   1 +
  configs/sama5d3xek_nandflash_defconfig             |   1 +
  configs/sama5d3xek_spiflash_defconfig              |   1 +
  configs/sama5d4_xplained_mmc_defconfig             |   1 +
  configs/sama5d4_xplained_nandflash_defconfig       |   1 +
  configs/sama5d4_xplained_spiflash_defconfig        |   1 +
  configs/sama5d4ek_mmc_defconfig                    |   1 +
  configs/sama5d4ek_nandflash_defconfig              |   1 +
  configs/sama5d4ek_spiflash_defconfig               |   1 +
  configs/sandbox_defconfig                          |   1 +
  configs/sandbox_flattree_defconfig                 |   1 +
  configs/sandbox_noblk_defconfig                    |   1 +
  configs/sandbox_spl_defconfig                      |   1 +
  configs/sansa_fuze_plus_defconfig                  |   1 +
  configs/sc_sps_1_defconfig                         |   1 +
  configs/seaboard_defconfig                         |   1 +
  configs/secomx6quq7_defconfig                      |   2 +-
  configs/sh7752evb_defconfig                        |   1 +
  configs/sh7753evb_defconfig                        |   1 +
  configs/sh7757lcr_defconfig                        |   1 +
  configs/sh7763rdp_defconfig                        |   1 +
  configs/sh7785lcr_32bit_defconfig                  |   1 +
  configs/sh7785lcr_defconfig                        |   1 +
  configs/sheep-rk3368_defconfig                     |   1 +
  configs/sheevaplug_defconfig                       |   1 +
  configs/silk_defconfig                             |   1 +
  configs/smartweb_defconfig                         |   1 +
  configs/smdk5250_defconfig                         |   1 +
  configs/smdk5420_defconfig                         |   1 +
  configs/snapper9260_defconfig                      |   1 +
  configs/snapper9g20_defconfig                      |   1 +
  configs/sniper_defconfig                           |   1 +
  configs/snow_defconfig                             |   1 +
  configs/socfpga_arria10_defconfig                  |   1 +
  configs/socfpga_arria5_defconfig                   |   1 +
  configs/socfpga_cyclone5_defconfig                 |   1 +
  configs/socfpga_de0_nano_soc_defconfig             |   1 +
  configs/socfpga_de10_nano_defconfig                |   1 +
  configs/socfpga_de1_soc_defconfig                  |   1 +
  configs/socfpga_is1_defconfig                      |   1 +
  configs/socfpga_mcvevk_defconfig                   |   1 +
  configs/socfpga_sockit_defconfig                   |   1 +
  configs/socfpga_socrates_defconfig                 |   1 +
  configs/socfpga_sr1500_defconfig                   |   1 +
  configs/socfpga_vining_fpga_defconfig              |   1 +
  configs/socrates_defconfig                         |   1 +
  configs/som-db5800-som-6867_defconfig              |   2 +-
  configs/spear300_defconfig                         |   1 +
  configs/spear300_nand_defconfig                    |   1 +
  configs/spear300_usbtty_defconfig                  |   1 +
  configs/spear300_usbtty_nand_defconfig             |   1 +
  configs/spear310_defconfig                         |   1 +
  configs/spear310_nand_defconfig                    |   1 +
  configs/spear310_pnor_defconfig                    |   1 +
  configs/spear310_usbtty_defconfig                  |   1 +
  configs/spear310_usbtty_nand_defconfig             |   1 +
  configs/spear310_usbtty_pnor_defconfig             |   1 +
  configs/spear320_defconfig                         |   1 +
  configs/spear320_nand_defconfig                    |   1 +
  configs/spear320_pnor_defconfig                    |   1 +
  configs/spear320_usbtty_defconfig                  |   1 +
  configs/spear320_usbtty_nand_defconfig             |   1 +
  configs/spear320_usbtty_pnor_defconfig             |   1 +
  configs/spear600_defconfig                         |   1 +
  configs/spear600_nand_defconfig                    |   1 +
  configs/spear600_usbtty_defconfig                  |   1 +
  configs/spear600_usbtty_nand_defconfig             |   1 +
  configs/spring_defconfig                           |   1 +
  configs/stih410-b2260_defconfig                    |   1 +
  configs/stm32f429-discovery_defconfig              |   1 +
  configs/stm32f746-disco_defconfig                  |   1 +
  configs/stout_defconfig                            |   1 +
  configs/stv0991_defconfig                          |   1 +
  configs/tao3530_defconfig                          |   1 +
  configs/taurus_defconfig                           |   1 +
  configs/tb100_defconfig                            |   1 +
  configs/tbs2910_defconfig                          |   1 +
  configs/tec_defconfig                              |   1 +
  configs/thuban_defconfig                           |   1 +
  configs/thunderx_88xx_defconfig                    |   1 +
  configs/ti814x_evm_defconfig                       |   1 +
  configs/ti816x_evm_defconfig                       |   6 +-
  configs/tinker-rk3288_defconfig                    |   1 +
  configs/titanium_defconfig                         |   1 +
  configs/topic_miami_defconfig                      |   1 +
  configs/topic_miamilite_defconfig                  |   5 +-
  configs/topic_miamiplus_defconfig                  |   3 +-
  configs/tplink_wdr4300_defconfig                   |   1 +
  configs/tqma6dl_mba6_mmc_defconfig                 |   1 +
  configs/tqma6dl_mba6_spi_defconfig                 |   1 +
  configs/tqma6q_mba6_mmc_defconfig                  |   1 +
  configs/tqma6q_mba6_spi_defconfig                  |   1 +
  configs/tqma6s_mba6_mmc_defconfig                  |   1 +
  configs/tqma6s_mba6_spi_defconfig                  |   1 +
  configs/tqma6s_wru4_mmc_defconfig                  |   1 +
  configs/tricorder_defconfig                        |   1 +
  configs/tricorder_flash_defconfig                  |   1 +
  configs/trimslice_defconfig                        |   1 +
  configs/ts4600_defconfig                           |   2 +-
  configs/ts4800_defconfig                           |   1 +
  configs/twister_defconfig                          |   1 +
  configs/udoo_defconfig                             |   1 +
  configs/usb_a9263_dataflash_defconfig              |   1 +
  configs/usbarmory_defconfig                        |   1 +
  configs/vct_platinum_defconfig                     |   1 +
  configs/vct_platinum_small_defconfig               |   1 +
  configs/vct_platinumavc_defconfig                  |   1 +
  configs/vct_platinumavc_small_defconfig            |   1 +
  configs/vct_premium_defconfig                      |   1 +
  configs/vct_premium_small_defconfig                |   1 +
  configs/ve8313_defconfig                           |   1 +
  configs/ventana_defconfig                          |   1 +
  configs/vexpress_aemv8a_dram_defconfig             |   1 +
  configs/vexpress_aemv8a_juno_defconfig             |   1 +
  configs/vexpress_aemv8a_semi_defconfig             |   1 +
  configs/vexpress_ca15_tc2_defconfig                |   1 +
  configs/vexpress_ca5x2_defconfig                   |   1 +
  configs/vexpress_ca9x4_defconfig                   |   1 +
  configs/vf610twr_defconfig                         |   3 +-
  configs/vf610twr_nand_defconfig                    |   3 +-
  configs/vinco_defconfig                            |   1 +
  configs/vme8349_defconfig                          |   1 +
  configs/wandboard_defconfig                        |   1 +
  configs/warp_defconfig                             |   1 +
  configs/woodburn_defconfig                         |   1 +
  configs/woodburn_sd_defconfig                      |   1 +
  configs/work_92105_defconfig                       |   1 +
  configs/x600_defconfig                             |   1 +
  configs/xfi3_defconfig                             |   1 +
  configs/xilinx_zynqmp_ep_defconfig                 |   5 +-
  configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig   |   1 +
  configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig   |   1 +
  configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig   |   1 +
  configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig   |   1 +
  configs/xilinx_zynqmp_zcu102_defconfig             |   5 +-
  configs/xilinx_zynqmp_zcu102_revB_defconfig        |   5 +-
  configs/xpedite550x_defconfig                      |   1 +
  configs/xpress_defconfig                           |   1 +
  configs/xpress_spl_defconfig                       |   1 +
  configs/xtfpga_defconfig                           |   1 +
  configs/zc5202_defconfig                           |   1 +
  configs/zc5601_defconfig                           |   1 +
  configs/zipitz2_defconfig                          |   1 +
  configs/zmx25_defconfig                            |   1 +
  configs/zynq_microzed_defconfig                    |   1 +
  configs/zynq_picozed_defconfig                     |   1 +
  configs/zynq_zc702_defconfig                       |   1 +
  configs/zynq_zc706_defconfig                       |   1 +
  configs/zynq_zc770_xm010_defconfig                 |   1 +
  configs/zynq_zc770_xm011_defconfig                 |   1 +
  configs/zynq_zc770_xm012_defconfig                 |   1 +
  configs/zynq_zc770_xm013_defconfig                 |   1 +
  configs/zynq_zed_defconfig                         |   1 +
  configs/zynq_zybo_defconfig                        |   1 +
  drivers/bootcount/bootcount_env.c                  |   3 +-
  env/Kconfig                                        | 403 +++++++++++++++++++++
  env/Makefile                                       |  57 +++
  common/env_attr.c => env/attr.c                    |   0
  common/env_callback.c => env/callback.c            |   0
  common/env_common.c => env/common.c                |  38 +-
  common/env_dataflash.c => env/dataflash.c          |  33 +-
  common/env_eeprom.c => env/eeprom.c                |  61 ++--
  common/env_embedded.c => env/embedded.c            |   0
  env/env.c                                          | 151 ++++++++
  common/env_ext4.c => env/ext4.c                    |  28 +-
  common/env_fat.c => env/fat.c                      |  34 +-
  common/env_flags.c => env/flags.c                  |   0
  common/env_flash.c => env/flash.c                  |  92 +++--
  common/env_mmc.c => env/mmc.c                      |  81 ++---
  common/env_nand.c => env/nand.c                    |  86 +++--
  common/env_nowhere.c => env/nowhere.c              |  22 +-
  common/env_nvram.c => env/nvram.c                  |  26 +-
  common/env_onenand.c => env/onenand.c              |  24 +-
  common/env_remote.c => env/remote.c                |  24 +-
  common/env_sata.c => env/sata.c                    |  37 +-
  common/env_sf.c => env/sf.c                        |  76 ++--
  common/env_ubi.c => env/ubi.c                      |  59 ++-
  include/asm-generic/global_data.h                  |   2 +-
  include/common.h                                   |   1 -
  include/config_fsl_chain_trust.h                   |  11 -
  include/configs/10m50_devboard.h                   |   1 -
  include/configs/3c120_devboard.h                   |   1 -
  include/configs/B4860QDS.h                         |   8 -
  include/configs/BSC9131RDB.h                       |   3 -
  include/configs/BSC9132QDS.h                       |   5 -
  include/configs/C29XPCIE.h                         |   3 -
  include/configs/M5208EVBE.h                        |   5 +-
  include/configs/M52277EVB.h                        |   3 -
  include/configs/M5235EVB.h                         |   3 +-
  include/configs/M5249EVB.h                         |   6 +-
  include/configs/M5253DEMO.h                        |   6 +-
  include/configs/M5253EVBE.h                        |   4 +-
  include/configs/M5272C3.h                          |   6 +-
  include/configs/M5275EVB.h                         |   6 +-
  include/configs/M5282EVB.h                         |   3 +-
  include/configs/M53017EVB.h                        |   3 +-
  include/configs/M5329EVB.h                         |   5 +-
  include/configs/M5373EVB.h                         |   5 +-
  include/configs/M54418TWR.h                        |   2 -
  include/configs/M54451EVB.h                        |   2 -
  include/configs/M54455EVB.h                        |   3 -
  include/configs/M5475EVB.h                         |   1 -
  include/configs/M5485EVB.h                         |   1 -
  include/configs/MPC8308RDB.h                       |   1 -
  include/configs/MPC8313ERDB.h                      |   3 -
  include/configs/MPC8315ERDB.h                      |   2 -
  include/configs/MPC8323ERDB.h                      |   2 -
  include/configs/MPC832XEMDS.h                      |   2 -
  include/configs/MPC8349EMDS.h                      |   2 -
  include/configs/MPC8349ITX.h                       |   2 -
  include/configs/MPC837XEMDS.h                      |   2 -
  include/configs/MPC837XERDB.h                      |   2 -
  include/configs/MPC8536DS.h                        |   4 -
  include/configs/MPC8540ADS.h                       |   2 -
  include/configs/MPC8541CDS.h                       |   1 -
  include/configs/MPC8544DS.h                        |   1 -
  include/configs/MPC8548CDS.h                       |   1 -
  include/configs/MPC8555CDS.h                       |   1 -
  include/configs/MPC8560ADS.h                       |   2 -
  include/configs/MPC8568MDS.h                       |   1 -
  include/configs/MPC8569MDS.h                       |   1 -
  include/configs/MPC8572DS.h                        |   1 -
  include/configs/MPC8610HPCD.h                      |   2 -
  include/configs/MPC8641HPCN.h                      |   2 -
  include/configs/MigoR.h                            |   1 -
  include/configs/P1010RDB.h                         |   5 -
  include/configs/P1022DS.h                          |   5 -
  include/configs/P1023RDB.h                         |   1 -
  include/configs/P2041RDB.h                         |   8 -
  include/configs/T102xQDS.h                         |   5 -
  include/configs/T102xRDB.h                         |   5 -
  include/configs/T1040QDS.h                         |   5 -
  include/configs/T104xRDB.h                         |   4 -
  include/configs/T208xQDS.h                         |   5 -
  include/configs/T208xRDB.h                         |   5 -
  include/configs/T4240QDS.h                         |   8 -
  include/configs/T4240RDB.h                         |   7 -
  include/configs/TQM834x.h                          |   1 -
  include/configs/UCP1020.h                          |   5 -
  include/configs/adp-ae3xx.h                        |   1 -
  include/configs/adp-ag101p.h                       |   1 -
  include/configs/advantech_dms-ba16.h               |   1 -
  include/configs/am335x_evm.h                       |   6 -
  include/configs/am335x_igep003x.h                  |   1 -
  include/configs/am335x_shc.h                       |   9 -
  include/configs/am335x_sl50.h                      |   4 -
  include/configs/am3517_crane.h                     |   1 -
  include/configs/am3517_evm.h                       |   1 -
  include/configs/am43xx_evm.h                       |   8 -
  include/configs/am57xx_evm.h                       |   1 -
  include/configs/amcore.h                           |   5 +-
  include/configs/ap121.h                            |   1 -
  include/configs/ap143.h                            |   1 -
  include/configs/ap325rxa.h                         |   1 -
  include/configs/ap_sh4a_4a.h                       |   1 -
  include/configs/apalis-tk1.h                       |   1 -
  include/configs/apalis_imx6.h                      |   2 -
  include/configs/apalis_t30.h                       |   1 -
  include/configs/apf27.h                            |   1 -
  include/configs/apx4devkit.h                       |   1 -
  include/configs/aristainetos-common.h              |   1 -
  include/configs/armadillo-800eva.h                 |   1 -
  include/configs/arndale.h                          |   1 -
  include/configs/aspenite.h                         |   1 -
  include/configs/astro_mcf5373l.h                   |   4 +-
  include/configs/at91-sama5_common.h                |   3 -
  include/configs/at91rm9200ek.h                     |   1 -
  include/configs/at91sam9260ek.h                    |   4 -
  include/configs/at91sam9261ek.h                    |   3 -
  include/configs/at91sam9263ek.h                    |   3 -
  include/configs/at91sam9m10g45ek.h                 |   2 -
  include/configs/at91sam9n12ek.h                    |   3 -
  include/configs/at91sam9rlek.h                     |   3 -
  include/configs/at91sam9x5ek.h                     |   4 -
  include/configs/atngw100.h                         |   1 -
  include/configs/atngw100mkii.h                     |   1 -
  include/configs/atstk1002.h                        |   1 -
  include/configs/axs10x.h                           |   1 -
  include/configs/baltos.h                           |   1 -
  include/configs/bav335x.h                          |   7 -
  include/configs/bcm23550_w1d.h                     |   1 -
  include/configs/bcm28155_ap.h                      |   1 -
  include/configs/bcm_ep_board.h                     |   1 -
  include/configs/bcm_northstar2.h                   |   1 -
  include/configs/beaver.h                           |   1 -
  include/configs/bg0900.h                           |   1 -
  include/configs/blanche.h                          |   2 -
  include/configs/boston.h                           |   1 -
  include/configs/brppt1.h                           |   9 -
  include/configs/brxre1.h                           |   2 -
  include/configs/calimain.h                         |   1 -
  include/configs/cardhu.h                           |   1 -
  include/configs/cei-tk1-som.h                      |   1 -
  include/configs/cgtqmx6eval.h                      |   1 -
  include/configs/chiliboard.h                       |   1 -
  include/configs/cl-som-am57x.h                     |   1 -
  include/configs/clearfog.h                         |   1 -
  include/configs/cm_fx6.h                           |   1 -
  include/configs/cm_t335.h                          |   1 -
  include/configs/cm_t35.h                           |   1 -
  include/configs/cm_t3517.h                         |   1 -
  include/configs/cm_t43.h                           |   1 -
  include/configs/cm_t54.h                           |   1 -
  include/configs/cobra5272.h                        |   6 +-
  include/configs/colibri_imx6.h                     |   2 -
  include/configs/colibri_imx7.h                     |   1 -
  include/configs/colibri_pxa270.h                   |   5 -
  include/configs/colibri_t20.h                      |   1 -
  include/configs/colibri_t30.h                      |   1 -
  include/configs/comtrend_ar5387un.h                |   1 -
  include/configs/comtrend_ct5361.h                  |   1 -
  include/configs/comtrend_vr3032u.h                 |   1 -
  include/configs/controlcenterd.h                   |   3 -
  include/configs/controlcenterdc.h                  |   1 -
  include/configs/corenet_ds.h                       |   8 -
  include/configs/corvus.h                           |   1 -
  include/configs/cyrus.h                            |   1 -
  include/configs/da850evm.h                         |   7 -
  include/configs/dalmore.h                          |   1 -
  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/dbau1x00.h                         |   2 -
  include/configs/devkit3250.h                       |   1 -
  include/configs/devkit8000.h                       |   1 -
  include/configs/dns325.h                           |   3 -
  include/configs/dockstar.h                         |   3 -
  include/configs/dra7xx_evm.h                       |   3 -
  include/configs/dragonboard410c.h                  |   1 -
  include/configs/dreamplug.h                        |   3 -
  include/configs/ds109.h                            |   3 -
  include/configs/ds414.h                            |   1 -
  include/configs/duovero.h                          |   1 -
  include/configs/e2220-1170.h                       |   1 -
  include/configs/ea20.h                             |   4 -
  include/configs/eb_cpu5282.h                       |   1 -
  include/configs/ecovec.h                           |   1 -
  include/configs/edb93xx.h                          |   1 -
  include/configs/edminiv2.h                         |   1 -
  include/configs/efi-x86.h                          |   2 -
  include/configs/el6x_common.h                      |   2 -
  include/configs/espresso7420.h                     |   1 -
  include/configs/espt.h                             |   1 -
  include/configs/ethernut5.h                        |   1 -
  include/configs/evb_ast2500.h                      |   2 -
  include/configs/evb_px5.h                          |   1 -
  include/configs/evb_rk3288.h                       |   1 -
  include/configs/evb_rk3328.h                       |   1 -
  include/configs/evb_rk3399.h                       |   1 -
  include/configs/exynos5-dt-common.h                |   1 -
  include/configs/fennec_rk3288.h                    |   1 -
  include/configs/firefly-rk3288.h                   |   1 -
  include/configs/flea3.h                            |   2 -
  include/configs/ge_bx50v3.h                        |   1 -
  include/configs/geekbox.h                          |   1 -
  include/configs/goflexhome.h                       |   3 -
  include/configs/gplugd.h                           |   1 -
  include/configs/grasshopper.h                      |   1 -
  include/configs/guruplug.h                         |   3 -
  include/configs/gw_ventana.h                       |   7 -
  include/configs/h2200.h                            |   1 -
  include/configs/harmony.h                          |   1 -
  include/configs/highbank.h                         |   1 -
  include/configs/hikey.h                            |   1 -
  include/configs/hrcon.h                            |   2 -
  include/configs/hsdk.h                             |   1 -
  include/configs/huawei_hg556a.h                    |   1 -
  include/configs/ib62x0.h                           |   3 -
  include/configs/iconnect.h                         |   3 -
  include/configs/ids8313.h                          |   1 -
  include/configs/imgtec_xilfpga.h                   |   1 -
  include/configs/imx27lite-common.h                 |   1 -
  include/configs/imx31_phycore.h                    |   1 -
  include/configs/imx6_logic.h                       |   1 -
  include/configs/integratorap.h                     |   1 -
  include/configs/integratorcp.h                     |   1 -
  include/configs/ipam390.h                          |   1 -
  include/configs/jetson-tk1.h                       |   1 -
  include/configs/k2e_evm.h                          |   1 -
  include/configs/k2g_evm.h                          |   1 -
  include/configs/k2hk_evm.h                         |   1 -
  include/configs/k2l_evm.h                          |   1 -
  include/configs/kc1.h                              |   1 -
  include/configs/km/km83xx-common.h                 |   2 -
  include/configs/km/km_arm.h                        |   2 -
  include/configs/km/kmp204x-common.h                |   1 -
  include/configs/kylin_rk3036.h                     |   2 -
  include/configs/kzm9g.h                            |   1 -
  include/configs/lacie_kw.h                         |   1 -
  include/configs/legoev3.h                          |   1 -
  include/configs/liteboard.h                        |   1 -
  include/configs/ls1012a_common.h                   |   1 -
  include/configs/ls1021aiot.h                       |   2 -
  include/configs/ls1021aqds.h                       |   4 -
  include/configs/ls1021atwr.h                       |   3 -
  include/configs/ls1043aqds.h                       |   4 -
  include/configs/ls1043ardb.h                       |   3 -
  include/configs/ls1046aqds.h                       |   4 -
  include/configs/ls1046ardb.h                       |   2 -
  include/configs/ls2080a_common.h                   |   1 -
  include/configs/ls2080a_emu.h                      |   1 -
  include/configs/ls2080a_simu.h                     |   1 -
  include/configs/ls2080aqds.h                       |   3 -
  include/configs/ls2080ardb.h                       |   2 -
  include/configs/lsxl.h                             |   3 -
  include/configs/m28evk.h                           |   3 -
  include/configs/m53evk.h                           |   3 -
  include/configs/ma5d4evk.h                         |   1 -
  include/configs/malta.h                            |   1 -
  include/configs/maxbcm.h                           |   1 -
  include/configs/mccmon6.h                          |   1 -
  include/configs/mcx.h                              |   1 -
  include/configs/medcom-wide.h                      |   1 -
  include/configs/meesc.h                            |   2 -
  include/configs/meson-gxbb-common.h                |   1 -
  include/configs/microblaze-generic.h               |   5 -
  include/configs/miqi_rk3288.h                      |   1 -
  include/configs/mpc8308_p1m.h                      |   1 -
  include/configs/mpr2.h                             |   1 -
  include/configs/ms7720se.h                         |   1 -
  include/configs/ms7722se.h                         |   1 -
  include/configs/ms7750se.h                         |   1 -
  include/configs/mvebu_armada-37xx.h                |   1 -
  include/configs/mvebu_armada-8k.h                  |   3 -
  include/configs/mx23_olinuxino.h                   |   1 -
  include/configs/mx23evk.h                          |   1 -
  include/configs/mx25pdk.h                          |   1 -
  include/configs/mx31ads.h                          |   1 -
  include/configs/mx31pdk.h                          |   1 -
  include/configs/mx35pdk.h                          |   3 -
  include/configs/mx51evk.h                          |   1 -
  include/configs/mx53ard.h                          |   1 -
  include/configs/mx53cx9020.h                       |   1 -
  include/configs/mx53evk.h                          |   1 -
  include/configs/mx53loco.h                         |   1 -
  include/configs/mx53smd.h                          |   1 -
  include/configs/mx6cuboxi.h                        |   1 -
  include/configs/mx6qarm2.h                         |   1 -
  include/configs/mx6sabre_common.h                  |   2 -
  include/configs/mx6slevk.h                         |   2 -
  include/configs/mx6sllevk.h                        |   1 -
  include/configs/mx6sxsabreauto.h                   |   1 -
  include/configs/mx6sxsabresd.h                     |   1 -
  include/configs/mx6ul_14x14_evk.h                  |   1 -
  include/configs/mx6ullevk.h                        |   1 -
  include/configs/mx7dsabresd.h                      |   1 -
  include/configs/mx7ulp_evk.h                       |   1 -
  include/configs/nas220.h                           |   3 -
  include/configs/netgear_cg3100d.h                  |   1 -
  include/configs/nitrogen6x.h                       |   6 -
  include/configs/nokia_rx51.h                       |   2 -
  include/configs/novena.h                           |   3 -
  include/configs/nsa310s.h                          |   3 -
  include/configs/nsim.h                             |   1 -
  include/configs/nyan-big.h                         |   1 -
  include/configs/odroid.h                           |   1 -
  include/configs/odroid_xu3.h                       |   4 -
  include/configs/omap3_beagle.h                     |   1 -
  include/configs/omap3_cairo.h                      |   1 -
  include/configs/omap3_evm.h                        |   1 -
  include/configs/omap3_igep00x0.h                   |   1 -
  include/configs/omap3_logic.h                      |   1 -
  include/configs/omap3_overo.h                      |   1 -
  include/configs/omap3_pandora.h                    |   1 -
  include/configs/omap3_zoom1.h                      |   1 -
  include/configs/omap4_panda.h                      |   1 -
  include/configs/omap4_sdp4430.h                    |   1 -
  include/configs/omap5_uevm.h                       |   1 -
  include/configs/omapl138_lcdk.h                    |  13 -
  include/configs/openrd.h                           |   3 -
  include/configs/opos6uldev.h                       |   1 -
  include/configs/origen.h                           |   1 -
  include/configs/ot1200.h                           |   1 -
  include/configs/p1_p2_rdb_pc.h                     |   5 -
  include/configs/p1_twr.h                           |   3 -
  include/configs/p2371-0000.h                       |   1 -
  include/configs/p2371-2180.h                       |   1 -
  include/configs/p2571.h                            |   1 -
  include/configs/p2771-0000.h                       |   1 -
  include/configs/paz00.h                            |   1 -
  include/configs/pb1x00.h                           |   2 -
  include/configs/pcm051.h                           |   1 -
  include/configs/pcm058.h                           |   1 -
  include/configs/pengwyn.h                          |   1 -
  include/configs/pepper.h                           |   1 -
  include/configs/pic32mzdask.h                      |   1 -
  include/configs/pico-imx6ul.h                      |   1 -
  include/configs/pico-imx7d.h                       |   1 -
  include/configs/picosam9g45.h                      |   1 -
  include/configs/platinum.h                         |   2 -
  include/configs/plutux.h                           |   1 -
  include/configs/pm9261.h                           |   3 -
  include/configs/pm9263.h                           |   3 -
  include/configs/pm9g45.h                           |   1 -
  include/configs/pogo_e02.h                         |   3 -
  include/configs/popmetal_rk3288.h                  |   1 -
  include/configs/puma_rk3399.h                      |   1 -
  include/configs/qemu-mips.h                        |   2 -
  include/configs/qemu-mips64.h                      |   2 -
  include/configs/qemu-ppce500.h                     |   2 -
  include/configs/qemu-x86.h                         |   2 -
  include/configs/r0p7734.h                          |   1 -
  include/configs/r2dplus.h                          |   1 -
  include/configs/r7780mp.h                          |   1 -
  include/configs/rcar-gen2-common.h                 |   1 -
  include/configs/rk3036_common.h                    |   1 -
  include/configs/rock.h                             |   1 -
  include/configs/rock2.h                            |   1 -
  include/configs/rpi.h                              |   1 -
  include/configs/rsk7203.h                          |   1 -
  include/configs/rsk7264.h                          |   1 -
  include/configs/rsk7269.h                          |   1 -
  include/configs/rv1108_common.h                    |   1 -
  include/configs/s32v234evb.h                       |   1 -
  include/configs/s5p_goni.h                         |   1 -
  include/configs/s5pc210_universal.h                |   1 -
  include/configs/sagem_f at st1704.h                   |   1 -
  include/configs/salvator-x.h                       |   1 -
  include/configs/sama5d2_ptc.h                      |   1 -
  include/configs/sama5d3_xplained.h                 |   2 -
  include/configs/sama5d3xek.h                       |   2 -
  include/configs/sandbox.h                          |   1 -
  include/configs/sansa_fuze_plus.h                  |   1 -
  include/configs/sbc8349.h                          |   2 -
  include/configs/sbc8548.h                          |   1 -
  include/configs/sbc8641d.h                         |   1 -
  include/configs/sc_sps_1.h                         |   3 -
  include/configs/seaboard.h                         |   1 -
  include/configs/sfr_nb4_ser.h                      |   1 -
  include/configs/sh7752evb.h                        |   1 -
  include/configs/sh7753evb.h                        |   1 -
  include/configs/sh7757lcr.h                        |   1 -
  include/configs/sh7763rdp.h                        |   1 -
  include/configs/sh7785lcr.h                        |   1 -
  include/configs/sheep_rk3368.h                     |   1 -
  include/configs/sheevaplug.h                       |   3 -
  include/configs/shmin.h                            |   1 -
  include/configs/siemens-am33x-common.h             |   5 -
  include/configs/smartweb.h                         |   1 -
  include/configs/smdkv310.h                         |   1 -
  include/configs/snapper9260.h                      |   1 -
  include/configs/snapper9g45.h                      |   1 -
  include/configs/sniper.h                           |   1 -
  include/configs/socfpga_arria10_socdk.h            |   1 -
  include/configs/socfpga_arria5_socdk.h             |   2 -
  include/configs/socfpga_cyclone5_socdk.h           |   2 -
  include/configs/socfpga_de0_nano_soc.h             |   2 -
  include/configs/socfpga_de10_nano.h                |   2 -
  include/configs/socfpga_de1_soc.h                  |   2 -
  include/configs/socfpga_is1.h                      |   1 -
  include/configs/socfpga_mcvevk.h                   |   1 -
  include/configs/socfpga_sockit.h                   |   2 -
  include/configs/socfpga_socrates.h                 |   2 -
  include/configs/socfpga_sr1500.h                   |   1 -
  include/configs/socfpga_vining_fpga.h              |   1 -
  include/configs/socrates.h                         |   1 -
  include/configs/spear3xx_evb.h                     |   6 -
  include/configs/spear6xx_evb.h                     |   6 -
  include/configs/stih410-b2260.h                    |   1 -
  include/configs/stm32f429-discovery.h              |   1 -
  include/configs/stm32f746-disco.h                  |   1 -
  include/configs/strider.h                          |   2 -
  include/configs/stv0991.h                          |   1 -
  include/configs/tam3517-common.h                   |   1 -
  include/configs/tao3530.h                          |   1 -
  include/configs/taurus.h                           |   1 -
  include/configs/tb100.h                            |   1 -
  include/configs/tbs2910.h                          |   1 -
  include/configs/tec-ng.h                           |   1 -
  include/configs/tec.h                              |   1 -
  include/configs/theadorable.h                      |   1 -
  include/configs/thunderx_88xx.h                    |   1 -
  include/configs/ti814x_evm.h                       |   2 -
  include/configs/ti816x_evm.h                       |   1 -
  include/configs/tinker_rk3288.h                    |   1 -
  include/configs/titanium.h                         |   2 -
  include/configs/topic_miami.h                      |   1 -
  include/configs/tplink_wdr4300.h                   |   1 -
  include/configs/tqma6.h                            |   2 -
  include/configs/trats.h                            |   1 -
  include/configs/trats2.h                           |   1 -
  include/configs/tricorder.h                        |   5 -
  include/configs/trimslice.h                        |   1 -
  include/configs/ts4800.h                           |   1 -
  include/configs/udoo.h                             |   1 -
  include/configs/udoo_neo.h                         |   1 -
  include/configs/uniphier.h                         |   3 -
  include/configs/usb_a9263.h                        |   1 -
  include/configs/usbarmory.h                        |   1 -
  include/configs/vct.h                              |   1 -
  include/configs/ve8313.h                           |   1 -
  include/configs/venice2.h                          |   1 -
  include/configs/ventana.h                          |   1 -
  include/configs/vexpress_aemv8a.h                  |   1 -
  include/configs/vexpress_common.h                  |   1 -
  include/configs/veyron.h                           |   1 -
  include/configs/vining_2000.h                      |   1 -
  include/configs/vme8349.h                          |   2 -
  include/configs/wandboard.h                        |   1 -
  include/configs/warp.h                             |   1 -
  include/configs/warp7.h                            |   1 -
  include/configs/woodburn_common.h                  |   2 -
  include/configs/work_92105.h                       |   1 -
  include/configs/x600.h                             |   2 -
  include/configs/x86-chromebook.h                   |   2 -
  include/configs/x86-common.h                       |   1 -
  include/configs/xfi3.h                             |   1 -
  include/configs/xilinx-ppc.h                       |   2 -
  include/configs/xilinx_zynqmp.h                    |   4 -
  include/configs/xpedite517x.h                      |   1 -
  include/configs/xpedite520x.h                      |   1 -
  include/configs/xpedite537x.h                      |   1 -
  include/configs/xpedite550x.h                      |   1 -
  include/configs/xpress.h                           |   1 -
  include/configs/xtfpga.h                           |   1 -
  include/configs/zipitz2.h                          |   1 -
  include/configs/zmx25.h                            |   1 -
  include/configs/zynq-common.h                      |   4 -
  include/environment.h                              | 131 ++++++-
  scripts/Makefile.spl                               |   4 +-
  scripts/config_whitelist.txt                       |   7 -
  tools/Makefile                                     |   4 +-
  1415 files changed, 2196 insertions(+), 1797 deletions(-)

create mode 100644 env/Kconfig
create mode 100644 env/Makefile
rename common/env_attr.c => env/attr.c (100%) rename common/env_callback.c => env/callback.c (100%) rename common/env_common.c => env/common.c (88%) rename common/env_dataflash.c => env/dataflash.c (75%) rename common/env_eeprom.c => env/eeprom.c (86%) rename common/env_embedded.c => env/embedded.c (100%) create mode 100644 env/env.c
rename common/env_ext4.c => env/ext4.c (91%) rename common/env_fat.c => env/fat.c (84%) rename common/env_flags.c => env/flags.c (100%) rename common/env_flash.c => env/flash.c (80%) rename common/env_mmc.c => env/mmc.c (88%) rename common/env_nand.c => env/nand.c (86%) rename common/env_nowhere.c => env/nowhere.c (58%) rename common/env_nvram.c => env/nvram.c (86%) rename common/env_onenand.c => env/onenand.c (89%) rename common/env_remote.c => env/remote.c (73%) rename common/env_sata.c => env/sata.c (84%) rename common/env_sf.c => env/sf.c (87%) rename common/env_ubi.c => env/ubi.c (87%)

#38 lore raw

cover env: Move environment code to use location drivers

Hi Christophe,

Quoted 83 lines · Christophe LEROY

Simon,

Quoted 70 lines · Simon Glass

The environment code is ripe for improvement in various ways. It has lots of duplication and inconsistencies between how things work with different environment locations. It does not properly use Kconfig. Error checking and handling is patchy.

This series makes a start at improving things:

- moves the rest of the CONFIG_ENV_IS_IN_... options to Kconfig
- introduces the concept of a location driver for the environment
- drops some of the duplicated code
- improves error handling a little (more to be done here)
- moves code into a new env/ directory

There is still much more to do:
- complete Kconfig conversion (e.g. CONFIG_ENV_SIZE)
- unify environment settings so that all locations support the same options
- try to rationalise the redundancy code (can we create a common implementation used by all drivers?)
- allow environment in multiple locations (e.g. as a fallback)
- figure out why CONFIG_ENV_IS_IN_FLASH enables the environment in flash even in SPL, which other locations do not

Simon Glass (30):
Makefile: Rename 'env' target to 'environ' Move environment files from common/ to env/ Convert CONFIG_ENV_IS_IN_MMC et al to Kconfig
env: Move help from README to Kconfig
Convert CONFIG_ENV_IS_IN_FLASH to Kconfig Convert CONFIG_ENV_IS_IN_NVRAM to Kconfig Convert CONFIG_ENV_IS_IN_EEPROM to Kconfig Convert CONFIG_ENV_IS_IN_DATAFLASH to Kconfig Convert CONFIG_ENV_IS_IN_SPI_FLASH to Kconfig Convert CONFIG_ENV_IS_IN_REMOTE to Kconfig Convert CONFIG_ENV_IS_IN_FAT to Kconfig
env: common: Make env_get_addr/get_char_memory() static
env: common: Drop env_get_addr()
env: common: Factor out the common env_valid check
env: common: Drop env_get_char_init()
env: common: Drop env_get_char_memory()
env: Add an enum for environment state
env: Rename nand env_location to nand_env_location
env: Create a location driver for each location
env: Add a new implementation of environment access
env: Switch over to use environment location drivers
env: Drop common init() functions
env: Drop the env_name_spec global
env: Drop unused env_ptr variables
env: Drop env_init_new()
env: Drop env_get_char_spec()
env: Drop env_relocate_spec() in favour of env_load()
env: Drop saveenv() in favour of env_save()
env: Adjust the get_char() method to return an int
env: Adjust the load() method to return an error

  Kconfig                                            |   2 +
  Makefile                                           |   5 +-
  README                                             | 352
------------------
  arch/Kconfig                                       |   1 +
  arch/arm/Kconfig                                   |   2 +
  arch/arm/cpu/armv7/mx6/Kconfig                     |   1 +
  arch/arm/cpu/armv7/mx7/Kconfig                     |   1 +
  arch/arm/mach-exynos/Kconfig                       |   1 +
  arch/arm/mach-integrator/Kconfig                   |   2 +
  arch/arm/mach-mvebu/Kconfig                        |   1 +
  arch/arm/mach-omap2/boot-common.c                  |   3 +-
  arch/arm/mach-sunxi/Kconfig                        |   6 +
Quoted 8 lines
  arch/arm/mach-tegra/Kconfig                        |   3 +
  arch/m68k/Kconfig                                  |   8 +
  arch/microblaze/Kconfig                            |   1 +
  arch/mips/Kconfig                                  |   7 +
  arch/powerpc/Kconfig                               |   1 +
  arch/powerpc/cpu/mpc83xx/Kconfig                   |   6 +
  arch/powerpc/cpu/mpc85xx/Kconfig                   |   4 +
  arch/powerpc/cpu/mpc86xx/Kconfig                   |   1 +
Quoted 1 line

It looks like the mpc8xx has been left behind.

It may just be that there are no useful 'imply' targets there.

Quoted 2 lines

Christophe

[..]

#39 lore raw

cover env: Move environment code to use location drivers

Hi Simon,

Quoted 86 lines · Simon Glass

Hi Christophe,

Quoted 83 lines · Christophe LEROY

Simon,

Quoted 78 lines · Simon Glass

The environment code is ripe for improvement in various ways. It has lots of duplication and inconsistencies between how things work with different environment locations. It does not properly use Kconfig. Error checking and handling is patchy.

This series makes a start at improving things:

- moves the rest of the CONFIG_ENV_IS_IN_... options to Kconfig
- introduces the concept of a location driver for the environment
- drops some of the duplicated code
- improves error handling a little (more to be done here)
- moves code into a new env/ directory

There is still much more to do:
- complete Kconfig conversion (e.g. CONFIG_ENV_SIZE)
- unify environment settings so that all locations support the same options
- try to rationalise the redundancy code (can we create a common implementation used by all drivers?)
- allow environment in multiple locations (e.g. as a fallback)
- figure out why CONFIG_ENV_IS_IN_FLASH enables the environment in flash even in SPL, which other locations do not

Simon Glass (30):
Makefile: Rename 'env' target to 'environ' Move environment files from common/ to env/ Convert CONFIG_ENV_IS_IN_MMC et al to Kconfig
env: Move help from README to Kconfig
Convert CONFIG_ENV_IS_IN_FLASH to Kconfig Convert CONFIG_ENV_IS_IN_NVRAM to Kconfig Convert CONFIG_ENV_IS_IN_EEPROM to Kconfig Convert CONFIG_ENV_IS_IN_DATAFLASH to Kconfig Convert CONFIG_ENV_IS_IN_SPI_FLASH to Kconfig Convert CONFIG_ENV_IS_IN_REMOTE to Kconfig Convert CONFIG_ENV_IS_IN_FAT to Kconfig
env: common: Make env_get_addr/get_char_memory() static
env: common: Drop env_get_addr()
env: common: Factor out the common env_valid check
env: common: Drop env_get_char_init()
env: common: Drop env_get_char_memory()
env: Add an enum for environment state
env: Rename nand env_location to nand_env_location
env: Create a location driver for each location
env: Add a new implementation of environment access
env: Switch over to use environment location drivers
env: Drop common init() functions
env: Drop the env_name_spec global
env: Drop unused env_ptr variables
env: Drop env_init_new()
env: Drop env_get_char_spec()
env: Drop env_relocate_spec() in favour of env_load()
env: Drop saveenv() in favour of env_save()
env: Adjust the get_char() method to return an int
env: Adjust the load() method to return an error

   Kconfig                                            |   2 +
   Makefile                                           |   5 +-
   README                                             | 352
------------------
   arch/Kconfig                                       |   1 +
   arch/arm/Kconfig                                   |   2 +
   arch/arm/cpu/armv7/mx6/Kconfig                     |   1 +
   arch/arm/cpu/armv7/mx7/Kconfig                     |   1 +
   arch/arm/mach-exynos/Kconfig                       |   1 +
   arch/arm/mach-integrator/Kconfig                   |   2 +
   arch/arm/mach-mvebu/Kconfig                        |   1 +
   arch/arm/mach-omap2/boot-common.c                  |   3 +-
   arch/arm/mach-sunxi/Kconfig                        |   6 +
   arch/arm/mach-tegra/Kconfig                        |   3 +
   arch/m68k/Kconfig                                  |   8 +
   arch/microblaze/Kconfig                            |   1 +
   arch/mips/Kconfig                                  |   7 +
   arch/powerpc/Kconfig                               |   1 +
   arch/powerpc/cpu/mpc83xx/Kconfig                   |   6 +
   arch/powerpc/cpu/mpc85xx/Kconfig                   |   4 +
   arch/powerpc/cpu/mpc86xx/Kconfig                   |   1 +
Quoted 3 lines
Quoted 1 line

It looks like the mpc8xx has been left behind.

It may just be that there are no useful 'imply' targets there.

include/configs/MCR3000.h contains the following:

#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_SECT_SIZE (64 * 1024)
#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN)
#define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR - CONFIG_SYS_FLASH_BASE)
#define CONFIG_ENV_OVERWRITE 1

So I would expect something about it in your serie. Maybe is it because this target was added recently in mainline ?

christophe

#40 lore raw

cover env: Move environment code to use location drivers

Hi Christophe,

Quoted 109 lines · Christophe LEROY

Hi Simon,

Quoted 93 lines · Simon Glass

Hi Christophe,

Quoted 88 lines · Christophe LEROY

Simon,

Quoted 81 lines · Simon Glass

The environment code is ripe for improvement in various ways. It has lots
of duplication and inconsistencies between how things work with different
environment locations. It does not properly use Kconfig. Error checking and handling is patchy.

This series makes a start at improving things:

- moves the rest of the CONFIG_ENV_IS_IN_... options to Kconfig
- introduces the concept of a location driver for the environment
- drops some of the duplicated code
- improves error handling a little (more to be done here)
- moves code into a new env/ directory

There is still much more to do:
- complete Kconfig conversion (e.g. CONFIG_ENV_SIZE)
- unify environment settings so that all locations support the same options
- try to rationalise the redundancy code (can we create a common implementation used by all drivers?)
- allow environment in multiple locations (e.g. as a fallback)
- figure out why CONFIG_ENV_IS_IN_FLASH enables the environment in flash even in SPL, which other locations do not

Simon Glass (30):
Makefile: Rename 'env' target to 'environ' Move environment files from common/ to env/ Convert CONFIG_ENV_IS_IN_MMC et al to Kconfig
env: Move help from README to Kconfig
Convert CONFIG_ENV_IS_IN_FLASH to Kconfig Convert CONFIG_ENV_IS_IN_NVRAM to Kconfig Convert CONFIG_ENV_IS_IN_EEPROM to Kconfig Convert CONFIG_ENV_IS_IN_DATAFLASH to Kconfig Convert CONFIG_ENV_IS_IN_SPI_FLASH to Kconfig Convert CONFIG_ENV_IS_IN_REMOTE to Kconfig Convert CONFIG_ENV_IS_IN_FAT to Kconfig
env: common: Make env_get_addr/get_char_memory() static
env: common: Drop env_get_addr()
env: common: Factor out the common env_valid check
env: common: Drop env_get_char_init()
env: common: Drop env_get_char_memory()
env: Add an enum for environment state
env: Rename nand env_location to nand_env_location
env: Create a location driver for each location
env: Add a new implementation of environment access
env: Switch over to use environment location drivers
env: Drop common init() functions
env: Drop the env_name_spec global
env: Drop unused env_ptr variables
env: Drop env_init_new()
env: Drop env_get_char_spec()
env: Drop env_relocate_spec() in favour of env_load()
env: Drop saveenv() in favour of env_save()
env: Adjust the get_char() method to return an int
env: Adjust the load() method to return an error

   Kconfig                                            |   2 +
   Makefile                                           |   5 +-
   README                                             | 352
------------------
   arch/Kconfig                                       |   1 +
   arch/arm/Kconfig                                   |   2 +
   arch/arm/cpu/armv7/mx6/Kconfig                     |   1 +
   arch/arm/cpu/armv7/mx7/Kconfig                     |   1 +
   arch/arm/mach-exynos/Kconfig                       |   1 +
   arch/arm/mach-integrator/Kconfig                   |   2 +
   arch/arm/mach-mvebu/Kconfig                        |   1 +
   arch/arm/mach-omap2/boot-common.c                  |   3 +-
   arch/arm/mach-sunxi/Kconfig                        |   6 +
   arch/arm/mach-tegra/Kconfig                        |   3 +
   arch/m68k/Kconfig                                  |   8 +
   arch/microblaze/Kconfig                            |   1 +
   arch/mips/Kconfig                                  |   7 +
   arch/powerpc/Kconfig                               |   1 +
   arch/powerpc/cpu/mpc83xx/Kconfig                   |   6 +
   arch/powerpc/cpu/mpc85xx/Kconfig                   |   4 +
   arch/powerpc/cpu/mpc86xx/Kconfig                   |   1 +
Quoted 4 lines
Quoted 1 line

It looks like the mpc8xx has been left behind.

It may just be that there are no useful 'imply' targets there.

include/configs/MCR3000.h contains the following:

#define CONFIG_ENV_IS_IN_FLASH  1
#define CONFIG_ENV_SECT_SIZE    (64 * 1024)
#define CONFIG_ENV_SIZE         CONFIG_ENV_SECT_SIZE
#define CONFIG_ENV_ADDR         (CONFIG_SYS_FLASH_BASE +
Quoted 6 lines

CONFIG_SYS_MONITOR_LEN)
#define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR - CONFIG_SYS_FLASH_BASE)
#define CONFIG_ENV_OVERWRITE 1

So I would expect something about it in your serie. Maybe is it because this target was added recently in mainline ?

Yes it looks like I need to rerun that. Overall I'm not happy with how the flash stuff has turned out and will be taking another look.

Regards,
Simon

#41 lore raw

cover env: Move environment code to use location drivers

In reply to Simon Glass
Quoted 8 lines · Simon Glass

The environment code is ripe for improvement in various ways. It has lots of duplication and inconsistencies between how things work with different environment locations. It does not properly use Kconfig. Error checking and handling is patchy.

This series makes a start at improving things:

- moves the rest of the CONFIG_ENV_IS_IN_... options to Kconfig

After this, did you do some checks to make sure that everyone was migrated correctly? I ask since I had made an attempt a while back to convert and I found a lot of cases that didn't happen right and ended up hacking up something to have every target print all of the env related options to a file (and have buildman save it). But it might have been..

Quoted 7 lines

- introduces the concept of a location driver for the environment
- drops some of the duplicated code
- improves error handling a little (more to be done here)
- moves code into a new env/ directory

There is still much more to do:
- complete Kconfig conversion (e.g. CONFIG_ENV_SIZE)

Because I was converting these parts as well.

Overall the series looks good.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170712/333a4b61/attachment.sig>
#42 lore raw

cover env: Move environment code to use location drivers

Hi Tom,

Quoted 10 lines · Tom Rini
Quoted 7 lines · Simon Glass

The environment code is ripe for improvement in various ways. It has lots of duplication and inconsistencies between how things work with different environment locations. It does not properly use Kconfig. Error checking and handling is patchy.

This series makes a start at improving things:

Quoted 7 lines
Quoted 1 line

- moves the rest of the CONFIG_ENV_IS_IN_... options to Kconfig

After this, did you do some checks to make sure that everyone was migrated correctly? I ask since I had made an attempt a while back to convert and I found a lot of cases that didn't happen right and ended up hacking up something to have every target print all of the env related options to a file (and have buildman save it). But it might have been..

I need to do another pass with this series. I noticed that it doesn't bisect properly (i.e. some interim commits mess things up that later ones fix).

Quoted 11 lines
Quoted 9 lines

- introduces the concept of a location driver for the environment
- drops some of the duplicated code
- improves error handling a little (more to be done here)
- moves code into a new env/ directory

There is still much more to do:
- complete Kconfig conversion (e.g. CONFIG_ENV_SIZE)

Because I was converting these parts as well.

I think that is much harder because this option often uses other options in its expression, but perhaps it is not as bad as I think.

Quoted 2 lines

Overall the series looks good.

OK thanks. I'll make time to respin this and send v2 next week.

Regards,
Simon

#43 lore raw

cover env: Move environment code to use location drivers

Quoted 21 lines · Simon Glass

Hi Tom,

Quoted 10 lines · Tom Rini
Quoted 7 lines · Simon Glass

The environment code is ripe for improvement in various ways. It has lots of duplication and inconsistencies between how things work with different environment locations. It does not properly use Kconfig. Error checking and handling is patchy.

This series makes a start at improving things:

Quoted 7 lines
Quoted 1 line

- moves the rest of the CONFIG_ENV_IS_IN_... options to Kconfig

After this, did you do some checks to make sure that everyone was migrated correctly? I ask since I had made an attempt a while back to convert and I found a lot of cases that didn't happen right and ended up hacking up something to have every target print all of the env related options to a file (and have buildman save it). But it might have been..

Quoted 3 lines

I need to do another pass with this series. I noticed that it doesn't bisect properly (i.e. some interim commits mess things up that later ones fix).

OK.

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

- introduces the concept of a location driver for the environment
- drops some of the duplicated code
- improves error handling a little (more to be done here)
- moves code into a new env/ directory

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines

There is still much more to do:
- complete Kconfig conversion (e.g. CONFIG_ENV_SIZE)

Because I was converting these parts as well.

I think that is much harder because this option often uses other options in its expression, but perhaps it is not as bad as I think.

It's pretty awful, in some respects. Once I gave in and hacked buildman and U-Boot to have a "host tool" that would have the calculated values, spit that out and save the output file it wasn't too bad to convert. Best to save it for a follow up series :)

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170717/1afe6d77/attachment.sig>