diff options
| author | Simon Glass <sjg@chromium.org> | 2017-07-23 21:19:41 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-07-25 21:20:02 -0400 |
| commit | 85fc970d74d09f33fcdcc649e73c5dc4f5334605 (patch) | |
| tree | 4ba2865dc229971373e8482d990af28c9eea3838 | |
| parent | e73496d08e2dc60f3e00554c71b92f72cdebf0fd (diff) | |
Convert CONFIG_ENV_IS_IN_FLASH to Kconfig
This converts the following to Kconfig:
CONFIG_ENV_IS_IN_FLASH
Signed-off-by: Simon Glass <sjg@chromium.org>
338 files changed, 282 insertions, 250 deletions
@@ -3412,76 +3412,6 @@ following configurations: Builds up envcrc with the target environment so that external utils may easily extract it and embed it in final U-Boot images. -- CONFIG_ENV_IS_IN_FLASH: - - Define this if the environment is in flash memory. - - a) The environment occupies one whole flash sector, which is - "embedded" in the text segment with the U-Boot code. This - happens usually with "bottom boot sector" or "top boot - sector" type flash chips, which have several smaller - sectors at the start or the end. For instance, such a - layout can have sector sizes of 8, 2x4, 16, Nx32 kB. In - such a case you would place the environment in one of the - 4 kB sectors - with U-Boot code before and after it. With - "top boot sector" type flash chips, you would put the - environment in one of the last sectors, leaving a gap - between U-Boot and the environment. - - - CONFIG_ENV_OFFSET: - - Offset of environment data (variable area) to the - beginning of flash memory; for instance, with bottom boot - type flash chips the second sector can be used: the offset - for this sector is given here. - - CONFIG_ENV_OFFSET is used relative to CONFIG_SYS_FLASH_BASE. - - - CONFIG_ENV_ADDR: - - This is just another way to specify the start address of - the flash sector containing the environment (instead of - CONFIG_ENV_OFFSET). - - - CONFIG_ENV_SECT_SIZE: - - Size of the sector containing the environment. - - - b) Sometimes flash chips have few, equal sized, BIG sectors. - In such a case you don't want to spend a whole sector for - the environment. - - - CONFIG_ENV_SIZE: - - If you use this in combination with CONFIG_ENV_IS_IN_FLASH - and CONFIG_ENV_SECT_SIZE, you can specify to use only a part - of this flash sector for the environment. This saves - memory for the RAM copy of the environment. - - It may also save flash memory if you decide to use this - when your environment is "embedded" within U-Boot code, - since then the remainder of the flash sector could be used - for U-Boot code. It should be pointed out that this is - STRONGLY DISCOURAGED from a robustness point of view: - updating the environment in flash makes it always - necessary to erase the WHOLE sector. If something goes - wrong before the contents has been restored from a copy in - RAM, your target system will be dead. - - - CONFIG_ENV_ADDR_REDUND - CONFIG_ENV_SIZE_REDUND - - These settings describe a second storage area used to hold - a redundant copy of the environment data, so that there is - a valid backup copy in case there is a power failure during - a "saveenv" operation. - -BE CAREFUL! Any changes to the flash layout, and some changes to the -source code will make it necessary to adapt <board>/u-boot.lds* -accordingly! - - - CONFIG_ENV_IS_IN_NVRAM: Define this if you have some non-volatile memory device diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig index d506ee5b39..5146e51f9c 100644 --- a/arch/arm/mach-integrator/Kconfig +++ b/arch/arm/mach-integrator/Kconfig @@ -11,11 +11,13 @@ config ARCH_INTEGRATOR_AP config ARCH_INTEGRATOR_CP bool "Support Integrator/CP platform" select ARCH_CINTEGRATOR + imply ENV_IS_IN_FLASH endchoice config ARCH_CINTEGRATOR bool + imply ENV_IS_IN_FLASH choice prompt "Integrator core module select" diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 26509b73c6..88e7d6a7b6 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@ -10,6 +10,7 @@ config MCF520x config MCF52x2 bool + imply ENV_IS_IN_FLASH config MCF523x bool @@ -22,6 +23,7 @@ config MCF5301x config MCF532x bool + imply ENV_IS_IN_FLASH config MCF537x bool @@ -37,6 +39,7 @@ config MCF5227x config MCF547x_8x bool + imply ENV_IS_IN_FLASH # processor type config M5208 @@ -70,6 +73,7 @@ config M5275 config M5282 bool select MCF52x2 + imply ENV_IS_IN_FLASH config M5307 bool @@ -107,10 +111,12 @@ config M52277 config M547x bool select MCF547x_8x + imply ENV_IS_IN_FLASH config M548x bool select MCF547x_8x + imply ENV_IS_IN_FLASH choice prompt "Target select" @@ -191,10 +197,12 @@ config TARGET_M54455EVB config TARGET_M5475EVB bool "Support M5475EVB" select M547x + imply ENV_IS_IN_FLASH config TARGET_M5485EVB bool "Support M5485EVB" select M548x + imply ENV_IS_IN_FLASH config TARGET_AMCORE bool "Support AMCORE" diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig index 80d85e46d4..20fa25b5cc 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig @@ -15,6 +15,7 @@ config TARGET_MICROBLAZE_GENERIC select OF_CONTROL select DM select DM_SERIAL + select ENV_IS_IN_FLASH endchoice diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 579371e8ee..b53206bf8e 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -21,6 +21,7 @@ config TARGET_QEMU_MIPS select SUPPORTS_CPU_MIPS64_R1 select SUPPORTS_CPU_MIPS64_R2 select ROM_EXCEPTION_VECTORS + imply ENV_IS_IN_FLASH config TARGET_MALTA bool "Support malta" @@ -42,6 +43,7 @@ config TARGET_MALTA select SWAP_IO_SPACE select MIPS_L1_CACHE_SHIFT_6 select ROM_EXCEPTION_VECTORS + imply ENV_IS_IN_FLASH config TARGET_VCT bool "Support vct" @@ -108,6 +110,7 @@ config TARGET_BOSTON select SUPPORTS_CPU_MIPS64_R2 select SUPPORTS_CPU_MIPS64_R6 select ROM_EXCEPTION_VECTORS + imply ENV_IS_IN_FLASH config TARGET_XILFPGA bool "Support Imagination Xilfpga" @@ -197,6 +200,7 @@ config CPU_MIPS64_R2 bool "MIPS64 Release 2" depends on SUPPORTS_CPU_MIPS64_R2 select 64BIT + imply ENV_IS_IN_FLASH help Choose this option to build a kernel for release 2 through 5 of the MIPS64 architecture. diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index e9002a76ab..8094416e4a 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -28,6 +28,7 @@ config MPC86xx bool "MPC86xx" select SYS_FSL_DDR select SYS_FSL_DDR_BE + imply ENV_IS_IN_FLASH config 8xx bool "MPC8xx" diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig index cdd21a253a..b5b26f9b3a 100644 --- a/arch/powerpc/cpu/mpc83xx/Kconfig +++ b/arch/powerpc/cpu/mpc83xx/Kconfig @@ -13,6 +13,7 @@ config TARGET_MPC8308_P1M config TARGET_SBC8349 bool "Support sbc8349" + imply ENV_IS_IN_FLASH config TARGET_VE8313 bool "Support ve8313" @@ -39,6 +40,7 @@ config TARGET_MPC8323ERDB config TARGET_MPC832XEMDS bool "Support MPC832XEMDS" select BOARD_EARLY_INIT_F + imply ENV_IS_IN_FLASH config TARGET_MPC8349EMDS bool "Support MPC8349EMDS" @@ -50,6 +52,7 @@ config TARGET_MPC8349EMDS config TARGET_MPC8349ITX bool "Support MPC8349ITX" imply CMD_IRQ + imply ENV_IS_IN_FLASH config TARGET_MPC837XEMDS bool "Support MPC837XEMDS" @@ -74,11 +77,13 @@ config TARGET_SUVD3 bool "Support suvd3" imply CMD_CRAMFS imply FS_CRAMFS + imply ENV_IS_IN_FLASH config TARGET_TUXX1 bool "Support tuxx1" imply CMD_CRAMFS imply FS_CRAMFS + imply ENV_IS_IN_FLASH config TARGET_TQM834X bool "Support TQM834x" @@ -90,6 +95,7 @@ config TARGET_HRCON config TARGET_STRIDER bool "Support strider" select SYS_FSL_ERRATUM_ESDHC111 + imply ENV_IS_IN_FLASH endchoice diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index cf5513641a..0c74f1d35b 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -19,6 +19,7 @@ choice config TARGET_SBC8548 bool "Support sbc8548" select ARCH_MPC8548 + imply ENV_IS_IN_FLASH config TARGET_SOCRATES bool "Support socrates" @@ -104,6 +105,7 @@ config TARGET_MPC8544DS config TARGET_MPC8548CDS bool "Support MPC8548CDS" select ARCH_MPC8548 + imply ENV_IS_IN_FLASH config TARGET_MPC8555CDS bool "Support MPC8555CDS" @@ -549,6 +551,7 @@ config ARCH_MPC8548 select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_2 select SYS_PPC_E500_USE_DEBUG_TLB + imply ENV_IS_IN_FLASH config ARCH_MPC8555 bool @@ -596,6 +599,7 @@ config ARCH_MPC8572 select SYS_FSL_SEC_COMPAT_2 select SYS_PPC_E500_USE_DEBUG_TLB select FSL_ELBC + imply ENV_IS_IN_FLASH config ARCH_P1010 bool diff --git a/arch/powerpc/cpu/mpc86xx/Kconfig b/arch/powerpc/cpu/mpc86xx/Kconfig index 2cc180da38..fe56efdf55 100644 --- a/arch/powerpc/cpu/mpc86xx/Kconfig +++ b/arch/powerpc/cpu/mpc86xx/Kconfig @@ -40,6 +40,7 @@ config ARCH_MPC8641 select FSL_LAW select SYS_FSL_HAS_DDR1 select SYS_FSL_HAS_DDR2 + imply ENV_IS_IN_FLASH config FSL_LAW bool diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 6ac22af2f1..1d40fe6845 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -3,13 +3,16 @@ menu "SuperH architecture" config CPU_SH2 bool + imply ENV_IS_IN_FLASH config CPU_SH2A bool select CPU_SH2 + imply ENV_IS_IN_FLASH config CPU_SH3 bool + imply ENV_IS_IN_FLASH config CPU_SH4 bool diff --git a/common/Kconfig b/common/Kconfig index de7584f778..29e25fef2f 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -176,6 +176,78 @@ endmenu menu "Environment" +config ENV_IS_IN_FLASH + bool "Environment in flash memory" + depends on !CHAIN_OF_TRUST + help + Define this if you have a flash device which you want to use for the + environment. + + a) The environment occupies one whole flash sector, which is + "embedded" in the text segment with the U-Boot code. This + happens usually with "bottom boot sector" or "top boot + sector" type flash chips, which have several smaller + sectors at the start or the end. For instance, such a + layout can have sector sizes of 8, 2x4, 16, Nx32 kB. In + such a case you would place the environment in one of the + 4 kB sectors - with U-Boot code before and after it. With + "top boot sector" type flash chips, you would put the + environment in one of the last sectors, leaving a gap + between U-Boot and the environment. + + CONFIG_ENV_OFFSET: + + Offset of environment data (variable area) to the + beginning of flash memory; for instance, with bottom boot + type flash chips the second sector can be used: the offset + for this sector is given here. + + CONFIG_ENV_OFFSET is used relative to CONFIG_SYS_FLASH_BASE. + + CONFIG_ENV_ADDR: + + This is just another way to specify the start address of + the flash sector containing the environment (instead of + CONFIG_ENV_OFFSET). + + CONFIG_ENV_SECT_SIZE: + + Size of the sector containing the environment. + + + b) Sometimes flash chips have few, equal sized, BIG sectors. + In such a case you don't want to spend a whole sector for + the environment. + + CONFIG_ENV_SIZE: + + If you use this in combination with CONFIG_ENV_IS_IN_FLASH + and CONFIG_ENV_SECT_SIZE, you can specify to use only a part + of this flash sector for the environment. This saves + memory for the RAM copy of the environment. + + It may also save flash memory if you decide to use this + when your environment is "embedded" within U-Boot code, + since then the remainder of the flash sector could be used + for U-Boot code. It should be pointed out that this is + STRONGLY DISCOURAGED from a robustness point of view: + updating the environment in flash makes it always + necessary to erase the WHOLE sector. If something goes + wrong before the contents has been restored from a copy in + RAM, your target system will be dead. + + CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND + + These settings describe a second storage area used to hold + a redundant copy of the environment data, so that there is + a valid backup copy in case there is a power failure during + a "saveenv" operation. + + BE CAREFUL! Any changes to the flash layout, and some changes to the + source code will make it necessary to adapt <board>/u-boot.lds* + accordingly! + config ENV_IS_IN_MMC bool "Environment in an MMC device" depends on !CHAIN_OF_TRUST diff --git a/configs/10m50_defconfig b/configs/10m50_defconfig index ed9a867d72..465edc5b50 100644 --- a/configs/10m50_defconfig +++ b/configs/10m50_defconfig @@ -2,6 +2,7 @@ CONFIG_NIOS2=y CONFIG_SYS_CONFIG_NAME="10m50_devboard" CONFIG_DEFAULT_DEVICE_TREE="10m50_devboard" CONFIG_FIT=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y diff --git a/configs/3c120_defconfig b/configs/3c120_defconfig index 95e794afca..601b0b5ef5 100644 --- a/configs/3c120_defconfig +++ b/configs/3c120_defconfig @@ -2,6 +2,7 @@ CONFIG_NIOS2=y CONFIG_SYS_CONFIG_NAME="3c120_devboard" CONFIG_DEFAULT_DEVICE_TREE="3c120_devboard" CONFIG_FIT=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y diff --git a/configs/B4420QDS_defconfig b/configs/B4420QDS_defconfig index a64bc6bdb6..074e94d7a5 100644 --- a/configs/B4420QDS_defconfig +++ b/configs/B4420QDS_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y diff --git a/configs/B4860QDS_defconfig b/configs/B4860QDS_defconfig index 80e06fb0d6..2452337a90 100644 --- a/configs/B4860QDS_defconfig +++ b/configs/B4860QDS_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y diff --git a/configs/BSC9132QDS_NOR_DDRCLK100_defconfig b/configs/BSC9132QDS_NOR_DDRCLK100_defconfig index f07841feab..eeb28b184d 100644 --- a/configs/BSC9132QDS_NOR_DDRCLK100_defconfig +++ b/configs/BSC9132QDS_NOR_DDRCLK100_defconfig @@ -6,6 +6,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="SYS_CLK_100_DDR_100" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y diff --git a/configs/BSC9132QDS_NOR_DDRCLK133_defconfig b/configs/BSC9132QDS_NOR_DDRCLK133_defconfig index ae753405ec..98d92e7056 100644 --- a/configs/BSC9132QDS_NOR_DDRCLK133_defconfig +++ b/configs/BSC9132QDS_NOR_DDRCLK133_defconfig @@ -6,6 +6,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="SYS_CLK_100_DDR_133" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y diff --git a/configs/C29XPCIE_defconfig b/configs/C29XPCIE_defconfig index 70b447863d..cd6bffde3c 100644 --- a/configs/C29XPCIE_defconfig +++ b/configs/C29XPCIE_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=-1 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y diff --git a/configs/M5208EVBE_defconfig b/configs/M5208EVBE_defconfig index 1ac3e5e846..8aabe58fac 100644 --- a/configs/M5208EVBE_defconfig +++ b/configs/M5208EVBE_defconfig @@ -1,6 +1,7 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0x00000000 CONFIG_TARGET_M5208EVBE=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="-> " diff --git a/configs/M52277EVB_defconfig b/configs/M52277EVB_defconfig index 903eef536c..42a031ad5b 100644 --- a/configs/M52277EVB_defconfig +++ b/configs/M52277EVB_defconfig @@ -2,6 +2,7 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0x00000000 CONFIG_TARGET_M52277EVB=y CONFIG_SYS_EXTRA_OPTIONS="SYS_SPANSION_BOOT" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="-> " diff --git a/configs/M5235EVB_Flash32_defconfig b/configs/M5235EVB_Flash32_defconfig index 19596cbeb1..ee8ba643b2 100644 --- a/configs/M5235EVB_Flash32_defconfig +++ b/configs/M5235EVB_Flash32_defconfig @@ -2,6 +2,7 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0xFFC00000 CONFIG_TARGET_M5235EVB=y CONFIG_SYS_EXTRA_OPTIONS="NORFLASH_PS32BIT" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMD_LOADB is not set diff --git a/configs/M5235EVB_defconfig b/configs/M5235EVB_defconfig index 026177db4c..d3bbf21ff2 100644 --- a/configs/M5235EVB_defconfig +++ b/configs/M5235EVB_defconfig @@ -1,6 +1,7 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0xFFE00000 CONFIG_TARGET_M5235EVB=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="-> " diff --git a/configs/M53017EVB_defconfig b/configs/M53017EVB_defconfig index 19b1fcd237..67dfe0bec1 100644 --- a/configs/M53017EVB_defconfig +++ b/configs/M53017EVB_defconfig @@ -1,6 +1,7 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0x00000000 CONFIG_TARGET_M53017EVB=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="-> " diff --git a/configs/M54451EVB_defconfig b/configs/M54451EVB_defconfig index 63c1a4bbe6..5f6382d46a 100644 --- a/configs/M54451EVB_defconfig +++ b/configs/M54451EVB_defconfig @@ -2,6 +2,7 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0x00000000 CONFIG_TARGET_M54451EVB=y CONFIG_SYS_EXTRA_OPTIONS="SYS_INPUT_CLKSRC=24000000" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_LOADB is not set diff --git a/configs/M54455EVB_a66_defconfig b/configs/M54455EVB_a66_defconfig index 221c70750b..11ed3c64eb 100644 --- a/configs/M54455EVB_a66_defconfig +++ b/configs/M54455EVB_a66_defconfig @@ -2,6 +2,7 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0x04000000 CONFIG_TARGET_M54455EVB=y CONFIG_SYS_EXTRA_OPTIONS="SYS_ATMEL_BOOT,SYS_INPUT_CLKSRC=66666666" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set diff --git a/configs/M54455EVB_defconfig b/configs/M54455EVB_defconfig index 557b87b78c..9c90ca536d 100644 --- a/configs/M54455EVB_defconfig +++ b/configs/M54455EVB_defconfig @@ -2,6 +2,7 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0x04000000 CONFIG_TARGET_M54455EVB=y CONFIG_SYS_EXTRA_OPTIONS="SYS_ATMEL_BOOT,SYS_INPUT_CLKSRC=33333333" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 CONFIG_SYS_PROMPT="-> " CONFIG_CMD_IDE=y diff --git a/configs/M54455EVB_i66_defconfig b/configs/M54455EVB_i66_defconfig index 9ad0564788..d5cdf73c01 100644 --- a/configs/M54455EVB_i66_defconfig +++ b/configs/M54455EVB_i66_defconfig @@ -2,6 +2,7 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0x00000000 CONFIG_TARGET_M54455EVB=y CONFIG_SYS_EXTRA_OPTIONS="SYS_INTEL_BOOT,SYS_INPUT_CLKSRC=66666666" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set diff --git a/configs/M54455EVB_intel_defconfig b/configs/M54455EVB_intel_defconfig index dc7af6cb19..158024237b 100644 --- a/configs/M54455EVB_intel_defconfig +++ b/configs/M54455EVB_intel_defconfig @@ -2,6 +2,7 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0x00000000 CONFIG_TARGET_M54455EVB=y CONFIG_SYS_EXTRA_OPTIONS="SYS_INTEL_BOOT,SYS_INPUT_CLKSRC=33333333" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set diff --git a/configs/MCR3000_defconfig b/configs/MCR3000_defconfig index 84849684e4..7aaf339213 100644 --- a/configs/MCR3000_defconfig +++ b/configs/MCR3000_defconfig @@ -37,6 +37,7 @@ CONFIG_SYS_BR7_PRELIM=0x1C000001 CONFIG_SYS_OR7_PRELIM=0xFFFF810A CONFIG_SYS_IMMR=0xFF000000 CONFIG_OF_BOARD_SETUP=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="S3K> " diff --git a/configs/MPC8308RDB_defconfig b/configs/MPC8308RDB_defconfig index c0f994a5ea..10ff9cf7ca 100644 --- a/configs/MPC8308RDB_defconfig +++ b/configs/MPC8308RDB_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_MMC=y diff --git a/configs/MPC8313ERDB_33_defconfig b/configs/MPC8313ERDB_33_defconfig index 9876d3699e..b26731a269 100644 --- a/configs/MPC8313ERDB_33_defconfig +++ b/configs/MPC8313ERDB_33_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_MPC8313ERDB=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="SYS_33MHZ" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=6 CONFIG_HUSH_PARSER=y CONFIG_CMD_I2C=y diff --git a/configs/MPC8313ERDB_66_defconfig b/configs/MPC8313ERDB_66_defconfig index a46a70480b..00598d4e55 100644 --- a/configs/MPC8313ERDB_66_defconfig +++ b/configs/MPC8313ERDB_66_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_MPC8313ERDB=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="SYS_66MHZ" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=6 CONFIG_HUSH_PARSER=y CONFIG_CMD_I2C=y diff --git a/configs/MPC8315ERDB_defconfig b/configs/MPC8315ERDB_defconfig index 52ce29a0bc..78e9b33dbf 100644 --- a/configs/MPC8315ERDB_defconfig +++ b/configs/MPC8315ERDB_defconfig @@ -3,6 +3,7 @@ CONFIG_MPC83xx=y CONFIG_TARGET_MPC8315ERDB=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=6 CONFIG_HUSH_PARSER=y CONFIG_CMD_I2C=y diff --git a/configs/MPC8323ERDB_defconfig b/configs/MPC8323ERDB_defconfig index 54d8a3ea1d..097fb09a44 100644 --- a/configs/MPC8323ERDB_defconfig +++ b/configs/MPC8323ERDB_defconfig @@ -3,6 +3,7 @@ CONFIG_MPC83xx=y CONFIG_TARGET_MPC8323ERDB=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=6 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y diff --git a/configs/MPC8349EMDS_defconfig b/configs/MPC8349EMDS_defconfig index 82a61f8883..8b27b271c3 100644 --- a/configs/MPC8349EMDS_defconfig +++ b/configs/MPC8349EMDS_defconfig @@ -3,6 +3,7 @@ CONFIG_MPC83xx=y CONFIG_TARGET_MPC8349EMDS=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=6 CONFIG_HUSH_PARSER=y CONFIG_CMD_I2C=y diff --git a/configs/MPC837XEMDS_HOST_defconfig b/configs/MPC837XEMDS_HOST_defconfig index 787ac9dbce..00fc9e8991 100644 --- a/configs/MPC837XEMDS_HOST_defconfig +++ b/configs/MPC837XEMDS_HOST_defconfig @@ -3,6 +3,7 @@ CONFIG_MPC83xx=y CONFIG_TARGET_MPC837XEMDS=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=6 CONFIG_HUSH_PARSER=y CONFIG_CMD_MMC=y diff --git a/configs/MPC837XEMDS_defconfig b/configs/MPC837XEMDS_defconfig index f76cec1104..64e576745b 100644 --- a/configs/MPC837XEMDS_defconfig +++ b/configs/MPC837XEMDS_defconfig @@ -3,6 +3,7 @@ CONFIG_MPC83xx=y CONFIG_TARGET_MPC837XEMDS=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=6 CONFIG_HUSH_PARSER=y CONFIG_CMD_MMC=y diff --git a/configs/MPC837XERDB_defconfig b/configs/MPC837XERDB_defconfig index fc21671ce7..0373e0e433 100644 --- a/configs/MPC837XERDB_defconfig +++ b/configs/MPC837XERDB_defconfig @@ -3,6 +3,7 @@ CONFIG_MPC83xx=y CONFIG_TARGET_MPC837XERDB=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=6 CONFIG_HUSH_PARSER=y CONFIG_CMD_MMC=y diff --git a/configs/MPC8536DS_36BIT_defconfig b/configs/MPC8536DS_36BIT_defconfig index 5db680bbd1..1d40e2fb1d 100644 --- a/configs/MPC8536DS_36BIT_defconfig +++ b/configs/MPC8536DS_36BIT_defconfig @@ -6,6 +6,7 @@ CONFIG_TARGET_MPC8536DS=y CONFIG_PHYS_64BIT=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 # CONFIG_CONSOLE_MUX is not set CONFIG_BOARD_EARLY_INIT_F=y diff --git a/configs/MPC8536DS_defconfig b/configs/MPC8536DS_defconfig index 3c563d6ff9..65a1f9e2c7 100644 --- a/configs/MPC8536DS_defconfig +++ b/configs/MPC8536DS_defconfig @@ -5,6 +5,7 @@ CONFIG_MPC85xx=y CONFIG_TARGET_MPC8536DS=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 # CONFIG_CONSOLE_MUX is not set CONFIG_BOARD_EARLY_INIT_F=y diff --git a/configs/MPC8541CDS_defconfig b/configs/MPC8541CDS_defconfig index 8268388d84..2d4647a6c9 100644 --- a/configs/MPC8541CDS_defconfig +++ b/configs/MPC8541CDS_defconfig @@ -4,6 +4,7 @@ CONFIG_MPC85xx=y CONFIG_TARGET_MPC8541CDS=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_I2C=y diff --git a/configs/MPC8541CDS_legacy_defconfig b/configs/MPC8541CDS_legacy_defconfig index 09a9c0f90b..cbf9eff85d 100644 --- a/configs/MPC8541CDS_legacy_defconfig +++ b/configs/MPC8541CDS_legacy_defconfig @@ -5,6 +5,7 @@ CONFIG_TARGET_MPC8541CDS=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="LEGACY" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_I2C=y diff --git a/configs/MPC8544DS_defconfig b/configs/MPC8544DS_defconfig index cb15afa9cc..3e75be96b9 100644 --- a/configs/MPC8544DS_defconfig +++ b/configs/MPC8544DS_defconfig @@ -5,6 +5,7 @@ CONFIG_MPC85xx=y CONFIG_TARGET_MPC8544DS=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 # CONFIG_CONSOLE_MUX is not set CONFIG_HUSH_PARSER=y @@ -15,12 +16,12 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y # CONFIG_CMD_HASH is not set CONFIG_CMD_EXT2=y -CONFIG_SCSI=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_NETDEVICES=y CONFIG_E1000=y CONFIG_RTL8139=y +CONFIG_SCSI=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/MPC8555CDS_defconfig b/configs/MPC8555CDS_defconfig index 00c7a76508..8410fa4fb1 100644 --- a/configs/MPC8555CDS_defconfig +++ b/configs/MPC8555CDS_defconfig @@ -4,6 +4,7 @@ CONFIG_MPC85xx=y CONFIG_TARGET_MPC8555CDS=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_I2C=y diff --git a/configs/MPC8555CDS_legacy_defconfig b/configs/MPC8555CDS_legacy_defconfig index 36da612318..3ac6035e35 100644 --- a/configs/MPC8555CDS_legacy_defconfig +++ b/configs/MPC8555CDS_legacy_defconfig @@ -5,6 +5,7 @@ CONFIG_TARGET_MPC8555CDS=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="LEGACY" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_I2C=y diff --git a/configs/MPC8568MDS_defconfig b/configs/MPC8568MDS_defconfig index 6e3cfa16f2..b5fb4c282e 100644 --- a/configs/MPC8568MDS_defconfig +++ b/configs/MPC8568MDS_defconfig @@ -4,6 +4,7 @@ CONFIG_MPC85xx=y CONFIG_TARGET_MPC8568MDS=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/MPC8569MDS_ATM_defconfig b/configs/MPC8569MDS_ATM_defconfig index 6adb9cf087..b713db43ad 100644 --- a/configs/MPC8569MDS_ATM_defconfig +++ b/configs/MPC8569MDS_ATM_defconfig @@ -5,6 +5,7 @@ CONFIG_TARGET_MPC8569MDS=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="ATM" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/MPC8569MDS_defconfig b/configs/MPC8569MDS_defconfig index 73cf6e35b7..96f7755f5d 100644 --- a/configs/MPC8569MDS_defconfig +++ b/configs/MPC8569MDS_defconfig @@ -4,6 +4,7 @@ CONFIG_MPC85xx=y CONFIG_TARGET_MPC8569MDS=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/MPC8610HPCD_defconfig b/configs/MPC8610HPCD_defconfig index 6aef6d8434..57d8583fd1 100644 --- a/configs/MPC8610HPCD_defconfig +++ b/configs/MPC8610HPCD_defconfig @@ -15,9 +15,9 @@ CONFIG_CMD_PING=y CONFIG_CMD_BMP=y CONFIG_CMD_EXT2=y CONFIG_DOS_PARTITION=y -CONFIG_SCSI=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_SCSI=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_KEYBOARD=y diff --git a/configs/MigoR_defconfig b/configs/MigoR_defconfig index f09794e13c..091045f6a3 100644 --- a/configs/MigoR_defconfig +++ b/configs/MigoR_defconfig @@ -1,5 +1,6 @@ CONFIG_SH=y CONFIG_TARGET_MIGOR=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set diff --git a/configs/P1010RDB-PA_36BIT_NOR_defconfig b/configs/P1010RDB-PA_36BIT_NOR_defconfig index 48157c22a4..cc71f0405e 100644 --- a/configs/P1010RDB-PA_36BIT_NOR_defconfig +++ b/configs/P1010RDB-PA_36BIT_NOR_defconfig @@ -6,6 +6,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_BOARD_EARLY_INIT_F=y diff --git a/configs/P1010RDB-PA_NOR_defconfig b/configs/P1010RDB-PA_NOR_defconfig index e94feb5997..24d7139a1b 100644 --- a/configs/P1010RDB-PA_NOR_defconfig +++ b/configs/P1010RDB-PA_NOR_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_BOARD_EARLY_INIT_F=y diff --git a/configs/P1010RDB-PB_36BIT_NOR_defconfig b/configs/P1010RDB-PB_36BIT_NOR_defconfig index 53b5d732e4..6c7a3b11d9 100644 --- a/configs/P1010RDB-PB_36BIT_NOR_defconfig +++ b/configs/P1010RDB-PB_36BIT_NOR_defconfig @@ -6,6 +6,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_BOARD_EARLY_INIT_F=y diff --git a/configs/P1010RDB-PB_NOR_defconfig b/configs/P1010RDB-PB_NOR_defconfig index 35e85306fc..b2dc667fc6 100644 --- a/configs/P1010RDB-PB_NOR_defconfig +++ b/configs/P1010RDB-PB_NOR_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_BOARD_EARLY_INIT_F=y diff --git a/configs/P1020MBG-PC_36BIT_defconfig b/configs/P1020MBG-PC_36BIT_defconfig index c8df31d1a0..6d3eaebf10 100644 --- a/configs/P1020MBG-PC_36BIT_defconfig +++ b/configs/P1020MBG-PC_36BIT_defconfig @@ -7,6 +7,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/P1020MBG-PC_defconfig b/configs/P1020MBG-PC_defconfig index a9bae76a4b..d8680d18aa 100644 --- a/configs/P1020MBG-PC_defconfig +++ b/configs/P1020MBG-PC_defconfig @@ -6,6 +6,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/P1020RDB-PC_36BIT_defconfig b/configs/P1020RDB-PC_36BIT_defconfig index 8e275e0bd5..32f10251ea 100644 --- a/configs/P1020RDB-PC_36BIT_defconfig +++ b/configs/P1020RDB-PC_36BIT_defconfig @@ -7,6 +7,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/P1020RDB-PC_defconfig b/configs/P1020RDB-PC_defconfig index 11f5961bd4..5cbd2fc140 100644 --- a/configs/P1020RDB-PC_defconfig +++ b/configs/P1020RDB-PC_defconfig @@ -6,6 +6,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/P1020RDB-PD_defconfig b/configs/P1020RDB-PD_defconfig index 13266bf111..5894dd13a1 100644 --- a/configs/P1020RDB-PD_defconfig +++ b/configs/P1020RDB-PD_defconfig @@ -6,6 +6,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/P1020UTM-PC_36BIT_defconfig b/configs/P1020UTM-PC_36BIT_defconfig index 031a7f2ced..8dcef035c4 100644 --- a/configs/P1020UTM-PC_36BIT_defconfig +++ b/configs/P1020UTM-PC_36BIT_defconfig @@ -7,6 +7,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/P1020UTM-PC_defconfig b/configs/P1020UTM-PC_defconfig index c6e12d6c35..299812915d 100644 --- a/configs/P1020UTM-PC_defconfig +++ b/configs/P1020UTM-PC_defconfig @@ -6,6 +6,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/P1021RDB-PC_36BIT_defconfig b/configs/P1021RDB-PC_36BIT_defconfig index 3e928df295..d8138f2955 100644 --- a/configs/P1021RDB-PC_36BIT_defconfig +++ b/configs/P1021RDB-PC_36BIT_defconfig @@ -7,6 +7,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/P1021RDB-PC_defconfig b/configs/P1021RDB-PC_defconfig index 727a8ac718..48565f1b96 100644 --- a/configs/P1021RDB-PC_defconfig +++ b/configs/P1021RDB-PC_defconfig @@ -6,6 +6,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/P1022DS_36BIT_defconfig b/configs/P1022DS_36BIT_defconfig index ecc723be5e..79dc16d425 100644 --- a/configs/P1022DS_36BIT_defconfig +++ b/configs/P1022DS_36BIT_defconfig @@ -6,6 +6,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/P1022DS_defconfig b/configs/P1022DS_defconfig index aa791ddbec..6d11a4a64f 100644 --- a/configs/P1022DS_defconfig +++ b/configs/P1022DS_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/P1023RDB_defconfig b/configs/P1023RDB_defconfig index c53b7e0819..d7aac8273b 100644 --- a/configs/P1023RDB_defconfig +++ b/configs/P1023RDB_defconfig @@ -6,6 +6,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=-1 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/P1024RDB_36BIT_defconfig b/configs/P1024RDB_36BIT_defconfig index 5b2773abc6..08d0f771ac 100644 --- a/configs/P1024RDB_36BIT_defconfig +++ b/configs/P1024RDB_36BIT_defconfig @@ -7,6 +7,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/P1024RDB_defconfig b/configs/P1024RDB_defconfig index 56bd118dd5..f0696d55ef 100644 --- a/configs/P1024RDB_defconfig +++ b/configs/P1024RDB_defconfig @@ -6,6 +6,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/P1025RDB_36BIT_defconfig b/configs/P1025RDB_36BIT_defconfig index 50ac75d701..bd4d916d9e 100644 --- a/configs/P1025RDB_36BIT_defconfig +++ b/configs/P1025RDB_36BIT_defconfig @@ -7,6 +7,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/P1025RDB_defconfig b/configs/P1025RDB_defconfig index 22bfb2edcf..2f1603b2b5 100644 --- a/configs/P1025RDB_defconfig +++ b/configs/P1025RDB_defconfig @@ -6,6 +6,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/P2020RDB-PC_36BIT_defconfig b/configs/P2020RDB-PC_36BIT_defconfig index 1f74cc6ba9..a51b63100f 100644 --- a/configs/P2020RDB-PC_36BIT_defconfig +++ b/configs/P2020RDB-PC_36BIT_defconfig @@ -7,6 +7,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/P2020RDB-PC_defconfig b/configs/P2020RDB-PC_defconfig index f3ae7a5666..0430762acf 100644 --- a/configs/P2020RDB-PC_defconfig +++ b/configs/P2020RDB-PC_defconfig @@ -6,6 +6,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/P2041RDB_defconfig b/configs/P2041RDB_defconfig index d47c7873c1..7324279de6 100644 --- a/configs/P2041RDB_defconfig +++ b/configs/P2041RDB_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/P3041DS_defconfig b/configs/P3041DS_defconfig index d8276c7b6d..b248e980c2 100644 --- a/configs/P3041DS_defconfig +++ b/configs/P3041DS_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/P4080DS_defconfig b/configs/P4080DS_defconfig index ec3d6f9304..d3addc800d 100644 --- a/configs/P4080DS_defconfig +++ b/configs/P4080DS_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/P5020DS_defconfig b/configs/P5020DS_defconfig index 55e0dbdf90..426775e27c 100644 --- a/configs/P5020DS_defconfig +++ b/configs/P5020DS_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/P5040DS_defconfig b/configs/P5040DS_defconfig index b56c86eec8..c9d923819b 100644 --- a/configs/P5040DS_defconfig +++ b/configs/P5040DS_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/T1023RDB_defconfig b/configs/T1023RDB_defconfig index 5510a46e48..22dd2dc09d 100644 --- a/configs/T1023RDB_defconfig +++ b/configs/T1023RDB_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y diff --git a/configs/T1024QDS_DDR4_defconfig b/configs/T1024QDS_DDR4_defconfig index 7a57b08085..6294ce3a25 100644 --- a/configs/T1024QDS_DDR4_defconfig +++ b/configs/T1024QDS_DDR4_defconfig @@ -6,6 +6,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y # CONFIG_CONSOLE_MUX is not set diff --git a/configs/T1024QDS_defconfig b/configs/T1024QDS_defconfig index b09e9a026d..ac7b316d52 100644 --- a/configs/T1024QDS_defconfig +++ b/configs/T1024QDS_defconfig @@ -6,6 +6,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y # CONFIG_CONSOLE_MUX is not set diff --git a/configs/T1024RDB_defconfig b/configs/T1024RDB_defconfig index da924d8f54..2cfcaedcd0 100644 --- a/configs/T1024RDB_defconfig +++ b/configs/T1024RDB_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/T1040D4RDB_defconfig b/configs/T1040D4RDB_defconfig index 82d6140518..961b33ba08 100644 --- a/configs/T1040D4RDB_defconfig +++ b/configs/T1040D4RDB_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/T1040QDS_DDR4_defconfig b/configs/T1040QDS_DDR4_defconfig index 063ae20c83..1e3d0b1c10 100644 --- a/configs/T1040QDS_DDR4_defconfig +++ b/configs/T1040QDS_DDR4_defconfig @@ -6,6 +6,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y # CONFIG_CONSOLE_MUX is not set diff --git a/configs/T1040QDS_defconfig b/configs/T1040QDS_defconfig index 5d8cdf1383..7521e72c45 100644 --- a/configs/T1040QDS_defconfig +++ b/configs/T1040QDS_defconfig @@ -6,6 +6,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y # CONFIG_CONSOLE_MUX is not set diff --git a/configs/T1040RDB_defconfig b/configs/T1040RDB_defconfig index 7d6ed1bb72..395a6cd18f 100644 --- a/configs/T1040RDB_defconfig +++ b/configs/T1040RDB_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/T1042D4RDB_defconfig b/configs/T1042D4RDB_defconfig index 410a124908..8daff4dc42 100644 --- a/configs/T1042D4RDB_defconfig +++ b/configs/T1042D4RDB_defconfig @@ -6,6 +6,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y # CONFIG_CONSOLE_MUX is not set diff --git a/configs/T1042RDB_PI_defconfig b/configs/T1042RDB_PI_defconfig index bad51b5534..5c3cfc7e10 100644 --- a/configs/T1042RDB_PI_defconfig +++ b/configs/T1042RDB_PI_defconfig @@ -6,6 +6,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y # CONFIG_CONSOLE_MUX is not set diff --git a/configs/T1042RDB_defconfig b/configs/T1042RDB_defconfig index ba8b11c570..8ce7440505 100644 --- a/configs/T1042RDB_defconfig +++ b/configs/T1042RDB_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/T2080QDS_defconfig b/configs/T2080QDS_defconfig index 8f85d64c74..89def59ccf 100644 --- a/configs/T2080QDS_defconfig +++ b/configs/T2080QDS_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_GREPENV=y diff --git a/configs/T2080RDB_defconfig b/configs/T2080RDB_defconfig index c620ce8712..8822537863 100644 --- a/configs/T2080RDB_defconfig +++ b/configs/T2080RDB_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_MEMTEST=y diff --git a/configs/T2081QDS_defconfig b/configs/T2081QDS_defconfig index ce74b53067..6fb0910600 100644 --- a/configs/T2081QDS_defconfig +++ b/configs/T2081QDS_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_GREPENV=y diff --git a/configs/T4160QDS_defconfig b/configs/T4160QDS_defconfig index 93411bab86..6caffd8468 100644 --- a/configs/T4160QDS_defconfig +++ b/configs/T4160QDS_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_GREPENV=y diff --git a/configs/T4160RDB_defconfig b/configs/T4160RDB_defconfig index 356e2d861e..a1c60b2c6c 100644 --- a/configs/T4160RDB_defconfig +++ b/configs/T4160RDB_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_GREPENV=y diff --git a/configs/T4240QDS_defconfig b/configs/T4240QDS_defconfig index 6061244a43..9632076997 100644 --- a/configs/T4240QDS_defconfig +++ b/configs/T4240QDS_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_GREPENV=y diff --git a/configs/T4240RDB_defconfig b/configs/T4240RDB_defconfig index 6c023337a6..1c0aa913f0 100644 --- a/configs/T4240RDB_defconfig +++ b/configs/T4240RDB_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_GREPENV=y diff --git a/configs/TQM834x_defconfig b/configs/TQM834x_defconfig index 61c157053e..e31cacac7b 100644 --- a/configs/TQM834x_defconfig +++ b/configs/TQM834x_defconfig @@ -3,6 +3,7 @@ CONFIG_MPC83xx=y CONFIG_TARGET_TQM834X=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=6 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y diff --git a/configs/TWR-P1025_defconfig b/configs/TWR-P1025_defconfig index 906ada4b3c..e48b9bc3e9 100644 --- a/configs/TWR-P1025_defconfig +++ b/configs/TWR-P1025_defconfig @@ -7,6 +7,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="TWR_P1025" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/UCP1020_defconfig b/configs/UCP1020_defconfig index dbf073d774..13eef4e619 100644 --- a/configs/UCP1020_defconfig +++ b/configs/UCP1020_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="B$ " diff --git a/configs/adp-ae3xx_defconfig b/configs/adp-ae3xx_defconfig index d47ad86fee..9e1e5ecb47 100644 --- a/configs/adp-ae3xx_defconfig +++ b/configs/adp-ae3xx_defconfig @@ -13,6 +13,7 @@ CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_MMC=y diff --git a/configs/adp-ag101p_defconfig b/configs/adp-ag101p_defconfig index 6ce9e809dd..ced042e49f 100644 --- a/configs/adp-ag101p_defconfig +++ b/configs/adp-ag101p_defconfig @@ -13,6 +13,7 @@ CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_MMC=y diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig index 0077482c55..f121e2ffc2 100644 --- a/configs/am335x_evm_norboot_defconfig +++ b/configs/am335x_evm_norboot_defconfig @@ -6,6 +6,7 @@ CONFIG_AM33XX=y CONFIG_NOR=y CONFIG_DISTRO_DEFAULTS=y CONFIG_NOR_BOOT=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_ARCH_MISC_INIT=y diff --git a/configs/amcore_defconfig b/configs/amcore_defconfig index e8c6adccb4..aa43859cb8 100644 --- a/configs/amcore_defconfig +++ b/configs/amcore_defconfig @@ -2,6 +2,7 @@ CONFIG_M68K=y CONFIG_SYS_TEXT_BASE=0xffc00000 CONFIG_SYS_MALLOC_F_LEN=0x800 CONFIG_TARGET_AMCORE=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/ap325rxa_defconfig b/configs/ap325rxa_defconfig index ebefd126a8..ebefe3cdb3 100644 --- a/configs/ap325rxa_defconfig +++ b/configs/ap325rxa_defconfig @@ -1,5 +1,6 @@ CONFIG_SH=y CONFIG_TARGET_AP325RXA=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set diff --git a/configs/ap_sh4a_4a_defconfig b/configs/ap_sh4a_4a_defconfig index 41c8be9120..c08ae4f3eb 100644 --- a/configs/ap_sh4a_4a_defconfig +++ b/configs/ap_sh4a_4a_defconfig @@ -1,5 +1,6 @@ CONFIG_SH=y CONFIG_TARGET_AP_SH4A_4A=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set diff --git a/configs/armadillo-800eva_defconfig b/configs/armadillo-800eva_defconfig index 4c16ec19fd..c5a652457f 100644 --- a/configs/armadillo-800eva_defconfig +++ b/configs/armadillo-800eva_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y # CONFIG_SYS_THUMB_BUILD is not set CONFIG_ARCH_RMOBILE=y CONFIG_TARGET_ARMADILLO_800EVA=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set diff --git a/configs/at91rm9200ek_defconfig b/configs/at91rm9200ek_defconfig index 0abfeab1e6..b239fd950e 100644 --- a/configs/at91rm9200ek_defconfig +++ b/configs/at91rm9200ek_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91RM9200EK=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 # CONFIG_SYS_STDIO_DEREGISTER is not set # CONFIG_DISPLAY_CPUINFO is not set diff --git a/configs/at91rm9200ek_ram_defconfig b/configs/at91rm9200ek_ram_defconfig index 545b24a9b1..1bb20036f5 100644 --- a/configs/at91rm9200ek_ram_defconfig +++ b/configs/at91rm9200ek_ram_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91RM9200EK=y CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 # CONFIG_SYS_STDIO_DEREGISTER is not set # CONFIG_DISPLAY_CPUINFO is not set diff --git a/configs/at91sam9263ek_norflash_boot_defconfig b/configs/at91sam9263ek_norflash_boot_defconfig index 66484a18f2..ac7d3684b7 100644 --- a/configs/at91sam9263ek_norflash_boot_defconfig +++ b/configs/at91sam9263ek_norflash_boot_defconfig @@ -5,6 +5,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek" CONFIG_DEBUG_UART=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_BOOT_NORFLASH" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/at91sam9263ek_norflash_defconfig b/configs/at91sam9263ek_norflash_defconfig index 1e177480c9..a3b0a4b093 100644 --- a/configs/at91sam9263ek_norflash_defconfig +++ b/configs/at91sam9263ek_norflash_defconfig @@ -5,6 +5,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek" CONFIG_DEBUG_UART=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NORFLASH" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/blanche_defconfig b/configs/blanche_defconfig index bf7700cbe1..ccd0d8f0da 100644 --- a/configs/blanche_defconfig +++ b/configs/blanche_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_BLANCHE=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set diff --git a/configs/caddy2_defconfig b/configs/caddy2_defconfig index 007cce1075..b062dcdd58 100644 --- a/configs/caddy2_defconfig +++ b/configs/caddy2_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_VME8349=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="CADDY2" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=6 CONFIG_HUSH_PARSER=y CONFIG_CMD_I2C=y diff --git a/configs/calimain_defconfig b/configs/calimain_defconfig index 48422ddffe..7476383bbe 100644 --- a/configs/calimain_defconfig +++ b/configs/calimain_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_DAVINCI=y CONFIG_TARGET_CALIMAIN=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=0 CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_CPUINFO is not set diff --git a/configs/colibri_pxa270_defconfig b/configs/colibri_pxa270_defconfig index ddf4bf655e..040408bcda 100644 --- a/configs/colibri_pxa270_defconfig +++ b/configs/colibri_pxa270_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_COLIBRI_PXA270=y +CONFIG_ENV_IS_IN_FLASH=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="$ " # CONFIG_CMD_ELF is not set diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig index 99543d39e1..0a5c636c50 100644 --- a/configs/da850evm_direct_nor_defconfig +++ b/configs/da850evm_direct_nor_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_DAVINCI=y CONFIG_TARGET_DA850EVM=y CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH,USE_NOR,DIRECT_NOR_BOOT" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_CPUINFO is not set diff --git a/configs/ecovec_defconfig b/configs/ecovec_defconfig index cc172f5181..7fb14ab9de 100644 --- a/configs/ecovec_defconfig +++ b/configs/ecovec_defconfig @@ -1,5 +1,6 @@ CONFIG_SH=y CONFIG_TARGET_ECOVEC=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set diff --git a/configs/edb9315a_defconfig b/configs/edb9315a_defconfig index bb67881a25..adc9a68de2 100644 --- a/configs/edb9315a_defconfig +++ b/configs/edb9315a_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_TARGET_EDB93XX=y CONFIG_SYS_EXTRA_OPTIONS="MK_edb9315a" +CONFIG_ENV_IS_IN_FLASH=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y diff --git a/configs/edminiv2_defconfig b/configs/edminiv2_defconfig index d67b548977..847c6c2c4b 100644 --- a/configs/edminiv2_defconfig +++ b/configs/edminiv2_defconfig @@ -5,6 +5,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_EDMINIV2=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_IDENT_STRING=" EDMiniV2" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_ARCH_MISC_INIT=y diff --git a/configs/espt_defconfig b/configs/espt_defconfig index a6a7af9755..a7f50efc45 100644 --- a/configs/espt_defconfig +++ b/configs/espt_defconfig @@ -1,5 +1,6 @@ CONFIG_SH=y CONFIG_TARGET_ESPT=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=-1 CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set diff --git a/configs/flea3_defconfig b/configs/flea3_defconfig index 0b76e114d8..75a97e3775 100644 --- a/configs/flea3_defconfig +++ b/configs/flea3_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_FLEA3=y CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y diff --git a/configs/hrcon_defconfig b/configs/hrcon_defconfig index aea06769f4..10dbb7db82 100644 --- a/configs/hrcon_defconfig +++ b/configs/hrcon_defconfig @@ -7,6 +7,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=5 CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/hrcon_dh_defconfig b/configs/hrcon_dh_defconfig index 8e911d49a0..48456b2974 100644 --- a/configs/hrcon_dh_defconfig +++ b/configs/hrcon_dh_defconfig @@ -8,6 +8,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="HRCON_DH" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=5 CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig index 2a8c239d69..85c09f8f62 100644 --- a/configs/ids8313_defconfig +++ b/configs/ids8313_defconfig @@ -6,6 +6,7 @@ CONFIG_FIT_SIGNATURE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFFF00000" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig index 22cf7df302..25185d6cee 100644 --- a/configs/kmcoge5ne_defconfig +++ b/configs/kmcoge5ne_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_KM8360=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="KMCOGE5NE" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig index 358e0cd5a5..16716f5862 100644 --- a/configs/kmeter1_defconfig +++ b/configs/kmeter1_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_KM8360=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="KMETER1" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y diff --git a/configs/kzm9g_defconfig b/configs/kzm9g_defconfig index a884e5a10c..0ee7f4bb80 100644 --- a/configs/kzm9g_defconfig +++ b/configs/kzm9g_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y # CONFIG_SYS_THUMB_BUILD is not set CONFIG_ARCH_RMOBILE=y CONFIG_TARGET_KZM9G=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y CONFIG_SYS_PROMPT="KZM-A9-GT# " diff --git a/configs/ls1021aqds_ddr4_nor_defconfig b/configs/ls1021aqds_ddr4_nor_defconfig index e753f4c589..07e5cb9bae 100644 --- a/configs/ls1021aqds_ddr4_nor_defconfig +++ b/configs/ls1021aqds_ddr4_nor_defconfig @@ -6,6 +6,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 CONFIG_SILENT_CONSOLE=y # CONFIG_CONSOLE_MUX is not set diff --git a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig index ed03812a92..00d6368796 100644 --- a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig +++ b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig @@ -7,6 +7,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="LPUART" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 CONFIG_SILENT_CONSOLE=y # CONFIG_CONSOLE_MUX is not set diff --git a/configs/ls1021aqds_nor_defconfig b/configs/ls1021aqds_nor_defconfig index 6b435cc4d5..a124ab5e5c 100644 --- a/configs/ls1021aqds_nor_defconfig +++ b/configs/ls1021aqds_nor_defconfig @@ -6,6 +6,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 CONFIG_SILENT_CONSOLE=y # CONFIG_CONSOLE_MUX is not set diff --git a/configs/ls1021aqds_nor_lpuart_defconfig b/configs/ls1021aqds_nor_lpuart_defconfig index 8fdd8b63db..61b0f447b2 100644 --- a/configs/ls1021aqds_nor_lpuart_defconfig +++ b/configs/ls1021aqds_nor_lpuart_defconfig @@ -7,6 +7,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="LPUART" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 CONFIG_SILENT_CONSOLE=y # CONFIG_CONSOLE_MUX is not set diff --git a/configs/ls1021atwr_nor_defconfig b/configs/ls1021atwr_nor_defconfig index c56533af3b..cdbf5a215f 100644 --- a/configs/ls1021atwr_nor_defconfig +++ b/configs/ls1021atwr_nor_defconfig @@ -6,6 +6,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 CONFIG_SILENT_CONSOLE=y # CONFIG_CONSOLE_MUX is not set diff --git a/configs/ls1021atwr_nor_lpuart_defconfig b/configs/ls1021atwr_nor_lpuart_defconfig index 89b89cd211..bbc73ad27f 100644 --- a/configs/ls1021atwr_nor_lpuart_defconfig +++ b/configs/ls1021atwr_nor_lpuart_defconfig @@ -7,6 +7,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="LPUART" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 CONFIG_SILENT_CONSOLE=y # CONFIG_CONSOLE_MUX is not set diff --git a/configs/ls1043aqds_defconfig b/configs/ls1043aqds_defconfig index 37662082c6..392ebf92cf 100644 --- a/configs/ls1043aqds_defconfig +++ b/configs/ls1043aqds_defconfig @@ -4,6 +4,7 @@ CONFIG_FSL_LS_PPA=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-qds-duart" CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/ls1043aqds_lpuart_defconfig b/configs/ls1043aqds_lpuart_defconfig index ed125d7494..40dd554835 100644 --- a/configs/ls1043aqds_lpuart_defconfig +++ b/configs/ls1043aqds_lpuart_defconfig @@ -5,6 +5,7 @@ CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-qds-lpuart" CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="LPUART" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/ls1043aqds_nor_ddr3_defconfig b/configs/ls1043aqds_nor_ddr3_defconfig index 6974a58797..d5628e765a 100644 --- a/configs/ls1043aqds_nor_ddr3_defconfig +++ b/configs/ls1043aqds_nor_ddr3_defconfig @@ -4,6 +4,7 @@ CONFIG_FSL_LS_PPA=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-qds-duart" CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/ls1043ardb_defconfig b/configs/ls1043ardb_defconfig index 894110bd1e..4050737fec 100644 --- a/configs/ls1043ardb_defconfig +++ b/configs/ls1043ardb_defconfig @@ -4,6 +4,7 @@ CONFIG_FSL_LS_PPA=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-rdb" CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_GPT=y diff --git a/configs/ls1046aqds_defconfig b/configs/ls1046aqds_defconfig index 87df2fec9b..ea006902f5 100644 --- a/configs/ls1046aqds_defconfig +++ b/configs/ls1046aqds_defconfig @@ -4,6 +4,7 @@ CONFIG_FSL_LS_PPA=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-qds-duart" CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/ls1046aqds_lpuart_defconfig b/configs/ls1046aqds_lpuart_defconfig index 47dba49fbd..5498c01eb1 100644 --- a/configs/ls1046aqds_lpuart_defconfig +++ b/configs/ls1046aqds_lpuart_defconfig @@ -5,6 +5,7 @@ CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-qds-lpuart" CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="LPUART" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/ls2080aqds_defconfig b/configs/ls2080aqds_defconfig index 0106e9ad0d..c1765894e7 100644 --- a/configs/ls2080aqds_defconfig +++ b/configs/ls2080aqds_defconfig @@ -6,6 +6,7 @@ CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2080a-qds" CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_CMD_GREPENV=y CONFIG_CMD_EEPROM=y diff --git a/configs/ls2080ardb_defconfig b/configs/ls2080ardb_defconfig index ed79c97121..0689a40201 100644 --- a/configs/ls2080ardb_defconfig +++ b/configs/ls2080ardb_defconfig @@ -6,6 +6,7 @@ CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2080a-rdb" CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_CMD_GREPENV=y CONFIG_CMD_EEPROM=y diff --git a/configs/mccmon6_nor_defconfig b/configs/mccmon6_nor_defconfig index b0f2692233..449804b43d 100644 --- a/configs/mccmon6_nor_defconfig +++ b/configs/mccmon6_nor_defconfig @@ -6,6 +6,7 @@ CONFIG_TARGET_MCCMON6=y CONFIG_SPL_SERIAL_SUPPORT=y # CONFIG_CMD_BMODE is not set CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/liebherr/mccmon6/mon6_imximage_nor.cfg,MX6QDL" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_SPL=y CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_ENV_SUPPORT=y diff --git a/configs/mccmon6_sd_defconfig b/configs/mccmon6_sd_defconfig index dcda48a547..653f2588db 100644 --- a/configs/mccmon6_sd_defconfig +++ b/configs/mccmon6_sd_defconfig @@ -7,6 +7,7 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y # CONFIG_CMD_BMODE is not set CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/liebherr/mccmon6/mon6_imximage_sd.cfg,MX6QDL" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_SPL=y CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_ENV_SUPPORT=y diff --git a/configs/mpc8308_p1m_defconfig b/configs/mpc8308_p1m_defconfig index ee92e4fb83..0dcdd3bcbe 100644 --- a/configs/mpc8308_p1m_defconfig +++ b/configs/mpc8308_p1m_defconfig @@ -3,6 +3,7 @@ CONFIG_MPC83xx=y CONFIG_TARGET_MPC8308_P1M=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_I2C=y diff --git a/configs/ms7722se_defconfig b/configs/ms7722se_defconfig index 92f3158dae..633a087616 100644 --- a/configs/ms7722se_defconfig +++ b/configs/ms7722se_defconfig @@ -1,5 +1,6 @@ CONFIG_SH=y CONFIG_TARGET_MS7722SE=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set diff --git a/configs/ms7750se_defconfig b/configs/ms7750se_defconfig index 88bbb12003..9fabcd9059 100644 --- a/configs/ms7750se_defconfig +++ b/configs/ms7750se_defconfig @@ -1,5 +1,6 @@ CONFIG_SH=y CONFIG_TARGET_MS7750SE=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=-1 # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/mx31ads_defconfig b/configs/mx31ads_defconfig index c9ba6975f8..17ce704d57 100644 --- a/configs/mx31ads_defconfig +++ b/configs/mx31ads_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_MX31ADS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 CONFIG_CMD_SPI=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/mx35pdk_defconfig b/configs/mx35pdk_defconfig index 324a4dbb5e..11bc00c3ab 100644 --- a/configs/mx35pdk_defconfig +++ b/configs/mx35pdk_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_MX35PDK=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y diff --git a/configs/pm9261_defconfig b/configs/pm9261_defconfig index ba079de6dc..4c35f41ac5 100644 --- a/configs/pm9261_defconfig +++ b/configs/pm9261_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_AT91=y CONFIG_TARGET_PM9261=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/pm9263_defconfig b/configs/pm9263_defconfig index 7cf2722740..01baaa1215 100644 --- a/configs/pm9263_defconfig +++ b/configs/pm9263_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_AT91=y CONFIG_TARGET_PM9263=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/r0p7734_defconfig b/configs/r0p7734_defconfig index 91b08dc24f..a6f6a9324d 100644 --- a/configs/r0p7734_defconfig +++ b/configs/r0p7734_defconfig @@ -1,5 +1,6 @@ CONFIG_SH=y CONFIG_TARGET_R0P7734=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set diff --git a/configs/r2dplus_defconfig b/configs/r2dplus_defconfig index ba68b504d0..32a12720c9 100644 --- a/configs/r2dplus_defconfig +++ b/configs/r2dplus_defconfig @@ -1,5 +1,6 @@ CONFIG_SH=y CONFIG_TARGET_R2DPLUS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=-1 CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/r7780mp_defconfig b/configs/r7780mp_defconfig index 2a37db824d..c5fa3f3b36 100644 --- a/configs/r7780mp_defconfig +++ b/configs/r7780mp_defconfig @@ -1,5 +1,6 @@ CONFIG_SH=y CONFIG_TARGET_R7780MP=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/sh7763rdp_defconfig b/configs/sh7763rdp_defconfig index 028616666c..9334f6bdec 100644 --- a/configs/sh7763rdp_defconfig +++ b/configs/sh7763rdp_defconfig @@ -1,5 +1,6 @@ CONFIG_SH=y CONFIG_TARGET_SH7763RDP=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=-1 CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set diff --git a/configs/sh7785lcr_32bit_defconfig b/configs/sh7785lcr_32bit_defconfig index 8cb58e9d18..59e6067209 100644 --- a/configs/sh7785lcr_32bit_defconfig +++ b/configs/sh7785lcr_32bit_defconfig @@ -1,6 +1,7 @@ CONFIG_SH=y CONFIG_SH_32BIT=y CONFIG_TARGET_SH7785LCR=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set diff --git a/configs/sh7785lcr_defconfig b/configs/sh7785lcr_defconfig index 5b6ebf8528..cf9c305bc3 100644 --- a/configs/sh7785lcr_defconfig +++ b/configs/sh7785lcr_defconfig @@ -1,5 +1,6 @@ CONFIG_SH=y CONFIG_TARGET_SH7785LCR=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig index 5def6d5991..f0578a56d2 100644 --- a/configs/socrates_defconfig +++ b/configs/socrates_defconfig @@ -6,6 +6,7 @@ CONFIG_TARGET_SOCRATES=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/spear300_defconfig b/configs/spear300_defconfig index 300bc08d5d..3a303a2c55 100644 --- a/configs/spear300_defconfig +++ b/configs/spear300_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR300=y CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR300" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/spear300_usbtty_defconfig b/configs/spear300_usbtty_defconfig index 99a72a0cab..9cef783284 100644 --- a/configs/spear300_usbtty_defconfig +++ b/configs/spear300_usbtty_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR300=y CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR300,USBTTY" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=-1 CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/spear310_defconfig b/configs/spear310_defconfig index d93f8fcf5e..695ed2fd90 100644 --- a/configs/spear310_defconfig +++ b/configs/spear310_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR310=y CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR310" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/spear310_pnor_defconfig b/configs/spear310_pnor_defconfig index 78a558bc42..326fa10a10 100644 --- a/configs/spear310_pnor_defconfig +++ b/configs/spear310_pnor_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR310=y CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR310,FLASH_PNOR" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/spear310_usbtty_defconfig b/configs/spear310_usbtty_defconfig index 92d24794f9..eb3282bb7d 100644 --- a/configs/spear310_usbtty_defconfig +++ b/configs/spear310_usbtty_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR310=y CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR310,USBTTY" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=-1 CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/spear310_usbtty_pnor_defconfig b/configs/spear310_usbtty_pnor_defconfig index f922e8fd9f..7c7dc69793 100644 --- a/configs/spear310_usbtty_pnor_defconfig +++ b/configs/spear310_usbtty_pnor_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR310=y CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR310,USBTTY,FLASH_PNOR" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=-1 CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/spear320_defconfig b/configs/spear320_defconfig index dd1798fdfe..c206f38839 100644 --- a/configs/spear320_defconfig +++ b/configs/spear320_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR320=y CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR320" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/spear320_pnor_defconfig b/configs/spear320_pnor_defconfig index 1ed8e83bc2..3d926f11cc 100644 --- a/configs/spear320_pnor_defconfig +++ b/configs/spear320_pnor_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR320=y CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR320,FLASH_PNOR" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/spear320_usbtty_defconfig b/configs/spear320_usbtty_defconfig index ff897822aa..2becc829bb 100644 --- a/configs/spear320_usbtty_defconfig +++ b/configs/spear320_usbtty_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR320=y CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR320,USBTTY" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=-1 CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/spear320_usbtty_pnor_defconfig b/configs/spear320_usbtty_pnor_defconfig index bc8f0e20f5..2759f372de 100644 --- a/configs/spear320_usbtty_pnor_defconfig +++ b/configs/spear320_usbtty_pnor_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR320=y CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR320,USBTTY,FLASH_PNOR" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=-1 CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/spear600_defconfig b/configs/spear600_defconfig index 7b8cd06297..3c5c0e617f 100644 --- a/configs/spear600_defconfig +++ b/configs/spear600_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR600=y CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR600" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/spear600_usbtty_defconfig b/configs/spear600_usbtty_defconfig index ef9308c368..34a308b8b7 100644 --- a/configs/spear600_usbtty_defconfig +++ b/configs/spear600_usbtty_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR600=y CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR600,USBTTY" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=-1 CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/stm32f429-discovery_defconfig b/configs/stm32f429-discovery_defconfig index 751e485b49..f16ca3753f 100644 --- a/configs/stm32f429-discovery_defconfig +++ b/configs/stm32f429-discovery_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_STM32=y CONFIG_STM32F4=y CONFIG_TARGET_STM32F429_DISCOVERY=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/vct_platinum_defconfig b/configs/vct_platinum_defconfig index f8b9d7e61b..dbb4bcfa77 100644 --- a/configs/vct_platinum_defconfig +++ b/configs/vct_platinum_defconfig @@ -1,6 +1,7 @@ CONFIG_MIPS=y CONFIG_TARGET_VCT=y CONFIG_VCT_PLATINUM=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=5 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_PROMPT="$ " diff --git a/configs/vct_platinum_small_defconfig b/configs/vct_platinum_small_defconfig index 2b49d4c9a0..72f53e09a1 100644 --- a/configs/vct_platinum_small_defconfig +++ b/configs/vct_platinum_small_defconfig @@ -2,6 +2,7 @@ CONFIG_MIPS=y CONFIG_TARGET_VCT=y CONFIG_VCT_PLATINUM=y CONFIG_VCT_SMALL_IMAGE=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=5 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_PROMPT="$ " diff --git a/configs/vct_platinumavc_defconfig b/configs/vct_platinumavc_defconfig index 5efe2236a3..b8a6fba415 100644 --- a/configs/vct_platinumavc_defconfig +++ b/configs/vct_platinumavc_defconfig @@ -1,6 +1,7 @@ CONFIG_MIPS=y CONFIG_TARGET_VCT=y CONFIG_VCT_PLATINUMAVC=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=5 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_PROMPT="VCT# " diff --git a/configs/vct_platinumavc_small_defconfig b/configs/vct_platinumavc_small_defconfig index 1b5c125893..0e3df63a4d 100644 --- a/configs/vct_platinumavc_small_defconfig +++ b/configs/vct_platinumavc_small_defconfig @@ -2,6 +2,7 @@ CONFIG_MIPS=y CONFIG_TARGET_VCT=y CONFIG_VCT_PLATINUMAVC=y CONFIG_VCT_SMALL_IMAGE=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=5 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_PROMPT="$ " diff --git a/configs/vct_premium_defconfig b/configs/vct_premium_defconfig index 24f776b49f..06b6c00084 100644 --- a/configs/vct_premium_defconfig +++ b/configs/vct_premium_defconfig @@ -1,6 +1,7 @@ CONFIG_MIPS=y CONFIG_TARGET_VCT=y CONFIG_VCT_PREMIUM=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=5 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_PROMPT="$ " diff --git a/configs/vct_premium_small_defconfig b/configs/vct_premium_small_defconfig index 276650dbe1..c26fb719e2 100644 --- a/configs/vct_premium_small_defconfig +++ b/configs/vct_premium_small_defconfig @@ -2,6 +2,7 @@ CONFIG_MIPS=y CONFIG_TARGET_VCT=y CONFIG_VCT_PREMIUM=y CONFIG_VCT_SMALL_IMAGE=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=5 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_PROMPT="$ " diff --git a/configs/ve8313_defconfig b/configs/ve8313_defconfig index 2fdf77d80b..0a315515c9 100644 --- a/configs/ve8313_defconfig +++ b/configs/ve8313_defconfig @@ -3,6 +3,7 @@ CONFIG_MPC83xx=y CONFIG_TARGET_VE8313=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=6 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/vexpress_aemv8a_dram_defconfig b/configs/vexpress_aemv8a_dram_defconfig index c06b989366..60eea037b5 100644 --- a/configs/vexpress_aemv8a_dram_defconfig +++ b/configs/vexpress_aemv8a_dram_defconfig @@ -3,6 +3,7 @@ CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_IDENT_STRING=" vexpress_aemv8a" CONFIG_DISTRO_DEFAULTS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/vexpress_aemv8a_juno_defconfig b/configs/vexpress_aemv8a_juno_defconfig index b2e3098fc4..d7414d44d8 100644 --- a/configs/vexpress_aemv8a_juno_defconfig +++ b/configs/vexpress_aemv8a_juno_defconfig @@ -3,6 +3,7 @@ CONFIG_TARGET_VEXPRESS64_JUNO=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_IDENT_STRING=" vexpress_aemv8a" CONFIG_DISTRO_DEFAULTS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig index 33639f2f8c..b92e87fd2c 100644 --- a/configs/vexpress_aemv8a_semi_defconfig +++ b/configs/vexpress_aemv8a_semi_defconfig @@ -3,6 +3,7 @@ CONFIG_TARGET_VEXPRESS64_BASE_FVP=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_IDENT_STRING=" vexpress_aemv8a" CONFIG_DISTRO_DEFAULTS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/vexpress_ca15_tc2_defconfig b/configs/vexpress_ca15_tc2_defconfig index ba489ea1d1..3dfe2e82ed 100644 --- a/configs/vexpress_ca15_tc2_defconfig +++ b/configs/vexpress_ca15_tc2_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_VEXPRESS_CA15_TC2=y CONFIG_DISTRO_DEFAULTS=y CONFIG_OF_BOARD_SETUP=y +CONFIG_ENV_IS_IN_FLASH=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/vexpress_ca5x2_defconfig b/configs/vexpress_ca5x2_defconfig index fb671419c5..507290bb69 100644 --- a/configs/vexpress_ca5x2_defconfig +++ b/configs/vexpress_ca5x2_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_TARGET_VEXPRESS_CA5X2=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_ENV_IS_IN_FLASH=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/vexpress_ca9x4_defconfig b/configs/vexpress_ca9x4_defconfig index 7b845c6c79..851f034478 100644 --- a/configs/vexpress_ca9x4_defconfig +++ b/configs/vexpress_ca9x4_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_TARGET_VEXPRESS_CA9X4=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_ENV_IS_IN_FLASH=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/vme8349_defconfig b/configs/vme8349_defconfig index c27a44744a..244dc7e34f 100644 --- a/configs/vme8349_defconfig +++ b/configs/vme8349_defconfig @@ -3,6 +3,7 @@ CONFIG_MPC83xx=y CONFIG_TARGET_VME8349=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=6 CONFIG_HUSH_PARSER=y CONFIG_CMD_I2C=y diff --git a/configs/woodburn_defconfig b/configs/woodburn_defconfig index 6c01f75a7d..f01b3b47da 100644 --- a/configs/woodburn_defconfig +++ b/configs/woodburn_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_WOODBURN=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y diff --git a/configs/woodburn_sd_defconfig b/configs/woodburn_sd_defconfig index 8d1a1f1480..996247b918 100644 --- a/configs/woodburn_sd_defconfig +++ b/configs/woodburn_sd_defconfig @@ -7,6 +7,7 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/woodburn/imximage.cfg" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SPL=y diff --git a/configs/x600_defconfig b/configs/x600_defconfig index 2e5d5f1ae8..d7666146b6 100644 --- a/configs/x600_defconfig +++ b/configs/x600_defconfig @@ -7,6 +7,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_IDENT_STRING="-SPEAr" +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/xpedite550x_defconfig b/configs/xpedite550x_defconfig index cad0d239e9..63ce8b2393 100644 --- a/configs/xpedite550x_defconfig +++ b/configs/xpedite550x_defconfig @@ -6,6 +6,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y diff --git a/configs/xtfpga_defconfig b/configs/xtfpga_defconfig index 9f85d63965..e52e62b201 100644 --- a/configs/xtfpga_defconfig +++ b/configs/xtfpga_defconfig @@ -1,6 +1,7 @@ CONFIG_XTENSA=y CONFIG_SYS_CPU="dc233c" CONFIG_XTFPGA_KC705=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 CONFIG_VERSION_VARIABLE=y CONFIG_SYS_PROMPT="U-Boot> " diff --git a/configs/zipitz2_defconfig b/configs/zipitz2_defconfig index 0b38f2b1af..6da257c671 100644 --- a/configs/zipitz2_defconfig +++ b/configs/zipitz2_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_ZIPITZ2=y +CONFIG_ENV_IS_IN_FLASH=y # CONFIG_CONSOLE_MUX is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y diff --git a/configs/zmx25_defconfig b/configs/zmx25_defconfig index e2b23ed651..9515091ec5 100644 --- a/configs/zmx25_defconfig +++ b/configs/zmx25_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_ZMX25=y +CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=5 # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/zynq_zc770_xm012_defconfig b/configs/zynq_zc770_xm012_defconfig index 943efdb141..4cf15d5c67 100644 --- a/configs/zynq_zc770_xm012_defconfig +++ b/configs/zynq_zc770_xm012_defconfig @@ -7,6 +7,7 @@ CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012" +CONFIG_ENV_IS_IN_FLASH=y # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL=y CONFIG_SPL_OS_BOOT=y diff --git a/include/config_fsl_chain_trust.h b/include/config_fsl_chain_trust.h index 5a1a287992..6b6ae7cc78 100644 --- a/include/config_fsl_chain_trust.h +++ b/include/config_fsl_chain_trust.h @@ -15,7 +15,6 @@ #undef CONFIG_ENV_IS_IN_EEPROM #undef CONFIG_ENV_IS_IN_SPI_FLASH -#undef CONFIG_ENV_IS_IN_FLASH #endif diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h index ea980e6511..d05cc613d0 100644 --- a/include/configs/10m50_devboard.h +++ b/include/configs/10m50_devboard.h @@ -70,7 +70,6 @@ * of flash. NOTE: the monitor length must be multiple of sector size * (which is common practice). */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SIZE 0x10000 /* 64k, 1 sector */ #define CONFIG_ENV_OVERWRITE /* Serial change Ok */ diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h index 65271773f4..0d3794dd06 100644 --- a/include/configs/3c120_devboard.h +++ b/include/configs/3c120_devboard.h @@ -73,7 +73,6 @@ * of flash. NOTE: the monitor length must be multiple of sector size * (which is common practice). */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SIZE 0x20000 /* 128k, 1 sector */ #define CONFIG_ENV_OVERWRITE /* Serial change Ok */ diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 61a1fa48ae..d580e9b36e 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -139,7 +139,6 @@ #elif defined(CONFIG_ENV_IS_NOWHERE) #define CONFIG_ENV_SIZE 0x2000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index ca28ab0126..e8d5dc59fe 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -505,7 +505,6 @@ combinations. this should be removed later #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index a8bc2abcab..937e93ef0a 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -423,7 +423,6 @@ #endif #define CONFIG_ENV_OFFSET CONFIG_SYS_NAND_BLOCK_SIZE #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index 223439aaab..0fbf457cdc 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -159,7 +159,6 @@ #define CONFIG_ENV_OFFSET 0x2000 #define CONFIG_ENV_SIZE 0x1000 #define CONFIG_ENV_SECT_SIZE 0x2000 -#define CONFIG_ENV_IS_IN_FLASH 1 #define LDS_BOARD_TEXT \ . = DEFINED(env_offset) ? env_offset : .; \ diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index e7d99baf25..591d0d1d85 100644 --- a/include/configs/M52277EVB.h +++ b/include/configs/M52277EVB.h @@ -198,8 +198,6 @@ #ifdef CONFIG_CF_SBF # define CONFIG_ENV_IS_IN_SPI_FLASH # define CONFIG_ENV_SPI_CS 2 -#else -# define CONFIG_ENV_IS_IN_FLASH 1 #endif #define CONFIG_ENV_OVERWRITE 1 diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index 84d3f3cfa6..57328c6269 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -176,7 +176,6 @@ /* Configuration for environment * Environment is embedded in u-boot in the second sector of the flash */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define LDS_BOARD_TEXT \ . = DEFINED(env_offset) ? env_offset : .; \ diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h index 4ef83f7862..f6027e231f 100644 --- a/include/configs/M5249EVB.h +++ b/include/configs/M5249EVB.h @@ -84,8 +84,6 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET -#define CONFIG_ENV_IS_IN_FLASH 1 - #define LDS_BOARD_TEXT \ . = DEFINED(env_offset) ? env_offset : .; \ common/env_embedded.o (.text); diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index 3efd7e59cf..2bdfe80ef5 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -23,11 +23,9 @@ #ifdef CONFIG_MONITOR_IS_IN_RAM # define CONFIG_ENV_OFFSET 0x4000 # define CONFIG_ENV_SECT_SIZE 0x1000 -# define CONFIG_ENV_IS_IN_FLASH 1 #else # define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x4000) # define CONFIG_ENV_SECT_SIZE 0x1000 -# define CONFIG_ENV_IS_IN_FLASH 1 #endif #define LDS_BOARD_TEXT \ diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h index 4f7a19b5d3..0722ea19e3 100644 --- a/include/configs/M5253EVBE.h +++ b/include/configs/M5253EVBE.h @@ -24,11 +24,9 @@ #ifndef CONFIG_MONITOR_IS_IN_RAM #define CONFIG_ENV_OFFSET 0x4000 #define CONFIG_ENV_SECT_SIZE 0x2000 -#define CONFIG_ENV_IS_IN_FLASH 1 #else #define CONFIG_ENV_ADDR 0xffe04000 #define CONFIG_ENV_SECT_SIZE 0x2000 -#define CONFIG_ENV_IS_IN_FLASH 1 #endif #define LDS_BOARD_TEXT \ diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index 0b0e4e60c7..e6bd7f3609 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -33,11 +33,9 @@ #ifndef CONFIG_MONITOR_IS_IN_RAM #define CONFIG_ENV_OFFSET 0x4000 #define CONFIG_ENV_SECT_SIZE 0x2000 -#define CONFIG_ENV_IS_IN_FLASH 1 #else #define CONFIG_ENV_ADDR 0xffe04000 #define CONFIG_ENV_SECT_SIZE 0x2000 -#define CONFIG_ENV_IS_IN_FLASH 1 #endif #define LDS_BOARD_TEXT \ diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h index 5d324ba5bf..6bcd6b6f2e 100644 --- a/include/configs/M5275EVB.h +++ b/include/configs/M5275EVB.h @@ -34,11 +34,9 @@ #ifndef CONFIG_MONITOR_IS_IN_RAM #define CONFIG_ENV_OFFSET 0x4000 #define CONFIG_ENV_SECT_SIZE 0x2000 -#define CONFIG_ENV_IS_IN_FLASH 1 #else #define CONFIG_ENV_ADDR 0xffe04000 #define CONFIG_ENV_SECT_SIZE 0x2000 -#define CONFIG_ENV_IS_IN_FLASH 1 #endif #define LDS_BOARD_TEXT \ diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index 061a632c98..cc703aac19 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -29,7 +29,6 @@ */ #define CONFIG_ENV_ADDR 0xffe04000 #define CONFIG_ENV_SIZE 0x2000 -#define CONFIG_ENV_IS_IN_FLASH 1 #define LDS_BOARD_TEXT \ . = DEFINED(env_offset) ? env_offset : .; \ diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index 419a0907c4..d50c874fe1 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -182,7 +182,6 @@ #define CONFIG_ENV_OFFSET (CONFIG_SYS_FLASH_BASE + 0x40000) #define CONFIG_ENV_SIZE 0x1000 #define CONFIG_ENV_SECT_SIZE 0x8000 -#define CONFIG_ENV_IS_IN_FLASH 1 #define LDS_BOARD_TEXT \ . = DEFINED(env_offset) ? env_offset : .; \ diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index 8261323d79..45cdf9da15 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -187,7 +187,6 @@ */ #define CONFIG_ENV_OFFSET 0x4000 #define CONFIG_ENV_SECT_SIZE 0x2000 -#define CONFIG_ENV_IS_IN_FLASH 1 #define LDS_BOARD_TEXT \ . = DEFINED(env_offset) ? env_offset : .; \ diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index 68136ad095..26639fc41f 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -187,7 +187,6 @@ */ #define CONFIG_ENV_OFFSET 0x4000 #define CONFIG_ENV_SECT_SIZE 0x2000 -#define CONFIG_ENV_IS_IN_FLASH 1 #define LDS_BOARD_TEXT \ . = DEFINED(env_offset) ? env_offset : .; \ diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h index f20aa6fc33..05c86ae2fc 100644 --- a/include/configs/M54451EVB.h +++ b/include/configs/M54451EVB.h @@ -219,7 +219,6 @@ # define CONFIG_ENV_SIZE 0x2000 # define CONFIG_ENV_SECT_SIZE 0x10000 #else -# define CONFIG_ENV_IS_IN_FLASH 1 # define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x40000) # define CONFIG_ENV_SIZE 0x2000 # define CONFIG_ENV_SECT_SIZE 0x20000 diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index 35604ad489..be54e019f2 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -272,8 +272,6 @@ #ifdef CONFIG_CF_SBF # define CONFIG_ENV_IS_IN_SPI_FLASH # define CONFIG_ENV_SPI_CS 1 -#else -# define CONFIG_ENV_IS_IN_FLASH 1 #endif #undef CONFIG_ENV_OVERWRITE diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h index 4d250bf2a1..9dca52e78a 100644 --- a/include/configs/M5475EVB.h +++ b/include/configs/M5475EVB.h @@ -232,7 +232,6 @@ */ #define CONFIG_ENV_OFFSET 0x40000 #define CONFIG_ENV_SECT_SIZE 0x10000 -#define CONFIG_ENV_IS_IN_FLASH 1 /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h index 6ed73656d3..d95be2bd5e 100644 --- a/include/configs/M5485EVB.h +++ b/include/configs/M5485EVB.h @@ -219,7 +219,6 @@ */ #define CONFIG_ENV_OFFSET 0x40000 #define CONFIG_ENV_SECT_SIZE 0x10000 -#define CONFIG_ENV_IS_IN_FLASH 1 /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h index 15bb0e9d6a..17090da796 100644 --- a/include/configs/MCR3000.h +++ b/include/configs/MCR3000.h @@ -125,7 +125,6 @@ /* Environment Configuration */ /* environment is in FLASH */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_SECT_SIZE (64 * 1024) #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN) diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h index 0f26467e29..25d5cab959 100644 --- a/include/configs/MPC8308RDB.h +++ b/include/configs/MPC8308RDB.h @@ -394,7 +394,6 @@ /* * Environment */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + \ CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */ diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index 5c10d9ba55..cf0c7234dc 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -439,7 +439,6 @@ #define CONFIG_ENV_OFFSET_REDUND \ (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE) #elif !defined(CONFIG_SYS_RAMBOOT) - #define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR \ (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */ diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index 53cb6d6174..be1a6afff3 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -420,7 +420,6 @@ * Environment */ #if !defined(CONFIG_SYS_RAMBOOT) - #define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR \ (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */ diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index d34eacbad3..b8f8f493eb 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -295,7 +295,6 @@ * Environment */ #ifndef CONFIG_SYS_RAMBOOT - #define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR \ (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x20000 diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h index 28b9478d04..428f3abf90 100644 --- a/include/configs/MPC832XEMDS.h +++ b/include/configs/MPC832XEMDS.h @@ -379,7 +379,6 @@ * Environment */ #ifndef CONFIG_SYS_RAMBOOT - #define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR \ (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x20000 diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 2835d42b93..18f7523692 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -433,7 +433,6 @@ * Environment */ #ifndef CONFIG_SYS_RAMBOOT - #define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR \ (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 4b9bc1fbd1..221c35cf51 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -452,7 +452,6 @@ boards, we say we have two, but don't display a message if we find only one. */ #define CONFIG_ENV_OVERWRITE #ifndef CONFIG_SYS_RAMBOOT - #define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR \ (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K (one sector) for environment */ diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index 781a93ab14..1a65c25c48 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -442,7 +442,6 @@ extern int board_pci_host_broken(void); * Environment */ #ifndef CONFIG_SYS_RAMBOOT - #define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR \ (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index ada85c7964..d93f7a0074 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -455,7 +455,6 @@ * Environment */ #ifndef CONFIG_SYS_RAMBOOT - #define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR \ (CONFIG_SYS_MONITOR_BASE+CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K (one sector) for env */ diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 1456648d6a..d96c15ec01 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -574,7 +574,6 @@ #define CONFIG_ENV_SIZE 0x2000 #endif #else - #define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index decb57404a..ca4ccd8ad3 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -291,7 +291,6 @@ * Environment */ #ifndef CONFIG_SYS_RAMBOOT - #define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x40000) #define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index 029aa572ce..977454167d 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -323,7 +323,6 @@ extern unsigned long get_clock_freq(void); /* * Environment */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x40000) #define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index ffa8796407..b4f4c4e32b 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -325,7 +325,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Environment */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K (one sector) */ #if CONFIG_SYS_MONITOR_BASE > 0xfff80000 #define CONFIG_ENV_ADDR 0xfff80000 diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 43e05516ab..b41543688b 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -438,7 +438,6 @@ extern unsigned long get_clock_freq(void); /* * Environment */ -#define CONFIG_ENV_IS_IN_FLASH 1 #if CONFIG_SYS_MONITOR_BASE > 0xfff80000 #define CONFIG_ENV_ADDR 0xfff80000 #else diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index 96a125c323..d31395cf81 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -321,7 +321,6 @@ extern unsigned long get_clock_freq(void); /* * Environment */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x40000) #define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index 47b97d1554..2e13fb52df 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -330,7 +330,6 @@ * Environment */ #ifndef CONFIG_SYS_RAMBOOT - #define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x40000) #define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index 3734055bd3..c0af7451b8 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -336,7 +336,6 @@ extern unsigned long get_clock_freq(void); /* * Environment */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index eb7db20b7f..a75ce0b93d 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -424,7 +424,6 @@ extern unsigned long get_clock_freq(void); */ #if defined(CONFIG_SYS_RAMBOOT) #else -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index d8e0dfd807..0a2bcb2383 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -531,7 +531,6 @@ #if defined(CONFIG_SYS_RAMBOOT) #else - #define CONFIG_ENV_IS_IN_FLASH 1 #if CONFIG_SYS_MONITOR_BASE > 0xfff80000 #define CONFIG_ENV_ADDR 0xfff80000 #else diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 46b9b7a67d..5e8211609a 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -403,7 +403,6 @@ * Environment */ #ifndef CONFIG_SYS_RAMBOOT -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x20000 /* 126k (one sector) for env */ #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index 4a4a76d2d4..7b9b2458b3 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -563,7 +563,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); * Environment */ #ifndef CONFIG_SYS_RAMBOOT - #define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR \ (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */ diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h index 7217426d3a..5ee83b9034 100644 --- a/include/configs/MigoR.h +++ b/include/configs/MigoR.h @@ -94,7 +94,6 @@ #undef CONFIG_SYS_DIRECT_FLASH_TFTP /* ENV setting */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_OVERWRITE 1 #define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index ea549e65d9..74c33fda02 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -707,7 +707,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 9bf0904c51..3695ac3f3f 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -576,7 +576,6 @@ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h index 719043d5a1..be42dadac7 100644 --- a/include/configs/P1023RDB.h +++ b/include/configs/P1023RDB.h @@ -230,7 +230,6 @@ extern unsigned long get_clock_freq(void); */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index d3b655fda9..36d08d8e7f 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -88,7 +88,6 @@ #elif defined(CONFIG_ENV_IS_NOWHERE) #define CONFIG_ENV_SIZE 0x2000 #else - #define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE \ - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index c8bba52ed1..ea05b3c36f 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -169,7 +169,6 @@ #elif defined(CONFIG_ENV_IS_NOWHERE) #define CONFIG_ENV_SIZE 0x2000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 59bbb5391b..f9a4ba1af3 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -192,7 +192,6 @@ #elif defined(CONFIG_ENV_IS_NOWHERE) #define CONFIG_ENV_SIZE 0x2000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 827068589b..6dbb3dfe00 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -90,7 +90,6 @@ #define CONFIG_ENV_SIZE CONFIG_SYS_NAND_BLOCK_SIZE #define CONFIG_ENV_OFFSET (7 * CONFIG_SYS_NAND_BLOCK_SIZE) #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 826313a850..57ef0fd3b7 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -198,7 +198,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (3 * CONFIG_SYS_NAND_BLOCK_SIZE) #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 79ee50db04..d3230c0e4a 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -165,7 +165,6 @@ #elif defined(CONFIG_ENV_IS_NOWHERE) #define CONFIG_ENV_SIZE 0x2000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 190000069b..bcbc8aac9f 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -151,7 +151,6 @@ #elif defined(CONFIG_ENV_IS_NOWHERE) #define CONFIG_ENV_SIZE 0x2000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index 287c722e2f..d9983653f0 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -110,7 +110,6 @@ #elif defined(CONFIG_ENV_IS_NOWHERE) #define CONFIG_ENV_SIZE 0x2000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index d06c5b574e..ee1110a317 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -347,7 +347,6 @@ #elif defined(CONFIG_ENV_IS_NOWHERE) #define CONFIG_ENV_SIZE 0x2000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index c54de65076..c216ac2d47 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -251,7 +251,6 @@ /* * Environment */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR \ (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) for env */ diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 2bf3a5686a..31d7cdbd10 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -362,7 +362,6 @@ */ #ifdef CONFIG_ENV_FIT_UCBOOT -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x20000) #define CONFIG_ENV_SIZE 0x20000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ @@ -397,7 +396,6 @@ #define CONFIG_ENV_SIZE 0x2000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_BASE (CONFIG_SYS_FLASH_BASE) #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE diff --git a/include/configs/adp-ae3xx.h b/include/configs/adp-ae3xx.h index 6bfc08e5af..cef1eddeb6 100644 --- a/include/configs/adp-ae3xx.h +++ b/include/configs/adp-ae3xx.h @@ -236,7 +236,6 @@ #define CONFIG_SYS_MAX_FLASH_SECT 512 /* environments */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x140000) #define CONFIG_ENV_SIZE 8192 #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h index 4cef64e3c5..f9662780de 100644 --- a/include/configs/adp-ag101p.h +++ b/include/configs/adp-ag101p.h @@ -358,7 +358,6 @@ #define CONFIG_SYS_MAX_FLASH_SECT 512 /* environments */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x140000) #define CONFIG_ENV_SIZE 8192 #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 5343b8df85..85591de116 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -339,7 +339,6 @@ #define CONFIG_SYS_REDUNDAND_ENVIRONMENT #define CONFIG_SYS_MMC_MAX_DEVICE 2 #elif defined(CONFIG_NOR_BOOT) -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ #define CONFIG_ENV_OFFSET (512 << 10) /* 512 KiB */ #define CONFIG_ENV_OFFSET_REDUND (768 << 10) /* 768 KiB */ diff --git a/include/configs/amcore.h b/include/configs/amcore.h index acae6914e5..0a40746112 100644 --- a/include/configs/amcore.h +++ b/include/configs/amcore.h @@ -87,7 +87,6 @@ #define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024) #define CONFIG_SYS_BOOTPARAMS_LEN (64 * 1024) -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + \ CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SIZE 0x1000 diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h index b3c22cf4a4..285041dbf8 100644 --- a/include/configs/ap325rxa.h +++ b/include/configs/ap325rxa.h @@ -124,7 +124,6 @@ #undef CONFIG_SYS_DIRECT_FLASH_TFTP /* ENV setting */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_OVERWRITE 1 #define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h index 440505dd1f..078c77bf68 100644 --- a/include/configs/ap_sh4a_4a.h +++ b/include/configs/ap_sh4a_4a.h @@ -107,7 +107,6 @@ #define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024) /* ENV setting */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_OVERWRITE 1 #define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index 2023895c3e..492062abb3 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -87,7 +87,6 @@ #define CONFIG_SYS_FLASH_UNLOCK_TOUT 3000 /* ENV setting */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_OVERWRITE 1 #define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + \ diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index e102cba2c9..723bc154b3 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -118,7 +118,6 @@ #ifndef CONFIG_MONITOR_IS_IN_RAM #define CONFIG_ENV_OFFSET 0x1FF8000 #define CONFIG_ENV_SECT_SIZE 0x8000 -#define CONFIG_ENV_IS_IN_FLASH 1 #else /* * environment in RAM - This is used to use a single PC-based application @@ -128,7 +127,6 @@ */ #define CONFIG_ENV_ADDR 0x40060000 #define CONFIG_ENV_SECT_SIZE 0x8000 -#define CONFIG_ENV_IS_IN_FLASH 1 #endif /* here we put our FPGA configuration... */ diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h index 53e191a312..cb6dae71e9 100644 --- a/include/configs/at91rm9200ek.h +++ b/include/configs/at91rm9200ek.h @@ -149,7 +149,6 @@ /* * Environment Settings */ -#define CONFIG_ENV_IS_IN_FLASH /* * after u-boot.bin diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index a8337cdf43..9effe9ebd9 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -97,7 +97,6 @@ #define CONFIG_SYS_MONITOR_SEC 1:0-3 #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_MONITOR_LEN (256 << 10) -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x007E0000) #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR - CONFIG_ENV_SIZE) diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 1a67816d43..70d1a66ad7 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -552,7 +552,6 @@ DEFAULT_LINUX_BOOT_ENV \ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE /* Reduce SPL size by removing unlikey targets */ #ifdef CONFIG_NOR_BOOT -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ #define CONFIG_ENV_OFFSET (512 << 10) /* 512 KiB */ #define CONFIG_ENV_OFFSET_REDUND (768 << 10) /* 768 KiB */ diff --git a/include/configs/blanche.h b/include/configs/blanche.h index cb80b90381..50692cba65 100755 --- a/include/configs/blanche.h +++ b/include/configs/blanche.h @@ -83,7 +83,6 @@ #else #undef CONFIG_ENV_IS_IN_SPI_FLASH #undef CONFIG_ENV_ADDR -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE (256 * 1024) #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR) diff --git a/include/configs/boston.h b/include/configs/boston.h index 50aaa7be8c..2646cf09ed 100644 --- a/include/configs/boston.h +++ b/include/configs/boston.h @@ -64,7 +64,6 @@ /* * Environment */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #ifdef CONFIG_64BIT diff --git a/include/configs/calimain.h b/include/configs/calimain.h index d43e3314a7..b6c8035fb5 100644 --- a/include/configs/calimain.h +++ b/include/configs/calimain.h @@ -154,7 +154,6 @@ #define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID) #define CONFIG_CONS_INDEX 1 /* use UART0 for console */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_PROTECTION diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h index b078e10475..a3b7b219b3 100644 --- a/include/configs/cobra5272.h +++ b/include/configs/cobra5272.h @@ -96,11 +96,9 @@ #ifndef CONFIG_MONITOR_IS_IN_RAM #define CONFIG_ENV_OFFSET 0x4000 #define CONFIG_ENV_SECT_SIZE 0x2000 -#define CONFIG_ENV_IS_IN_FLASH 1 #else #define CONFIG_ENV_ADDR 0xffe04000 #define CONFIG_ENV_SECT_SIZE 0x2000 -#define CONFIG_ENV_IS_IN_FLASH 1 #endif #define LDS_BOARD_TEXT \ diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h index 9efe74b593..4be06f1914 100644 --- a/include/configs/colibri_pxa270.h +++ b/include/configs/colibri_pxa270.h @@ -138,8 +138,6 @@ #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1 #define CONFIG_SYS_FLASH_PROTECTION 1 - -#define CONFIG_ENV_IS_IN_FLASH 1 #endif #define CONFIG_SYS_MONITOR_BASE 0x0 diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index abd09ca1ed..70fdb58163 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -99,7 +99,6 @@ #elif defined(CONFIG_ENV_IS_NOWHERE) #define CONFIG_ENV_SIZE 0x2000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 2bf4d66242..b79bd4e2e1 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -162,7 +162,6 @@ * Flash & Environment */ #ifdef CONFIG_USE_NAND -#undef CONFIG_ENV_IS_IN_FLASH #define CONFIG_NAND_DAVINCI #define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ #define CONFIG_ENV_SIZE (128 << 10) @@ -217,7 +216,6 @@ #endif #ifdef CONFIG_USE_NOR -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_PROTECTION @@ -233,7 +231,6 @@ #endif #ifdef CONFIG_USE_SPIFLASH -#undef CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE (64 << 10) #define CONFIG_ENV_OFFSET (512 << 10) diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 40beb17574..1c2cc6f4b0 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -236,7 +236,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE /* Reduce SPL size by removing unlikey targets */ #ifdef CONFIG_NOR_BOOT -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE (128 * 1024) /* 128 KiB */ #define MTDIDS_DEFAULT "nor0=physmap-flash.0" #define MTDPARTS_DEFAULT "mtdparts=physmap-flash.0:" \ diff --git a/include/configs/ea20.h b/include/configs/ea20.h index b06c9b8f22..8f42b83a45 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -87,7 +87,6 @@ #endif #ifdef CONFIG_USE_SPIFLASH -#undef CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE (8 << 10) #define CONFIG_ENV_OFFSET 0x80000 diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h index 45ce944eb1..755e7887df 100644 --- a/include/configs/eb_cpu5282.h +++ b/include/configs/eb_cpu5282.h @@ -43,7 +43,6 @@ #define CONFIG_ENV_ADDR 0xFF040000 #define CONFIG_ENV_SECT_SIZE 0x00020000 -#define CONFIG_ENV_IS_IN_FLASH 1 /* * BOOTP options diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h index 2404441860..cabbe160a3 100644 --- a/include/configs/ecovec.h +++ b/include/configs/ecovec.h @@ -139,7 +139,6 @@ #define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024) /* ENV setting */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_OVERWRITE 1 #define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h index def28f2cf1..92842e1e18 100644 --- a/include/configs/edb93xx.h +++ b/include/configs/edb93xx.h @@ -198,7 +198,6 @@ #define CONFIG_SYS_MONITOR_LEN (256 * 1024) #define CONFIG_ENV_OVERWRITE /* Vendor params unprotected */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR 0x60040000 #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index cc5cc7bac6..31364c2533 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -187,7 +187,6 @@ /* * Environment variables configurations */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_SECT_SIZE 0x2000 /* 16K */ #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET 0x4000 /* env starts here */ diff --git a/include/configs/espt.h b/include/configs/espt.h index 845bcc1c9a..1b3295346d 100644 --- a/include/configs/espt.h +++ b/include/configs/espt.h @@ -74,7 +74,6 @@ /* Use hardware flash sectors protection instead of U-Boot software protection */ #undef CONFIG_SYS_FLASH_PROTECTION #undef CONFIG_SYS_DIRECT_FLASH_TFTP -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + (1 * CONFIG_ENV_SECT_SIZE)) diff --git a/include/configs/flea3.h b/include/configs/flea3.h index 976730cdd3..a09986d14c 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -154,8 +154,6 @@ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + \ CONFIG_SYS_MONITOR_LEN) -#define CONFIG_ENV_IS_IN_FLASH - /* * CFI FLASH driver setup */ diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index df8e69fe66..c5b6fddee7 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -493,7 +493,6 @@ void fpga_control_clear(unsigned int bus, int pin); * Environment */ #if 1 -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + \ CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */ diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index bd6da684bc..02d5b2cf65 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -429,7 +429,6 @@ /* * Environment Configuration */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE \ + CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SIZE 0x20000 diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index e964b492e3..01c5cc496a 100644 --- a/include/configs/imx27lite-common.h +++ b/include/configs/imx27lite-common.h @@ -89,7 +89,6 @@ /* * Flash & Environment */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI /* Use buffered writes (~10x faster) */ diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h index d0b6af8cad..8c9ad6c183 100644 --- a/include/configs/integratorcp.h +++ b/include/configs/integratorcp.h @@ -42,7 +42,6 @@ */ #define PHYS_FLASH_SIZE 0x01000000 /* 16MB */ #define CONFIG_SYS_MAX_FLASH_SECT 64 -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_SYS_MONITOR_LEN 0x00100000 /* diff --git a/include/configs/km/km83xx-common.h b/include/configs/km/km83xx-common.h index 0db33b701c..0bd42799f1 100644 --- a/include/configs/km/km83xx-common.h +++ b/include/configs/km/km83xx-common.h @@ -175,7 +175,6 @@ */ #ifndef CONFIG_SYS_RAMBOOT -#define CONFIG_ENV_IS_IN_FLASH #ifndef CONFIG_ENV_ADDR #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + \ CONFIG_SYS_MONITOR_LEN) diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index feb3eec446..f434991314 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -98,7 +98,6 @@ #undef CONFIG_SYS_FLASH_PROTECTION #undef CONFIG_SYS_DIRECT_FLASH_TFTP -#define CONFIG_ENV_IS_IN_FLASH /* GPIO / PFC */ #define CONFIG_SH_GPIO_PFC diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index b3c931e36c..b823ff23bf 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -561,7 +561,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (10 * CONFIG_SYS_NAND_BLOCK_SIZE) #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x300000) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 06d7d400ca..8fe34ef658 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -426,7 +426,6 @@ #define CONFIG_ENV_OFFSET 0x300000 #define CONFIG_ENV_SECT_SIZE 0x10000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x300000) #define CONFIG_ENV_SIZE 0x20000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index 83c8805df6..740facfa58 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -422,7 +422,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_ENV_OFFSET 0x300000 /* 3MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x300000) #define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE 0x20000 diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index 7b8561e9d6..59e7760b10 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -240,7 +240,6 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x300000) #define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE 0x20000 diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 860ad8f693..782669ad2c 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -456,7 +456,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_ENV_OFFSET 0x300000 /* 3MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x300000) #define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE 0x20000 diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index b5fa41e33d..929ae3286a 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -270,7 +270,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_CS2_FTIM3 CONFIG_SYS_NAND_FTIM3 #ifndef CONFIG_QSPI_BOOT -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x300000) #define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index a353cf4f68..0be4c4fa0b 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -248,7 +248,6 @@ unsigned long get_board_sys_clk(void); #define CONFIG_SYS_CS2_FTIM2 CONFIG_SYS_NAND_FTIM2 #define CONFIG_SYS_CS2_FTIM3 CONFIG_SYS_NAND_FTIM3 -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x300000) #define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/malta.h b/include/configs/malta.h index 1f977cb71a..8eb6d7a269 100644 --- a/include/configs/malta.h +++ b/include/configs/malta.h @@ -82,7 +82,6 @@ /* * Environment */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #define CONFIG_ENV_ADDR \ diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index 8a672812d0..a4c103503f 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -313,7 +313,6 @@ #define CONFIG_ENV_SIZE (SZ_128K) /* Envs are stored in NOR flash */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE (SZ_128K) #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x40000) diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 734bd50dda..609da9e9ba 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -99,7 +99,6 @@ # define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SIZE) # else /* FLASH && !RAMENV */ -# define CONFIG_ENV_IS_IN_FLASH 1 /* 128K(one sector) for env */ # define CONFIG_ENV_SECT_SIZE 0x20000 # define CONFIG_ENV_ADDR \ diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h index b865d9f916..cd5971d30c 100644 --- a/include/configs/mpc8308_p1m.h +++ b/include/configs/mpc8308_p1m.h @@ -361,7 +361,6 @@ /* * Environment */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + \ CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h index df8ffe29d0..5b37277cce 100644 --- a/include/configs/mpr2.h +++ b/include/configs/mpr2.h @@ -51,7 +51,6 @@ #define CONFIG_SYS_MAX_FLASH_SECT 256 #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE } -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h index 2855c00723..850a8cc222 100644 --- a/include/configs/ms7720se.h +++ b/include/configs/ms7720se.h @@ -65,7 +65,6 @@ #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE } -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE (64 * 1024) #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h index de6e58a71e..f456bf6293 100644 --- a/include/configs/ms7722se.h +++ b/include/configs/ms7722se.h @@ -85,7 +85,6 @@ #undef CONFIG_SYS_DIRECT_FLASH_TFTP -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_OVERWRITE 1 #define CONFIG_ENV_SECT_SIZE (8 * 1024) #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h index 394ce6cd38..8ea431efdc 100644 --- a/include/configs/ms7750se.h +++ b/include/configs/ms7750se.h @@ -63,7 +63,6 @@ #undef CONFIG_SYS_FLASH_QUIET_TEST #define CONFIG_SYS_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h index d84801b7c6..80b6e16818 100644 --- a/include/configs/mx31ads.h +++ b/include/configs/mx31ads.h @@ -132,7 +132,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE /* Monitor at beginning of flash */ #define CONFIG_SYS_MONITOR_LEN (256 * 1024) /* Reserve 256KiB */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index 2b7b871a86..9ae3d18137 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -169,8 +169,6 @@ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + \ CONFIG_SYS_MONITOR_LEN) -#define CONFIG_ENV_IS_IN_FLASH - #if defined(CONFIG_FSL_ENV_IN_NAND) #define CONFIG_ENV_OFFSET (1024 * 1024) #endif diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 94a705e0fe..77ac08aaf5 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -154,7 +154,6 @@ * Flash & Environment */ #ifdef CONFIG_USE_NAND -#undef CONFIG_ENV_IS_IN_FLASH #define CONFIG_NAND_DAVINCI #define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ #define CONFIG_ENV_SIZE (128 << 9) @@ -198,7 +197,6 @@ #endif #ifdef CONFIG_SYS_USE_NOR -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_PROTECTION @@ -214,7 +212,6 @@ #endif #ifdef CONFIG_USE_SPIFLASH -#undef CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE (64 << 10) #define CONFIG_ENV_OFFSET (256 << 10) @@ -309,7 +306,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_FLASH #undef CONFIG_ENV_IS_IN_SPI_FLASH #endif diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 193e287845..a22e9fae9a 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -794,7 +794,6 @@ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index 3d4d80c577..d5f5769463 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -368,7 +368,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_ENV_SIZE 0x2000 #endif #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index b6ec563cee..bae5736801 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -269,7 +269,6 @@ #elif defined (CONFIG_SYS_USE_FLASH) -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_OFFSET 0x40000 #define CONFIG_ENV_SECT_SIZE 0x10000 #define CONFIG_ENV_SIZE 0x10000 diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index eeb3f27cfe..9ea444009a 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -299,7 +299,6 @@ #elif defined(CONFIG_SYS_USE_FLASH) /* CFG_USE_FLASH */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_OFFSET 0x40000 #define CONFIG_ENV_SECT_SIZE 0x10000 #define CONFIG_ENV_SIZE 0x10000 diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h index abdc93c7d2..89d1ad91e0 100644 --- a/include/configs/qemu-mips.h +++ b/include/configs/qemu-mips.h @@ -111,8 +111,6 @@ #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE -#define CONFIG_ENV_IS_IN_FLASH - /* Address and size of Primary Environment Sector */ #define CONFIG_ENV_SIZE 0x8000 #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + (4 << 20) - CONFIG_ENV_SIZE) diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h index f1e096fddd..a78112d5bc 100644 --- a/include/configs/qemu-mips64.h +++ b/include/configs/qemu-mips64.h @@ -111,8 +111,6 @@ #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE -#define CONFIG_ENV_IS_IN_FLASH - /* Address and size of Primary Environment Sector */ #define CONFIG_ENV_SIZE 0x8000 #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + (4 << 20) - CONFIG_ENV_SIZE) diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h index 6212dbae21..5f74b2a0e0 100644 --- a/include/configs/r0p7734.h +++ b/include/configs/r0p7734.h @@ -112,7 +112,6 @@ #define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024) /* ENV setting */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_OVERWRITE 1 #define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h index 744d567805..64fd4b97a0 100644 --- a/include/configs/r2dplus.h +++ b/include/configs/r2dplus.h @@ -53,7 +53,6 @@ #define CONFIG_SYS_MAX_FLASH_SECT 256 #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE } -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE 0x40000 #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h index bb79a9ffea..c5f577a3bf 100644 --- a/include/configs/r7780mp.h +++ b/include/configs/r7780mp.h @@ -77,7 +77,6 @@ /* print 'E' for empty sector on flinfo */ #define CONFIG_SYS_FLASH_EMPTY_INFO -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE (256 * 1024) #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h index 8dc839df96..8f30aefc41 100644 --- a/include/configs/rsk7203.h +++ b/include/configs/rsk7203.h @@ -63,7 +63,6 @@ #define CONFIG_SYS_MAX_FLASH_SECT 64 #define CONFIG_SYS_MAX_FLASH_BANKS 1 -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE (64 * 1024) #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) diff --git a/include/configs/rsk7264.h b/include/configs/rsk7264.h index cc709097c0..14e55c579d 100644 --- a/include/configs/rsk7264.h +++ b/include/configs/rsk7264.h @@ -48,7 +48,6 @@ #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 512 -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_OFFSET (128 * 1024) #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET) #define CONFIG_ENV_SECT_SIZE (128 * 1024) diff --git a/include/configs/rsk7269.h b/include/configs/rsk7269.h index 12812f9a34..60844ab738 100644 --- a/include/configs/rsk7269.h +++ b/include/configs/rsk7269.h @@ -47,7 +47,6 @@ #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 512 -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_OFFSET (128 * 1024) #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET) #define CONFIG_ENV_SECT_SIZE (64 * 1024) diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index 1d07593e95..c0faac3b79 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -370,7 +370,6 @@ * Environment */ #ifndef CONFIG_SYS_RAMBOOT - #define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x40000) #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h index e872e7f810..cf9809df49 100644 --- a/include/configs/sbc8548.h +++ b/include/configs/sbc8548.h @@ -485,7 +485,6 @@ /* * Environment */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_SIZE 0x2000 #if CONFIG_SYS_TEXT_BASE == 0xfff00000 /* Boot from 64MB SODIMM */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x80000) diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index 33b6d1fb93..c5f9fcb918 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -443,7 +443,6 @@ /* * Environment */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128k(one sector) for env */ #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h index 2186f21f7a..50a0e3e7d1 100644 --- a/include/configs/sh7763rdp.h +++ b/include/configs/sh7763rdp.h @@ -74,7 +74,6 @@ /* Use hardware flash sectors protection instead of U-Boot software protection */ #undef CONFIG_SYS_FLASH_PROTECTION #undef CONFIG_SYS_DIRECT_FLASH_TFTP -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + (1 * CONFIG_ENV_SECT_SIZE)) diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h index ab30428063..59fcad0309 100644 --- a/include/configs/sh7785lcr.h +++ b/include/configs/sh7785lcr.h @@ -132,7 +132,6 @@ #define CONFIG_PCI_SYS_SIZE CONFIG_SYS_SDRAM_SIZE /* ENV setting */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_OVERWRITE 1 #define CONFIG_ENV_SECT_SIZE (256 * 1024) #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) diff --git a/include/configs/shmin.h b/include/configs/shmin.h index 995f76a1ea..c9718f9b36 100644 --- a/include/configs/shmin.h +++ b/include/configs/shmin.h @@ -72,7 +72,6 @@ #define CONFIG_SYS_ATMEL_SECT {1, 2, 1, 7} #define CONFIG_SYS_ATMEL_SECTSZ {0x4000, 0x2000, 0x8000, 0x10000} -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE (64 * 1024) #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE diff --git a/include/configs/socrates.h b/include/configs/socrates.h index bfd4e5fe3f..3864dfb09f 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -256,7 +256,6 @@ /* * Environment */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x4000 diff --git a/include/configs/spear3xx_evb.h b/include/configs/spear3xx_evb.h index 98a74fa6e1..4dbf919cfa 100644 --- a/include/configs/spear3xx_evb.h +++ b/include/configs/spear3xx_evb.h @@ -24,11 +24,6 @@ #define CONFIG_SPEAR_USBTTY #endif -#if defined(CONFIG_NAND) -#else -#define CONFIG_ENV_IS_IN_FLASH -#endif - #include <configs/spear-common.h> /* Ethernet driver configuration */ diff --git a/include/configs/spear6xx_evb.h b/include/configs/spear6xx_evb.h index de08a72704..4bd989e2f0 100644 --- a/include/configs/spear6xx_evb.h +++ b/include/configs/spear6xx_evb.h @@ -16,11 +16,6 @@ #define CONFIG_SPEAR_USBTTY #endif -#if defined(CONFIG_NAND) -#else -#define CONFIG_ENV_IS_IN_FLASH -#endif - #include <configs/spear-common.h> /* Serial Configuration (PL011) */ diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h index 8609f2a0a9..c47be514d8 100644 --- a/include/configs/stm32f429-discovery.h +++ b/include/configs/stm32f429-discovery.h @@ -35,7 +35,6 @@ #define CONFIG_SYS_MAX_FLASH_SECT 12 #define CONFIG_SYS_MAX_FLASH_BANKS 2 -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_OFFSET (256 << 10) #define CONFIG_ENV_SECT_SIZE (128 << 10) #define CONFIG_ENV_SIZE (8 << 10) diff --git a/include/configs/strider.h b/include/configs/strider.h index be6bd7352a..a702ec71da 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -529,7 +529,6 @@ void fpga_control_clear(unsigned int bus, int pin); * Environment */ #if 1 -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + \ CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */ diff --git a/include/configs/vct.h b/include/configs/vct.h index 19192ddcc5..5a62e3fb82 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -137,7 +137,6 @@ * FLASH and environment organization */ #if defined(CONFIG_VCT_NOR) -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_FLASH_NOT_MEM_MAPPED /* diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h index f0e9a2e58d..32ed2f95c9 100644 --- a/include/configs/ve8313.h +++ b/include/configs/ve8313.h @@ -290,7 +290,6 @@ /* * Environment */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR \ (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 11cb53587c..3b1233f615 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -284,6 +284,5 @@ #define CONFIG_SYS_FLASH_EMPTY_INFO /* flinfo indicates empty blocks */ #define FLASH_MAX_SECTOR_SIZE 0x00040000 #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE -#define CONFIG_ENV_IS_IN_FLASH 1 #endif /* __VEXPRESS_AEMV8A_H */ diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index 0880b627ae..8f9ba91641 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -262,7 +262,6 @@ #define CONFIG_ENV_OVERWRITE 1 /* Store environment at top of flash */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_OFFSET (PHYS_FLASH_SIZE - \ (2 * CONFIG_ENV_SECT_SIZE)) #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE1 + \ diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h index f2a15f37fe..13ebafeac8 100644 --- a/include/configs/vme8349.h +++ b/include/configs/vme8349.h @@ -313,7 +313,6 @@ * Environment */ #ifndef CONFIG_SYS_RAMBOOT - #define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0xc0000) #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h index 68a9db5b20..515f360400 100644 --- a/include/configs/woodburn_common.h +++ b/include/configs/woodburn_common.h @@ -167,8 +167,6 @@ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + \ CONFIG_SYS_MONITOR_LEN) -#define CONFIG_ENV_IS_IN_FLASH - /* * CFI FLASH driver setup */ diff --git a/include/configs/x600.h b/include/configs/x600.h index 63889f9b27..007670740e 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -33,8 +33,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_MONITOR_LEN 0x60000 -#define CONFIG_ENV_IS_IN_FLASH - /* Serial Configuration (PL011) */ #define CONFIG_SYS_SERIAL0 0xD0000000 #define CONFIG_SYS_SERIAL1 0xD0080000 diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 07f26544fd..9b6a5f8ce1 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -517,7 +517,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Environment Configuration */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128k (one sector) for env */ #define CONFIG_ENV_SIZE 0x8000 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h index 2645006b37..715acc4fbc 100644 --- a/include/configs/xpedite520x.h +++ b/include/configs/xpedite520x.h @@ -322,7 +322,6 @@ /* * Environment Configuration */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128k (one sector) for env */ #define CONFIG_ENV_SIZE 0x8000 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - (256 * 1024)) diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index abbaeaad10..7d05a5aa82 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -371,7 +371,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Environment Configuration */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128k (one sector) for env */ #define CONFIG_ENV_SIZE 0x8000 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - (256 * 1024)) diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index 254fc12cf6..68795d8faa 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -370,7 +370,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Environment Configuration */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128k (one sector) for env */ #define CONFIG_ENV_SIZE 0x8000 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - (256 * 1024)) diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h index 7d7d9bb983..206ec344d9 100644 --- a/include/configs/xtfpga.h +++ b/include/configs/xtfpga.h @@ -250,7 +250,6 @@ * Put environment in top block (64kB) * Another option would be to put env. in 2nd param block offs 8KB, size 8KB */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_OFFSET (CONFIG_SYS_FLASH_SIZE - CONFIG_SYS_FLASH_SECT_SZ) #define CONFIG_ENV_SIZE CONFIG_SYS_FLASH_SECT_SZ diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h index 9b3769b5f1..e730824146 100644 --- a/include/configs/zipitz2.h +++ b/include/configs/zipitz2.h @@ -22,7 +22,6 @@ * Environment settings */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR 0x40000 #define CONFIG_ENV_SIZE 0x10000 diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h index 96cc1b7252..21a78c4bfa 100644 --- a/include/configs/zmx25.h +++ b/include/configs/zmx25.h @@ -102,7 +102,6 @@ #define CONFIG_SYS_MAX_FLASH_SECT 256 #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x00040000) -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_SIZE (128 * 1024) diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 807b097d34..9b527feec8 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -161,7 +161,6 @@ #ifndef CONFIG_ENV_IS_NOWHERE # ifdef CONFIG_MTD_NOR_FLASH /* Environment in NOR flash */ -# define CONFIG_ENV_IS_IN_FLASH # elif defined(CONFIG_ZYNQ_QSPI) /* Environment in Serial Flash */ # define CONFIG_ENV_IS_IN_SPI_FLASH diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index baf87996a8..2c7ea85618 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -636,7 +636,6 @@ CONFIG_ENV_IS_IN_ CONFIG_ENV_IS_IN_DATAFLASH CONFIG_ENV_IS_IN_EEPROM CONFIG_ENV_IS_IN_FAT -CONFIG_ENV_IS_IN_FLASH CONFIG_ENV_IS_IN_MRAM CONFIG_ENV_IS_IN_NVRAM CONFIG_ENV_IS_IN_ONENAND |