diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index 95ba840..c17a2ea 100644
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -385,7 +385,7 @@
  * Environment
  */
 #if defined(CONFIG_NAND_U_BOOT)
-	#define CFG_ENV_IS_IN_NAND	1
+	#define CONFIG_ENV_IS_IN_NAND	1
 	#define CFG_ENV_OFFSET		(512 * 1024)
 	#define CFG_ENV_SECT_SIZE	CFG_NAND_BLOCK_SIZE
 	#define CFG_ENV_SIZE		CFG_ENV_SECT_SIZE
diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h
index 071ba10..5b25323 100644
--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@@ -107,7 +107,7 @@
 #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
 #define CONFIG_ENV_IS_IN_EEPROM	1	/* use FLASH for environment vars */
 #else
-#define CFG_ENV_IS_IN_NAND	1	/* use NAND for environment vars */
+#define CONFIG_ENV_IS_IN_NAND	1	/* use NAND for environment vars */
 #define CFG_ENV_IS_EMBEDDED	1	/* use embedded environment */
 #endif
 
@@ -200,7 +200,7 @@
 #define CFG_NAND_ECCPOS		{0, 1, 2, 3, 6, 7}
 #endif
 
-#ifdef CFG_ENV_IS_IN_NAND
+#ifdef CONFIG_ENV_IS_IN_NAND
 /*
  * For NAND booting the environment is embedded in the U-Boot image. Please take
  * look at the file board/amcc/sequoia/u-boot-nand.lds for details.
diff --git a/include/configs/acadia.h b/include/configs/acadia.h
index ed2754d..894a62b 100644
--- a/include/configs/acadia.h
+++ b/include/configs/acadia.h
@@ -98,7 +98,7 @@
 #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
 #define CFG_ENV_IS_IN_FLASH     1	/* use FLASH for environment vars	*/
 #else
-#define CFG_ENV_IS_IN_NAND	1	/* use NAND for environment vars	*/
+#define CONFIG_ENV_IS_IN_NAND	1	/* use NAND for environment vars	*/
 #define CFG_ENV_IS_EMBEDDED	1	/* use embedded environment */
 #endif
 
@@ -180,7 +180,7 @@
 #define CFG_NAND_ECCTOTAL	(CFG_NAND_ECCBYTES * CFG_NAND_ECCSTEPS)
 #define CFG_NAND_ECCPOS		{0, 1, 2, 3, 6, 7}
 
-#ifdef CFG_ENV_IS_IN_NAND
+#ifdef CONFIG_ENV_IS_IN_NAND
 /*
  * For NAND booting the environment is embedded in the U-Boot image. Please take
  * look at the file board/amcc/sequoia/u-boot-nand.lds for details.
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index f419363..0ddc079 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -162,7 +162,7 @@
 #else /* CFG_USE_NANDFLASH */
 
 /* bootstrap + u-boot + env + linux in nandflash */
-#define CFG_ENV_IS_IN_NAND	1
+#define CONFIG_ENV_IS_IN_NAND	1
 #define CFG_ENV_OFFSET		0x60000
 #define CFG_ENV_OFFSET_REDUND	0x80000
 #define CFG_ENV_SIZE		0x20000		/* 1 sector = 128 kB */
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 2929149..a4a0831 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -162,7 +162,7 @@
 #else /* CFG_USE_NANDFLASH */
 
 /* bootstrap + u-boot + env + linux in nandflash */
-#define CFG_ENV_IS_IN_NAND	1
+#define CONFIG_ENV_IS_IN_NAND	1
 #define CFG_ENV_OFFSET		0x60000
 #define CFG_ENV_OFFSET_REDUND	0x80000
 #define CFG_ENV_SIZE		0x20000		/* 1 sector = 128 kB */
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index c91e076..1d24311 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -168,7 +168,7 @@
 #else /* CFG_USE_NANDFLASH */
 
 /* bootstrap + u-boot + env + linux in nandflash */
