diff options
| author | Simon Glass <sjg@chromium.org> | 2017-07-23 21:19:39 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-07-25 21:08:01 -0400 |
| commit | 2be296538e2e9d2893dc495b3fc8f9f6acb1454c (patch) | |
| tree | 8e0c795c20efffb8c3e3a0cedf62a3e3d5658c2c /include | |
| parent | 5785e51940f0dd89ab372a56fc7341fdd2739277 (diff) | |
Convert CONFIG_ENV_IS_IN_MMC/NAND/UBI and NOWHERE to Kconfig
This converts the following to Kconfig:
CONFIG_ENV_IS_IN_MMC
CONFIG_ENV_IS_IN_NAND
CONFIG_ENV_IS_IN_UBI
CONFIG_ENV_IS_NOWHERE
In fact this already exists for sunxi as a 'choice' config. However not
all the choices are available in Kconfig yet so we cannot use that. It
would lead to more than one option being set.
In addition, one purpose of this series is to allow the environment to be
stored in more than one place. So the existing choice is converted to a
normal config allowing each option to be set independently.
There are not many opportunities for Kconfig updates to reduce the size of
this patch. This was tested with
./tools/moveconfig.py -i CONFIG_ENV_IS_IN_MMC
And then manual updates. This is because for CHAIN_OF_TRUST boards they
can only have ENV_IS_NOWHERE set, so we enforce that via Kconfig logic
now.
Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include')
304 files changed, 0 insertions, 468 deletions
diff --git a/include/config_fsl_chain_trust.h b/include/config_fsl_chain_trust.h index 40d323e0044..5a1a2879925 100644 --- a/include/config_fsl_chain_trust.h +++ b/include/config_fsl_chain_trust.h @@ -14,13 +14,9 @@ #ifdef CONFIG_SECURE_BOOT #undef CONFIG_ENV_IS_IN_EEPROM -#undef CONFIG_ENV_IS_IN_NAND -#undef CONFIG_ENV_IS_IN_MMC #undef CONFIG_ENV_IS_IN_SPI_FLASH #undef CONFIG_ENV_IS_IN_FLASH -#define CONFIG_ENV_IS_NOWHERE - #endif #ifdef CONFIG_CHAIN_OF_TRUST diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 2226aba674b..61a1fa48aed 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -107,9 +107,6 @@ #define CONFIG_ENV_OVERWRITE #ifndef CONFIG_MTD_NOR_FLASH -#if !defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) && !defined(CONFIG_RAMBOOT_PBL) -#define CONFIG_ENV_IS_NOWHERE -#endif #else #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI @@ -128,13 +125,11 @@ #define CONFIG_ENV_SECT_SIZE 0x10000 #elif defined(CONFIG_SDCARD) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (512 * 1097) #elif defined(CONFIG_NAND) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (10 * CONFIG_SYS_NAND_BLOCK_SIZE) #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index 9c0e4659f97..3fa1f7b4aec 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -276,13 +276,11 @@ extern unsigned long get_sdram_size(void); #define CONFIG_ENV_SECT_SIZE 0x10000 #define CONFIG_ENV_SIZE 0x2000 #elif defined(CONFIG_NAND) -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_ENV_SIZE CONFIG_SYS_NAND_BLOCK_SIZE #define CONFIG_ENV_OFFSET ((768 * 1024) + CONFIG_SYS_NAND_BLOCK_SIZE) #define CONFIG_ENV_RANGE (3 * CONFIG_ENV_SIZE) #elif defined(CONFIG_SYS_RAMBOOT) -#define CONFIG_ENV_IS_NOWHERE /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 #endif diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 5491c47a776..ca28ab01262 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -485,7 +485,6 @@ combinations. this should be removed later * Environment */ #if defined(CONFIG_RAMBOOT_SDCARD) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_FSL_FIXED_MMC_LOCATION #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 @@ -499,12 +498,10 @@ combinations. this should be removed later #define CONFIG_ENV_SECT_SIZE 0x10000 #define CONFIG_ENV_SIZE 0x2000 #elif defined(CONFIG_NAND) || defined(CONFIG_NAND_SECBOOT) -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_SIZE CONFIG_SYS_NAND_BLOCK_SIZE #define CONFIG_ENV_OFFSET ((768 * 1024) + CONFIG_SYS_NAND_BLOCK_SIZE) #define CONFIG_ENV_RANGE (3 * CONFIG_ENV_SIZE) #elif defined(CONFIG_SYS_RAMBOOT) -#define CONFIG_ENV_IS_NOWHERE /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 #else diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index 398d0e0550c..a8bc2abcab5 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -414,7 +414,6 @@ #define CONFIG_ENV_SIZE 0x2000 #endif #elif defined(CONFIG_NAND) -#define CONFIG_ENV_IS_IN_NAND #ifdef CONFIG_TPL_BUILD #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_ADDR (CONFIG_SYS_INIT_L2_ADDR + (160 << 10)) diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h index 3b2d01e5180..0eb56c07b44 100644 --- a/include/configs/M54418TWR.h +++ b/include/configs/M54418TWR.h @@ -285,7 +285,6 @@ #define CONFIG_ENV_SECT_SIZE 0x10000 #endif #if defined(CONFIG_SYS_NAND_BOOT) -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_OFFSET 0x80000 #define CONFIG_ENV_SIZE 0x20000 #define CONFIG_ENV_SECT_SIZE 0x20000 diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index 7494b3d0b2b..5c10d9ba555 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -431,7 +431,6 @@ * Environment */ #if defined(CONFIG_NAND) - #define CONFIG_ENV_IS_IN_NAND 1 #define CONFIG_ENV_OFFSET (512 * 1024) #define CONFIG_ENV_SECT_SIZE CONFIG_SYS_NAND_BLOCK_SIZE #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE @@ -448,7 +447,6 @@ /* Address and size of Redundant Environment Sector */ #else - #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 #endif diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index 8799a9eb271..53cb6d6174a 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -426,7 +426,6 @@ #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */ #define CONFIG_ENV_SIZE 0x2000 #else - #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 #endif diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index ea99aead456..d34eacbad36 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -301,7 +301,6 @@ #define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE 0x2000 #else - #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 #endif diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h index 716fc3822e8..28b9478d046 100644 --- a/include/configs/MPC832XEMDS.h +++ b/include/configs/MPC832XEMDS.h @@ -385,7 +385,6 @@ #define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE 0x2000 #else - #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 #endif diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 2f91dd57bbf..2835d42b930 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -444,7 +444,6 @@ #define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #else - #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 #endif diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 53e089a82a1..4b9bc1fbd1e 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -459,7 +459,6 @@ boards, we say we have two, but don't display a message if we find only one. */ #define CONFIG_ENV_SIZE 0x2000 #else #undef CONFIG_FLASH_CFI_DRIVER - #define CONFIG_ENV_IS_NOWHERE /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 #endif diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index 459efb560c2..781a93ab14c 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -448,7 +448,6 @@ extern int board_pci_host_broken(void); #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ #define CONFIG_ENV_SIZE 0x2000 #else - #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 #endif diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 7afbc9096f5..ada85c7964c 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -461,7 +461,6 @@ #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K (one sector) for env */ #define CONFIG_ENV_SIZE 0x4000 #else - #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE-0x1000) #define CONFIG_ENV_SIZE 0x2000 #endif diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 470bb72fcb2..1456648d6a6 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -566,12 +566,10 @@ #define CONFIG_ENV_OFFSET 0xF0000 #define CONFIG_ENV_SECT_SIZE 0x10000 #elif defined(CONFIG_RAMBOOT_SDCARD) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_FSL_FIXED_MMC_LOCATION #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_SYS_MMC_ENV_DEV 0 #else - #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 #endif diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index 0f96ac0242f..decb57404a8 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -296,7 +296,6 @@ #define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ #define CONFIG_ENV_SIZE 0x2000 #else - #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 #endif diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index 8d026addb35..47b97d1554d 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -335,7 +335,6 @@ #define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ #define CONFIG_ENV_SIZE 0x2000 #else - #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 #endif diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 1db3a633ef3..46b9b7a67df 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -408,7 +408,6 @@ #define CONFIG_ENV_SECT_SIZE 0x20000 /* 126k (one sector) for env */ #define CONFIG_ENV_SIZE 0x2000 #else -#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 #endif diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index e87b11180a4..4a4a76d2d46 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -568,7 +568,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */ #else - #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #endif #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index a249fa6ef2f..ea549e65d97 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -677,7 +677,6 @@ extern unsigned long get_sdram_size(void); * Environment */ #if defined(CONFIG_SDCARD) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_FSL_FIXED_MMC_LOCATION #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 @@ -691,7 +690,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_ENV_SECT_SIZE 0x10000 #define CONFIG_ENV_SIZE 0x2000 #elif defined(CONFIG_NAND) -#define CONFIG_ENV_IS_IN_NAND #ifdef CONFIG_TPL_BUILD #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_ADDR (CONFIG_SYS_INIT_L2_ADDR + (160 << 10)) @@ -706,7 +704,6 @@ extern unsigned long get_sdram_size(void); #endif #define CONFIG_ENV_OFFSET (1024 * 1024) #elif defined(CONFIG_SYS_RAMBOOT) -#define CONFIG_ENV_IS_NOWHERE /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 #else diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 132f335dfdf..9bf0904c51b 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -560,7 +560,6 @@ #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 #elif defined(CONFIG_SDCARD) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_FSL_FIXED_MMC_LOCATION #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_SYS_MMC_ENV_DEV 0 @@ -571,11 +570,9 @@ #else #define CONFIG_ENV_SIZE CONFIG_SYS_NAND_BLOCK_SIZE #endif -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET (1024 * 1024) #define CONFIG_ENV_RANGE (3 * CONFIG_ENV_SIZE) #elif defined(CONFIG_SYS_RAMBOOT) -#define CONFIG_ENV_IS_NOWHERE /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 #else diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 967c83c53ba..d3b655fda93 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -55,9 +55,6 @@ #define CONFIG_ENV_OVERWRITE #ifndef CONFIG_MTD_NOR_FLASH -#if !defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) -#define CONFIG_ENV_IS_NOWHERE -#endif #else #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI @@ -76,14 +73,12 @@ #define CONFIG_ENV_SECT_SIZE 0x10000 #elif defined(CONFIG_SDCARD) #define CONFIG_SYS_EXTRA_ENV_RELOC - #define CONFIG_ENV_IS_IN_MMC #define CONFIG_FSL_FIXED_MMC_LOCATION #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (512 * 1658) #elif defined(CONFIG_NAND) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_NAND #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) diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index cbd92d92f6b..c8bba52ed13 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -155,13 +155,11 @@ #define CONFIG_ENV_SECT_SIZE 0x10000 #elif defined(CONFIG_SDCARD) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (512 * 0x800) #elif defined(CONFIG_NAND) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (10 * CONFIG_SYS_NAND_BLOCK_SIZE) #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 58c93788d74..59bbb5391b5 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -174,13 +174,11 @@ #endif #elif defined(CONFIG_SDCARD) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (512 * 0x800) #elif defined(CONFIG_NAND) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_SIZE 0x2000 #if defined(CONFIG_TARGET_T1024RDB) #define CONFIG_ENV_OFFSET (2 * CONFIG_SYS_NAND_BLOCK_SIZE) diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 4e42450da02..827068589b0 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -63,7 +63,6 @@ #define CONFIG_ENV_OVERWRITE #ifndef CONFIG_MTD_NOR_FLASH -#define CONFIG_ENV_IS_NOWHERE #else #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI @@ -83,13 +82,11 @@ #define CONFIG_ENV_SECT_SIZE 0x10000 #elif defined(CONFIG_SDCARD) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (512 * 1658) #elif defined(CONFIG_NAND) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_SIZE CONFIG_SYS_NAND_BLOCK_SIZE #define CONFIG_ENV_OFFSET (7 * CONFIG_SYS_NAND_BLOCK_SIZE) #else diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 69cbee0dfa7..826313a8508 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -186,7 +186,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #define CONFIG_ENV_SECT_SIZE 0x10000 #elif defined(CONFIG_SDCARD) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (512 * 0x800) @@ -196,7 +195,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #define CONFIG_BOOTSCRIPT_COPY_RAM #endif #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (3 * CONFIG_SYS_NAND_BLOCK_SIZE) #else diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 4fce8590735..79ee50db048 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -151,13 +151,11 @@ #define CONFIG_ENV_SECT_SIZE 0x10000 #elif defined(CONFIG_SDCARD) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (512 * 0x800) #elif defined(CONFIG_NAND) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (10 * CONFIG_SYS_NAND_BLOCK_SIZE) #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 0857bc8f170..190000069b8 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -137,13 +137,11 @@ #define CONFIG_ENV_SECT_SIZE 0x10000 #elif defined(CONFIG_SDCARD) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (512 * 0x800) #elif defined(CONFIG_NAND) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (2 * CONFIG_SYS_NAND_BLOCK_SIZE) #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index f69746b4da8..287c722e2f4 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -78,9 +78,6 @@ #include "t4qds.h" #ifndef CONFIG_MTD_NOR_FLASH -#if !defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) && !defined(CONFIG_RAMBOOT_PBL) -#define CONFIG_ENV_IS_NOWHERE -#endif #else #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI @@ -99,13 +96,11 @@ #define CONFIG_ENV_SECT_SIZE 0x10000 #elif defined(CONFIG_SDCARD) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (512 * 0x800) #elif defined(CONFIG_NAND) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (10 * CONFIG_SYS_NAND_BLOCK_SIZE) #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index ed3b0f7202f..d06c5b574ec 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -319,9 +319,6 @@ "bootm 0x01000000 - 0x00f00000" #ifndef CONFIG_MTD_NOR_FLASH -#ifndef CONFIG_RAMBOOT_PBL -#define CONFIG_ENV_IS_NOWHERE -#endif #else #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI @@ -340,13 +337,11 @@ #define CONFIG_ENV_SECT_SIZE 0x10000 #elif defined(CONFIG_SDCARD) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (512 * 0x800) #elif defined(CONFIG_NAND) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_SIZE CONFIG_SYS_NAND_BLOCK_SIZE #define CONFIG_ENV_OFFSET (7 * CONFIG_SYS_NAND_BLOCK_SIZE) #elif defined(CONFIG_ENV_IS_NOWHERE) diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 9a7aa811963..2bf3a5686aa 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -388,13 +388,11 @@ #endif #elif defined(CONFIG_RAMBOOT_SDCARD) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_FSL_FIXED_MMC_LOCATION #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_SYS_MMC_ENV_DEV 0 #elif defined(CONFIG_SYS_RAMBOOT) -#define CONFIG_ENV_IS_NOWHERE /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index cdccdc0c38b..5343b8df854 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -293,8 +293,6 @@ #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) /* Remove other SPL modes. */ -#define CONFIG_ENV_IS_NOWHERE -#undef CONFIG_ENV_IS_IN_NAND /* disable host part of MUSB in SPL */ /* disable EFI partitions and partition UUID support */ #endif @@ -334,7 +332,6 @@ "128k(u-boot-env2),3464k(kernel)," \ "-(rootfs)" #elif defined(CONFIG_EMMC_BOOT) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 #define CONFIG_SYS_MMC_ENV_PART 2 #define CONFIG_ENV_OFFSET 0x0 diff --git a/include/configs/am335x_igep003x.h b/include/configs/am335x_igep003x.h index 22f542dc7d5..4721b42f9ef 100644 --- a/include/configs/am335x_igep003x.h +++ b/include/configs/am335x_igep003x.h @@ -142,7 +142,6 @@ #define CONFIG_SPL_UBI_INFO_ADDR 0x88080000 /* environment organization */ -#define CONFIG_ENV_IS_IN_UBI 1 #define CONFIG_ENV_UBI_PART "UBI" #define CONFIG_ENV_UBI_VOLUME "config" #define CONFIG_ENV_UBI_VOLUME_REDUND "config_r" diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index 77ac3fed240..f3b7767a972 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -34,8 +34,6 @@ #define V_OSCK 24000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK) -#define CONFIG_ENV_IS_IN_MMC 1 - /* * in case of SD Card or Network boot we want to have a possibility to * debrick the shc, therefore do not read environment from eMMC @@ -289,11 +287,4 @@ #define CONFIG_SYS_I2C_SLAVE 1 #define CONFIG_SHOW_BOOT_PROGRESS - -#if defined CONFIG_SHC_NETBOOT -#ifdef CONFIG_SPL_BUILD -#define CONFIG_ENV_IS_NOWHERE -#undef CONFIG_ENV_IS_IN_MMC -#endif -#endif #endif /* ! __CONFIG_AM335X_SHC_H */ diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index e0fad52c646..75f9befcfd0 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -86,16 +86,12 @@ #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) /* Remove other SPL modes. */ -#define CONFIG_ENV_IS_NOWHERE -#undef CONFIG_ENV_IS_IN_NAND /* disable host part of MUSB in SPL */ #undef CONFIG_MUSB_HOST /* disable EFI partitions and partition UUID support */ #endif #if defined(CONFIG_EMMC_BOOT) -#undef CONFIG_ENV_IS_NOWHERE -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 #define CONFIG_SYS_MMC_ENV_PART 2 #define CONFIG_ENV_OFFSET 0x0 diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index eb768b9e97b..77d9ba18996 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -218,7 +218,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE #define CONFIG_NAND_OMAP_GPMC -#define CONFIG_ENV_IS_IN_NAND 1 #define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB sector */ diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 7fe822eaced..26036c4e977 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -292,7 +292,6 @@ #define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ #define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET #define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET -#define CONFIG_ENV_IS_IN_NAND /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 1d8e39c2035..88487c9fb9d 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -257,11 +257,6 @@ #define CONFIG_PHYLIB #define PHY_ANEG_TIMEOUT 8000 /* PHY needs longer aneg time at 1G */ -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_ETH_SUPPORT) -#undef CONFIG_ENV_IS_IN_FAT -#define CONFIG_ENV_IS_NOWHERE -#endif - #define CONFIG_SYS_RX_ETH_BUFFER 64 /* NAND support */ diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index 98ce6c52daf..9216998486f 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -22,7 +22,6 @@ #define CONFIG_NR_DRAM_BANKS 2 /* MMC ENV related defines */ -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 /* eMMC */ #define CONFIG_SYS_MMC_ENV_PART 0 #define CONFIG_ENV_SIZE SZ_128K diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index c3cade9ea6b..d6b226c4251 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -29,7 +29,6 @@ #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ /* Environment in eMMC, before config block at the end of 1st "boot sector" */ -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE + \ CONFIG_TDX_CFG_BLOCK_OFFSET) #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index a18ab128041..4a12ac8ca37 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -300,8 +300,6 @@ #define CONFIG_ENV_SIZE (8 * 1024) -#define CONFIG_ENV_IS_IN_MMC - #if defined(CONFIG_ENV_IS_IN_MMC) /* Environment in eMMC, before config block at the end of 1st "boot sector" */ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE + \ diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h index 9772d8b5c39..daa3be09998 100644 --- a/include/configs/apalis_t30.h +++ b/include/configs/apalis_t30.h @@ -26,7 +26,6 @@ #define CONFIG_SYS_I2C_TEGRA /* Environment in eMMC, before config block at the end of 1st "boot sector" */ -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE + \ CONFIG_TDX_CFG_BLOCK_OFFSET) #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/apf27.h b/include/configs/apf27.h index 3cb8fabfa94..b122fe617ba 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -83,7 +83,6 @@ */ #define ACFG_MONITOR_OFFSET 0x00000000 #define CONFIG_SYS_MONITOR_LEN 0x00100000 /* 1MiB */ -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_OFFSET 0x00100000 /* NAND offset */ #define CONFIG_ENV_SIZE 0x00020000 /* 128kB */ diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h index e0e577a6229..fd319b39324 100644 --- a/include/configs/apx4devkit.h +++ b/include/configs/apx4devkit.h @@ -30,7 +30,6 @@ /* Environment */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_ENV_IS_IN_NAND /* Environment is in MMC */ #if defined(CONFIG_CMD_MMC) && defined(CONFIG_ENV_IS_IN_MMC) diff --git a/include/configs/arndale.h b/include/configs/arndale.h index 4d770e6077d..8f0422943bb 100644 --- a/include/configs/arndale.h +++ b/include/configs/arndale.h @@ -27,7 +27,6 @@ /* Miscellaneous configurable options */ #define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0" -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (CONFIG_BL2_OFFSET + CONFIG_BL2_SIZE) #define CONFIG_IRAM_STACK 0x02050000 diff --git a/include/configs/aspenite.h b/include/configs/aspenite.h index e6cddc13ac1..36d74f3b268 100644 --- a/include/configs/aspenite.h +++ b/include/configs/aspenite.h @@ -38,7 +38,6 @@ /* * Environment variables configurations */ -#define CONFIG_ENV_IS_NOWHERE 1 /* if env in SDRAM */ #define CONFIG_ENV_SIZE 0x20000 /* 64k */ #endif /* __CONFIG_ASPENITE_H */ diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h index dea81300465..e511d18234d 100644 --- a/include/configs/at91-sama5_common.h +++ b/include/configs/at91-sama5_common.h @@ -79,7 +79,6 @@ #ifdef CONFIG_SYS_USE_NANDFLASH /* u-boot env in nand flash */ -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET 0xc0000 #define CONFIG_ENV_OFFSET_REDUND 0x100000 #define CONFIG_ENV_SIZE 0x20000 diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index 48d7f6a5e63..8b0105c017c 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -174,7 +174,6 @@ #elif defined(CONFIG_SYS_USE_NANDFLASH) /* bootstrap + u-boot + env + linux in nandflash */ -#define CONFIG_ENV_IS_IN_NAND 1 #define CONFIG_ENV_OFFSET 0x120000 #define CONFIG_ENV_OFFSET_REDUND 0x100000 #define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ @@ -188,7 +187,6 @@ #else /* CONFIG_SYS_USE_MMC */ /* bootstrap + u-boot + env + linux in mmc */ -#define CONFIG_ENV_IS_IN_MMC /* For FAT system, most cases it should be in the reserved sector */ #define CONFIG_ENV_OFFSET 0x2000 #define CONFIG_ENV_SIZE 0x1000 diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index 505f945bd31..d86f07b982b 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -167,7 +167,6 @@ #else /* CONFIG_SYS_USE_NANDFLASH */ /* bootstrap + u-boot + env + linux in nandflash */ -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET 0xc0000 #define CONFIG_ENV_OFFSET_REDUND 0x100000 #define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index e45e4dbddc7..a8337cdf435 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -264,7 +264,6 @@ #elif CONFIG_SYS_USE_NANDFLASH /* bootstrap + u-boot + env + linux in nandflash */ -#define CONFIG_ENV_IS_IN_NAND 1 #define CONFIG_ENV_OFFSET 0x120000 #define CONFIG_ENV_OFFSET_REDUND 0x100000 #define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index a0c5b9afae1..9e7fd1e1ae8 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -90,7 +90,6 @@ #ifdef CONFIG_SYS_USE_NANDFLASH /* bootstrap + u-boot + env in nandflash */ -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET 0x120000 #define CONFIG_ENV_OFFSET_REDUND 0x100000 #define CONFIG_ENV_SIZE 0x20000 diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index 5b3a4591fda..54c2318d86b 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -137,7 +137,6 @@ #elif defined(CONFIG_SYS_USE_NANDFLASH) /* bootstrap + u-boot + env + linux in nandflash */ -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET 0x120000 #define CONFIG_ENV_OFFSET_REDUND 0x100000 #define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 8a8eb7c34fd..05ba5423829 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -109,7 +109,6 @@ #elif CONFIG_SYS_USE_NANDFLASH /* bootstrap + u-boot + env + linux in nandflash */ -#define CONFIG_ENV_IS_IN_NAND 1 #define CONFIG_ENV_OFFSET 0x120000 #define CONFIG_ENV_OFFSET_REDUND 0x100000 #define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 799b75719e6..96f4801ac58 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -113,7 +113,6 @@ #ifdef CONFIG_SYS_USE_NANDFLASH /* bootstrap + u-boot + env + linux in nandflash */ -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET 0x120000 #define CONFIG_ENV_OFFSET_REDUND 0x100000 #define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 29710a1fcd5..17b3a1571ed 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -321,7 +321,6 @@ "128k(SPL.backup3)," \ "1920k(u-boot)," \ "-(UBI)" -#define CONFIG_ENV_IS_NOWHERE #endif #endif diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 8b1809e9c89..1a67816d438 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -18,7 +18,6 @@ #define __CONFIG_BAV335X_H #include <configs/ti_am335x_common.h> -#define CONFIG_ENV_IS_NOWHERE #ifndef CONFIG_SPL_BUILD # define CONFIG_TIMESTAMP @@ -388,8 +387,6 @@ DEFAULT_LINUX_BOOT_ENV \ "8m(NAND.kernel)," \ "-(NAND.rootfs)" #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x000c0000 -#undef CONFIG_ENV_IS_NOWHERE -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET 0x001c0000 #define CONFIG_ENV_OFFSET_REDUND 0x001e0000 #define CONFIG_SYS_ENV_SECT_SIZE CONFIG_SYS_NAND_BLOCK_SIZE @@ -514,8 +511,6 @@ DEFAULT_LINUX_BOOT_ENV \ "128k(u-boot-env2),3464k(kernel)," \ "-(rootfs)" #elif defined(CONFIG_EMMC_BOOT) -#undef CONFIG_ENV_IS_NOWHERE -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 #define CONFIG_SYS_MMC_ENV_PART 2 #define CONFIG_ENV_OFFSET 0x0 diff --git a/include/configs/bcm23550_w1d.h b/include/configs/bcm23550_w1d.h index 02ae65ff577..049b4e0a437 100644 --- a/include/configs/bcm23550_w1d.h +++ b/include/configs/bcm23550_w1d.h @@ -81,7 +81,6 @@ #define CONFIG_SYS_NS16550_COM1 0x3e000000 /* must fit into GPT:u-boot-env partition */ -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_OFFSET (0x00011a00 * 512) #define CONFIG_ENV_SIZE (8 * 512) diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h index 5a85f7fa9c0..08d1e4e69f3 100644 --- a/include/configs/bcm28155_ap.h +++ b/include/configs/bcm28155_ap.h @@ -80,7 +80,6 @@ #define CONFIG_SYS_NS16550_COM1 0x3e000000 /* must fit into GPT:u-boot-env partition */ -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_OFFSET (0x00011a00 * 512) #define CONFIG_ENV_SIZE (8 * 512) diff --git a/include/configs/bcm_ep_board.h b/include/configs/bcm_ep_board.h index 2afbbea140a..8bd1e301a9c 100644 --- a/include/configs/bcm_ep_board.h +++ b/include/configs/bcm_ep_board.h @@ -46,7 +46,6 @@ #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_ENV_SIZE 0x2000 -#define CONFIG_ENV_IS_NOWHERE /* console configuration */ #define CONFIG_SYS_CBSIZE 1024 /* Console buffer size */ diff --git a/include/configs/bcm_northstar2.h b/include/configs/bcm_northstar2.h index dc2860382d6..2352b98f622 100644 --- a/include/configs/bcm_northstar2.h +++ b/include/configs/bcm_northstar2.h @@ -38,7 +38,6 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_ENV_SIZE SZ_8K -#define CONFIG_ENV_IS_NOWHERE /* console configuration */ #define CONFIG_SYS_CBSIZE SZ_1K diff --git a/include/configs/beaver.h b/include/configs/beaver.h index f3d7a2fad2f..6afa1e8c048 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.h @@ -27,7 +27,6 @@ #define CONFIG_SYS_I2C_TEGRA /* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 diff --git a/include/configs/bg0900.h b/include/configs/bg0900.h index 40f15387891..c76053e49a1 100644 --- a/include/configs/bg0900.h +++ b/include/configs/bg0900.h @@ -23,7 +23,6 @@ /* Environment */ #define CONFIG_ENV_SIZE (16 * 1024) #define CONFIG_ENV_OVERWRITE -#define CONFIG_ENV_IS_NOWHERE /* FEC Ethernet on SoC */ #ifdef CONFIG_CMD_NET diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index e35ea0ea4ae..10c97d27c24 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -241,7 +241,6 @@ MMCARGS #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 -#undef CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_SYS_REDUNDAND_ENVIRONMENT #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED @@ -250,8 +249,6 @@ MMCARGS #define CONFIG_ENV_OFFSET_REDUND (896 << 10) /* 896 KiB in */ #elif defined(CONFIG_EMMC_BOOT) -#undef CONFIG_ENV_IS_NOWHERE -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 #define CONFIG_SYS_MMC_ENV_PART 2 #define CONFIG_ENV_OFFSET 0x40000 /* TODO: Adresse definieren */ @@ -260,11 +257,6 @@ MMCARGS #elif defined(CONFIG_NAND) /* No NAND env support in SPL */ -#ifdef CONFIG_SPL_BUILD -#define CONFIG_ENV_IS_NOWHERE -#else -#define CONFIG_ENV_IS_IN_NAND -#endif #define CONFIG_ENV_OFFSET 0x60000 #define CONFIG_SYS_ENV_SECT_SIZE CONFIG_ENV_SIZE #else diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h index f7d736939b1..8f92d7a9587 100644 --- a/include/configs/brxre1.h +++ b/include/configs/brxre1.h @@ -88,8 +88,6 @@ BUR_COMMON_ENV \ #define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1_MODE MUSB_HOST -#undef CONFIG_ENV_IS_NOWHERE -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 #define CONFIG_SYS_MMC_ENV_PART 2 #define CONFIG_ENV_OFFSET 0x40000 /* TODO: Adresse definieren */ diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index f1b5a71edf1..a490d066194 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -31,7 +31,6 @@ #define CONFIG_SYS_I2C_TEGRA /* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h index fd8df46776f..768669ff127 100644 --- a/include/configs/cei-tk1-som.h +++ b/include/configs/cei-tk1-som.h @@ -27,7 +27,6 @@ #define CONFIG_SYS_I2C_TEGRA /* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h index 0802e1b8e53..82be3a1afb2 100644 --- a/include/configs/chiliboard.h +++ b/include/configs/chiliboard.h @@ -198,7 +198,6 @@ #define CONFIG_ENV_SIZE SZ_128K #define CONFIG_SYS_ENV_SECT_SIZE CONFIG_SYS_NAND_BLOCK_SIZE #else -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_OFFSET SZ_128K #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index 77c2493e665..bd802221491 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -54,7 +54,6 @@ #define CONFIG_ENV_MIN_ENTRIES 128 /* Environment in MMC */ -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SECT_SIZE 0x200 #define CONFIG_ENV_SIZE 0x10000 diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h index 3fb9daebbc5..a1b8e141a9e 100644 --- a/include/configs/cm_t335.h +++ b/include/configs/cm_t335.h @@ -136,7 +136,6 @@ "1m(u-boot),1m(u-boot-env)," \ "1m(dtb),4m(splash)," \ "6m(kernel),-(rootfs)" -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET 0x300000 /* environment starts here */ #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ #define CONFIG_SYS_NAND_ONFI_DETECTION diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 5f923086821..99d48003277 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -217,7 +217,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */ -#define CONFIG_ENV_IS_IN_NAND #define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ #define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET #define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index 346608d8e3b..3fb66760c86 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -217,7 +217,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */ -#define CONFIG_ENV_IS_IN_NAND #define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ #define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET #define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h index 36475734fcc..69706d254e6 100644 --- a/include/configs/cm_t54.h +++ b/include/configs/cm_t54.h @@ -33,7 +33,6 @@ #undef CONFIG_ENV_OFFSET #undef CONFIG_ENV_SIZE -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 /* SLOT2: eMMC(1) */ #define CONFIG_SYS_MMC_ENV_PART 0 #define CONFIG_ENV_OFFSET 0xc0000 /* (in bytes) 768 KB */ diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index f3335f5c12a..5f7386737a0 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -271,8 +271,6 @@ /* environment organization */ #define CONFIG_ENV_SIZE (8 * 1024) -#define CONFIG_ENV_IS_IN_MMC - #if defined(CONFIG_ENV_IS_IN_MMC) /* Environment in eMMC, before config block at the end of 1st "boot sector" */ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE + \ diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index ffcd98bf764..8aca89ddd84 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -148,7 +148,6 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) /* environment organization */ -#define CONFIG_ENV_IS_IN_NAND #if defined(CONFIG_ENV_IS_IN_MMC) #define CONFIG_SYS_MMC_ENV_DEV 0 /* USDHC1 */ diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h index 587963963ad..9efe74b593e 100644 --- a/include/configs/colibri_pxa270.h +++ b/include/configs/colibri_pxa270.h @@ -140,9 +140,6 @@ #define CONFIG_SYS_FLASH_PROTECTION 1 #define CONFIG_ENV_IS_IN_FLASH 1 - -#else /* No flash */ -#define CONFIG_ENV_IS_NOWHERE #endif #define CONFIG_SYS_MONITOR_BASE 0x0 diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index cbcd5e4d383..d9fd642655e 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -56,7 +56,6 @@ "-(ubi)" /* Environment in NAND, 64K is a bit excessive but erase block is 512K anyway */ -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET (SZ_2M) #undef CONFIG_ENV_SIZE /* undef size from tegra20-common.h */ #define CONFIG_ENV_SIZE (SZ_64K) diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h index 53ff33e4b9d..91433afaccf 100644 --- a/include/configs/colibri_t30.h +++ b/include/configs/colibri_t30.h @@ -26,7 +26,6 @@ #define CONFIG_SYS_I2C_TEGRA /* Environment in eMMC, before config block at the end of 1st "boot sector" */ -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE + \ CONFIG_TDX_CFG_BLOCK_OFFSET) #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/comtrend_ar5387un.h b/include/configs/comtrend_ar5387un.h index 5d8f968c4d8..99630c08229 100644 --- a/include/configs/comtrend_ar5387un.h +++ b/include/configs/comtrend_ar5387un.h @@ -9,7 +9,6 @@ #define CONFIG_REMAKE_ELF -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_AUTO_COMPLETE diff --git a/include/configs/comtrend_ct5361.h b/include/configs/comtrend_ct5361.h index 099684ddd27..94ec498af1f 100644 --- a/include/configs/comtrend_ct5361.h +++ b/include/configs/comtrend_ct5361.h @@ -9,7 +9,6 @@ #define CONFIG_REMAKE_ELF -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_AUTO_COMPLETE diff --git a/include/configs/comtrend_vr3032u.h b/include/configs/comtrend_vr3032u.h index d45f8b32daf..6d46041af6d 100644 --- a/include/configs/comtrend_vr3032u.h +++ b/include/configs/comtrend_vr3032u.h @@ -9,7 +9,6 @@ #define CONFIG_REMAKE_ELF -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_AUTO_COMPLETE diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 072650dfaec..f9245e06baa 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -298,7 +298,6 @@ * Environment */ #if defined(CONFIG_TRAILBLAZER) -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ #elif defined(CONFIG_RAMBOOT_SPIFLASH) #define CONFIG_ENV_IS_IN_SPI_FLASH @@ -310,7 +309,6 @@ #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 #elif defined(CONFIG_RAMBOOT_SDCARD) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_FSL_FIXED_MMC_LOCATION #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 92e6ee0033d..abd09ca1ed1 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -66,9 +66,6 @@ #define CONFIG_ENV_OVERWRITE #ifndef CONFIG_MTD_NOR_FLASH -#if !defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) && !defined(CONFIG_RAMBOOT_PBL) -#define CONFIG_ENV_IS_NOWHERE -#endif #else #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI @@ -87,14 +84,12 @@ #define CONFIG_ENV_SECT_SIZE 0x10000 #elif defined(CONFIG_SDCARD) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_FSL_FIXED_MMC_LOCATION #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (512 * 1658) #elif defined(CONFIG_NAND) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_NAND #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) diff --git a/include/configs/corvus.h b/include/configs/corvus.h index 3635add4b29..ed1a2287aba 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -107,7 +107,6 @@ #define CONFIG_SYS_LOAD_ADDR ATMEL_BASE_CS6 /* bootstrap + u-boot + env in nandflash */ -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET 0x100000 #define CONFIG_ENV_OFFSET_REDUND 0x180000 #define CONFIG_ENV_SIZE SZ_128K diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index 6079540bc95..ddbaf327d8c 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -58,7 +58,6 @@ #if defined(CONFIG_SDCARD) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_FSL_FIXED_MMC_LOCATION #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 614417bff12..2bf4d662427 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -164,7 +164,6 @@ #ifdef CONFIG_USE_NAND #undef CONFIG_ENV_IS_IN_FLASH #define CONFIG_NAND_DAVINCI -#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */ #define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ #define CONFIG_ENV_SIZE (128 << 10) #define CONFIG_SYS_NAND_USE_FLASH_BBT @@ -235,7 +234,6 @@ #ifdef CONFIG_USE_SPIFLASH #undef CONFIG_ENV_IS_IN_FLASH -#undef CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE (64 << 10) #define CONFIG_ENV_OFFSET (512 << 10) @@ -294,7 +292,6 @@ #if !defined(CONFIG_USE_NAND) && \ !defined(CONFIG_USE_NOR) && \ !defined(CONFIG_USE_SPIFLASH) -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE (16 << 10) #endif diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h index 96a2df806a5..41ab61aa7c3 100644 --- a/include/configs/dalmore.h +++ b/include/configs/dalmore.h @@ -24,7 +24,6 @@ #define CONFIG_SYS_I2C_TEGRA /* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h index 9db3380a95b..970e214e074 100644 --- a/include/configs/dbau1x00.h +++ b/include/configs/dbau1x00.h @@ -138,8 +138,6 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT (2 * CONFIG_SYS_HZ) /* Timeout for Flash Erase */ #define CONFIG_SYS_FLASH_WRITE_TOUT (2 * CONFIG_SYS_HZ) /* Timeout for Flash Write */ -#define CONFIG_ENV_IS_NOWHERE 1 - /* Address and size of Primary Environment Sector */ #define CONFIG_ENV_ADDR 0xB0030000 #define CONFIG_ENV_SIZE 0x10000 diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index a8b6802235f..dfe99355204 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -138,7 +138,6 @@ /* * Environment */ -#define CONFIG_ENV_IS_IN_NAND 1 #define CONFIG_ENV_SIZE SZ_128K #define CONFIG_ENV_OFFSET 0x000A0000 diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 92ce1273c63..54769618470 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -182,7 +182,6 @@ 0x01000000) /* 16MB */ /* NAND and environment organization */ -#define CONFIG_ENV_IS_IN_NAND 1 #define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ #define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET diff --git a/include/configs/dns325.h b/include/configs/dns325.h index 470e26256a2..3e931edc712 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -73,10 +73,7 @@ * Environment variables configurations */ #ifdef CONFIG_CMD_NAND -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128KB */ -#else -#define CONFIG_ENV_IS_NOWHERE #endif #define CONFIG_ENV_SIZE 0x20000 /* 128KB */ diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h index 394485ae8d7..15e3292c093 100644 --- a/include/configs/dockstar.h +++ b/include/configs/dockstar.h @@ -34,10 +34,7 @@ * Environment variables configurations */ #ifdef CONFIG_CMD_NAND -#define CONFIG_ENV_IS_IN_NAND 1 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K */ -#else -#define CONFIG_ENV_IS_NOWHERE 1 /* if env in SDRAM */ #endif /* * max 4k env size is enough, but in case of nand diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index d2f7c7cfff8..40beb175744 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -24,7 +24,6 @@ #ifndef CONFIG_QSPI_BOOT /* MMC ENV related defines */ -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 /* SLOT2: eMMC(1) */ #define CONFIG_ENV_SIZE (128 << 10) #define CONFIG_ENV_OFFSET 0x260000 diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index 712e11725be..d9dc639aeb8 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -110,7 +110,6 @@ REFLASH(dragonboard/u-boot.img, 8)\ "pxefile_addr_r=0x90100000\0"\ BOOTENV -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_VARS_UBOOT_CONFIG diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 003cf0e1f32..9715f297a97 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -34,8 +34,6 @@ #ifdef CONFIG_SPI_FLASH #define CONFIG_ENV_IS_IN_SPI_FLASH 1 #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64k */ -#else -#define CONFIG_ENV_IS_NOWHERE 1 /* if env in SDRAM */ #endif #ifdef CONFIG_CMD_SF diff --git a/include/configs/ds109.h b/include/configs/ds109.h index 133b2b023ca..ad7fce84e8f 100644 --- a/include/configs/ds109.h +++ b/include/configs/ds109.h @@ -37,8 +37,6 @@ #ifdef CONFIG_SPI_FLASH #define CONFIG_ENV_IS_IN_SPI_FLASH 1 #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64k */ -#else -#define CONFIG_ENV_IS_NOWHERE 1 /* if env in SDRAM */ #endif #ifdef CONFIG_CMD_SF diff --git a/include/configs/duovero.h b/include/configs/duovero.h index f1422316891..8efcc94945e 100644 --- a/include/configs/duovero.h +++ b/include/configs/duovero.h @@ -39,7 +39,6 @@ /* GPIO */ /* ENV related config options */ -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG diff --git a/include/configs/e2220-1170.h b/include/configs/e2220-1170.h index f88045436fa..f8a59933260 100644 --- a/include/configs/e2220-1170.h +++ b/include/configs/e2220-1170.h @@ -22,7 +22,6 @@ #define CONFIG_SYS_I2C_TEGRA /* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) diff --git a/include/configs/ea20.h b/include/configs/ea20.h index 8d38087ae61..b06c9b8f229 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -88,7 +88,6 @@ #ifdef CONFIG_USE_SPIFLASH #undef CONFIG_ENV_IS_IN_FLASH -#undef CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE (8 << 10) #define CONFIG_ENV_OFFSET 0x80000 @@ -161,7 +160,6 @@ #if !defined(CONFIG_SYS_USE_NAND) && \ !defined(CONFIG_USE_NOR) && \ !defined(CONFIG_USE_SPIFLASH) -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE (16 << 10) #endif diff --git a/include/configs/efi-x86.h b/include/configs/efi-x86.h index 9dcb4817077..7763365fe1a 100644 --- a/include/configs/efi-x86.h +++ b/include/configs/efi-x86.h @@ -14,7 +14,6 @@ #undef CONFIG_TPM_TIS_BASE_ADDRESS #undef CONFIG_ENV_IS_IN_SPI_FLASH -#define CONFIG_ENV_IS_NOWHERE #undef CONFIG_SCSI_AHCI #undef CONFIG_INTEL_ICH6_GPIO #undef CONFIG_USB_EHCI_PCI diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h index 575610d4104..531f5bf5aab 100644 --- a/include/configs/el6x_common.h +++ b/include/configs/el6x_common.h @@ -114,8 +114,6 @@ #define CONFIG_ENV_SIZE (8 * 1024) -#define CONFIG_ENV_IS_IN_MMC - #if defined(CONFIG_ENV_IS_IN_MMC) #define CONFIG_SYS_MMC_ENV_DEV 1 #define CONFIG_SYS_MMC_ENV_PART 2 diff --git a/include/configs/espresso7420.h b/include/configs/espresso7420.h index 0a50154dda3..0115d398a7d 100644 --- a/include/configs/espresso7420.h +++ b/include/configs/espresso7420.h @@ -14,7 +14,6 @@ #define CONFIG_BOARD_COMMON #define CONFIG_ESPRESSO7420 -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define CONFIG_SYS_TEXT_BASE 0x43E00000 diff --git a/include/configs/evb_ast2500.h b/include/configs/evb_ast2500.h index a571f2a749d..552cd366bcd 100644 --- a/include/configs/evb_ast2500.h +++ b/include/configs/evb_ast2500.h @@ -20,8 +20,6 @@ /* Memory Info */ #define CONFIG_SYS_LOAD_ADDR 0x83000000 -#define CONFIG_ENV_IS_NOWHERE - #define CONFIG_ENV_SIZE 0x20000 #endif /* __CONFIG_H */ diff --git a/include/configs/evb_px5.h b/include/configs/evb_px5.h index 228683739b2..d008539eb1f 100644 --- a/include/configs/evb_px5.h +++ b/include/configs/evb_px5.h @@ -9,7 +9,6 @@ #include <configs/rk3368_common.h> -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_CONSOLE_SCROLL_LINES 10 diff --git a/include/configs/evb_rk3229.h b/include/configs/evb_rk3229.h index 8f8e50fb60d..6e1fd1c2930 100644 --- a/include/configs/evb_rk3229.h +++ b/include/configs/evb_rk3229.h @@ -13,7 +13,6 @@ /* Store env in emmc */ #undef CONFIG_ENV_SIZE #define CONFIG_ENV_SIZE (32 << 10) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 0 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT diff --git a/include/configs/evb_rk3288.h b/include/configs/evb_rk3288.h index 0dc3532f330..15a374cca7d 100644 --- a/include/configs/evb_rk3288.h +++ b/include/configs/evb_rk3288.h @@ -10,7 +10,6 @@ #define ROCKCHIP_DEVICE_SETTINGS #include <configs/rk3288_common.h> -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #endif diff --git a/include/configs/evb_rk3328.h b/include/configs/evb_rk3328.h index fe3ec8c1778..c792ce55c14 100644 --- a/include/configs/evb_rk3328.h +++ b/include/configs/evb_rk3328.h @@ -9,7 +9,6 @@ #include <configs/rk3328_common.h> -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 /* * SPL @ 32k for ~36k diff --git a/include/configs/evb_rk3399.h b/include/configs/evb_rk3399.h index b9fd5b417a7..015f25a7740 100644 --- a/include/configs/evb_rk3399.h +++ b/include/configs/evb_rk3399.h @@ -9,7 +9,6 @@ #include <configs/rk3399_common.h> -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 /* * SPL @ 32k for ~36k diff --git a/include/configs/fennec_rk3288.h b/include/configs/fennec_rk3288.h index 0dc3532f330..15a374cca7d 100644 --- a/include/configs/fennec_rk3288.h +++ b/include/configs/fennec_rk3288.h @@ -10,7 +10,6 @@ #define ROCKCHIP_DEVICE_SETTINGS #include <configs/rk3288_common.h> -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #endif diff --git a/include/configs/firefly-rk3288.h b/include/configs/firefly-rk3288.h index b4dcf23b1cf..bd39111710e 100644 --- a/include/configs/firefly-rk3288.h +++ b/include/configs/firefly-rk3288.h @@ -14,7 +14,6 @@ #include <configs/rk3288_common.h> -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #endif diff --git a/include/configs/geekbox.h b/include/configs/geekbox.h index 6f6007e65ba..7a707cb2a0f 100644 --- a/include/configs/geekbox.h +++ b/include/configs/geekbox.h @@ -9,7 +9,6 @@ #include <configs/rk3368_common.h> -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_CONSOLE_SCROLL_LINES 10 diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h index d1635b098ef..7fdadab101d 100644 --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h @@ -56,10 +56,7 @@ * Environment variables configurations */ #ifdef CONFIG_CMD_NAND -#define CONFIG_ENV_IS_IN_NAND 1 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K */ -#else -#define CONFIG_ENV_IS_NOWHERE 1 /* if env in SDRAM */ #endif /* * max 4k env size is enough, but in case of nand diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h index f2260eae564..dddd300fb5d 100644 --- a/include/configs/gplugd.h +++ b/include/configs/gplugd.h @@ -78,7 +78,6 @@ /* * Environment variables configurations */ -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE 0x4000 #ifdef CONFIG_CMD_USB diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index 5ac29db240c..c69e8994bd8 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -31,10 +31,7 @@ * Environment variables configurations */ #ifdef CONFIG_CMD_NAND -#define CONFIG_ENV_IS_IN_NAND 1 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K */ -#else -#define CONFIG_ENV_IS_NOWHERE 1 /* if env in SDRAM */ #endif /* * max 4k env size is enough, but in case of nand diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index ef8911fafae..c46a8772a34 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -214,10 +214,6 @@ /* Persistent Environment Config */ #ifdef CONFIG_SPI_FLASH #define CONFIG_ENV_IS_IN_SPI_FLASH -#elif defined(CONFIG_SPL_NAND_SUPPORT) - #define CONFIG_ENV_IS_IN_NAND -#else - #define CONFIG_ENV_IS_IN_MMC #endif #if defined(CONFIG_ENV_IS_IN_MMC) #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/h2200.h b/include/configs/h2200.h index 530a88e9e1a..fea40447698 100644 --- a/include/configs/h2200.h +++ b/include/configs/h2200.h @@ -26,7 +26,6 @@ #define CONFIG_ENV_SIZE 0x00040000 #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_LOAD_ADDR 0xa3000000 /* default load address */ diff --git a/include/configs/harmony.h b/include/configs/harmony.h index c17d7fad792..cc312199ac0 100644 --- a/include/configs/harmony.h +++ b/include/configs/harmony.h @@ -32,7 +32,6 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Environment in NAND (which is 512M), aligned to start of last sector */ -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sector size */ /* USB Host support */ diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index 405129b7e22..df8e69fe663 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -501,7 +501,6 @@ void fpga_control_clear(unsigned int bus, int pin); #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE #else -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ #endif diff --git a/include/configs/huawei_hg556a.h b/include/configs/huawei_hg556a.h index ab64518e0b1..6bd2d76f530 100644 --- a/include/configs/huawei_hg556a.h +++ b/include/configs/huawei_hg556a.h @@ -9,7 +9,6 @@ #define CONFIG_REMAKE_ELF -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_AUTO_COMPLETE diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index a5782f3300e..d45dc357cb1 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -39,10 +39,7 @@ * Environment variables configuration */ #ifdef CONFIG_CMD_NAND -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_SECT_SIZE 0x20000 -#else -#define CONFIG_ENV_IS_NOWHERE #endif #define CONFIG_ENV_SIZE 0x20000 #define CONFIG_ENV_OFFSET 0xe0000 diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h index 72c64c6f9a1..0748a4ef007 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -42,10 +42,7 @@ * Environment variables configuration */ #ifdef CONFIG_CMD_NAND -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_SECT_SIZE 0x20000 -#else -#define CONFIG_ENV_IS_NOWHERE #endif #define CONFIG_ENV_SIZE 0x20000 #define CONFIG_ENV_OFFSET 0x80000 diff --git a/include/configs/imgtec_xilfpga.h b/include/configs/imgtec_xilfpga.h index 63104233356..934b76ecaf5 100644 --- a/include/configs/imgtec_xilfpga.h +++ b/include/configs/imgtec_xilfpga.h @@ -51,7 +51,6 @@ /* ------------------------------------------------- * Environment */ -#define CONFIG_ENV_IS_NOWHERE 1 #define CONFIG_ENV_SIZE 0x4000 /* --------------------------------------------------------------------- diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h index 648404fb74e..95cb810fcd3 100644 --- a/include/configs/imx6_logic.h +++ b/include/configs/imx6_logic.h @@ -141,7 +141,6 @@ /* Environment organization */ #define CONFIG_ENV_SIZE (8 * 1024) -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET 0x400000 #define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h index 1d1b8b31c28..ae8399426fd 100644 --- a/include/configs/integratorap.h +++ b/include/configs/integratorap.h @@ -37,7 +37,6 @@ /* Flash settings */ #define CONFIG_SYS_FLASH_SIZE 0x02000000 /* 32 MiB */ #define CONFIG_SYS_MAX_FLASH_SECT 128 -#define CONFIG_ENV_IS_NOWHERE 1 #define CONFIG_ENV_SIZE 32768 /*----------------------------------------------------------------------- diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index 09f3a0471fe..7f1f3cca3a8 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -139,7 +139,6 @@ * Flash & Environment */ #define CONFIG_NAND_DAVINCI -#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */ #define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ #define CONFIG_ENV_SIZE (128 << 10) #define CONFIG_SYS_NAND_USE_FLASH_BBT diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h index 89f6cbc85b9..acc97268bae 100644 --- a/include/configs/jetson-tk1.h +++ b/include/configs/jetson-tk1.h @@ -23,7 +23,6 @@ #define CONFIG_SYS_I2C_TEGRA /* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h index b186bfc8915..7e455498dc4 100644 --- a/include/configs/k2e_evm.h +++ b/include/configs/k2e_evm.h @@ -28,7 +28,6 @@ "name_fs=arago-console-image-k2e-evm.cpio.gz\0" #define CONFIG_ENV_SIZE (256 << 10) /* 256 KiB */ -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET 0x100000 #include <configs/ti_armv7_keystone2.h> diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h index 9598bc6976e..78b901fb582 100644 --- a/include/configs/k2hk_evm.h +++ b/include/configs/k2hk_evm.h @@ -28,7 +28,6 @@ "name_fs=arago-console-image-k2hk-evm.cpio.gz\0" #define CONFIG_ENV_SIZE (256 << 10) /* 256 KiB */ -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET 0x100000 #include <configs/ti_armv7_keystone2.h> diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h index d054276e61e..d8bcbde8430 100644 --- a/include/configs/k2l_evm.h +++ b/include/configs/k2l_evm.h @@ -28,7 +28,6 @@ "name_fs=arago-console-image-k2l-evm.cpio.gz\0" #define CONFIG_ENV_SIZE (256 << 10) /* 256 KiB */ -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET 0x100000 #include <configs/ti_armv7_keystone2.h> diff --git a/include/configs/kc1.h b/include/configs/kc1.h index 408e5634b61..f040d0bbb6b 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -143,7 +143,6 @@ */ #define CONFIG_ENV_SIZE (128 * 1024) -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/km/km83xx-common.h b/include/configs/km/km83xx-common.h index 7d69224bd18..0db33b701ca 100644 --- a/include/configs/km/km83xx-common.h +++ b/include/configs/km/km83xx-common.h @@ -191,7 +191,6 @@ #define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #else /* CFG_SYS_RAMBOOT */ -#define CONFIG_ENV_IS_NOWHERE /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 #endif /* CFG_SYS_RAMBOOT */ diff --git a/include/configs/kylin_rk3036.h b/include/configs/kylin_rk3036.h index 088aced8b66..36009b8599e 100644 --- a/include/configs/kylin_rk3036.h +++ b/include/configs/kylin_rk3036.h @@ -15,8 +15,6 @@ /* Store env in emmc */ #undef CONFIG_ENV_SIZE #define CONFIG_ENV_SIZE SZ_32K -#undef CONFIG_ENV_IS_NOWHERE -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 /* emmc */ #define CONFIG_SYS_MMC_ENV_PART 0 /* user area */ diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index 15da4074f26..4ea61af920e 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -206,7 +206,6 @@ #define CONFIG_CLOCKS #endif -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE (16 << 10) /* additions for new relocation code, must added to all boards */ diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h index 016d54f138c..76ee91042da 100644 --- a/include/configs/liteboard.h +++ b/include/configs/liteboard.h @@ -129,7 +129,6 @@ /* FLASH and environment organization */ #define CONFIG_ENV_SIZE SZ_8K -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (8 * SZ_64K) #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 0 diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index c1ec2d440cd..e5544f327d0 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -287,7 +287,6 @@ #if defined(CONFIG_SD_BOOT) #define CONFIG_ENV_OFFSET 0x100000 -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #elif defined(CONFIG_QSPI_BOOT) diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 152954165cc..b3c931e36c6 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -550,7 +550,6 @@ unsigned long get_board_ddr_clk(void); #if defined(CONFIG_SD_BOOT) #define CONFIG_ENV_OFFSET 0x300000 -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #elif defined(CONFIG_QSPI_BOOT) @@ -559,7 +558,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_ENV_OFFSET 0x300000 /* 3MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 #elif defined(CONFIG_NAND_BOOT) -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (10 * CONFIG_SYS_NAND_BLOCK_SIZE) #else diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 067ef4df93c..06d7d400ca6 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -418,7 +418,6 @@ #if defined(CONFIG_SD_BOOT) #define CONFIG_ENV_OFFSET 0x300000 -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x20000 #elif defined(CONFIG_QSPI_BOOT) diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index 87ca36a8e9d..83c8805df6e 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -410,12 +410,10 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_ENV_OVERWRITE #ifdef CONFIG_NAND_BOOT -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (24 * CONFIG_SYS_NAND_BLOCK_SIZE) #elif defined(CONFIG_SD_BOOT) #define CONFIG_ENV_OFFSET (3 * 1024 * 1024) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #elif defined(CONFIG_QSPI_BOOT) diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index deae7873588..7b8561e9d6f 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -233,12 +233,10 @@ #endif #if defined(CONFIG_NAND_BOOT) -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (24 * CONFIG_SYS_NAND_BLOCK_SIZE) #elif defined(CONFIG_SD_BOOT) #define CONFIG_ENV_OFFSET (3 * 1024 * 1024) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #else diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 77619ab3241..860ad8f6931 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -444,12 +444,10 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_ENV_OVERWRITE #ifdef CONFIG_NAND_BOOT -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (24 * CONFIG_SYS_NAND_BLOCK_SIZE) #elif defined(CONFIG_SD_BOOT) #define CONFIG_ENV_OFFSET (3 * 1024 * 1024) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #elif defined(CONFIG_QSPI_BOOT) diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index 8a6b4e63786..1c30462af2f 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -167,7 +167,6 @@ #endif #if defined(CONFIG_SD_BOOT) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_OFFSET (3 * 1024 * 1024) #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/ls2080a_emu.h b/include/configs/ls2080a_emu.h index cec12ad04c0..6b34edfbf11 100644 --- a/include/configs/ls2080a_emu.h +++ b/include/configs/ls2080a_emu.h @@ -82,7 +82,6 @@ #define CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS 200000 /* Store environment at top of flash */ -#define CONFIG_ENV_IS_NOWHERE 1 #define CONFIG_ENV_SIZE 0x1000 #endif /* __LS2_EMU_H */ diff --git a/include/configs/ls2080a_simu.h b/include/configs/ls2080a_simu.h index de9db4abb46..02589be5fde 100644 --- a/include/configs/ls2080a_simu.h +++ b/include/configs/ls2080a_simu.h @@ -152,7 +152,6 @@ #define CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS 200000 /* Store environment at top of flash */ -#define CONFIG_ENV_IS_NOWHERE 1 #define CONFIG_ENV_SIZE 0x1000 #endif /* __LS2_SIMU_H */ diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index 5e1867d81ef..b5fa41e33df 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -229,7 +229,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_CS0_FTIM2 CONFIG_SYS_NAND_FTIM2 #define CONFIG_SYS_CS0_FTIM3 CONFIG_SYS_NAND_FTIM3 -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET (896 * 1024) #define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE 0x2000 @@ -238,7 +237,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_NAND_U_BOOT_SIZE (640 * 1024) #elif defined(CONFIG_SD_BOOT) #define CONFIG_ENV_OFFSET 0x200000 -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x20000 #endif diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index e8aacd3dcd2..a353cf4f687 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -223,7 +223,6 @@ unsigned long get_board_sys_clk(void); #define CONFIG_SYS_CS0_FTIM2 CONFIG_SYS_NAND_FTIM2 #define CONFIG_SYS_CS0_FTIM3 CONFIG_SYS_NAND_FTIM3 -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET (2048 * 1024) #define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index 43e4a325b46..b21a285d19b 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -62,8 +62,6 @@ #define CONFIG_SYS_MAX_FLASH_SECT 8 #define CONFIG_ENV_IS_IN_SPI_FLASH 1 #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K */ -#else -#define CONFIG_ENV_IS_NOWHERE #endif #define CONFIG_ENV_SIZE 0x10000 /* 64k */ diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index bd141fa4aa2..14874a5ebc4 100644 --- a/include/configs/m28evk.h +++ b/include/configs/m28evk.h @@ -25,7 +25,6 @@ /* Environment */ #define CONFIG_ENV_SIZE (16 * 1024) -#define CONFIG_ENV_IS_IN_NAND /* Environment is in NAND */ #if defined(CONFIG_CMD_NAND) && defined(CONFIG_ENV_IS_IN_NAND) @@ -47,8 +46,6 @@ "14m(boot)," \ "238m(data)," \ "-@4096k(UBI)" -#else -#define CONFIG_ENV_IS_NOWHERE #endif /* FEC Ethernet on SoC */ diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index 8bf0bd55481..f4fcbd315a5 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -92,7 +92,6 @@ #define CONFIG_SYS_NAND_USE_FLASH_BBT /* Environment is in NAND */ -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE #define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_RANGE (4 * CONFIG_ENV_SECT_SIZE) @@ -111,8 +110,6 @@ "14m(boot)," \ "240m(data)," \ "-@2048k(UBI)" -#else -#define CONFIG_ENV_IS_NOWHERE #endif /* diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h index 82aee151321..2744efb922d 100644 --- a/include/configs/ma5d4evk.h +++ b/include/configs/ma5d4evk.h @@ -32,7 +32,6 @@ /* * Environment */ -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE #define CONFIG_SYS_CONSOLE_ENV_OVERWRITE #define CONFIG_ENV_SIZE 0x4000 diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 0f3d7ae13cb..73fdfbd09fb 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -256,7 +256,6 @@ #define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_NAND_OMAP_GPMC #define CONFIG_NAND_OMAP_GPMC_PREFETCH -#define CONFIG_ENV_IS_IN_NAND #define SMNAND_ENV_OFFSET 0x180000 /* environment starts here */ /* Redundant Environment */ diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h index d2165828d36..e007370f904 100644 --- a/include/configs/medcom-wide.h +++ b/include/configs/medcom-wide.h @@ -25,7 +25,6 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Environment in NAND, aligned to start of last sector */ -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sectors */ /* USB host support */ diff --git a/include/configs/meesc.h b/include/configs/meesc.h index 3a8e82edbf7..3b7643fb630 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -145,7 +145,6 @@ #elif CONFIG_SYS_USE_NANDFLASH /* bootstrap + u-boot + env + linux in nandflash */ -# define CONFIG_ENV_IS_IN_NAND 1 # define CONFIG_ENV_OFFSET 0xC0000 # define CONFIG_ENV_SIZE 0x20000 diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h index ed55f441a45..14dac4a7296 100644 --- a/include/configs/meson-gxbb-common.h +++ b/include/configs/meson-gxbb-common.h @@ -11,7 +11,6 @@ #define CONFIG_CPU_ARMV8 #define CONFIG_REMAKE_ELF #define CONFIG_NR_DRAM_BANKS 2 -#define CONFIG_ENV_IS_NOWHERE 1 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_SYS_MAXARGS 32 #define CONFIG_SYS_MALLOC_LEN (32 << 20) diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 39d7bd1c2c7..734bd50dda2 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -95,7 +95,6 @@ /* use buffered writes (20x faster) */ # define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1 # ifdef RAMENV -# define CONFIG_ENV_IS_NOWHERE 1 # define CONFIG_ENV_SIZE 0x1000 # define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SIZE) @@ -117,7 +116,6 @@ # define CONFIG_SF_DEFAULT_CS XILINX_SPI_FLASH_CS # ifdef RAMENV -# define CONFIG_ENV_IS_NOWHERE 1 # define CONFIG_ENV_SIZE 0x1000 # define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SIZE) @@ -135,7 +133,6 @@ #else /* !SPIFLASH */ /* ENV in RAM */ -# define CONFIG_ENV_IS_NOWHERE 1 # define CONFIG_ENV_SIZE 0x1000 # define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SIZE) #endif /* !SPIFLASH */ diff --git a/include/configs/miqi_rk3288.h b/include/configs/miqi_rk3288.h index 477f296542d..0c43a2343d0 100644 --- a/include/configs/miqi_rk3288.h +++ b/include/configs/miqi_rk3288.h @@ -14,7 +14,6 @@ #include <configs/rk3288_common.h> -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #endif diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index ac116edf31a..eca13442abb 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -79,8 +79,6 @@ #ifdef CONFIG_MVEBU_SPI_BOOT #define CONFIG_ENV_IS_IN_SPI_FLASH /* Environment in NAND flash */ -#elif defined(CONFIG_MVEBU_NAND_BOOT) -#define CONFIG_ENV_IS_IN_NAND #endif #define CONFIG_ENV_OFFSET 0x180000 /* as Marvell U-Boot version */ diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h index cccc3a8ab0a..bd3c7ed949b 100644 --- a/include/configs/mx23_olinuxino.h +++ b/include/configs/mx23_olinuxino.h @@ -19,7 +19,6 @@ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 /* Environment */ -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OVERWRITE /* Environment is in MMC */ diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h index 34051728039..9b54d20e21a 100644 --- a/include/configs/mx23evk.h +++ b/include/configs/mx23evk.h @@ -23,7 +23,6 @@ /* Environment */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_ENV_IS_IN_MMC /* Environment is in MMC */ #if defined(CONFIG_CMD_MMC) && defined(CONFIG_ENV_IS_IN_MMC) diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h index 8949ee64db4..8b472bf0f08 100644 --- a/include/configs/mx25pdk.h +++ b/include/configs/mx25pdk.h @@ -58,7 +58,6 @@ #define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 /* U-Boot general configuration */ diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index e45649f566a..7ed9012ec92 100644 --- a/include/configs/mx31pdk.h +++ b/include/configs/mx31pdk.h @@ -127,7 +127,6 @@ /* * environment organization */ -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET 0x40000 #define CONFIG_ENV_OFFSET_REDUND 0x60000 #define CONFIG_ENV_SIZE (128 * 1024) diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index a4191ac86f9..2b7b871a861 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -172,7 +172,6 @@ #define CONFIG_ENV_IS_IN_FLASH #if defined(CONFIG_FSL_ENV_IN_NAND) - #define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET (1024 * 1024) #endif diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 4513adf2c41..5daa50d169f 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -211,7 +211,6 @@ */ #define CONFIG_ENV_OFFSET (6 * 64 * 1024) #define CONFIG_ENV_SIZE (8 * 1024) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #endif diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index aee6e70c39c..ccbac6ab287 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -196,7 +196,6 @@ /* environment organization */ #define CONFIG_ENV_OFFSET (6 * 64 * 1024) #define CONFIG_ENV_SIZE (8 * 1024) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define MX53ARD_CS1GCR1 (CSEN | DSZ(2)) diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h index cff1462d008..4137592d4c6 100644 --- a/include/configs/mx53cx9020.h +++ b/include/configs/mx53cx9020.h @@ -177,7 +177,6 @@ /* environment organization */ #define CONFIG_ENV_OFFSET (6 * 64 * 1024) #define CONFIG_ENV_SIZE (8 * 1024) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 /* Framebuffer and LCD */ diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h index ac9beb60abd..11d1278349a 100644 --- a/include/configs/mx53evk.h +++ b/include/configs/mx53evk.h @@ -139,7 +139,6 @@ /* environment organization */ #define CONFIG_ENV_OFFSET (6 * 64 * 1024) #define CONFIG_ENV_SIZE (8 * 1024) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #endif /* __CONFIG_H */ diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index c82e426a61c..3828b21a8e0 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -186,7 +186,6 @@ /* environment organization */ #define CONFIG_ENV_OFFSET (6 * 64 * 1024) #define CONFIG_ENV_SIZE (8 * 1024) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #ifdef CONFIG_CMD_SATA diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h index d064337f472..2990e163720 100644 --- a/include/configs/mx53smd.h +++ b/include/configs/mx53smd.h @@ -134,7 +134,6 @@ /* environment organization */ #define CONFIG_ENV_OFFSET (6 * 64 * 1024) #define CONFIG_ENV_SIZE (8 * 1024) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #endif /* __CONFIG_H */ diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 05a9ffde2b9..32e898e05c2 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -152,7 +152,6 @@ /* Environment organization */ #define CONFIG_ENV_SIZE (8 * 1024) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (8 * 64 * 1024) #endif /* __MX6CUBOXI_CONFIG_H */ diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index de5dc1c4517..ff0e4a6444d 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -123,7 +123,6 @@ /* Environment organization */ #define CONFIG_ENV_OFFSET (6 * 64 * 1024) #define CONFIG_ENV_SIZE (8 * 1024) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 /* USB Configs */ diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index d4e4628841e..b3638d5caef 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -194,8 +194,6 @@ /* Environment organization */ #define CONFIG_ENV_SIZE (8 * 1024) -#define CONFIG_ENV_IS_IN_MMC - #if defined(CONFIG_ENV_IS_IN_MMC) #define CONFIG_ENV_OFFSET (768 * 1024) #endif diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 6ab76bb8fa1..0f1a67dbb3e 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -146,7 +146,6 @@ #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #else #define CONFIG_ENV_OFFSET (8 * SZ_64K) -#define CONFIG_ENV_IS_IN_MMC #endif #ifdef CONFIG_CMD_SF diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h index 62159a16b72..67807f62803 100644 --- a/include/configs/mx6sllevk.h +++ b/include/configs/mx6sllevk.h @@ -133,7 +133,6 @@ #define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC1 */ #define CONFIG_ENV_OFFSET (12 * SZ_64K) -#define CONFIG_ENV_IS_IN_MMC /* MMC Configs */ #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 3e73dad9a3f..3468b491a78 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -171,7 +171,6 @@ #define CONFIG_ENV_OFFSET (8 * SZ_64K) #define CONFIG_ENV_SIZE SZ_8K -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_FSL_USDHC_NUM 2 #if defined(CONFIG_ENV_IS_IN_MMC) diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index b39ab729d8a..319fed4ebcb 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -211,7 +211,6 @@ #define CONFIG_ENV_OFFSET (8 * SZ_64K) #define CONFIG_ENV_SIZE SZ_8K -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_FSL_USDHC_NUM 3 #if defined(CONFIG_ENV_IS_IN_MMC) diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index d38c27a6417..c9b7e7b473d 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -166,7 +166,6 @@ /* environment organization */ #define CONFIG_ENV_SIZE SZ_8K -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (8 * SZ_64K) #define CONFIG_SYS_MMC_ENV_DEV 1 /* USDHC2 */ #define CONFIG_SYS_MMC_ENV_PART 0 /* user area */ diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h index 30e75184950..8787df49071 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -155,7 +155,6 @@ #define CONFIG_SYS_MMC_ENV_PART 0 /* user area */ #define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_SIZE SZ_8K #define CONFIG_ENV_OFFSET (12 * SZ_64K) diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index fe9fd661e8f..43453323f75 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -185,7 +185,6 @@ /* environment organization */ #define CONFIG_ENV_SIZE SZ_8K -#define CONFIG_ENV_IS_IN_MMC /* * If want to use nand, define CONFIG_NAND_MXS and rework board diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index 288a8894d17..532f47ea4f3 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -42,7 +42,6 @@ #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 #define CONFIG_ENV_OFFSET (12 * SZ_64K) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_SIZE SZ_8K /* Using ULP WDOG for reset */ diff --git a/include/configs/nas220.h b/include/configs/nas220.h index f3ed31386ce..52db4215a3d 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -56,10 +56,7 @@ * Environment variables configurations */ #ifdef CONFIG_CMD_NAND -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_SECT_SIZE 0x10000 -#else -#define CONFIG_ENV_IS_NOWHERE #endif #define CONFIG_ENV_SIZE 0x10000 diff --git a/include/configs/netgear_cg3100d.h b/include/configs/netgear_cg3100d.h index c97d4e57ed2..457a50d4721 100644 --- a/include/configs/netgear_cg3100d.h +++ b/include/configs/netgear_cg3100d.h @@ -7,7 +7,6 @@ #include <configs/bmips_common.h> #include <configs/bmips_bcm3380.h> -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_AUTO_COMPLETE diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 576b7b07db6..6d5b0bd831a 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -271,7 +271,6 @@ #define CONFIG_ENV_SIZE (8 * 1024) #if defined(CONFIG_SABRELITE) -#define CONFIG_ENV_IS_IN_MMC #else #define CONFIG_ENV_IS_IN_SPI_FLASH #endif diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index e157df4b957..982651462d4 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -371,8 +371,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); * FLASH and environment organization */ -#define CONFIG_ENV_IS_NOWHERE - #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 #define CONFIG_SYS_INIT_RAM_ADDR 0x4020f800 #define CONFIG_SYS_INIT_RAM_SIZE 0x800 diff --git a/include/configs/novena.h b/include/configs/novena.h index 041159806b8..2bba741ac37 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -30,14 +30,11 @@ * http://homepage.ntlworld.com./jonathan.deboynepollard/FGA/disc-partition-alignment.html */ #ifdef CONFIG_CMD_MMC -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_OFFSET (512 * 1024) #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE #define CONFIG_ENV_OFFSET_REDUND \ (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) -#else -#define CONFIG_ENV_IS_NOWHERE #endif /* Booting Linux */ diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h index bc67270af7b..2342f7452f5 100644 --- a/include/configs/nsa310s.h +++ b/include/configs/nsa310s.h @@ -33,10 +33,7 @@ /* environment variables configuration */ #ifdef CONFIG_CMD_NAND -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_SECT_SIZE 0x20000 -#else -#define CONFIG_ENV_IS_NOWHERE #endif #define CONFIG_ENV_SIZE 0x20000 #define CONFIG_ENV_OFFSET 0xe0000 diff --git a/include/configs/nsim.h b/include/configs/nsim.h index 5bbf6108463..44906630205 100644 --- a/include/configs/nsim.h +++ b/include/configs/nsim.h @@ -42,7 +42,6 @@ /* * Environment settings */ -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE SZ_512 #define CONFIG_ENV_OFFSET 0 diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index b5357ea15c7..ca409949adc 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -25,7 +25,6 @@ #define CONFIG_SYS_I2C_TEGRA /* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 609a3d1c453..9552c967c84 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -52,7 +52,6 @@ #define CONFIG_SYS_MONITOR_BASE 0x00000000 -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV CONFIG_MMC_DEFAULT_DEV #define CONFIG_ENV_SIZE 4096 #define CONFIG_ENV_OFFSET (SZ_1K * 1280) /* 1.25 MiB offset */ diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index ba29f3e7d1f..3b920ccf16b 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -29,8 +29,6 @@ #define CONFIG_SYS_MEM_TOP_HIDE (22UL << 20UL) #define CONFIG_TZSW_RESERVED_DRAM_SIZE CONFIG_SYS_MEM_TOP_HIDE -#define CONFIG_ENV_IS_IN_MMC - #undef CONFIG_ENV_SIZE #undef CONFIG_ENV_OFFSET #define CONFIG_ENV_SIZE (SZ_1K * 16) diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 0d48d4ecc1c..4422d5e8d5f 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -250,7 +250,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_ONENAND_BASE ONENAND_MAP -#define CONFIG_ENV_IS_IN_NAND 1 #define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ #define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */ #define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h index b5d2b007e82..7e1f4751fb9 100644 --- a/include/configs/omap3_cairo.h +++ b/include/configs/omap3_cairo.h @@ -175,7 +175,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_ONENAND_BASE ONENAND_MAP -#define CONFIG_ENV_IS_IN_NAND 1 #define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ #define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */ #define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 53bfc132643..76c00d4efa6 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -266,7 +266,6 @@ #if !defined(CONFIG_ENV_IS_NOWHERE) #if defined(CONFIG_CMD_NAND) -#define CONFIG_ENV_IS_IN_NAND #elif defined(CONFIG_CMD_ONENAND) #define CONFIG_ENV_IS_IN_ONENAND #define CONFIG_ENV_OFFSET ONENAND_ENV_OFFSET diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h index 9347a169a59..39f1e545444 100644 --- a/include/configs/omap3_igep00x0.h +++ b/include/configs/omap3_igep00x0.h @@ -133,7 +133,6 @@ #define CONFIG_SPL_UBI_INFO_ADDR 0x88080000 /* environment organization */ -#define CONFIG_ENV_IS_NOWHERE 1 #define CONFIG_ENV_UBI_PART "UBI" #define CONFIG_ENV_UBI_VOLUME "config" #define CONFIG_ENV_UBI_VOLUME_REDUND "config_r" diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 14dabfeb503..6e8afbf81f8 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -249,7 +249,6 @@ /* Monitor at start of flash */ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE -#define CONFIG_ENV_IS_IN_NAND 1 #define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ #define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index 950b91a4d94..834822df7fc 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -179,7 +179,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_ONENAND_BASE ONENAND_MAP -#define CONFIG_ENV_IS_IN_NAND #define ONENAND_ENV_OFFSET 0x240000 /* environment starts here */ #define SMNAND_ENV_OFFSET 0x240000 /* environment starts here */ diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index db5873642a9..b7ab6283dd2 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -103,7 +103,6 @@ /* Monitor at start of flash */ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE -#define CONFIG_ENV_IS_IN_NAND 1 #define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index 6c869c4c07b..23603c61e2f 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -155,7 +155,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_ONENAND_BASE ONENAND_MAP -#define CONFIG_ENV_IS_IN_NAND 1 #define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */ #define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ diff --git a/include/configs/omap4_sdp4430.h b/include/configs/omap4_sdp4430.h index b82ad13489c..c89bd13f55f 100644 --- a/include/configs/omap4_sdp4430.h +++ b/include/configs/omap4_sdp4430.h @@ -22,7 +22,6 @@ #include <configs/ti_omap4_common.h> /* ENV related config options */ -#define CONFIG_ENV_IS_IN_MMC 1 #define CONFIG_SYS_MMC_ENV_DEV 1 /* SLOT2: eMMC(1) */ #define CONFIG_ENV_OFFSET 0xE0000 diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 15d06bbe458..eb5e6df9ca7 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -34,7 +34,6 @@ #define CONFIG_MISC_INIT_R /* MMC ENV related defines */ -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 /* SLOT2: eMMC(1) */ #define CONFIG_ENV_SIZE (128 << 10) #define CONFIG_ENV_OFFSET 0x260000 diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index cb3513d3188..94a705e0fea 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -156,7 +156,6 @@ #ifdef CONFIG_USE_NAND #undef CONFIG_ENV_IS_IN_FLASH #define CONFIG_NAND_DAVINCI -#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */ #define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ #define CONFIG_ENV_SIZE (128 << 9) #define CONFIG_SYS_NAND_USE_FLASH_BBT @@ -216,7 +215,6 @@ #ifdef CONFIG_USE_SPIFLASH #undef CONFIG_ENV_IS_IN_FLASH -#undef CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE (64 << 10) #define CONFIG_ENV_OFFSET (256 << 10) @@ -301,14 +299,10 @@ #if !defined(CONFIG_USE_NAND) && \ !defined(CONFIG_SYS_USE_NOR) && \ !defined(CONFIG_USE_SPIFLASH) -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE (16 << 10) #endif /* SD/MMC */ -#ifdef CONFIG_MMC -#undef CONFIG_ENV_IS_IN_MMC -#endif #ifdef CONFIG_ENV_IS_IN_MMC #undef CONFIG_ENV_SIZE @@ -316,7 +310,6 @@ #define CONFIG_ENV_SIZE (16 << 10) /* 16 KiB */ #define CONFIG_ENV_OFFSET (51 << 9) /* Sector 51 */ #undef CONFIG_ENV_IS_IN_FLASH -#undef CONFIG_ENV_IS_IN_NAND #undef CONFIG_ENV_IS_IN_SPI_FLASH #endif diff --git a/include/configs/openrd.h b/include/configs/openrd.h index 89e963d5245..a30efdeb859 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -38,10 +38,7 @@ * Environment variables configurations */ #ifdef CONFIG_CMD_NAND -#define CONFIG_ENV_IS_IN_NAND 1 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K */ -#else -#define CONFIG_ENV_IS_NOWHERE 1 /* if env in SDRAM */ #endif /* * max 4k env size is enough, but in case of nand diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h index e7bc044acf5..9b96cd0be8c 100644 --- a/include/configs/opos6uldev.h +++ b/include/configs/opos6uldev.h @@ -74,7 +74,6 @@ #endif /* Environment is stored in the eMMC boot partition */ -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 1 #define CONFIG_ENV_SIZE (10 * 1024) diff --git a/include/configs/origen.h b/include/configs/origen.h index 6980e9e548d..c3636535377 100644 --- a/include/configs/origen.h +++ b/include/configs/origen.h @@ -89,7 +89,6 @@ /* MIU (Memory Interleaving Unit) */ #define CONFIG_MIU_2BIT_21_7_INTERLEAVED -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE (16 << 10) /* 16 KB */ #define RESERVE_BLOCK_SIZE (512) diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index a76e69fa9ab..193e2878450 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -778,7 +778,6 @@ #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 #elif defined(CONFIG_SDCARD) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_FSL_FIXED_MMC_LOCATION #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_SYS_MMC_ENV_DEV 0 @@ -789,11 +788,9 @@ #else #define CONFIG_ENV_SIZE CONFIG_SYS_NAND_BLOCK_SIZE #endif -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET (1024 * 1024) #define CONFIG_ENV_RANGE (3 * CONFIG_ENV_SIZE) #elif defined(CONFIG_SYS_RAMBOOT) -#define CONFIG_ENV_IS_NOWHERE /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 #else diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index 04d01e2ec3e..3d4d80c5773 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -361,11 +361,9 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); */ #ifdef CONFIG_SYS_RAMBOOT #ifdef CONFIG_RAMBOOT_SDCARD -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_SYS_MMC_ENV_DEV 0 #else -#define CONFIG_ENV_IS_NOWHERE /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 #endif diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h index b106439071c..3f5c669c399 100644 --- a/include/configs/p2371-0000.h +++ b/include/configs/p2371-0000.h @@ -22,7 +22,6 @@ #define CONFIG_SYS_I2C_TEGRA /* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h index 22fc122cc30..3fb62ded1ef 100644 --- a/include/configs/p2371-2180.h +++ b/include/configs/p2371-2180.h @@ -22,7 +22,6 @@ #define CONFIG_SYS_I2C_TEGRA /* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) diff --git a/include/configs/p2571.h b/include/configs/p2571.h index 974fd3f59f8..e8ed8b0fd34 100644 --- a/include/configs/p2571.h +++ b/include/configs/p2571.h @@ -23,7 +23,6 @@ #define CONFIG_SYS_I2C_TEGRA /* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) diff --git a/include/configs/p2771-0000.h b/include/configs/p2771-0000.h index 791a48a3be1..55230291c2f 100644 --- a/include/configs/p2771-0000.h +++ b/include/configs/p2771-0000.h @@ -18,7 +18,6 @@ #define CONFIG_SYS_I2C_TEGRA /* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) diff --git a/include/configs/paz00.h b/include/configs/paz00.h index 87a8557ea98..88754f0403a 100644 --- a/include/configs/paz00.h +++ b/include/configs/paz00.h @@ -23,7 +23,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_PAZ00 /* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h index efbcbd2e05d..85cac5a7b45 100644 --- a/include/configs/pb1x00.h +++ b/include/configs/pb1x00.h @@ -86,8 +86,6 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT (2 * CONFIG_SYS_HZ) /* Timeout for Flash Erase */ #define CONFIG_SYS_FLASH_WRITE_TOUT (2 * CONFIG_SYS_HZ) /* Timeout for Flash Write */ -#define CONFIG_ENV_IS_NOWHERE 1 - /* Address and size of Primary Environment Sector */ #define CONFIG_ENV_ADDR 0xB0030000 #define CONFIG_ENV_SIZE 0x10000 diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h index fc75ca85c58..ce80e7ecbc8 100644 --- a/include/configs/pcm051.h +++ b/include/configs/pcm051.h @@ -116,7 +116,6 @@ 4800, 9600, 14400, 19200, 28800, 38400, 56000, 57600, 115200 } /* CPU */ -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds" diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h index 482045d99f5..c77c82aacc6 100644 --- a/include/configs/pengwyn.h +++ b/include/configs/pengwyn.h @@ -160,7 +160,6 @@ "512k(SPL.backup3),1536k(u-boot)," \ "512k(u-boot-spl-os)," \ "512k(u-boot-env),5m(kernel),-(rootfs)" -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET 0x260000 /* environment starts here */ #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ /* NAND: SPL falcon mode configs */ diff --git a/include/configs/pepper.h b/include/configs/pepper.h index 5abeffbade3..ff3cd74ac31 100644 --- a/include/configs/pepper.h +++ b/include/configs/pepper.h @@ -19,7 +19,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_PEPPER #define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/phycore_rk3288.h b/include/configs/phycore_rk3288.h index aab43ed5948..7a977a8e5e7 100644 --- a/include/configs/phycore_rk3288.h +++ b/include/configs/phycore_rk3288.h @@ -17,7 +17,6 @@ func(MMC, mmc, 0) \ func(MMC, mmc, 1) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 #endif diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h index c5bfdec8fa8..57b265ce144 100644 --- a/include/configs/pic32mzdask.h +++ b/include/configs/pic32mzdask.h @@ -97,7 +97,6 @@ /* ------------------------------------------------- * Environment */ -#define CONFIG_ENV_IS_NOWHERE 1 #define CONFIG_ENV_SIZE 0x4000 /* --------------------------------------------------------------------- diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index 38ae83786d4..7b44752e551 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -143,7 +143,6 @@ /* environment organization */ #define CONFIG_ENV_SIZE SZ_8K -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (8 * SZ_64K) #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index d128eded054..e623f48fa26 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/pico-imx7d.h @@ -122,7 +122,6 @@ /* FLASH and environment organization */ #define CONFIG_ENV_SIZE SZ_8K -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (8 * SZ_64K) #define CONFIG_SYS_FSL_USDHC_NUM 2 diff --git a/include/configs/platinum.h b/include/configs/platinum.h index e5baae01703..a1cd18ef085 100644 --- a/include/configs/platinum.h +++ b/include/configs/platinum.h @@ -90,7 +90,6 @@ #define CONFIG_APBH_DMA_BURST8 /* Environment in NAND */ -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET (16 << 20) #define CONFIG_ENV_SECT_SIZE (128 << 10) #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE @@ -101,7 +100,6 @@ /* Environment in MMC */ #define CONFIG_ENV_SIZE (8 << 10) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (6 * 64 * 1024) #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/plutux.h b/include/configs/plutux.h index ff396eceb97..5d692d159c4 100644 --- a/include/configs/plutux.h +++ b/include/configs/plutux.h @@ -25,7 +25,6 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Environment in NAND, aligned to start of last sector */ -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sectors */ /* USB host support */ diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index b22a3b6a2bf..b6ec563cee2 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -256,7 +256,6 @@ #elif defined(CONFIG_SYS_USE_NANDFLASH) /* CONFIG_SYS_USE_NANDFLASH */ /* bootstrap + u-boot + env + linux in nandflash */ -#define CONFIG_ENV_IS_IN_NAND 1 #define CONFIG_ENV_OFFSET 0x60000 #define CONFIG_ENV_OFFSET_REDUND 0x80000 #define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index 41d5722490f..eeb3f27cfe3 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -282,7 +282,6 @@ #elif defined(CONFIG_SYS_USE_NANDFLASH) /* CFG_USE_NANDFLASH */ /* bootstrap + u-boot + env + linux in nandflash */ -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET 0x60000 #define CONFIG_ENV_OFFSET_REDUND 0x80000 #define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index 5e58b6b021c..dc4ebeab318 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -119,7 +119,6 @@ #define CONFIG_SYS_MEMTEST_END CONFIG_AT91SAM9G45_LCD_BASE /* bootstrap + u-boot + env + linux in nandflash */ -#define CONFIG_ENV_IS_IN_NAND 1 #define CONFIG_ENV_OFFSET 0x60000 #define CONFIG_ENV_OFFSET_REDUND 0x80000 #define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h index 2956d20d182..31d7156902a 100644 --- a/include/configs/pogo_e02.h +++ b/include/configs/pogo_e02.h @@ -41,10 +41,7 @@ * Environment variables configurations */ #ifdef CONFIG_CMD_NAND -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K */ -#else -#define CONFIG_ENV_IS_NOWHERE #endif #define CONFIG_ENV_SIZE 0x20000 /* 128k */ diff --git a/include/configs/poplar.h b/include/configs/poplar.h index 55e05d6ca56..d59f32a352d 100644 --- a/include/configs/poplar.h +++ b/include/configs/poplar.h @@ -67,7 +67,6 @@ /* Command line configuration */ -#define CONFIG_ENV_IS_IN_MMC 1 #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_OFFSET (0x780 * 512) /* env_mmc_blknum */ #define CONFIG_ENV_SIZE 0x10000 /* env_mmc_nblks bytes */ diff --git a/include/configs/popmetal_rk3288.h b/include/configs/popmetal_rk3288.h index 0dc3532f330..15a374cca7d 100644 --- a/include/configs/popmetal_rk3288.h +++ b/include/configs/popmetal_rk3288.h @@ -10,7 +10,6 @@ #define ROCKCHIP_DEVICE_SETTINGS #include <configs/rk3288_common.h> -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #endif diff --git a/include/configs/puma_rk3399.h b/include/configs/puma_rk3399.h index af1dae88eda..e481a28ae95 100644 --- a/include/configs/puma_rk3399.h +++ b/include/configs/puma_rk3399.h @@ -17,7 +17,6 @@ #undef CONFIG_ENV_OFFSET #define CONFIG_ENV_OFFSET (240 * 1024) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 #define SDRAM_BANK_SIZE (2UL << 30) diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h index c26810723e5..703d158b8b6 100644 --- a/include/configs/qemu-ppce500.h +++ b/include/configs/qemu-ppce500.h @@ -71,8 +71,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void); #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#define CONFIG_ENV_IS_NOWHERE - #define CONFIG_HWCONFIG #define CONFIG_SYS_INIT_RAM_ADDR 0x00100000 diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h index 05eb5ebf912..9690757109e 100644 --- a/include/configs/qemu-x86.h +++ b/include/configs/qemu-x86.h @@ -49,7 +49,6 @@ /* SPI is not supported */ #undef CONFIG_ENV_IS_IN_SPI_FLASH -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_SPL_FRAMEWORK diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index 18b7dce94e6..43fece6b8a7 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -10,7 +10,6 @@ #include "rockchip-common.h" #define CONFIG_NR_DRAM_BANKS 1 -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_MALLOC_LEN (32 << 20) diff --git a/include/configs/rock.h b/include/configs/rock.h index de5291cd05d..e998ec5f03c 100644 --- a/include/configs/rock.h +++ b/include/configs/rock.h @@ -10,7 +10,6 @@ #define ROCKCHIP_DEVICE_SETTINGS #include <configs/rk3188_common.h> -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #ifdef CONFIG_ROCKCHIP_SPL_BACK_TO_BROM diff --git a/include/configs/rock2.h b/include/configs/rock2.h index b4dcf23b1cf..bd39111710e 100644 --- a/include/configs/rock2.h +++ b/include/configs/rock2.h @@ -14,7 +14,6 @@ #include <configs/rk3288_common.h> -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #endif diff --git a/include/configs/rv1108_common.h b/include/configs/rv1108_common.h index 52750cb81bd..2b63abce467 100644 --- a/include/configs/rv1108_common.h +++ b/include/configs/rv1108_common.h @@ -9,7 +9,6 @@ #include <asm/arch/hardware.h> #include "rockchip-common.h" -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_MALLOC_LEN (32 << 20) diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h index b25a7ea3446..c56125209de 100644 --- a/include/configs/s32v234evb.h +++ b/include/configs/s32v234evb.h @@ -211,7 +211,6 @@ /* environment organization */ #define CONFIG_ENV_SIZE (8 * 1024) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (12 * 64 * 1024) #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index a9431cbd186..9c001385080 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -198,7 +198,6 @@ /* FLASH and environment organization */ #define CONFIG_MMC_DEFAULT_DEV 0 -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV CONFIG_MMC_DEFAULT_DEV #define CONFIG_ENV_SIZE 4096 #define CONFIG_ENV_OFFSET ((32 - 4) << 10) /* 32KiB - 4KiB */ diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index 0265684e673..b0bc69dab0c 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -77,7 +77,6 @@ #define CONFIG_BOOTBLOCK "10" #define CONFIG_UBIBLOCK "9" -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV CONFIG_MMC_DEFAULT_DEV #define CONFIG_ENV_SIZE 4096 #define CONFIG_ENV_OFFSET ((32 - 4) << 10) /* 32KiB - 4KiB */ diff --git a/include/configs/sagem_f@st1704.h b/include/configs/sagem_f@st1704.h index dbc7725796c..fd1c75935e7 100644 --- a/include/configs/sagem_f@st1704.h +++ b/include/configs/sagem_f@st1704.h @@ -7,7 +7,6 @@ #include <configs/bmips_common.h> #include <configs/bmips_bcm6338.h> -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_AUTO_COMPLETE diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h index 0ac39003266..7f81063d13b 100644 --- a/include/configs/salvator-x.h +++ b/include/configs/salvator-x.h @@ -73,7 +73,6 @@ #define CONFIG_SH_SDHI_FREQ 200000000 /* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) #define CONFIG_SYS_MMC_ENV_DEV 1 #define CONFIG_SYS_MMC_ENV_PART 2 diff --git a/include/configs/sama5d2_ptc.h b/include/configs/sama5d2_ptc.h index 7607f946405..b25be974b68 100644 --- a/include/configs/sama5d2_ptc.h +++ b/include/configs/sama5d2_ptc.h @@ -88,7 +88,6 @@ #undef CONFIG_ENV_OFFSET_REDUND #undef CONFIG_BOOTCOMMAND /* u-boot env in nand flash */ -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET 0x200000 #define CONFIG_ENV_OFFSET_REDUND 0x400000 #define CONFIG_BOOTCOMMAND "nand read 0x21000000 0xb80000 0x80000;" \ diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h index 74cdefe92b9..76533e3954f 100644 --- a/include/configs/sama5d3_xplained.h +++ b/include/configs/sama5d3_xplained.h @@ -76,8 +76,6 @@ /* override the bootcmd, bootargs and other configuration for nandflash env */ #elif CONFIG_SYS_USE_MMC /* override the bootcmd, bootargs and other configuration for sd/mmc env */ -#else -#define CONFIG_ENV_IS_NOWHERE #endif /* SPL */ diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index 891d6a0f79a..a5a0f7c32f7 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -109,8 +109,6 @@ /* override the bootcmd, bootargs and other configuration nandflash env */ #elif CONFIG_SYS_USE_MMC /* override the bootcmd, bootargs and other configuration for sd/mmc env */ -#else -#define CONFIG_ENV_IS_NOWHERE #endif /* SPL */ diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 072299b3f9a..edb153f79e8 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -52,7 +52,6 @@ #define CONFIG_AUTO_COMPLETE #define CONFIG_ENV_SIZE 8192 -#define CONFIG_ENV_IS_NOWHERE /* SPI - enable all SPI flash types for testing purposes */ #define CONFIG_CMD_SF_TEST diff --git a/include/configs/sansa_fuze_plus.h b/include/configs/sansa_fuze_plus.h index a6da2ccf826..e55addb99cb 100644 --- a/include/configs/sansa_fuze_plus.h +++ b/include/configs/sansa_fuze_plus.h @@ -19,7 +19,6 @@ /* Environment */ #define CONFIG_ENV_SIZE (16 * 1024) -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_OVERWRITE /* Booting Linux */ diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index 4d87f5334a4..1d07593e95e 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -380,7 +380,6 @@ #define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #else - #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 #endif diff --git a/include/configs/sc_sps_1.h b/include/configs/sc_sps_1.h index 73e7e6bbcfb..f7aeb640f60 100644 --- a/include/configs/sc_sps_1.h +++ b/include/configs/sc_sps_1.h @@ -23,14 +23,11 @@ /* Environment */ #define CONFIG_ENV_SIZE (16 * 1024) -#define CONFIG_ENV_IS_IN_MMC /* Environment is in MMC */ #if defined(CONFIG_CMD_MMC) && defined(CONFIG_ENV_IS_IN_MMC) #define CONFIG_ENV_OFFSET (256 * 1024) #define CONFIG_SYS_MMC_ENV_DEV 0 -#else -#define CONFIG_ENV_IS_NOWHERE #endif /* FEC Ethernet on SoC */ diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index afc2c7dfe96..2482ba1dcde 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -31,7 +31,6 @@ #define CONFIG_SYS_I2C_TEGRA /* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 diff --git a/include/configs/sfr_nb4_ser.h b/include/configs/sfr_nb4_ser.h index ab64518e0b1..6bd2d76f530 100644 --- a/include/configs/sfr_nb4_ser.h +++ b/include/configs/sfr_nb4_ser.h @@ -9,7 +9,6 @@ #define CONFIG_REMAKE_ELF -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_AUTO_COMPLETE diff --git a/include/configs/sheep_rk3368.h b/include/configs/sheep_rk3368.h index ec33565d097..eac9755bbad 100644 --- a/include/configs/sheep_rk3368.h +++ b/include/configs/sheep_rk3368.h @@ -13,7 +13,6 @@ #define KERNEL_LOAD_ADDR 0x280000 #define DTB_LOAD_ADDR 0x5600000 #define INITRD_LOAD_ADDR 0x5bf0000 -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_CONSOLE_SCROLL_LINES 10 diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index 9d2c106d46b..d4c9995d50a 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -35,10 +35,7 @@ * Environment variables configurations */ #ifdef CONFIG_CMD_NAND -#define CONFIG_ENV_IS_IN_NAND 1 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K */ -#else -#define CONFIG_ENV_IS_NOWHERE 1 /* if env in SDRAM */ #endif /* * max 4k env size is enough, but in case of nand diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index f393edbf53d..4a42de5ddbe 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -38,7 +38,6 @@ #endif #define CONFIG_ENV_OVERWRITE 1 -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_SYS_LONGHELP #define CONFIG_CMDLINE_EDITING @@ -216,7 +215,6 @@ * 0x442000 - 0x800000 : Userland */ #if defined(CONFIG_SPI_BOOT) -# undef CONFIG_ENV_IS_NOWHERE # 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 */ @@ -532,8 +530,6 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ #if !defined(CONFIG_SPI_BOOT) -#undef CONFIG_ENV_IS_NOWHERE -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET 0x260000 /* environment starts here */ #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ #endif diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 0550255b50d..bccb432a60b 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -181,7 +181,6 @@ /* * The NAND Flash partitions: */ -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET (0x100000) #define CONFIG_ENV_OFFSET_REDUND (0x180000) #define CONFIG_ENV_RANGE (SZ_512K) diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h index ccb89216d88..9986a3b707d 100644 --- a/include/configs/smdkv310.h +++ b/include/configs/smdkv310.h @@ -73,7 +73,6 @@ /* MIU (Memory Interleaving Unit) */ #define CONFIG_MIU_2BIT_INTERLEAVED -#define CONFIG_ENV_IS_IN_MMC 1 #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE (16 << 10) /* 16 KB */ #define RESERVE_BLOCK_SIZE (512) diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index d3e73f20975..63bc769efec 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -119,7 +119,6 @@ #define CONFIG_BOOTP_HOSTNAME /* Environment settings */ -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET (512 << 10) #define CONFIG_ENV_SIZE (256 << 10) #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index 4e0b9b12525..2c5f2648eee 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -89,7 +89,6 @@ #define CONFIG_BOOTP_HOSTNAME /* Environment settings */ -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET (512 << 10) #define CONFIG_ENV_SIZE (256 << 10) #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 6b065c9dc79..669ce8588d1 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -143,7 +143,6 @@ */ #define CONFIG_ENV_SIZE (128 * 1024) -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/socfpga_arria10_socdk.h b/include/configs/socfpga_arria10_socdk.h index 3b59b6a1069..55850bd1b39 100644 --- a/include/configs/socfpga_arria10_socdk.h +++ b/include/configs/socfpga_arria10_socdk.h @@ -33,7 +33,6 @@ /* * U-Boot environment configurations */ -#define CONFIG_ENV_IS_IN_MMC /* * arguments passed to the bootz command. The value of diff --git a/include/configs/socfpga_arria5_socdk.h b/include/configs/socfpga_arria5_socdk.h index fe4031910b6..9f83858bd18 100644 --- a/include/configs/socfpga_arria5_socdk.h +++ b/include/configs/socfpga_arria5_socdk.h @@ -23,8 +23,6 @@ #define CONFIG_PHY_MICREL_KSZ9021 #endif -#define CONFIG_ENV_IS_IN_MMC - /* The rest of the configuration is shared */ #include <configs/socfpga_common.h> diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h index be565211219..86b4a9dfb80 100644 --- a/include/configs/socfpga_cyclone5_socdk.h +++ b/include/configs/socfpga_cyclone5_socdk.h @@ -23,8 +23,6 @@ #define CONFIG_PHY_MICREL_KSZ9021 #endif -#define CONFIG_ENV_IS_IN_MMC - /* The rest of the configuration is shared */ #include <configs/socfpga_common.h> diff --git a/include/configs/socfpga_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h index 320c585a397..6516c45acf1 100644 --- a/include/configs/socfpga_de0_nano_soc.h +++ b/include/configs/socfpga_de0_nano_soc.h @@ -23,8 +23,6 @@ #define CONFIG_PHY_MICREL_KSZ9031 #endif -#define CONFIG_ENV_IS_IN_MMC - /* The rest of the configuration is shared */ #include <configs/socfpga_common.h> diff --git a/include/configs/socfpga_de10_nano.h b/include/configs/socfpga_de10_nano.h index ef693b00380..04be2b1689c 100644 --- a/include/configs/socfpga_de10_nano.h +++ b/include/configs/socfpga_de10_nano.h @@ -23,8 +23,6 @@ #define CONFIG_PHY_MICREL_KSZ9031 #endif -#define CONFIG_ENV_IS_IN_MMC - /* The rest of the configuration is shared */ #include <configs/socfpga_common.h> diff --git a/include/configs/socfpga_de1_soc.h b/include/configs/socfpga_de1_soc.h index 522ac74ffef..9405083b3e0 100644 --- a/include/configs/socfpga_de1_soc.h +++ b/include/configs/socfpga_de1_soc.h @@ -23,8 +23,6 @@ #define CONFIG_PHY_MICREL_KSZ9021 #endif -#define CONFIG_ENV_IS_IN_MMC - /* The rest of the configuration is shared */ #include <configs/socfpga_common.h> diff --git a/include/configs/socfpga_mcvevk.h b/include/configs/socfpga_mcvevk.h index ee85708b7a0..e9c7c71a73e 100644 --- a/include/configs/socfpga_mcvevk.h +++ b/include/configs/socfpga_mcvevk.h @@ -23,7 +23,6 @@ /* Environment is in MMC */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_ENV_IS_IN_MMC /* Extra Environment */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/socfpga_sockit.h b/include/configs/socfpga_sockit.h index c75acc0749d..57de60ecfa8 100644 --- a/include/configs/socfpga_sockit.h +++ b/include/configs/socfpga_sockit.h @@ -23,8 +23,6 @@ #define CONFIG_PHY_MICREL_KSZ9021 #endif -#define CONFIG_ENV_IS_IN_MMC - /* The rest of the configuration is shared */ #include <configs/socfpga_common.h> diff --git a/include/configs/socfpga_socrates.h b/include/configs/socfpga_socrates.h index a08fa9ff4cc..6b6cb6aa14f 100644 --- a/include/configs/socfpga_socrates.h +++ b/include/configs/socfpga_socrates.h @@ -23,8 +23,6 @@ #define CONFIG_PHY_MICREL_KSZ9021 #endif -#define CONFIG_ENV_IS_IN_MMC - /* The rest of the configuration is shared */ #include <configs/socfpga_common.h> diff --git a/include/configs/spear3xx_evb.h b/include/configs/spear3xx_evb.h index dd73a4d1bd9..98a74fa6e1e 100644 --- a/include/configs/spear3xx_evb.h +++ b/include/configs/spear3xx_evb.h @@ -25,7 +25,6 @@ #endif #if defined(CONFIG_NAND) -#define CONFIG_ENV_IS_IN_NAND #else #define CONFIG_ENV_IS_IN_FLASH #endif diff --git a/include/configs/spear6xx_evb.h b/include/configs/spear6xx_evb.h index 7745247052e..de08a727043 100644 --- a/include/configs/spear6xx_evb.h +++ b/include/configs/spear6xx_evb.h @@ -17,7 +17,6 @@ #endif #if defined(CONFIG_NAND) -#define CONFIG_ENV_IS_IN_NAND #else #define CONFIG_ENV_IS_IN_FLASH #endif diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h index 6f4070ff430..eaa93a58302 100644 --- a/include/configs/stih410-b2260.h +++ b/include/configs/stih410-b2260.h @@ -28,7 +28,6 @@ "board= B2260" \ "load_addr= #CONFIG_SYS_LOAD_ADDR \0" -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE 0x4000 /* Extra Commands */ diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index 4e0edcbc01c..46955b1f1f8 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -28,7 +28,6 @@ #define CONFIG_SYS_MAX_FLASH_SECT 8 #define CONFIG_SYS_MAX_FLASH_BANKS 1 -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE (8 << 10) #define CONFIG_STM32_FLASH diff --git a/include/configs/strider.h b/include/configs/strider.h index 994ac73e136..be6bd7352aa 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -537,7 +537,6 @@ void fpga_control_clear(unsigned int bus, int pin); #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE #else -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ #endif diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 16e25c4ea02..a9991fc6b81 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -137,7 +137,6 @@ /* **** PISMO SUPPORT *** */ #define CONFIG_NAND #define CONFIG_NAND_OMAP_GPMC -#define CONFIG_ENV_IS_IN_NAND #define SMNAND_ENV_OFFSET 0x180000 /* environment starts here */ /* Redundant Environment */ diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 897966cfabf..38f5bd015f8 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -202,7 +202,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_ONENAND_BASE ONENAND_MAP -#define CONFIG_ENV_IS_IN_NAND 1 #define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */ #define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ diff --git a/include/configs/taurus.h b/include/configs/taurus.h index e03731b9b93..cdea9ebf597 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -144,7 +144,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* bootstrap in spi flash , u-boot + env + linux in nandflash */ -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET 0x100000 #define CONFIG_ENV_OFFSET_REDUND 0x180000 #define CONFIG_ENV_SIZE (SZ_128K) /* 1 sector = 128 kB */ diff --git a/include/configs/tb100.h b/include/configs/tb100.h index fe8e6c4e3b3..67b5774a096 100644 --- a/include/configs/tb100.h +++ b/include/configs/tb100.h @@ -65,7 +65,6 @@ /* * Environment settings */ -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE SZ_2K #define CONFIG_ENV_OFFSET 0 diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 79f6b162f7f..4baccdc1e97 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -128,7 +128,6 @@ #endif /* Environment organization */ -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 2 /* overwritten on SD boot */ #define CONFIG_SYS_MMC_ENV_PART 1 /* overwritten on SD boot */ #define CONFIG_ENV_SIZE (8 * 1024) diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h index 6406d396983..c32a0870995 100644 --- a/include/configs/tec-ng.h +++ b/include/configs/tec-ng.h @@ -21,7 +21,6 @@ #define CONFIG_SYS_I2C_TEGRA /* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 diff --git a/include/configs/tec.h b/include/configs/tec.h index 8ffdbec9d1e..5f84f2489a9 100644 --- a/include/configs/tec.h +++ b/include/configs/tec.h @@ -25,7 +25,6 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Environment in NAND, aligned to start of last sector */ -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sectors */ /* USB host support */ diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h index f52fc8225c7..514590a2700 100644 --- a/include/configs/thunderx_88xx.h +++ b/include/configs/thunderx_88xx.h @@ -76,7 +76,6 @@ "root=/dev/sda2 coherent_pool=16M" /* Do not preserve environment */ -#define CONFIG_ENV_IS_NOWHERE 1 #define CONFIG_ENV_SIZE 0x1000 /* Monitor Command Prompt */ diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index ea83ea2495e..b5f817749cb 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -135,8 +135,6 @@ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 -#define CONFIG_ENV_IS_NOWHERE - /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x40300000 diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index 4a81b1daf84..bba10ec0010 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -107,7 +107,6 @@ "8m(NAND.kernel)," \ "-(NAND.file-system)" #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x000c0000 -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET 0x001c0000 #define CONFIG_ENV_OFFSET_REDUND 0x001e0000 #define CONFIG_SYS_ENV_SECT_SIZE CONFIG_SYS_NAND_BLOCK_SIZE diff --git a/include/configs/tinker_rk3288.h b/include/configs/tinker_rk3288.h index 72578f9202b..58eea3c405d 100644 --- a/include/configs/tinker_rk3288.h +++ b/include/configs/tinker_rk3288.h @@ -18,7 +18,6 @@ func(PXE, pxe, na) \ func(DHCP, dchp, na) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 #endif diff --git a/include/configs/titanium.h b/include/configs/titanium.h index ba5a1416b63..6d9c3432601 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -168,7 +168,6 @@ #define CONFIG_APBH_DMA_BURST8 /* Environment in NAND */ -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET (16 << 20) #define CONFIG_ENV_SECT_SIZE (128 << 10) #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE @@ -179,7 +178,6 @@ /* Environment in MMC */ #define CONFIG_ENV_SIZE (8 << 10) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (6 * 64 * 1024) #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h index ee46d3ac7ec..d538080aa31 100644 --- a/include/configs/topic_miami.h +++ b/include/configs/topic_miami.h @@ -14,7 +14,6 @@ #define CONFIG_ZYNQ_I2C1 /* Speed up boot time by ignoring the environment which we never used */ -#define CONFIG_ENV_IS_NOWHERE #include "zynq-common.h" diff --git a/include/configs/tplink_wdr4300.h b/include/configs/tplink_wdr4300.h index fc99dbd91e5..a03ad67af01 100644 --- a/include/configs/tplink_wdr4300.h +++ b/include/configs/tplink_wdr4300.h @@ -37,7 +37,6 @@ #define CONFIG_BOOTCOMMAND \ "dhcp 192.168.1.1:wdr4300.fit && bootm $loadaddr" -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE 0x10000 /* diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 0b362559f26..29e22aa3112 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -92,7 +92,6 @@ #if defined(CONFIG_TQMA6X_MMC_BOOT) -#define CONFIG_ENV_IS_IN_MMC #define TQMA6_UBOOT_OFFSET SZ_1K #define TQMA6_UBOOT_SECTOR_START 0x2 #define TQMA6_UBOOT_SECTOR_COUNT 0x7fe diff --git a/include/configs/trats.h b/include/configs/trats.h index e08bbc49ae9..3059d89ac90 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -55,7 +55,6 @@ #define CONFIG_BOOTBLOCK "10" #define CONFIG_ENV_COMMON_BOOT "${console} ${meminfo}" -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV CONFIG_MMC_DEFAULT_DEV #define CONFIG_ENV_SIZE 4096 #define CONFIG_ENV_OFFSET ((32 - 4) << 10) /* 32KiB - 4KiB */ diff --git a/include/configs/trats2.h b/include/configs/trats2.h index 927d48255cd..1f3ce9d9410 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -49,7 +49,6 @@ #define CONFIG_SYS_MONITOR_BASE 0x00000000 -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV CONFIG_MMC_DEFAULT_DEV #define CONFIG_ENV_SIZE 4096 #define CONFIG_ENV_OFFSET ((32 - 4) << 10) /* 32KiB - 4KiB */ diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 1d58701d98c..a0fd583c0a1 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -148,9 +148,6 @@ * which will not be influenced by any data already on the device. */ #ifdef CONFIG_FLASHCARD - -#define CONFIG_ENV_IS_NOWHERE - /* the rdaddr is 16 MiB before the loadaddr */ #define CONFIG_ENV_RDADDR "rdaddr=0x81000000\0" @@ -171,8 +168,6 @@ #define CONFIG_ENV_OVERWRITE /* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_IS_IN_NAND - #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_COMMON_ENV_SETTINGS \ "mmcargs=" \ diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h index 7bb8c879887..959db5fdb23 100644 --- a/include/configs/ts4800.h +++ b/include/configs/ts4800.h @@ -160,7 +160,6 @@ #define CONFIG_ENV_OFFSET (6 * 64 * 1024) #define CONFIG_ENV_SIZE (8 * 1024) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #endif diff --git a/include/configs/udoo.h b/include/configs/udoo.h index aef4563eded..d3fa5d71c19 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -168,7 +168,6 @@ /* Environment organization */ #define CONFIG_ENV_SIZE (8 * 1024) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (6 * 64 * 1024) #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h index c6f39c38b33..60b76edd1fc 100644 --- a/include/configs/udoo_neo.h +++ b/include/configs/udoo_neo.h @@ -85,7 +85,6 @@ /* Environment organization */ #define CONFIG_ENV_OFFSET (8 * SZ_64K) #define CONFIG_ENV_SIZE SZ_8K -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_IMX_THERMAL diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index e45b506eba9..b8afa813250 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -70,9 +70,6 @@ #define CONFIG_CONS_INDEX 1 -/* #define CONFIG_ENV_IS_NOWHERE */ -/* #define CONFIG_ENV_IS_IN_NAND */ -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET 0x100000 #define CONFIG_ENV_SIZE 0x2000 /* #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) */ diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index e25bf99e1c2..5bacc9d834a 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -21,7 +21,6 @@ /* U-Boot environment */ #define CONFIG_ENV_OFFSET (6 * 64 * 1024) #define CONFIG_ENV_SIZE (8 * 1024) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 /* U-Boot general configurations */ diff --git a/include/configs/venice2.h b/include/configs/venice2.h index 850a9bd49a4..5e9b79eb042 100644 --- a/include/configs/venice2.h +++ b/include/configs/venice2.h @@ -23,7 +23,6 @@ #define CONFIG_SYS_I2C_TEGRA /* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) diff --git a/include/configs/ventana.h b/include/configs/ventana.h index 1ab6476f3cb..9b8b1010a9c 100644 --- a/include/configs/ventana.h +++ b/include/configs/ventana.h @@ -21,7 +21,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_VENTANA /* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 diff --git a/include/configs/veyron.h b/include/configs/veyron.h index 3bd8dd60b5b..3f236aa13c8 100644 --- a/include/configs/veyron.h +++ b/include/configs/veyron.h @@ -14,7 +14,6 @@ #include <configs/rk3288_common.h> -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_SPL_SPI_LOAD #define CONFIG_SPI_FLASH_GIGADEVICE diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h index 78e14b38c11..0fed7f37ca3 100644 --- a/include/configs/vining_2000.h +++ b/include/configs/vining_2000.h @@ -101,7 +101,6 @@ #define CONFIG_ENV_SIZE SZ_8K #define CONFIG_ENV_OFFSET_REDUND (9 * SZ_64K) #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE -#define CONFIG_ENV_IS_IN_MMC #ifdef CONFIG_ENV_IS_IN_MMC #define CONFIG_SUPPORT_EMMC_BOOT diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h index 1aed81fc14d..f2a15f37fe3 100644 --- a/include/configs/vme8349.h +++ b/include/configs/vme8349.h @@ -323,7 +323,6 @@ #define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #else - #define CONFIG_ENV_IS_NOWHERE /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 #endif diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index be2f619f7ce..a8a48a597f0 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -151,7 +151,6 @@ /* Environment organization */ #define CONFIG_ENV_SIZE (8 * 1024) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (768 * 1024) #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/warp.h b/include/configs/warp.h index 389831595b0..139cde4d113 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -49,7 +49,6 @@ #define CONFIG_ENV_OFFSET (6 * SZ_64K) #define CONFIG_ENV_SIZE SZ_8K -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 /* VDD voltage 1.65 - 1.95 */ diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 23b6eae5330..75ae8a3e333 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -112,7 +112,6 @@ /* environment organization */ #define CONFIG_ENV_SIZE SZ_8K -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (8 * SZ_64K) #define CONFIG_SYS_FSL_USDHC_NUM 1 diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 56f53b97323..807cb99c81a 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -138,7 +138,6 @@ * Environment */ -#define CONFIG_ENV_IS_IN_NAND 1 #define CONFIG_ENV_SIZE 0x00020000 #define CONFIG_ENV_OFFSET 0x00100000 #define CONFIG_ENV_OFFSET_REDUND 0x00120000 diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h index b0e7e8115f7..51366d4d4e2 100644 --- a/include/configs/x86-chromebook.h +++ b/include/configs/x86-chromebook.h @@ -39,7 +39,6 @@ #define VIDEO_IO_OFFSET 0 #define CONFIG_X86EMU_RAW_IO -#undef CONFIG_ENV_IS_NOWHERE #undef CONFIG_ENV_SIZE #define CONFIG_ENV_SIZE 0x1000 #define CONFIG_ENV_SECT_SIZE 0x1000 diff --git a/include/configs/xfi3.h b/include/configs/xfi3.h index 2e6e75d5e34..bd829a94956 100644 --- a/include/configs/xfi3.h +++ b/include/configs/xfi3.h @@ -19,7 +19,6 @@ /* Environment */ #define CONFIG_ENV_SIZE (16 * 1024) -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_OVERWRITE /* Booting Linux */ diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index c7fcd86dd5c..0f4ca7452bb 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -138,9 +138,6 @@ #endif /* Do not preserve environment */ -#if !defined(CONFIG_ENV_IS_IN_FAT) -#define CONFIG_ENV_IS_NOWHERE 1 -#endif #define CONFIG_ENV_SIZE 0x8000 /* Monitor Command Prompt */ diff --git a/include/configs/xpress.h b/include/configs/xpress.h index 9edb35322d4..629e3df641e 100644 --- a/include/configs/xpress.h +++ b/include/configs/xpress.h @@ -57,7 +57,6 @@ /* Environment is in stored in the eMMC boot partition */ #define CONFIG_ENV_SIZE (16 << 10) -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (512 << 10) #define CONFIG_SYS_MMC_ENV_DEV 0 /* USDHC2 */ #define CONFIG_SYS_MMC_ENV_PART 1 /* boot parition */ diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 4b6b0888513..807b097d343 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -165,8 +165,6 @@ # elif defined(CONFIG_ZYNQ_QSPI) /* Environment in Serial Flash */ # define CONFIG_ENV_IS_IN_SPI_FLASH -# elif !defined(CONFIG_MTD_NOR_FLASH) -# define CONFIG_ENV_IS_NOWHERE # endif # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE |