rename CFG_ENV_IS_IN_FLASH in CONFIG_ENV_IS_IN_FLASH

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
17 years ago · 5a1aceb068
parent 7d9b5bae5b
commit 5a1aceb068
463 changed files with 591 additions and 591 deletions
--- a/4
+++ b/4
@ -2104,7 +2104,7 @@ The following definitions that deal with the placement and management
 of environment data (variable area); in general, we support the
 following configurations:

- CFG_ENV_IS_IN_FLASH:
+- CONFIG_ENV_IS_IN_FLASH:

 	Define this if the environment is in flash memory.

@ -2146,7 +2146,7 @@ following configurations:

 	- CFG_ENV_SIZE:

-	   If you use this in combination with CFG_ENV_IS_IN_FLASH
+	   If you use this in combination with CONFIG_ENV_IS_IN_FLASH
 	   and CFG_ENV_SECT_SIZE, you can specify to use only a part
 	   of this flash sector for the environment. This saves
 	   memory for the RAM copy of the environment.
--- a/board/LEOX/elpt860/flash.c
+++ b/board/LEOX/elpt860/flash.c
@ -122,7 +122,7 @@ flash_init (void)
 		 &flash_info[0]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
  /* ENV protection ON by default */
  flash_protect(FLAG_PROTECT_SET,
 		CFG_ENV_ADDR,
--- a/board/MAI/AmigaOneG3SE/flash_new.c
+++ b/board/MAI/AmigaOneG3SE/flash_new.c
@ -123,7 +123,7 @@ unsigned long flash_init (void)
 			      &flash_info[0]);
 #endif

-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 		/* ENV protection ON by default */
 		flash_protect(FLAG_PROTECT_SET,
 			      CFG_ENV_ADDR,
--- a/board/RPXlite_dw/README
+++ b/board/RPXlite_dw/README
@ -21,7 +21,7 @@ make distclean
 make RPXlite_DW_64_config
 make all

-2. CFG_ENV_IS_IN_FLASH/CONFIG_ENV_IS_IN_NVRAM
+2. CONFIG_ENV_IS_IN_FLASH/CONFIG_ENV_IS_IN_NVRAM

 The default environment parameter is stored in FLASH because it is a common choice for
 environment parameter.So I make NVRAM as backup parameter storeage.The reason why I
--- a/board/RRvision/flash.c
+++ b/board/RRvision/flash.c
@ -77,7 +77,7 @@ unsigned long flash_init (void)
 		      &flash_info[0]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
 		      CFG_ENV_ADDR,
--- a/board/a3000/flash.c
+++ b/board/a3000/flash.c
@ -25,7 +25,7 @@
 #include <common.h>
 #include <mpc824x.h>

-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 # ifndef  CFG_ENV_ADDR
 #  define CFG_ENV_ADDR  (CFG_FLASH_BASE + CFG_ENV_OFFSET)
 # endif
@ -108,7 +108,7 @@ unsigned long flash_init (void)
 		      &flash_info[0]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	DEBUGF("protect environtment %x @ %x\n", CFG_ENV_ADDR, CFG_ENV_SECT_SIZE);
 	flash_protect(FLAG_PROTECT_SET,
--- a/board/amcc/bamboo/flash.c
+++ b/board/amcc/bamboo/flash.c
@ -153,11 +153,11 @@ unsigned long flash_init(void)
 		(void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE,
 				    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
 				    &flash_info[i]);
-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 		(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
 				    CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
 				    &flash_info[i]);
-#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR_REDUND)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR_REDUND)
 		(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND,
 				    CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1,
 				    &flash_info[i]);
--- a/board/amcc/bubinga/flash.c
+++ b/board/amcc/bubinga/flash.c
@ -84,7 +84,7 @@ unsigned long flash_init(void)
 				    CFG_MONITOR_BASE,
 				    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
 				    &flash_info[0]);
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 		(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
 				    CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
 				    &flash_info[0]);
--- a/board/amcc/ebony/flash.c
+++ b/board/amcc/ebony/flash.c
@ -124,7 +124,7 @@ unsigned long flash_init(void)
 		(void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE,
 				    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
 				    &flash_info[2]);
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 		(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
 				    CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
 				    &flash_info[2]);
--- a/board/amcc/kilauea/kilauea.c
+++ b/board/amcc/kilauea/kilauea.c
@ -219,7 +219,7 @@ int board_early_init_f (void)

 int misc_init_r(void)
 {
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 	/* Monitor protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
 		      -CFG_MONITOR_LEN,
--- a/board/amcc/luan/flash.c
+++ b/board/amcc/luan/flash.c
@ -95,7 +95,7 @@ unsigned long flash_init(void)
 		(void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE,
 				    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
 				    &flash_info[2]);
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 		(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
 				    CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
 				    &flash_info[2]);
--- a/board/amcc/makalu/makalu.c
+++ b/board/amcc/makalu/makalu.c
@ -210,7 +210,7 @@ int board_early_init_f (void)

 int misc_init_r(void)
 {
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 	/* Monitor protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
 		      -CFG_MONITOR_LEN,
--- a/board/amcc/ocotea/flash.c
+++ b/board/amcc/ocotea/flash.c
@ -134,7 +134,7 @@ unsigned long flash_init(void)
 		(void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE,
 				    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
 				    &flash_info[i]);
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 		(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
 				    CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
 				    &flash_info[i]);
--- a/board/amcc/sequoia/sequoia.c
+++ b/board/amcc/sequoia/sequoia.c
@ -157,7 +157,7 @@ int misc_init_r(void)
 	 */
 	flash_get_size(gd->bd->bi_flashstart, 0);

-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 	/* Monitor protection ON by default */
 	(void)flash_protect(FLAG_PROTECT_SET,
 			    -CFG_MONITOR_LEN,
--- a/board/amcc/taihu/flash.c
+++ b/board/amcc/taihu/flash.c
@ -87,7 +87,7 @@ unsigned long flash_init(void)
 				    CFG_MONITOR_BASE,
 				    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
 				    &flash_info[0]);
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 		(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
 				    CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
 				    &flash_info[0]);
--- a/board/amcc/walnut/flash.c
+++ b/board/amcc/walnut/flash.c
@ -82,7 +82,7 @@ unsigned long flash_init(void)
 				    CFG_MONITOR_BASE,
 				    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
 				    &flash_info[0]);
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 		(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
 				    CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
 				    &flash_info[0]);
--- a/board/amcc/yucca/flash.c
+++ b/board/amcc/yucca/flash.c
@ -1037,7 +1037,7 @@ unsigned long flash_init(void)
 		(void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE,
 				    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
 				    &flash_info[i]);
-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 		(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
 				    CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
 				    &flash_info[i]);
--- a/board/atc/flash.c
+++ b/board/atc/flash.c
@ -95,7 +95,7 @@ unsigned long flash_init (void)
 		      flash_get_info(CFG_MONITOR_BASE));
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
 		      CFG_ENV_ADDR,
