rename CFG_ENV_IS_IN_FLASH in CONFIG_ENV_IS_IN_FLASH

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
Keerthyj · Sep 10, 2008 · 5a1aceb · 5a1aceb
1 parent 7d9b5ba
commit 5a1aceb
Show file tree

Hide file tree

Showing 463 changed files with 591 additions and 591 deletions.
diff --git a/README b/README
@@ -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.

diff --git 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,

diff --git 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,

diff --git 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

diff --git 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,

diff --git 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,

diff --git 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]);

diff --git 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]);

diff --git 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]);

diff --git 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,

diff --git 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]);

diff --git 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,

diff --git 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]);

diff --git 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,

diff --git 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]);

diff --git 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]);

diff --git 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]);

diff --git 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,

diff --git 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,

diff --git 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,

diff --git 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,

diff --git 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,

diff --git 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,

diff --git 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,

diff --git 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,

diff --git 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

diff --git 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

diff --git 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,

diff --git 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,

diff --git 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

diff --git 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,

diff --git 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,

diff --git 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,

diff --git 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,