From: Jean-Christophe PLAGNIOL-VILLARD Date: Wed, 10 Sep 2008 20:48:03 +0000 (+0200) Subject: cleanup use of CFG_ENV_IS_IN_FLASH X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=7d9b5bae5ba558c7464d89d033aca04acaf01172;p=u-boot.git cleanup use of CFG_ENV_IS_IN_FLASH - #if CFG_ENV_IS_IN_FLASH - #if (CFG_ENV_IS_IN_FLASH == 1) - #define CFG_ENV_IS_IN_FLASH 0 Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- diff --git a/board/barco/flash.c b/board/barco/flash.c index 6cb19b7b07..9502560d67 100644 --- a/board/barco/flash.c +++ b/board/barco/flash.c @@ -224,7 +224,7 @@ unsigned long flash_init(void) &flash_info[0]); #endif -#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) +#if defined(CFG_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 7fba174f46..6d3cfab130 100644 --- a/board/bmw/flash.c +++ b/board/bmw/flash.c @@ -224,7 +224,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) +#if defined(CFG_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/cpc45/flash.c b/board/cpc45/flash.c index 37dd182ba4..9a398686be 100644 --- a/board/cpc45/flash.c +++ b/board/cpc45/flash.c @@ -174,7 +174,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) +#if defined(CFG_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 1535a6b48f..b1048a36b6 100644 --- a/board/cpu86/flash.c +++ b/board/cpu86/flash.c @@ -230,7 +230,7 @@ unsigned long flash_init (void) #endif #endif -#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) +#if defined(CFG_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 076c2f9192..925a0e6722 100644 --- a/board/cpu87/flash.c +++ b/board/cpu87/flash.c @@ -236,7 +236,7 @@ unsigned long flash_init (void) #endif #endif -#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) +#if defined(CFG_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 7368176e54..ec1a58633f 100644 --- a/board/cu824/flash.c +++ b/board/cu824/flash.c @@ -135,7 +135,7 @@ unsigned long flash_init(void) #endif #endif -#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) +#if defined(CFG_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/ep8260/flash.c b/board/ep8260/flash.c index 966a345260..167f316c87 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 (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) +#if defined(CFG_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/exbitgen/flash.c b/board/exbitgen/flash.c index 4dd5382876..401eead5d9 100644 --- a/board/exbitgen/flash.c +++ b/board/exbitgen/flash.c @@ -126,7 +126,7 @@ unsigned long flash_init (void) #endif #endif -#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) +#if defined(CFG_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/gw8260/flash.c b/board/gw8260/flash.c index 5620a1d8b7..015ea7dda9 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 (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) +#if defined(CFG_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 21c5a01c16..a2ed3bd1f9 100644 --- a/board/hidden_dragon/flash.c +++ b/board/hidden_dragon/flash.c @@ -212,7 +212,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) +#if defined(CFG_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/oxc/flash.c b/board/oxc/flash.c index 296c01dc84..4559b8033b 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 (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) +#if defined(CFG_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/pm826/flash.c b/board/pm826/flash.c index fee07cf353..92a433a587 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 (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) +#if defined(CFG_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 1f21b3e9cb..0e7bfe8b0e 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 (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) +#if defined(CFG_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 4be6f13644..4d13612aff 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 (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) +#if defined(CFG_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/rpxsuper/flash.c b/board/rpxsuper/flash.c index d80e778622..b29032bc46 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 (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) +#if defined(CFG_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 4e43b29660..d9f6b3bacd 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 (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) +#if defined(CFG_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/sandpoint/flash.c b/board/sandpoint/flash.c index a9f73ff0dc..cf06679938 100644 --- a/board/sandpoint/flash.c +++ b/board/sandpoint/flash.c @@ -230,7 +230,7 @@ flash_init(void) &flash_info[0]); #endif -#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) +#if defined(CFG_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 9a8b95225f..c43435fc5b 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 (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) +#if defined(CFG_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 056fe810b3..063972db5b 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 (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) +#if defined(CFG_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/sl8245/flash.c b/board/sl8245/flash.c index 553dc98226..7fb94631cf 100644 --- a/board/sl8245/flash.c +++ b/board/sl8245/flash.c @@ -139,7 +139,7 @@ unsigned long flash_init (void) #endif #endif -#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) +#if defined(CFG_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/tqc/tqm8260/flash.c b/board/tqc/tqm8260/flash.c index 056fe810b3..063972db5b 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 (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) +#if defined(CFG_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/utx8245/flash.c b/board/utx8245/flash.c index 199f619a82..ae0e659c2e 100644 --- a/board/utx8245/flash.c +++ b/board/utx8245/flash.c @@ -169,7 +169,7 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) +#if defined(CFG_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/include/configs/CPCI750.h b/include/configs/CPCI750.h index 4818aede30..48f308c76f 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 0 +#define CFG_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/grsim.h b/include/configs/grsim.h index c6d366607f..a23ac9ca49 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 0*/ +/*#define CFG_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 945a163fb1..c45b258bda 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 0*/ +/*#define CFG_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/pf5200.h b/include/configs/pf5200.h index 4ed8a212b7..a709d0ed62 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 0 +#define CFG_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/sc3.h b/include/configs/sc3.h index 659f74ed95..4205f46e5c 100644 --- a/include/configs/sc3.h +++ b/include/configs/sc3.h @@ -405,7 +405,7 @@ extern unsigned long offsetOfEnvironment; #define CFG_WRITE_SWAPPED_DATA /* swap Databytes between reading/writing */ #define CFG_ENV_IS_IN_FLASH 1 -#if CFG_ENV_IS_IN_FLASH +#ifdef CFG_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 */