--- a/board/barco/flash.c
+++ b/board/barco/flash.c
@ -58,7 +58,7 @@

 flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips    */

-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 # ifndef  CFG_ENV_ADDR
 #  define CFG_ENV_ADDR  (CFG_FLASH_BASE + CFG_ENV_OFFSET)
 # endif
@ -224,7 +224,7 @@ unsigned long flash_init(void)
 				&flash_info[0]);
 #endif

-#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 		flash_protect(FLAG_PROTECT_SET,
 				CFG_ENV_ADDR,
 				CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
--- a/board/bmw/flash.c
+++ b/board/bmw/flash.c
@ -31,7 +31,7 @@

 flash_info_t flash_info[CFG_MAX_FLASH_BANKS];	/* info for FLASH chips    */

-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 # ifndef  CFG_ENV_ADDR
 #  define CFG_ENV_ADDR  (CFG_FLASH_BASE + CFG_ENV_OFFSET)
 # endif
@ -224,7 +224,7 @@ unsigned long flash_init (void)
 			       &flash_info[0]);
 #endif

-#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 		flash_protect (FLAG_PROTECT_SET,
 			       CFG_ENV_ADDR,
 			       CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
--- a/board/c2mon/flash.c
+++ b/board/c2mon/flash.c
@ -95,7 +95,7 @@ unsigned long flash_init (void)
 		      &flash_info[0]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
 		      CFG_ENV_ADDR,
@ -122,7 +122,7 @@ unsigned long flash_init (void)
 			      &flash_info[1]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 		/* ENV protection ON by default */
 		flash_protect(FLAG_PROTECT_SET,
 			      CFG_ENV_ADDR,
--- a/board/cmc_pu2/flash.c
+++ b/board/cmc_pu2/flash.c
@ -71,7 +71,7 @@ unsigned long flash_init (void)
 		      flash_get_info(CFG_MONITOR_BASE));
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
 		      CFG_ENV_ADDR,
--- a/board/cmi/flash.c
+++ b/board/cmi/flash.c
@ -36,7 +36,7 @@
 #include <common.h>
 #include <mpc5xx.h>

-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 # ifndef  CFG_ENV_ADDR
 #  define CFG_ENV_ADDR	(CFG_FLASH_BASE + CFG_ENV_OFFSET)
 # endif
@ -110,7 +110,7 @@ unsigned long flash_init (void)
 		      &flash_info[0]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
 		      CFG_ENV_ADDR,
--- a/board/cogent/flash.c
+++ b/board/cogent/flash.c
@ -26,7 +26,7 @@

 flash_info_t	flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips	*/

-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 # ifndef  CFG_ENV_ADDR
 #  define CFG_ENV_ADDR	(CFG_FLASH_BASE + CFG_ENV_OFFSET)
 # endif
@ -327,7 +327,7 @@ flash_init(void)
 		      &flash_info[0]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
 		      CFG_ENV_ADDR,
--- a/board/cpc45/flash.c
+++ b/board/cpc45/flash.c
@ -25,7 +25,7 @@
 #include <mpc824x.h>
 #include <asm/processor.h>

-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 # ifndef  CFG_ENV_ADDR
 #  define CFG_ENV_ADDR	(CFG_FLASH_BASE + CFG_ENV_OFFSET)
 # endif
@ -174,7 +174,7 @@ unsigned long flash_init (void)
 		       &flash_info[0]);
 #endif

-#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
+#if defined(CONFIG_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,
--- a/board/cpu86/flash.c
+++ b/board/cpu86/flash.c
@ -230,7 +230,7 @@ unsigned long flash_init (void)
 #endif
 #endif

-#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 # ifndef  CFG_ENV_SIZE
 #  define CFG_ENV_SIZE	CFG_ENV_SECT_SIZE
 # endif
--- a/board/cpu87/flash.c
+++ b/board/cpu87/flash.c
@ -236,7 +236,7 @@ unsigned long flash_init (void)
 #endif
 #endif

-#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 # ifndef  CFG_ENV_SIZE
 #  define CFG_ENV_SIZE	CFG_ENV_SECT_SIZE
 # endif
--- a/board/cu824/flash.c
+++ b/board/cu824/flash.c
@ -25,7 +25,7 @@
 #include <mpc824x.h>
 #include <asm/processor.h>

-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 # ifndef  CFG_ENV_ADDR
 #  define CFG_ENV_ADDR	(CFG_FLASH_BASE + CFG_ENV_OFFSET)
 # endif
@ -135,7 +135,7 @@ unsigned long flash_init(void)
 #endif
 #endif

-#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
+#if defined(CONFIG_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,
--- a/board/emk/common/flash.c
+++ b/board/emk/common/flash.c
@ -113,7 +113,7 @@ unsigned long flash_init (void)
 		      flash_get_info(CFG_MONITOR_BASE));
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
 		      CFG_ENV_ADDR,
--- a/board/ep8260/flash.c
+++ b/board/ep8260/flash.c
@ -157,7 +157,7 @@ unsigned long flash_init (void)
 		      &flash_info[0]);
 #endif

-#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 # ifndef  CFG_ENV_SIZE
 #  define CFG_ENV_SIZE	CFG_ENV_SECT_SIZE
 # endif
--- a/board/esd/pf5200/flash.c
+++ b/board/esd/pf5200/flash.c
@ -76,7 +76,7 @@ unsigned long flash_init(void)
 		      flash_get_info(CFG_MONITOR_BASE));
 #endif

-#ifdef  CFG_ENV_IS_IN_FLASH
+#ifdef  CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
 		      CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
--- a/board/esd/pmc440/pmc440.c
+++ b/board/esd/pmc440/pmc440.c
@ -239,7 +239,7 @@ int misc_init_r(void)
 	 */
 	flash_get_size(gd->bd->bi_flashstart, 0);

-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 	/* Monitor protection ON by default */
 	(void)flash_protect(FLAG_PROTECT_SET,
 			    -CFG_MONITOR_LEN,
--- a/board/evb64260/flash.c
+++ b/board/evb64260/flash.c
@ -119,7 +119,7 @@ flash_init (void)
 	              flash_get_info(CFG_MONITOR_BASE));
 #endif

-#ifdef  CFG_ENV_IS_IN_FLASH
+#ifdef  CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
 	              CFG_ENV_ADDR,
--- a/board/exbitgen/flash.c
+++ b/board/exbitgen/flash.c
@ -126,7 +126,7 @@ unsigned long flash_init (void)
 #endif
 #endif

-#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 	flash_protect(FLAG_PROTECT_SET,
 		CFG_ENV_ADDR,
 		CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
--- a/board/fads/fads.h
+++ b/board/fads/fads.h
@ -226,7 +226,7 @@
 #define CFG_FLASH_ERASE_TOUT	120000	/* Timeout for Flash Erase (in ms)	*/
 #define CFG_FLASH_WRITE_TOUT	500	/* Timeout for Flash Write (in ms)	*/

-#define	CFG_ENV_IS_IN_FLASH	1
+#define	CONFIG_ENV_IS_IN_FLASH	1
 #define CFG_ENV_SECT_SIZE	0x40000	/* see README - env sector total size	*/
 #define CFG_ENV_OFFSET		CFG_ENV_SECT_SIZE
 #define	CFG_ENV_SIZE		0x4000	/* Total Size of Environment		*/
--- a/board/fads/flash.c
+++ b/board/fads/flash.c
@ -26,7 +26,7 @@

 flash_info_t flash_info[CFG_MAX_FLASH_BANKS];	/* info for FLASH chips */

-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 # ifndef  CFG_ENV_ADDR
 #  define CFG_ENV_ADDR	(CFG_FLASH_BASE + CFG_ENV_OFFSET)
 # endif
@ -124,7 +124,7 @@ unsigned long flash_init (void)
 				       &flash_info[i]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 		/* ENV protection ON by default */
 		if (CFG_ENV_ADDR >= flash_info[i].start[0])
 			flash_protect (FLAG_PROTECT_SET,
--- a/board/flagadm/flash.c
+++ b/board/flagadm/flash.c
@ -81,7 +81,7 @@ unsigned long flash_init (void)
 		      &flash_info[0]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
 		      CFG_ENV_OFFSET,
--- a/board/freescale/mpc8260ads/flash.c
+++ b/board/freescale/mpc8260ads/flash.c
@ -155,7 +155,7 @@ unsigned long flash_init (void)
 		      &flash_info[0]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
 		      CFG_ENV_ADDR,
--- a/board/freescale/mpc8266ads/flash.c
+++ b/board/freescale/mpc8266ads/flash.c
@ -31,7 +31,7 @@

 flash_info_t	flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips	*/

-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 # ifndef  CFG_ENV_ADDR
 #  define CFG_ENV_ADDR	(CFG_FLASH_BASE + CFG_ENV_OFFSET)
 # endif
@ -105,7 +105,7 @@ unsigned long flash_init (void)
 		      &flash_info[0]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
 		      CFG_ENV_ADDR,
--- a/board/funkwerk/vovpn-gw/flash.c
+++ b/board/funkwerk/vovpn-gw/flash.c
@ -151,7 +151,7 @@ flash_init(void)
 		      CFG_MONITOR_FLASH+CFG_MONITOR_LEN-1,
 		      &flash_info[0]);
 #endif
-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	flash_protect(FLAG_PROTECT_SET,
 		      CFG_ENV_ADDR,
 		      CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1,
--- a/board/gen860t/flash.c
+++ b/board/gen860t/flash.c
@ -25,7 +25,7 @@
 #include <common.h>
 #include <mpc8xx.h>

-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 # ifndef  CFG_ENV_ADDR
 #  define CFG_ENV_ADDR	(CFG_FLASH_BASE + CFG_ENV_OFFSET)
 # endif
@ -161,7 +161,7 @@ flash_init (void)
 			  &flash_info[0]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/*
 	 * Environment protection ON by default
 	 */
--- a/board/gw8260/flash.c
+++ b/board/gw8260/flash.c
@ -100,7 +100,7 @@ unsigned long flash_init (void)
 		  &flash_info[0]);
 #endif

-#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 # ifndef  CFG_ENV_SIZE
 #  define CFG_ENV_SIZE	CFG_ENV_SECT_SIZE
 # endif
