diff --git a/board/barco/flash.c b/board/barco/flash.c
index 6cb19b7..9502560 100644
--- a/board/barco/flash.c
+++ b/board/barco/flash.c
@@ -224,7 +224,7 @@
 				&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 7fba174..6d3cfab 100644
--- a/board/bmw/flash.c
+++ b/board/bmw/flash.c
@@ -224,7 +224,7 @@
 			       &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 37dd182..9a39868 100644
--- a/board/cpc45/flash.c
+++ b/board/cpc45/flash.c
@@ -174,7 +174,7 @@
 		       &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 1535a6b..b1048a3 100644
--- a/board/cpu86/flash.c
+++ b/board/cpu86/flash.c
@@ -230,7 +230,7 @@
 #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 076c2f9..925a0e6 100644
--- a/board/cpu87/flash.c
+++ b/board/cpu87/flash.c
@@ -236,7 +236,7 @@
 #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 7368176..ec1a586 100644
--- a/board/cu824/flash.c
+++ b/board/cu824/flash.c
@@ -135,7 +135,7 @@
 #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 966a345..167f316 100644
--- a/board/ep8260/flash.c
+++ b/board/ep8260/flash.c
@@ -157,7 +157,7 @@
 		      &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 4dd5382..401eead 100644
--- a/board/exbitgen/flash.c
+++ b/board/exbitgen/flash.c
@@ -126,7 +126,7 @@
 #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 5620a1d..015ea7d 100644
--- a/board/gw8260/flash.c
+++ b/board/gw8260/flash.c
@@ -100,7 +100,7 @@
 		  &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 21c5a01..a2ed3bd 100644
--- a/board/hidden_dragon/flash.c
+++ b/board/hidden_dragon/flash.c
@@ -212,7 +212,7 @@
 			       &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 296c01d..4559b80 100644
--- a/board/oxc/flash.c
+++ b/board/oxc/flash.c
@@ -73,7 +73,7 @@
 		  &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 fee07cf..92a433a 100644
--- a/board/pm826/flash.c
+++ b/board/pm826/flash.c
@@ -144,7 +144,7 @@
 # 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 1f21b3e..0e7bfe8 100644
--- a/board/pm828/flash.c
+++ b/board/pm828/flash.c
@@ -144,7 +144,7 @@
 # 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 4be6f13..4d13612 100644
--- a/board/ppmc7xx/flash.c
+++ b/board/ppmc7xx/flash.c
@@ -197,7 +197,7 @@
 		       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 d80e778..b29032b 100644
--- a/board/rpxsuper/flash.c
+++ b/board/rpxsuper/flash.c
@@ -71,7 +71,7 @@
 		  &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 4e43b296..d9f6b3b 100644
--- a/board/rsdproto/flash.c
+++ b/board/rsdproto/flash.c
@@ -131,7 +131,7 @@
 		      &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 a9f73ff..cf06679 100644
--- a/board/sandpoint/flash.c
+++ b/board/sandpoint/flash.c
@@ -230,7 +230,7 @@
 		&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 9a8b952..c43435f 100644
--- a/board/sbc8260/flash.c
+++ b/board/sbc8260/flash.c
@@ -67,7 +67,7 @@
 		  &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 056fe81..063972d 100644
--- a/board/siemens/SCM/flash.c
+++ b/board/siemens/SCM/flash.c
@@ -207,7 +207,7 @@
 		       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 553dc98..7fb9463 100644
--- a/board/sl8245/flash.c
+++ b/board/sl8245/flash.c
@@ -139,7 +139,7 @@
 #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 056fe81..063972d 100644
--- a/board/tqc/tqm8260/flash.c
+++ b/board/tqc/tqm8260/flash.c
@@ -207,7 +207,7 @@
 		       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 199f619..ae0e659 100644
--- a/board/utx8245/flash.c
+++ b/board/utx8245/flash.c
@@ -169,7 +169,7 @@
 				   &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 4818aed..48f308c 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 c6d3666..a23ac9c 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 945a163..c45b258 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 4ed8a21..a709d0e 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 659f74e..4205f46 100644
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -405,7 +405,7 @@
 #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	*/