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 40d323e004..5a1a287992 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 2226aba674..61a1fa48ae 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 9c0e4659f9..3fa1f7b4ae 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 5491c47a77..ca28ab0126 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 398d0e0550..a8bc2abcab 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 3b2d01e518..0eb56c07b4 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 7494b3d0b2..5c10d9ba55 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 8799a9eb27..53cb6d6174 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 ea99aead45..d34eacbad3 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 716fc3822e..28b9478d04 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 2f91dd57bb..2835d42b93 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 53e089a82a..4b9bc1fbd1 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 459efb560c..781a93ab14 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 7afbc9096f..ada85c7964 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 470bb72fcb..1456648d6a 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 0f96ac0242..decb57404a 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 8d026addb3..47b97d1554 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 1db3a633ef..46b9b7a67d 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 e87b11180a..4a4a76d2d4 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 a249fa6ef2..ea549e65d9 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 132f335dfd..9bf0904c51 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 967c83c53b..d3b655fda9 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 cbd92d92f6..c8bba52ed1 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 58c93788d7..59bbb5391b 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 4e42450da0..827068589b 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 69cbee0dfa..826313a850 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 4fce859073..79ee50db04 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 0857bc8f17..190000069b 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 f69746b4da..287c722e2f 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 ed3b0f7202..d06c5b574e 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 9a7aa81196..2bf3a5686a 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 cdccdc0c38..5343b8df85 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 22f542dc7d..4721b42f9e 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 77ac3fed24..f3b7767a97 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 e0fad52c64..75f9befcfd 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 eb768b9e97..77d9ba1899 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 7fe822eace..26036c4e97 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 1d8e39c203..88487c9fb9 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 98ce6c52da..9216998486 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 c3cade9ea6..d6b226c425 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 a18ab12804..4a12ac8ca3 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 9772d8b5c3..daa3be0999 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 3cb8fabfa9..b122fe617b 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 e0e577a622..fd319b3932 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 4d770e6077..8f0422943b 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 e6cddc13ac..36d74f3b26 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 dea8130046..e511d18234 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 48d7f6a5e6..8b0105c017 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 505f945bd3..d86f07b982 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 e45e4dbddc..a8337cdf43 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 a0c5b9afae..9e7fd1e1ae 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 5b3a4591fd..54c2318d86 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 8a8eb7c34f..05ba542382 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 799b75719e..96f4801ac5 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 29710a1fcd..17b3a1571e 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 8b1809e9c8..1a67816d43 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 02ae65ff57..049b4e0a43 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 5a85f7fa9c..08d1e4e69f 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 2afbbea140..8bd1e301a9 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 dc2860382d..2352b98f62 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 f3d7a2fad2..6afa1e8c04 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 40f1538789..c76053e49a 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 e35ea0ea4a..10c97d27c2 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 f7d736939b..8f92d7a958 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 f1b5a71edf..a490d06619 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 fd8df46776..768669ff12 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 0802e1b8e5..82be3a1afb 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 77c2493e66..bd80222149 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 3fb9daebbc..a1b8e141a9 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 5f92308682..99d4800327 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 346608d8e3..3fb66760c8 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 36475734fc..69706d254e 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 f3335f5c12..5f7386737a 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 ffcd98bf76..8aca89ddd8 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 587963963a..9efe74b593 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 cbcd5e4d38..d9fd642655 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 53ff33e4b9..91433afacc 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 5d8f968c4d..99630c0822 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 099684ddd2..94ec498af1 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 d45f8b32da..6d46041af6 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 072650dfae..f9245e06ba 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 92e6ee0033..abd09ca1ed 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 3635add4b2..ed1a2287ab 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 6079540bc9..ddbaf327d8 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 614417bff1..2bf4d66242 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 96a2df806a..41ab61aa7c 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 9db3380a95..970e214e07 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 a8b6802235..dfe9935520 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 92ce1273c6..5476961847 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 470e26256a..3e931edc71 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 394485ae8d..15e3292c09 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 d2f7c7cfff..40beb17574 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 712e11725b..d9dc639aeb 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 003cf0e1f3..9715f297a9 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 133b2b023c..ad7fce84e8 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 f142231689..8efcc94945 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 f88045436f..f8a5993326 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 8d38087ae6..b06c9b8f22 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 9dcb481707..7763365fe1 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 575610d410..531f5bf5aa 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 0a50154dda..0115d398a7 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 a571f2a749..552cd366bc 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 228683739b..d008539eb1 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 8f8e50fb60..6e1fd1c293 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 0dc3532f33..15a374cca7 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 fe3ec8c177..c792ce55c1 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 b9fd5b417a..015f25a774 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 0dc3532f33..15a374cca7 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 b4dcf23b1c..bd39111710 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 6f6007e65b..7a707cb2a0 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 d1635b098e..7fdadab101 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 f2260eae56..dddd300fb5 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 5ac29db240..c69e8994bd 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 ef8911fafa..c46a8772a3 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 530a88e9e1..fea4044769 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 c17d7fad79..cc312199ac 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 405129b7e2..df8e69fe66 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 ab64518e0b..6bd2d76f53 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 a5782f3300..d45dc357cb 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 72c64c6f9a..0748a4ef00 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 6310423335..934b76ecaf 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 648404fb74..95cb810fcd 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 1d1b8b31c2..ae8399426f 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 09f3a0471f..7f1f3cca3a 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 89f6cbc85b..acc97268ba 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 b186bfc891..7e455498dc 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 9598bc6976..78b901fb58 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 d054276e61..d8bcbde843 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 408e5634b6..f040d0bbb6 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 7d69224bd1..0db33b701c 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 088aced8b6..36009b8599 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 15da4074f2..4ea61af920 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 016d54f138..76ee91042d 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 c1ec2d440c..e5544f327d 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 152954165c..b3c931e36c 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 067ef4df93..06d7d400ca 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 87ca36a8e9..83c8805df6 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 deae787358..7b8561e9d6 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 77619ab324..860ad8f693 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 8a6b4e6378..1c30462af2 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 cec12ad04c..6b34edfbf1 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 de9db4abb4..02589be5fd 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 5e1867d81e..b5fa41e33d 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 e8aacd3dcd..a353cf4f68 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 43e4a325b4..b21a285d19 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 bd141fa4aa..14874a5ebc 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 8bf0bd5548..f4fcbd315a 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 82aee15132..2744efb922 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 0f3d7ae13c..73fdfbd09f 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 d2165828d3..e007370f90 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 3a8e82edbf..3b7643fb63 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 ed55f441a4..14dac4a729 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 39d7bd1c2c..734bd50dda 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 477f296542..0c43a2343d 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 ac116edf31..eca13442ab 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 cccc3a8ab0..bd3c7ed949 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 3405172803..9b54d20e21 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 8949ee64db..8b472bf0f0 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 e45649f566..7ed9012ec9 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 a4191ac86f..2b7b871a86 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 4513adf2c4..5daa50d169 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 aee6e70c39..ccbac6ab28 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 cff1462d00..4137592d4c 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 ac9beb60ab..11d1278349 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 c82e426a61..3828b21a8e 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 d064337f47..2990e16372 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 05a9ffde2b..32e898e05c 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 de5dc1c451..ff0e4a6444 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 d4e4628841..b3638d5cae 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 6ab76bb8fa..0f1a67dbb3 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 62159a16b7..67807f6280 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 3e73dad9a3..3468b491a7 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 b39ab729d8..319fed4ebc 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 d38c27a641..c9b7e7b473 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 30e7518495..8787df4907 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 fe9fd661e8..43453323f7 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 288a8894d1..532f47ea4f 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 f3ed31386c..52db4215a3 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 c97d4e57ed..457a50d472 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 576b7b07db..6d5b0bd831 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 e157df4b95..982651462d 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 041159806b..2bba741ac3 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 bc67270af7..2342f7452f 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 5bbf610846..4490663020 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 b5357ea15c..ca409949ad 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 609a3d1c45..9552c967c8 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 ba29f3e7d1..3b920ccf16 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 0d48d4ecc1..4422d5e8d5 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 b5d2b007e8..7e1f4751fb 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 53bfc13264..76c00d4efa 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 9347a169a5..39f1e54544 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 14dabfeb50..6e8afbf81f 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 950b91a4d9..834822df7f 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 db5873642a..b7ab6283dd 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 6c869c4c07..23603c61e2 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 b82ad13489..c89bd13f55 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 15d06bbe45..eb5e6df9ca 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 cb3513d318..94a705e0fe 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 89e963d524..a30efdeb85 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 e7bc044acf..9b96cd0be8 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 6980e9e548..c363653537 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 a76e69fa9a..193e287845 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 04d01e2ec3..3d4d80c577 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 b106439071..3f5c669c39 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 22fc122cc3..3fb62ded1e 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 974fd3f59f..e8ed8b0fd3 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 791a48a3be..55230291c2 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 87a8557ea9..88754f0403 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 efbcbd2e05..85cac5a7b4 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 fc75ca85c5..ce80e7ecbc 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 482045d99f..c77c82aacc 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 5abeffbade..ff3cd74ac3 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 aab43ed594..7a977a8e5e 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 c5bfdec8fa..57b265ce14 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 38ae83786d..7b44752e55 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 d128eded05..e623f48fa2 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 e5baae0170..a1cd18ef08 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 ff396eceb9..5d692d159c 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 b22a3b6a2b..b6ec563cee 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 41d5722490..eeb3f27cfe 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 5e58b6b021..dc4ebeab31 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 2956d20d18..31d7156902 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 55e05d6ca5..d59f32a352 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 0dc3532f33..15a374cca7 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 af1dae88ed..e481a28ae9 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 c26810723e..703d158b8b 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 05eb5ebf91..9690757109 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 18b7dce94e..43fece6b8a 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 de5291cd05..e998ec5f03 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 b4dcf23b1c..bd39111710 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 52750cb81b..2b63abce46 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 b25a7ea344..c56125209d 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 a9431cbd18..9c00138508 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 0265684e67..b0bc69dab0 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 dbc7725796..fd1c75935e 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 0ac3900326..7f81063d13 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 7607f94640..b25be974b6 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 74cdefe92b..76533e3954 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 891d6a0f79..a5a0f7c32f 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 072299b3f9..edb153f79e 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 a6da2ccf82..e55addb99c 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 4d87f5334a..1d07593e95 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 73e7e6bbcf..f7aeb640f6 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 afc2c7dfe9..2482ba1dcd 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 ab64518e0b..6bd2d76f53 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 ec33565d09..eac9755bba 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 9d2c106d46..d4c9995d50 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 f393edbf53..4a42de5ddb 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 0550255b50..bccb432a60 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 ccb89216d8..9986a3b707 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 d3e73f2097..63bc769efe 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 4e0b9b1252..2c5f2648ee 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 6b065c9dc7..669ce8588d 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 3b59b6a106..55850bd1b3 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 fe4031910b..9f83858bd1 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 be56521121..86b4a9dfb8 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 320c585a39..6516c45acf 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 ef693b0038..04be2b1689 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 522ac74ffe..9405083b3e 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 ee85708b7a..e9c7c71a73 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 c75acc0749..57de60ecfa 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 a08fa9ff4c..6b6cb6aa14 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 dd73a4d1bd..98a74fa6e1 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 7745247052..de08a72704 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 6f4070ff43..eaa93a5830 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 4e0edcbc01..46955b1f1f 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 994ac73e13..be6bd7352a 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 16e25c4ea0..a9991fc6b8 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 897966cfab..38f5bd015f 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 e03731b9b9..cdea9ebf59 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 fe8e6c4e3b..67b5774a09 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 79f6b162f7..4baccdc1e9 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 6406d39698..c32a087099 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 8ffdbec9d1..5f84f2489a 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 f52fc8225c..514590a270 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 ea83ea2495..b5f817749c 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 4a81b1daf8..bba10ec001 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 72578f9202..58eea3c405 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 ba5a1416b6..6d9c343260 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 ee46d3ac7e..d538080aa3 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 fc99dbd91e..a03ad67af0 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 0b362559f2..29e22aa311 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 e08bbc49ae..3059d89ac9 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 927d48255c..1f3ce9d941 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 1d58701d98..a0fd583c0a 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 7bb8c87988..959db5fdb2 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 aef4563ede..d3fa5d71c1 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 c6f39c38b3..60b76edd1f 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 e45b506eba..b8afa81325 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 e25bf99e1c..5bacc9d834 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 850a9bd49a..5e9b79eb04 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 1ab6476f3c..9b8b1010a9 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 3bd8dd60b5..3f236aa13c 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 78e14b38c1..0fed7f37ca 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 1aed81fc14..f2a15f37fe 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 be2f619f7c..a8a48a597f 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 389831595b..139cde4d11 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 23b6eae533..75ae8a3e33 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 56f53b9732..807cb99c81 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 b0e7e8115f..51366d4d4e 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 2e6e75d5e3..bd829a9495 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 c7fcd86dd5..0f4ca7452b 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 9edb35322d..629e3df641 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 4b6b088851..807b097d34 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 |