--- a/board/hidden_dragon/flash.c
+++ b/board/hidden_dragon/flash.c
@ -35,7 +35,7 @@

 flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips    */

-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 # ifndef  CFG_ENV_ADDR
 #  define CFG_ENV_ADDR  (CFG_FLASH_BASE + CFG_ENV_OFFSET)
 # endif
@ -212,7 +212,7 @@ unsigned long flash_init (void)
 			       &flash_info[0]);
 #endif

-#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 		flash_protect (FLAG_PROTECT_SET,
 			       CFG_ENV_ADDR,
 			       CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
--- a/board/icecube/flash.c
+++ b/board/icecube/flash.c
@ -88,7 +88,7 @@ unsigned long flash_init (void)
 		      flash_get_info(CFG_MONITOR_BASE));
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
 		      CFG_ENV_ADDR,
--- a/board/icu862/flash.c
+++ b/board/icu862/flash.c
@ -26,7 +26,7 @@

 flash_info_t	flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips	*/

-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 # ifndef  CFG_ENV_ADDR
 #  define CFG_ENV_ADDR	(CFG_FLASH_BASE + CFG_ENV_OFFSET)
 # endif
@ -108,7 +108,7 @@ unsigned long flash_init (void)
 		      &flash_info[0]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
 		      CFG_ENV_ADDR,
--- a/board/ids8247/flash.c
+++ b/board/ids8247/flash.c
@ -33,7 +33,7 @@

 flash_info_t flash_info[CFG_MAX_FLASH_BANKS];	/* info for FLASH chips    */

-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 # ifndef  CFG_ENV_ADDR
 #  define CFG_ENV_ADDR	(CFG_FLASH_BASE + CFG_ENV_OFFSET)
 # endif
@ -113,7 +113,7 @@ unsigned long flash_init (void)
 				&flash_info[0]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect (FLAG_PROTECT_SET,
 			CFG_ENV_ADDR,
--- a/board/incaip/flash.c
+++ b/board/incaip/flash.c
@ -104,7 +104,7 @@ unsigned long flash_init (void)
 		      flash_get_info(CFG_MONITOR_BASE));
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
 		      CFG_ENV_ADDR,
--- a/board/innokom/flash.c
+++ b/board/innokom/flash.c
@ -114,7 +114,7 @@ ulong flash_init(void)
 			CFG_FLASH_BASE + (256*1024) - 1,
 			&flash_info[0]);

-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 	flash_protect(FLAG_PROTECT_SET,
 			CFG_ENV_ADDR,
 			CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
--- a/board/integratorcp/flash.c
+++ b/board/integratorcp/flash.c
@ -125,7 +125,7 @@ unsigned long flash_init (void)
 		       CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]);
 #endif

-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON */
 	flash_protect(FLAG_PROTECT_SET,
 		      CFG_ENV_ADDR,
--- a/board/ip860/flash.c
+++ b/board/ip860/flash.c
@ -26,7 +26,7 @@

 flash_info_t	flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips	*/

-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 # ifndef  CFG_ENV_ADDR
 #  define CFG_ENV_ADDR	(CFG_FLASH_BASE + CFG_ENV_OFFSET)
 # endif
@ -94,7 +94,7 @@ unsigned long flash_init (void)
 		      &flash_info[0]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
 		      CFG_ENV_ADDR,
--- a/board/iphase4539/flash.c
+++ b/board/iphase4539/flash.c
@ -75,7 +75,7 @@ unsigned long flash_init (void)
 			      flash_info + bank);
 #endif

-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 		/* ENV protection ON by default */
 		flash_protect(FLAG_PROTECT_SET,
 			      CFG_ENV_ADDR,
--- a/board/ivm/flash.c
+++ b/board/ivm/flash.c
@ -26,7 +26,7 @@

 flash_info_t	flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips	*/

-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 # ifndef  CFG_ENV_ADDR
 #  define CFG_ENV_ADDR	(CFG_FLASH_BASE + CFG_ENV_OFFSET)
 # endif
@ -91,7 +91,7 @@ unsigned long flash_init (void)
 		      &flash_info[0]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
 		      CFG_ENV_ADDR,
--- a/board/kup/common/flash.c
+++ b/board/kup/common/flash.c
@ -78,7 +78,7 @@ unsigned long flash_init (void)
 		      &flash_info[0]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
 		      CFG_ENV_ADDR,
--- a/board/lantec/flash.c
+++ b/board/lantec/flash.c
@ -29,7 +29,7 @@
 #include <common.h>
 #include <mpc8xx.h>

-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 # ifndef  CFG_ENV_ADDR
 #  define CFG_ENV_ADDR	(CFG_FLASH_BASE + CFG_ENV_OFFSET)
 # endif
@ -138,7 +138,7 @@ unsigned long flash_init (void)
 		      &flash_info[0]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
 		      CFG_ENV_ADDR,
@ -170,7 +170,7 @@ unsigned long flash_init (void)
 			      &flash_info[1]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 		/* ENV protection ON by default */
 		flash_protect(FLAG_PROTECT_SET,
 			      CFG_ENV_ADDR,
--- a/board/lwmon/flash.c
+++ b/board/lwmon/flash.c
@ -26,7 +26,7 @@
 #include <common.h>
 #include <mpc8xx.h>

-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 # ifndef  CFG_ENV_ADDR
 #  define CFG_ENV_ADDR	(CFG_FLASH_BASE + CFG_ENV_OFFSET)
 # endif
@ -130,7 +130,7 @@ unsigned long flash_init (void)
 		      &flash_info[0]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
 		      CFG_ENV_ADDR,
@ -163,7 +163,7 @@ unsigned long flash_init (void)
 			      &flash_info[1]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 		/* ENV protection ON by default */
 		flash_protect(FLAG_PROTECT_SET,
 			      CFG_ENV_ADDR,
--- a/board/mpc8540eval/flash.c
+++ b/board/mpc8540eval/flash.c
@ -35,7 +35,7 @@

 flash_info_t	flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips	*/

-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 # ifndef  CFG_ENV_ADDR
 #  define CFG_ENV_ADDR	(CFG_FLASH_BASE + CFG_ENV_OFFSET)
 # endif
@ -103,7 +103,7 @@ unsigned long flash_init (void)
 		      &flash_info[0]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
 		      CFG_ENV_ADDR,
--- a/board/mpl/common/flash.c
+++ b/board/mpl/common/flash.c
@ -256,7 +256,7 @@ unsigned long flash_init (void)
 		p++;
 	}
 #else /* #if !defined(CONFIG_PATI) */
-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
 		      CFG_ENV_ADDR,
--- a/board/musenki/flash.c
+++ b/board/musenki/flash.c
@ -24,7 +24,7 @@
 #include <common.h>
 #include <mpc824x.h>

-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 # ifndef  CFG_ENV_ADDR
 #  define CFG_ENV_ADDR	(CFG_FLASH_BASE + CFG_ENV_OFFSET)
 # endif
@ -153,7 +153,7 @@ unsigned long flash_init (void)
 		      &flash_info[0]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	DEBUGF("protect environtment %x @ %x\n", CFG_ENV_ADDR, CFG_ENV_SECT_SIZE);
 	flash_protect(FLAG_PROTECT_SET,
@ -174,7 +174,7 @@ unsigned long flash_init (void)
 			      &flash_info[1]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 		/* ENV protection ON by default */
 		flash_protect(FLAG_PROTECT_SET,
 			      CFG_ENV_ADDR,
--- a/board/nc650/flash.c
+++ b/board/nc650/flash.c
@ -41,7 +41,7 @@ DECLARE_GLOBAL_DATA_PTR;

 flash_info_t flash_info[CFG_MAX_FLASH_BANKS];	/* info for FLASH chips    */

-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 # ifndef  CFG_ENV_ADDR
 #  define CFG_ENV_ADDR	(CFG_FLASH_BASE + CFG_ENV_OFFSET)
 # endif
@ -171,7 +171,7 @@ unsigned long flash_init (void)
 				&flash_info[0]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect (FLAG_PROTECT_SET,
 			CFG_ENV_ADDR,
--- a/board/netstal/hcu5/hcu5.c
+++ b/board/netstal/hcu5/hcu5.c
@ -240,7 +240,7 @@ int misc_init_r(void)
 	unsigned long usb2phy0cr, usb2h0cr = 0;
 	unsigned long sdr0_pfc1;

-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 	/* Monitor protection ON by default */
 	(void)flash_protect(FLAG_PROTECT_SET,
 			    -CFG_MONITOR_LEN,
--- a/board/o2dnt/flash.c
+++ b/board/o2dnt/flash.c
@ -103,7 +103,7 @@ unsigned long flash_init (void)
 			flash_get_info(CFG_MONITOR_BASE));
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
 			CFG_ENV_ADDR,
--- a/board/oxc/flash.c
+++ b/board/oxc/flash.c
@ -73,7 +73,7 @@ unsigned long flash_init (void)
 		  &flash_info[0]);
 #endif

-#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 # ifndef  CFG_ENV_SIZE
 #  define CFG_ENV_SIZE	CFG_ENV_SECT_SIZE
 # endif
--- a/board/pcippc2/flash.c
+++ b/board/pcippc2/flash.c
@ -74,7 +74,7 @@ unsigned long flash_init (void)
 			      &flash_info[0]);
 #endif

-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 		/* ENV protection ON by default */
 		flash_protect(FLAG_PROTECT_SET,
 			      CFG_ENV_ADDR,
--- a/board/pm520/flash.c
+++ b/board/pm520/flash.c
@ -119,7 +119,7 @@ unsigned long flash_init (void)
 #endif
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	flash_protect ( FLAG_PROTECT_SET,
 			CFG_ENV_ADDR,
 			CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0] );
--- 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 defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 # ifndef  CFG_ENV_SIZE
 #  define CFG_ENV_SIZE	CFG_ENV_SECT_SIZE
 # endif
--- 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 defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 # ifndef  CFG_ENV_SIZE
 #  define CFG_ENV_SIZE	CFG_ENV_SECT_SIZE
 # endif
--- 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 defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 # ifndef  CFG_ENV_SIZE
 #  define CFG_ENV_SIZE	CFG_ENV_SECT_SIZE
 # endif
--- a/board/purple/flash.c
+++ b/board/purple/flash.c
@ -237,7 +237,7 @@ unsigned long flash_init (void)
 		      flash_get_info(CFG_MONITOR_BASE));
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
 		      CFG_ENV_ADDR,
--- a/board/r360mpi/flash.c
+++ b/board/r360mpi/flash.c
@ -31,7 +31,7 @@

 flash_info_t flash_info[CFG_MAX_FLASH_BANKS];	/* info for FLASH chips    */

-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 # ifndef  CFG_ENV_ADDR
 #  define CFG_ENV_ADDR	(CFG_FLASH_BASE + CFG_ENV_OFFSET)
 # endif
@ -111,7 +111,7 @@ unsigned long flash_init (void)
 				&flash_info[0]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect (FLAG_PROTECT_SET,
 			CFG_ENV_ADDR,
--- a/board/rmu/flash.c
+++ b/board/rmu/flash.c
@ -81,7 +81,7 @@ unsigned long flash_init (void)
 		      CFG_MONITOR_BASE+monitor_flash_len-1,
 		      &flash_info[0]);

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
 		      CFG_ENV_ADDR,
--- a/board/rpxsuper/flash.c
+++ b/board/rpxsuper/flash.c
@ -71,7 +71,7 @@ unsigned long flash_init (void)
 		  &flash_info[0]);
 #endif

-#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 # ifndef  CFG_ENV_SIZE
 #  define CFG_ENV_SIZE	CFG_ENV_SECT_SIZE
 # endif
--- a/board/rsdproto/flash.c
+++ b/board/rsdproto/flash.c
@ -131,7 +131,7 @@ unsigned long flash_init (void)
 		      &flash_info[1]);
 #endif

-#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 # ifndef  CFG_ENV_SIZE
 #  define CFG_ENV_SIZE	CFG_ENV_SECT_SIZE
 # endif
--- a/board/sacsng/flash.c
+++ b/board/sacsng/flash.c
@ -73,7 +73,7 @@ unsigned long flash_init (void)
 		      &flash_info[0]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
 		      CFG_ENV_ADDR,
@ -90,7 +90,7 @@ unsigned long flash_init (void)
 			      &flash_info[1]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 		/* ENV protection ON by default */
 		flash_protect(FLAG_PROTECT_SET,
 			      CFG_ENV_ADDR,
--- a/board/sandpoint/flash.c
+++ b/board/sandpoint/flash.c
@ -32,7 +32,7 @@

 flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips    */

-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 # ifndef  CFG_ENV_ADDR
 #  define CFG_ENV_ADDR  (CFG_FLASH_BASE + CFG_ENV_OFFSET)
 # endif
@ -230,7 +230,7 @@ flash_init(void)
 		&flash_info[0]);
 #endif

-#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
    flash_protect(FLAG_PROTECT_SET,
 		CFG_ENV_ADDR,
 		CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
--- a/board/sbc8260/flash.c
+++ b/board/sbc8260/flash.c
@ -67,7 +67,7 @@ unsigned long flash_init (void)
 		  &flash_info[0]);
 #endif

-#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 # ifndef  CFG_ENV_SIZE
 #  define CFG_ENV_SIZE	CFG_ENV_SECT_SIZE
 # endif
--- 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 defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 # ifndef  CFG_ENV_SIZE
 #  define CFG_ENV_SIZE	CFG_ENV_SECT_SIZE
 # endif
--- a/board/siemens/pcu_e/flash.c
+++ b/board/siemens/pcu_e/flash.c
@ -24,7 +24,7 @@
 #include <common.h>
 #include <mpc8xx.h>

-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 # ifndef  CFG_ENV_ADDR
 #  define CFG_ENV_ADDR	(CFG_FLASH_BASE + CFG_ENV_OFFSET)
 # endif
@ -151,7 +151,7 @@ unsigned long flash_init (void)
 		      PCU_MONITOR_BASE+monitor_flash_len-1,
 		      &flash_info[0]);

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
 		      CFG_ENV_ADDR,
@ -178,7 +178,7 @@ unsigned long flash_init (void)

 		flash_info[1].size = size_b1;

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 		/* ENV protection ON by default */
 		flash_protect(FLAG_PROTECT_SET,
 			      CFG_ENV_ADDR,
--- a/board/sl8245/flash.c
+++ b/board/sl8245/flash.c
@ -25,7 +25,7 @@
 #include <mpc824x.h>
 #include <asm/processor.h>

-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 # ifndef  CFG_ENV_ADDR
 #  define CFG_ENV_ADDR	(CFG_FLASH_BASE + CFG_ENV_OFFSET)
 # endif
@ -139,7 +139,7 @@ unsigned long flash_init (void)
 #endif
 #endif

-#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
+#if defined(CONFIG_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,
--- a/board/stxgp3/flash.c
+++ b/board/stxgp3/flash.c
@ -41,7 +41,7 @@

 flash_info_t	flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips	*/

-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 # ifndef  CFG_ENV_ADDR
 #  define CFG_ENV_ADDR	(CFG_FLASH_BASE + CFG_ENV_OFFSET)
 # endif
@ -99,7 +99,7 @@ unsigned long flash_init (void)
 		      CFG_MONITOR_BASE+monitor_flash_len-1,
 		      &flash_info[0]);

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
 		      CFG_ENV_ADDR,
--- a/board/svm_sc8xx/flash.c
+++ b/board/svm_sc8xx/flash.c
@ -152,7 +152,7 @@ unsigned long flash_init (void)
 		      &flash_info[0]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
 		      CFG_ENV_ADDR,
@ -179,7 +179,7 @@ unsigned long flash_init (void)
 			      &flash_info[1]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 		/* ENV protection ON by default */
 		flash_protect(FLAG_PROTECT_SET,
 			      CFG_ENV_ADDR,
--- a/board/tqc/tqm5200/cam5200_flash.c
+++ b/board/tqc/tqm5200/cam5200_flash.c
@ -768,7 +768,7 @@ unsigned long flash_init(void)
 		(void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE,
 				    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
 				    &flash_info[i]);
-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 		(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
 				    CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
 				    &flash_info[i]);
--- 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 defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 # ifndef  CFG_ENV_SIZE
 #  define CFG_ENV_SIZE	CFG_ENV_SECT_SIZE
 # endif
--- a/board/tqc/tqm8xx/flash.c
+++ b/board/tqc/tqm8xx/flash.c
@ -176,7 +176,7 @@ unsigned long flash_init (void)
 		      &flash_info[0]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 # ifdef CFG_ENV_ADDR_REDUND
 	debug ("Protect primary   environment: %08lx ... %08lx\n",
@ -229,7 +229,7 @@ unsigned long flash_init (void)
 			      &flash_info[1]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 		/* ENV protection ON by default */
 		flash_protect(FLAG_PROTECT_SET,
 			      CFG_ENV_ADDR,
--- a/board/utx8245/flash.c
+++ b/board/utx8245/flash.c
@ -33,7 +33,7 @@
 #define ROM_CS0_START	0xFF800000
 #define ROM_CS1_START	0xFF000000

-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 # ifndef  CFG_ENV_ADDR
 #  define CFG_ENV_ADDR	(CFG_FLASH_BASE + CFG_ENV_OFFSET)
 # endif
@ -169,7 +169,7 @@ unsigned long flash_init (void)
 				   &flash_info[0]);
 #endif

-#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
+#if defined(CONFIG_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
--- a/board/westel/amx860/flash.c
+++ b/board/westel/amx860/flash.c
@ -26,7 +26,7 @@

 flash_info_t	flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips	*/

-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 # ifndef  CFG_ENV_ADDR
 #  define CFG_ENV_ADDR	(CFG_FLASH_BASE + CFG_ENV_OFFSET)
 # endif
@ -134,7 +134,7 @@ unsigned long flash_init (void)
 		      &flash_info[0]);
 #endif

-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
 		      CFG_ENV_ADDR,
@ -166,7 +166,7 @@ unsigned long flash_init (void)
 			      &flash_info[1]);
 # endif

