diff options
Diffstat (limited to 'include')
96 files changed, 0 insertions, 114 deletions
diff --git a/include/config_fsl_chain_trust.h b/include/config_fsl_chain_trust.h index 195419b888..6ec577bffa 100644 --- a/include/config_fsl_chain_trust.h +++ b/include/config_fsl_chain_trust.h @@ -7,16 +7,6 @@ #ifndef __CONFIG_FSL_CHAIN_TRUST_H #define __CONFIG_FSL_CHAIN_TRUST_H -/* For secure boot, since ENVIRONMENT in flash/external memories is - * not verified, undef CONFIG_ENV_xxx and set default env - * (CONFIG_ENV_IS_NOWHERE) - */ -#ifdef CONFIG_SECURE_BOOT - -#undef CONFIG_ENV_IS_IN_SPI_FLASH - -#endif - #ifdef CONFIG_CHAIN_OF_TRUST #ifndef CONFIG_EXTRA_ENV diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index d580e9b36e..6ae9851545 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -115,7 +115,6 @@ #if defined(CONFIG_SPIFLASH) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 10000000 diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index 3fa1f7b4ae..eadfa758c7 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -267,7 +267,6 @@ extern unsigned long get_sdram_size(void); * Environment */ #if defined(CONFIG_RAMBOOT_SPIFLASH) -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 10000000 diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index e8d5dc59fe..4395eb9c07 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -489,7 +489,6 @@ combinations. this should be removed later #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #elif defined(CONFIG_RAMBOOT_SPIFLASH) -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 10000000 diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index 937e93ef0a..629a326d7b 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -404,7 +404,6 @@ */ #if defined(CONFIG_SYS_RAMBOOT) #if defined(CONFIG_RAMBOOT_SPIFLASH) -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 10000000 diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index 591d0d1d85..21a0309c6e 100644 --- a/include/configs/M52277EVB.h +++ b/include/configs/M52277EVB.h @@ -196,7 +196,6 @@ * crc error warning if there is no correct environment on the flash. */ #ifdef CONFIG_CF_SBF -# define CONFIG_ENV_IS_IN_SPI_FLASH # define CONFIG_ENV_SPI_CS 2 #endif #define CONFIG_ENV_OVERWRITE 1 diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h index f55843a8f4..b4b1ba88d6 100644 --- a/include/configs/M54418TWR.h +++ b/include/configs/M54418TWR.h @@ -277,7 +277,6 @@ #endif #if defined(CONFIG_CF_SBF) -#define CONFIG_ENV_IS_IN_SPI_FLASH 1 #define CONFIG_ENV_SPI_CS 1 #define CONFIG_ENV_OFFSET 0x40000 #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h index 05c86ae2fc..6eb8eaddf1 100644 --- a/include/configs/M54451EVB.h +++ b/include/configs/M54451EVB.h @@ -213,7 +213,6 @@ * crc error warning if there is no correct environment on the flash. */ #if defined(CONFIG_SYS_STMICRO_BOOT) -# define CONFIG_ENV_IS_IN_SPI_FLASH 1 # define CONFIG_ENV_SPI_CS 1 # define CONFIG_ENV_OFFSET 0x20000 # define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index be54e019f2..8702b89174 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -270,7 +270,6 @@ * crc error warning if there is no correct environment on the flash. */ #ifdef CONFIG_CF_SBF -# define CONFIG_ENV_IS_IN_SPI_FLASH # define CONFIG_ENV_SPI_CS 1 #endif #undef CONFIG_ENV_OVERWRITE diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index d96c15ec01..0245fc68eb 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -557,7 +557,6 @@ #if defined(CONFIG_SYS_RAMBOOT) #if defined(CONFIG_RAMBOOT_SPIFLASH) -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 10000000 diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 74c33fda02..23fe9f9f7c 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -681,7 +681,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #elif defined(CONFIG_SPIFLASH) -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 10000000 diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 3695ac3f3f..db70b469dc 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -551,7 +551,6 @@ * Environment */ #ifdef CONFIG_SPIFLASH -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 10000000 diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 36d08d8e7f..a31989835b 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -63,7 +63,6 @@ #if defined(CONFIG_SPIFLASH) #define CONFIG_SYS_EXTRA_ENV_RELOC - #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 10000000 diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index ea05b3c36f..d1287fc224 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -145,7 +145,6 @@ #if defined(CONFIG_SPIFLASH) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 10000000 diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index f9a4ba1af3..0785164cb9 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -160,7 +160,6 @@ #if defined(CONFIG_SPIFLASH) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 10000000 diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 6dbb3dfe00..bf2c15a183 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -72,7 +72,6 @@ #ifdef CONFIG_MTD_NOR_FLASH #if defined(CONFIG_SPIFLASH) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 10000000 diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 57ef0fd3b7..1454b9f62e 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -180,7 +180,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #if defined(CONFIG_SPIFLASH) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index d3230c0e4a..1339aa0583 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -141,7 +141,6 @@ #if defined(CONFIG_SPIFLASH) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 10000000 diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index bcbc8aac9f..e0a5fc9749 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -127,7 +127,6 @@ #if defined(CONFIG_SPIFLASH) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 10000000 diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index d9983653f0..0c1ec41e66 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -86,7 +86,6 @@ #if defined(CONFIG_SPIFLASH) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 10000000 diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index ee1110a317..df3888310c 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -327,7 +327,6 @@ #if defined(CONFIG_SPIFLASH) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 10000000 diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 31d7cdbd10..6fd3fa4712 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -375,7 +375,6 @@ #ifdef CONFIG_RAMBOOT_SPIFLASH -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE 0x3000 /* 12KB */ #define CONFIG_ENV_OFFSET 0x2000 /* 8KB */ #define CONFIG_ENV_SECT_SIZE 0x1000 diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h index 58cf7ad888..22a4e69be5 100644 --- a/include/configs/advantech_dms-ba16.h +++ b/include/configs/advantech_dms-ba16.h @@ -239,7 +239,6 @@ /* FLASH and environment organization */ -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_OFFSET (768 * 1024) #define CONFIG_ENV_SECT_SIZE (64 * 1024) diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 85591de116..3b90d78bf4 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -320,7 +320,6 @@ #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_SYS_REDUNDAND_ENVIRONMENT #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #define CONFIG_ENV_SECT_SIZE (4 << 10) /* 4 KB sectors */ diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 88487c9fb9..ffef0b8afe 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -128,7 +128,6 @@ #define CONFIG_SYS_TEXT_BASE CONFIG_ISW_ENTRY_ADDR #endif #undef CONFIG_ENV_IS_IN_FAT -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_SYS_REDUNDAND_ENVIRONMENT #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #define CONFIG_ENV_SECT_SIZE (64 << 10) /* 64 KB sectors */ diff --git a/include/configs/ap121.h b/include/configs/ap121.h index 05d7b3abe6..489b32e6d1 100644 --- a/include/configs/ap121.h +++ b/include/configs/ap121.h @@ -41,7 +41,6 @@ "64k(NVRAM),64k(ART)" #define CONFIG_ENV_SPI_MAX_HZ 25000000 -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_OFFSET 0x40000 #define CONFIG_ENV_SECT_SIZE 0x10000 #define CONFIG_ENV_SIZE 0x10000 diff --git a/include/configs/ap143.h b/include/configs/ap143.h index 91a40c9f4b..3e93a08fe3 100644 --- a/include/configs/ap143.h +++ b/include/configs/ap143.h @@ -45,7 +45,6 @@ "64k(ART)" #define CONFIG_ENV_SPI_MAX_HZ 25000000 -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_OFFSET 0x40000 #define CONFIG_ENV_SECT_SIZE 0x10000 #define CONFIG_ENV_SIZE 0x10000 diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index b6edfe0948..0495dbffbd 100644 --- a/include/configs/aristainetos-common.h +++ b/include/configs/aristainetos-common.h @@ -160,7 +160,6 @@ /* Environment organization */ #define CONFIG_ENV_SIZE (12 * 1024) -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_SYS_REDUNDAND_ENVIRONMENT #define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS #define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h index e511d18234..33f2d85319 100644 --- a/include/configs/at91-sama5_common.h +++ b/include/configs/at91-sama5_common.h @@ -87,7 +87,6 @@ "bootz 0x22000000 - 0x21000000" #elif CONFIG_SYS_USE_SERIALFLASH /* u-boot env in serial flash, by default is bus 0 and cs 0 */ -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_OFFSET 0x6000 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x1000 diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index 54c2318d86..79e83a8d80 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -125,7 +125,6 @@ #ifdef CONFIG_SYS_USE_SPIFLASH /* bootstrap + u-boot + env + linux in dataflash on CS0 */ -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_OFFSET 0x5000 #define CONFIG_ENV_SIZE 0x3000 #define CONFIG_ENV_SECT_SIZE 0x1000 diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 96f4801ac5..cc74ca30a8 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -121,7 +121,6 @@ "bootm 0x22000000" #elif defined(CONFIG_SYS_USE_SPIFLASH) /* bootstrap + u-boot + env + linux in spi flash */ -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_OFFSET 0x5000 #define CONFIG_ENV_SIZE 0x3000 #define CONFIG_ENV_SECT_SIZE 0x1000 @@ -131,7 +130,6 @@ "bootm 0x22000000" #elif defined(CONFIG_SYS_USE_DATAFLASH) /* bootstrap + u-boot + env + linux in data flash */ -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_OFFSET 0x4200 #define CONFIG_ENV_SIZE 0x4200 #define CONFIG_ENV_SECT_SIZE 0x210 diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 70d1a66ad7..fafab8ea97 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -499,7 +499,6 @@ DEFAULT_LINUX_BOOT_ENV \ #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_SYS_REDUNDAND_ENVIRONMENT #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #define CONFIG_ENV_SECT_SIZE (4 << 10) /* 4 KB sectors */ diff --git a/include/configs/blanche.h b/include/configs/blanche.h index 50692cba65..9a18046d9c 100755 --- a/include/configs/blanche.h +++ b/include/configs/blanche.h @@ -81,7 +81,6 @@ /* ENV setting */ #if !defined(CONFIG_MTD_NOR_FLASH) #else -#undef CONFIG_ENV_IS_IN_SPI_FLASH #undef CONFIG_ENV_ADDR #define CONFIG_ENV_SECT_SIZE (256 * 1024) #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN) diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index 10c97d27c2..9688c4a776 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 -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_SYS_REDUNDAND_ENVIRONMENT #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #define CONFIG_ENV_SECT_SIZE (4 << 10) /* 4 KB sectors */ diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index 5d797b4403..b36cbb9679 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -245,7 +245,6 @@ #define CONFIG_ENV_SIZE (8 * 1024) -#define CONFIG_ENV_IS_IN_SPI_FLASH #if defined(CONFIG_ENV_IS_IN_SPI_FLASH) #define CONFIG_ENV_OFFSET (768 * 1024) #define CONFIG_ENV_SECT_SIZE (64 * 1024) diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h index a04f4cd23d..c1cf4132fe 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -50,7 +50,6 @@ #define CONFIG_ENV_SIZE (16 << 10) /* 16 KiB env size */ #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SECT_SIZE (64 * 1024) #define CONFIG_ENV_OFFSET (768 * 1024) #define CONFIG_ENV_SPI_MAX_HZ 48000000 diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 4d60edd56d..481b837175 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -64,7 +64,6 @@ "-(reserved)" /* Environment */ -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE #define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index 7b5ca0db0f..f6e0743b53 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -97,7 +97,6 @@ #define V_OSCK 24000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK) -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SECT_SIZE (64 * 1024) #define CONFIG_ENV_OFFSET (768 * 1024) #define CONFIG_ENV_SPI_MAX_HZ 48000000 diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index f9245e06ba..1ac416260e 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -300,7 +300,6 @@ #if defined(CONFIG_TRAILBLAZER) #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ #elif defined(CONFIG_RAMBOOT_SPIFLASH) -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 10000000 diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index f10cddafe0..021150ed61 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -65,7 +65,6 @@ #define CONFIG_EHCI_IS_TDI /* Environment in SPI NOR flash */ -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_BUS 1 #define CONFIG_ENV_OFFSET (1 << 20) /* 1MiB in */ #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */ diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 70fdb58163..07183c9095 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -74,7 +74,6 @@ #if defined(CONFIG_SPIFLASH) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 10000000 diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index b79bd4e2e1..c610ff3f8f 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -231,7 +231,6 @@ #endif #ifdef CONFIG_USE_SPIFLASH -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE (64 << 10) #define CONFIG_ENV_OFFSET (512 << 10) #define CONFIG_ENV_SECT_SIZE (64 << 10) diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h index 699c03f844..cdaaced2eb 100644 --- a/include/configs/db-88f6720.h +++ b/include/configs/db-88f6720.h @@ -40,7 +40,6 @@ #define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 /* Environment in SPI NOR flash */ -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_OFFSET (1 << 20) /* 1MiB in */ #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */ #define CONFIG_ENV_SECT_SIZE (64 << 10) /* 64KiB sectors */ diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h index 0f0ab01f62..864222955f 100644 --- a/include/configs/db-88f6820-amc.h +++ b/include/configs/db-88f6820-amc.h @@ -40,7 +40,6 @@ #define CONFIG_EHCI_IS_TDI /* Environment in SPI NOR flash */ -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_BUS 1 #define CONFIG_ENV_OFFSET (1 << 20) /* 1MiB in */ #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */ diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 292bfb8f7d..4a9d2f75bf 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -62,7 +62,6 @@ #define CONFIG_EHCI_IS_TDI /* Environment in SPI NOR flash */ -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_OFFSET (1 << 20) /* 1MiB in */ #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */ #define CONFIG_ENV_SECT_SIZE (256 << 10) /* 256KiB sectors */ diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index 187ead3e4b..6ad5206fc0 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -44,7 +44,6 @@ #define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 /* Environment in SPI NOR flash */ -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_OFFSET (1 << 20) /* 1MiB in */ #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */ #define CONFIG_ENV_SECT_SIZE (64 << 10) /* 64KiB sectors */ diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 1c2cc6f4b0..8566bdc569 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -137,7 +137,6 @@ #define CONFIG_SYS_SPI_ARGS_OFFS 0x140000 #define CONFIG_SYS_SPI_ARGS_SIZE 0x80000 #if defined(CONFIG_QSPI_BOOT) -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_SYS_REDUNDAND_ENVIRONMENT #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #define CONFIG_ENV_SIZE (64 << 10) diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 9715f297a9..7a739e39d7 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -32,7 +32,6 @@ * Environment variables configurations */ #ifdef CONFIG_SPI_FLASH -#define CONFIG_ENV_IS_IN_SPI_FLASH 1 #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64k */ #endif diff --git a/include/configs/ds109.h b/include/configs/ds109.h index ad7fce84e8..a2c6837348 100644 --- a/include/configs/ds109.h +++ b/include/configs/ds109.h @@ -35,7 +35,6 @@ * Environment variables configurations */ #ifdef CONFIG_SPI_FLASH -#define CONFIG_ENV_IS_IN_SPI_FLASH 1 #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64k */ #endif diff --git a/include/configs/ds414.h b/include/configs/ds414.h index aaba5d8eab..a209e6f09c 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -36,7 +36,6 @@ #define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 /* Environment in SPI NOR flash */ -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_OFFSET 0x7E0000 /* RedBoot config partition in DTS */ #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */ #define CONFIG_ENV_SECT_SIZE (64 << 10) /* 64KiB sectors */ diff --git a/include/configs/ea20.h b/include/configs/ea20.h index 8f42b83a45..16f65f3480 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -87,7 +87,6 @@ #endif #ifdef CONFIG_USE_SPIFLASH -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE (8 << 10) #define CONFIG_ENV_OFFSET 0x80000 #define CONFIG_ENV_SECT_SIZE (64 << 10) diff --git a/include/configs/efi-x86.h b/include/configs/efi-x86.h index 7763365fe1..f5331915e2 100644 --- a/include/configs/efi-x86.h +++ b/include/configs/efi-x86.h @@ -13,7 +13,6 @@ #undef CONFIG_TPM_TIS_BASE_ADDRESS -#undef CONFIG_ENV_IS_IN_SPI_FLASH #undef CONFIG_SCSI_AHCI #undef CONFIG_INTEL_ICH6_GPIO #undef CONFIG_USB_EHCI_PCI diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index 6f7817a33e..4c0647bb69 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -61,7 +61,6 @@ #define DATAFLASH_TCSS (0x1a << 16) #define DATAFLASH_TCHS (0x1 << 24) -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_OFFSET 0x3DE000 #define CONFIG_ENV_SECT_SIZE (132 << 10) #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE diff --git a/include/configs/exynos5-dt-common.h b/include/configs/exynos5-dt-common.h index 1b94d07f67..11aa6b8a9a 100644 --- a/include/configs/exynos5-dt-common.h +++ b/include/configs/exynos5-dt-common.h @@ -18,7 +18,6 @@ #define CONFIG_EXYNOS5_DT -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_BASE 0x12D30000 #define FLASH_SIZE (4 << 20) #define CONFIG_ENV_OFFSET (FLASH_SIZE - CONFIG_ENV_SECT_SIZE) diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index ad97a16bc7..5e04dd24f4 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -269,7 +269,6 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) /* environment organization */ -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_OFFSET (768 * 1024) #define CONFIG_ENV_SECT_SIZE (64 * 1024) diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index c46a8772a3..ff2b9c6e72 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -212,9 +212,6 @@ #endif /* Persistent Environment Config */ -#ifdef CONFIG_SPI_FLASH - #define CONFIG_ENV_IS_IN_SPI_FLASH -#endif #if defined(CONFIG_ENV_IS_IN_MMC) #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 1 diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index 7ca077133f..04afde7e20 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -204,7 +204,6 @@ int get_scl(void); * Environment variables configurations */ #if defined CONFIG_KM_ENV_IS_IN_SPI_NOR -#define CONFIG_ENV_IS_IN_SPI_FLASH /* use SPI-Flash for environment vars */ #define CONFIG_ENV_OFFSET 0xc0000 /* no bracets! */ #define CONFIG_ENV_SIZE 0x02000 /* Size of Environment */ #define CONFIG_ENV_SECT_SIZE 0x10000 diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index 664a64c55a..373e4bc3b4 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -44,7 +44,6 @@ /* Environment in SPI Flash */ #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 20000000 diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index 433e0ddbcc..d5fe7dfa96 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -136,7 +136,6 @@ /* * Environment variables configurations */ -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64KB */ #define CONFIG_ENV_SIZE 0x1000 /* 4KB */ #define CONFIG_ENV_ADDR 0x70000 diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h index 42bbc028d3..74af0b9dc6 100644 --- a/include/configs/ls1012a_common.h +++ b/include/configs/ls1012a_common.h @@ -64,7 +64,6 @@ */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE 0x40000 /* 256KB */ #define CONFIG_ENV_OFFSET 0x200000 /* 2MB */ #define CONFIG_ENV_SECT_SIZE 0x40000 diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index e5544f327d..1f2eb52c24 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -290,7 +290,6 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #elif defined(CONFIG_QSPI_BOOT) -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET 0x100000 #define CONFIG_ENV_SECT_SIZE 0x10000 diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index b823ff23bf..251a66e595 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -553,7 +553,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #elif defined(CONFIG_QSPI_BOOT) -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ #define CONFIG_ENV_OFFSET 0x300000 /* 3MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 8fe34ef658..b9e5cdbb1e 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -421,7 +421,6 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x20000 #elif defined(CONFIG_QSPI_BOOT) -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET 0x300000 #define CONFIG_ENV_SECT_SIZE 0x10000 diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index 740facfa58..415a705508 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -417,7 +417,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #elif defined(CONFIG_QSPI_BOOT) -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ #define CONFIG_ENV_OFFSET 0x300000 /* 3MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 782669ad2c..ea99676b7a 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -451,7 +451,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #elif defined(CONFIG_QSPI_BOOT) -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ #define CONFIG_ENV_OFFSET 0x300000 /* 3MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index 1c30462af2..20a5e7f659 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -171,7 +171,6 @@ #define CONFIG_ENV_OFFSET (3 * 1024 * 1024) #define CONFIG_ENV_SIZE 0x2000 #else -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ #define CONFIG_ENV_OFFSET 0x300000 /* 3MB */ #define CONFIG_ENV_SECT_SIZE 0x40000 /* 256KB */ diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index dbca05a3f6..6ae5586d64 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -31,7 +31,6 @@ #endif #else #define CONFIG_SYS_TEXT_BASE 0x20100000 -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ #define CONFIG_ENV_OFFSET 0x300000 /* 3MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index b21a285d19..8b94412028 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -60,7 +60,6 @@ #ifdef CONFIG_SPI_FLASH #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 8 -#define CONFIG_ENV_IS_IN_SPI_FLASH 1 #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K */ #endif diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h index b82a684cc9..66641ff1c9 100644 --- a/include/configs/maxbcm.h +++ b/include/configs/maxbcm.h @@ -36,7 +36,6 @@ #define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 /* Environment in SPI NOR flash */ -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_OFFSET (1 << 20) /* 1MiB in */ #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */ #define CONFIG_ENV_SECT_SIZE (64 << 10) /* 64KiB sectors */ diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 609da9e9ba..aa007e2819 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -119,7 +119,6 @@ # define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SIZE) # else /* SPIFLASH && !RAMENV */ -# define CONFIG_ENV_IS_IN_SPI_FLASH 1 # define CONFIG_ENV_SPI_MODE SPI_MODE_3 # define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED # define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h index eb80ac5b48..778cc9e378 100644 --- a/include/configs/mvebu_armada-37xx.h +++ b/include/configs/mvebu_armada-37xx.h @@ -79,7 +79,6 @@ #define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE /* Environment in SPI NOR flash */ -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_OFFSET 0x180000 /* as Marvell U-Boot version */ #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */ #define CONFIG_ENV_SECT_SIZE (64 << 10) /* 64KiB sectors */ diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index eca13442ab..53db10f9bc 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -77,7 +77,6 @@ /* Environment in SPI NOR flash */ #ifdef CONFIG_MVEBU_SPI_BOOT -#define CONFIG_ENV_IS_IN_SPI_FLASH /* Environment in NAND flash */ #endif diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 0f1a67dbb3..98797b07c1 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -137,7 +137,6 @@ #define CONFIG_ENV_SIZE SZ_8K #if defined CONFIG_SPI_BOOT -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_OFFSET (768 * 1024) #define CONFIG_ENV_SECT_SIZE (64 * 1024) #define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 6d5b0bd831..a1a0cdaf2e 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -270,11 +270,6 @@ /* Environment organization */ #define CONFIG_ENV_SIZE (8 * 1024) -#if defined(CONFIG_SABRELITE) -#else -#define CONFIG_ENV_IS_IN_SPI_FLASH -#endif - #if defined(CONFIG_ENV_IS_IN_MMC) #define CONFIG_ENV_OFFSET (6 * 64 * 1024) #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index 3b920ccf16..697f8d2582 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -11,8 +11,6 @@ #include "exynos5420-common.h" #include <configs/exynos5-common.h> -#undef CONFIG_ENV_IS_IN_SPI_FLASH - #define CONFIG_BOARD_COMMON #define CONFIG_SYS_SDRAM_BASE 0x40000000 diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 77ac08aaf5..2c17840218 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -212,7 +212,6 @@ #endif #ifdef CONFIG_USE_SPIFLASH -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE (64 << 10) #define CONFIG_ENV_OFFSET (256 << 10) #define CONFIG_ENV_SECT_SIZE (64 << 10) @@ -306,7 +305,6 @@ #undef CONFIG_ENV_OFFSET #define CONFIG_ENV_SIZE (16 << 10) /* 16 KiB */ #define CONFIG_ENV_OFFSET (51 << 9) /* Sector 51 */ -#undef CONFIG_ENV_IS_IN_SPI_FLASH #endif #ifndef CONFIG_DIRECT_NOR_BOOT diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index be6bbad32e..373c2d5ca2 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -115,7 +115,6 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) /* Environment organization */ -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE (64 * 1024) /* 64 kb */ #define CONFIG_ENV_OFFSET (1024 * 1024) /* M25P16 has an erase size of 64 KiB */ diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index a22e9fae9a..6dbd9900f4 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -769,7 +769,6 @@ * Environment */ #ifdef CONFIG_SPIFLASH -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 10000000 diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h index a150c066c4..70e7f78c8d 100644 --- a/include/configs/pcm058.h +++ b/include/configs/pcm058.h @@ -100,7 +100,6 @@ #define CONFIG_SYS_FSL_USDHC_NUM 1 /* Environment organization */ -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE (16 * 1024) #define CONFIG_ENV_OFFSET (1024 * SZ_1K) #define CONFIG_ENV_SECT_SIZE (64 * SZ_1K) diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h index 9690757109..64cbc807a6 100644 --- a/include/configs/qemu-x86.h +++ b/include/configs/qemu-x86.h @@ -48,7 +48,6 @@ #undef CONFIG_INTEL_ICH6_GPIO /* SPI is not supported */ -#undef CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_SPL_FRAMEWORK diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h index 365950d729..16f45f2bea 100644 --- a/include/configs/rcar-gen2-common.h +++ b/include/configs/rcar-gen2-common.h @@ -52,7 +52,6 @@ #define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024) /* ENV setting */ -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_ADDR 0xC0000 /* Common ENV setting */ diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h index 3342a2966c..46d0f2aede 100644 --- a/include/configs/sh7752evb.h +++ b/include/configs/sh7752evb.h @@ -84,7 +84,6 @@ /* ENV setting */ #define CONFIG_ENV_IS_EMBEDDED -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SECT_SIZE (64 * 1024) #define CONFIG_ENV_ADDR (0x00080000) #define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR) diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h index 78670422f7..aa8d05c221 100644 --- a/include/configs/sh7753evb.h +++ b/include/configs/sh7753evb.h @@ -84,7 +84,6 @@ /* ENV setting */ #define CONFIG_ENV_IS_EMBEDDED -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SECT_SIZE (64 * 1024) #define CONFIG_ENV_ADDR (0x00080000) #define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR) diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h index e9cd3d749a..1759a6f5d9 100644 --- a/include/configs/sh7757lcr.h +++ b/include/configs/sh7757lcr.h @@ -94,7 +94,6 @@ /* ENV setting */ #define CONFIG_ENV_IS_EMBEDDED -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SECT_SIZE (64 * 1024) #define CONFIG_ENV_ADDR (0x00080000) #define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR) diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 4a42de5ddb..22f070d502 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -215,7 +215,6 @@ * 0x442000 - 0x800000 : Userland */ #if defined(CONFIG_SPI_BOOT) -# define CONFIG_ENV_IS_IN_SPI_FLASH # define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED # define CONFIG_ENV_OFFSET (892 << 10) /* 892 KiB in */ # define CONFIG_ENV_SECT_SIZE (4 << 10) /* 4 KB sectors */ diff --git a/include/configs/socfpga_is1.h b/include/configs/socfpga_is1.h index 68403aa744..febb8f7fcc 100644 --- a/include/configs/socfpga_is1.h +++ b/include/configs/socfpga_is1.h @@ -19,7 +19,6 @@ #define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE) #define CONFIG_LOADADDR 0x01000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_ENV_IS_IN_SPI_FLASH /* Ethernet on SoC (EMAC) */ #if defined(CONFIG_CMD_NET) diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h index 4366061f77..39bf612291 100644 --- a/include/configs/socfpga_sr1500.h +++ b/include/configs/socfpga_sr1500.h @@ -24,7 +24,6 @@ #define PHY_ANEG_TIMEOUT 8000 /* Environment */ -#define CONFIG_ENV_IS_IN_SPI_FLASH /* Enable SPI NOR flash reset, needed for SPI booting */ #define CONFIG_SPI_N25Q256A_RESET diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h index 2742e66f55..a86043f339 100644 --- a/include/configs/socfpga_vining_fpga.h +++ b/include/configs/socfpga_vining_fpga.h @@ -179,7 +179,6 @@ "256k(samtec2)," \ "-(rcvrfs);" /* Recovery */ \ -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_SYS_REDUNDAND_ENVIRONMENT #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE #define CONFIG_ENV_SECT_SIZE (64 * 1024) diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h index 2f808c6c72..0ac262e095 100644 --- a/include/configs/stv0991.h +++ b/include/configs/stv0991.h @@ -19,7 +19,6 @@ #define PHYS_SDRAM_1_SIZE 0x00198000 #define CONFIG_ENV_SIZE 0x10000 -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE #define CONFIG_ENV_OFFSET 0x30000 #define CONFIG_ENV_ADDR \ diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 94e207c8c4..3f9b69aeda 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -50,7 +50,6 @@ #define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 /* Environment in SPI NOR flash */ -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_OFFSET (1 << 20) /* 1MiB in */ #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */ #define CONFIG_ENV_SECT_SIZE (256 << 10) /* 256KiB sectors */ diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 29e22aa311..b5b71570d1 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -166,7 +166,6 @@ #define TQMA6_UBOOT_SIZE (TQMA6_UBOOT_SECTOR_SIZE * \ TQMA6_UBOOT_SECTOR_COUNT) -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_SYS_REDUNDAND_ENVIRONMENT #define CONFIG_ENV_OFFSET (TQMA6_UBOOT_SIZE) #define CONFIG_ENV_SECT_SIZE TQMA6_SPI_FLASH_SECTOR_SIZE diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h index ab9c5c3ab8..fd36634ae9 100644 --- a/include/configs/trimslice.h +++ b/include/configs/trimslice.h @@ -28,7 +28,6 @@ #define CONFIG_SYS_I2C_TEGRA /* Environment in SPI */ -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_MAX_HZ 48000000 #define CONFIG_ENV_SPI_MODE SPI_MODE_0 #define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h index 4ad603d2fb..1020355ed5 100644 --- a/include/configs/turris_omnia.h +++ b/include/configs/turris_omnia.h @@ -69,7 +69,6 @@ #define CONFIG_EHCI_IS_TDI /* Environment in SPI NOR flash */ -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_OFFSET (3*(1 << 18)) /* 768KiB in */ #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */ #define CONFIG_ENV_SECT_SIZE (256 << 10) /* 256KiB sectors */ diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h index 51366d4d4e..4d02cd45f5 100644 --- a/include/configs/x86-chromebook.h +++ b/include/configs/x86-chromebook.h @@ -42,7 +42,6 @@ #undef CONFIG_ENV_SIZE #define CONFIG_ENV_SIZE 0x1000 #define CONFIG_ENV_SECT_SIZE 0x1000 -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_OFFSET 0x003f8000 #define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,i8042-kbd,serial\0" \ diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 78cce9e770..1be69748b7 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -117,7 +117,6 @@ /*----------------------------------------------------------------------- * Environment configuration */ -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE 0x01000 /*----------------------------------------------------------------------- diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 9b527feec8..83a2a028e9 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -163,7 +163,6 @@ /* Environment in NOR flash */ # elif defined(CONFIG_ZYNQ_QSPI) /* Environment in Serial Flash */ -# define CONFIG_ENV_IS_IN_SPI_FLASH # endif # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE |