rename CFG_ENV_IS_NOWHERE in CONFIG_ENV_IS_NOWHERE

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

57 files changed, 69 insertions, 69 deletions

diff --git a/board/xilinx/xilinx_enet/emac_adapter.c b/board/xilinx/xilinx_enet/emac_adapter.c
index d3403038e..0b100d215 100644
--- a/board/xilinx/xilinx_enet/emac_adapter.c
+++ b/board/xilinx/xilinx_enet/emac_adapter.c
@@ -56,7 +56,7 @@ static XEmac Emac;
 static char etherrxbuff[PKTSIZE_ALIGN];	/* Receive buffer */
 
 /* hardcoded MAC address for the Xilinx EMAC Core when env is nowhere*/
-#ifdef CFG_ENV_IS_NOWHERE
+#ifdef CONFIG_ENV_IS_NOWHERE
 static u8 EMACAddr[ENET_ADDR_LENGTH] = { 0x00, 0x0a, 0x35, 0x00, 0x22, 0x01 };
 #endif
 
@@ -87,7 +87,7 @@ eth_init(bd_t * bis)
 	/* make sure the Emac is stopped before it is started */
 	(void) XEmac_Stop(&Emac);
 
-#ifdef CFG_ENV_IS_NOWHERE
+#ifdef CONFIG_ENV_IS_NOWHERE
 	memcpy(bis->bi_enetaddr, EMACAddr, 6);
 #endif
 
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index 85d7108c9..fc9b94e0e 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -59,7 +59,7 @@ DECLARE_GLOBAL_DATA_PTR;
     !defined(CONFIG_ENV_IS_IN_NAND)	&& \
     !defined(CONFIG_ENV_IS_IN_ONENAND)	&& \
     !defined(CONFIG_ENV_IS_IN_SPI_FLASH)	&& \
-    !defined(CFG_ENV_IS_NOWHERE)
+    !defined(CONFIG_ENV_IS_NOWHERE)
 # error Define one of CFG_ENV_IS_IN_{NVRAM|EEPROM|FLASH|DATAFLASH|ONENAND|SPI_FLASH|NOWHERE}
 #endif
 
@@ -544,7 +544,7 @@ int getenv_r (char *name, char *buf, unsigned len)
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND))) \
-    && !defined(CFG_ENV_IS_NOWHERE))
+    && !defined(CONFIG_ENV_IS_NOWHERE))
 int do_saveenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
 	extern char * env_name_spec;