-# ifdef CFG_ENV_IS_IN_FLASH
+# ifdef CONFIG_ENV_IS_IN_FLASH
 		/* ENV protection ON by default */
 		flash_protect(FLAG_PROTECT_SET,
 			      CFG_ENV_ADDR,
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@ -54,7 +54,7 @@ DECLARE_GLOBAL_DATA_PTR;

 #if !defined(CONFIG_ENV_IS_IN_NVRAM)	&& \
    !defined(CONFIG_ENV_IS_IN_EEPROM)	&& \
-    !defined(CFG_ENV_IS_IN_FLASH)	&& \
+    !defined(CONFIG_ENV_IS_IN_FLASH)	&& \
    !defined(CONFIG_ENV_IS_IN_DATAFLASH)	&& \
    !defined(CONFIG_ENV_IS_IN_NAND)	&& \
    !defined(CONFIG_ENV_IS_IN_ONENAND)	&& \
--- a/common/env_flash.c
+++ b/common/env_flash.c
@ -28,7 +28,7 @@

 #include <common.h>

-#if defined(CFG_ENV_IS_IN_FLASH) /* Environment is in Flash */
+#if defined(CONFIG_ENV_IS_IN_FLASH) /* Environment is in Flash */

 #include <command.h>
 #include <environment.h>
@ -384,4 +384,4 @@ void env_relocate_spec (void)
 #endif /* ! ENV_IS_EMBEDDED || CFG_ENV_ADDR_REDUND */
 }

-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@ -255,7 +255,7 @@ u64 flash_read64(void *addr)__attribute__((weak, alias("__flash_read64")));

 /*-----------------------------------------------------------------------
 */
