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 <plagnioj@jcrosoft.com>

diff --git a/board/barco/flash.c b/board/barco/flash.c
index 6cb19b7b076a5d33272e0422a8db2f2c979197c8..9502560d6769cdd638a0aaf89f44b71735f9daea 100644 (file)
--- 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 7fba174f46d87618ee0c4e3dc81ff035722b4c74..6d3cfab130a51743921c4841d3db0b75b115d9a7 100644 (file)
--- 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 37dd182ba4d3a1993fe9f090a853f8d2dc705751..9a398686be068f0f329c20cc5f99c82c14f8a38d 100644 (file)
--- 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 1535a6b48fce33b912082b9c56db29871c768a27..b1048a36b6bdbcc48374178b50e4dc80943ebd13 100644 (file)
--- 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 076c2f9192f4203bf40dbaf761fa338fe34f15b4..925a0e672254e4344a2a4fda2c469380abd4854e 100644 (file)
--- 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 7368176e54bbf2596ce0472bf48dfbfae76da093..ec1a58633f55cde18b8c5bcf6c0f48c183e3c06a 100644 (file)
--- 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 966a34526065d6dc7df0111e90ced59c500d53b6..167f316c87eb3c963be2efbaeb81de13f727cdd9 100644 (file)
--- 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 4dd53828767c68a229800db58fe08d8c501e7e1d..401eead5d9f289af174e282775742eeb685d1138 100644 (file)
--- 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 5620a1d8b7d9f85870fda21f20a59a53ed37f67a..015ea7dda905e5d4443d171f3f3fa81228c4b996 100644 (file)
--- 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 21c5a01c16a9d11d71c4098d9f8f2c8115d2a8b1..a2ed3bd1f98d2ee8dabb6098e8d4f41ed98e369b 100644 (file)
--- 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 296c01dc8439cfaf3e5adb99a7e97dccf091b496..4559b8033b41e9eefcdd3625b4f05b9ce8d60811 100644 (file)
--- 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 fee07cf353d3c04bb6064a8c369f7159ca59a9c4..92a433a58788402329fe88f167a349d0aed22dae 100644 (file)
--- 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 1f21b3e9cb73e5d0ca0c5dd534f338ec6cf3a345..0e7bfe8b0e7ec47902ddceadd1ed113a5f9f47be 100644 (file)
--- 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 4be6f136443494e905fff624408448e6d12b2139..4d13612aff24072b93571e89e38ca5bf26c6968d 100644 (file)
--- 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 d80e778622a00d037964968a511d8eca6c0cf6e2..b29032bc4695668a527d2bc7a2632e82ebdcfbe6 100644 (file)
--- 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 4e43b296601f0ca9e5b4792f58b40b0d1e25ccc2..d9f6b3bacd73ba0569c7124c92bb0ed4c396f3a7 100644 (file)
--- 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 a9f73ff0dcd230887561be0135f855a4c8cded51..cf066799381a4eff8d9346415d5df2678e4db0f3 100644 (file)
--- 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 9a8b95225f91aa686577cf80d131359ae49f191e..c43435fc5b8881033d325fdc34f0b92f12cdfd99 100644 (file)
--- 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 056fe810b38a165a041c0028d5a8628304ef0325..063972db5bbcff4df30c01b4a2b5ae14a6f2414b 100644 (file)
--- 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 553dc982266099dd4e558c605b41e5ac1cd48156..7fb94631cf107ad8af4de5fa3a7fae535fbdb63c 100644 (file)
--- 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 056fe810b38a165a041c0028d5a8628304ef0325..063972db5bbcff4df30c01b4a2b5ae14a6f2414b 100644 (file)
--- 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 199f619a827fddd24a2b896388b9355a781de056..ae0e659c2e6de1ca1d558a50c2ecea1025fba53e 100644 (file)
--- 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 4818aede305940ee4857463f3c7902f83bb699e2..48f308c76f6b8733335192590f3a00494399d770 100644 (file)
--- 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 c6d366607f032bd52e688b34a39d700a2b9a810d..a23ac9ca49b80de0cd10ea32108d68fd95a67e8e 100644 (file)
--- 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 945a163fb1b7ad91f8af5affb45c530e5deb8218..c45b258bda71e67fc8c0f998017eaee10aed8322 100644 (file)
--- 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 4ed8a212b7c025f63a3cadd3a58484bb285062bd..a709d0ed62a841f6c6abd0a48b54ce4e6b03a1e2 100644 (file)
--- 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 659f74ed9541a382e06219bc082ed6f3e0c4079b..4205f46e5c9d7c458b810ca751de23a83924fd19 100644 (file)
--- 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       */