@@ -600,7 +600,7 @@ U_BOOT_CMD(
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND))) \
-    && !defined(CFG_ENV_IS_NOWHERE))
+    && !defined(CONFIG_ENV_IS_NOWHERE))
 U_BOOT_CMD(
 	saveenv, 1, 0,	do_saveenv,
 	"saveenv - save environment variables to persistent storage\n",
diff --git a/common/env_common.c b/common/env_common.c
index 36c46f0c9..c3946f0a7 100644
--- a/common/env_common.c
+++ b/common/env_common.c
@@ -246,7 +246,7 @@ void env_relocate (void)
 #endif
 
 	if (gd->env_valid == 0) {
-#if defined(CONFIG_GTH)	|| defined(CFG_ENV_IS_NOWHERE)	/* Environment not changable */
+#if defined(CONFIG_GTH)	|| defined(CONFIG_ENV_IS_NOWHERE)	/* Environment not changable */
 		puts ("Using default environment\n\n");
 #else
 		puts ("*** Warning - bad CRC, using default environment\n\n");
diff --git a/common/env_nowhere.c b/common/env_nowhere.c
index 17ecc775f..8dd4867f1 100644
--- a/common/env_nowhere.c
+++ b/common/env_nowhere.c
@@ -26,7 +26,7 @@
 
 #include <common.h>
 
-#if defined(CFG_ENV_IS_NOWHERE) /* Environment is nowhere */
+#if defined(CONFIG_ENV_IS_NOWHERE) /* Environment is nowhere */
 
 #include <command.h>
 #include <environment.h>
@@ -62,4 +62,4 @@ int  env_init(void)
 	return (0);
 }
 
-#endif /* CFG_ENV_IS_NOWHERE) */
+#endif /* CONFIG_ENV_IS_NOWHERE) */
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c
index 9ba4096e8..88cd0f9ff 100644
--- a/drivers/net/xilinx_emaclite.c
+++ b/drivers/net/xilinx_emaclite.c
@@ -73,7 +73,7 @@ static xemaclite emaclite;
 static char etherrxbuff[PKTSIZE_ALIGN/4]; /* Receive buffer */
 
 /* hardcoded MAC address for the Xilinx EMAC Core when env is nowhere*/
-#ifdef CFG_ENV_IS_NOWHERE
+#ifdef CONFIG_ENV_IS_NOWHERE
 static u8 emacaddr[ENET_ADDR_LENGTH] = { 0x00, 0x0a, 0x35, 0x00, 0x22, 0x01 };
 #else
 static u8 emacaddr[ENET_ADDR_LENGTH];
diff --git a/include/configs/ADNPESC1.h b/include/configs/ADNPESC1.h
index 01ee72b8b..cc91c8d11 100644
--- a/include/configs/ADNPESC1.h
+++ b/include/configs/ADNPESC1.h
@@ -129,7 +129,7 @@
 #define CONFIG_ENV_OVERWRITE			/* Serial/eth change Ok */
 
 #else
-#define	CFG_ENV_IS_NOWHERE	1		/* NO Environment	*/
+#define	CONFIG_ENV_IS_NOWHERE	1		/* NO Environment	*/
 #endif
 
 /*------------------------------------------------------------------------
diff --git a/include/configs/DK1C20.h b/include/configs/DK1C20.h
index fb0668907..965827823 100644
--- a/include/configs/DK1C20.h
+++ b/include/configs/DK1C20.h
@@ -117,7 +117,7 @@
 #define CONFIG_ENV_OVERWRITE			/* Serial/eth change Ok */
 
 #else
-#define	CFG_ENV_IS_NOWHERE	1		/* NO Environment	*/
+#define	CONFIG_ENV_IS_NOWHERE	1		/* NO Environment	*/
 #endif
 
 /*------------------------------------------------------------------------
diff --git a/include/configs/DK1S10.h b/include/configs/DK1S10.h
index 7a9ef79ad..e5bf8c7cc 100644
--- a/include/configs/DK1S10.h
+++ b/include/configs/DK1S10.h
@@ -133,7 +133,7 @@
 #define CONFIG_ENV_OVERWRITE			/* Serial/eth change Ok */
 
 #else
-#define	CFG_ENV_IS_NOWHERE	1		/* NO Environment	*/
+#define	CONFIG_ENV_IS_NOWHERE	1		/* NO Environment	*/
 #endif
 
 /*------------------------------------------------------------------------
diff --git a/include/configs/JSE.h b/include/configs/JSE.h
index fccf880ab..ecc344d82 100644
--- a/include/configs/JSE.h
+++ b/include/configs/JSE.h
@@ -80,7 +80,7 @@
 #undef	CONFIG_ENV_IS_IN_NVRAM
 #undef	CFG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_IS_IN_EEPROM 1
-#undef	CFG_ENV_IS_NOWHERE
+#undef	CONFIG_ENV_IS_NOWHERE
 
   /* This is the 7bit address of the device, not including P. */
 #define CFG_I2C_EEPROM_ADDR 0x50
diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index c17a2ea3c..776fe9916 100644
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -400,7 +400,7 @@
 
 /* Address and size of Redundant Environment Sector */
 #else
-	#define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+	#define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
 	#define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
 	#define CFG_ENV_SIZE		0x2000
 #endif
diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index 006b93a0b..1edd9ced4 100644
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -383,7 +383,7 @@
 	#define CFG_ENV_SIZE		0x2000
 #else
 	#define CFG_NO_FLASH		1	/* Flash is not usable now */
-	#define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+	#define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
 	#define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
 	#define CFG_ENV_SIZE		0x2000
 #endif
diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index 94b3d5a33..308f10216 100644
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -397,7 +397,7 @@
 	#define CFG_ENV_SIZE		0x2000
 #else
 	#define CFG_NO_FLASH		1	/* Flash is not usable now */
-	#define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+	#define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
 	#define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
 	#define CFG_ENV_SIZE		0x2000
 #endif
diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index 401d0afc4..b98f3ee18 100644
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -409,7 +409,7 @@
 	#define CFG_ENV_SIZE		0x2000
 #else
 	#define CFG_NO_FLASH		1	/* Flash is not usable now */
-	#define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+	#define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
 	#define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
 	#define CFG_ENV_SIZE		0x2000
 #endif
diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index c8870b54a..e03f5ca09 100644
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -476,7 +476,7 @@
 
 #else
 	#define CFG_NO_FLASH		1	/* Flash is not usable now */
-	#define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+	#define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
 	#define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
 	#define CFG_ENV_SIZE		0x2000
 #endif
diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index 45ddd5c45..7f5d303f0 100644
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -420,7 +420,7 @@ boards, we say we have two, but don't display a message if we find only one. */
 #else
   #define CFG_NO_FLASH		/* Flash is not usable now */
   #undef  CONFIG_FLASH_CFI_DRIVER
-  #define CFG_ENV_IS_NOWHERE	/* Store ENV in memory only */
+  #define CONFIG_ENV_IS_NOWHERE	/* Store ENV in memory only */
   #define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
   #define CFG_ENV_SIZE		0x2000
 #endif
diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h
index 43d4118b6..c532eb1fc 100644
--- a/include/configs/MPC8360EMDS.h
+++ b/include/configs/MPC8360EMDS.h
@@ -440,7 +440,7 @@
 	#define CFG_ENV_SIZE		0x2000
 #else
 	#define CFG_NO_FLASH		1	/* Flash is not usable now */
-	#define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+	#define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
 	#define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
 	#define CFG_ENV_SIZE		0x2000
 #endif
diff --git a/include/configs/MPC8360ERDK.h b/include/configs/MPC8360ERDK.h
index 6898495b8..47016005f 100644
--- a/include/configs/MPC8360ERDK.h
+++ b/include/configs/MPC8360ERDK.h
@@ -345,7 +345,7 @@
 #define CFG_ENV_SIZE		0x20000
 #else /* CFG_RAMBOOT */
 #define CFG_NO_FLASH		1	/* Flash is not usable now */
-#define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+#define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
 #define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
 #define CFG_ENV_SIZE		0x2000
 #endif /* CFG_RAMBOOT */
diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index f9c1b170d..220c14861 100644
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -427,7 +427,7 @@
 	#define CFG_ENV_SIZE		0x2000
 #else
 	#define CFG_NO_FLASH		1	/* Flash is not usable now */
-	#define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+	#define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
 	#define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
 	#define CFG_ENV_SIZE		0x2000
 #endif
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 82b33530d..289bcfaba 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -448,7 +448,7 @@
 	#define CFG_ENV_SIZE		0x4000
 #else
 	#define CFG_NO_FLASH		1	/* Flash is not usable now */
-	#define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+	#define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
 	#define CFG_ENV_ADDR		(CFG_MONITOR_BASE-0x1000)
 	#define CFG_ENV_SIZE		0x2000
 #endif
diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index 74f860536..c23dcf66b 100644
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -387,7 +387,7 @@
   #define CFG_ENV_SIZE		0x2000
 #else
   #define CFG_NO_FLASH		1	/* Flash is not usable now */
-  #define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+  #define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
   #define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
   #define CFG_ENV_SIZE		0x2000
 #endif
diff --git a/include/configs/MPC8540EVAL.h b/include/configs/MPC8540EVAL.h
index 1073e23bf..04bec2d02 100644
--- a/include/configs/MPC8540EVAL.h
+++ b/include/configs/MPC8540EVAL.h
@@ -256,7 +256,7 @@
 /* Environment */
 #ifndef CFG_RAMBOOT
 #if defined(CONFIG_RAM_AS_FLASH)
-#define CFG_ENV_IS_NOWHERE
+#define CONFIG_ENV_IS_NOWHERE
 #define CFG_ENV_ADDR		(CFG_FLASH_BASE + 0x100000)
 #define CFG_ENV_SIZE		0x2000
 #else
@@ -267,7 +267,7 @@
 #define CFG_ENV_SIZE		0x2000
 #else
 /* #define CFG_NO_FLASH		1 */	/* Flash is not usable now	*/
-#define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only	*/
+#define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only	*/
 #define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
 #define CFG_ENV_SIZE		0x2000
 #endif
diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index a8e7c0a41..f661c8e3b 100644
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -418,7 +418,7 @@
   #define CFG_ENV_SIZE		0x2000
 #else
   #define CFG_NO_FLASH		1	/* Flash is not usable now */
-  #define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+  #define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
   #define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
   #define CFG_ENV_SIZE		0x2000
 #endif
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 7c6958280..2ee8d5701 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -443,7 +443,7 @@
 #define CFG_ENV_SECT_SIZE	0x20000	/* 126k (one sector) for env */
 #define CFG_ENV_SIZE		0x2000
 #else
-#define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+#define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
 #define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
 #define CFG_ENV_SIZE		0x2000
 #endif
diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index a57c30331..170fbd6a5 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -509,7 +509,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
     #define CFG_ENV_SECT_SIZE		0x10000	/* 64K(one sector) for env */
     #define CFG_ENV_SIZE		0x2000
 #else
-    #define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+    #define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
     #define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
     #define CFG_ENV_SIZE		0x2000
 #endif
diff --git a/include/configs/PM854.h b/include/configs/PM854.h
index aa6095fa0..1212bcdb7 100644
--- a/include/configs/PM854.h
+++ b/include/configs/PM854.h
@@ -299,7 +299,7 @@
   #define CFG_ENV_SIZE		0x2000
 #else
   #define CFG_NO_FLASH		1	/* Flash is not usable now */
-  #define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+  #define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
   #define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
   #define CFG_ENV_SIZE		0x2000
 #endif
diff --git a/include/configs/PM856.h b/include/configs/PM856.h
index 244f09aa9..75dba3bcb 100644
--- a/include/configs/PM856.h
+++ b/include/configs/PM856.h
@@ -299,7 +299,7 @@
   #define CFG_ENV_SIZE		0x2000
 #else
   #define CFG_NO_FLASH		1	/* Flash is not usable now */
-  #define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+  #define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
   #define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
   #define CFG_ENV_SIZE		0x2000
 #endif
diff --git a/include/configs/PN62.h b/include/configs/PN62.h
index da7d8b82b..074e8a1a9 100644
--- a/include/configs/PN62.h
+++ b/include/configs/PN62.h
@@ -160,7 +160,7 @@
 
 #define CFG_NO_FLASH		1		/* There is no FLASH memory	*/
 
-#define CFG_ENV_IS_NOWHERE	1		/* Store ENV in memory only	*/
+#define CONFIG_ENV_IS_NOWHERE	1		/* Store ENV in memory only	*/
 #define CFG_ENV_OFFSET		0x00004000	/* Offset of Environment Sector */
 #define CFG_ENV_SIZE		0x00002000	/* Total Size of Environment Sector */
 
diff --git a/include/configs/SBC8540.h b/include/configs/SBC8540.h
index 93509ee08..6b25d56fc 100644
--- a/include/configs/SBC8540.h
+++ b/include/configs/SBC8540.h
@@ -333,7 +333,7 @@
 /* Environment */
 #if !defined(CFG_RAMBOOT)
   #if defined(CONFIG_RAM_AS_FLASH)
-    #define CFG_ENV_IS_NOWHERE
+    #define CONFIG_ENV_IS_NOWHERE
     #define CFG_ENV_ADDR	(CFG_FLASH_BASE + 0x100000)
     #define CFG_ENV_SIZE	0x2000
   #else
@@ -344,7 +344,7 @@
   #endif
 #else
   #define CFG_NO_FLASH		1	/* Flash is not usable now	*/
-  #define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only	*/
+  #define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only	*/
   #define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
   #define CFG_ENV_SIZE		0x2000
 #endif
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index e8f69f6dc..2ab699151 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -306,7 +306,7 @@ extern int tqm834x_num_flash_banks;
 	#define CFG_ENV_SIZE		0x2000
 #else
 	#define CFG_NO_FLASH		1	/* Flash is not usable now */
-	#define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+	#define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
 	#define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
 	#define CFG_ENV_SIZE		0x2000
 #endif
diff --git a/include/configs/cm4008.h b/include/configs/cm4008.h
index ae40b358e..85f45b7e0 100644
--- a/include/configs/cm4008.h
+++ b/include/configs/cm4008.h
@@ -52,7 +52,7 @@
 /*
  * select serial console configuration
  */
-#define CFG_ENV_IS_NOWHERE
+#define CONFIG_ENV_IS_NOWHERE
 #define	CONFIG_SERIAL1
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		115200
diff --git a/include/configs/cm41xx.h b/include/configs/cm41xx.h
index c1dd33d1d..f34dc5c97 100644
--- a/include/configs/cm41xx.h
+++ b/include/configs/cm41xx.h
@@ -52,7 +52,7 @@
 /*
  * select serial console configuration
  */
-#define CFG_ENV_IS_NOWHERE
+#define CONFIG_ENV_IS_NOWHERE
 #define	CONFIG_SERIAL1
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		115200
diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index 8941c5eb1..d422cce20 100644
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -198,7 +198,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_NOWHERE	1
+#define	CONFIG_ENV_IS_NOWHERE	1
 
 /* Address and size of Primary Environment Sector	*/
 #define CFG_ENV_ADDR		0xB0030000
diff --git a/include/configs/evb4510.h b/include/configs/evb4510.h
index 1571477d0..f2ed0df49 100644
--- a/include/configs/evb4510.h
+++ b/include/configs/evb4510.h
@@ -172,7 +172,7 @@
 
 /* environment settings */
 #define CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_NOWHERE
+#undef CONFIG_ENV_IS_NOWHERE
 
 #define CFG_ENV_ADDR		(CFG_FLASH_BASE + 0x20000) /* environment start address */
 #define CFG_ENV_SECT_SIZE	0x10000	   /* Total Size of Environment Sector */
diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h
index 942609f8c..7fee1d2df 100644
--- a/include/configs/gr_cpci_ax2000.h
+++ b/include/configs/gr_cpci_ax2000.h
@@ -218,7 +218,7 @@
 /*
  * Environment settings
  */
-/*#define CFG_ENV_IS_NOWHERE 1*/
+/*#define CONFIG_ENV_IS_NOWHERE 1*/
 #define CFG_ENV_IS_IN_FLASH	1
 /* CFG_ENV_ADDR need to be at sector boundary */
 #define CFG_ENV_SIZE		0x8000
diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h
index ae25fb291..776fe40de 100644
--- a/include/configs/gr_ep2s60.h
+++ b/include/configs/gr_ep2s60.h
@@ -206,7 +206,7 @@
 /*
  * Environment settings
  */
-/*#define CFG_ENV_IS_NOWHERE 1*/
+/*#define CONFIG_ENV_IS_NOWHERE 1*/
 #define CFG_ENV_IS_IN_FLASH	1
 /* CFG_ENV_ADDR need to be at sector boundary */
 #define CFG_ENV_SIZE		0x8000
diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h
index f019bb44e..f0f770cb3 100644
--- a/include/configs/gr_xc3s_1500.h
+++ b/include/configs/gr_xc3s_1500.h
@@ -182,7 +182,7 @@
 /*
  * Environment settings
  */
-/*#define CFG_ENV_IS_NOWHERE 1*/
+/*#define CONFIG_ENV_IS_NOWHERE 1*/
 #define CFG_ENV_IS_IN_FLASH	1
 /* CFG_ENV_ADDR need to be at sector boundary */
 #define CFG_ENV_SIZE		0x8000
diff --git a/include/configs/grsim.h b/include/configs/grsim.h
index f880a7b51..c6d366607 100644
--- a/include/configs/grsim.h
+++ b/include/configs/grsim.h
@@ -209,7 +209,7 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_NOWHERE 1
+#define CONFIG_ENV_IS_NOWHERE 1
 /*#define CFG_ENV_IS_IN_FLASH	0*/
 /*#define CFG_ENV_SIZE		0x8000*/
 #define CFG_ENV_SECT_SIZE	0x40000
diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h
index e5af9a6e9..945a163fb 100644
--- a/include/configs/grsim_leon2.h
+++ b/include/configs/grsim_leon2.h
@@ -206,7 +206,7 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_NOWHERE 1
+#define CONFIG_ENV_IS_NOWHERE 1
 /*#define CFG_ENV_IS_IN_FLASH	0*/
 /*#define CFG_ENV_SIZE		0x8000*/
 #define CFG_ENV_SECT_SIZE	0x40000
diff --git a/include/configs/gth2.h b/include/configs/gth2.h
index 7f7190bcd..ad8bb5958 100644
--- a/include/configs/gth2.h
+++ b/include/configs/gth2.h
@@ -153,7 +153,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_NOWHERE	1
+#define CONFIG_ENV_IS_NOWHERE	1
 
 /* Address and size of Primary Environment Sector	*/
 #define CFG_ENV_ADDR		0xB0030000
diff --git a/include/configs/hcu4.h b/include/configs/hcu4.h
index 0dd978782..7f262cbf9 100644
--- a/include/configs/hcu4.h
+++ b/include/configs/hcu4.h
@@ -123,7 +123,7 @@
 
 #undef	CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_IS_IN_FLASH
-#undef  CFG_ENV_IS_NOWHERE
+#undef  CONFIG_ENV_IS_NOWHERE
 
 #ifdef  CONFIG_ENV_IS_IN_EEPROM
 /* Put the environment after the SDRAM configuration */
diff --git a/include/configs/hcu5.h b/include/configs/hcu5.h
index 0796a7d52..af0f7f475 100644
--- a/include/configs/hcu5.h
+++ b/include/configs/hcu5.h
@@ -109,7 +109,7 @@
 #undef	CONFIG_ENV_IS_IN_NVRAM
 #define  CFG_ENV_IS_IN_FLASH
 #undef	CONFIG_ENV_IS_IN_EEPROM
-#undef  CFG_ENV_IS_NOWHERE
+#undef  CONFIG_ENV_IS_NOWHERE
 
 #ifdef  CONFIG_ENV_IS_IN_EEPROM
 /* Put the environment after the SDRAM and bootstrap configuration */
diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h
index ba3c5315e..dd070be13 100644
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -128,7 +128,7 @@
 /*-----------------------------------------------------------------------
  * FLASH and environment organization
  */
-#define CFG_ENV_IS_NOWHERE
+#define CONFIG_ENV_IS_NOWHERE
 #define CFG_MAX_FLASH_BANKS	1		/* max number of memory banks */
 #define PHYS_FLASH_SIZE		0x01000000	/* 16MB */
 /* timeout values are in ticks */
diff --git a/include/configs/mcu25.h b/include/configs/mcu25.h
index 5c234df93..35ecc656b 100644
--- a/include/configs/mcu25.h
+++ b/include/configs/mcu25.h
@@ -123,7 +123,7 @@
 
 #undef	CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_IS_IN_FLASH
-#undef  CFG_ENV_IS_NOWHERE
+#undef  CONFIG_ENV_IS_NOWHERE
 
 #ifdef  CONFIG_ENV_IS_IN_EEPROM
 /* Put the environment after the SDRAM configuration */
diff --git a/include/configs/ml401.h b/include/configs/ml401.h
index 36a42ba6f..c626702dd 100644
--- a/include/configs/ml401.h
+++ b/include/configs/ml401.h
@@ -161,7 +161,7 @@
 	#define	CFG_FLASH_PROTECTION		/* hardware flash protection */
 
 	#ifdef	RAMENV
-		#define	CFG_ENV_IS_NOWHERE	1
+		#define	CONFIG_ENV_IS_NOWHERE	1
 		#define	CFG_ENV_SIZE		0x1000
 		#define	CFG_ENV_ADDR		(CFG_MONITOR_BASE - CFG_ENV_SIZE)
 
@@ -174,7 +174,7 @@
 #else /* !FLASH */
 	/* ENV in RAM */
 	#define	CFG_NO_FLASH		1
-	#define	CFG_ENV_IS_NOWHERE	1
+	#define	CONFIG_ENV_IS_NOWHERE	1
 	#define	CFG_ENV_SIZE		0x1000
 	#define	CFG_ENV_ADDR		(CFG_MONITOR_BASE - CFG_ENV_SIZE)
 	#define	CFG_FLASH_PROTECTION		/* hardware flash protection */
diff --git a/include/configs/modnet50.h b/include/configs/modnet50.h
index 5159897db..84540f5e5 100644
--- a/include/configs/modnet50.h
+++ b/include/configs/modnet50.h
@@ -171,7 +171,7 @@
 
 /* environment settings */
 #define	CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_NOWHERE
+#undef CONFIG_ENV_IS_NOWHERE
 
 #define CFG_ENV_ADDR		0x1001C000 /* environment start address */
 #define CFG_ENV_SECT_SIZE       0x10000 /* Total Size of Environment Sector */
diff --git a/include/configs/ns9750dev.h b/include/configs/ns9750dev.h
index 746a56e9a..b9eec62cf 100644
--- a/include/configs/ns9750dev.h
+++ b/include/configs/ns9750dev.h
@@ -186,7 +186,7 @@
 
 /* @TODO */
 /*#define	CFG_ENV_IS_IN_FLASH	1*/
-#define CFG_ENV_IS_NOWHERE
+#define CONFIG_ENV_IS_NOWHERE
 #define CFG_ENV_SIZE		0x10000	/* Total Size of Environment Sector */
 
 #ifdef CONFIG_STATUS_LED
diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h
index 2caa64173..4ec520fef 100644
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -116,7 +116,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_NOWHERE	1
+#define	CONFIG_ENV_IS_NOWHERE	1
 
 /* Address and size of Primary Environment Sector	*/
 #define CFG_ENV_ADDR		0xB0030000
diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index 261229c48..264f5ab1d 100644
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -424,7 +424,7 @@
 
 #else
 	#define CFG_NO_FLASH		1	/* Flash is not usable now */
-	#define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+	#define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
 	#define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
 	#define CFG_ENV_SIZE		0x2000
 #endif
diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h
index 99d328c75..f39867feb 100644
--- a/include/configs/sbc8560.h
+++ b/include/configs/sbc8560.h
@@ -332,7 +332,7 @@
 /* Environment */
 #if !defined(CFG_RAMBOOT)
   #if defined(CONFIG_RAM_AS_FLASH)
-    #define CFG_ENV_IS_NOWHERE
+    #define CONFIG_ENV_IS_NOWHERE
     #define CFG_ENV_ADDR	(CFG_FLASH_BASE + 0x100000)
     #define CFG_ENV_SIZE	0x2000
   #else
@@ -343,7 +343,7 @@
   #endif
 #else
   #define CFG_NO_FLASH		1	/* Flash is not usable now	*/
-  #define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only	*/
+  #define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only	*/
   #define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
   #define CFG_ENV_SIZE		0x2000
 #endif
diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h
index ea79de71f..f4a8fa577 100644
--- a/include/configs/stxgp3.h
+++ b/include/configs/stxgp3.h
@@ -294,7 +294,7 @@
   #define CFG_ENV_SIZE		0x2000
 #else
   #define CFG_NO_FLASH		1	/* Flash is not usable now	*/
-  #define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only	*/
+  #define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only	*/
   #define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
   #define CFG_ENV_SIZE		0x2000
 #endif
diff --git a/include/configs/suzaku.h b/include/configs/suzaku.h
index 020ed0230..5299733e0 100644
--- a/include/configs/suzaku.h
+++ b/include/configs/suzaku.h
@@ -90,7 +90,7 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_NOWHERE	1
+#define CONFIG_ENV_IS_NOWHERE	1
 #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/versatile.h b/include/configs/versatile.h
index c18a24814..f563c580c 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 CFG_ENV_IS_NOWHERE */
+#define CFG_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/xupv2p.h b/include/configs/xupv2p.h
index 570d6a802..7bd142469 100644
--- a/include/configs/xupv2p.h
+++ b/include/configs/xupv2p.h
@@ -150,7 +150,7 @@
 #define	CFG_INIT_SP_OFFSET	CFG_MALLOC_BASE
 
 #define	CFG_NO_FLASH		1
-#define	CFG_ENV_IS_NOWHERE	1
+#define	CONFIG_ENV_IS_NOWHERE	1
 #define	CFG_ENV_SIZE		0x1000
 #define	CFG_ENV_ADDR		(CFG_MONITOR_BASE - CFG_ENV_SIZE)
 
diff --git a/lib_avr32/board.c b/lib_avr32/board.c
index d6423d4f3..f3d0c5227 100644
--- a/lib_avr32/board.c
+++ b/lib_avr32/board.c
@@ -261,7 +261,7 @@ void board_init_f(ulong board_type)
 void board_init_r(gd_t *new_gd, ulong dest_addr)
 {
 	extern void malloc_bin_reloc (void);
-#ifndef CFG_ENV_IS_NOWHERE
+#ifndef CONFIG_ENV_IS_NOWHERE
 	extern char * env_name_spec;
 #endif
 	char *s;
@@ -302,7 +302,7 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
 	}
 
 	/* there are some other pointer constants we must deal with */
-#ifndef CFG_ENV_IS_NOWHERE
+#ifndef CONFIG_ENV_IS_NOWHERE
 	env_name_spec += gd->reloc_off;
 #endif
 
diff --git a/lib_m68k/board.c b/lib_m68k/board.c
index 3aadfaffb..428a241b7 100644
--- a/lib_m68k/board.c
+++ b/lib_m68k/board.c
@@ -443,7 +443,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
 	int i;
 	extern void malloc_bin_reloc (void);
 
-#ifndef CFG_ENV_IS_NOWHERE
+#ifndef CONFIG_ENV_IS_NOWHERE
 	extern char * env_name_spec;
 #endif
 #ifndef CFG_NO_FLASH
@@ -494,7 +494,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
 #endif
 	}
 	/* there are some other pointer constants we must deal with */