-#define CFG_ENV_IS_IN_NAND	1
+#define CONFIG_ENV_IS_IN_NAND	1
 #define CFG_ENV_OFFSET		0x60000
 #define CFG_ENV_OFFSET_REDUND	0x80000
 #define CFG_ENV_SIZE		0x20000		/* 1 sector = 128 kB */
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index 0bf0ace..8162475 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -137,7 +137,7 @@
 #else /* CFG_USE_NANDFLASH */
 
 /* bootstrap + u-boot + env + linux in nandflash */
-#define CFG_ENV_IS_IN_NAND	1
+#define CONFIG_ENV_IS_IN_NAND	1
 #define CFG_ENV_OFFSET		0x60000
 #define CFG_ENV_OFFSET_REDUND	0x80000
 #define CFG_ENV_SIZE		0x20000		/* 1 sector = 128 kB */
diff --git a/include/configs/bamboo.h b/include/configs/bamboo.h
index 7caa403..20ebc3f 100644
--- a/include/configs/bamboo.h
+++ b/include/configs/bamboo.h
@@ -105,7 +105,7 @@
 #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
 #define CFG_ENV_IS_IN_FLASH     1	/* use FLASH for environment vars	*/
 #else
-#define CFG_ENV_IS_IN_NAND	1	/* use NAND for environment vars	*/
+#define CONFIG_ENV_IS_IN_NAND	1	/* use NAND for environment vars	*/
 #define CFG_ENV_IS_EMBEDDED	1	/* use embedded environment */
 #endif
 
@@ -183,7 +183,7 @@
 #define CFG_NAND_ECCTOTAL	(CFG_NAND_ECCBYTES * CFG_NAND_ECCSTEPS)
 #define CFG_NAND_ECCPOS		{0, 1, 2, 3, 6, 7}
 
-#ifdef CFG_ENV_IS_IN_NAND
+#ifdef CONFIG_ENV_IS_IN_NAND
 /*
  * For NAND booting the environment is embedded in the U-Boot image. Please take
  * look at the file board/amcc/sequoia/u-boot-nand.lds for details.
diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h
index 3b5b280..1891074 100644
--- a/include/configs/canyonlands.h
+++ b/include/configs/canyonlands.h
@@ -115,7 +115,7 @@
 #define	CFG_ENV_IS_IN_FLASH	1	/* use FLASH for environment vars */
 #define CFG_NAND_CS		3	/* NAND chip connected to CSx */
 #else
-#define	CFG_ENV_IS_IN_NAND	1	/* use NAND for environment vars  */
+#define	CONFIG_ENV_IS_IN_NAND	1	/* use NAND for environment vars  */
 #define CFG_NAND_CS		0	/* NAND chip connected to CSx */
 #define CFG_ENV_IS_EMBEDDED	1	/* use embedded environment */
 #endif
@@ -174,7 +174,7 @@
 				 48, 49, 50, 51, 52, 53, 54, 55, \
 				 56, 57, 58, 59, 60, 61, 62, 63}
 
-#ifdef CFG_ENV_IS_IN_NAND
+#ifdef CONFIG_ENV_IS_IN_NAND
 /*
  * For NAND booting the environment is embedded in the U-Boot image. Please take
  * look at the file board/amcc/canyonlands/u-boot-nand.lds for details.
diff --git a/include/configs/davinci_dvevm.h b/include/configs/davinci_dvevm.h
index c27ce18..9d79e3c 100644
--- a/include/configs/davinci_dvevm.h
+++ b/include/configs/davinci_dvevm.h
@@ -114,7 +114,7 @@
 #ifdef CFG_USE_NAND
 #undef CFG_ENV_IS_IN_FLASH
 #define CFG_NO_FLASH
-#define CFG_ENV_IS_IN_NAND		/* U-Boot env in NAND Flash  */
+#define CONFIG_ENV_IS_IN_NAND		/* U-Boot env in NAND Flash  */
 #ifdef CFG_NAND_SMALLPAGE
 #define CFG_ENV_SECT_SIZE	512	/* Env sector Size */
 #define CFG_ENV_SIZE		SZ_16K
diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h
index 10166a1..4aed843 100644
--- a/include/configs/davinci_schmoogie.h
+++ b/include/configs/davinci_schmoogie.h
@@ -81,7 +81,7 @@
 /*=====================*/
 #undef CFG_ENV_IS_IN_FLASH
 #define CFG_NO_FLASH
