diff options
463 files changed, 591 insertions, 591 deletions
@@ -2104,7 +2104,7 @@ The following definitions that deal with the placement and management of environment data (variable area); in general, we support the following configurations: -- CFG_ENV_IS_IN_FLASH: +- CONFIG_ENV_IS_IN_FLASH: Define this if the environment is in flash memory. @@ -2146,7 +2146,7 @@ following configurations: - CFG_ENV_SIZE: - If you use this in combination with CFG_ENV_IS_IN_FLASH + If you use this in combination with CONFIG_ENV_IS_IN_FLASH and CFG_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. diff --git a/board/LEOX/elpt860/flash.c b/board/LEOX/elpt860/flash.c index c1b3b8513e..d77af357a3 100644 --- a/board/LEOX/elpt860/flash.c +++ b/board/LEOX/elpt860/flash.c @@ -122,7 +122,7 @@ flash_init (void) &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/MAI/AmigaOneG3SE/flash_new.c b/board/MAI/AmigaOneG3SE/flash_new.c index d46bf46465..5e15e20489 100644 --- a/board/MAI/AmigaOneG3SE/flash_new.c +++ b/board/MAI/AmigaOneG3SE/flash_new.c @@ -123,7 +123,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/RPXlite_dw/README b/board/RPXlite_dw/README index 60580c948b..14296b2ab4 100644 --- a/board/RPXlite_dw/README +++ b/board/RPXlite_dw/README @@ -21,7 +21,7 @@ make distclean make RPXlite_DW_64_config make all -2. CFG_ENV_IS_IN_FLASH/CONFIG_ENV_IS_IN_NVRAM +2. CONFIG_ENV_IS_IN_FLASH/CONFIG_ENV_IS_IN_NVRAM The default environment parameter is stored in FLASH because it is a common choice for environment parameter.So I make NVRAM as backup parameter storeage.The reason why I diff --git a/board/RRvision/flash.c b/board/RRvision/flash.c index d8e07e6450..287bbac8c6 100644 --- a/board/RRvision/flash.c +++ b/board/RRvision/flash.c @@ -77,7 +77,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/a3000/flash.c b/board/a3000/flash.c index 13a5ca5b06..98a027e783 100644 --- a/board/a3000/flash.c +++ b/board/a3000/flash.c @@ -25,7 +25,7 @@ #include <common.h> #include <mpc824x.h> -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) # ifndef CFG_ENV_ADDR # define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # endif @@ -108,7 +108,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ DEBUGF("protect environtment %x @ %x\n", CFG_ENV_ADDR, CFG_ENV_SECT_SIZE); flash_protect(FLAG_PROTECT_SET, diff --git a/board/amcc/bamboo/flash.c b/board/amcc/bamboo/flash.c index 8a2e832cf4..f23fc249c4 100644 --- a/board/amcc/bamboo/flash.c +++ b/board/amcc/bamboo/flash.c @@ -153,11 +153,11 @@ unsigned long flash_init(void) (void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, &flash_info[i]); -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, &flash_info[i]); -#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR_REDUND) +#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR_REDUND) (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND, CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1, &flash_info[i]); diff --git a/board/amcc/bubinga/flash.c b/board/amcc/bubinga/flash.c index e4832ebf36..0295b8c708 100644 --- a/board/amcc/bubinga/flash.c +++ b/board/amcc/bubinga/flash.c @@ -84,7 +84,7 @@ unsigned long flash_init(void) CFG_MONITOR_BASE, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, &flash_info[0]); -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, &flash_info[0]); diff --git a/board/amcc/ebony/flash.c b/board/amcc/ebony/flash.c index e8fbbc493e..b49e05f6da 100644 --- a/board/amcc/ebony/flash.c +++ b/board/amcc/ebony/flash.c @@ -124,7 +124,7 @@ unsigned long flash_init(void) (void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, &flash_info[2]); -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, &flash_info[2]); diff --git a/board/amcc/kilauea/kilauea.c b/board/amcc/kilauea/kilauea.c index 7b1025526f..f407e195be 100644 --- a/board/amcc/kilauea/kilauea.c +++ b/board/amcc/kilauea/kilauea.c @@ -219,7 +219,7 @@ int board_early_init_f (void) int misc_init_r(void) { -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* Monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, -CFG_MONITOR_LEN, diff --git a/board/amcc/luan/flash.c b/board/amcc/luan/flash.c index d3c3c0d058..3b2f9b746f 100644 --- a/board/amcc/luan/flash.c +++ b/board/amcc/luan/flash.c @@ -95,7 +95,7 @@ unsigned long flash_init(void) (void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, &flash_info[2]); -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, &flash_info[2]); diff --git a/board/amcc/makalu/makalu.c b/board/amcc/makalu/makalu.c index 2b4d3d4b77..fc79907baa 100644 --- a/board/amcc/makalu/makalu.c +++ b/board/amcc/makalu/makalu.c @@ -210,7 +210,7 @@ int board_early_init_f (void) int misc_init_r(void) { -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* Monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, -CFG_MONITOR_LEN, diff --git a/board/amcc/ocotea/flash.c b/board/amcc/ocotea/flash.c index 5614e20780..88a76f7da6 100644 --- a/board/amcc/ocotea/flash.c +++ b/board/amcc/ocotea/flash.c @@ -134,7 +134,7 @@ unsigned long flash_init(void) (void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, &flash_info[i]); -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, &flash_info[i]); diff --git a/board/amcc/sequoia/sequoia.c b/board/amcc/sequoia/sequoia.c index 176d5cf0dc..c682c8e3e8 100644 --- a/board/amcc/sequoia/sequoia.c +++ b/board/amcc/sequoia/sequoia.c @@ -157,7 +157,7 @@ int misc_init_r(void) */ flash_get_size(gd->bd->bi_flashstart, 0); -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* Monitor protection ON by default */ (void)flash_protect(FLAG_PROTECT_SET, -CFG_MONITOR_LEN, diff --git a/board/amcc/taihu/flash.c b/board/amcc/taihu/flash.c index 290259e73f..8ffcc39346 100644 --- a/board/amcc/taihu/flash.c +++ b/board/amcc/taihu/flash.c @@ -87,7 +87,7 @@ unsigned long flash_init(void) CFG_MONITOR_BASE, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, &flash_info[0]); -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, &flash_info[0]); diff --git a/board/amcc/walnut/flash.c b/board/amcc/walnut/flash.c index 056f9b9362..d47d263e9e 100644 --- a/board/amcc/walnut/flash.c +++ b/board/amcc/walnut/flash.c @@ -82,7 +82,7 @@ unsigned long flash_init(void) CFG_MONITOR_BASE, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, &flash_info[0]); -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, &flash_info[0]); diff --git a/board/amcc/yucca/flash.c b/board/amcc/yucca/flash.c index 15b8a462ba..9256938dde 100644 --- a/board/amcc/yucca/flash.c +++ b/board/amcc/yucca/flash.c @@ -1037,7 +1037,7 @@ unsigned long flash_init(void) (void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, &flash_info[i]); -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, &flash_info[i]); diff --git a/board/atc/flash.c b/board/atc/flash.c index 2ab60e866b..9e4c6c512e 100644 --- a/board/atc/flash.c +++ b/board/atc/flash.c @@ -95,7 +95,7 @@ unsigned long flash_init (void) flash_get_info(CFG_MONITOR_BASE)); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/barco/flash.c b/board/barco/flash.c index 9502560d67..c6a01cacaa 100644 --- a/board/barco/flash.c +++ b/board/barco/flash.c @@ -58,7 +58,7 @@ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) # ifndef CFG_ENV_ADDR # define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # endif @@ -224,7 +224,7 @@ unsigned long flash_init(void) &flash_info[0]); #endif -#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) +#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, CFG_ENV_ADDR + CFG_ENV_SIZE - 1, diff --git a/board/bmw/flash.c b/board/bmw/flash.c index 6d3cfab130..4c7971aee5 100644 --- a/board/bmw/flash.c +++ b/board/bmw/flash.c @@ -31,7 +31,7 @@ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) # ifndef CFG_ENV_ADDR # define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # endif @@ -224,7 +224,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) +#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) flash_protect (FLAG_PROTECT_SET, CFG_ENV_ADDR, CFG_ENV_ADDR + CFG_ENV_SIZE - 1, diff --git a/board/c2mon/flash.c b/board/c2mon/flash.c index b2be21c684..2a5e050abb 100644 --- a/board/c2mon/flash.c +++ b/board/c2mon/flash.c @@ -95,7 +95,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, @@ -122,7 +122,7 @@ unsigned long flash_init (void) &flash_info[1]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/cmc_pu2/flash.c b/board/cmc_pu2/flash.c index 9983c7b78c..0419d76200 100644 --- a/board/cmc_pu2/flash.c +++ b/board/cmc_pu2/flash.c @@ -71,7 +71,7 @@ unsigned long flash_init (void) flash_get_info(CFG_MONITOR_BASE)); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/cmi/flash.c b/board/cmi/flash.c index f57d8ecfe9..aec6a8ef92 100644 --- a/board/cmi/flash.c +++ b/board/cmi/flash.c @@ -36,7 +36,7 @@ #include <common.h> #include <mpc5xx.h> -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) # ifndef CFG_ENV_ADDR # define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # endif @@ -110,7 +110,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/cogent/flash.c b/board/cogent/flash.c index 969520d277..fc3e5ff88e 100644 --- a/board/cogent/flash.c +++ b/board/cogent/flash.c @@ -26,7 +26,7 @@ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) # ifndef CFG_ENV_ADDR # define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # endif @@ -327,7 +327,7 @@ flash_init(void) &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/cpc45/flash.c b/board/cpc45/flash.c index 9a398686be..db9a637b56 100644 --- a/board/cpc45/flash.c +++ b/board/cpc45/flash.c @@ -25,7 +25,7 @@ #include <mpc824x.h> #include <asm/processor.h> -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) # ifndef CFG_ENV_ADDR # define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # endif @@ -174,7 +174,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) +#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) #if CFG_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE flash_protect (FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/cpu86/flash.c b/board/cpu86/flash.c index b1048a36b6..e6a14b0d8f 100644 --- a/board/cpu86/flash.c +++ b/board/cpu86/flash.c @@ -230,7 +230,7 @@ unsigned long flash_init (void) #endif #endif -#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) +#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) # ifndef CFG_ENV_SIZE # define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # endif diff --git a/board/cpu87/flash.c b/board/cpu87/flash.c index 925a0e6722..b96a30c5a3 100644 --- a/board/cpu87/flash.c +++ b/board/cpu87/flash.c @@ -236,7 +236,7 @@ unsigned long flash_init (void) #endif #endif -#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) +#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) # ifndef CFG_ENV_SIZE # define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # endif diff --git a/board/cu824/flash.c b/board/cu824/flash.c index ec1a58633f..5e55284a7d 100644 --- a/board/cu824/flash.c +++ b/board/cu824/flash.c @@ -25,7 +25,7 @@ #include <mpc824x.h> #include <asm/processor.h> -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) # ifndef CFG_ENV_ADDR # define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # endif @@ -135,7 +135,7 @@ unsigned long flash_init(void) #endif #endif -#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) +#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) #if CFG_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/emk/common/flash.c b/board/emk/common/flash.c index d6161bf358..0e8d337f72 100644 --- a/board/emk/common/flash.c +++ b/board/emk/common/flash.c @@ -113,7 +113,7 @@ unsigned long flash_init (void) flash_get_info(CFG_MONITOR_BASE)); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/ep8260/flash.c b/board/ep8260/flash.c index 167f316c87..8d996407cd 100644 --- a/board/ep8260/flash.c +++ b/board/ep8260/flash.c @@ -157,7 +157,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) +#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) # ifndef CFG_ENV_SIZE # define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # endif diff --git a/board/esd/pf5200/flash.c b/board/esd/pf5200/flash.c index 53afbc0b92..55419eeb91 100644 --- a/board/esd/pf5200/flash.c +++ b/board/esd/pf5200/flash.c @@ -76,7 +76,7 @@ unsigned long flash_init(void) flash_get_info(CFG_MONITOR_BASE)); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, CFG_ENV_ADDR + CFG_ENV_SIZE - 1, diff --git a/board/esd/pmc440/pmc440.c b/board/esd/pmc440/pmc440.c index 0cdaee4452..7c8fa74c6f 100644 --- a/board/esd/pmc440/pmc440.c +++ b/board/esd/pmc440/pmc440.c @@ -239,7 +239,7 @@ int misc_init_r(void) */ flash_get_size(gd->bd->bi_flashstart, 0); -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* Monitor protection ON by default */ (void)flash_protect(FLAG_PROTECT_SET, -CFG_MONITOR_LEN, diff --git a/board/evb64260/flash.c b/board/evb64260/flash.c index 6ab23dce2f..1691e108c2 100644 --- a/board/evb64260/flash.c +++ b/board/evb64260/flash.c @@ -119,7 +119,7 @@ flash_init (void) flash_get_info(CFG_MONITOR_BASE)); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/exbitgen/flash.c b/board/exbitgen/flash.c index 401eead5d9..4d83fd5efd 100644 --- a/board/exbitgen/flash.c +++ b/board/exbitgen/flash.c @@ -126,7 +126,7 @@ unsigned long flash_init (void) #endif #endif -#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) +#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, CFG_ENV_ADDR + CFG_ENV_SIZE - 1, diff --git a/board/fads/fads.h b/board/fads/fads.h index 0a8b98352a..63b1e625e5 100644 --- a/board/fads/fads.h +++ b/board/fads/fads.h @@ -226,7 +226,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SECT_SIZE 0x40000 /* see README - env sector total size */ #define CFG_ENV_OFFSET CFG_ENV_SECT_SIZE #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment */ diff --git a/board/fads/flash.c b/board/fads/flash.c index 7cda3a412f..742a88979b 100644 --- a/board/fads/flash.c +++ b/board/fads/flash.c @@ -26,7 +26,7 @@ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) # ifndef CFG_ENV_ADDR # define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # endif @@ -124,7 +124,7 @@ unsigned long flash_init (void) &flash_info[i]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ if (CFG_ENV_ADDR >= flash_info[i].start[0]) flash_protect (FLAG_PROTECT_SET, diff --git a/board/flagadm/flash.c b/board/flagadm/flash.c index fd0082c135..3303707817 100644 --- a/board/flagadm/flash.c +++ b/board/flagadm/flash.c @@ -81,7 +81,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_OFFSET, diff --git a/board/freescale/mpc8260ads/flash.c b/board/freescale/mpc8260ads/flash.c index 59997aac4f..5f80f26e0c 100644 --- a/board/freescale/mpc8260ads/flash.c +++ b/board/freescale/mpc8260ads/flash.c @@ -155,7 +155,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/freescale/mpc8266ads/flash.c b/board/freescale/mpc8266ads/flash.c index 9512c72a0b..aa533e4b90 100644 --- a/board/freescale/mpc8266ads/flash.c +++ b/board/freescale/mpc8266ads/flash.c @@ -31,7 +31,7 @@ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) # ifndef CFG_ENV_ADDR # define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # endif @@ -105,7 +105,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/funkwerk/vovpn-gw/flash.c b/board/funkwerk/vovpn-gw/flash.c index 7dd0d3f234..935adfa1a0 100644 --- a/board/funkwerk/vovpn-gw/flash.c +++ b/board/funkwerk/vovpn-gw/flash.c @@ -151,7 +151,7 @@ flash_init(void) CFG_MONITOR_FLASH+CFG_MONITOR_LEN-1, &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1, diff --git a/board/gen860t/flash.c b/board/gen860t/flash.c index 13faaf39f3..c558014e7d 100644 --- a/board/gen860t/flash.c +++ b/board/gen860t/flash.c @@ -25,7 +25,7 @@ #include <common.h> #include <mpc8xx.h> -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) # ifndef CFG_ENV_ADDR # define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # endif @@ -161,7 +161,7 @@ flash_init (void) &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* * Environment protection ON by default */ diff --git a/board/gw8260/flash.c b/board/gw8260/flash.c index 015ea7dda9..e4b596b0ca 100644 --- a/board/gw8260/flash.c +++ b/board/gw8260/flash.c @@ -100,7 +100,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) +#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) # ifndef CFG_ENV_SIZE # define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # endif diff --git a/board/hidden_dragon/flash.c b/board/hidden_dragon/flash.c index a2ed3bd1f9..5fb9578bb0 100644 --- a/board/hidden_dragon/flash.c +++ b/board/hidden_dragon/flash.c @@ -35,7 +35,7 @@ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) # ifndef CFG_ENV_ADDR # define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # endif @@ -212,7 +212,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) +#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) flash_protect (FLAG_PROTECT_SET, CFG_ENV_ADDR, CFG_ENV_ADDR + CFG_ENV_SIZE - 1, diff --git a/board/icecube/flash.c b/board/icecube/flash.c index 2d4026a9de..e6cf92e3df 100644 --- a/board/icecube/flash.c +++ b/board/icecube/flash.c @@ -88,7 +88,7 @@ unsigned long flash_init (void) flash_get_info(CFG_MONITOR_BASE)); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/icu862/flash.c b/board/icu862/flash.c index ca5bcf31af..625d1a8647 100644 --- a/board/icu862/flash.c +++ b/board/icu862/flash.c @@ -26,7 +26,7 @@ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) # ifndef CFG_ENV_ADDR # define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # endif @@ -108,7 +108,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/ids8247/flash.c b/board/ids8247/flash.c index 4eba4b9687..522fafe435 100644 --- a/board/ids8247/flash.c +++ b/board/ids8247/flash.c @@ -33,7 +33,7 @@ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) # ifndef CFG_ENV_ADDR # define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # endif @@ -113,7 +113,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect (FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/incaip/flash.c b/board/incaip/flash.c index 520514dea3..b510e900cd 100644 --- a/board/incaip/flash.c +++ b/board/incaip/flash.c @@ -104,7 +104,7 @@ unsigned long flash_init (void) flash_get_info(CFG_MONITOR_BASE)); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/innokom/flash.c b/board/innokom/flash.c index 8fc6e5bd91..2d773b1b04 100644 --- a/board/innokom/flash.c +++ b/board/innokom/flash.c @@ -114,7 +114,7 @@ ulong flash_init(void) CFG_FLASH_BASE + (256*1024) - 1, &flash_info[0]); -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, CFG_ENV_ADDR + CFG_ENV_SIZE - 1, diff --git a/board/integratorcp/flash.c b/board/integratorcp/flash.c index 59961cdab6..2a4256abdf 100644 --- a/board/integratorcp/flash.c +++ b/board/integratorcp/flash.c @@ -125,7 +125,7 @@ unsigned long flash_init (void) CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/ip860/flash.c b/board/ip860/flash.c index 2cf23b3e8c..6bf4d8da6d 100644 --- a/board/ip860/flash.c +++ b/board/ip860/flash.c @@ -26,7 +26,7 @@ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) # ifndef CFG_ENV_ADDR # define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # endif @@ -94,7 +94,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/iphase4539/flash.c b/board/iphase4539/flash.c index 4eca46720c..f8ab51a7e6 100644 --- a/board/iphase4539/flash.c +++ b/board/iphase4539/flash.c @@ -75,7 +75,7 @@ unsigned long flash_init (void) flash_info + bank); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/ivm/flash.c b/board/ivm/flash.c index 140ba2d530..f911fdb5bd 100644 --- a/board/ivm/flash.c +++ b/board/ivm/flash.c @@ -26,7 +26,7 @@ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) # ifndef CFG_ENV_ADDR # define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # endif @@ -91,7 +91,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/kup/common/flash.c b/board/kup/common/flash.c index 903c88f06c..50bf5439f7 100644 --- a/board/kup/common/flash.c +++ b/board/kup/common/flash.c @@ -78,7 +78,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/lantec/flash.c b/board/lantec/flash.c index 0faa82cba4..ddf680a316 100644 --- a/board/lantec/flash.c +++ b/board/lantec/flash.c @@ -29,7 +29,7 @@ #include <common.h> #include <mpc8xx.h> -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) # ifndef CFG_ENV_ADDR # define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # endif @@ -138,7 +138,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, @@ -170,7 +170,7 @@ unsigned long flash_init (void) &flash_info[1]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/lwmon/flash.c b/board/lwmon/flash.c index b894887c93..7e4acc2481 100644 --- a/board/lwmon/flash.c +++ b/board/lwmon/flash.c @@ -26,7 +26,7 @@ #include <common.h> #include <mpc8xx.h> -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) # ifndef CFG_ENV_ADDR # define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # endif @@ -130,7 +130,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, @@ -163,7 +163,7 @@ unsigned long flash_init (void) &flash_info[1]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/mpc8540eval/flash.c b/board/mpc8540eval/flash.c index 79eb04ca87..b129602a6e 100644 --- a/board/mpc8540eval/flash.c +++ b/board/mpc8540eval/flash.c @@ -35,7 +35,7 @@ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) # ifndef CFG_ENV_ADDR # define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # endif @@ -103,7 +103,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/mpl/common/flash.c b/board/mpl/common/flash.c index eb2702b6df..a2e0244d89 100644 --- a/board/mpl/common/flash.c +++ b/board/mpl/common/flash.c @@ -256,7 +256,7 @@ unsigned long flash_init (void) p++; } #else /* #if !defined(CONFIG_PATI) */ -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/musenki/flash.c b/board/musenki/flash.c index cd33d8ed33..df7bbc5488 100644 --- a/board/musenki/flash.c +++ b/board/musenki/flash.c @@ -24,7 +24,7 @@ #include <common.h> #include <mpc824x.h> -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) # ifndef CFG_ENV_ADDR # define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # endif @@ -153,7 +153,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ DEBUGF("protect environtment %x @ %x\n", CFG_ENV_ADDR, CFG_ENV_SECT_SIZE); flash_protect(FLAG_PROTECT_SET, @@ -174,7 +174,7 @@ unsigned long flash_init (void) &flash_info[1]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/nc650/flash.c b/board/nc650/flash.c index 8d7c172657..a7fc084afa 100644 --- a/board/nc650/flash.c +++ b/board/nc650/flash.c @@ -41,7 +41,7 @@ DECLARE_GLOBAL_DATA_PTR; flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) # ifndef CFG_ENV_ADDR # define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # endif @@ -171,7 +171,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect (FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/netstal/hcu5/hcu5.c b/board/netstal/hcu5/hcu5.c index 4ecdb25da8..41fa2048dd 100644 --- a/board/netstal/hcu5/hcu5.c +++ b/board/netstal/hcu5/hcu5.c @@ -240,7 +240,7 @@ int misc_init_r(void) unsigned long usb2phy0cr, usb2h0cr = 0; unsigned long sdr0_pfc1; -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* Monitor protection ON by default */ (void)flash_protect(FLAG_PROTECT_SET, -CFG_MONITOR_LEN, diff --git a/board/o2dnt/flash.c b/board/o2dnt/flash.c index 349086ffb5..2aa0489da1 100644 --- a/board/o2dnt/flash.c +++ b/board/o2dnt/flash.c @@ -103,7 +103,7 @@ unsigned long flash_init (void) flash_get_info(CFG_MONITOR_BASE)); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/oxc/flash.c b/board/oxc/flash.c index 4559b8033b..44e2300e94 100644 --- a/board/oxc/flash.c +++ b/board/oxc/flash.c @@ -73,7 +73,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) +#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) # ifndef CFG_ENV_SIZE # define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # endif diff --git a/board/pcippc2/flash.c b/board/pcippc2/flash.c index 8c01415fae..b1fec97dd3 100644 --- a/board/pcippc2/flash.c +++ b/board/pcippc2/flash.c @@ -74,7 +74,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/pm520/flash.c b/board/pm520/flash.c index 4301b8c234..c899ad3404 100644 --- a/board/pm520/flash.c +++ b/board/pm520/flash.c @@ -119,7 +119,7 @@ unsigned long flash_init (void) #endif #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH flash_protect ( FLAG_PROTECT_SET, CFG_ENV_ADDR, CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0] ); diff --git a/board/pm826/flash.c b/board/pm826/flash.c index 92a433a587..e8e02893d7 100644 --- a/board/pm826/flash.c +++ b/board/pm826/flash.c @@ -144,7 +144,7 @@ unsigned long flash_init (void) # endif #endif /* CONFIG_BOOT_ROM */ -#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) +#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) # ifndef CFG_ENV_SIZE # define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # endif diff --git a/board/pm828/flash.c b/board/pm828/flash.c index 0e7bfe8b0e..0620ea3106 100644 --- a/board/pm828/flash.c +++ b/board/pm828/flash.c @@ -144,7 +144,7 @@ unsigned long flash_init (void) # endif #endif /* CONFIG_BOOT_ROM */ -#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) +#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) # ifndef CFG_ENV_SIZE # define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # endif diff --git a/board/ppmc7xx/flash.c b/board/ppmc7xx/flash.c index 4d13612aff..dd91da7d72 100644 --- a/board/ppmc7xx/flash.c +++ b/board/ppmc7xx/flash.c @@ -197,7 +197,7 @@ unsigned long flash_init (void) CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]); #endif -#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) +#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) # ifndef CFG_ENV_SIZE # define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # endif diff --git a/board/purple/flash.c b/board/purple/flash.c index 1baae35eb8..ee8a60e1be 100644 --- a/board/purple/flash.c +++ b/board/purple/flash.c @@ -237,7 +237,7 @@ unsigned long flash_init (void) flash_get_info(CFG_MONITOR_BASE)); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/r360mpi/flash.c b/board/r360mpi/flash.c index 9b42960c7d..398e7342a7 100644 --- a/board/r360mpi/flash.c +++ b/board/r360mpi/flash.c @@ -31,7 +31,7 @@ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) # ifndef CFG_ENV_ADDR # define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # endif @@ -111,7 +111,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect (FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/rmu/flash.c b/board/rmu/flash.c index 0f2c327a1c..670faf0931 100644 --- a/board/rmu/flash.c +++ b/board/rmu/flash.c @@ -81,7 +81,7 @@ unsigned long flash_init (void) CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/rpxsuper/flash.c b/board/rpxsuper/flash.c index b29032bc46..2d176947af 100644 --- a/board/rpxsuper/flash.c +++ b/board/rpxsuper/flash.c @@ -71,7 +71,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) +#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) # ifndef CFG_ENV_SIZE # define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # endif diff --git a/board/rsdproto/flash.c b/board/rsdproto/flash.c index d9f6b3bacd..f9544580cf 100644 --- a/board/rsdproto/flash.c +++ b/board/rsdproto/flash.c @@ -131,7 +131,7 @@ unsigned long flash_init (void) &flash_info[1]); #endif -#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) +#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) # ifndef CFG_ENV_SIZE # define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # endif diff --git a/board/sacsng/flash.c b/board/sacsng/flash.c index 52e01def5b..f37be29423 100644 --- a/board/sacsng/flash.c +++ b/board/sacsng/flash.c @@ -73,7 +73,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, @@ -90,7 +90,7 @@ unsigned long flash_init (void) &flash_info[1]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/sandpoint/flash.c b/board/sandpoint/flash.c index cf06679938..60cb1915e5 100644 --- a/board/sandpoint/flash.c +++ b/board/sandpoint/flash.c @@ -32,7 +32,7 @@ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) # ifndef CFG_ENV_ADDR # define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # endif @@ -230,7 +230,7 @@ flash_init(void) &flash_info[0]); #endif -#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) +#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, CFG_ENV_ADDR + CFG_ENV_SIZE - 1, diff --git a/board/sbc8260/flash.c b/board/sbc8260/flash.c index c43435fc5b..6d659b2d58 100644 --- a/board/sbc8260/flash.c +++ b/board/sbc8260/flash.c @@ -67,7 +67,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) +#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) # ifndef CFG_ENV_SIZE # define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # endif diff --git a/board/siemens/SCM/flash.c b/board/siemens/SCM/flash.c index 063972db5b..815f0236d1 100644 --- a/board/siemens/SCM/flash.c +++ b/board/siemens/SCM/flash.c @@ -207,7 +207,7 @@ unsigned long flash_init (void) CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]); #endif -#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) +#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) # ifndef CFG_ENV_SIZE # define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # endif diff --git a/board/siemens/pcu_e/flash.c b/board/siemens/pcu_e/flash.c index 05c364bb23..5b812cb365 100644 --- a/board/siemens/pcu_e/flash.c +++ b/board/siemens/pcu_e/flash.c @@ -24,7 +24,7 @@ #include <common.h> #include <mpc8xx.h> -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) # ifndef CFG_ENV_ADDR # define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # endif @@ -151,7 +151,7 @@ unsigned long flash_init (void) PCU_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, @@ -178,7 +178,7 @@ unsigned long flash_init (void) flash_info[1].size = size_b1; -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/sl8245/flash.c b/board/sl8245/flash.c index 7fb94631cf..f41dde0589 100644 --- a/board/sl8245/flash.c +++ b/board/sl8245/flash.c @@ -25,7 +25,7 @@ #include <mpc824x.h> #include <asm/processor.h> -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) # ifndef CFG_ENV_ADDR # define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # endif @@ -139,7 +139,7 @@ unsigned long flash_init (void) #endif #endif -#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) +#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) #if CFG_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE flash_protect ( FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/stxgp3/flash.c b/board/stxgp3/flash.c index 032989ba56..25ac3012c6 100644 --- a/board/stxgp3/flash.c +++ b/board/stxgp3/flash.c @@ -41,7 +41,7 @@ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) # ifndef CFG_ENV_ADDR # define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # endif @@ -99,7 +99,7 @@ unsigned long flash_init (void) CFG_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/svm_sc8xx/flash.c b/board/svm_sc8xx/flash.c index 25e61dd5e5..267be78f66 100644 --- a/board/svm_sc8xx/flash.c +++ b/board/svm_sc8xx/flash.c @@ -152,7 +152,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, @@ -179,7 +179,7 @@ unsigned long flash_init (void) &flash_info[1]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/tqc/tqm5200/cam5200_flash.c b/board/tqc/tqm5200/cam5200_flash.c index b3f095d807..bb12aaea4c 100644 --- a/board/tqc/tqm5200/cam5200_flash.c +++ b/board/tqc/tqm5200/cam5200_flash.c @@ -768,7 +768,7 @@ unsigned long flash_init(void) (void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, &flash_info[i]); -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, &flash_info[i]); diff --git a/board/tqc/tqm8260/flash.c b/board/tqc/tqm8260/flash.c index 063972db5b..815f0236d1 100644 --- a/board/tqc/tqm8260/flash.c +++ b/board/tqc/tqm8260/flash.c @@ -207,7 +207,7 @@ unsigned long flash_init (void) CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]); #endif -#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) +#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) # ifndef CFG_ENV_SIZE # define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # endif diff --git a/board/tqc/tqm8xx/flash.c b/board/tqc/tqm8xx/flash.c index 1231c7c6f9..f9078cffd9 100644 --- a/board/tqc/tqm8xx/flash.c +++ b/board/tqc/tqm8xx/flash.c @@ -176,7 +176,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ # ifdef CFG_ENV_ADDR_REDUND debug ("Protect primary environment: %08lx ... %08lx\n", @@ -229,7 +229,7 @@ unsigned long flash_init (void) &flash_info[1]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/board/utx8245/flash.c b/board/utx8245/flash.c index ae0e659c2e..515d8c2cee 100644 --- a/board/utx8245/flash.c +++ b/board/utx8245/flash.c @@ -33,7 +33,7 @@ #define ROM_CS0_START 0xFF800000 #define ROM_CS1_START 0xFF000000 -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) # ifndef CFG_ENV_ADDR # define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # endif @@ -169,7 +169,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) +#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) flash_protect (FLAG_PROTECT_SET, CFG_ENV_ADDR, CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]); #endif diff --git a/board/westel/amx860/flash.c b/board/westel/amx860/flash.c index 12a1335b75..4d468d314d 100644 --- a/board/westel/amx860/flash.c +++ b/board/westel/amx860/flash.c @@ -26,7 +26,7 @@ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) # ifndef CFG_ENV_ADDR # define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # endif @@ -134,7 +134,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, @@ -166,7 +166,7 @@ unsigned long flash_init (void) &flash_info[1]); # endif -# ifdef CFG_ENV_IS_IN_FLASH +# ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index fc9b94e0ec..f5b93df220 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -54,7 +54,7 @@ DECLARE_GLOBAL_DATA_PTR; #if !defined(CONFIG_ENV_IS_IN_NVRAM) && \ !defined(CONFIG_ENV_IS_IN_EEPROM) && \ - !defined(CFG_ENV_IS_IN_FLASH) && \ + !defined(CONFIG_ENV_IS_IN_FLASH) && \ !defined(CONFIG_ENV_IS_IN_DATAFLASH) && \ !defined(CONFIG_ENV_IS_IN_NAND) && \ !defined(CONFIG_ENV_IS_IN_ONENAND) && \ diff --git a/common/env_flash.c b/common/env_flash.c index a92160ddfb..c287b17404 100644 --- a/common/env_flash.c +++ b/common/env_flash.c @@ -28,7 +28,7 @@ #include <common.h> -#if defined(CFG_ENV_IS_IN_FLASH) /* Environment is in Flash */ +#if defined(CONFIG_ENV_IS_IN_FLASH) /* Environment is in Flash */ #include <command.h> #include <environment.h> @@ -384,4 +384,4 @@ void env_relocate_spec (void) #endif /* ! ENV_IS_EMBEDDED || CFG_ENV_ADDR_REDUND */ } -#endif /* CFG_ENV_IS_IN_FLASH */ +#endif /* CONFIG_ENV_IS_IN_FLASH */ diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index a74321d5c0..7937b61a81 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -255,7 +255,7 @@ u64 flash_read64(void *addr)__attribute__((weak, alias("__flash_read64"))); /*----------------------------------------------------------------------- */ -#if defined(CFG_ENV_IS_IN_FLASH) || defined(CFG_ENV_ADDR_REDUND) || (CFG_MONITOR_BASE >= CFG_FLASH_BASE) +#if defined(CONFIG_ENV_IS_IN_FLASH) || defined(CFG_ENV_ADDR_REDUND) || (CFG_MONITOR_BASE >= CFG_FLASH_BASE) static flash_info_t *flash_get_info(ulong base) { int i; @@ -2031,7 +2031,7 @@ unsigned long flash_init (void) #endif /* Environment protection ON by default */ -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH flash_protect (FLAG_PROTECT_SET, CFG_ENV_ADDR, CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, diff --git a/include/configs/A3000.h b/include/configs/A3000.h index dba1bf727d..35180d636e 100644 --- a/include/configs/A3000.h +++ b/include/configs/A3000.h @@ -297,7 +297,7 @@ /* Warining: environment is not EMBEDDED in the U-Boot code. * It's stored in flash separately. */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR 0xFFFE0000 #define CFG_ENV_SIZE 0x00020000 /* Size of the Environment */ #define CFG_ENV_SECT_SIZE 0x00020000 /* Size of the Environment Sector */ diff --git a/include/configs/ADCIOP.h b/include/configs/ADCIOP.h index 148c905925..0069aabab7 100644 --- a/include/configs/ADCIOP.h +++ b/include/configs/ADCIOP.h @@ -170,7 +170,7 @@ #else /* Use FLASH for environment variables */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x00010000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ diff --git a/include/configs/ADNPESC1.h b/include/configs/ADNPESC1.h index cc91c8d11d..2999b2a0b7 100644 --- a/include/configs/ADNPESC1.h +++ b/include/configs/ADNPESC1.h @@ -116,7 +116,7 @@ *----------------------------------------------------------------------*/ #if (CFG_NIOS_CPU_FLASH_SIZE != 0) -#define CFG_ENV_IS_IN_FLASH 1 /* Environment in flash */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */ /* Mem addr of environment */ #if defined(CONFIG_NIOS_BASE_32) diff --git a/include/configs/AMX860.h b/include/configs/AMX860.h index 035ebc6935..85a7ee91fe 100644 --- a/include/configs/AMX860.h +++ b/include/configs/AMX860.h @@ -199,7 +199,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ diff --git a/include/configs/AP1000.h b/include/configs/AP1000.h index f0e0282280..a4582148a9 100644 --- a/include/configs/AP1000.h +++ b/include/configs/AP1000.h @@ -37,13 +37,13 @@ #define CONFIG_COMMAND_HISTORY 1 #define CONFIG_COMPLETE_ADDRESSES 1 -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_FLASH_USE_BUFFER_WRITE #ifdef CONFIG_ENV_IS_IN_NVRAM -#undef CFG_ENV_IS_IN_FLASH +#undef CONFIG_ENV_IS_IN_FLASH #else -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #undef CONFIG_ENV_IS_IN_NVRAM #endif #endif @@ -174,7 +174,7 @@ #define CFG_FLASH_PROTECTION 1 /* use hardware protection */ /* BEG ENVIRONNEMENT FLASH */ -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_OFFSET 0x00040000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ #define CFG_ENV_SECT_SIZE 0x20000 /* see README - env sector total size */ diff --git a/include/configs/AR405.h b/include/configs/AR405.h index 06023819f9..045849f76d 100644 --- a/include/configs/AR405.h +++ b/include/configs/AR405.h @@ -205,7 +205,7 @@ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR 0xFFFB0000 /* Address of Environment Sector*/ #define CFG_ENV_SECT_SIZE 0x10000 /* see README - env sector total size */ #define CFG_ENV_SIZE 0x04000 /* Size of Environment */ diff --git a/include/configs/ATUM8548.h b/include/configs/ATUM8548.h index 5bc28f18f9..0ce81dbaf2 100644 --- a/include/configs/ATUM8548.h +++ b/include/configs/ATUM8548.h @@ -333,7 +333,7 @@ /* * Environment */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) #define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ #define CFG_ENV_SIZE 0x2000 diff --git a/include/configs/Adder.h b/include/configs/Adder.h index 07a9f4e934..3c2f4d646d 100644 --- a/include/configs/Adder.h +++ b/include/configs/Adder.h @@ -148,7 +148,7 @@ #define CFG_MAX_FLASH_SECT 128 /* Max num of sects on one chip */ /* Environment is in flash */ -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE 0x10000 /* We use one complete sector */ #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) diff --git a/include/configs/Alaska8220.h b/include/configs/Alaska8220.h index 3d4cd36a49..3b3c0bcbb1 100644 --- a/include/configs/Alaska8220.h +++ b/include/configs/Alaska8220.h @@ -205,7 +205,7 @@ /* * Environment settings */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #if defined (CFG_AMD_BOOT) #define CFG_ENV_ADDR (CFG_FLASH0_BASE + CFG_CS0_MASK - PHYS_AMD_SECT_SIZE) #define CFG_ENV_SIZE PHYS_AMD_SECT_SIZE @@ -224,15 +224,15 @@ #define CONFIG_ENV_OVERWRITE 1 -#if defined CFG_ENV_IS_IN_FLASH +#if defined CONFIG_ENV_IS_IN_FLASH #undef CONFIG_ENV_IS_IN_NVRAM #undef CONFIG_ENV_IS_IN_EEPROM #elif defined CONFIG_ENV_IS_IN_NVRAM -#undef CFG_ENV_IS_IN_FLASH +#undef CONFIG_ENV_IS_IN_FLASH #undef CONFIG_ENV_IS_IN_EEPROM #elif defined CONFIG_ENV_IS_IN_EEPROM #undef CONFIG_ENV_IS_IN_NVRAM -#undef CFG_ENV_IS_IN_FLASH +#undef CONFIG_ENV_IS_IN_FLASH #endif /* diff --git a/include/configs/BC3450.h b/include/configs/BC3450.h index 3c5d03812e..09c1995f09 100644 --- a/include/configs/BC3450.h +++ b/include/configs/BC3450.h @@ -358,7 +358,7 @@ /* * Environment settings */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x10000 #define CFG_ENV_SECT_SIZE 0x20000 #define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE) diff --git a/include/configs/CANBT.h b/include/configs/CANBT.h index a4afccab96..d50be015f5 100644 --- a/include/configs/CANBT.h +++ b/include/configs/CANBT.h @@ -155,7 +155,7 @@ #if 0 /* Use FLASH for environment variables */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x00010000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ diff --git a/include/configs/CATcenter.h b/include/configs/CATcenter.h index 1603c9c0bd..b9c998eec6 100644 --- a/include/configs/CATcenter.h +++ b/include/configs/CATcenter.h @@ -393,7 +393,7 @@ /*----------------------------------------------------------------------- * Environment Variable setup */ -#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ #define CFG_ENV_ADDR 0xFFFF8000 /* environment starts at the first small sector */ #define CFG_ENV_SECT_SIZE 0x2000 /* 8196 bytes may be used for env vars*/ #define CFG_ENV_ADDR_REDUND 0xFFFFA000 diff --git a/include/configs/CCM.h b/include/configs/CCM.h index 57c122395d..52b7b82cdc 100644 --- a/include/configs/CCM.h +++ b/include/configs/CCM.h @@ -218,7 +218,7 @@ #if 1 /* Start port with environment in flash; switch to SPI EEPROM later */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ diff --git a/include/configs/CPC45.h b/include/configs/CPC45.h index 11107d499a..7ec48a127d 100644 --- a/include/configs/CPC45.h +++ b/include/configs/CPC45.h @@ -323,7 +323,7 @@ /* Warining: environment is not EMBEDDED in the ppcboot code. * It's stored in flash separately. */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x7F8000) #define CFG_ENV_SIZE 0x4000 /* Size of the Environment */ diff --git a/include/configs/CPCI750.h b/include/configs/CPCI750.h index 48f308c76f..7a185e847e 100644 --- a/include/configs/CPCI750.h +++ b/include/configs/CPCI750.h @@ -572,7 +572,7 @@ #define CFG_FLASH_LOCK_TOUT 500 /* Timeout for Flash Lock (in ms) */ #if 0 -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ #define CFG_ENV_SECT_SIZE 0x10000 #define CFG_ENV_ADDR 0xFFF78000 /* Marvell 8-Bit Bootflash last sector */ diff --git a/include/configs/CPU86.h b/include/configs/CPU86.h index 742ea463e5..443b976495 100644 --- a/include/configs/CPU86.h +++ b/include/configs/CPU86.h @@ -324,7 +324,7 @@ #if 0 /* environment is in Flash */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #ifdef CONFIG_BOOT_ROM # define CFG_ENV_ADDR (CFG_FLASH_BASE+0x70000) # define CFG_ENV_SIZE 0x10000 diff --git a/include/configs/CPU87.h b/include/configs/CPU87.h index db423a0ba9..45075fa2e3 100644 --- a/include/configs/CPU87.h +++ b/include/configs/CPU87.h @@ -339,7 +339,7 @@ #if 0 /* environment is in Flash */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #ifdef CONFIG_BOOT_ROM # define CFG_ENV_ADDR (CFG_FLASH_BASE+0x70000) # define CFG_ENV_SIZE 0x10000 diff --git a/include/configs/CRAYL1.h b/include/configs/CRAYL1.h index 604779a691..c15a02ab96 100644 --- a/include/configs/CRAYL1.h +++ b/include/configs/CRAYL1.h @@ -170,7 +170,7 @@ /* BEG ENVIRONNEMENT FLASH: needs to be a whole FlashSector */ #define CFG_ENV_OFFSET 0x3c8000 -#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ #define CFG_ENV_SIZE 0x1000 /* Total Size of Environment area */ #define CFG_ENV_SECT_SIZE 0x10000 /* see README - env sector total size */ diff --git a/include/configs/CU824.h b/include/configs/CU824.h index f36d8dacc0..3320c9aee7 100644 --- a/include/configs/CU824.h +++ b/include/configs/CU824.h @@ -271,7 +271,7 @@ /* Warining: environment is not EMBEDDED in the U-Boot code. * It's stored in flash separately. */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #if 0 #define CFG_ENV_ADDR 0xFF008000 #define CFG_ENV_SIZE 0x8000 /* Size of the Environment Sector */ diff --git a/include/configs/DASA_SIM.h b/include/configs/DASA_SIM.h index 117a1367c1..24370c93fd 100644 --- a/include/configs/DASA_SIM.h +++ b/include/configs/DASA_SIM.h @@ -157,7 +157,7 @@ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x00010000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ diff --git a/include/configs/DB64360.h b/include/configs/DB64360.h index eef216dfae..3fc280fc38 100644 --- a/include/configs/DB64360.h +++ b/include/configs/DB64360.h @@ -559,7 +559,7 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0" #define CFG_FLASH_LOCK_TOUT 500 /* Timeout for Flash Lock (in ms) */ #define CFG_FLASH_CFI 1 -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ #define CFG_ENV_SECT_SIZE 0x10000 #define CFG_ENV_ADDR 0xFFF78000 /* Marvell 8-Bit Bootflash last sector */ diff --git a/include/configs/DB64460.h b/include/configs/DB64460.h index b14cd0df1a..59a934e694 100644 --- a/include/configs/DB64460.h +++ b/include/configs/DB64460.h @@ -497,7 +497,7 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0" #define CFG_FLASH_LOCK_TOUT 500 /* Timeout for Flash Lock (in ms) */ #define CFG_FLASH_CFI 1 -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ #define CFG_ENV_SECT_SIZE 0x10000 #define CFG_ENV_ADDR 0xFFF78000 /* Marvell 8-Bit Bootflash last sector */ diff --git a/include/configs/DK1C20.h b/include/configs/DK1C20.h index 9658278236..a1f4e0dc73 100644 --- a/include/configs/DK1C20.h +++ b/include/configs/DK1C20.h @@ -111,7 +111,7 @@ *----------------------------------------------------------------------*/ #if (CFG_NIOS_CPU_FLASH_SIZE != 0) -#define CFG_ENV_IS_IN_FLASH 1 /* Environment in flash */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */ #define CFG_ENV_ADDR CFG_FLASH_BASE /* Mem addr of env */ #define CFG_ENV_SIZE (64 * 1024) /* 64 KByte (1 sector) */ #define CONFIG_ENV_OVERWRITE /* Serial/eth change Ok */ diff --git a/include/configs/DK1S10.h b/include/configs/DK1S10.h index e5bf8c7ccc..eda328ab3e 100644 --- a/include/configs/DK1S10.h +++ b/include/configs/DK1S10.h @@ -119,7 +119,7 @@ *----------------------------------------------------------------------*/ #if (CFG_NIOS_CPU_FLASH_SIZE != 0) -#define CFG_ENV_IS_IN_FLASH 1 /* Environment in flash */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */ #if defined(CONFIG_NIOS_STANDARD_32) #define CFG_ENV_ADDR CFG_FLASH_BASE /* Mem addr of env */ diff --git a/include/configs/DU440.h b/include/configs/DU440.h index b1d4ff3f64..37a7e3ae87 100644 --- a/include/configs/DU440.h +++ b/include/configs/DU440.h @@ -136,7 +136,7 @@ #define CFG_FLASH_EMPTY_INFO #define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */ -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ #define CFG_ENV_ADDR ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ diff --git a/include/configs/EB+MCF-EV123.h b/include/configs/EB+MCF-EV123.h index 324eb6ce15..80a6cb7bec 100644 --- a/include/configs/EB+MCF-EV123.h +++ b/include/configs/EB+MCF-EV123.h @@ -53,7 +53,7 @@ #ifndef CONFIG_MONITOR_IS_IN_RAM #define CFG_ENV_ADDR 0xF003C000 /* End of 256K */ #define CFG_ENV_SECT_SIZE 0x4000 -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 /* #define CFG_ENV_IS_EMBEDDED 1 #define CFG_ENV_ADDR_REDUND 0xF0018000 @@ -62,7 +62,7 @@ #else #define CFG_ENV_ADDR 0xFFE04000 #define CFG_ENV_SECT_SIZE 0x2000 -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #endif diff --git a/include/configs/ELPT860.h b/include/configs/ELPT860.h index b9178069b8..11eca4c4d5 100644 --- a/include/configs/ELPT860.h +++ b/include/configs/ELPT860.h @@ -139,7 +139,7 @@ #undef CONFIG_ENV_IS_IN_NVRAM /* Environment is in NVRAM */ #undef CONFIG_ENV_IS_IN_EEPROM /* Environment is in I2C EEPROM */ -#define CFG_ENV_IS_IN_FLASH 1 /* Environment is in FLASH */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment is in FLASH */ #define CONFIG_BAUDRATE 9600 /* console baudrate = 9600 bps */ #define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } @@ -180,7 +180,7 @@ #define CFG_FLASH_BASE 0x02000000 #define CFG_NVRAM_BASE 0x03000000 -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) # if defined(DEBUG) # define CFG_MONITOR_LEN (320 << 10) /* Reserve 320 kB for Monitor */ # else @@ -213,7 +213,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) # define CFG_ENV_OFFSET 0x10000 /* Offset of Environment Sector */ # define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ #endif diff --git a/include/configs/EP1C20.h b/include/configs/EP1C20.h index cfa6335927..aaf61726db 100644 --- a/include/configs/EP1C20.h +++ b/include/configs/EP1C20.h @@ -86,7 +86,7 @@ * of flash. NOTE: the monitor length must be multiple of sector size * (which is common practice). *----------------------------------------------------------------------*/ -#define CFG_ENV_IS_IN_FLASH 1 /* Environment in flash */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */ #define CFG_ENV_SIZE (64 * 1024) /* 64 KByte (1 sector) */ #define CONFIG_ENV_OVERWRITE /* Serial change Ok */ #define CFG_ENV_ADDR (CFG_RESET_ADDR + CFG_MONITOR_LEN) diff --git a/include/configs/EP1S10.h b/include/configs/EP1S10.h index 7c526f759e..ae1e476fd3 100644 --- a/include/configs/EP1S10.h +++ b/include/configs/EP1S10.h @@ -84,7 +84,7 @@ * of flash. NOTE: the monitor length must be multiple of sector size * (which is common practice). *----------------------------------------------------------------------*/ -#define CFG_ENV_IS_IN_FLASH 1 /* Environment in flash */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */ #define CFG_ENV_SIZE (64 * 1024) /* 64 KByte (1 sector) */ #define CONFIG_ENV_OVERWRITE /* Serial change Ok */ #define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN) diff --git a/include/configs/EP1S40.h b/include/configs/EP1S40.h index 1fe8f68c2e..7aedcca1db 100644 --- a/include/configs/EP1S40.h +++ b/include/configs/EP1S40.h @@ -84,7 +84,7 @@ * of flash. NOTE: the monitor length must be multiple of sector size * (which is common practice). *----------------------------------------------------------------------*/ -#define CFG_ENV_IS_IN_FLASH 1 /* Environment in flash */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */ #define CFG_ENV_SIZE (64 * 1024) /* 64 KByte (1 sector) */ #define CONFIG_ENV_OVERWRITE /* Serial change Ok */ #define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN) diff --git a/include/configs/EP88x.h b/include/configs/EP88x.h index 5f1743b2ff..81d5e55461 100644 --- a/include/configs/EP88x.h +++ b/include/configs/EP88x.h @@ -143,7 +143,7 @@ #define CFG_MAX_FLASH_SECT 512 /* Max num of sects on one chip */ /* Environment is in flash */ -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE 0x20000 /* We use one complete sector */ #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) diff --git a/include/configs/ERIC.h b/include/configs/ERIC.h index c699855a55..b7ec0d0105 100644 --- a/include/configs/ERIC.h +++ b/include/configs/ERIC.h @@ -42,7 +42,7 @@ #define CONFIG_SYS_CLK_FREQ 33333333 /* external frequency to pll */ #if 1 -#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ #endif #if 0 #define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */ @@ -62,17 +62,17 @@ #define CONFIG_I2C_RTC 1 /* we have a Xicor X1240 RTC */ #define CFG_I2C_RTC_ADDR 0x6F /* and one for RTC */ -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #undef CONFIG_ENV_IS_IN_NVRAM #undef CONFIG_ENV_IS_IN_EEPROM #else #ifdef CONFIG_ENV_IS_IN_NVRAM -#undef CFG_ENV_IS_IN_FLASH +#undef CONFIG_ENV_IS_IN_FLASH #undef CONFIG_ENV_IS_IN_EEPROM #else #ifdef CONFIG_ENV_IS_IN_EEPROM #undef CONFIG_ENV_IS_IN_NVRAM -#undef CFG_ENV_IS_IN_FLASH +#undef CONFIG_ENV_IS_IN_FLASH #endif #endif #endif @@ -298,7 +298,7 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ /* BEG ENVIRONNEMENT FLASH */ -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE (128*1024) #if 0 /* force ENV to be NOT embedded */ diff --git a/include/configs/ESTEEM192E.h b/include/configs/ESTEEM192E.h index 66e1203b7d..24f0f4c1fb 100644 --- a/include/configs/ESTEEM192E.h +++ b/include/configs/ESTEEM192E.h @@ -154,7 +154,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ /*----------------------------------------------------------------------- diff --git a/include/configs/ETX094.h b/include/configs/ETX094.h index 525051fb57..940e53d23a 100644 --- a/include/configs/ETX094.h +++ b/include/configs/ETX094.h @@ -171,7 +171,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 1000 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #ifdef CONFIG_FLASH_16BIT #define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x8000 /* Total Size of Environment Sector */ diff --git a/include/configs/EVB64260.h b/include/configs/EVB64260.h index c9d8c271ba..2a78fd648b 100644 --- a/include/configs/EVB64260.h +++ b/include/configs/EVB64260.h @@ -391,7 +391,7 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CFG_FLASH_CFI 1 -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ #define CFG_ENV_SECT_SIZE 0x10000 #define CFG_ENV_ADDR (CFG_FLASH_BASE+CFG_MONITOR_LEN-CFG_ENV_SECT_SIZE) diff --git a/include/configs/EXBITGEN.h b/include/configs/EXBITGEN.h index 4193492ff9..fed8d4247f 100644 --- a/include/configs/EXBITGEN.h +++ b/include/configs/EXBITGEN.h @@ -48,7 +48,7 @@ /* environment is in EEPROM */ #define CONFIG_ENV_IS_IN_EEPROM 1 -#undef CFG_ENV_IS_IN_FLASH +#undef CONFIG_ENV_IS_IN_FLASH #undef CONFIG_ENV_IS_IN_NVRAM #ifdef CONFIG_ENV_IS_IN_EEPROM @@ -188,7 +188,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_OFFSET 0x00060000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x00010000 /* Total Size of Environment Sector */ #define CFG_ENV_SECT_SIZE 0x00010000 /* see README - env sector total size */ diff --git a/include/configs/FADS823.h b/include/configs/FADS823.h index 6f3e6a75b8..c6c7b533be 100644 --- a/include/configs/FADS823.h +++ b/include/configs/FADS823.h @@ -203,7 +203,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x00040000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x40000 /* Total Size of Environment Sector */ #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ diff --git a/include/configs/FADS850SAR.h b/include/configs/FADS850SAR.h index 356705ba1f..82a875719e 100644 --- a/include/configs/FADS850SAR.h +++ b/include/configs/FADS850SAR.h @@ -153,7 +153,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x00040000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x40000 /* Total Size of Environment Sector */ #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ diff --git a/include/configs/FLAGADM.h b/include/configs/FLAGADM.h index 431844c7f3..e7fcf75198 100644 --- a/include/configs/FLAGADM.h +++ b/include/configs/FLAGADM.h @@ -158,7 +158,7 @@ #define CFG_FLASH_ERASE_TOUT 8000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 /* This is a litlebit wasteful, but one sector is 128kb and we have to * assigne a whole sector for the environment, so that we can safely * erase and write it without disturbing the boot sector diff --git a/include/configs/FPS850L.h b/include/configs/FPS850L.h index e694a0218f..2b819c52f1 100644 --- a/include/configs/FPS850L.h +++ b/include/configs/FPS850L.h @@ -201,7 +201,7 @@ #define CFG_MAX_FLASH_BANKS 2 /* max number of memory banks */ #define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ diff --git a/include/configs/FPS860L.h b/include/configs/FPS860L.h index 84b682415d..b3380dbbcb 100644 --- a/include/configs/FPS860L.h +++ b/include/configs/FPS860L.h @@ -201,7 +201,7 @@ #define CFG_MAX_FLASH_BANKS 2 /* max number of memory banks */ #define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ diff --git a/include/configs/G2000.h b/include/configs/G2000.h index 74e6ef70ee..43926a280c 100644 --- a/include/configs/G2000.h +++ b/include/configs/G2000.h @@ -306,7 +306,7 @@ #else /* DEFAULT: environment in flash, using redundand flash sectors */ -#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ #define CFG_ENV_ADDR 0xFFFA0000 /* environment starts before u-boot */ #define CFG_ENV_SECT_SIZE 0x20000 /* 128k bytes may be used for env vars*/ diff --git a/include/configs/GEN860T.h b/include/configs/GEN860T.h index 51cf5794b9..6a5a316dd2 100644 --- a/include/configs/GEN860T.h +++ b/include/configs/GEN860T.h @@ -434,7 +434,7 @@ * Select environment placement. NOTE that u-boot.lds must * be edited if this is changed! */ -#undef CFG_ENV_IS_IN_FLASH +#undef CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_IS_IN_EEPROM #if defined(CONFIG_ENV_IS_IN_EEPROM) diff --git a/include/configs/GENIETV.h b/include/configs/GENIETV.h index f6d6ae0ce5..3cf7fb1d1a 100644 --- a/include/configs/GENIETV.h +++ b/include/configs/GENIETV.h @@ -196,7 +196,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x10000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector (64k)*/ diff --git a/include/configs/GTH.h b/include/configs/GTH.h index 4a98c40638..d5816ae2f6 100644 --- a/include/configs/GTH.h +++ b/include/configs/GTH.h @@ -194,7 +194,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #undef CONFIG_ENV_IS_IN_EEPROM #define CFG_ENV_OFFSET 0x000E0000 #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ diff --git a/include/configs/HIDDEN_DRAGON.h b/include/configs/HIDDEN_DRAGON.h index 5deb84de5a..5168be0dc0 100644 --- a/include/configs/HIDDEN_DRAGON.h +++ b/include/configs/HIDDEN_DRAGON.h @@ -145,7 +145,7 @@ #define CFG_FLASH_BASE 0xFFE00000 #define CFG_FLASH_SIZE (2 * 1024 * 1024) /* Unity has onboard 1MByte flash */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x00004000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x00002000 /* Total Size of Environment Sector */ diff --git a/include/configs/HMI10.h b/include/configs/HMI10.h index a7e7c5744e..406c352644 100644 --- a/include/configs/HMI10.h +++ b/include/configs/HMI10.h @@ -234,7 +234,7 @@ #define CFG_MAX_FLASH_BANKS 2 /* max number of memory banks */ #define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ diff --git a/include/configs/IAD210.h b/include/configs/IAD210.h index 87827ead1c..c80165ba59 100644 --- a/include/configs/IAD210.h +++ b/include/configs/IAD210.h @@ -220,7 +220,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x8000 #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ diff --git a/include/configs/ICU862.h b/include/configs/ICU862.h index f693956d42..caf7210a64 100644 --- a/include/configs/ICU862.h +++ b/include/configs/ICU862.h @@ -229,7 +229,7 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x00F40000 #define CFG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment sector */ diff --git a/include/configs/IDS8247.h b/include/configs/IDS8247.h index 029bb9914b..459654e546 100644 --- a/include/configs/IDS8247.h +++ b/include/configs/IDS8247.h @@ -251,7 +251,7 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (in ms) */ /* Environment in flash */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_FLASH_BASE+0x60000) #define CFG_ENV_SIZE 0x20000 #define CFG_ENV_SECT_SIZE 0x20000 diff --git a/include/configs/IP860.h b/include/configs/IP860.h index 63e7e5d452..fa3c29ec9a 100644 --- a/include/configs/IP860.h +++ b/include/configs/IP860.h @@ -186,7 +186,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#undef CFG_ENV_IS_IN_FLASH +#undef CONFIG_ENV_IS_IN_FLASH #undef CONFIG_ENV_IS_IN_NVRAM #undef CONFIG_ENV_IS_IN_NVRAM #undef DEBUG_I2C diff --git a/include/configs/IPHASE4539.h b/include/configs/IPHASE4539.h index 7d564a0957..cea8532047 100644 --- a/include/configs/IPHASE4539.h +++ b/include/configs/IPHASE4539.h @@ -208,7 +208,7 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (in ms) */ /* Environment in FLASH, there is little space left in Serial EEPROM */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SECT_SIZE 0x10000 /* We use one complete sector */ #define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x10000) /* 2. sector */ diff --git a/include/configs/ISPAN.h b/include/configs/ISPAN.h index 27e46a432b..6de40da4ed 100644 --- a/include/configs/ISPAN.h +++ b/include/configs/ISPAN.h @@ -185,7 +185,7 @@ #define CFG_MAX_FLASH_SECT 142 /* Max num of sects on one chip */ /* Environment is in flash, there is little space left in Serial EEPROM */ -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE 0x10000 /* We use one complete sector */ #define CFG_ENV_SIZE (CFG_ENV_SECT_SIZE) #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) diff --git a/include/configs/IVML24.h b/include/configs/IVML24.h index 0ffdfac07c..ee302d9a61 100644 --- a/include/configs/IVML24.h +++ b/include/configs/IVML24.h @@ -184,7 +184,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x7A000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ /*----------------------------------------------------------------------- diff --git a/include/configs/IVMS8.h b/include/configs/IVMS8.h index ea3ffe0a10..1bdd0318e6 100644 --- a/include/configs/IVMS8.h +++ b/include/configs/IVMS8.h @@ -180,7 +180,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x7A000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ /*----------------------------------------------------------------------- diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h index 0b90946a36..804fc3f69c 100644 --- a/include/configs/IceCube.h +++ b/include/configs/IceCube.h @@ -255,7 +255,7 @@ /* * Environment settings */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x10000 #if defined(CONFIG_LITE5200B) #define CFG_ENV_SECT_SIZE 0x20000 diff --git a/include/configs/JSE.h b/include/configs/JSE.h index ecc344d829..4bcd17a6ee 100644 --- a/include/configs/JSE.h +++ b/include/configs/JSE.h @@ -78,7 +78,7 @@ /* JSE has EEPROM chips that are good for environment. */ #undef CONFIG_ENV_IS_IN_NVRAM -#undef CFG_ENV_IS_IN_FLASH +#undef CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_IS_IN_EEPROM 1 #undef CONFIG_ENV_IS_NOWHERE diff --git a/include/configs/KAREF.h b/include/configs/KAREF.h index 7208444bdd..897d8a0592 100644 --- a/include/configs/KAREF.h +++ b/include/configs/KAREF.h @@ -142,7 +142,7 @@ * Environment *----------------------------------------------------------------------*/ #define CONFIG_ENV_IS_IN_NVRAM 1 /* Environment uses NVRAM */ -#undef CFG_ENV_IS_IN_FLASH /* ... not in flash */ +#undef CONFIG_ENV_IS_IN_FLASH /* ... not in flash */ #undef CONFIG_ENV_IS_IN_EEPROM /* ... not in EEPROM */ #define CONFIG_ENV_OVERWRITE 1 /* allow env overwrite */ diff --git a/include/configs/KUP4K.h b/include/configs/KUP4K.h index e52fbfde0e..e40e53bb2f 100644 --- a/include/configs/KUP4K.h +++ b/include/configs/KUP4K.h @@ -254,7 +254,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ #define CFG_ENV_SECT_SIZE 0x10000 diff --git a/include/configs/KUP4X.h b/include/configs/KUP4X.h index be0c7af8f3..29c3e2d7ba 100644 --- a/include/configs/KUP4X.h +++ b/include/configs/KUP4X.h @@ -266,7 +266,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ #define CFG_ENV_SECT_SIZE 0x10000 diff --git a/include/configs/LANTEC.h b/include/configs/LANTEC.h index e92069b5a9..dc6084877c 100644 --- a/include/configs/LANTEC.h +++ b/include/configs/LANTEC.h @@ -185,7 +185,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index 8713b02aaf..10b37b5e01 100644 --- a/include/configs/M52277EVB.h +++ b/include/configs/M52277EVB.h @@ -192,7 +192,7 @@ /* Configuration for environment * Environment is embedded in u-boot in the second sector of the flash */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_OVERWRITE 1 #undef CFG_ENV_IS_EMBEDDED diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index b32eabe9a3..3f55594a3c 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -220,7 +220,7 @@ /* Configuration for environment * Environment is embedded in u-boot in the second sector of the flash */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_IS_EMBEDDED 1 #ifdef NORFLASH_PS32BIT # define CFG_ENV_OFFSET (0x8000) diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h index 6bf2d99c9c..c7544a8ebb 100644 --- a/include/configs/M5249EVB.h +++ b/include/configs/M5249EVB.h @@ -113,7 +113,7 @@ #define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE) #define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x4000 /* Address of Environment Sector*/ #define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ #define CFG_ENV_SECT_SIZE 0x2000 /* see README - env sector total size */ diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index 9f78f6ebc8..72dd05db66 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -45,11 +45,11 @@ #ifdef CONFIG_MONITOR_IS_IN_RAM # define CFG_ENV_OFFSET 0x4000 # define CFG_ENV_SECT_SIZE 0x1000 -# define CFG_ENV_IS_IN_FLASH 1 +# define CONFIG_ENV_IS_IN_FLASH 1 #else # define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x4000) # define CFG_ENV_SECT_SIZE 0x1000 -# define CFG_ENV_IS_IN_FLASH 1 +# define CONFIG_ENV_IS_IN_FLASH 1 #endif /* diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h index 6e14ebf5b1..cbf50fe713 100644 --- a/include/configs/M5253EVBE.h +++ b/include/configs/M5253EVBE.h @@ -45,11 +45,11 @@ #ifndef CONFIG_MONITOR_IS_IN_RAM #define CFG_ENV_OFFSET 0x4000 #define CFG_ENV_SECT_SIZE 0x2000 -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #else #define CFG_ENV_ADDR 0xffe04000 #define CFG_ENV_SECT_SIZE 0x2000 -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #endif /* diff --git a/include/configs/M5271EVB.h b/include/configs/M5271EVB.h index 78a1b93cf7..482c262c81 100644 --- a/include/configs/M5271EVB.h +++ b/include/configs/M5271EVB.h @@ -56,7 +56,7 @@ #define CFG_ENV_ADDR 0xffe04000 #endif #define CFG_ENV_SECT_SIZE 0x2000 -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ /* diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index fc457e3bcb..22124c961f 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -54,12 +54,12 @@ #ifndef CONFIG_MONITOR_IS_IN_RAM #define CFG_ENV_OFFSET 0x4000 #define CFG_ENV_SECT_SIZE 0x2000 -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_IS_EMBEDDED 1 #else #define CFG_ENV_ADDR 0xffe04000 #define CFG_ENV_SECT_SIZE 0x2000 -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #endif /* diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h index 430af6bfa2..0a30e0b1ed 100644 --- a/include/configs/M5275EVB.h +++ b/include/configs/M5275EVB.h @@ -54,12 +54,12 @@ #ifndef CONFIG_MONITOR_IS_IN_RAM #define CFG_ENV_OFFSET 0x4000 #define CFG_ENV_SECT_SIZE 0x2000 -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_IS_EMBEDDED 1 #else #define CFG_ENV_ADDR 0xffe04000 #define CFG_ENV_SECT_SIZE 0x2000 -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #endif /* diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index eb59c250db..1763f97b65 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -50,7 +50,7 @@ */ #define CFG_ENV_ADDR 0xffe04000 #define CFG_ENV_SIZE 0x2000 -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 /* * BOOTP options diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index 58948a20a9..441f209c4a 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -230,7 +230,7 @@ */ #define CFG_ENV_OFFSET 0x4000 #define CFG_ENV_SECT_SIZE 0x2000 -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_IS_EMBEDDED 1 /*----------------------------------------------------------------------- diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index 814c3a610d..f8212c6551 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -230,7 +230,7 @@ */ #define CFG_ENV_OFFSET 0x4000 #define CFG_ENV_SECT_SIZE 0x2000 -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_IS_EMBEDDED 1 /*----------------------------------------------------------------------- diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h index 06e22443b3..d0a66ea8fe 100644 --- a/include/configs/M54451EVB.h +++ b/include/configs/M54451EVB.h @@ -272,7 +272,7 @@ # define CFG_ENV_SIZE 0x2000 # define CFG_ENV_SECT_SIZE 0x10000 #else -# define CFG_ENV_IS_IN_FLASH 1 +# define CONFIG_ENV_IS_IN_FLASH 1 # define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x4000) # define CFG_ENV_SECT_SIZE 0x2000 #endif diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index 45a244fae7..9872d58d22 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -334,7 +334,7 @@ # define CONFIG_ENV_IS_IN_SPI_FLASH # define CFG_ENV_SPI_CS 1 #else -# define CFG_ENV_IS_IN_FLASH 1 +# define CONFIG_ENV_IS_IN_FLASH 1 #endif #undef CONFIG_ENV_OVERWRITE #undef CFG_ENV_IS_EMBEDDED diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h index af6723c637..7913879489 100644 --- a/include/configs/M5475EVB.h +++ b/include/configs/M5475EVB.h @@ -279,7 +279,7 @@ */ #define CFG_ENV_OFFSET 0x2000 #define CFG_ENV_SECT_SIZE 0x2000 -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_IS_EMBEDDED 1 /*----------------------------------------------------------------------- diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h index 248db53d9a..df92a24419 100644 --- a/include/configs/M5485EVB.h +++ b/include/configs/M5485EVB.h @@ -265,7 +265,7 @@ */ #define CFG_ENV_OFFSET 0x2000 #define CFG_ENV_SECT_SIZE 0x2000 -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_IS_EMBEDDED 1 /*----------------------------------------------------------------------- diff --git a/include/configs/METROBOX.h b/include/configs/METROBOX.h index fdb840ec6c..b972390b04 100644 --- a/include/configs/METROBOX.h +++ b/include/configs/METROBOX.h @@ -204,7 +204,7 @@ * Environment *----------------------------------------------------------------------*/ #define CONFIG_ENV_IS_IN_NVRAM 1 /* Environment uses NVRAM */ -#undef CFG_ENV_IS_IN_FLASH /* ... not in flash */ +#undef CONFIG_ENV_IS_IN_FLASH /* ... not in flash */ #undef CONFIG_ENV_IS_IN_EEPROM /* ... not in EEPROM */ #define CONFIG_ENV_OVERWRITE 1 /* allow env overwrite */ diff --git a/include/configs/MHPC.h b/include/configs/MHPC.h index dde7742711..de7cb128f3 100644 --- a/include/configs/MHPC.h +++ b/include/configs/MHPC.h @@ -228,7 +228,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET CFG_MONITOR_LEN /* Offset of Environment */ #define CFG_ENV_SIZE 0x20000 /* Total Size of Environment */ diff --git a/include/configs/ML2.h b/include/configs/ML2.h index 3ce1807b52..a2703b1688 100644 --- a/include/configs/ML2.h +++ b/include/configs/ML2.h @@ -31,12 +31,12 @@ #define CONFIG_ML2 1 /* ...on a ML2 board */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #ifdef CONFIG_ENV_IS_IN_NVRAM -#undef CFG_ENV_IS_IN_FLASH +#undef CONFIG_ENV_IS_IN_FLASH #else -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #undef CONFIG_ENV_IS_IN_NVRAM #endif #endif @@ -184,7 +184,7 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ /* BEG ENVIRONNEMENT FLASH */ -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_OFFSET 0x00050000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ #define CFG_ENV_SECT_SIZE 0x10000 /* see README - env sector total size */ diff --git a/include/configs/MOUSSE.h b/include/configs/MOUSSE.h index 4052e78628..b145166f03 100644 --- a/include/configs/MOUSSE.h +++ b/include/configs/MOUSSE.h @@ -298,7 +298,7 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #if 0 -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x8000 /* Offset of the Environment Sector */ #define CFG_ENV_SIZE 0x4000 /* Size of the Environment Sector */ #else diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h index 735cfaae5b..9a76732310 100644 --- a/include/configs/MPC8260ADS.h +++ b/include/configs/MPC8260ADS.h @@ -380,7 +380,7 @@ #endif /* CONFIG_BZIP2 */ #ifndef CFG_RAMBOOT -# define CFG_ENV_IS_IN_FLASH 1 +# define CONFIG_ENV_IS_IN_FLASH 1 # define CFG_ENV_SECT_SIZE 0x40000 # define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_ENV_SECT_SIZE) #else diff --git a/include/configs/MPC8266ADS.h b/include/configs/MPC8266ADS.h index 4429e99571..e062717e6b 100644 --- a/include/configs/MPC8266ADS.h +++ b/include/configs/MPC8266ADS.h @@ -427,7 +427,7 @@ #define CFG_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */ #ifndef CFG_RAMBOOT -# define CFG_ENV_IS_IN_FLASH 1 +# define CONFIG_ENV_IS_IN_FLASH 1 # define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) # define CFG_ENV_SECT_SIZE 0x40000 #else diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index 776fe99160..aef35781cd 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -393,7 +393,7 @@ #define CFG_ENV_RANGE (CFG_ENV_SECT_SIZE * 4) #define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET + CFG_ENV_RANGE) #elif !defined(CFG_RAMBOOT) - #define CFG_ENV_IS_IN_FLASH 1 + #define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #define CFG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */ #define CFG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index 1edd9ced4b..92a6218427 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -377,7 +377,7 @@ * Environment */ #ifndef CFG_RAMBOOT - #define CFG_ENV_IS_IN_FLASH 1 + #define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #define CFG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */ #define CFG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index 308f102161..7e4849a913 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -391,7 +391,7 @@ * Environment */ #ifndef CFG_RAMBOOT - #define CFG_ENV_IS_IN_FLASH 1 + #define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #define CFG_ENV_SECT_SIZE 0x20000 #define CFG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h index b98f3ee18e..3102272ae3 100644 --- a/include/configs/MPC832XEMDS.h +++ b/include/configs/MPC832XEMDS.h @@ -403,7 +403,7 @@ * Environment */ #ifndef CFG_RAMBOOT - #define CFG_ENV_IS_IN_FLASH 1 + #define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #define CFG_ENV_SECT_SIZE 0x20000 #define CFG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index e03f5ca092..d737cb44fa 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -465,7 +465,7 @@ * Environment */ #ifndef CFG_RAMBOOT - #define CFG_ENV_IS_IN_FLASH 1 + #define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #define CFG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ #define CFG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 7f5d303f00..7635c65e36 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -413,7 +413,7 @@ boards, we say we have two, but don't display a message if we find only one. */ #define CONFIG_ENV_OVERWRITE #ifndef CFG_RAMBOOT - #define CFG_ENV_IS_IN_FLASH + #define CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #define CFG_ENV_SECT_SIZE 0x10000 /* 64K (one sector) for environment */ #define CFG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h index c532eb1fc0..37173cc467 100644 --- a/include/configs/MPC8360EMDS.h +++ b/include/configs/MPC8360EMDS.h @@ -434,7 +434,7 @@ */ #ifndef CFG_RAMBOOT - #define CFG_ENV_IS_IN_FLASH 1 + #define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #define CFG_ENV_SECT_SIZE 0x20000 #define CFG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC8360ERDK.h b/include/configs/MPC8360ERDK.h index 47016005f2..b20f16504a 100644 --- a/include/configs/MPC8360ERDK.h +++ b/include/configs/MPC8360ERDK.h @@ -339,7 +339,7 @@ */ #ifndef CFG_RAMBOOT -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) #define CFG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ #define CFG_ENV_SIZE 0x20000 diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index 220c148618..21d7d2dd64 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -421,7 +421,7 @@ * Environment */ #ifndef CFG_RAMBOOT - #define CFG_ENV_IS_IN_FLASH 1 + #define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #define CFG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ #define CFG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 289bcfaba4..7ffc743c35 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -442,7 +442,7 @@ * Environment */ #ifndef CFG_RAMBOOT - #define CFG_ENV_IS_IN_FLASH 1 + #define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_MONITOR_BASE+CFG_MONITOR_LEN) #define CFG_ENV_SECT_SIZE 0x10000 /* 64K (one sector) for env */ #define CFG_ENV_SIZE 0x4000 diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index dc304e7bca..f290075d8e 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -446,7 +446,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Environment */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #if CFG_MONITOR_BASE > 0xfff80000 #define CFG_ENV_ADDR 0xfff80000 #else diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index c23dcf66bf..0dc10965ce 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -381,7 +381,7 @@ * Environment */ #ifndef CFG_RAMBOOT - #define CFG_ENV_IS_IN_FLASH 1 + #define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) #define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ #define CFG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC8540EVAL.h b/include/configs/MPC8540EVAL.h index 04bec2d02d..d4df8a613b 100644 --- a/include/configs/MPC8540EVAL.h +++ b/include/configs/MPC8540EVAL.h @@ -260,7 +260,7 @@ #define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x100000) #define CFG_ENV_SIZE 0x2000 #else -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) #define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ #endif diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index bfd86f5069..569952daef 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -405,7 +405,7 @@ extern unsigned long get_clock_freq(void); /* * Environment */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) #define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ #define CFG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index 612e8f2a74..02776b35fd 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -394,7 +394,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Environment */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #if CFG_MONITOR_BASE > 0xfff80000 #define CFG_ENV_ADDR 0xfff80000 #else diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 06965ed4b4..4afb7aeee5 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -466,7 +466,7 @@ extern unsigned long get_clock_freq(void); /* * Environment */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) #define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ #define CFG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index a92c0fe301..c521336538 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -403,7 +403,7 @@ extern unsigned long get_clock_freq(void); /* * Environment */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) #define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ #define CFG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index f661c8e3b4..72a8b25f48 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -412,7 +412,7 @@ * Environment */ #ifndef CFG_RAMBOOT - #define CFG_ENV_IS_IN_FLASH 1 + #define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) #define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ #define CFG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index 8aeaa293bb..5b1cf6f919 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -424,7 +424,7 @@ extern unsigned long get_clock_freq(void); /* * Environment */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) #define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ #define CFG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index b0094f310f..94c02408f5 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -426,7 +426,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Environment */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #if CFG_MONITOR_BASE > 0xfff80000 #define CFG_ENV_ADDR 0xfff80000 #else diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 2ee8d57015..744110f36c 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -438,7 +438,7 @@ * Environment */ #ifndef CFG_RAMBOOT -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #define CFG_ENV_SECT_SIZE 0x20000 /* 126k (one sector) for env */ #define CFG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index 170fbd6a5c..7b5c402e9b 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -504,7 +504,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); * Environment */ #ifndef CFG_RAMBOOT - #define CFG_ENV_IS_IN_FLASH 1 + #define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x60000) #define CFG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */ #define CFG_ENV_SIZE 0x2000 diff --git a/include/configs/MUSENKI.h b/include/configs/MUSENKI.h index 4319e6c04c..4a7540ec59 100644 --- a/include/configs/MUSENKI.h +++ b/include/configs/MUSENKI.h @@ -280,7 +280,7 @@ /* Warining: environment is not EMBEDDED in the U-Boot code. * It's stored in flash separately. */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR 0xFFFF0000 #define CFG_ENV_SIZE 0x00010000 /* Size of the Environment */ #define CFG_ENV_SECT_SIZE 0x20000 /* Size of the Environment Sector */ diff --git a/include/configs/MVBC_P.h b/include/configs/MVBC_P.h index 0ce88d6be6..bf06ef831a 100644 --- a/include/configs/MVBC_P.h +++ b/include/configs/MVBC_P.h @@ -215,7 +215,7 @@ /* * Environment settings */ -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH #undef CFG_FLASH_PROTECTION #define CFG_ENV_ADDR 0xFFFE0000 diff --git a/include/configs/MVBLM7.h b/include/configs/MVBLM7.h index 849350fd8a..b8288571ab 100644 --- a/include/configs/MVBLM7.h +++ b/include/configs/MVBLM7.h @@ -255,7 +255,7 @@ #undef CFG_FLASH_PROTECTION #define CONFIG_ENV_OVERWRITE -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR 0xFF800000 #define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SECT_SIZE 0x2000 diff --git a/include/configs/MVBLUE.h b/include/configs/MVBLUE.h index 8e247af63c..819e72542e 100644 --- a/include/configs/MVBLUE.h +++ b/include/configs/MVBLUE.h @@ -328,7 +328,7 @@ #define CFG_FLASH_WRITE_TOUT 1000 -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_OFFSET 0x00010000 #define CFG_ENV_SIZE 0x00010000 diff --git a/include/configs/MVS1.h b/include/configs/MVS1.h index 87458e3624..df1586bdfe 100644 --- a/include/configs/MVS1.h +++ b/include/configs/MVS1.h @@ -174,7 +174,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 /* 4MB flash - use bottom sectors of a bottom boot sector flash (16 bit access) */ #define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector (bottom boot sector) */ diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h index 40cf275786..59d6e9a131 100644 --- a/include/configs/MigoR.h +++ b/include/configs/MigoR.h @@ -130,7 +130,7 @@ #undef CFG_DIRECT_FLASH_TFTP /* ENV setting */ -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_OVERWRITE 1 #define CFG_ENV_SECT_SIZE (128 * 1024) #define CFG_ENV_SIZE (CFG_ENV_SECT_SIZE) diff --git a/include/configs/NC650.h b/include/configs/NC650.h index 84c6e9b617..22bd0f070c 100644 --- a/include/configs/NC650.h +++ b/include/configs/NC650.h @@ -232,7 +232,7 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x00740000 #define CFG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment sector */ diff --git a/include/configs/NETPHONE.h b/include/configs/NETPHONE.h index 1494190bf9..ac4c42493e 100644 --- a/include/configs/NETPHONE.h +++ b/include/configs/NETPHONE.h @@ -216,7 +216,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SECT_SIZE 0x10000 #define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x60000) diff --git a/include/configs/NETTA.h b/include/configs/NETTA.h index 64806342ae..80aee5bc2a 100644 --- a/include/configs/NETTA.h +++ b/include/configs/NETTA.h @@ -220,7 +220,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SECT_SIZE 0x10000 #define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x60000) diff --git a/include/configs/NETTA2.h b/include/configs/NETTA2.h index efa91e304a..6cb39d9f83 100644 --- a/include/configs/NETTA2.h +++ b/include/configs/NETTA2.h @@ -217,7 +217,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SECT_SIZE 0x10000 #define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x60000) diff --git a/include/configs/NETVIA.h b/include/configs/NETVIA.h index 40e09fba62..0d318e8247 100644 --- a/include/configs/NETVIA.h +++ b/include/configs/NETVIA.h @@ -187,7 +187,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SECT_SIZE 0x10000 #define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x60000) diff --git a/include/configs/NSCU.h b/include/configs/NSCU.h index 31762b9a36..9991d69976 100644 --- a/include/configs/NSCU.h +++ b/include/configs/NSCU.h @@ -207,7 +207,7 @@ #define CFG_MAX_FLASH_BANKS 2 /* max number of memory banks */ #define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ diff --git a/include/configs/NX823.h b/include/configs/NX823.h index 2a4bd4724c..eddb52bece 100644 --- a/include/configs/NX823.h +++ b/include/configs/NX823.h @@ -147,7 +147,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define xEMBED #ifdef EMBED #define CFG_ENV_SIZE 0x200 /* FIXME How big when embedded?? */ diff --git a/include/configs/OXC.h b/include/configs/OXC.h index 8d61bcd2d4..d9b4224fe1 100644 --- a/include/configs/OXC.h +++ b/include/configs/OXC.h @@ -193,7 +193,7 @@ * Environment */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR 0xFFF30000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x00010000 /* Total Size of Environment Sector */ #define CFG_ENV_IS_EMBEDDED 1 /* short-cut compile-time test */ diff --git a/include/configs/P3G4.h b/include/configs/P3G4.h index 5a2d157705..232044b084 100644 --- a/include/configs/P3G4.h +++ b/include/configs/P3G4.h @@ -397,7 +397,7 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CFG_FLASH_CFI 1 -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ #define CFG_ENV_SECT_SIZE 0x20000 #define CFG_ENV_ADDR 0xFFFE0000 diff --git a/include/configs/PATI.h b/include/configs/PATI.h index 2676c78fa9..96150447c7 100644 --- a/include/configs/PATI.h +++ b/include/configs/PATI.h @@ -178,8 +178,8 @@ #define CFG_ENV_SIZE 2048 #endif -#undef CFG_ENV_IS_IN_FLASH -#ifdef CFG_ENV_IS_IN_FLASH +#undef CONFIG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SIZE 0x00002000 /* Set whole sector as env */ #define CFG_ENV_OFFSET ((0 - CFG_FLASH_BASE) - CFG_ENV_SIZE) /* Environment starts at this adress */ #endif diff --git a/include/configs/PCI5441.h b/include/configs/PCI5441.h index abb9bfc25c..94f6f93454 100644 --- a/include/configs/PCI5441.h +++ b/include/configs/PCI5441.h @@ -84,7 +84,7 @@ * of flash. NOTE: the monitor length must be multiple of sector size * (which is common practice). *----------------------------------------------------------------------*/ -#define CFG_ENV_IS_IN_FLASH 1 /* Environment in flash */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */ #define CFG_ENV_SIZE (64 * 1024) /* 64 KByte (1 sector) */ #define CONFIG_ENV_OVERWRITE /* Serial change Ok */ #define CFG_ENV_ADDR (CFG_RESET_ADDR + CFG_MONITOR_LEN) diff --git a/include/configs/PCIPPC2.h b/include/configs/PCIPPC2.h index 6ebaa85e8c..af3b8ee5a2 100644 --- a/include/configs/PCIPPC2.h +++ b/include/configs/PCIPPC2.h @@ -221,7 +221,7 @@ * Note: environment is not EMBEDDED in the U-Boot code. * It's stored in flash separately. */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x70000) #define CFG_ENV_SIZE 0x1000 /* Size of the Environment */ #define CFG_ENV_SECT_SIZE 0x10000 /* Size of the Environment Sector */ diff --git a/include/configs/PCIPPC6.h b/include/configs/PCIPPC6.h index 9202794ab2..e229bde246 100644 --- a/include/configs/PCIPPC6.h +++ b/include/configs/PCIPPC6.h @@ -223,7 +223,7 @@ * Note: environment is not EMBEDDED in the U-Boot code. * It's stored in flash separately. */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x70000) #define CFG_ENV_SIZE 0x1000 /* Size of the Environment */ #define CFG_ENV_SECT_SIZE 0x10000 /* Size of the Environment Sector */ diff --git a/include/configs/PK1C20.h b/include/configs/PK1C20.h index d90351add3..48e9269d99 100644 --- a/include/configs/PK1C20.h +++ b/include/configs/PK1C20.h @@ -86,7 +86,7 @@ * of flash. NOTE: the monitor length must be multiple of sector size * (which is common practice). *----------------------------------------------------------------------*/ -#define CFG_ENV_IS_IN_FLASH 1 /* Environment in flash */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */ #define CFG_ENV_SIZE (64 * 1024) /* 64 KByte (1 sector) */ #define CONFIG_ENV_OVERWRITE /* Serial change Ok */ #define CFG_ENV_ADDR (CFG_RESET_ADDR + CFG_MONITOR_LEN) diff --git a/include/configs/PM520.h b/include/configs/PM520.h index 5e0bb056d8..4da84ca9ff 100644 --- a/include/configs/PM520.h +++ b/include/configs/PM520.h @@ -245,7 +245,7 @@ /* * Environment settings */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x10000 #define CFG_ENV_SECT_SIZE 0x40000 #define CONFIG_ENV_OVERWRITE 1 diff --git a/include/configs/PM826.h b/include/configs/PM826.h index de1ecde0d5..0782ff0c47 100644 --- a/include/configs/PM826.h +++ b/include/configs/PM826.h @@ -257,7 +257,7 @@ #if 0 /* Start port with environment in flash; switch to EEPROM later */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_FLASH_BASE+0x40000) #define CFG_ENV_SIZE 0x40000 #define CFG_ENV_SECT_SIZE 0x40000 diff --git a/include/configs/PM828.h b/include/configs/PM828.h index cac8f27266..a342824ef4 100644 --- a/include/configs/PM828.h +++ b/include/configs/PM828.h @@ -250,7 +250,7 @@ #if 0 /* Start port with environment in flash; switch to EEPROM later */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_FLASH_BASE+0x40000) #define CFG_ENV_SIZE 0x40000 #define CFG_ENV_SECT_SIZE 0x40000 diff --git a/include/configs/PM854.h b/include/configs/PM854.h index 1212bcdb7c..8babcb2730 100644 --- a/include/configs/PM854.h +++ b/include/configs/PM854.h @@ -293,7 +293,7 @@ * Environment */ #ifndef CFG_RAMBOOT - #define CFG_ENV_IS_IN_FLASH 1 + #define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x80000) #define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ #define CFG_ENV_SIZE 0x2000 diff --git a/include/configs/PM856.h b/include/configs/PM856.h index 75dba3bcb1..9690bd7631 100644 --- a/include/configs/PM856.h +++ b/include/configs/PM856.h @@ -293,7 +293,7 @@ * Environment */ #ifndef CFG_RAMBOOT - #define CFG_ENV_IS_IN_FLASH 1 + #define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x80000) #define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ #define CFG_ENV_SIZE 0x2000 diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h index 5b253230c1..7a787761d2 100644 --- a/include/configs/PMC440.h +++ b/include/configs/PMC440.h @@ -136,7 +136,7 @@ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ #define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */ -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ #define CFG_ENV_ADDR ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h index a33bc3ba5a..81085ec0df 100644 --- a/include/configs/PPChameleonEVB.h +++ b/include/configs/PPChameleonEVB.h @@ -423,7 +423,7 @@ #else /* DEFAULT: environment in flash, using redundand flash sectors */ -#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ #define CFG_ENV_ADDR 0xFFFF8000 /* environment starts at the first small sector */ #define CFG_ENV_SECT_SIZE 0x2000 /* 8196 bytes may be used for env vars*/ #define CFG_ENV_ADDR_REDUND 0xFFFFA000 diff --git a/include/configs/QS823.h b/include/configs/QS823.h index cef9f42dfd..3c7fc6f906 100644 --- a/include/configs/QS823.h +++ b/include/configs/QS823.h @@ -223,7 +223,7 @@ /*----------------------------------------------------------------------- * Environment variable storage is in FLASH, one sector before U-boot */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SECT_SIZE 0x20000 /* 128Kb, one whole sector */ #define CFG_ENV_SIZE 0x2000 /* 8kb */ #define CFG_ENV_ADDR 0xffee0000 /* address of env sector */ diff --git a/include/configs/QS850.h b/include/configs/QS850.h index ba5827a22d..44daf520c1 100644 --- a/include/configs/QS850.h +++ b/include/configs/QS850.h @@ -223,7 +223,7 @@ /*----------------------------------------------------------------------- * Environment variable storage is in FLASH, one sector before U-boot */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SECT_SIZE 0x20000 /* 128Kb, one whole sector */ #define CFG_ENV_SIZE 0x2000 /* 8kb */ #define CFG_ENV_ADDR 0xffee0000 /* address of env sector */ diff --git a/include/configs/QS860T.h b/include/configs/QS860T.h index 9dfceef3c8..dd79246301 100644 --- a/include/configs/QS860T.h +++ b/include/configs/QS860T.h @@ -213,7 +213,7 @@ CONFIG_SPI #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#undef CFG_ENV_IS_IN_FLASH +#undef CONFIG_ENV_IS_IN_FLASH /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/R360MPI.h b/include/configs/R360MPI.h index a653cca96f..26729fcb68 100644 --- a/include/configs/R360MPI.h +++ b/include/configs/R360MPI.h @@ -229,7 +229,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x40000 /* Offset of Environment */ #define CFG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment sector */ #define CFG_ENV_SIZE 0x4000 /* Used Size of Environment sector */ diff --git a/include/configs/RBC823.h b/include/configs/RBC823.h index 9222d21554..8f59450908 100644 --- a/include/configs/RBC823.h +++ b/include/configs/RBC823.h @@ -203,7 +203,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x10000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ diff --git a/include/configs/RPXClassic.h b/include/configs/RPXClassic.h index 37623910ab..50345e53e9 100644 --- a/include/configs/RPXClassic.h +++ b/include/configs/RPXClassic.h @@ -219,7 +219,7 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #if 0 -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x20000 /* Offset of Environment Sector */ #define CFG_ENV_SECT_SIZE 0x8000 #define CFG_ENV_SIZE 0x8000 /* Total Size of Environment Sector */ diff --git a/include/configs/RPXlite.h b/include/configs/RPXlite.h index 671094b69d..2e4710ac6f 100644 --- a/include/configs/RPXlite.h +++ b/include/configs/RPXlite.h @@ -155,7 +155,7 @@ #define CFG_DIRECT_FLASH_TFTP -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SECT_SIZE 0x40000 /* We use one complete sector */ #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) diff --git a/include/configs/RPXlite_DW.h b/include/configs/RPXlite_DW.h index d1358186a6..724dc48eb2 100644 --- a/include/configs/RPXlite_DW.h +++ b/include/configs/RPXlite_DW.h @@ -233,7 +233,7 @@ #define CFG_ENV_ADDR 0xFA000100 #define CFG_ENV_SIZE 0x1000 #else -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_OFFSET 0x30000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x8000 /* Total Size of Environment Sector */ #endif /* CONFIG_ENV_IS_IN_NVRAM */ diff --git a/include/configs/RPXsuper.h b/include/configs/RPXsuper.h index 2a9c62709b..8bdb401508 100644 --- a/include/configs/RPXsuper.h +++ b/include/configs/RPXsuper.h @@ -300,7 +300,7 @@ #define CFG_FLASH_WRITE_TOUT 1 /* Timeout for Flash Write (in ms) */ #ifndef CFG_RAMBOOT -# define CFG_ENV_IS_IN_FLASH 1 +# define CONFIG_ENV_IS_IN_FLASH 1 # ifdef CFG_ENV_IN_OWN_SECT # define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) diff --git a/include/configs/RRvision.h b/include/configs/RRvision.h index 6a71801935..22d3da614d 100644 --- a/include/configs/RRvision.h +++ b/include/configs/RRvision.h @@ -227,7 +227,7 @@ #define CFG_FLASH_ERASE_TOUT (120*CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (1 * CFG_HZ) /* Timeout for Flash Write */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ diff --git a/include/configs/Rattler.h b/include/configs/Rattler.h index e8ed0951c8..e603f29b3b 100644 --- a/include/configs/Rattler.h +++ b/include/configs/Rattler.h @@ -223,12 +223,12 @@ #define CFG_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE 0x10000 #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) -#endif /* CFG_ENV_IS_IN_FLASH */ +#endif /* CONFIG_ENV_IS_IN_FLASH */ #define CFG_DEFAULT_IMMR 0xFF010000 diff --git a/include/configs/SBC8540.h b/include/configs/SBC8540.h index 6b25d56fcb..64f2320574 100644 --- a/include/configs/SBC8540.h +++ b/include/configs/SBC8540.h @@ -337,7 +337,7 @@ #define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x100000) #define CFG_ENV_SIZE 0x2000 #else - #define CFG_ENV_IS_IN_FLASH 1 + #define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ #define CFG_ENV_ADDR (CFG_MONITOR_BASE - CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE 0x2000 /* CFG_ENV_SECT_SIZE */ diff --git a/include/configs/SCM.h b/include/configs/SCM.h index 2c7e55f287..bc779de804 100644 --- a/include/configs/SCM.h +++ b/include/configs/SCM.h @@ -270,7 +270,7 @@ #if 0 /* Start port with environment in flash; switch to EEPROM later */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_FLASH_BASE+0x40000) #define CFG_ENV_SIZE 0x40000 #define CFG_ENV_SECT_SIZE 0x40000 diff --git a/include/configs/SL8245.h b/include/configs/SL8245.h index 31853c8de3..56436a4354 100644 --- a/include/configs/SL8245.h +++ b/include/configs/SL8245.h @@ -257,7 +257,7 @@ /* Warining: environment is not EMBEDDED in the U-Boot code. * It's stored in flash separately. */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR 0xFFFF0000 #define CFG_ENV_SIZE 0x00010000 /* Size of the Environment */ #define CFG_ENV_SECT_SIZE 0x00010000 /* Size of the Environment Sector */ diff --git a/include/configs/SM850.h b/include/configs/SM850.h index 465db4735f..138dbd24c7 100644 --- a/include/configs/SM850.h +++ b/include/configs/SM850.h @@ -163,7 +163,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ diff --git a/include/configs/SMN42.h b/include/configs/SMN42.h index a5d3d69588..583ee21114 100644 --- a/include/configs/SMN42.h +++ b/include/configs/SMN42.h @@ -189,7 +189,7 @@ #define CFG_MAX_FLASH_BANKS 2 /* max number of memory banks */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 /* The Environment Sector is in the CPU-internal flash */ #define CFG_FLASH_BASE 0 #define CFG_ENV_OFFSET 0x3C000 diff --git a/include/configs/SPD823TS.h b/include/configs/SPD823TS.h index 395c7a1e7a..39ab1c80a6 100644 --- a/include/configs/SPD823TS.h +++ b/include/configs/SPD823TS.h @@ -167,7 +167,7 @@ #define CFG_FLASH_ERASE_TOUT 0 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 0 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x0800 /* Total Size of Environment Sector */ /*----------------------------------------------------------------------- diff --git a/include/configs/SX1.h b/include/configs/SX1.h index d23367979f..d1b6998b96 100644 --- a/include/configs/SX1.h +++ b/include/configs/SX1.h @@ -189,7 +189,7 @@ #define CFG_FLASH_ERASE_TOUT (20*CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (20*CFG_HZ) /* Timeout for Flash Write */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SECT_SIZE PHYS_FLASH_SECT_SIZE #define CFG_ENV_SIZE CFG_ENV_SECT_SIZE /* Total Size of Environment Sector */ #define CFG_ENV_OFFSET ( CFG_MONITOR_BASE + CFG_MONITOR_LEN ) /* Environment after Monitor */ diff --git a/include/configs/SXNI855T.h b/include/configs/SXNI855T.h index 85b3a9f75d..67b6071be1 100644 --- a/include/configs/SXNI855T.h +++ b/include/configs/SXNI855T.h @@ -449,8 +449,8 @@ #define CONFIG_RESET_ON_PANIC /* reset if system panic() */ -#define CFG_ENV_IS_IN_FLASH -#ifdef CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* environment is in FLASH */ #define CFG_ENV_ADDR 0xF8040000 /* AM29LV641 or AM29LV800BT */ #define CFG_ENV_ADDR_REDUND 0xF8050000 /* AM29LV641 or AM29LV800BT */ diff --git a/include/configs/Sandpoint8240.h b/include/configs/Sandpoint8240.h index cfd16d3127..7c880ab5ad 100644 --- a/include/configs/Sandpoint8240.h +++ b/include/configs/Sandpoint8240.h @@ -176,7 +176,7 @@ #else #define CFG_FLASH_SIZE (1024 * 1024) /* Unity has onboard 1MByte flash */ #endif -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x00004000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x00002000 /* Total Size of Environment Sector */ diff --git a/include/configs/Sandpoint8245.h b/include/configs/Sandpoint8245.h index c0f2c5796a..39f66cbdb3 100644 --- a/include/configs/Sandpoint8245.h +++ b/include/configs/Sandpoint8245.h @@ -146,7 +146,7 @@ #else #define CFG_FLASH_SIZE (1024 * 1024) /* Unity has onboard 1MByte flash */ #endif -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x00004000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x00002000 /* Total Size of Environment Sector */ diff --git a/include/configs/TASREG.h b/include/configs/TASREG.h index dccdf0ca9b..1b2b70a452 100644 --- a/include/configs/TASREG.h +++ b/include/configs/TASREG.h @@ -195,7 +195,7 @@ #define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE) #define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR 0xFFC40000 /* Address of Environment Sector*/ #define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ #define CFG_ENV_SECT_SIZE 0x10000 /* see README - env sector total size */ diff --git a/include/configs/TB5200.h b/include/configs/TB5200.h index 3b6816675a..97a8d6f8a0 100644 --- a/include/configs/TB5200.h +++ b/include/configs/TB5200.h @@ -296,7 +296,7 @@ /* * Environment settings */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x10000 #if defined(CONFIG_TQM5200_B) #define CFG_ENV_SECT_SIZE 0x40000 diff --git a/include/configs/TK885D.h b/include/configs/TK885D.h index 8073b7ec6e..99829169cc 100644 --- a/include/configs/TK885D.h +++ b/include/configs/TK885D.h @@ -254,7 +254,7 @@ #define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */ #define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x08000 /* Total Size of Environment */ #define CFG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */ diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index 0ba7455896..d91d2e51b2 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -456,7 +456,7 @@ /* * Environment settings */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x4000 /* 16 k - keep small for fast booting */ #if defined(CONFIG_TQM5200_B) || defined (CONFIG_CAM5200) #define CFG_ENV_SECT_SIZE 0x40000 diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h index 839b6be91b..a979351166 100644 --- a/include/configs/TQM823L.h +++ b/include/configs/TQM823L.h @@ -215,7 +215,7 @@ #define CFG_MAX_FLASH_BANKS 2 /* max number of memory banks */ #define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h index b9a7a59c25..86432c6eae 100644 --- a/include/configs/TQM823M.h +++ b/include/configs/TQM823M.h @@ -210,7 +210,7 @@ #define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */ #define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x08000 /* Total Size of Environment */ #define CFG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment Sector */ diff --git a/include/configs/TQM8260.h b/include/configs/TQM8260.h index a77b1199bd..46ecb5127a 100644 --- a/include/configs/TQM8260.h +++ b/include/configs/TQM8260.h @@ -306,7 +306,7 @@ #if 0 /* Start port with environment in flash; switch to EEPROM later */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_FLASH_BASE+0x40000) #define CFG_ENV_SIZE 0x40000 #define CFG_ENV_SECT_SIZE 0x40000 diff --git a/include/configs/TQM8272.h b/include/configs/TQM8272.h index 039ecf17bb..8642a9f610 100644 --- a/include/configs/TQM8272.h +++ b/include/configs/TQM8272.h @@ -381,7 +381,7 @@ #define CFG_UPDATE_FLASH_SIZE -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x40000) #define CFG_ENV_SIZE 0x20000 #define CFG_ENV_SECT_SIZE 0x20000 diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index 2ab6991513..0d47d70fd1 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -300,7 +300,7 @@ extern int tqm834x_num_flash_banks; #define CONFIG_ENV_OVERWRITE #ifndef CFG_RAMBOOT - #define CFG_ENV_IS_IN_FLASH 1 + #define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) #define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ #define CFG_ENV_SIZE 0x2000 diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h index 388fafc555..1a80896176 100644 --- a/include/configs/TQM850L.h +++ b/include/configs/TQM850L.h @@ -200,7 +200,7 @@ #define CFG_MAX_FLASH_BANKS 2 /* max number of memory banks */ #define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h index 6f0864f47a..4626f2ef27 100644 --- a/include/configs/TQM850M.h +++ b/include/configs/TQM850M.h @@ -199,7 +199,7 @@ #define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */ #define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x08000 /* Total Size of Environment */ #define CFG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment Sector */ diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h index 093d6599ea..6582d97a11 100644 --- a/include/configs/TQM855L.h +++ b/include/configs/TQM855L.h @@ -205,7 +205,7 @@ #define CFG_MAX_FLASH_BANKS 2 /* max number of memory banks */ #define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h index 64bbc39cf8..2ff208c44a 100644 --- a/include/configs/TQM855M.h +++ b/include/configs/TQM855M.h @@ -239,7 +239,7 @@ #define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */ #define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x08000 /* Total Size of Environment */ #define CFG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment Sector */ diff --git a/include/configs/TQM85xx.h b/include/configs/TQM85xx.h index 5e1cf956f1..c6bb4f902e 100644 --- a/include/configs/TQM85xx.h +++ b/include/configs/TQM85xx.h @@ -558,7 +558,7 @@ /* * Environment */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #ifdef CONFIG_TQM_FLASH_N_TYPE #define CFG_ENV_SECT_SIZE 0x40000 /* 256K (one sector) for env */ diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h index dacc3406bb..1daf8666ba 100644 --- a/include/configs/TQM860L.h +++ b/include/configs/TQM860L.h @@ -204,7 +204,7 @@ #define CFG_MAX_FLASH_BANKS 2 /* max number of memory banks */ #define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h index 3ec849c8bc..dcdcdc1ae9 100644 --- a/include/configs/TQM860M.h +++ b/include/configs/TQM860M.h @@ -204,7 +204,7 @@ #define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */ #define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x08000 /* Total Size of Environment Sector */ #define CFG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */ diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h index 6c610ee590..53a8f34503 100644 --- a/include/configs/TQM862L.h +++ b/include/configs/TQM862L.h @@ -208,7 +208,7 @@ #define CFG_MAX_FLASH_BANKS 2 /* max number of memory banks */ #define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h index 2eca59b99d..41a0cac8a3 100644 --- a/include/configs/TQM862M.h +++ b/include/configs/TQM862M.h @@ -208,7 +208,7 @@ #define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */ #define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x08000 /* Total Size of Environment */ #define CFG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment Sector */ diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h index 4683286d7a..3e50cd4223 100644 --- a/include/configs/TQM866M.h +++ b/include/configs/TQM866M.h @@ -248,7 +248,7 @@ #define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */ #define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x08000 /* Total Size of Environment Sector */ #define CFG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */ diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h index 5daaf04be8..ebdf17d397 100644 --- a/include/configs/TQM885D.h +++ b/include/configs/TQM885D.h @@ -251,7 +251,7 @@ #define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */ #define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x08000 /* Total Size of Environment */ #define CFG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */ diff --git a/include/configs/Total5200.h b/include/configs/Total5200.h index 25e98e249e..16584ecbc3 100644 --- a/include/configs/Total5200.h +++ b/include/configs/Total5200.h @@ -232,7 +232,7 @@ /* * Environment settings */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x40000 #define CFG_ENV_SECT_SIZE 0x40000 #define CONFIG_ENV_OVERWRITE 1 diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h index 50dd7aae9f..9822d7d428 100644 --- a/include/configs/VCMA9.h +++ b/include/configs/VCMA9.h @@ -239,7 +239,7 @@ #define CFG_FLASH_WRITE_TOUT (5*CFG_HZ) /* Timeout for Flash Write */ #if 0 -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ #endif diff --git a/include/configs/VoVPN-GW.h b/include/configs/VoVPN-GW.h index db05d82bfc..d8d97e84fb 100644 --- a/include/configs/VoVPN-GW.h +++ b/include/configs/VoVPN-GW.h @@ -259,7 +259,7 @@ #define CFG_MONITOR_OFFSET 0x00700000 /* environment in flash */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00020000) #define CFG_ENV_SIZE 0x00020000 #define CFG_ENV_SECT_SIZE 0x00020000 diff --git a/include/configs/W7OLMC.h b/include/configs/W7OLMC.h index d4ec03e5e8..2471a44172 100644 --- a/include/configs/W7OLMC.h +++ b/include/configs/W7OLMC.h @@ -261,7 +261,7 @@ /*----------------------------------------------------------------------- * Flash EEPROM for environment */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x00040000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x10000 /* Total Size of env. sector */ diff --git a/include/configs/W7OLMG.h b/include/configs/W7OLMG.h index ac52e39fe0..fe09c9a130 100644 --- a/include/configs/W7OLMG.h +++ b/include/configs/W7OLMG.h @@ -268,7 +268,7 @@ /*----------------------------------------------------------------------- * Flash EEPROM for environment */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x00040000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x10000 /* Total Size of env. sector */ diff --git a/include/configs/Yukon8220.h b/include/configs/Yukon8220.h index 9ace43eff9..ef230e15df 100644 --- a/include/configs/Yukon8220.h +++ b/include/configs/Yukon8220.h @@ -205,7 +205,7 @@ /* * Environment settings */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #if defined (CFG_AMD_BOOT) #define CFG_ENV_ADDR (CFG_FLASH0_BASE + CFG_CS0_MASK - PHYS_AMD_SECT_SIZE) #define CFG_ENV_SIZE PHYS_AMD_SECT_SIZE @@ -224,15 +224,15 @@ #define CONFIG_ENV_OVERWRITE 1 -#if defined CFG_ENV_IS_IN_FLASH +#if defined CONFIG_ENV_IS_IN_FLASH #undef CONFIG_ENV_IS_IN_NVRAM #undef CONFIG_ENV_IS_IN_EEPROM #elif defined CONFIG_ENV_IS_IN_NVRAM -#undef CFG_ENV_IS_IN_FLASH +#undef CONFIG_ENV_IS_IN_FLASH #undef CONFIG_ENV_IS_IN_EEPROM #elif defined CONFIG_ENV_IS_IN_EEPROM #undef CONFIG_ENV_IS_IN_NVRAM -#undef CFG_ENV_IS_IN_FLASH +#undef CONFIG_ENV_IS_IN_FLASH #endif #ifndef CFG_JFFS2_FIRST_SECTOR diff --git a/include/configs/ZPC1900.h b/include/configs/ZPC1900.h index 4217900e60..5fade6332e 100644 --- a/include/configs/ZPC1900.h +++ b/include/configs/ZPC1900.h @@ -220,11 +220,11 @@ #define CFG_MALLOC_LEN (4096 << 10) /* Reserve 4 MB for malloc() */ #define CFG_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */ -#if !defined(CFG_ENV_IS_IN_FLASH) && !defined(CONFIG_ENV_IS_IN_NVRAM) +#if !defined(CONFIG_ENV_IS_IN_FLASH) && !defined(CONFIG_ENV_IS_IN_NVRAM) #define CONFIG_ENV_IS_IN_NVRAM 1 #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH # define CFG_ENV_SECT_SIZE 0x10000 # define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #else diff --git a/include/configs/ZUMA.h b/include/configs/ZUMA.h index 5ba8d1a715..1b71388483 100644 --- a/include/configs/ZUMA.h +++ b/include/configs/ZUMA.h @@ -349,7 +349,7 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CFG_FLASH_CFI 1 -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ #define CFG_ENV_SECT_SIZE 0x10000 /* see README - env sect real size */ #define CFG_ENV_ADDR (0xfff80000 - CFG_ENV_SECT_SIZE) diff --git a/include/configs/acadia.h b/include/configs/acadia.h index 894a62b847..ffaaa847a3 100644 --- a/include/configs/acadia.h +++ b/include/configs/acadia.h @@ -96,7 +96,7 @@ * Environment *----------------------------------------------------------------------*/ #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL) -#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ #else #define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */ #define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */ @@ -123,7 +123,7 @@ #define CFG_NO_FLASH 1 /* No NOR on Acadia when NAND-booting */ #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE 0x40000 /* size of one complete sector */ #define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ diff --git a/include/configs/actux1.h b/include/configs/actux1.h index 33a74949a5..d18c4b5848 100644 --- a/include/configs/actux1.h +++ b/include/configs/actux1.h @@ -202,7 +202,7 @@ * environment organization: * one flash sector, embedded in uboot area (bottom bootblock flash) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x2000 #define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x4000) #define CFG_USE_PPCENV 1 diff --git a/include/configs/actux2.h b/include/configs/actux2.h index 75aaa11842..f6919a5edf 100644 --- a/include/configs/actux2.h +++ b/include/configs/actux2.h @@ -179,7 +179,7 @@ * environment organization: * one flash sector, embedded in uboot area (bottom bootblock flash) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x2000 #define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x4000) #define CFG_USE_PPCENV 1 diff --git a/include/configs/actux3.h b/include/configs/actux3.h index 693c2847fd..dfc8967d29 100644 --- a/include/configs/actux3.h +++ b/include/configs/actux3.h @@ -179,7 +179,7 @@ * environment organization: * one flash sector, embedded in uboot area (bottom bootblock flash) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x2000 #define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x4000) #define CFG_USE_PPCENV 1 diff --git a/include/configs/actux4.h b/include/configs/actux4.h index 7f8e0f4d0f..48d3713f36 100644 --- a/include/configs/actux4.h +++ b/include/configs/actux4.h @@ -176,7 +176,7 @@ #define CFG_CACHELINE_SIZE 32 /* environment organization: one complete 4k flash sector */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x1000 #define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x3f000) diff --git a/include/configs/ads5121.h b/include/configs/ads5121.h index f516c4602c..eb6a6454a1 100644 --- a/include/configs/ads5121.h +++ b/include/configs/ads5121.h @@ -320,7 +320,7 @@ /* * Environment */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 /* This has to be a multiple of the Flash sector size */ #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #define CFG_ENV_SIZE 0x2000 diff --git a/include/configs/aev.h b/include/configs/aev.h index f27cc4a150..bd7dab2f7b 100644 --- a/include/configs/aev.h +++ b/include/configs/aev.h @@ -246,7 +246,7 @@ /* * Environment settings */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x10000 #define CFG_ENV_SECT_SIZE 0x20000 #define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE) diff --git a/include/configs/alpr.h b/include/configs/alpr.h index f342c7a6db..ee60644ad0 100644 --- a/include/configs/alpr.h +++ b/include/configs/alpr.h @@ -93,7 +93,7 @@ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ #define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */ -#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ #define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ #define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE) diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h index 3db609bb3b..79f4d11447 100644 --- a/include/configs/ap325rxa.h +++ b/include/configs/ap325rxa.h @@ -160,7 +160,7 @@ #undef CFG_DIRECT_FLASH_TFTP /* ENV setting */ -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_OVERWRITE 1 #define CFG_ENV_SECT_SIZE (128 * 1024) #define CFG_ENV_SIZE (CFG_ENV_SECT_SIZE) diff --git a/include/configs/armadillo.h b/include/configs/armadillo.h index 98a83db296..45b20bdc4a 100644 --- a/include/configs/armadillo.h +++ b/include/configs/armadillo.h @@ -147,7 +147,7 @@ #define CFG_FLASH_ERASE_TOUT (2*CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x20000) /* Addr of Environment Sector */ #define CFG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */ diff --git a/include/configs/assabet.h b/include/configs/assabet.h index ed7b5ef8ff..3cc4db43ac 100644 --- a/include/configs/assabet.h +++ b/include/configs/assabet.h @@ -160,9 +160,9 @@ #undef CFG_FLASH_PROTECTION #define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE } -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) #define CFG_ENV_IN_OWN_SECTOR 1 #define CFG_ENV_ADDR (PHYS_FLASH_1 + PHYS_FLASH_SECT_SIZE) #define CFG_ENV_SIZE PHYS_FLASH_SECT_SIZE diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h index acf452bbe3..fb5358c787 100644 --- a/include/configs/at91cap9adk.h +++ b/include/configs/at91cap9adk.h @@ -163,7 +163,7 @@ #else /* bootstrap + u-boot + env + linux in norflash */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_MONITOR_BASE (PHYS_FLASH_1 + 0x8000) #define CFG_ENV_OFFSET 0x4000 #define CFG_ENV_ADDR (PHYS_FLASH_1 + CFG_ENV_OFFSET) diff --git a/include/configs/at91rm9200dk.h b/include/configs/at91rm9200dk.h index 92724abbe8..31d84d2162 100644 --- a/include/configs/at91rm9200dk.h +++ b/include/configs/at91rm9200dk.h @@ -186,7 +186,7 @@ #define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET) #define CFG_ENV_SIZE 0x2000 /* 0x8000 */ #else -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #ifdef CONFIG_SKIP_LOWLEVEL_INIT #define CFG_ENV_ADDR (PHYS_FLASH_1 + 0xe000) /* between boot.bin and u-boot.bin.gz */ #define CFG_ENV_SIZE 0x2000 /* 0x8000 */ diff --git a/include/configs/atc.h b/include/configs/atc.h index 1e393a2a1f..a7b154ddbd 100644 --- a/include/configs/atc.h +++ b/include/configs/atc.h @@ -270,7 +270,7 @@ #if 1 /* environment is in Flash */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 # define CFG_ENV_ADDR (CFG_FLASH_BASE+0x30000) # define CFG_ENV_SIZE 0x10000 # define CFG_ENV_SECT_SIZE 0x10000 diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h index 6d8c1b22a3..12da7f0906 100644 --- a/include/configs/atngw100.h +++ b/include/configs/atngw100.h @@ -153,7 +153,7 @@ #define CFG_INTRAM_SIZE INTERNAL_SRAM_SIZE #define CFG_SDRAM_BASE EBI_SDRAM_BASE -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 65536 #define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE) diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h index 3a7d27354f..4a9a94e365 100644 --- a/include/configs/atstk1002.h +++ b/include/configs/atstk1002.h @@ -177,7 +177,7 @@ #define CFG_INTRAM_SIZE INTERNAL_SRAM_SIZE #define CFG_SDRAM_BASE EBI_SDRAM_BASE -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 65536 #define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE) diff --git a/include/configs/atstk1003.h b/include/configs/atstk1003.h index 55ea7f290f..62c1aff85b 100644 --- a/include/configs/atstk1003.h +++ b/include/configs/atstk1003.h @@ -160,7 +160,7 @@ #define CFG_INTRAM_SIZE INTERNAL_SRAM_SIZE #define CFG_SDRAM_BASE EBI_SDRAM_BASE -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 65536 #define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE) diff --git a/include/configs/atstk1004.h b/include/configs/atstk1004.h index 369c619649..a9a94841e1 100644 --- a/include/configs/atstk1004.h +++ b/include/configs/atstk1004.h @@ -160,7 +160,7 @@ #define CFG_INTRAM_SIZE INTERNAL_SRAM_SIZE #define CFG_SDRAM_BASE EBI_SDRAM_BASE -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 65536 #define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE) diff --git a/include/configs/atstk1006.h b/include/configs/atstk1006.h index 902f822e45..c454ec01c8 100644 --- a/include/configs/atstk1006.h +++ b/include/configs/atstk1006.h @@ -177,7 +177,7 @@ #define CFG_INTRAM_SIZE INTERNAL_SRAM_SIZE #define CFG_SDRAM_BASE EBI_SDRAM_BASE -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 65536 #define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE) diff --git a/include/configs/bamboo.h b/include/configs/bamboo.h index 20ebc3fb8f..2485477876 100644 --- a/include/configs/bamboo.h +++ b/include/configs/bamboo.h @@ -103,7 +103,7 @@ * Environment *----------------------------------------------------------------------*/ #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL) -#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ #else #define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */ #define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */ @@ -126,7 +126,7 @@ #define CFG_FLASH_2ND_16BIT_DEV 1 /* bamboo has 8 and 16bit device */ #define CFG_FLASH_2ND_ADDR 0x87800000 /* bamboo has 8 and 16bit device */ -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ #define CFG_ENV_ADDR ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ @@ -134,7 +134,7 @@ /* Address and size of Redundant Environment Sector */ #define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) -#endif /* CFG_ENV_IS_IN_FLASH */ +#endif /* CONFIG_ENV_IS_IN_FLASH */ /* * IPL (Initial Program Loader, integrated inside CPU) diff --git a/include/configs/barco.h b/include/configs/barco.h index 4f57067db1..cbf5868a31 100644 --- a/include/configs/barco.h +++ b/include/configs/barco.h @@ -166,7 +166,7 @@ #define CFG_FLASH_BASE 0xFFF00000 #define CFG_FLASH_SIZE (8 * 1024 * 1024) /* Unity has onboard 1MByte flash */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x000047A4 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x00002000 /* Total Size of Environment Sector */ /* #define ENV_CRC 0x8BF6F24B XXX - FIXME: gets defined automatically */ diff --git a/include/configs/bf533-ezkit.h b/include/configs/bf533-ezkit.h index 2f551adca4..08fb639c15 100644 --- a/include/configs/bf533-ezkit.h +++ b/include/configs/bf533-ezkit.h @@ -138,7 +138,7 @@ #define CFG_MAX_FLASH_BANKS 3 /* max number of memory banks */ #define CFG_MAX_FLASH_SECT 40 /* max number of sectors on one chip */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR 0x20020000 #define CFG_ENV_SECT_SIZE 0x10000 /* Total Size of Environment Sector */ diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h index 842207f731..2e71780d07 100644 --- a/include/configs/bf533-stamp.h +++ b/include/configs/bf533-stamp.h @@ -106,7 +106,7 @@ #define CFG_ENV_OFFSET 0x4000 #define CFG_ENV_HEADER (CFG_ENV_OFFSET + 0x12A) /* 0x12A is the length of LDR file header */ #else -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR 0x20004000 #define CFG_ENV_OFFSET (CFG_ENV_ADDR - CFG_FLASH_BASE) #endif diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h index 6d43839593..5224eb2ff0 100644 --- a/include/configs/bf537-stamp.h +++ b/include/configs/bf537-stamp.h @@ -239,7 +239,7 @@ #define CFG_ENV_OFFSET 0x4000 #define CFG_ENV_HEADER (CFG_ENV_OFFSET + 0x16e) /* 0x12A is the length of LDR file header */ #else -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR 0x20004000 #define CFG_ENV_OFFSET (CFG_ENV_ADDR - CFG_FLASH_BASE) #endif diff --git a/include/configs/bf561-ezkit.h b/include/configs/bf561-ezkit.h index e4a7f9dbce..ff10650eb7 100644 --- a/include/configs/bf561-ezkit.h +++ b/include/configs/bf561-ezkit.h @@ -79,7 +79,7 @@ #define CFG_FLASH_CFI /* The flash is CFI compatible */ #define CONFIG_FLASH_CFI_DRIVER /* Use common CFI driver */ #define CFG_FLASH_CFI_AMD_RESET -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_FLASH_BASE 0x20000000 #define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */ #define CFG_MAX_FLASH_SECT 135 /* max number of sectors on one chip */ diff --git a/include/configs/bubinga.h b/include/configs/bubinga.h index 4b42f8b1a8..146d25493a 100644 --- a/include/configs/bubinga.h +++ b/include/configs/bubinga.h @@ -81,7 +81,7 @@ * supported for backward compatibility. */ #if 1 -#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ #else #define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */ #endif @@ -194,7 +194,7 @@ #define CFG_FLASH_ADDR1 0x2aaa #define CFG_FLASH_WORD_SIZE unsigned char -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ #define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ @@ -202,7 +202,7 @@ /* Address and size of Redundant Environment Sector */ #define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) -#endif /* CFG_ENV_IS_IN_FLASH */ +#endif /* CONFIG_ENV_IS_IN_FLASH */ /*----------------------------------------------------------------------- * NVRAM organization diff --git a/include/configs/c2mon.h b/include/configs/c2mon.h index 6f0d4b0f80..17178e9f02 100644 --- a/include/configs/c2mon.h +++ b/include/configs/c2mon.h @@ -177,7 +177,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ diff --git a/include/configs/canmb.h b/include/configs/canmb.h index 38714cc306..f0818b77dd 100644 --- a/include/configs/canmb.h +++ b/include/configs/canmb.h @@ -137,7 +137,7 @@ /* * Environment settings */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET (2*128*1024) #define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SECT_SIZE (128*1024) diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h index 189107448c..9ec49c10c7 100644 --- a/include/configs/canyonlands.h +++ b/include/configs/canyonlands.h @@ -112,7 +112,7 @@ * Define here the location of the environment variables (FLASH). */ #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL) -#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ #define CFG_NAND_CS 3 /* NAND chip connected to CSx */ #else #define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */ @@ -201,7 +201,7 @@ #define CFG_FLASH_USE_BUFFER_WRITE 1 /* use buffered writes (20x faster) */ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ #define CFG_ENV_ADDR (CFG_MONITOR_BASE - CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ @@ -209,7 +209,7 @@ /* Address and size of Redundant Environment Sector */ #define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR - CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) -#endif /* CFG_ENV_IS_IN_FLASH */ +#endif /* CONFIG_ENV_IS_IN_FLASH */ /*----------------------------------------------------------------------- * NAND-FLASH related diff --git a/include/configs/cerf250.h b/include/configs/cerf250.h index c801f037e1..fb737d50cc 100644 --- a/include/configs/cerf250.h +++ b/include/configs/cerf250.h @@ -217,7 +217,7 @@ #define CFG_FLASH_WRITE_TOUT (25*CFG_HZ) /* Timeout for Flash Write */ #define CFG_MONITOR_LEN 0x40000 /* 256 KiB */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (PHYS_FLASH_1 + CFG_MONITOR_LEN) #define CFG_ENV_SIZE 0x40000 /* Total Size of Environment Sector */ diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h index 0221dfeb8c..5f0d3fbcc9 100644 --- a/include/configs/cm5200.h +++ b/include/configs/cm5200.h @@ -264,7 +264,7 @@ /* * Environment settings */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x10000 #define CFG_ENV_SECT_SIZE 0x20000 #define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN) diff --git a/include/configs/cmc_pu2.h b/include/configs/cmc_pu2.h index bce5fcd82f..d9c1263326 100644 --- a/include/configs/cmc_pu2.h +++ b/include/configs/cmc_pu2.h @@ -172,7 +172,7 @@ #define CFG_FLASH_ERASE_TOUT (11 * CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT ( 2 * CFG_HZ) /* Timeout for Flash Write */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x20000 /* after u-boot.bin */ #define CFG_ENV_SECT_SIZE (64 << 10) /* sectors are 64 kB */ #define CFG_ENV_SIZE (16 << 10) /* Use only 16 kB */ diff --git a/include/configs/cmi_mpc5xx.h b/include/configs/cmi_mpc5xx.h index ac2b7a1e71..ed6578a10a 100644 --- a/include/configs/cmi_mpc5xx.h +++ b/include/configs/cmi_mpc5xx.h @@ -168,9 +168,9 @@ #define CFG_FLASH_WRITE_TOUT 600 /* Timeout for Flash Write (in ms) */ #define CFG_FLASH_PROTECTION 1 /* Physically section protection on */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_OFFSET 0x00020000 /* Environment starts at this adress */ #define CFG_ENV_SIZE 0x00010000 /* Set whole sector as env */ #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h index 649b053c2b..c908d5aa3d 100644 --- a/include/configs/cobra5272.h +++ b/include/configs/cobra5272.h @@ -126,12 +126,12 @@ #ifndef CONFIG_MONITOR_IS_IN_RAM #define CFG_ENV_OFFSET 0x4000 #define CFG_ENV_SECT_SIZE 0x2000 -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_IS_EMBEDDED 1 #else #define CFG_ENV_ADDR 0xffe04000 #define CFG_ENV_SECT_SIZE 0x2000 -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #endif diff --git a/include/configs/cogent_mpc8260.h b/include/configs/cogent_mpc8260.h index 84d50c71dd..fff35f98ec 100644 --- a/include/configs/cogent_mpc8260.h +++ b/include/configs/cogent_mpc8260.h @@ -257,7 +257,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Flash Erase Timeout (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR CFG_FLASH_BASE /* Addr of Environment Sector */ #ifdef CONFIG_CMA302 #define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ diff --git a/include/configs/cogent_mpc8xx.h b/include/configs/cogent_mpc8xx.h index ce38af1dd8..9d257d29d1 100644 --- a/include/configs/cogent_mpc8xx.h +++ b/include/configs/cogent_mpc8xx.h @@ -203,7 +203,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR CFG_FLASH_BASE /* Addr of Environment Sector */ #ifdef CONFIG_CMA302 #define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ diff --git a/include/configs/cpci5200.h b/include/configs/cpci5200.h index 7974491aca..cbc5b2ea67 100644 --- a/include/configs/cpci5200.h +++ b/include/configs/cpci5200.h @@ -219,7 +219,7 @@ * Environment settings */ #if 1 /* test-only */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x20000 #define CFG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_OVERWRITE 1 diff --git a/include/configs/cradle.h b/include/configs/cradle.h index eb93a8f083..ee319a7af7 100644 --- a/include/configs/cradle.h +++ b/include/configs/cradle.h @@ -152,7 +152,7 @@ #define CFG_FLASH_ERASE_TOUT (2*CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR 0x00020000 /* absolute address for now */ #define CFG_ENV_SIZE 0x20000 /* 8K ouch, this may later be */ diff --git a/include/configs/csb226.h b/include/configs/csb226.h index a807d0084d..c5d65e5796 100644 --- a/include/configs/csb226.h +++ b/include/configs/csb226.h @@ -488,7 +488,7 @@ #define CFG_FLASH_ERASE_TOUT (2*CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x1C000) /* Addr of Environment Sector */ #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ diff --git a/include/configs/csb272.h b/include/configs/csb272.h index 880bee8612..1d6a0775bb 100644 --- a/include/configs/csb272.h +++ b/include/configs/csb272.h @@ -230,7 +230,7 @@ * Environment configuration * */ -#define CFG_ENV_IS_IN_FLASH 1 /* environment is in FLASH */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* environment is in FLASH */ #undef CONFIG_ENV_IS_IN_NVRAM #undef CONFIG_ENV_IS_IN_EEPROM @@ -252,7 +252,7 @@ #define CFG_RAMSTART #endif -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) #define CFG_ENV_IN_OWN_SECTOR 1 /* Give Environment own sector */ #define CFG_ENV_ADDR 0xFFF00000 /* Address of Environment Sector */ #define CFG_ENV_SIZE 0x00001000 /* Size of Environment */ diff --git a/include/configs/csb472.h b/include/configs/csb472.h index e343632935..62bcc2ff1c 100644 --- a/include/configs/csb472.h +++ b/include/configs/csb472.h @@ -229,7 +229,7 @@ * Environment configuration * */ -#define CFG_ENV_IS_IN_FLASH 1 /* environment is in FLASH */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* environment is in FLASH */ #undef CONFIG_ENV_IS_IN_NVRAM #undef CONFIG_ENV_IS_IN_EEPROM @@ -251,7 +251,7 @@ #define CFG_RAMSTART #endif -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) #define CFG_ENV_IN_OWN_SECTOR 1 /* Give Environment own sector */ #define CFG_ENV_ADDR 0xFFF00000 /* Address of Environment Sector */ #define CFG_ENV_SIZE 0x00001000 /* Size of Environment */ diff --git a/include/configs/csb637.h b/include/configs/csb637.h index 66265242e6..c3054d3709 100644 --- a/include/configs/csb637.h +++ b/include/configs/csb637.h @@ -198,7 +198,7 @@ #define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET) #define CFG_ENV_SIZE 0x2000 /* 0x8000 */ #else -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x20000) /* after u-boot.bin */ #define CFG_ENV_SIZE 0x20000 /* sectors are 128K here */ #endif /* CONFIG_ENV_IS_IN_DATAFLASH */ diff --git a/include/configs/davinci_dvevm.h b/include/configs/davinci_dvevm.h index 9d79e3cf74..13f5e01a00 100644 --- a/include/configs/davinci_dvevm.h +++ b/include/configs/davinci_dvevm.h @@ -112,7 +112,7 @@ /* Flash & Environment */ /*=====================*/ #ifdef CFG_USE_NAND -#undef CFG_ENV_IS_IN_FLASH +#undef CONFIG_ENV_IS_IN_FLASH #define CFG_NO_FLASH #define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */ #ifdef CFG_NAND_SMALLPAGE @@ -138,7 +138,7 @@ #undef CONFIG_SKIP_LOWLEVEL_INIT #undef CONFIG_SKIP_RELOCATE_UBOOT #endif -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH #undef CFG_NO_FLASH #define CONFIG_FLASH_CFI_DRIVER #define CFG_FLASH_CFI diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h index 4aed8439d5..f6234ec3d0 100644 --- a/include/configs/davinci_schmoogie.h +++ b/include/configs/davinci_schmoogie.h @@ -79,7 +79,7 @@ /*=====================*/ /* Flash & Environment */ /*=====================*/ -#undef CFG_ENV_IS_IN_FLASH +#undef CONFIG_ENV_IS_IN_FLASH #define CFG_NO_FLASH #define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */ #define CFG_ENV_SECT_SIZE 2048 /* Env sector Size */ diff --git a/include/configs/davinci_sffsdr.h b/include/configs/davinci_sffsdr.h index c46a4305a8..b4f4b11682 100644 --- a/include/configs/davinci_sffsdr.h +++ b/include/configs/davinci_sffsdr.h @@ -75,7 +75,7 @@ #define CONFIG_NET_RETRY_COUNT 10 #define CONFIG_OVERWRITE_ETHADDR_ONCE /* Flash & Environment */ -#undef CFG_ENV_IS_IN_FLASH +#undef CONFIG_ENV_IS_IN_FLASH #define CFG_NO_FLASH #define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */ #define CFG_ENV_SECT_SIZE 2048 /* Env sector Size */ diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h index 9c54f084d4..cd781eda05 100644 --- a/include/configs/davinci_sonata.h +++ b/include/configs/davinci_sonata.h @@ -112,7 +112,7 @@ /* Flash & Environment */ /*=====================*/ #ifdef CFG_USE_NAND -#undef CFG_ENV_IS_IN_FLASH +#undef CONFIG_ENV_IS_IN_FLASH #define CFG_NO_FLASH #define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */ #define CFG_ENV_SECT_SIZE 512 /* Env sector Size */ @@ -133,7 +133,7 @@ #undef CONFIG_SKIP_LOWLEVEL_INIT #undef CONFIG_SKIP_RELOCATE_UBOOT #endif -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH #undef CFG_NO_FLASH #define CONFIG_FLASH_CFI_DRIVER #define CFG_FLASH_CFI diff --git a/include/configs/dnp1110.h b/include/configs/dnp1110.h index e7873e95fd..4adfeed082 100644 --- a/include/configs/dnp1110.h +++ b/include/configs/dnp1110.h @@ -155,7 +155,7 @@ #define CFG_FLASH_ERASE_TOUT (2*CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (PHYS_FLASH_1 + 0xF80000) /* Addr of Environment Sector */ #define CFG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */ diff --git a/include/configs/eXalion.h b/include/configs/eXalion.h index 6ba0d3fe57..deb20aab9b 100644 --- a/include/configs/eXalion.h +++ b/include/configs/eXalion.h @@ -135,7 +135,7 @@ #error Specific type of MPC824x must be defined (i.e. CONFIG_MPC8240) #endif -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SECT_SIZE 0x20000 /* Size of one Flash sector */ #define CFG_ENV_SIZE CFG_ENV_SECT_SIZE /* Use one Flash sector for enviroment */ #define CFG_ENV_ADDR 0xFFFC0000 diff --git a/include/configs/ebony.h b/include/configs/ebony.h index 21c0866f89..2a3595aa57 100644 --- a/include/configs/ebony.h +++ b/include/configs/ebony.h @@ -49,7 +49,7 @@ * supported for backward compatibility. */ #if 1 -#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ #else #define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */ #endif @@ -118,7 +118,7 @@ #define CFG_FLASH_ADDR1 0x2aaa #define CFG_FLASH_WORD_SIZE unsigned char -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ #define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ @@ -126,7 +126,7 @@ /* Address and size of Redundant Environment Sector */ #define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) -#endif /* CFG_ENV_IS_IN_FLASH */ +#endif /* CONFIG_ENV_IS_IN_FLASH */ /*----------------------------------------------------------------------- * DDR SDRAM diff --git a/include/configs/ep7312.h b/include/configs/ep7312.h index 54330821b1..367e667a10 100644 --- a/include/configs/ep7312.h +++ b/include/configs/ep7312.h @@ -149,7 +149,7 @@ #define CFG_FLASH_ERASE_TOUT (2*CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x20000) /* Addr of Environment Sector */ #define CFG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */ diff --git a/include/configs/ep8248.h b/include/configs/ep8248.h index ccc0d5d225..54484ad433 100644 --- a/include/configs/ep8248.h +++ b/include/configs/ep8248.h @@ -214,12 +214,12 @@ #define CFG_MONITOR_LEN (256 << 10) /* Reserve 256KB for Monitor */ -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE 0x20000 #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) -#endif /* CFG_ENV_IS_IN_FLASH */ +#endif /* CONFIG_ENV_IS_IN_FLASH */ #define CFG_DEFAULT_IMMR 0x00010000 diff --git a/include/configs/ep8260.h b/include/configs/ep8260.h index 094a14c24b..0911f8c925 100644 --- a/include/configs/ep8260.h +++ b/include/configs/ep8260.h @@ -474,7 +474,7 @@ #endif #ifndef CFG_RAMBOOT -# define CFG_ENV_IS_IN_FLASH 1 +# define CONFIG_ENV_IS_IN_FLASH 1 # ifdef CFG_ENV_IN_OWN_SECT # define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) diff --git a/include/configs/ep82xxm.h b/include/configs/ep82xxm.h index 4de879abe2..17c84963c3 100644 --- a/include/configs/ep82xxm.h +++ b/include/configs/ep82xxm.h @@ -192,7 +192,7 @@ * Note: DENX encourages to use redundant environment in FLASH. */ #if 1 -#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ #else #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ #endif @@ -207,10 +207,10 @@ #define CFG_MAX_FLASH_SECT 512 /* max num of sects on one chip */ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector in flinfo */ -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE 0x20000 #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) -#endif /* CFG_ENV_IS_IN_FLASH */ +#endif /* CONFIG_ENV_IS_IN_FLASH */ /*----------------------------------------------------------------------- * I2C diff --git a/include/configs/evb4510.h b/include/configs/evb4510.h index f2ed0df494..35a020bd6d 100644 --- a/include/configs/evb4510.h +++ b/include/configs/evb4510.h @@ -171,7 +171,7 @@ #define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */ /* environment settings */ -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH #undef CONFIG_ENV_IS_NOWHERE #define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x20000) /* environment start address */ diff --git a/include/configs/favr-32-ezkit.h b/include/configs/favr-32-ezkit.h index 35d289fadc..ce19b1f820 100644 --- a/include/configs/favr-32-ezkit.h +++ b/include/configs/favr-32-ezkit.h @@ -174,7 +174,7 @@ #define CFG_INTRAM_SIZE INTERNAL_SRAM_SIZE #define CFG_SDRAM_BASE EBI_SDRAM_BASE -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 65536 #define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE) diff --git a/include/configs/gcplus.h b/include/configs/gcplus.h index 1d9c05b729..31e99f3bec 100644 --- a/include/configs/gcplus.h +++ b/include/configs/gcplus.h @@ -178,7 +178,7 @@ #define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE } #endif -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (PHYS_FLASH_1 + PHYS_FLASH_SECT_SIZE) /* Addr of Environment Sector */ #define CFG_ENV_SIZE PHYS_FLASH_SECT_SIZE diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h index 7fee1d2dfc..e363d9a078 100644 --- a/include/configs/gr_cpci_ax2000.h +++ b/include/configs/gr_cpci_ax2000.h @@ -219,7 +219,7 @@ * Environment settings */ /*#define CONFIG_ENV_IS_NOWHERE 1*/ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 /* CFG_ENV_ADDR need to be at sector boundary */ #define CFG_ENV_SIZE 0x8000 #define CFG_ENV_SECT_SIZE 0x20000 diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h index 776fe40dec..7f8367436c 100644 --- a/include/configs/gr_ep2s60.h +++ b/include/configs/gr_ep2s60.h @@ -207,7 +207,7 @@ * Environment settings */ /*#define CONFIG_ENV_IS_NOWHERE 1*/ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 /* CFG_ENV_ADDR need to be at sector boundary */ #define CFG_ENV_SIZE 0x8000 #define CFG_ENV_SECT_SIZE 0x20000 diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h index f0f770cb3f..a6e34d0cc1 100644 --- a/include/configs/gr_xc3s_1500.h +++ b/include/configs/gr_xc3s_1500.h @@ -183,7 +183,7 @@ * Environment settings */ /*#define CONFIG_ENV_IS_NOWHERE 1*/ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 /* CFG_ENV_ADDR need to be at sector boundary */ #define CFG_ENV_SIZE 0x8000 #define CFG_ENV_SECT_SIZE 0x20000 diff --git a/include/configs/grsim.h b/include/configs/grsim.h index a23ac9ca49..2a8226a8de 100644 --- a/include/configs/grsim.h +++ b/include/configs/grsim.h @@ -210,7 +210,7 @@ * Environment settings */ #define CONFIG_ENV_IS_NOWHERE 1 -/*#define CFG_ENV_IS_IN_FLASH*/ +/*#define CONFIG_ENV_IS_IN_FLASH*/ /*#define CFG_ENV_SIZE 0x8000*/ #define CFG_ENV_SECT_SIZE 0x40000 #define CONFIG_ENV_OVERWRITE 1 diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h index c45b258bda..3cfeb20405 100644 --- a/include/configs/grsim_leon2.h +++ b/include/configs/grsim_leon2.h @@ -207,7 +207,7 @@ * Environment settings */ #define CONFIG_ENV_IS_NOWHERE 1 -/*#define CFG_ENV_IS_IN_FLASH*/ +/*#define CONFIG_ENV_IS_IN_FLASH*/ /*#define CFG_ENV_SIZE 0x8000*/ #define CFG_ENV_SECT_SIZE 0x40000 #define CONFIG_ENV_OVERWRITE 1 diff --git a/include/configs/gw8260.h b/include/configs/gw8260.h index d9187825e5..19641b7df5 100644 --- a/include/configs/gw8260.h +++ b/include/configs/gw8260.h @@ -463,7 +463,7 @@ #define CFG_FLASH_ERASE_TOUT 8000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 1 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #ifdef CFG_ENV_IN_OWN_SECT # define CFG_ENV_ADDR (CFG_MONITOR_BASE + (256 * 1024)) diff --git a/include/configs/hammerhead.h b/include/configs/hammerhead.h index c44d62eb0c..68bd4c8fa8 100644 --- a/include/configs/hammerhead.h +++ b/include/configs/hammerhead.h @@ -143,7 +143,7 @@ #define CFG_SDRAM_BASE 0x10000000 -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 65536 #define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE) diff --git a/include/configs/hcu4.h b/include/configs/hcu4.h index 7f262cbf91..b98883edbe 100644 --- a/include/configs/hcu4.h +++ b/include/configs/hcu4.h @@ -122,7 +122,7 @@ *----------------------------------------------------------------------*/ #undef CONFIG_ENV_IS_IN_NVRAM -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH #undef CONFIG_ENV_IS_NOWHERE #ifdef CONFIG_ENV_IS_IN_EEPROM @@ -132,7 +132,7 @@ #define CFG_ENV_SIZE (PROM_SIZE-CFG_ENV_OFFSET) #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* Put the environment in Flash */ #define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ #define CFG_ENV_ADDR ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE) diff --git a/include/configs/hcu5.h b/include/configs/hcu5.h index af0f7f4758..91c5f22b54 100644 --- a/include/configs/hcu5.h +++ b/include/configs/hcu5.h @@ -107,7 +107,7 @@ *----------------------------------------------------------------------*/ #undef CONFIG_ENV_IS_IN_NVRAM -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH #undef CONFIG_ENV_IS_IN_EEPROM #undef CONFIG_ENV_IS_NOWHERE @@ -119,7 +119,7 @@ #define CFG_ENV_SIZE (PROM_SIZE-CFG_ENV_OFFSET) #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* Put the environment in Flash */ #define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ #define CFG_ENV_ADDR ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE) diff --git a/include/configs/hermes.h b/include/configs/hermes.h index 48b23bdcd6..1ecb4b5ef4 100644 --- a/include/configs/hermes.h +++ b/include/configs/hermes.h @@ -155,7 +155,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x4000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ /*----------------------------------------------------------------------- diff --git a/include/configs/hmi1001.h b/include/configs/hmi1001.h index 205f5ccb03..4d55761146 100644 --- a/include/configs/hmi1001.h +++ b/include/configs/hmi1001.h @@ -163,7 +163,7 @@ /* * Environment settings */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x4000 #define CFG_ENV_SECT_SIZE 0x20000 #define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE) diff --git a/include/configs/hymod.h b/include/configs/hymod.h index 264192f262..fd0bab1643 100644 --- a/include/configs/hymod.h +++ b/include/configs/hymod.h @@ -403,7 +403,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Flash Erase Timeout (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x40000 /* Total Size of Environment Sector */ #define CFG_ENV_SECT_SIZE 0x40000 /* see README - env sect real size */ #define CFG_ENV_ADDR (CFG_FLASH_BASE+CFG_MONITOR_LEN-CFG_ENV_SECT_SIZE) diff --git a/include/configs/idmr.h b/include/configs/idmr.h index 7c3ebad4b7..43453b7cfc 100644 --- a/include/configs/idmr.h +++ b/include/configs/idmr.h @@ -118,11 +118,11 @@ #define CFG_ENV_ADDR 0xff820000 #define CFG_ENV_SECT_SIZE 0x10000 #define CFG_ENV_SIZE 0x2000 -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH #else /* CONFIG_MONITOR_IS_IN_RAM */ #define CFG_ENV_OFFSET 0x4000 #define CFG_ENV_SECT_SIZE 0x2000 -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH #endif /* !CONFIG_MONITOR_IS_IN_RAM */ #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ diff --git a/include/configs/impa7.h b/include/configs/impa7.h index e9704fc9af..7eb6921b55 100644 --- a/include/configs/impa7.h +++ b/include/configs/impa7.h @@ -151,7 +151,7 @@ #define CFG_FLASH_ERASE_TOUT (2*CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x1C000) /* Addr of Environment Sector */ #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ diff --git a/include/configs/imx31_litekit.h b/include/configs/imx31_litekit.h index c4763335b6..1660b0509e 100644 --- a/include/configs/imx31_litekit.h +++ b/include/configs/imx31_litekit.h @@ -150,7 +150,7 @@ #define CFG_MONITOR_BASE CFG_FLASH_BASE /* Monitor at beginning of flash */ #define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x001f0000) -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SECT_SIZE (64 * 1024) #define CFG_ENV_SIZE (64 * 1024) diff --git a/include/configs/incaip.h b/include/configs/incaip.h index 2e4ee66cf6..3d98974a2a 100644 --- a/include/configs/incaip.h +++ b/include/configs/incaip.h @@ -150,7 +150,7 @@ #define CFG_FLASH_ERASE_TOUT (2 * CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (2 * CFG_HZ) /* Timeout for Flash Write */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 /* Address and size of Primary Environment Sector */ #define CFG_ENV_ADDR 0xB0030000 diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h index efa2802fee..528f2762a5 100644 --- a/include/configs/inka4x0.h +++ b/include/configs/inka4x0.h @@ -171,7 +171,7 @@ /* * Environment settings */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x4000) #define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SECT_SIZE 0x2000 diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h index 5340f7c2d1..d66ec3a194 100644 --- a/include/configs/integratorcp.h +++ b/include/configs/integratorcp.h @@ -163,7 +163,7 @@ SIB at Block62 End Block62 address 0x24f80000 #define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */ #define CFG_MONITOR_LEN 0x00100000 -#define CFG_ENV_IS_IN_FLASH (1) +#define CONFIG_ENV_IS_IN_FLASH 1 /* * Move up the U-Boot & monitor area if more flash is fitted. diff --git a/include/configs/ixdp425.h b/include/configs/ixdp425.h index 6b73abe1f6..6559429f82 100644 --- a/include/configs/ixdp425.h +++ b/include/configs/ixdp425.h @@ -182,7 +182,7 @@ #define CFG_FLASH_CFI /* The flash is CFI compatible */ #define CONFIG_FLASH_CFI_DRIVER /* Use common CFI driver */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_FLASH_BANKS_LIST { PHYS_FLASH_1 } diff --git a/include/configs/ixdpg425.h b/include/configs/ixdpg425.h index d4e487124b..484c2d98aa 100644 --- a/include/configs/ixdpg425.h +++ b/include/configs/ixdpg425.h @@ -211,7 +211,7 @@ #define CFG_FLASH_CFI /* The flash is CFI compatible */ #define CONFIG_FLASH_CFI_DRIVER /* Use common CFI driver */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_FLASH_USE_BUFFER_WRITE 1 /* use buffered writes (20x faster) */ #define CFG_FLASH_PROTECTION 1 /* hardware flash protection */ diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h index af88a3fa2d..ce90d7f170 100644 --- a/include/configs/jupiter.h +++ b/include/configs/jupiter.h @@ -201,7 +201,7 @@ /* * Environment settings */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x20000 #define CFG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_OVERWRITE 1 diff --git a/include/configs/katmai.h b/include/configs/katmai.h index 5dcca75733..1876279abd 100644 --- a/include/configs/katmai.h +++ b/include/configs/katmai.h @@ -170,7 +170,7 @@ /*----------------------------------------------------------------------- * Environment *----------------------------------------------------------------------*/ -#define CFG_ENV_IS_IN_FLASH 1 /* Environment uses flash */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment uses flash */ /* * Default environment variables diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h index 01d861b2ed..fec22d89a4 100644 --- a/include/configs/kilauea.h +++ b/include/configs/kilauea.h @@ -121,7 +121,7 @@ * Environment *----------------------------------------------------------------------*/ #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL) -#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ #else #define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */ #define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */ @@ -143,7 +143,7 @@ #define CFG_FLASH_USE_BUFFER_WRITE 1 /* use buffered writes (20x faster) */ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ #define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ @@ -151,7 +151,7 @@ /* Address and size of Redundant Environment Sector */ #define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) -#endif /* CFG_ENV_IS_IN_FLASH */ +#endif /* CONFIG_ENV_IS_IN_FLASH */ /* * IPL (Initial Program Loader, integrated inside CPU) diff --git a/include/configs/korat.h b/include/configs/korat.h index a887446f26..b6984da2ca 100644 --- a/include/configs/korat.h +++ b/include/configs/korat.h @@ -104,7 +104,7 @@ /* * Environment */ -#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environ vars */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environ vars */ /* * FLASH related diff --git a/include/configs/lart.h b/include/configs/lart.h index 4570398cd4..f38e5da0d0 100644 --- a/include/configs/lart.h +++ b/include/configs/lart.h @@ -152,7 +152,7 @@ #define CFG_FLASH_ERASE_TOUT (2*CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x1C000) /* Addr of Environment Sector */ #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ diff --git a/include/configs/linkstation.h b/include/configs/linkstation.h index e5a0fb9715..01ae31769f 100644 --- a/include/configs/linkstation.h +++ b/include/configs/linkstation.h @@ -449,7 +449,7 @@ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ #define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */ -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH /* * The original LinkStation flash organisation uses * 448 kB (0xFFF00000 - 0xFFF6FFFF) for the boot loader diff --git a/include/configs/logodl.h b/include/configs/logodl.h index 047b4a4f71..5e51d8134e 100644 --- a/include/configs/logodl.h +++ b/include/configs/logodl.h @@ -288,7 +288,7 @@ #define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */ /* FIXME */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x1C000) /* Addr of Environment Sector */ #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ diff --git a/include/configs/lpc2292sodimm.h b/include/configs/lpc2292sodimm.h index e3fef5e2ce..2f2a3e823a 100644 --- a/include/configs/lpc2292sodimm.h +++ b/include/configs/lpc2292sodimm.h @@ -150,7 +150,7 @@ #define CFG_FLASH_ERASE_TOUT (2*CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (0x0 + 0x3C000) /* Addr of Environment Sector */ #define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ diff --git a/include/configs/lpd7a400.h b/include/configs/lpd7a400.h index 04148898ea..ae9503fd9f 100644 --- a/include/configs/lpd7a400.h +++ b/include/configs/lpd7a400.h @@ -110,7 +110,7 @@ #define CFG_MONITOR_BASE CFG_FLASH_BASE #define CFG_MONITOR_LEN (256<<10) -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 /* Address and size of Primary Environment Sector */ #define CFG_ENV_ADDR (CFG_FLASH_BASE + 0xFC0000) diff --git a/include/configs/lpd7a404.h b/include/configs/lpd7a404.h index 11ede96818..7ea4342a1b 100644 --- a/include/configs/lpd7a404.h +++ b/include/configs/lpd7a404.h @@ -110,7 +110,7 @@ #define CFG_MONITOR_BASE CFG_FLASH_BASE #define CFG_MONITOR_LEN (256<<10) -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 /* Address and size of Primary Environment Sector */ #define CFG_ENV_ADDR (CFG_FLASH_BASE + 0xFC0000) diff --git a/include/configs/luan.h b/include/configs/luan.h index 805cc59b30..9aef77cc5a 100644 --- a/include/configs/luan.h +++ b/include/configs/luan.h @@ -97,7 +97,7 @@ * Define here the location of the environment variables (FLASH or EEPROM). * Note: DENX encourages to use redundant environment in FLASH. */ -#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ /*----------------------------------------------------------------------- * FLASH related @@ -114,7 +114,7 @@ #define CFG_FLASH_ADDR1 0x2aa #define CFG_FLASH_WORD_SIZE unsigned char -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ #define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ @@ -122,7 +122,7 @@ /* Address and size of Redundant Environment Sector */ #define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) -#endif /* CFG_ENV_IS_IN_FLASH */ +#endif /* CONFIG_ENV_IS_IN_FLASH */ /*----------------------------------------------------------------------- * DDR SDRAM diff --git a/include/configs/lubbock.h b/include/configs/lubbock.h index 82fe19c725..7e0c4a20cf 100644 --- a/include/configs/lubbock.h +++ b/include/configs/lubbock.h @@ -231,7 +231,7 @@ * second sector, not an environment. You have been warned! */ #define CFG_MONITOR_LEN PHYS_FLASH_SECT_SIZE -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (PHYS_FLASH_1 + PHYS_FLASH_SECT_SIZE) #define CFG_ENV_SECT_SIZE PHYS_FLASH_SECT_SIZE #define CFG_ENV_SIZE (PHYS_FLASH_SECT_SIZE / 16) diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h index 87abfba14c..73b988f29b 100644 --- a/include/configs/lwmon.h +++ b/include/configs/lwmon.h @@ -315,7 +315,7 @@ #define CFG_FLASH_BUFFER_SIZE (2*32) /* Put environment in flash which is much faster to boot than using the EEPROM */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR 0x40040000 /* Address of Environment Sector */ #define CFG_ENV_SIZE 0x2000 /* Total Size of Environment */ #define CFG_ENV_SECT_SIZE 0x40000 /* we have BIG sectors only :-( */ diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index 3d135c4eaa..841361541a 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -118,7 +118,7 @@ /*----------------------------------------------------------------------- * Environment *----------------------------------------------------------------------*/ -#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ /*----------------------------------------------------------------------- * FLASH related diff --git a/include/configs/m501sk.h b/include/configs/m501sk.h index 7024a833b2..bbc2b4e3eb 100644 --- a/include/configs/m501sk.h +++ b/include/configs/m501sk.h @@ -159,7 +159,7 @@ #define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET) #define CFG_ENV_SIZE 0x2000 #else -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x00020000) #define CFG_ENV_SIZE 2048 #endif diff --git a/include/configs/makalu.h b/include/configs/makalu.h index cfc6fdc3e0..97715a3292 100644 --- a/include/configs/makalu.h +++ b/include/configs/makalu.h @@ -119,7 +119,7 @@ /*----------------------------------------------------------------------- * Environment *----------------------------------------------------------------------*/ -#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ /*----------------------------------------------------------------------- * FLASH related @@ -137,7 +137,7 @@ #define CFG_FLASH_USE_BUFFER_WRITE 1 /* use buffered writes (20x faster) */ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ #define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ @@ -145,7 +145,7 @@ /* Address and size of Redundant Environment Sector */ #define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) -#endif /* CFG_ENV_IS_IN_FLASH */ +#endif /* CONFIG_ENV_IS_IN_FLASH */ /*----------------------------------------------------------------------- * DDR SDRAM diff --git a/include/configs/mcc200.h b/include/configs/mcc200.h index f512847447..4e8c0d1105 100644 --- a/include/configs/mcc200.h +++ b/include/configs/mcc200.h @@ -227,7 +227,7 @@ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ #define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */ -#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ #define CFG_ENV_SECT_SIZE 0x40000 /* size of one complete sector */ #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) diff --git a/include/configs/mcu25.h b/include/configs/mcu25.h index 35ecc656b9..67c848510e 100644 --- a/include/configs/mcu25.h +++ b/include/configs/mcu25.h @@ -122,7 +122,7 @@ *----------------------------------------------------------------------*/ #undef CONFIG_ENV_IS_IN_NVRAM -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH #undef CONFIG_ENV_IS_NOWHERE #ifdef CONFIG_ENV_IS_IN_EEPROM @@ -132,7 +132,7 @@ #define CFG_ENV_SIZE (PROM_SIZE-CFG_ENV_OFFSET) #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* Put the environment in Flash */ #define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ #define CFG_ENV_ADDR ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE) diff --git a/include/configs/mecp5200.h b/include/configs/mecp5200.h index 1c2f1a2ec5..e0bd6e3e05 100644 --- a/include/configs/mecp5200.h +++ b/include/configs/mecp5200.h @@ -191,7 +191,7 @@ * Environment settings */ #if 1 /* test-only */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x10000 #define CFG_ENV_SECT_SIZE 0x10000 #define CONFIG_ENV_OVERWRITE 1 diff --git a/include/configs/mgcoge.h b/include/configs/mgcoge.h index 5fe3075efc..015e4dc527 100644 --- a/include/configs/mgcoge.h +++ b/include/configs/mgcoge.h @@ -169,12 +169,12 @@ #define CFG_MONITOR_LEN (256 << 10) /* Reserve 256KB for Monitor */ -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE 0x20000 #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) -#endif /* CFG_ENV_IS_IN_FLASH */ +#endif /* CONFIG_ENV_IS_IN_FLASH */ #define CFG_IMMR 0xF0000000 diff --git a/include/configs/mgsuvd.h b/include/configs/mgsuvd.h index 6f1c640b1a..7fd5a47f33 100644 --- a/include/configs/mgsuvd.h +++ b/include/configs/mgsuvd.h @@ -196,7 +196,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x08000 /* Total Size of Environment Sector */ #define CFG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */ diff --git a/include/configs/mimc200.h b/include/configs/mimc200.h index 57f64ba407..69e99a6db4 100644 --- a/include/configs/mimc200.h +++ b/include/configs/mimc200.h @@ -149,7 +149,7 @@ #define CFG_FRAM_BASE 0x08000000 #define CFG_FRAM_SIZE 0x20000 -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 65536 #define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE) diff --git a/include/configs/ml401.h b/include/configs/ml401.h index c626702dd3..75fcb6a922 100644 --- a/include/configs/ml401.h +++ b/include/configs/ml401.h @@ -166,7 +166,7 @@ #define CFG_ENV_ADDR (CFG_MONITOR_BASE - CFG_ENV_SIZE) #else /* !RAMENV */ - #define CFG_ENV_IS_IN_FLASH 1 + #define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ #define CFG_ENV_ADDR (CFG_FLASH_BASE + (2 * CFG_ENV_SECT_SIZE)) #define CFG_ENV_SIZE 0x40000 diff --git a/include/configs/ml507.h b/include/configs/ml507.h index 37d93bb3c7..e34e43a2e7 100644 --- a/include/configs/ml507.h +++ b/include/configs/ml507.h @@ -27,7 +27,7 @@ #define CFG_SDRAM_SIZE_MB 256 /*Env*/ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x20000 #define CFG_ENV_SECT_SIZE 0x20000 #define CFG_ENV_OFFSET 0x340000 diff --git a/include/configs/modnet50.h b/include/configs/modnet50.h index 84540f5e54..7cfd4fa4ae 100644 --- a/include/configs/modnet50.h +++ b/include/configs/modnet50.h @@ -170,7 +170,7 @@ #define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */ /* environment settings */ -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH #undef CONFIG_ENV_IS_NOWHERE #define CFG_ENV_ADDR 0x1001C000 /* environment start address */ diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h index f2a35ee2b3..8692ab8b8d 100644 --- a/include/configs/motionpro.h +++ b/include/configs/motionpro.h @@ -353,7 +353,7 @@ extern void __led_set(led_id_t id, int state); /* * Environment settings */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 /* This has to be a multiple of the Flash sector size */ #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #define CFG_ENV_SIZE 0x1000 diff --git a/include/configs/mp2usb.h b/include/configs/mp2usb.h index 87264fbb4b..f0b5c9fe9f 100644 --- a/include/configs/mp2usb.h +++ b/include/configs/mp2usb.h @@ -199,7 +199,7 @@ #define CFG_FLASH_UNLOCK_TOUT (10*CFG_HZ) /* Timeout for Flash Clear Lock Bits */ #define CFG_FLASH_PROTECTION /* "Real" (hardware) sectors protection */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x20000 /* after u-boot.bin */ #define CFG_ENV_ADDR (CFG_FLASH_BASE+CFG_ENV_OFFSET) #define CFG_ENV_SIZE 0x20000 diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h index 3df6e39f49..6e0721e986 100644 --- a/include/configs/mpr2.h +++ b/include/configs/mpr2.h @@ -73,7 +73,7 @@ #define CFG_MAX_FLASH_SECT 256 #define CFG_MAX_FLASH_BANKS 1 #define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE } -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE (128 * 1024) #define CFG_ENV_SIZE CFG_ENV_SECT_SIZE #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h index 1c3d2771b0..ee19b026e7 100644 --- a/include/configs/ms7720se.h +++ b/include/configs/ms7720se.h @@ -92,7 +92,7 @@ #define CFG_MAX_FLASH_BANKS 1 #define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE } -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE (64 * 1024) #define CFG_ENV_SIZE CFG_ENV_SECT_SIZE #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h index 3809e7120c..55f264c323 100644 --- a/include/configs/ms7722se.h +++ b/include/configs/ms7722se.h @@ -114,7 +114,7 @@ #undef CFG_DIRECT_FLASH_TFTP -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_OVERWRITE 1 #define CFG_ENV_SECT_SIZE (8 * 1024) #define CFG_ENV_SIZE (CFG_ENV_SECT_SIZE) diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h index 4356a671e8..c4a1f54885 100644 --- a/include/configs/ms7750se.h +++ b/include/configs/ms7750se.h @@ -92,7 +92,7 @@ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE 0x20000 #define CFG_ENV_SIZE (CFG_ENV_SECT_SIZE) #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) diff --git a/include/configs/muas3001.h b/include/configs/muas3001.h index a13648b6ef..ded0f4cbed 100644 --- a/include/configs/muas3001.h +++ b/include/configs/muas3001.h @@ -227,12 +227,12 @@ #define CFG_MONITOR_LEN (256 << 10) /* Reserve 256KB for Monitor */ -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE 0x10000 #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) -#endif /* CFG_ENV_IS_IN_FLASH */ +#endif /* CONFIG_ENV_IS_IN_FLASH */ /* * I2C Bus diff --git a/include/configs/mucmc52.h b/include/configs/mucmc52.h index 18200ec814..d3546c7470 100644 --- a/include/configs/mucmc52.h +++ b/include/configs/mucmc52.h @@ -174,7 +174,7 @@ /* * Environment settings */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x4000 #define CFG_ENV_SECT_SIZE 0x20000 #define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE) diff --git a/include/configs/munices.h b/include/configs/munices.h index cea2834305..6d39580b27 100644 --- a/include/configs/munices.h +++ b/include/configs/munices.h @@ -152,7 +152,7 @@ /* * Environment settings */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x40000 #define CFG_ENV_ADDR (TEXT_BASE + CFG_ENV_OFFSET) #define CFG_ENV_SECT_SIZE 0x20000 diff --git a/include/configs/mx1ads.h b/include/configs/mx1ads.h index 5125b21e04..bf43dad01b 100644 --- a/include/configs/mx1ads.h +++ b/include/configs/mx1ads.h @@ -174,7 +174,7 @@ #define CFG_MAX_FLASH_SECT (16) #define CFG_ENV_ADDR (CFG_FLASH_BASE+0x00ff8000) -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x04000 /* Total Size of Environment Sector */ #define CFG_ENV_SECT_SIZE 0x100000 diff --git a/include/configs/mx1fs2.h b/include/configs/mx1fs2.h index d527d098f5..8f4b42c757 100644 --- a/include/configs/mx1fs2.h +++ b/include/configs/mx1fs2.h @@ -207,7 +207,7 @@ #define CFG_MONITOR_BASE 0x10000000 #define CFG_MONITOR_LEN 0x20000 /* 128b ( 1 flash sector ) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR 0x10020000 /* absolute address for now */ #define CFG_ENV_SIZE 0x20000 diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h index 9ede7645d9..0bb0568e42 100644 --- a/include/configs/mx31ads.h +++ b/include/configs/mx31ads.h @@ -167,7 +167,7 @@ #define CFG_MONITOR_BASE CFG_FLASH_BASE /* Monitor at beginning of flash */ #define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256KiB */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SECT_SIZE (32 * 1024) #define CFG_ENV_SIZE CFG_ENV_SECT_SIZE diff --git a/include/configs/netstar.h b/include/configs/netstar.h index 756b7c2671..76d025cf69 100644 --- a/include/configs/netstar.h +++ b/include/configs/netstar.h @@ -75,7 +75,7 @@ /* * Environment settings */ -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_ADDR 0x4000 #define CFG_ENV_SIZE (8 * 1024) #define CFG_ENV_SECT_SIZE (8 * 1024) diff --git a/include/configs/ns9750dev.h b/include/configs/ns9750dev.h index b9eec62cfa..f8200f99f2 100644 --- a/include/configs/ns9750dev.h +++ b/include/configs/ns9750dev.h @@ -185,7 +185,7 @@ #define CFG_FLASH_WRITE_TOUT (5*CFG_HZ) /* Timeout for Flash Write */ /* @TODO */ -/*#define CFG_ENV_IS_IN_FLASH 1*/ +/*#define CONFIG_ENV_IS_IN_FLASH 1*/ #define CONFIG_ENV_IS_NOWHERE #define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ diff --git a/include/configs/o2dnt.h b/include/configs/o2dnt.h index 88bdb03e67..09995e87be 100644 --- a/include/configs/o2dnt.h +++ b/include/configs/o2dnt.h @@ -203,7 +203,7 @@ /* * Environment settings */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x20000 #define CFG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_OVERWRITE 1 diff --git a/include/configs/ocotea.h b/include/configs/ocotea.h index e8549e9386..b0a2e5d207 100644 --- a/include/configs/ocotea.h +++ b/include/configs/ocotea.h @@ -93,7 +93,7 @@ * supported for backward compatibility. */ #if 1 -#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ #else #define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */ #endif @@ -132,7 +132,7 @@ #define CFG_FLASH_ADDR1 0x2aaa #define CFG_FLASH_WORD_SIZE unsigned char -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ #define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ @@ -140,7 +140,7 @@ /* Address and size of Redundant Environment Sector */ #define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) -#endif /* CFG_ENV_IS_IN_FLASH */ +#endif /* CONFIG_ENV_IS_IN_FLASH */ /*----------------------------------------------------------------------- * DDR SDRAM diff --git a/include/configs/omap1510inn.h b/include/configs/omap1510inn.h index 46b30e025a..fe6a0db536 100644 --- a/include/configs/omap1510inn.h +++ b/include/configs/omap1510inn.h @@ -187,7 +187,7 @@ #define CFG_FLASH_ERASE_TOUT (20*CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (20*CFG_HZ) /* Timeout for Flash Write */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SECT_SIZE PHYS_FLASH_SECT_SIZE /* Total Size of Environment Sector */ #define CFG_ENV_SIZE CFG_ENV_SECT_SIZE #define CFG_ENV_OFFSET ( CFG_MONITOR_BASE + CFG_MONITOR_LEN ) /* Environment after Monitor */ diff --git a/include/configs/omap1610h2.h b/include/configs/omap1610h2.h index 74bba05fe8..9d2051df3a 100644 --- a/include/configs/omap1610h2.h +++ b/include/configs/omap1610h2.h @@ -187,7 +187,7 @@ extern unsigned long omap_flash_base; /* set in flash__init */ #define CFG_FLASH_ERASE_TOUT (20*CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (20*CFG_HZ) /* Timeout for Flash Write */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */ #define CFG_ENV_OFFSET 0x20000 /* environment starts here */ diff --git a/include/configs/omap1610inn.h b/include/configs/omap1610inn.h index 734f354392..edc42e45ae 100644 --- a/include/configs/omap1610inn.h +++ b/include/configs/omap1610inn.h @@ -192,7 +192,7 @@ extern unsigned long omap_flash_base; /* set in flash__init */ #define CFG_FLASH_ERASE_TOUT (20*CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (20*CFG_HZ) /* Timeout for Flash Write */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */ #define CFG_ENV_OFFSET 0x20000 /* environment starts here */ diff --git a/include/configs/omap2420h4.h b/include/configs/omap2420h4.h index 461362f91a..ac98fb5483 100644 --- a/include/configs/omap2420h4.h +++ b/include/configs/omap2420h4.h @@ -274,7 +274,7 @@ #define CFG_ENV_OFFSET 0x80000 /* environment starts here */ #else #define CFG_ENV_ADDR (CFG_FLASH_BASE + SZ_128K) -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SECT_SIZE PHYS_FLASH_SECT_SIZE #define CFG_ENV_OFFSET ( CFG_MONITOR_BASE + CFG_MONITOR_LEN ) /* Environment after Monitor */ #endif diff --git a/include/configs/omap5912osk.h b/include/configs/omap5912osk.h index 1c44ce032f..0f56279e4d 100644 --- a/include/configs/omap5912osk.h +++ b/include/configs/omap5912osk.h @@ -194,7 +194,7 @@ /*----------------------------------------------------------------------- * FLASH and environment organization */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 /* addr of environment */ #define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x020000) diff --git a/include/configs/omap730p2.h b/include/configs/omap730p2.h index c4d253af45..b781f72732 100644 --- a/include/configs/omap730p2.h +++ b/include/configs/omap730p2.h @@ -199,7 +199,7 @@ #define CFG_FLASH_ERASE_TOUT (20*CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (20*CFG_HZ) /* Timeout for Flash Write */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */ #define CFG_ENV_OFFSET 0x20000 /* environment starts here */ diff --git a/include/configs/p3mx.h b/include/configs/p3mx.h index 33a94bc2ca..1128c4ecb4 100644 --- a/include/configs/p3mx.h +++ b/include/configs/p3mx.h @@ -137,7 +137,7 @@ #define CFG_FLASH_PROTECTION 1 /* use hardware flash protection */ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ -#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ #if defined (CONFIG_P3M750) #define CFG_ENV_SECT_SIZE 0x20000 /* one sector (1 device) */ #elif defined (CONFIG_P3M7448) diff --git a/include/configs/p3p440.h b/include/configs/p3p440.h index ac0d83ac1c..046ec25481 100644 --- a/include/configs/p3p440.h +++ b/include/configs/p3p440.h @@ -295,7 +295,7 @@ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ #define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */ -#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ #define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ #define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE) diff --git a/include/configs/pcs440ep.h b/include/configs/pcs440ep.h index ba6d932249..368a66b95d 100644 --- a/include/configs/pcs440ep.h +++ b/include/configs/pcs440ep.h @@ -92,7 +92,7 @@ /*----------------------------------------------------------------------- * Environment *----------------------------------------------------------------------*/ -#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ /*----------------------------------------------------------------------- * FLASH related @@ -109,7 +109,7 @@ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ #define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ @@ -119,7 +119,7 @@ /* Address and size of Redundant Environment Sector */ #define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) -#endif /* CFG_ENV_IS_IN_FLASH */ +#endif /* CONFIG_ENV_IS_IN_FLASH */ #define ENV_NAME_REVLEV "revision_level" #define ENV_NAME_SOLDER "solder_switch" diff --git a/include/configs/pcu_e.h b/include/configs/pcu_e.h index f15ce9906e..1a3bf1c6fe 100644 --- a/include/configs/pcu_e.h +++ b/include/configs/pcu_e.h @@ -227,7 +227,7 @@ #if 0 /* Start port with environment in flash; switch to SPI EEPROM later */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x2000 /* Total Size of Environment */ #define CFG_ENV_ADDR 0xFFFFE000 /* Address of Environment Sector */ #define CFG_ENV_SECT_SIZE 0x2000 /* use the top-most 8k boot sector */ diff --git a/include/configs/pdnb3.h b/include/configs/pdnb3.h index 889207a94e..0b7b6d4f87 100644 --- a/include/configs/pdnb3.h +++ b/include/configs/pdnb3.h @@ -243,7 +243,7 @@ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN) #if defined(CONFIG_SCPU) diff --git a/include/configs/pf5200.h b/include/configs/pf5200.h index a709d0ed62..6120f58290 100644 --- a/include/configs/pf5200.h +++ b/include/configs/pf5200.h @@ -205,7 +205,7 @@ * Environment settings */ #if 1 /* test-only */ -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SIZE 0x10000 #define CFG_ENV_SECT_SIZE 0x10000 #define CONFIG_ENV_OVERWRITE 1 diff --git a/include/configs/pleb2.h b/include/configs/pleb2.h index 863029d146..799cf76996 100644 --- a/include/configs/pleb2.h +++ b/include/configs/pleb2.h @@ -246,7 +246,7 @@ #define CFG_FLASH_PROTECTION 1 /* FIXME */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x3C000) /* Addr of Environment Sector */ #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment */ #define CFG_ENV_SECT_SIZE 0x20000 diff --git a/include/configs/ppmc7xx.h b/include/configs/ppmc7xx.h index 1d2d38b36b..cd5ef94579 100644 --- a/include/configs/ppmc7xx.h +++ b/include/configs/ppmc7xx.h @@ -274,13 +274,13 @@ /* * Environment config - see memory map details above * - * CFG_ENV_IS_IN_FLASH - The env variables are stored in flash + * CONFIG_ENV_IS_IN_FLASH - The env variables are stored in flash * CFG_ENV_ADDR - Address of the sector containing env vars * CFG_ENV_SIZE - Ammount of RAM for env vars (used to save RAM, 4KB) * CFG_ENV_SECT_SIZE - Size of sector containing env vars (32KB) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR 0xFFFE0000 #define CFG_ENV_SIZE 0x1000 #define CFG_ENV_ADDR_REDUND 0xFFFE8000 diff --git a/include/configs/ppmc8260.h b/include/configs/ppmc8260.h index 6f1195b1e5..a045f22410 100644 --- a/include/configs/ppmc8260.h +++ b/include/configs/ppmc8260.h @@ -462,7 +462,7 @@ #ifndef CFG_RAMBOOT -# define CFG_ENV_IS_IN_FLASH 1 +# define CONFIG_ENV_IS_IN_FLASH 1 # ifdef CFG_ENV_IN_OWN_SECT # define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) # define CFG_ENV_SECT_SIZE 0x40000 @@ -473,7 +473,7 @@ # endif /* CFG_ENV_IN_OWN_SECT */ #else -# define CFG_ENV_IS_IN_FLASH 1 +# define CONFIG_ENV_IS_IN_FLASH 1 # define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x40000) #define CFG_ENV_SIZE 0x1000 # define CFG_ENV_SECT_SIZE 0x40000 diff --git a/include/configs/purple.h b/include/configs/purple.h index ef92637127..59743dfed0 100644 --- a/include/configs/purple.h +++ b/include/configs/purple.h @@ -143,7 +143,7 @@ #define CFG_FLASH_ERASE_TOUT (6 * CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (6 * CFG_HZ) /* Timeout for Flash Write */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 /* Address and size of Primary Environment Sector */ #define CFG_ENV_ADDR 0xB0008000 diff --git a/include/configs/pxa255_idp.h b/include/configs/pxa255_idp.h index 179ff7ad50..9f83c7df06 100644 --- a/include/configs/pxa255_idp.h +++ b/include/configs/pxa255_idp.h @@ -348,7 +348,7 @@ #define CFG_FLASH_WRITE_TOUT (25*CFG_HZ) /* Timeout for Flash Write */ /* put cfg at end of flash for now */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 /* Addr of Environment Sector */ #define CFG_ENV_ADDR (PHYS_FLASH_1 + PHYS_FLASH_SIZE - 0x40000) #define CFG_ENV_SIZE PHYS_FLASH_SECT_SIZE /* Total Size of Environment Sector */ diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h index 19e627b61c..e03e71026a 100644 --- a/include/configs/qemu-mips.h +++ b/include/configs/qemu-mips.h @@ -149,7 +149,7 @@ #define CONFIG_FLASH_CFI_DRIVER 1 #define CFG_FLASH_USE_BUFFER_WRITE 1 -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x40000) /* Address and size of Primary Environment Sector */ diff --git a/include/configs/quad100hd.h b/include/configs/quad100hd.h index 94bdd8ca7d..ad7f290376 100644 --- a/include/configs/quad100hd.h +++ b/include/configs/quad100hd.h @@ -43,7 +43,7 @@ /* the environment is in the EEPROM by default */ #define CONFIG_ENV_IS_IN_EEPROM -#undef CFG_ENV_IS_IN_FLASH +#undef CONFIG_ENV_IS_IN_FLASH #define CONFIG_NET_MULTI 1 #define CONFIG_HAS_ETH1 1 @@ -198,7 +198,7 @@ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ #define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */ -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ /* the environment is located before u-boot */ #define CFG_ENV_ADDR (TEXT_BASE - CFG_ENV_SECT_SIZE) diff --git a/include/configs/quantum.h b/include/configs/quantum.h index 34a1ea6e2c..a35418fa89 100644 --- a/include/configs/quantum.h +++ b/include/configs/quantum.h @@ -208,7 +208,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x00F40000 /* Offset of Environment Sector absolute address 0xfff40000*/ #define CFG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */ #define CFG_ENV_SIZE CFG_ENV_SECT_SIZE diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h index 06ede3e039..666219e3cf 100644 --- a/include/configs/r2dplus.h +++ b/include/configs/r2dplus.h @@ -71,7 +71,7 @@ #define CFG_MAX_FLASH_SECT 256 #define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE } -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE 0x40000 #define CFG_ENV_SIZE (CFG_ENV_SECT_SIZE) #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h index 77881e7a28..7123a83709 100644 --- a/include/configs/r7780mp.h +++ b/include/configs/r7780mp.h @@ -112,7 +112,7 @@ /* print 'E' for empty sector on flinfo */ #define CFG_FLASH_EMPTY_INFO -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE (256 * 1024) #define CFG_ENV_SIZE (CFG_ENV_SECT_SIZE) #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) diff --git a/include/configs/redwood.h b/include/configs/redwood.h index b791589adf..c825f13c26 100644 --- a/include/configs/redwood.h +++ b/include/configs/redwood.h @@ -120,7 +120,7 @@ * Environment *----------------------------------------------------------------------*/ #undef CONFIG_ENV_IS_IN_NVRAM /* ... not in NVRAM */ -#define CFG_ENV_IS_IN_FLASH 1 /* Environment uses flash */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment uses flash */ #undef CONFIG_ENV_IS_IN_EEPROM /* ... not in EEPROM */ #define CONFIG_PREBOOT "echo;" \ @@ -175,11 +175,11 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ #define CFG_ENV_ADDR 0xfffa0000 #define CFG_ENV_SIZE 0x10000 /* Size of Environment vars */ -#endif /* CFG_ENV_IS_IN_FLASH */ +#endif /* CONFIG_ENV_IS_IN_FLASH */ /*---------------------------------------------------------------------------*/ diff --git a/include/configs/rmu.h b/include/configs/rmu.h index 596bf15566..46f94dac70 100644 --- a/include/configs/rmu.h +++ b/include/configs/rmu.h @@ -188,7 +188,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR ((TEXT_BASE) + 0x40000) #define CFG_ENV_SIZE 0x40000 /* Total Size of Environment Sector */ diff --git a/include/configs/rsdproto.h b/include/configs/rsdproto.h index 6251383f55..89db35b70e 100644 --- a/include/configs/rsdproto.h +++ b/include/configs/rsdproto.h @@ -291,7 +291,7 @@ /* turn off NVRAM env feature */ #undef CONFIG_NVRAM_ENV -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (PHYS_FLASH + 0x28000) /* Addr of Environment Sector */ #define CFG_ENV_SECT_SIZE 0x8000 /* Total Size of Environment Sector */ diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h index 23598f33ca..f6b013c364 100644 --- a/include/configs/rsk7203.h +++ b/include/configs/rsk7203.h @@ -92,7 +92,7 @@ #define CFG_MAX_FLASH_SECT 64 #define CFG_MAX_FLASH_BANKS 1 -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE (64 * 1024) #define CFG_ENV_SIZE CFG_ENV_SECT_SIZE #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) diff --git a/include/configs/sacsng.h b/include/configs/sacsng.h index 5c6ddc6b47..bce8c9c8fe 100644 --- a/include/configs/sacsng.h +++ b/include/configs/sacsng.h @@ -707,7 +707,7 @@ #define CFG_FLASH_WRITE_TOUT 1 /* Timeout for Flash Write (in ms) */ #ifndef CFG_RAMBOOT -# define CFG_ENV_IS_IN_FLASH 1 +# define CONFIG_ENV_IS_IN_FLASH 1 # ifdef CFG_ENV_IN_OWN_SECT # define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) diff --git a/include/configs/sbc2410x.h b/include/configs/sbc2410x.h index 08cadf6271..8c14e8b62c 100644 --- a/include/configs/sbc2410x.h +++ b/include/configs/sbc2410x.h @@ -193,7 +193,7 @@ #define CFG_FLASH_ERASE_TOUT (5*CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (5*CFG_HZ) /* Timeout for Flash Write */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ /*----------------------------------------------------------------------- diff --git a/include/configs/sbc405.h b/include/configs/sbc405.h index 60d401fa0e..33eeca220a 100644 --- a/include/configs/sbc405.h +++ b/include/configs/sbc405.h @@ -228,7 +228,7 @@ * Environment Variable setup */ #define CFG_ENV_ADDR CFG_FLASH_BASE /* starting right at the beginning */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0 /* starting right at the beginning */ #define CFG_ENV_SECT_SIZE 0x40000 /* see README - env sector total size */ #define CFG_ENV_SIZE 0x40000 /* Total Size of Environment Sector */ diff --git a/include/configs/sbc8240.h b/include/configs/sbc8240.h index 0e878f054f..6e3c160ec8 100644 --- a/include/configs/sbc8240.h +++ b/include/configs/sbc8240.h @@ -339,7 +339,7 @@ typedef unsigned int led_id_t; /* Warining: environment is not EMBEDDED in the U-Boot code. * It's stored in flash separately. */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR 0xFFF70000 #define CFG_ENV_SIZE 0x4000 /* Size of the Environment */ #define CFG_ENV_OFFSET 0 /* starting right at the beginning */ diff --git a/include/configs/sbc8260.h b/include/configs/sbc8260.h index 6068c234ec..3a031de087 100644 --- a/include/configs/sbc8260.h +++ b/include/configs/sbc8260.h @@ -603,7 +603,7 @@ #define CFG_FLASH_WRITE_TOUT 1 /* Timeout for Flash Write (in ms) */ #ifndef CFG_RAMBOOT -# define CFG_ENV_IS_IN_FLASH 1 +# define CONFIG_ENV_IS_IN_FLASH 1 # ifdef CFG_ENV_IN_OWN_SECT # define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index 264f5ab1d9..fa0ccd8132 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -413,7 +413,7 @@ * Environment */ #ifndef CFG_RAMBOOT - #define CFG_ENV_IS_IN_FLASH 1 + #define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) #define CFG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ #define CFG_ENV_SIZE 0x2000 diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h index 9ef0bfdd86..1f6dc3fe54 100644 --- a/include/configs/sbc8548.h +++ b/include/configs/sbc8548.h @@ -434,7 +434,7 @@ /* * Environment */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) #define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ #define CFG_ENV_SIZE 0x2000 diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h index f39867febc..72e4791f30 100644 --- a/include/configs/sbc8560.h +++ b/include/configs/sbc8560.h @@ -336,7 +336,7 @@ #define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x100000) #define CFG_ENV_SIZE 0x2000 #else - #define CFG_ENV_IS_IN_FLASH 1 + #define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ #define CFG_ENV_ADDR (CFG_MONITOR_BASE - CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE 0x2000 /* CFG_ENV_SECT_SIZE */ diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index c84240e03d..40211a0ac9 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -469,7 +469,7 @@ /* * Environment */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000) #define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ #define CFG_ENV_SIZE 0x2000 diff --git a/include/configs/sc3.h b/include/configs/sc3.h index 4205f46e5c..1a614fd627 100644 --- a/include/configs/sc3.h +++ b/include/configs/sc3.h @@ -404,8 +404,8 @@ extern unsigned long offsetOfEnvironment; #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CFG_WRITE_SWAPPED_DATA /* swap Databytes between reading/writing */ -#define CFG_ENV_IS_IN_FLASH 1 -#ifdef CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH 1 +#ifdef CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_OFFSET 0x00000000 /* Offset of Environment Sector in bottom type */ #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ #define CFG_ENV_SECT_SIZE 0x4000 /* see README - env sector total size */ diff --git a/include/configs/sc520_spunk.h b/include/configs/sc520_spunk.h index aa9dc9755f..a8f520c3c2 100644 --- a/include/configs/sc520_spunk.h +++ b/include/configs/sc520_spunk.h @@ -153,7 +153,7 @@ #if 0 /* Environment in flash */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 # define CFG_ENV_ADDR (0x387a0000) /* Addr of Environment Sector */ # define CFG_ENV_SIZE 0x20000 /* Total Size of Environment Sector (or 0x10000) */ # define CFG_ENV_OFFSET 0 diff --git a/include/configs/scb9328.h b/include/configs/scb9328.h index 4ae25adde0..51826d7356 100644 --- a/include/configs/scb9328.h +++ b/include/configs/scb9328.h @@ -215,7 +215,7 @@ #define CFG_MONITOR_BASE 0x10000000 #define CFG_MONITOR_LEN 0x20000 /* 128b ( 1 flash sector ) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR 0x10020000 /* absolute address for now */ #define CFG_ENV_SIZE 0x20000 diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h index 0e28555bfe..3574a6f5f8 100644 --- a/include/configs/sequoia.h +++ b/include/configs/sequoia.h @@ -113,7 +113,7 @@ * Environment */ #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL) -#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environ vars */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environ vars */ #else #define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environ vars */ #define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */ @@ -139,7 +139,7 @@ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ #define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */ -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ #define CFG_ENV_ADDR ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h index 1306702fcb..05e3f96249 100644 --- a/include/configs/sh7763rdp.h +++ b/include/configs/sh7763rdp.h @@ -103,7 +103,7 @@ /* Use hardware flash sectors protection instead of U-Boot software protection */ #undef CFG_FLASH_PROTECTION #undef CFG_DIRECT_FLASH_TFTP -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE (128 * 1024) #define CFG_ENV_SIZE (CFG_ENV_SECT_SIZE) #define CFG_ENV_ADDR (CFG_FLASH_BASE + (1 * CFG_ENV_SECT_SIZE)) diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h index efdb163dd2..f9bbb4d0b1 100644 --- a/include/configs/sh7785lcr.h +++ b/include/configs/sh7785lcr.h @@ -150,7 +150,7 @@ #define CONFIG_RTL8169 /* ENV setting */ -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_OVERWRITE 1 #define CFG_ENV_SECT_SIZE (256 * 1024) #define CFG_ENV_SIZE (CFG_ENV_SECT_SIZE) diff --git a/include/configs/shannon.h b/include/configs/shannon.h index 8bbc730cb9..28fecf1fc9 100644 --- a/include/configs/shannon.h +++ b/include/configs/shannon.h @@ -158,7 +158,7 @@ #define CFG_FLASH_ERASE_TOUT (2*CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #ifdef CONFIG_INFERNO /* we take the last sector, 128 KB in size, but we only use 4 KB of it for stack reasons */ #define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x003E0000) /* Addr of Environment Sector */ diff --git a/include/configs/smdk2400.h b/include/configs/smdk2400.h index ac1642e1fc..35eebeb0c6 100644 --- a/include/configs/smdk2400.h +++ b/include/configs/smdk2400.h @@ -178,7 +178,7 @@ #define CFG_FLASH_ERASE_TOUT (5*CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (5*CFG_HZ) /* Timeout for Flash Write */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 /* Address and size of Primary Environment Sector */ #define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x40000) diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h index efe4693ec6..86ebcbaf01 100644 --- a/include/configs/smdk2410.h +++ b/include/configs/smdk2410.h @@ -178,7 +178,7 @@ #define CFG_FLASH_ERASE_TOUT (5*CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (5*CFG_HZ) /* Timeout for Flash Write */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ #endif /* __CONFIG_H */ diff --git a/include/configs/smmaco4.h b/include/configs/smmaco4.h index 1d202d4b2f..cf92fa77f3 100644 --- a/include/configs/smmaco4.h +++ b/include/configs/smmaco4.h @@ -226,7 +226,7 @@ /* * Environment settings */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x10000 #define CFG_ENV_SECT_SIZE 0x20000 #define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE) diff --git a/include/configs/socrates.h b/include/configs/socrates.h index a981a8fe95..09e1c8cfc5 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -308,7 +308,7 @@ /* * Environment */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ #define CFG_ENV_ADDR (CFG_MONITOR_BASE - CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE 0x4000 diff --git a/include/configs/sorcery.h b/include/configs/sorcery.h index b4da4ce920..fef722be83 100644 --- a/include/configs/sorcery.h +++ b/include/configs/sorcery.h @@ -197,7 +197,7 @@ /* * Environment settings */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x8000000 - 0x40000) #define CFG_ENV_SIZE 0x4000 /* 16K */ #define CFG_ENV_SECT_SIZE 0x20000 @@ -206,15 +206,15 @@ #define CONFIG_ENV_OVERWRITE 1 -#if defined CFG_ENV_IS_IN_FLASH +#if defined CONFIG_ENV_IS_IN_FLASH #undef CONFIG_ENV_IS_IN_NVRAM #undef CONFIG_ENV_IS_IN_EEPROM #elif defined CONFIG_ENV_IS_IN_NVRAM -#undef CFG_ENV_IS_IN_FLASH +#undef CONFIG_ENV_IS_IN_FLASH #undef CONFIG_ENV_IS_IN_EEPROM #elif defined CONFIG_ENV_IS_IN_EEPROM #undef CONFIG_ENV_IS_IN_NVRAM -#undef CFG_ENV_IS_IN_FLASH +#undef CONFIG_ENV_IS_IN_FLASH #endif /* diff --git a/include/configs/spc1920.h b/include/configs/spc1920.h index daaa23f48e..73fa97f14a 100644 --- a/include/configs/spc1920.h +++ b/include/configs/spc1920.h @@ -185,7 +185,7 @@ #define CFG_MAX_FLASH_SECT 128 /* Max num of sects on one chip */ /* Environment is in flash */ -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE 0x40000 /* We use one complete sector */ #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) diff --git a/include/configs/spieval.h b/include/configs/spieval.h index 93798a46f9..8df56e393a 100644 --- a/include/configs/spieval.h +++ b/include/configs/spieval.h @@ -308,7 +308,7 @@ /* * Environment settings */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x10000 #define CFG_ENV_SECT_SIZE 0x20000 #define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE) diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h index f4a8fa577d..95230ac17c 100644 --- a/include/configs/stxgp3.h +++ b/include/configs/stxgp3.h @@ -288,7 +288,7 @@ /* We use the top boot sector flash, so we have some 16K sectors for env */ #ifndef CFG_RAMBOOT - #define CFG_ENV_IS_IN_FLASH 1 + #define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x60000) #define CFG_ENV_SECT_SIZE 0x4000 /* 16K (one top sector) for env */ #define CFG_ENV_SIZE 0x2000 diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h index 4f1d70c3d5..21bb2797fc 100644 --- a/include/configs/stxssa.h +++ b/include/configs/stxssa.h @@ -317,7 +317,7 @@ # define CFG_ENV_OFFSET 0 # define CFG_ENV_SIZE 2048 #else /* in flash */ -# define CFG_ENV_IS_IN_FLASH 1 +# define CONFIG_ENV_IS_IN_FLASH 1 # ifdef CONFIG_STXSSA_4M # define CFG_ENV_SECT_SIZE 0x20000 # else /* default configuration - 64 MiB flash */ diff --git a/include/configs/stxxtc.h b/include/configs/stxxtc.h index 0dc9f8a010..c8b54bf485 100644 --- a/include/configs/stxxtc.h +++ b/include/configs/stxxtc.h @@ -201,7 +201,7 @@ /*----------------------------------------------------------------------- * FLASH organization */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SECT_SIZE 0x10000 #define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00000000) diff --git a/include/configs/svm_sc8xx.h b/include/configs/svm_sc8xx.h index bbbfa15db1..b7831b4473 100644 --- a/include/configs/svm_sc8xx.h +++ b/include/configs/svm_sc8xx.h @@ -227,7 +227,7 @@ #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #ifdef CONFIG_BOOT_8B #define CFG_ENV_OFFSET 0x10000 /* Offset of Environment Sector */ diff --git a/include/configs/taihu.h b/include/configs/taihu.h index 2ef454532f..ad0f5a9440 100644 --- a/include/configs/taihu.h +++ b/include/configs/taihu.h @@ -74,7 +74,7 @@ #endif /*----------------------------------------------------------------------------*/ -#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ /* * Default environment variables @@ -205,7 +205,7 @@ unsigned char spi_read(void); #define CFG_FLASH_ADDR1 0x2aa #define CFG_FLASH_WORD_SIZE unsigned short -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ #define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ @@ -213,7 +213,7 @@ unsigned char spi_read(void); /* Address and size of Redundant Environment Sector */ #define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) -#endif /* CFG_ENV_IS_IN_FLASH */ +#endif /* CONFIG_ENV_IS_IN_FLASH */ /*----------------------------------------------------------------------- * NVRAM organization diff --git a/include/configs/taishan.h b/include/configs/taishan.h index 81133bb5c8..9bac0e2883 100644 --- a/include/configs/taishan.h +++ b/include/configs/taishan.h @@ -83,7 +83,7 @@ /*----------------------------------------------------------------------- * Environment *----------------------------------------------------------------------*/ -#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ /*----------------------------------------------------------------------- * FLASH related diff --git a/include/configs/tb0229.h b/include/configs/tb0229.h index fc2357d406..cf2af93d37 100644 --- a/include/configs/tb0229.h +++ b/include/configs/tb0229.h @@ -153,7 +153,7 @@ #define CFG_FLASH_ERASE_TOUT (20 * CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (2 * CFG_HZ) /* Timeout for Flash Write */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 /* Address and size of Primary Environment Sector */ #define CFG_ENV_ADDR 0xBFC40000 diff --git a/include/configs/trab.h b/include/configs/trab.h index b0615a0e37..1c8d3cec19 100644 --- a/include/configs/trab.h +++ b/include/configs/trab.h @@ -403,7 +403,7 @@ #define CFG_FLASH_ERASE_TOUT (15*CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 /* Address and size of Primary Environment Sector */ #ifndef CONFIG_FLASH_8MB diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h index 6367f873ef..dcfb73c859 100644 --- a/include/configs/trizepsiv.h +++ b/include/configs/trizepsiv.h @@ -309,7 +309,7 @@ #define CFG_FLASH_USE_BUFFER_WRITE 1 /* Flash environment locations */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (PHYS_FLASH_1 + CFG_MONITOR_LEN) /* Addr of Environment Sector */ #define CFG_ENV_SIZE 0x40000 /* Total Size of Environment */ #define CFG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */ diff --git a/include/configs/uc100.h b/include/configs/uc100.h index 106e6f2759..cdd7bdf75f 100644 --- a/include/configs/uc100.h +++ b/include/configs/uc100.h @@ -241,7 +241,7 @@ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_MONITOR_BASE+CFG_MONITOR_LEN) #define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ diff --git a/include/configs/uc101.h b/include/configs/uc101.h index a18618893c..ac5285a866 100644 --- a/include/configs/uc101.h +++ b/include/configs/uc101.h @@ -176,7 +176,7 @@ /* * Environment settings */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x4000 #define CFG_ENV_SECT_SIZE 0x10000 #define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE) diff --git a/include/configs/utx8245.h b/include/configs/utx8245.h index 1675ab752c..2844c6354a 100644 --- a/include/configs/utx8245.h +++ b/include/configs/utx8245.h @@ -392,7 +392,7 @@ protect on ${u-boot_startaddr} ${u-boot_endaddr}" /* NOTE: environment is not EMBEDDED in the u-boot code. It's stored in flash in its own separate sector. */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #if 1 /* AMD AM29LV033C */ #define CFG_MAX_FLASH_SECT 64 /* Max number of sectors in one bank */ diff --git a/include/configs/v38b.h b/include/configs/v38b.h index 35745484d4..e0bd8c7976 100644 --- a/include/configs/v38b.h +++ b/include/configs/v38b.h @@ -213,7 +213,7 @@ /* * Environment settings */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00040000) #define CFG_ENV_SIZE 0x10000 #define CFG_ENV_SECT_SIZE 0x10000 diff --git a/include/configs/v5fx30teval.h b/include/configs/v5fx30teval.h index 67d8d7f631..5132293def 100644 --- a/include/configs/v5fx30teval.h +++ b/include/configs/v5fx30teval.h @@ -27,7 +27,7 @@ #define CFG_SDRAM_SIZE_MB 64 /*Env*/ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x20000 #define CFG_ENV_SECT_SIZE 0x20000 #define CFG_ENV_OFFSET 0x1A0000 diff --git a/include/configs/versatile.h b/include/configs/versatile.h index f563c580c2..4a54b9028d 100644 --- a/include/configs/versatile.h +++ b/include/configs/versatile.h @@ -185,7 +185,7 @@ #define PHYS_FLASH_1 (CFG_FLASH_BASE) -#define CFG_ENV_IS_IN_FLASH 1 /* env in flash instead of CONFIG_ENV_IS_NOWHERE */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* env in flash instead of CONFIG_ENV_IS_NOWHERE */ #define CFG_ENV_SECT_SIZE 0x00020000 /* 256 KB sectors (x2) */ #define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ #define CFG_ENV_OFFSET 0x01f00000 /* environment starts here */ diff --git a/include/configs/virtlab2.h b/include/configs/virtlab2.h index 1a125f16ce..6250926281 100644 --- a/include/configs/virtlab2.h +++ b/include/configs/virtlab2.h @@ -209,7 +209,7 @@ #define CFG_MAX_FLASH_BANKS 2 /* max number of memory banks */ #define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ diff --git a/include/configs/voiceblue.h b/include/configs/voiceblue.h index 20917ee9a5..fee3ab996f 100644 --- a/include/configs/voiceblue.h +++ b/include/configs/voiceblue.h @@ -74,7 +74,7 @@ /* * Environment settings */ -#define CFG_ENV_IS_IN_FLASH +#define CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_ADDR (PHYS_FLASH_1 + CFG_MONITOR_LEN) #define CFG_ENV_SIZE (8 * 1024) #define CFG_ENV_SECT_SIZE (64 * 1024) diff --git a/include/configs/walnut.h b/include/configs/walnut.h index 4eecf77086..fc267d114f 100644 --- a/include/configs/walnut.h +++ b/include/configs/walnut.h @@ -137,7 +137,7 @@ * supported for backward compatibility. */ #if 1 -#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ #else #define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */ #endif @@ -160,7 +160,7 @@ #define CFG_FLASH_ADDR1 0x2aaa #define CFG_FLASH_WORD_SIZE unsigned char -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ #define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ @@ -168,7 +168,7 @@ /* Address and size of Redundant Environment Sector */ #define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) -#endif /* CFG_ENV_IS_IN_FLASH */ +#endif /* CONFIG_ENV_IS_IN_FLASH */ /*----------------------------------------------------------------------- * NVRAM organization diff --git a/include/configs/wepep250.h b/include/configs/wepep250.h index f2efe9f410..9baf730798 100644 --- a/include/configs/wepep250.h +++ b/include/configs/wepep250.h @@ -178,7 +178,7 @@ #define CFG_MONITOR_BASE PHYS_FLASH_1 #define CFG_MONITOR_LEN 0x20000 /* 128kb ( 1 flash sector ) */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR 0x20000 /* absolute address for now */ #define CFG_ENV_SIZE 0x2000 diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h index dc0ee0b223..3c32d9f9a3 100644 --- a/include/configs/xaeniax.h +++ b/include/configs/xaeniax.h @@ -176,7 +176,7 @@ #define CFG_FLASH_WRITE_TOUT (25*CFG_HZ) /* Timeout for Flash Write */ /* FIXME */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x40000)/* Addr of Environment Sector */ #define CFG_ENV_SIZE 0x40000 /* Total Size of Environment Sector */ diff --git a/include/configs/xilinx-ppc440-generic.h b/include/configs/xilinx-ppc440-generic.h index 4e8080bf6b..fdefc4e833 100644 --- a/include/configs/xilinx-ppc440-generic.h +++ b/include/configs/xilinx-ppc440-generic.h @@ -27,7 +27,7 @@ #define CFG_SDRAM_SIZE_MB 256 /*Env*/ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_SIZE 0x20000 #define CFG_ENV_SECT_SIZE 0x20000 #define CFG_ENV_OFFSET 0x340000 diff --git a/include/configs/xm250.h b/include/configs/xm250.h index bcd16ec5da..d01898f2df 100644 --- a/include/configs/xm250.h +++ b/include/configs/xm250.h @@ -184,7 +184,7 @@ #define CFG_FLASH_UNLOCK_TOUT (2*CFG_HZ) /* Timeout for Flash Clear Lock Bits */ #define CFG_FLASH_PROTECTION /* "Real" (hardware) sectors protection */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x40000) /* Addr of Environment Sector */ #define CFG_ENV_SIZE 0x4000 #define CFG_ENV_SECT_SIZE 0x40000 /* Size of the Environment Sector */ diff --git a/include/configs/xsengine.h b/include/configs/xsengine.h index 4d1bdd7b14..709423dbe0 100644 --- a/include/configs/xsengine.h +++ b/include/configs/xsengine.h @@ -80,7 +80,7 @@ /* Environment settings */ #define CONFIG_ENV_OVERWRITE -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x40000) /* Addr of Environment Sector (after monitor)*/ #define CFG_ENV_SECT_SIZE PHYS_FLASH_SECT_SIZE /* Size of the Environment Sector */ #define CFG_ENV_SIZE 0x4000 /* 16kB Total Size of Environment Sector */ diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h index f90e9ecd73..528776a243 100644 --- a/include/configs/yosemite.h +++ b/include/configs/yosemite.h @@ -96,7 +96,7 @@ * Note: DENX encourages to use redundant environment in FLASH. */ #if 1 -#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ #else #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ #endif @@ -118,7 +118,7 @@ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ #define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ @@ -126,7 +126,7 @@ /* Address and size of Redundant Environment Sector */ #define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) -#endif /* CFG_ENV_IS_IN_FLASH */ +#endif /* CONFIG_ENV_IS_IN_FLASH */ /*----------------------------------------------------------------------- * DDR SDRAM diff --git a/include/configs/yucca.h b/include/configs/yucca.h index 9ccd308087..d85da94bd9 100644 --- a/include/configs/yucca.h +++ b/include/configs/yucca.h @@ -140,7 +140,7 @@ /* #define CFG_NVRAM_SIZE (0x2000 - 8) */ /* NVRAM size(8k)- RTC regs */ #undef CONFIG_ENV_IS_IN_NVRAM /* ... not in NVRAM */ -#define CFG_ENV_IS_IN_FLASH 1 /* Environment uses flash */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment uses flash */ #undef CONFIG_ENV_IS_IN_EEPROM /* ... not in EEPROM */ #define CONFIG_ENV_OVERWRITE 1 @@ -188,12 +188,12 @@ #define CFG_FLASH_2ND_16BIT_DEV 1 /* evb440SPe has 8 and 16bit device */ #define CFG_FLASH_2ND_ADDR 0xe7c00000 /* evb440SPe has 8 and 16bit device*/ -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ #define CFG_ENV_ADDR 0xfffa0000 /* #define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE) */ #define CFG_ENV_SIZE 0x10000 /* Size of Environment vars */ -#endif /* CFG_ENV_IS_IN_FLASH */ +#endif /* CONFIG_ENV_IS_IN_FLASH */ /*----------------------------------------------------------------------- * PCI stuff *----------------------------------------------------------------------- diff --git a/include/configs/zeus.h b/include/configs/zeus.h index b50cba556c..fdb4e3711e 100644 --- a/include/configs/zeus.h +++ b/include/configs/zeus.h @@ -42,7 +42,7 @@ #define PLLMR0_DEFAULT PLLMR0_333_111_55_111 #define PLLMR1_DEFAULT PLLMR1_333_111_55_111 -#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ +#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ #define CONFIG_OVERWRITE_ETHADDR_ONCE 1 @@ -226,7 +226,7 @@ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ #define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */ -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH #define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */ #define CFG_ENV_ADDR ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ diff --git a/include/environment.h b/include/environment.h index 047f5f059f..6fcc8ec7d8 100644 --- a/include/environment.h +++ b/include/environment.h @@ -37,7 +37,7 @@ ************************************************************************** */ -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) # ifndef CFG_ENV_ADDR # define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # endif @@ -67,7 +67,7 @@ # if defined(CFG_ENV_ADDR_REDUND) || defined(CFG_ENV_OFFSET_REDUND) # define CFG_REDUNDAND_ENVIRONMENT 1 # endif -#endif /* CFG_ENV_IS_IN_FLASH */ +#endif /* CONFIG_ENV_IS_IN_FLASH */ #if defined(CONFIG_ENV_IS_IN_NAND) # ifndef CFG_ENV_OFFSET diff --git a/tools/envcrc.c b/tools/envcrc.c index 550cf82d17..2f40051278 100644 --- a/tools/envcrc.c +++ b/tools/envcrc.c @@ -33,7 +33,7 @@ #include <config.h> #undef __ASSEMBLY__ -#if defined(CFG_ENV_IS_IN_FLASH) +#if defined(CONFIG_ENV_IS_IN_FLASH) # ifndef CFG_ENV_ADDR # define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # endif @@ -56,7 +56,7 @@ # if defined(CFG_ENV_ADDR_REDUND) || defined(CFG_ENV_OFFSET_REDUND) # define CFG_REDUNDAND_ENVIRONMENT 1 # endif -#endif /* CFG_ENV_IS_IN_FLASH */ +#endif /* CONFIG_ENV_IS_IN_FLASH */ #ifdef CFG_REDUNDAND_ENVIRONMENT # define ENV_HEADER_SIZE (sizeof(uint32_t) + 1) diff --git a/tools/updater/flash_hw.c b/tools/updater/flash_hw.c index 2d9b8c8802..50b4df02b8 100644 --- a/tools/updater/flash_hw.c +++ b/tools/updater/flash_hw.c @@ -123,7 +123,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, |