-#ifndef CFG_ENV_IS_NOWHERE
+#ifndef CONFIG_ENV_IS_NOWHERE
 	env_name_spec += gd->reloc_off;
 #endif
 
diff --git a/lib_mips/board.c b/lib_mips/board.c
index 64ca2003f..fb31e33f3 100644
--- a/lib_mips/board.c
+++ b/lib_mips/board.c
@@ -308,7 +308,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
 	ulong size;
 #endif
 	extern void malloc_bin_reloc (void);
-#ifndef CFG_ENV_IS_NOWHERE
+#ifndef CONFIG_ENV_IS_NOWHERE
 	extern char * env_name_spec;
 #endif
 	char *s, *e;
@@ -353,7 +353,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
 #endif
 	}
 	/* there are some other pointer constants we must deal with */
-#ifndef CFG_ENV_IS_NOWHERE
+#ifndef CONFIG_ENV_IS_NOWHERE
 	env_name_spec += gd->reloc_off;
 #endif
 
diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index a757ffd24..cf6239f9c 100644
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -651,7 +651,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
 	bd_t *bd;
 	int i;
 	extern void malloc_bin_reloc (void);
-#ifndef CFG_ENV_IS_NOWHERE
+#ifndef CONFIG_ENV_IS_NOWHERE
 	extern char * env_name_spec;
 #endif
 
@@ -713,7 +713,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
 #endif
 	}
 	/* there are some other pointer constants we must deal with */
-#ifndef CFG_ENV_IS_NOWHERE
+#ifndef CONFIG_ENV_IS_NOWHERE
 	env_name_spec += gd->reloc_off;
 #endif