-#define CFG_ENV_IS_IN_NAND		/* U-Boot env in NAND Flash  */
+#define CONFIG_ENV_IS_IN_NAND		/* U-Boot env in NAND Flash  */
 #define CFG_ENV_SECT_SIZE	2048	/* Env sector Size */
 #define CFG_ENV_SIZE		SZ_128K
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* U-Boot is loaded by a bootloader */
diff --git a/include/configs/davinci_sffsdr.h b/include/configs/davinci_sffsdr.h
index 7c860e5..c46a430 100644
--- a/include/configs/davinci_sffsdr.h
+++ b/include/configs/davinci_sffsdr.h
@@ -77,7 +77,7 @@
 /* Flash & Environment */
 #undef CFG_ENV_IS_IN_FLASH
 #define CFG_NO_FLASH
-#define CFG_ENV_IS_IN_NAND		/* U-Boot env in NAND Flash  */
+#define CONFIG_ENV_IS_IN_NAND		/* U-Boot env in NAND Flash  */
 #define CFG_ENV_SECT_SIZE	2048	/* Env sector Size */
 #define CFG_ENV_SIZE		SZ_128K
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* U-Boot is loaded by a bootloader */
diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h
index c55766c..9c54f084 100644
--- a/include/configs/davinci_sonata.h
+++ b/include/configs/davinci_sonata.h
@@ -114,7 +114,7 @@
 #ifdef CFG_USE_NAND
 #undef CFG_ENV_IS_IN_FLASH
 #define CFG_NO_FLASH
-#define CFG_ENV_IS_IN_NAND		/* U-Boot env in NAND Flash  */
+#define CONFIG_ENV_IS_IN_NAND		/* U-Boot env in NAND Flash  */
 #define CFG_ENV_SECT_SIZE	512	/* Env sector Size */
 #define CFG_ENV_SIZE		SZ_16K
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* U-Boot is loaded by a bootloader */
diff --git a/include/configs/delta.h b/include/configs/delta.h
index 1db962a..5a5240e 100644
--- a/include/configs/delta.h
+++ b/include/configs/delta.h
@@ -262,7 +262,7 @@
 
 #define CFG_NO_FLASH		1
 
-#define CFG_ENV_IS_IN_NAND	1
+#define CONFIG_ENV_IS_IN_NAND	1
 #define CFG_ENV_OFFSET		0x40000
 #define CFG_ENV_OFFSET_REDUND	0x44000
 #define CFG_ENV_SIZE		0x4000
diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h
index f9eaa77..01d861b 100644
--- a/include/configs/kilauea.h
+++ b/include/configs/kilauea.h
@@ -123,7 +123,7 @@
 #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
 #define CFG_ENV_IS_IN_FLASH     1	/* use FLASH for environment vars	*/
 #else
-#define CFG_ENV_IS_IN_NAND	1	/* use NAND for environment vars	*/
+#define CONFIG_ENV_IS_IN_NAND	1	/* use NAND for environment vars	*/
 #define CFG_ENV_IS_EMBEDDED	1	/* use embedded environment */
 #endif
 
@@ -200,7 +200,7 @@
 #define CFG_NAND_ECCTOTAL	(CFG_NAND_ECCBYTES * CFG_NAND_ECCSTEPS)
 #define CFG_NAND_ECCPOS		{0, 1, 2, 3, 6, 7}
 
-#ifdef CFG_ENV_IS_IN_NAND
+#ifdef CONFIG_ENV_IS_IN_NAND
 /*
  * For NAND booting the environment is embedded in the U-Boot image. Please take
  * look at the file board/amcc/sequoia/u-boot-nand.lds for details.
diff --git a/include/configs/omap2420h4.h b/include/configs/omap2420h4.h
index afdcba4..461362f 100644
--- a/include/configs/omap2420h4.h
+++ b/include/configs/omap2420h4.h
@@ -270,7 +270,7 @@
 #define CFG_FLASH_BANKS_LIST	{ CFG_FLASH_BASE, CFG_FLASH_BASE + PHYS_FLASH_SIZE_1 }
 
 #ifdef CFG_NAND_BOOT
-#define CFG_ENV_IS_IN_NAND	1
+#define CONFIG_ENV_IS_IN_NAND	1
 #define CFG_ENV_OFFSET	0x80000	/* environment starts here  */
 #else
 #define CFG_ENV_ADDR             (CFG_FLASH_BASE + SZ_128K)
diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h
index 74f6e3a..0e28555 100644
--- a/include/configs/sequoia.h
+++ b/include/configs/sequoia.h
@@ -115,7 +115,7 @@
 #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
 #define CFG_ENV_IS_IN_FLASH	1	/* use FLASH for environ vars	*/
 #else
-#define CFG_ENV_IS_IN_NAND	1	/* use NAND for environ vars	*/
+#define CONFIG_ENV_IS_IN_NAND	1	/* use NAND for environ vars	*/
 #define CFG_ENV_IS_EMBEDDED	1	/* use embedded environment	*/
 #endif
 
@@ -197,7 +197,7 @@
 #define CFG_NAND_ECCTOTAL	(CFG_NAND_ECCBYTES * CFG_NAND_ECCSTEPS)
 #define CFG_NAND_ECCPOS		{0, 1, 2, 3, 6, 7}
 
-#ifdef CFG_ENV_IS_IN_NAND
+#ifdef CONFIG_ENV_IS_IN_NAND
 /*
  * For NAND booting the environment is embedded in the U-Boot image. Please take
  * look at the file board/amcc/sequoia/u-boot-nand.lds for details.
diff --git a/include/configs/smdk6400.h b/include/configs/smdk6400.h
index f0c146e..4c5602b 100644
--- a/include/configs/smdk6400.h
+++ b/include/configs/smdk6400.h
@@ -284,7 +284,7 @@
 */
 
 /* Settings as above boot configuration */
-#define CFG_ENV_IS_IN_NAND
+#define CONFIG_ENV_IS_IN_NAND
 #define CONFIG_BOOTARGS		"console=ttySAC,115200"
 
 #if !defined(CONFIG_ENABLE_MMU)
diff --git a/include/configs/zylonite.h b/include/configs/zylonite.h
index 517ecb1..47ce15d 100644
--- a/include/configs/zylonite.h
+++ b/include/configs/zylonite.h
@@ -231,7 +231,7 @@
 
 #define CFG_NO_FLASH		1
 
-#define CFG_ENV_IS_IN_NAND	1
+#define CONFIG_ENV_IS_IN_NAND	1
 #define CFG_ENV_OFFSET		0x40000
 #define CFG_ENV_OFFSET_REDUND	0x44000
 #define CFG_ENV_SIZE		0x4000
diff --git a/include/environment.h b/include/environment.h
index 481ea73..047f5f0 100644
--- a/include/environment.h
+++ b/include/environment.h
@@ -69,12 +69,12 @@
 # endif
 #endif	/* CFG_ENV_IS_IN_FLASH */
 
-#if defined(CFG_ENV_IS_IN_NAND)
+#if defined(CONFIG_ENV_IS_IN_NAND)
 # ifndef CFG_ENV_OFFSET
-#  error "Need to define CFG_ENV_OFFSET when using CFG_ENV_IS_IN_NAND"
+#  error "Need to define CFG_ENV_OFFSET when using CONFIG_ENV_IS_IN_NAND"
 # endif
 # ifndef CFG_ENV_SIZE
-#  error "Need to define CFG_ENV_SIZE when using CFG_ENV_IS_IN_NAND"
+#  error "Need to define CFG_ENV_SIZE when using CONFIG_ENV_IS_IN_NAND"
 # endif
 # ifdef CFG_ENV_OFFSET_REDUND
 #  define CFG_REDUNDAND_ENVIRONMENT
@@ -82,7 +82,7 @@
 # ifdef CFG_ENV_IS_EMBEDDED
 #  define ENV_IS_EMBEDDED	1
 # endif
-#endif /* CFG_ENV_IS_IN_NAND */
+#endif /* CONFIG_ENV_IS_IN_NAND */
 
 #ifdef USE_HOSTCC
 # include <stdint.h>