-#if defined(CFG_ENV_IS_IN_FLASH) || defined(CFG_ENV_ADDR_REDUND) || (CFG_MONITOR_BASE >= CFG_FLASH_BASE)
+#if defined(CONFIG_ENV_IS_IN_FLASH) || defined(CFG_ENV_ADDR_REDUND) || (CFG_MONITOR_BASE >= CFG_FLASH_BASE)
 static flash_info_t *flash_get_info(ulong base)
 {
 	int i;
@ -2031,7 +2031,7 @@ unsigned long flash_init (void)
 #endif

 	/* Environment protection ON by default */
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 	flash_protect (FLAG_PROTECT_SET,
 		       CFG_ENV_ADDR,
 		       CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
--- a/include/configs/A3000.h
+++ b/include/configs/A3000.h
@ -297,7 +297,7 @@
 	/* Warining: environment is not EMBEDDED in the U-Boot code.
 	 * It's stored in flash separately.
 	 */
-#define CFG_ENV_IS_IN_FLASH	    1
+#define CONFIG_ENV_IS_IN_FLASH	    1
 #define CFG_ENV_ADDR		0xFFFE0000
 #define CFG_ENV_SIZE		0x00020000 /* Size of the Environment		*/
 #define CFG_ENV_SECT_SIZE	0x00020000 /* Size of the Environment Sector	*/
--- a/include/configs/ADCIOP.h
+++ b/include/configs/ADCIOP.h
@ -170,7 +170,7 @@

 #else /* Use FLASH for environment variables */

-#define CFG_ENV_IS_IN_FLASH	1
+#define CONFIG_ENV_IS_IN_FLASH	1
 #define CFG_ENV_OFFSET		0x00010000	/* Offset of Environment Sector */
 #define CFG_ENV_SIZE		0x1000	/* Total Size of Environment Sector	*/

--- a/include/configs/ADNPESC1.h
+++ b/include/configs/ADNPESC1.h
@ -116,7 +116,7 @@
 *----------------------------------------------------------------------*/
 #if	(CFG_NIOS_CPU_FLASH_SIZE != 0)

-#define	CFG_ENV_IS_IN_FLASH	1		/* Environment in flash */
+#define	CONFIG_ENV_IS_IN_FLASH	1		/* Environment in flash */

 /* Mem addr of environment */
 #if	defined(CONFIG_NIOS_BASE_32)
--- a/include/configs/AMX860.h
+++ b/include/configs/AMX860.h
@ -199,7 +199,7 @@
 #define CFG_FLASH_ERASE_TOUT	120000	/* Timeout for Flash Erase (in ms)	*/
 #define CFG_FLASH_WRITE_TOUT	500	/* Timeout for Flash Write (in ms)	*/

-#define	CFG_ENV_IS_IN_FLASH	1
+#define	CONFIG_ENV_IS_IN_FLASH	1
 #define	CFG_ENV_OFFSET		0x8000	/*   Offset   of Environment Sector	*/
 #define	CFG_ENV_SIZE		0x4000	/* Total Size of Environment Sector	*/

--- a/include/configs/AP1000.h
+++ b/include/configs/AP1000.h
@ -37,13 +37,13 @@
 #define CONFIG_COMMAND_HISTORY	1
 #define CONFIG_COMPLETE_ADDRESSES 1

-#define CFG_ENV_IS_IN_FLASH	1
+#define CONFIG_ENV_IS_IN_FLASH	1
 #define CFG_FLASH_USE_BUFFER_WRITE

 #ifdef CONFIG_ENV_IS_IN_NVRAM
-#undef CFG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_FLASH
 #else
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #undef CONFIG_ENV_IS_IN_NVRAM
 #endif
 #endif
@ -174,7 +174,7 @@
 #define CFG_FLASH_PROTECTION	1	/* use hardware protection	    */

 /* BEG ENVIRONNEMENT FLASH */
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_OFFSET		0x00040000 /* Offset of Environment Sector	*/
 #define CFG_ENV_SIZE		0x1000	/* Total Size of Environment Sector */
 #define CFG_ENV_SECT_SIZE	0x20000 /* see README - env sector total size	*/
--- a/include/configs/AR405.h
+++ b/include/configs/AR405.h
@ -205,7 +205,7 @@

 #define CFG_FLASH_EMPTY_INFO		/* print 'E' for empty sector on flinfo */

-#define CFG_ENV_IS_IN_FLASH	1
+#define CONFIG_ENV_IS_IN_FLASH	1
 #define CFG_ENV_ADDR		0xFFFB0000	/* Address of Environment Sector*/
 #define CFG_ENV_SECT_SIZE	0x10000 /* see README - env sector total size	*/
 #define CFG_ENV_SIZE		0x04000	        /* Size of Environment	        */
--- a/include/configs/ATUM8548.h
+++ b/include/configs/ATUM8548.h
@ -333,7 +333,7 @@
 /*
 * Environment
 */
-#define CFG_ENV_IS_IN_FLASH	1
+#define CONFIG_ENV_IS_IN_FLASH	1
 #define CFG_ENV_ADDR		(CFG_MONITOR_BASE + 0x40000)
 #define CFG_ENV_SECT_SIZE	0x40000	/* 256K(one sector) for env */
 #define CFG_ENV_SIZE		0x2000
--- a/include/configs/Adder.h
+++ b/include/configs/Adder.h
@ -148,7 +148,7 @@
 #define CFG_MAX_FLASH_SECT	128		/* Max num of sects on one chip */

 /* Environment is in flash */
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE	0x10000		/* We use one complete sector	*/
 #define CFG_ENV_ADDR		(CFG_MONITOR_BASE + CFG_MONITOR_LEN)

--- a/include/configs/Alaska8220.h
+++ b/include/configs/Alaska8220.h
@ -205,7 +205,7 @@
 /*
 * Environment settings
 */
-#define CFG_ENV_IS_IN_FLASH	1
+#define CONFIG_ENV_IS_IN_FLASH	1
 #if defined (CFG_AMD_BOOT)
 #define CFG_ENV_ADDR		(CFG_FLASH0_BASE + CFG_CS0_MASK - PHYS_AMD_SECT_SIZE)
 #define CFG_ENV_SIZE		PHYS_AMD_SECT_SIZE
@ -224,15 +224,15 @@

 #define CONFIG_ENV_OVERWRITE	1

-#if defined CFG_ENV_IS_IN_FLASH
+#if defined CONFIG_ENV_IS_IN_FLASH
 #undef CONFIG_ENV_IS_IN_NVRAM
 #undef CONFIG_ENV_IS_IN_EEPROM
 #elif defined CONFIG_ENV_IS_IN_NVRAM
-#undef CFG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_FLASH
 #undef CONFIG_ENV_IS_IN_EEPROM
 #elif defined CONFIG_ENV_IS_IN_EEPROM
 #undef CONFIG_ENV_IS_IN_NVRAM
-#undef CFG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_FLASH
 #endif

 /*
--- a/include/configs/BC3450.h
+++ b/include/configs/BC3450.h
@ -358,7 +358,7 @@
 /*
 * Environment settings
 */
-#define CFG_ENV_IS_IN_FLASH	1
+#define CONFIG_ENV_IS_IN_FLASH	1
 #define CFG_ENV_SIZE		0x10000
 #define CFG_ENV_SECT_SIZE	0x20000
 #define CFG_ENV_ADDR_REDUND	(CFG_ENV_ADDR + CFG_ENV_SECT_SIZE)
--- a/include/configs/CANBT.h
+++ b/include/configs/CANBT.h
@ -155,7 +155,7 @@

 #if 0 /* Use FLASH for environment variables */

-#define CFG_ENV_IS_IN_FLASH	1
+#define CONFIG_ENV_IS_IN_FLASH	1
 #define CFG_ENV_OFFSET		0x00010000	/* Offset of Environment Sector */
 #define CFG_ENV_SIZE		0x1000	/* Total Size of Environment Sector	*/

--- a/include/configs/CATcenter.h
+++ b/include/configs/CATcenter.h
@ -393,7 +393,7 @@
 /*-----------------------------------------------------------------------
 * Environment Variable setup
 */
-#define CFG_ENV_IS_IN_FLASH	1	/* use FLASH for environment vars */
+#define CONFIG_ENV_IS_IN_FLASH	1	/* use FLASH for environment vars */
 #define CFG_ENV_ADDR		0xFFFF8000	/* environment starts at the first small sector */
 #define CFG_ENV_SECT_SIZE	0x2000	/* 8196 bytes may be used for env vars*/
 #define CFG_ENV_ADDR_REDUND	0xFFFFA000
--- a/Show More
+++ b/Show More