rename CFG_ENV_IS_IN_FLASH in CONFIG_ENV_IS_IN_FLASH

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

diff --git a/README b/README
index 0da6412..49f9d88 100644 (file)
--- 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
index c1b3b85..d77af35 100644 (file)
--- 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
index d46bf46..5e15e20 100644 (file)
--- 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
index 60580c9..14296b2 100644 (file)
--- 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
index d8e07e6..287bbac 100644 (file)
--- 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
index 13a5ca5..98a027e 100644 (file)
--- 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
index 8a2e832..f23fc24 100644 (file)
--- 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
index e4832eb..0295b8c 100644 (file)
--- 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
index e8fbbc4..b49e05f 100644 (file)
--- 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
index 7b10255..f407e19 100644 (file)
--- 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
index d3c3c0d..3b2f9b7 100644 (file)
--- 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
index 2b4d3d4..fc79907 100644 (file)
--- 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
index 5614e20..88a76f7 100644 (file)
--- 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
index 176d5cf..c682c8e 100644 (file)
--- 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
index 290259e..8ffcc39 100644 (file)
--- 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
index 056f9b9..d47d263 100644 (file)
--- 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
index 15b8a46..9256938 100644 (file)
--- 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
index 2ab60e8..9e4c6c5 100644 (file)
--- 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
index 9502560..c6a01ca 100644 (file)
--- 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
index 6d3cfab..4c7971a 100644 (file)
--- 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
index b2be21c..2a5e050 100644 (file)
--- 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
index 9983c7b..0419d76 100644 (file)
--- 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
index f57d8ec..aec6a8e 100644 (file)
--- 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
index 969520d..fc3e5ff 100644 (file)
--- 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
index 9a39868..db9a637 100644 (file)
--- 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
index b1048a3..e6a14b0 100644 (file)
--- 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
index 925a0e6..b96a30c 100644 (file)
--- 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
index ec1a586..5e55284 100644 (file)
--- 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
index d6161bf..0e8d337 100644 (file)
--- 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
index 167f316..8d99640 100644 (file)
--- 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
index 53afbc0..55419ee 100644 (file)
--- 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
index 0cdaee4..7c8fa74 100644 (file)
--- 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
index 6ab23dc..1691e10 100644 (file)
--- 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
index 401eead..4d83fd5 100644 (file)
--- 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,

diff --git a/board/fads/fads.h b/board/fads/fads.h
index 0a8b983..63b1e62 100644 (file)
--- 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            */

diff --git a/board/fads/flash.c b/board/fads/flash.c
index 7cda3a4..742a889 100644 (file)
--- 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,

diff --git a/board/flagadm/flash.c b/board/flagadm/flash.c
index fd0082c..3303707 100644 (file)
--- 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,

diff --git a/board/freescale/mpc8260ads/flash.c b/board/freescale/mpc8260ads/flash.c
index 59997aa..5f80f26 100644 (file)
--- 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,

diff --git a/board/freescale/mpc8266ads/flash.c b/board/freescale/mpc8266ads/flash.c
index 9512c72..aa533e4 100644 (file)
--- 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,

diff --git a/board/funkwerk/vovpn-gw/flash.c b/board/funkwerk/vovpn-gw/flash.c
index 7dd0d3f..935adfa 100644 (file)
--- 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,

diff --git a/board/gen860t/flash.c b/board/gen860t/flash.c
index 13faaf3..c558014 100644 (file)
--- 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
         */

diff --git a/board/gw8260/flash.c b/board/gw8260/flash.c
index 015ea7d..e4b596b 100644 (file)
--- 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

diff --git a/board/hidden_dragon/flash.c b/board/hidden_dragon/flash.c
index a2ed3bd..5fb9578 100644 (file)
--- 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,

diff --git a/board/icecube/flash.c b/board/icecube/flash.c
index 2d4026a..e6cf92e 100644 (file)
--- 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,

diff --git a/board/icu862/flash.c b/board/icu862/flash.c
index ca5bcf3..625d1a8 100644 (file)
--- 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,

diff --git a/board/ids8247/flash.c b/board/ids8247/flash.c
index 4eba4b9..522fafe 100644 (file)
--- 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,

diff --git a/board/incaip/flash.c b/board/incaip/flash.c
index 520514d..b510e90 100644 (file)
--- 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,

diff --git a/board/innokom/flash.c b/board/innokom/flash.c
index 8fc6e5b..2d773b1 100644 (file)
--- 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,

diff --git a/board/integratorcp/flash.c b/board/integratorcp/flash.c
index 59961cd..2a4256a 100644 (file)
--- 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,

diff --git a/board/ip860/flash.c b/board/ip860/flash.c
index 2cf23b3..6bf4d8d 100644 (file)
--- 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,

diff --git a/board/iphase4539/flash.c b/board/iphase4539/flash.c
index 4eca467..f8ab51a 100644 (file)
--- 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,

diff --git a/board/ivm/flash.c b/board/ivm/flash.c
index 140ba2d..f911fdb 100644 (file)
--- 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,

diff --git a/board/kup/common/flash.c b/board/kup/common/flash.c
index 903c88f..50bf543 100644 (file)
--- 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,

diff --git a/board/lantec/flash.c b/board/lantec/flash.c
index 0faa82c..ddf680a 100644 (file)
--- 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,

diff --git a/board/lwmon/flash.c b/board/lwmon/flash.c
index b894887..7e4acc2 100644 (file)
--- 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,

diff --git a/board/mpc8540eval/flash.c b/board/mpc8540eval/flash.c
index 79eb04c..b129602 100644 (file)
--- 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,

diff --git a/board/mpl/common/flash.c b/board/mpl/common/flash.c
index eb2702b..a2e0244 100644 (file)
--- 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,

diff --git a/board/musenki/flash.c b/board/musenki/flash.c
index cd33d8e..df7bbc5 100644 (file)
--- 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,

diff --git a/board/nc650/flash.c b/board/nc650/flash.c
index 8d7c172..a7fc084 100644 (file)
--- 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,

diff --git a/board/netstal/hcu5/hcu5.c b/board/netstal/hcu5/hcu5.c
index 4ecdb25..41fa204 100644 (file)
--- 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,

diff --git a/board/o2dnt/flash.c b/board/o2dnt/flash.c
index 349086f..2aa0489 100644 (file)
--- 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,

diff --git a/board/oxc/flash.c b/board/oxc/flash.c
index 4559b80..44e2300 100644 (file)
--- 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

diff --git a/board/pcippc2/flash.c b/board/pcippc2/flash.c
index 8c01415..b1fec97 100644 (file)
--- 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,

diff --git a/board/pm520/flash.c b/board/pm520/flash.c
index 4301b8c..c899ad3 100644 (file)
--- 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] );

diff --git a/board/pm826/flash.c b/board/pm826/flash.c
index 92a433a..e8e0289 100644 (file)
--- 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

diff --git a/board/pm828/flash.c b/board/pm828/flash.c
index 0e7bfe8..0620ea3 100644 (file)
--- 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

diff --git a/board/ppmc7xx/flash.c b/board/ppmc7xx/flash.c
index 4d13612..dd91da7 100644 (file)
--- 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

diff --git a/board/purple/flash.c b/board/purple/flash.c
index 1baae35..ee8a60e 100644 (file)
--- 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,

diff --git a/board/r360mpi/flash.c b/board/r360mpi/flash.c
index 9b42960..398e734 100644 (file)
--- 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,

diff --git a/board/rmu/flash.c b/board/rmu/flash.c
index 0f2c327..670faf0 100644 (file)
--- 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,

diff --git a/board/rpxsuper/flash.c b/board/rpxsuper/flash.c
index b29032b..2d17694 100644 (file)
--- 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

diff --git a/board/rsdproto/flash.c b/board/rsdproto/flash.c
index d9f6b3b..f954458 100644 (file)
--- 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

diff --git a/board/sacsng/flash.c b/board/sacsng/flash.c
index 52e01de..f37be29 100644 (file)
--- 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,

diff --git a/board/sandpoint/flash.c b/board/sandpoint/flash.c
index cf06679..60cb191 100644 (file)
--- 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,

diff --git a/board/sbc8260/flash.c b/board/sbc8260/flash.c
index c43435f..6d659b2 100644 (file)
--- 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

diff --git a/board/siemens/SCM/flash.c b/board/siemens/SCM/flash.c
index 063972d..815f023 100644 (file)
--- 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

diff --git a/board/siemens/pcu_e/flash.c b/board/siemens/pcu_e/flash.c
index 05c364b..5b812cb 100644 (file)
--- 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,

diff --git a/board/sl8245/flash.c b/board/sl8245/flash.c
index 7fb9463..f41dde0 100644 (file)
--- 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,

diff --git a/board/stxgp3/flash.c b/board/stxgp3/flash.c
index 032989b..25ac301 100644 (file)
--- 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,

diff --git a/board/svm_sc8xx/flash.c b/board/svm_sc8xx/flash.c
index 25e61dd..267be78 100644 (file)
--- 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,

diff --git a/board/tqc/tqm5200/cam5200_flash.c b/board/tqc/tqm5200/cam5200_flash.c
index b3f095d..bb12aae 100644 (file)
--- 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]);

diff --git a/board/tqc/tqm8260/flash.c b/board/tqc/tqm8260/flash.c
index 063972d..815f023 100644 (file)
--- 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

diff --git a/board/tqc/tqm8xx/flash.c b/board/tqc/tqm8xx/flash.c
index 1231c7c..f9078cf 100644 (file)
--- 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,

diff --git a/board/utx8245/flash.c b/board/utx8245/flash.c
index ae0e659..515d8c2 100644 (file)
--- 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

diff --git a/board/westel/amx860/flash.c b/board/westel/amx860/flash.c
index 12a1335..4d468d3 100644 (file)
--- 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,

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index fc9b94e..f5b93df 100644 (file)
--- 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) && \

diff --git a/common/env_flash.c b/common/env_flash.c
index a92160d..c287b17 100644 (file)
--- 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 */

diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index a74321d..7937b61 100644 (file)
--- 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,

diff --git a/include/configs/A3000.h b/include/configs/A3000.h
index dba1bf7..35180d6 100644 (file)
--- 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    */

diff --git a/include/configs/ADCIOP.h b/include/configs/ADCIOP.h
index 148c905..0069aab 100644 (file)
--- 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     */
 

diff --git a/include/configs/ADNPESC1.h b/include/configs/ADNPESC1.h
index cc91c8d..2999b2a 100644 (file)
--- 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)

diff --git a/include/configs/AMX860.h b/include/configs/AMX860.h
index 035ebc6..85a7ee9 100644 (file)
--- 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     */
 

diff --git a/include/configs/AP1000.h b/include/configs/AP1000.h
index f0e0282..a458214 100644 (file)
--- 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   */

diff --git a/include/configs/AR405.h b/include/configs/AR405.h
index 0602381..045849f 100644 (file)
--- 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          */

diff --git a/include/configs/ATUM8548.h b/include/configs/ATUM8548.h
index 5bc28f1..0ce81db 100644 (file)
--- 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

diff --git a/include/configs/Adder.h b/include/configs/Adder.h
index 07a9f4e..3c2f4d6 100644 (file)
--- 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)
 

diff --git a/include/configs/Alaska8220.h b/include/configs/Alaska8220.h
index 3d4cd36..3b3c0bc 100644 (file)
--- 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
 
 /*

diff --git a/include/configs/BC3450.h b/include/configs/BC3450.h
index 3c5d038..09c1995 100644 (file)
--- 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)

diff --git a/include/configs/CANBT.h b/include/configs/CANBT.h
index a4afcca..d50be01 100644 (file)
--- 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     */
 

diff --git a/include/configs/CATcenter.h b/include/configs/CATcenter.h
index 1603c9c..b9c998e 100644 (file)
--- 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

diff --git a/include/configs/CCM.h b/include/configs/CCM.h
index 57c1223..52b7b82 100644 (file)
--- a/include/configs/CCM.h
+++ b/include/configs/CCM.h
@@ -218,7 +218,7 @@
 
 #if 1
 /* Start port with environment in flash; switch to SPI EEPROM later */
-#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     */
 

diff --git a/include/configs/CPC45.h b/include/configs/CPC45.h
index 11107d4..7ec48a1 100644 (file)
--- a/include/configs/CPC45.h
+++ b/include/configs/CPC45.h
@@ -323,7 +323,7 @@
        /* Warining: environment is not EMBEDDED in the ppcboot 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           (CFG_FLASH_BASE + 0x7F8000)
 #define CFG_ENV_SIZE           0x4000  /* Size of the Environment              */

diff --git a/include/configs/CPCI750.h b/include/configs/CPCI750.h
index 48f308c..7a185e8 100644 (file)
--- a/include/configs/CPCI750.h
+++ b/include/configs/CPCI750.h
@@ -572,7 +572,7 @@
 #define CFG_FLASH_LOCK_TOUT    500     /* Timeout for Flash Lock (in ms) */
 
 #if 0
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SIZE           0x1000  /* Total Size of Environment Sector */
 #define CFG_ENV_SECT_SIZE      0x10000
 #define CFG_ENV_ADDR           0xFFF78000 /* Marvell 8-Bit Bootflash last sector */

diff --git a/include/configs/CPU86.h b/include/configs/CPU86.h
index 742ea46..443b976 100644 (file)
--- a/include/configs/CPU86.h
+++ b/include/configs/CPU86.h
@@ -324,7 +324,7 @@
 
 #if 0
 /* environment is in Flash */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #ifdef CONFIG_BOOT_ROM
 # define CFG_ENV_ADDR          (CFG_FLASH_BASE+0x70000)
 # define CFG_ENV_SIZE          0x10000

diff --git a/include/configs/CPU87.h b/include/configs/CPU87.h
index db423a0..45075fa 100644 (file)
--- a/include/configs/CPU87.h
+++ b/include/configs/CPU87.h
@@ -339,7 +339,7 @@
 
 #if 0
 /* environment is in Flash */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #ifdef CONFIG_BOOT_ROM
 # define CFG_ENV_ADDR          (CFG_FLASH_BASE+0x70000)
 # define CFG_ENV_SIZE          0x10000

diff --git a/include/configs/CRAYL1.h b/include/configs/CRAYL1.h
index 604779a..c15a02a 100644 (file)
--- a/include/configs/CRAYL1.h
+++ b/include/configs/CRAYL1.h
@@ -170,7 +170,7 @@
 
 /* BEG ENVIRONNEMENT FLASH: needs to be a whole FlashSector  */
 #define CFG_ENV_OFFSET         0x3c8000
-#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_SIZE            0x1000   /* Total Size of Environment area      */
 #define CFG_ENV_SECT_SIZE      0x10000  /* see README - env sector total size  */
 

diff --git a/include/configs/CU824.h b/include/configs/CU824.h
index f36d8da..3320c9a 100644 (file)
--- a/include/configs/CU824.h
+++ b/include/configs/CU824.h
@@ -271,7 +271,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
 #if 0
 #define CFG_ENV_ADDR           0xFF008000
 #define CFG_ENV_SIZE           0x8000  /* Size of the Environment Sector       */

diff --git a/include/configs/DASA_SIM.h b/include/configs/DASA_SIM.h
index 117a136..24370c9 100644 (file)
--- a/include/configs/DASA_SIM.h
+++ b/include/configs/DASA_SIM.h
@@ -157,7 +157,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_OFFSET         0x00010000      /* Offset of Environment Sector */
 #define CFG_ENV_SIZE           0x1000  /* Total Size of Environment Sector     */
 

diff --git a/include/configs/DB64360.h b/include/configs/DB64360.h
index eef216d..3fc280f 100644 (file)
--- a/include/configs/DB64360.h
+++ b/include/configs/DB64360.h
@@ -559,7 +559,7 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
 #define CFG_FLASH_LOCK_TOUT    500     /* Timeout for Flash Lock (in ms) */
 #define CFG_FLASH_CFI          1
 
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_SIZE           0x1000  /* Total Size of Environment Sector */
 #define CFG_ENV_SECT_SIZE      0x10000
 #define CFG_ENV_ADDR         0xFFF78000 /* Marvell 8-Bit Bootflash last sector */

diff --git a/include/configs/DB64460.h b/include/configs/DB64460.h
index b14cd0d..59a934e 100644 (file)
--- a/include/configs/DB64460.h
+++ b/include/configs/DB64460.h
@@ -497,7 +497,7 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
 #define CFG_FLASH_LOCK_TOUT    500     /* Timeout for Flash Lock (in ms) */
 #define CFG_FLASH_CFI          1
 
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_SIZE           0x1000  /* Total Size of Environment Sector */
 #define CFG_ENV_SECT_SIZE      0x10000
 #define CFG_ENV_ADDR         0xFFF78000 /* Marvell 8-Bit Bootflash last sector */

diff --git a/include/configs/DK1C20.h b/include/configs/DK1C20.h
index 9658278..a1f4e0d 100644 (file)
--- a/include/configs/DK1C20.h
+++ b/include/configs/DK1C20.h
@@ -111,7 +111,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 */
 #define CFG_ENV_ADDR           CFG_FLASH_BASE  /* Mem addr of env      */
 #define CFG_ENV_SIZE           (64 * 1024)     /* 64 KByte (1 sector)  */
 #define CONFIG_ENV_OVERWRITE                   /* Serial/eth change Ok */

diff --git a/include/configs/DK1S10.h b/include/configs/DK1S10.h
index e5bf8c7..eda328a 100644 (file)
--- a/include/configs/DK1S10.h
+++ b/include/configs/DK1S10.h
@@ -119,7 +119,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 */
 
 #if    defined(CONFIG_NIOS_STANDARD_32)
 #define CFG_ENV_ADDR           CFG_FLASH_BASE  /* Mem addr of env      */

diff --git a/include/configs/DU440.h b/include/configs/DU440.h
index b1d4ff3..37a7e3a 100644 (file)
--- a/include/configs/DU440.h
+++ b/include/configs/DU440.h
@@ -136,7 +136,7 @@
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_QUIET_TEST   1       /* don't warn upon unknown flash      */
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      0x20000 /* size of one complete sector        */
 #define CFG_ENV_ADDR           ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE)
 #define        CFG_ENV_SIZE            0x2000  /* Total Size of Environment Sector   */

diff --git a/include/configs/EB+MCF-EV123.h b/include/configs/EB+MCF-EV123.h
index 324eb6c..80a6cb7 100644 (file)
--- a/include/configs/EB+MCF-EV123.h
+++ b/include/configs/EB+MCF-EV123.h
@@ -53,7 +53,7 @@
 #ifndef CONFIG_MONITOR_IS_IN_RAM
 #define CFG_ENV_ADDR           0xF003C000      /* End of 256K */
 #define CFG_ENV_SECT_SIZE      0x4000
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 /*
 #define CFG_ENV_IS_EMBEDDED    1
 #define CFG_ENV_ADDR_REDUND            0xF0018000
@@ -62,7 +62,7 @@
 #else
 #define CFG_ENV_ADDR           0xFFE04000
 #define CFG_ENV_SECT_SIZE      0x2000
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #endif
 
 

diff --git a/include/configs/ELPT860.h b/include/configs/ELPT860.h
index b917806..11eca4c 100644 (file)
--- a/include/configs/ELPT860.h
+++ b/include/configs/ELPT860.h
@@ -139,7 +139,7 @@
 
 #undef   CONFIG_ENV_IS_IN_NVRAM               /* Environment is in NVRAM       */
 #undef   CONFIG_ENV_IS_IN_EEPROM              /* Environment is in I2C EEPROM  */
-#define CFG_ENV_IS_IN_FLASH    1      /* Environment is in FLASH       */
+#define CONFIG_ENV_IS_IN_FLASH 1      /* Environment is in FLASH       */
 
 #define CONFIG_BAUDRATE                9600   /* console baudrate = 9600 bps   */
 #define CFG_BAUDRATE_TABLE     { 9600, 19200, 38400, 57600, 115200 }
@@ -180,7 +180,7 @@
 #define CFG_FLASH_BASE         0x02000000
 #define CFG_NVRAM_BASE         0x03000000
 
-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 #  if defined(DEBUG)
 #    define CFG_MONITOR_LEN    (320 << 10)  /* Reserve 320 kB for Monitor  */
 #  else
@@ -213,7 +213,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)   */
 
-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 #  define CFG_ENV_OFFSET       0x10000 /* Offset   of Environment Sector    */
 #  define CFG_ENV_SIZE         0x10000 /* Total Size of Environment Sector  */
 #endif

diff --git a/include/configs/EP1C20.h b/include/configs/EP1C20.h
index cfa6335..aaf6172 100644 (file)
--- a/include/configs/EP1C20.h
+++ b/include/configs/EP1C20.h
@@ -86,7 +86,7 @@
  * of flash. NOTE: the monitor length must be multiple of sector size
  * (which is common practice).
  *----------------------------------------------------------------------*/
-#define CFG_ENV_IS_IN_FLASH    1               /* Environment in flash */
+#define CONFIG_ENV_IS_IN_FLASH 1               /* Environment in flash */
 #define CFG_ENV_SIZE           (64 * 1024)     /* 64 KByte (1 sector)  */
 #define CONFIG_ENV_OVERWRITE                   /* Serial change Ok     */
 #define CFG_ENV_ADDR   (CFG_RESET_ADDR + CFG_MONITOR_LEN)

diff --git a/include/configs/EP1S10.h b/include/configs/EP1S10.h
index 7c526f7..ae1e476 100644 (file)
--- a/include/configs/EP1S10.h
+++ b/include/configs/EP1S10.h
@@ -84,7 +84,7 @@
  * of flash. NOTE: the monitor length must be multiple of sector size
  * (which is common practice).
  *----------------------------------------------------------------------*/
-#define CFG_ENV_IS_IN_FLASH    1               /* Environment in flash */
+#define CONFIG_ENV_IS_IN_FLASH 1               /* Environment in flash */
 #define CFG_ENV_SIZE           (64 * 1024)     /* 64 KByte (1 sector)  */
 #define CONFIG_ENV_OVERWRITE                   /* Serial change Ok     */
 #define CFG_ENV_ADDR   (CFG_FLASH_BASE + CFG_MONITOR_LEN)

diff --git a/include/configs/EP1S40.h b/include/configs/EP1S40.h
index 1fe8f68..7aedcca 100644 (file)
--- a/include/configs/EP1S40.h
+++ b/include/configs/EP1S40.h
@@ -84,7 +84,7 @@
  * of flash. NOTE: the monitor length must be multiple of sector size
  * (which is common practice).
  *----------------------------------------------------------------------*/
-#define CFG_ENV_IS_IN_FLASH    1               /* Environment in flash */
+#define CONFIG_ENV_IS_IN_FLASH 1               /* Environment in flash */
 #define CFG_ENV_SIZE           (64 * 1024)     /* 64 KByte (1 sector)  */
 #define CONFIG_ENV_OVERWRITE                   /* Serial change Ok     */
 #define CFG_ENV_ADDR   (CFG_FLASH_BASE + CFG_MONITOR_LEN)

diff --git a/include/configs/EP88x.h b/include/configs/EP88x.h
index 5f1743b..81d5e55 100644 (file)
--- a/include/configs/EP88x.h
+++ b/include/configs/EP88x.h
@@ -143,7 +143,7 @@
 #define CFG_MAX_FLASH_SECT     512             /* 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      0x20000         /* We use one complete sector   */
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
 

diff --git a/include/configs/ERIC.h b/include/configs/ERIC.h
index c699855..b7ec0d0 100644 (file)
--- a/include/configs/ERIC.h
+++ b/include/configs/ERIC.h
@@ -42,7 +42,7 @@
 #define CONFIG_SYS_CLK_FREQ    33333333 /* external frequency to pll   */
 
 #if 1
-#define CFG_ENV_IS_IN_FLASH    1       /* use FLASH for environment vars       */
+#define CONFIG_ENV_IS_IN_FLASH 1       /* use FLASH for environment vars       */
 #endif
 #if 0
 #define CONFIG_ENV_IS_IN_NVRAM 1       /* use NVRAM for environment vars       */
@@ -62,17 +62,17 @@
 #define CONFIG_I2C_RTC         1       /* we have a Xicor X1240 RTC */
 #define CFG_I2C_RTC_ADDR       0x6F    /*                                and one for RTC */
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #undef CONFIG_ENV_IS_IN_NVRAM
 #undef CONFIG_ENV_IS_IN_EEPROM
 #else
 #ifdef CONFIG_ENV_IS_IN_NVRAM
-#undef CFG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_FLASH
 #undef CONFIG_ENV_IS_IN_EEPROM
 #else
 #ifdef CONFIG_ENV_IS_IN_EEPROM
 #undef CONFIG_ENV_IS_IN_NVRAM
-#undef CFG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_FLASH
 #endif
 #endif
 #endif
@@ -298,7 +298,7 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 /* BEG ENVIRONNEMENT FLASH */
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE       (128*1024)
 
 #if 0  /* force ENV to be NOT embedded */

diff --git a/include/configs/ESTEEM192E.h b/include/configs/ESTEEM192E.h
index 66e1203..24f0f4c 100644 (file)
--- a/include/configs/ESTEEM192E.h
+++ b/include/configs/ESTEEM192E.h
@@ -154,7 +154,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            0x2000  /* Total Size of Environment Sector     */
 /*-----------------------------------------------------------------------

diff --git a/include/configs/ETX094.h b/include/configs/ETX094.h
index 525051f..940e53d 100644 (file)
--- a/include/configs/ETX094.h
+++ b/include/configs/ETX094.h
@@ -171,7 +171,7 @@
 #define CFG_FLASH_ERASE_TOUT   120000  /* Timeout for Flash Erase (in ms)      */
 #define CFG_FLASH_WRITE_TOUT   1000    /* Timeout for Flash Write (in ms)      */
 
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #ifdef CONFIG_FLASH_16BIT
 #define CFG_ENV_OFFSET         0x8000  /* Offset   of Environment Sector       */
 #define        CFG_ENV_SIZE            0x8000  /* Total Size of Environment Sector     */

diff --git a/include/configs/EVB64260.h b/include/configs/EVB64260.h
index c9d8c27..2a78fd6 100644 (file)
--- a/include/configs/EVB64260.h
+++ b/include/configs/EVB64260.h
@@ -391,7 +391,7 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms) */
 #define CFG_FLASH_CFI          1
 
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define        CFG_ENV_SIZE            0x1000  /* Total Size of Environment Sector */
 #define CFG_ENV_SECT_SIZE      0x10000
 #define CFG_ENV_ADDR    (CFG_FLASH_BASE+CFG_MONITOR_LEN-CFG_ENV_SECT_SIZE)

diff --git a/include/configs/EXBITGEN.h b/include/configs/EXBITGEN.h
index 4193492..fed8d42 100644 (file)
--- a/include/configs/EXBITGEN.h
+++ b/include/configs/EXBITGEN.h
@@ -48,7 +48,7 @@
 
 /* environment is in EEPROM */
 #define CONFIG_ENV_IS_IN_EEPROM    1
-#undef CFG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_FLASH
 #undef CONFIG_ENV_IS_IN_NVRAM
 
 #ifdef CONFIG_ENV_IS_IN_EEPROM
@@ -188,7 +188,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)      */
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_OFFSET         0x00060000 /* Offset of Environment Sector      */
 #define        CFG_ENV_SIZE            0x00010000 /* Total Size of Environment Sector  */
 #define CFG_ENV_SECT_SIZE      0x00010000 /* see README - env sector total size */

diff --git a/include/configs/FADS823.h b/include/configs/FADS823.h
index 6f3e6a7..c6c7b53 100644 (file)
--- a/include/configs/FADS823.h
+++ b/include/configs/FADS823.h
@@ -203,7 +203,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         0x00040000      /* Offset of Environment Sector */
 #define        CFG_ENV_SIZE            0x40000 /* Total Size of Environment Sector     */
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */

diff --git a/include/configs/FADS850SAR.h b/include/configs/FADS850SAR.h
index 356705b..82a8757 100644 (file)
--- a/include/configs/FADS850SAR.h
+++ b/include/configs/FADS850SAR.h
@@ -153,7 +153,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         0x00040000      /* Offset of Environment Sector */
 #define        CFG_ENV_SIZE            0x40000 /* Total Size of Environment Sector     */
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */

diff --git a/include/configs/FLAGADM.h b/include/configs/FLAGADM.h
index 431844c..e7fcf75 100644 (file)
--- a/include/configs/FLAGADM.h
+++ b/include/configs/FLAGADM.h
@@ -158,7 +158,7 @@
 #define CFG_FLASH_ERASE_TOUT   8000    /* 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
 /* This is a litlebit wasteful, but one sector is 128kb and we have to
  * assigne a whole sector for the environment, so that we can safely
  * erase and write it without disturbing the boot sector

diff --git a/include/configs/FPS850L.h b/include/configs/FPS850L.h
index e694a02..2b819c5 100644 (file)
--- a/include/configs/FPS850L.h
+++ b/include/configs/FPS850L.h
@@ -201,7 +201,7 @@
 #define CFG_MAX_FLASH_BANKS    2       /* max number of memory banks */
 #define CFG_MAX_FLASH_SECT     71      /* max number of sectors on one chip */
 
-#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     */
 

diff --git a/include/configs/FPS860L.h b/include/configs/FPS860L.h
index 84b6824..b3380db 100644 (file)
--- a/include/configs/FPS860L.h
+++ b/include/configs/FPS860L.h
@@ -201,7 +201,7 @@
 #define CFG_MAX_FLASH_BANKS    2       /* max number of memory banks */
 #define CFG_MAX_FLASH_SECT     71      /* max number of sectors on one chip */
 
-#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     */
 

diff --git a/include/configs/G2000.h b/include/configs/G2000.h
index 74e6ef7..43926a2 100644 (file)
--- a/include/configs/G2000.h
+++ b/include/configs/G2000.h
@@ -306,7 +306,7 @@
 
 #else  /* DEFAULT: environment in flash, using redundand flash sectors */
 
-#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           0xFFFA0000 /* environment starts before u-boot */
 #define CFG_ENV_SECT_SIZE      0x20000 /* 128k bytes may be used for env vars*/
 

diff --git a/include/configs/GEN860T.h b/include/configs/GEN860T.h
index 51cf579..6a5a316 100644 (file)
--- a/include/configs/GEN860T.h
+++ b/include/configs/GEN860T.h
@@ -434,7 +434,7 @@
  * Select environment placement.  NOTE that u-boot.lds must
  * be edited if this is changed!
  */
-#undef CFG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_IS_IN_EEPROM
 
 #if defined(CONFIG_ENV_IS_IN_EEPROM)

diff --git a/include/configs/GENIETV.h b/include/configs/GENIETV.h
index f6d6ae0..3cf7fb1 100644 (file)
--- a/include/configs/GENIETV.h
+++ b/include/configs/GENIETV.h
@@ -196,7 +196,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         0x10000 /* Offset of Environment Sector         */
 #define        CFG_ENV_SIZE            0x10000 /* Total Size of Environment Sector (64k)*/
 

diff --git a/include/configs/GTH.h b/include/configs/GTH.h
index 4a98c40..d5816ae 100644 (file)
--- a/include/configs/GTH.h
+++ b/include/configs/GTH.h
@@ -194,7 +194,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
 #undef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_ENV_OFFSET         0x000E0000
 #define        CFG_ENV_SIZE            0x4000  /* Total Size of Environment Sector     */

diff --git a/include/configs/HIDDEN_DRAGON.h b/include/configs/HIDDEN_DRAGON.h
index 5deb84d..5168be0 100644 (file)
--- a/include/configs/HIDDEN_DRAGON.h
+++ b/include/configs/HIDDEN_DRAGON.h
@@ -145,7 +145,7 @@
 
 #define CFG_FLASH_BASE         0xFFE00000
 #define CFG_FLASH_SIZE         (2 * 1024 * 1024)       /* Unity has onboard 1MByte flash */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_OFFSET         0x00004000      /* Offset of Environment Sector */
 #define CFG_ENV_SIZE           0x00002000      /* Total Size of Environment Sector */
 

diff --git a/include/configs/HMI10.h b/include/configs/HMI10.h
index a7e7c57..406c352 100644 (file)
--- a/include/configs/HMI10.h
+++ b/include/configs/HMI10.h
@@ -234,7 +234,7 @@
 #define CFG_MAX_FLASH_BANKS    2       /* max number of memory banks */
 #define CFG_MAX_FLASH_SECT     71      /* max number of sectors on one chip */
 
-#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     */
 

diff --git a/include/configs/IAD210.h b/include/configs/IAD210.h
index 87827ea..c80165b 100644 (file)
--- a/include/configs/IAD210.h
+++ b/include/configs/IAD210.h
@@ -220,7 +220,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
 #define        CFG_ENV_SIZE            0x4000  /* Total Size of Environment Sector     */
 

diff --git a/include/configs/ICU862.h b/include/configs/ICU862.h
index f693956..caf7210 100644 (file)
--- a/include/configs/ICU862.h
+++ b/include/configs/ICU862.h
@@ -229,7 +229,7 @@
 #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         0x00F40000
 
 #define CFG_ENV_SECT_SIZE      0x40000 /* Total Size of Environment sector     */

diff --git a/include/configs/IDS8247.h b/include/configs/IDS8247.h
index 029bb99..459654e 100644 (file)
--- a/include/configs/IDS8247.h
+++ b/include/configs/IDS8247.h
@@ -251,7 +251,7 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Flash Write Timeout (in ms)  */
 
 /* Environment in flash */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_ADDR           (CFG_FLASH_BASE+0x60000)
 #define CFG_ENV_SIZE           0x20000
 #define CFG_ENV_SECT_SIZE      0x20000

diff --git a/include/configs/IP860.h b/include/configs/IP860.h
index 63e7e5d..fa3c29e 100644 (file)
--- a/include/configs/IP860.h
+++ b/include/configs/IP860.h
@@ -186,7 +186,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)      */
 
-#undef CFG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_FLASH
 #undef CONFIG_ENV_IS_IN_NVRAM
 #undef  CONFIG_ENV_IS_IN_NVRAM
 #undef DEBUG_I2C

diff --git a/include/configs/IPHASE4539.h b/include/configs/IPHASE4539.h
index 7d564a0..cea8532 100644 (file)
--- a/include/configs/IPHASE4539.h
+++ b/include/configs/IPHASE4539.h
@@ -208,7 +208,7 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Flash Write Timeout (in ms)  */
 
 /* Environment in FLASH, there is little space left in Serial EEPROM */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_SECT_SIZE      0x10000 /* We use one complete sector   */
 #define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x10000) /* 2. sector */
 

diff --git a/include/configs/ISPAN.h b/include/configs/ISPAN.h
index 27e46a4..6de40da 100644 (file)
--- a/include/configs/ISPAN.h
+++ b/include/configs/ISPAN.h
@@ -185,7 +185,7 @@
 #define CFG_MAX_FLASH_SECT     142             /* Max num of sects on one chip */
 
 /* Environment is in flash, there is little space left in Serial EEPROM */
-#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_SIZE           (CFG_ENV_SECT_SIZE)
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE + CFG_MONITOR_LEN)

diff --git a/include/configs/IVML24.h b/include/configs/IVML24.h
index 0ffdfac..ee302d9 100644 (file)
--- a/include/configs/IVML24.h
+++ b/include/configs/IVML24.h
@@ -184,7 +184,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          0x7A000 /*   Offset   of Environment Sector     */
 #define        CFG_ENV_SIZE            0x2000  /* Total Size of Environment Sector     */
 /*-----------------------------------------------------------------------

diff --git a/include/configs/IVMS8.h b/include/configs/IVMS8.h
index ea3ffe0..1bdd031 100644 (file)
--- a/include/configs/IVMS8.h
+++ b/include/configs/IVMS8.h
@@ -180,7 +180,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          0x7A000 /*   Offset   of Environment Sector     */
 #define        CFG_ENV_SIZE            0x2000  /* Total Size of Environment Sector     */
 /*-----------------------------------------------------------------------

diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h
index 0b90946..804fc3f 100644 (file)
--- a/include/configs/IceCube.h
+++ b/include/configs/IceCube.h
@@ -255,7 +255,7 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_SIZE           0x10000
 #if defined(CONFIG_LITE5200B)
 #define CFG_ENV_SECT_SIZE      0x20000

diff --git a/include/configs/JSE.h b/include/configs/JSE.h
index ecc344d..4bcd17a 100644 (file)
--- a/include/configs/JSE.h
+++ b/include/configs/JSE.h
@@ -78,7 +78,7 @@
 
   /* JSE has EEPROM chips that are good for environment. */
 #undef CONFIG_ENV_IS_IN_NVRAM
-#undef CFG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_IS_IN_EEPROM 1
 #undef CONFIG_ENV_IS_NOWHERE
 

diff --git a/include/configs/KAREF.h b/include/configs/KAREF.h
index 7208444..897d8a0 100644 (file)
--- a/include/configs/KAREF.h
+++ b/include/configs/KAREF.h
@@ -142,7 +142,7 @@
  * Environment
  *----------------------------------------------------------------------*/
 #define CONFIG_ENV_IS_IN_NVRAM   1                  /* Environment uses NVRAM  */
-#undef CFG_ENV_IS_IN_FLASH                  /* ... not in flash        */
+#undef CONFIG_ENV_IS_IN_FLASH               /* ... not in flash        */
 #undef CONFIG_ENV_IS_IN_EEPROM              /* ... not in EEPROM       */
 #define CONFIG_ENV_OVERWRITE  1                     /* allow env overwrite     */
 

diff --git a/include/configs/KUP4K.h b/include/configs/KUP4K.h
index e52fbfd..e40e53b 100644 (file)
--- a/include/configs/KUP4K.h
+++ b/include/configs/KUP4K.h
@@ -254,7 +254,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         0x40000 /*   Offset   of Environment Sector     */
 #define CFG_ENV_SIZE           0x1000  /* Total Size of Environment Sector     */
 #define CFG_ENV_SECT_SIZE      0x10000

diff --git a/include/configs/KUP4X.h b/include/configs/KUP4X.h
index be0c7af..29c3e2d 100644 (file)
--- a/include/configs/KUP4X.h
+++ b/include/configs/KUP4X.h
@@ -266,7 +266,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         0x40000 /*   Offset   of Environment Sector     */
 #define CFG_ENV_SIZE           0x1000  /* Total Size of Environment Sector     */
 #define CFG_ENV_SECT_SIZE      0x10000

diff --git a/include/configs/LANTEC.h b/include/configs/LANTEC.h
index e92069b..dc60848 100644 (file)
--- a/include/configs/LANTEC.h
+++ b/include/configs/LANTEC.h
@@ -185,7 +185,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     */
 

diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h
index 8713b02..10b37b5 100644 (file)
--- a/include/configs/M52277EVB.h
+++ b/include/configs/M52277EVB.h
@@ -192,7 +192,7 @@
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
  */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CONFIG_ENV_OVERWRITE   1
 #undef CFG_ENV_IS_EMBEDDED
 

diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index b32eabe..3f55594 100644 (file)
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -220,7 +220,7 @@
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
  */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_IS_EMBEDDED    1
 #ifdef NORFLASH_PS32BIT
 #      define CFG_ENV_OFFSET           (0x8000)

diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h
index 6bf2d99..c7544a8 100644 (file)
--- a/include/configs/M5249EVB.h
+++ b/include/configs/M5249EVB.h
@@ -113,7 +113,7 @@
 #define CFG_GBL_DATA_OFFSET    (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
 #define CFG_INIT_SP_OFFSET     CFG_GBL_DATA_OFFSET
 
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_OFFSET         0x4000  /* Address of Environment Sector*/
 #define CFG_ENV_SIZE           0x2000  /* Total Size of Environment Sector     */
 #define CFG_ENV_SECT_SIZE      0x2000 /* see README - env sector total size    */

diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index 9f78f6e..72dd05d 100644 (file)
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -45,11 +45,11 @@
 #ifdef CONFIG_MONITOR_IS_IN_RAM
 #      define CFG_ENV_OFFSET           0x4000
 #      define CFG_ENV_SECT_SIZE        0x1000
-#      define CFG_ENV_IS_IN_FLASH      1
+#      define CONFIG_ENV_IS_IN_FLASH   1
 #else
 #      define CFG_ENV_ADDR             (CFG_FLASH_BASE + 0x4000)
 #      define CFG_ENV_SECT_SIZE        0x1000
-#      define CFG_ENV_IS_IN_FLASH      1
+#      define CONFIG_ENV_IS_IN_FLASH   1
 #endif
 
 /*

diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h
index 6e14ebf..cbf50fe 100644 (file)
--- a/include/configs/M5253EVBE.h
+++ b/include/configs/M5253EVBE.h
@@ -45,11 +45,11 @@
 #ifndef CONFIG_MONITOR_IS_IN_RAM
 #define CFG_ENV_OFFSET         0x4000
 #define CFG_ENV_SECT_SIZE      0x2000
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #else
 #define CFG_ENV_ADDR           0xffe04000
 #define CFG_ENV_SECT_SIZE      0x2000
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #endif
 
 /*

diff --git a/include/configs/M5271EVB.h b/include/configs/M5271EVB.h
index 78a1b93..482c262 100644 (file)
--- a/include/configs/M5271EVB.h
+++ b/include/configs/M5271EVB.h
@@ -56,7 +56,7 @@
 #define CFG_ENV_ADDR           0xffe04000
 #endif
 #define CFG_ENV_SECT_SIZE      0x2000
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 /*

diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index fc457e3..22124c9 100644 (file)
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -54,12 +54,12 @@
 #ifndef CONFIG_MONITOR_IS_IN_RAM
 #define CFG_ENV_OFFSET         0x4000
 #define CFG_ENV_SECT_SIZE      0x2000
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_IS_EMBEDDED    1
 #else
 #define CFG_ENV_ADDR           0xffe04000
 #define CFG_ENV_SECT_SIZE      0x2000
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #endif
 
 /*

diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h
index 430af6b..0a30e0b 100644 (file)
--- a/include/configs/M5275EVB.h
+++ b/include/configs/M5275EVB.h
@@ -54,12 +54,12 @@
 #ifndef CONFIG_MONITOR_IS_IN_RAM
 #define CFG_ENV_OFFSET         0x4000
 #define CFG_ENV_SECT_SIZE      0x2000
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_IS_EMBEDDED    1
 #else
 #define CFG_ENV_ADDR           0xffe04000
 #define CFG_ENV_SECT_SIZE      0x2000
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #endif
 
 /*

diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index eb59c25..1763f97 100644 (file)
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -50,7 +50,7 @@
  */
 #define CFG_ENV_ADDR           0xffe04000
 #define CFG_ENV_SIZE           0x2000
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 
 /*
  * BOOTP options

diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index 58948a2..441f209 100644 (file)
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -230,7 +230,7 @@
  */
 #define CFG_ENV_OFFSET         0x4000
 #define CFG_ENV_SECT_SIZE      0x2000
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_IS_EMBEDDED    1
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index 814c3a6..f8212c6 100644 (file)
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -230,7 +230,7 @@
  */
 #define CFG_ENV_OFFSET         0x4000
 #define CFG_ENV_SECT_SIZE      0x2000
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_IS_EMBEDDED    1
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h
index 06e2244..d0a66ea 100644 (file)
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@@ -272,7 +272,7 @@
 #      define CFG_ENV_SIZE             0x2000
 #      define CFG_ENV_SECT_SIZE        0x10000
 #else
-#      define CFG_ENV_IS_IN_FLASH      1
+#      define CONFIG_ENV_IS_IN_FLASH   1
 #      define CFG_ENV_ADDR             (CFG_FLASH_BASE + 0x4000)
 #      define CFG_ENV_SECT_SIZE        0x2000
 #endif

diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index 45a244f..9872d58 100644 (file)
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -334,7 +334,7 @@
 #      define CONFIG_ENV_IS_IN_SPI_FLASH
 #      define CFG_ENV_SPI_CS           1
 #else
-#      define CFG_ENV_IS_IN_FLASH      1
+#      define CONFIG_ENV_IS_IN_FLASH   1
 #endif
 #undef CONFIG_ENV_OVERWRITE
 #undef CFG_ENV_IS_EMBEDDED

diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h
index af6723c..7913879 100644 (file)
--- a/include/configs/M5475EVB.h
+++ b/include/configs/M5475EVB.h
@@ -279,7 +279,7 @@
  */
 #define CFG_ENV_OFFSET         0x2000
 #define CFG_ENV_SECT_SIZE      0x2000
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_IS_EMBEDDED    1
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h
index 248db53..df92a24 100644 (file)
--- a/include/configs/M5485EVB.h
+++ b/include/configs/M5485EVB.h
@@ -265,7 +265,7 @@
  */
 #define CFG_ENV_OFFSET         0x2000
 #define CFG_ENV_SECT_SIZE      0x2000
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_IS_EMBEDDED    1
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/METROBOX.h b/include/configs/METROBOX.h
index fdb840e..b972390 100644 (file)
--- a/include/configs/METROBOX.h
+++ b/include/configs/METROBOX.h
@@ -204,7 +204,7 @@
  * Environment
  *----------------------------------------------------------------------*/
 #define CONFIG_ENV_IS_IN_NVRAM   1                  /* Environment uses NVRAM  */
-#undef CFG_ENV_IS_IN_FLASH                  /* ... not in flash        */
+#undef CONFIG_ENV_IS_IN_FLASH               /* ... not in flash        */
 #undef CONFIG_ENV_IS_IN_EEPROM              /* ... not in EEPROM       */
 #define CONFIG_ENV_OVERWRITE  1                     /* allow env overwrite     */
 

diff --git a/include/configs/MHPC.h b/include/configs/MHPC.h
index dde7742..de7cb12 100644 (file)
--- a/include/configs/MHPC.h
+++ b/include/configs/MHPC.h
@@ -228,7 +228,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         CFG_MONITOR_LEN /* Offset of Environment */
 #define CFG_ENV_SIZE           0x20000 /* Total Size of Environment    */
 

diff --git a/include/configs/ML2.h b/include/configs/ML2.h
index 3ce1807..a2703b1 100644 (file)
--- a/include/configs/ML2.h
+++ b/include/configs/ML2.h
@@ -31,12 +31,12 @@
 #define CONFIG_ML2     1       /* ...on a ML2 board    */
 
 
-#define CFG_ENV_IS_IN_FLASH     1
+#define CONFIG_ENV_IS_IN_FLASH     1
 
 #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
@@ -184,7 +184,7 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 /* BEG ENVIRONNEMENT FLASH */
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_OFFSET         0x00050000 /* Offset of Environment Sector  */
 #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/MOUSSE.h b/include/configs/MOUSSE.h
index 4052e78..b145166 100644 (file)
--- a/include/configs/MOUSSE.h
+++ b/include/configs/MOUSSE.h
@@ -298,7 +298,7 @@
 #define CFG_FLASH_WRITE_TOUT    500     /* Timeout for Flash Write (in ms)   */
 
 #if 0
-#define        CFG_ENV_IS_IN_FLASH         1
+#define        CONFIG_ENV_IS_IN_FLASH      1
 #define CFG_ENV_OFFSET          0x8000  /* Offset of the Environment Sector    */
 #define CFG_ENV_SIZE            0x4000  /* Size of the Environment Sector    */
 #else

diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h
index 735cfaa..9a76732 100644 (file)
--- a/include/configs/MPC8260ADS.h
+++ b/include/configs/MPC8260ADS.h
@@ -380,7 +380,7 @@
 #endif /* CONFIG_BZIP2 */
 
 #ifndef CFG_RAMBOOT
-#  define CFG_ENV_IS_IN_FLASH  1
+#  define CONFIG_ENV_IS_IN_FLASH       1
 #  define CFG_ENV_SECT_SIZE    0x40000
 #  define CFG_ENV_ADDR         (CFG_MONITOR_BASE + CFG_ENV_SECT_SIZE)
 #else

diff --git a/include/configs/MPC8266ADS.h b/include/configs/MPC8266ADS.h
index 4429e99..e062717 100644 (file)
--- a/include/configs/MPC8266ADS.h
+++ b/include/configs/MPC8266ADS.h
@@ -427,7 +427,7 @@
 #define CFG_BOOTMAPSZ          (8 << 20)       /* Initial Memory map for Linux */
 
 #ifndef CFG_RAMBOOT
-#  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
 #else

diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index 776fe99..aef3578 100644 (file)
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -393,7 +393,7 @@
        #define CFG_ENV_RANGE           (CFG_ENV_SECT_SIZE * 4)
        #define CFG_ENV_OFFSET_REDUND   (CFG_ENV_OFFSET + CFG_ENV_RANGE)
 #elif !defined(CFG_RAMBOOT)
-       #define CFG_ENV_IS_IN_FLASH     1
+       #define CONFIG_ENV_IS_IN_FLASH  1
        #define CFG_ENV_ADDR            (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
        #define CFG_ENV_SECT_SIZE       0x10000 /* 64K(one sector) for env */
        #define CFG_ENV_SIZE            0x2000

diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index 1edd9ce..92a6218 100644 (file)
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -377,7 +377,7 @@
  * Environment
  */
 #ifndef CFG_RAMBOOT
-       #define CFG_ENV_IS_IN_FLASH     1
+       #define CONFIG_ENV_IS_IN_FLASH  1
        #define CFG_ENV_ADDR            (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
        #define CFG_ENV_SECT_SIZE       0x10000 /* 64K(one sector) for env */
        #define CFG_ENV_SIZE            0x2000

diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index 308f102..7e4849a 100644 (file)
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -391,7 +391,7 @@
  * Environment
  */
 #ifndef CFG_RAMBOOT
-       #define CFG_ENV_IS_IN_FLASH     1
+       #define CONFIG_ENV_IS_IN_FLASH  1
        #define CFG_ENV_ADDR            (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
        #define CFG_ENV_SECT_SIZE       0x20000
        #define CFG_ENV_SIZE            0x2000

diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index b98f3ee..3102272 100644 (file)
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -403,7 +403,7 @@
  * Environment
  */
 #ifndef CFG_RAMBOOT
-       #define CFG_ENV_IS_IN_FLASH     1
+       #define CONFIG_ENV_IS_IN_FLASH  1
        #define CFG_ENV_ADDR            (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
        #define CFG_ENV_SECT_SIZE       0x20000
        #define CFG_ENV_SIZE            0x2000

diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index e03f5ca..d737cb4 100644 (file)
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -465,7 +465,7 @@
  * Environment
  */
 #ifndef CFG_RAMBOOT
-       #define CFG_ENV_IS_IN_FLASH     1
+       #define CONFIG_ENV_IS_IN_FLASH  1
        #define CFG_ENV_ADDR            (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
        #define CFG_ENV_SECT_SIZE       0x20000 /* 128K(one sector) for env */
        #define CFG_ENV_SIZE            0x2000

diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index 7f5d303..7635c65 100644 (file)
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -413,7 +413,7 @@ boards, we say we have two, but don't display a message if we find only one. */
 #define CONFIG_ENV_OVERWRITE
 
 #ifndef CFG_RAMBOOT
-  #define CFG_ENV_IS_IN_FLASH
+  #define CONFIG_ENV_IS_IN_FLASH
   #define CFG_ENV_ADDR         (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
   #define CFG_ENV_SECT_SIZE    0x10000 /* 64K (one sector) for environment */
   #define CFG_ENV_SIZE         0x2000

diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h
index c532eb1..37173cc 100644 (file)
--- a/include/configs/MPC8360EMDS.h
+++ b/include/configs/MPC8360EMDS.h
@@ -434,7 +434,7 @@
  */
 
 #ifndef CFG_RAMBOOT
-       #define CFG_ENV_IS_IN_FLASH     1
+       #define CONFIG_ENV_IS_IN_FLASH  1
        #define CFG_ENV_ADDR            (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
        #define CFG_ENV_SECT_SIZE       0x20000
        #define CFG_ENV_SIZE            0x2000

diff --git a/include/configs/MPC8360ERDK.h b/include/configs/MPC8360ERDK.h
index 4701600..b20f165 100644 (file)
--- a/include/configs/MPC8360ERDK.h
+++ b/include/configs/MPC8360ERDK.h
@@ -339,7 +339,7 @@
  */
 
 #ifndef CFG_RAMBOOT
-#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      0x20000 /* 128K(one sector) for env */
 #define CFG_ENV_SIZE           0x20000

diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index 220c148..21d7d2d 100644 (file)
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -421,7 +421,7 @@
  * Environment
  */
 #ifndef CFG_RAMBOOT
-       #define CFG_ENV_IS_IN_FLASH     1
+       #define CONFIG_ENV_IS_IN_FLASH  1
        #define CFG_ENV_ADDR            (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
        #define CFG_ENV_SECT_SIZE       0x20000 /* 128K(one sector) for env */
        #define CFG_ENV_SIZE            0x2000

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 289bcfa..7ffc743 100644 (file)
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -442,7 +442,7 @@
  * Environment
  */
 #ifndef CFG_RAMBOOT
-       #define CFG_ENV_IS_IN_FLASH     1
+       #define CONFIG_ENV_IS_IN_FLASH  1
        #define CFG_ENV_ADDR            (CFG_MONITOR_BASE+CFG_MONITOR_LEN)
        #define CFG_ENV_SECT_SIZE       0x10000 /* 64K (one sector) for env */
        #define CFG_ENV_SIZE            0x4000

diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index dc304e7..f290075 100644 (file)
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -446,7 +446,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
 /*
  * Environment
  */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #if CFG_MONITOR_BASE > 0xfff80000
 #define CFG_ENV_ADDR           0xfff80000
 #else

diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index c23dcf6..0dc1096 100644 (file)
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -381,7 +381,7 @@
  * Environment
  */
 #ifndef CFG_RAMBOOT
-  #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

diff --git a/include/configs/MPC8540EVAL.h b/include/configs/MPC8540EVAL.h
index 04bec2d..d4df8a6 100644 (file)
--- a/include/configs/MPC8540EVAL.h
+++ b/include/configs/MPC8540EVAL.h
@@ -260,7 +260,7 @@
 #define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x100000)
 #define CFG_ENV_SIZE           0x2000
 #else
-#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 */
 #endif

diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h
index bfd86f5..569952d 100644 (file)
--- a/include/configs/MPC8541CDS.h
+++ b/include/configs/MPC8541CDS.h
@@ -405,7 +405,7 @@ extern unsigned long get_clock_freq(void);
 /*
  * 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

diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index 612e8f2..02776b3 100644 (file)
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -394,7 +394,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 /*
  * Environment
  */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #if CFG_MONITOR_BASE > 0xfff80000
 #define CFG_ENV_ADDR           0xfff80000
 #else

diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 06965ed..4afb7ae 100644 (file)
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -466,7 +466,7 @@ extern unsigned long get_clock_freq(void);
 /*
  * 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

diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h
index a92c0fe..c521336 100644 (file)
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@@ -403,7 +403,7 @@ extern unsigned long get_clock_freq(void);
 /*
  * 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

diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index f661c8e..72a8b25 100644 (file)
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -412,7 +412,7 @@
  * Environment
  */
 #ifndef CFG_RAMBOOT
-  #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

diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index 8aeaa29..5b1cf6f 100644 (file)
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -424,7 +424,7 @@ extern unsigned long get_clock_freq(void);
 /*
  * 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

diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index b0094f3..94c0240 100644 (file)
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -426,7 +426,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
 /*
  * Environment
  */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #if CFG_MONITOR_BASE > 0xfff80000
 #define CFG_ENV_ADDR           0xfff80000
 #else

diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 2ee8d57..744110f 100644 (file)
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -438,7 +438,7 @@
  * Environment
  */
 #ifndef CFG_RAMBOOT
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
 #define CFG_ENV_SECT_SIZE      0x20000 /* 126k (one sector) for env */
 #define CFG_ENV_SIZE           0x2000

diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index 170fbd6..7b5c402 100644 (file)
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -504,7 +504,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
  * Environment
  */
 #ifndef CFG_RAMBOOT
-    #define CFG_ENV_IS_IN_FLASH        1
+    #define CONFIG_ENV_IS_IN_FLASH     1
     #define CFG_ENV_ADDR               (CFG_MONITOR_BASE + 0x60000)
     #define CFG_ENV_SECT_SIZE          0x10000 /* 64K(one sector) for env */
     #define CFG_ENV_SIZE               0x2000

diff --git a/include/configs/MUSENKI.h b/include/configs/MUSENKI.h
index 4319e6c..4a7540e 100644 (file)
--- a/include/configs/MUSENKI.h
+++ b/include/configs/MUSENKI.h
@@ -280,7 +280,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           0xFFFF0000
 #define CFG_ENV_SIZE           0x00010000 /* Size of the Environment           */
 #define CFG_ENV_SECT_SIZE      0x20000 /* Size of the Environment Sector       */

diff --git a/include/configs/MVBC_P.h b/include/configs/MVBC_P.h
index 0ce88d6..bf06ef8 100644 (file)
--- a/include/configs/MVBC_P.h
+++ b/include/configs/MVBC_P.h
@@ -215,7 +215,7 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 #undef CFG_FLASH_PROTECTION
 
 #define CFG_ENV_ADDR           0xFFFE0000

diff --git a/include/configs/MVBLM7.h b/include/configs/MVBLM7.h
index 849350f..b828857 100644 (file)
--- a/include/configs/MVBLM7.h
+++ b/include/configs/MVBLM7.h
@@ -255,7 +255,7 @@
 #undef  CFG_FLASH_PROTECTION
 #define CONFIG_ENV_OVERWRITE
 
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_ADDR           0xFF800000
 #define CFG_ENV_SIZE           0x2000
 #define CFG_ENV_SECT_SIZE      0x2000

diff --git a/include/configs/MVBLUE.h b/include/configs/MVBLUE.h
index 8e247af..819e725 100644 (file)
--- a/include/configs/MVBLUE.h
+++ b/include/configs/MVBLUE.h
@@ -328,7 +328,7 @@
 #define CFG_FLASH_WRITE_TOUT   1000
 
 
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 
 #define CFG_ENV_OFFSET         0x00010000
 #define CFG_ENV_SIZE           0x00010000

diff --git a/include/configs/MVS1.h b/include/configs/MVS1.h
index 87458e3..df1586b 100644 (file)
--- a/include/configs/MVS1.h
+++ b/include/configs/MVS1.h
@@ -174,7 +174,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
 
 /* 4MB flash - use bottom sectors of a bottom boot sector flash (16 bit access) */
 #define        CFG_ENV_OFFSET          0x8000  /* Offset of Environment Sector (bottom boot sector) */

diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h
index 40cf275..59d6e9a 100644 (file)
--- a/include/configs/MigoR.h
+++ b/include/configs/MigoR.h
@@ -130,7 +130,7 @@
 #undef  CFG_DIRECT_FLASH_TFTP
 
 /* ENV setting */
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_OVERWRITE   1
 #define CFG_ENV_SECT_SIZE      (128 * 1024)
 #define CFG_ENV_SIZE           (CFG_ENV_SECT_SIZE)

diff --git a/include/configs/NC650.h b/include/configs/NC650.h
index 84c6e9b..22bd0f0 100644 (file)
--- a/include/configs/NC650.h
+++ b/include/configs/NC650.h
@@ -232,7 +232,7 @@
 #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         0x00740000
 
 #define CFG_ENV_SECT_SIZE      0x20000 /* Total Size of Environment sector     */

diff --git a/include/configs/NETPHONE.h b/include/configs/NETPHONE.h
index 1494190..ac4c424 100644 (file)
--- a/include/configs/NETPHONE.h
+++ b/include/configs/NETPHONE.h
@@ -216,7 +216,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      0x10000
 
 #define        CFG_ENV_ADDR            (CFG_FLASH_BASE + 0x60000)

diff --git a/include/configs/NETTA.h b/include/configs/NETTA.h
index 6480634..80aee5b 100644 (file)
--- a/include/configs/NETTA.h
+++ b/include/configs/NETTA.h
@@ -220,7 +220,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      0x10000
 
 #define        CFG_ENV_ADDR            (CFG_FLASH_BASE + 0x60000)

diff --git a/include/configs/NETTA2.h b/include/configs/NETTA2.h
index efa91e3..6cb39d9 100644 (file)
--- a/include/configs/NETTA2.h
+++ b/include/configs/NETTA2.h
@@ -217,7 +217,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      0x10000
 
 #define        CFG_ENV_ADDR            (CFG_FLASH_BASE + 0x60000)

diff --git a/include/configs/NETVIA.h b/include/configs/NETVIA.h
index 40e09fb..0d318e8 100644 (file)
--- a/include/configs/NETVIA.h
+++ b/include/configs/NETVIA.h
@@ -187,7 +187,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      0x10000
 
 #define        CFG_ENV_ADDR            (CFG_FLASH_BASE + 0x60000)

diff --git a/include/configs/NSCU.h b/include/configs/NSCU.h
index 31762b9..9991d69 100644 (file)
--- a/include/configs/NSCU.h
+++ b/include/configs/NSCU.h
@@ -207,7 +207,7 @@
 #define CFG_MAX_FLASH_BANKS    2       /* max number of memory banks */
 #define CFG_MAX_FLASH_SECT     71      /* max number of sectors on one chip */
 
-#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     */
 

diff --git a/include/configs/NX823.h b/include/configs/NX823.h
index 2a4bd47..eddb52b 100644 (file)
--- a/include/configs/NX823.h
+++ b/include/configs/NX823.h
@@ -147,7 +147,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 xEMBED
 #ifdef EMBED
 #define CFG_ENV_SIZE           0x200   /* FIXME How big when embedded?? */

diff --git a/include/configs/OXC.h b/include/configs/OXC.h
index 8d61bcd..d9b4224 100644 (file)
--- a/include/configs/OXC.h
+++ b/include/configs/OXC.h
@@ -193,7 +193,7 @@
  * Environment
  */
 
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_ADDR           0xFFF30000      /* Offset of Environment Sector */
 #define CFG_ENV_SIZE           0x00010000      /* Total Size of Environment Sector */
 #define        CFG_ENV_IS_EMBEDDED     1               /* short-cut compile-time test  */

diff --git a/include/configs/P3G4.h b/include/configs/P3G4.h
index 5a2d157..232044b 100644 (file)
--- a/include/configs/P3G4.h
+++ b/include/configs/P3G4.h
@@ -397,7 +397,7 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms) */
 #define CFG_FLASH_CFI          1
 
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define        CFG_ENV_SIZE            0x1000  /* Total Size of Environment Sector */
 #define CFG_ENV_SECT_SIZE      0x20000
 #define CFG_ENV_ADDR           0xFFFE0000

diff --git a/include/configs/PATI.h b/include/configs/PATI.h
index 2676c78..9615044 100644 (file)
--- a/include/configs/PATI.h
+++ b/include/configs/PATI.h
@@ -178,8 +178,8 @@
 #define CFG_ENV_SIZE           2048
 #endif
 
-#undef  CFG_ENV_IS_IN_FLASH
-#ifdef CFG_ENV_IS_IN_FLASH
+#undef  CONFIG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define        CFG_ENV_SIZE            0x00002000              /* Set whole sector as env              */
 #define CFG_ENV_OFFSET         ((0 - CFG_FLASH_BASE) - CFG_ENV_SIZE)           /* Environment starts at this adress    */
 #endif

diff --git a/include/configs/PCI5441.h b/include/configs/PCI5441.h
index abb9bfc..94f6f93 100644 (file)
--- a/include/configs/PCI5441.h
+++ b/include/configs/PCI5441.h
@@ -84,7 +84,7 @@
  * of flash. NOTE: the monitor length must be multiple of sector size
  * (which is common practice).
  *----------------------------------------------------------------------*/
-#define        CFG_ENV_IS_IN_FLASH     1               /* Environment in flash */
+#define        CONFIG_ENV_IS_IN_FLASH  1               /* Environment in flash */
 #define CFG_ENV_SIZE           (64 * 1024)     /* 64 KByte (1 sector)  */
 #define CONFIG_ENV_OVERWRITE                   /* Serial change Ok     */
 #define CFG_ENV_ADDR   (CFG_RESET_ADDR + CFG_MONITOR_LEN)

diff --git a/include/configs/PCIPPC2.h b/include/configs/PCIPPC2.h
index 6ebaa85..af3b8ee 100644 (file)
--- a/include/configs/PCIPPC2.h
+++ b/include/configs/PCIPPC2.h
@@ -221,7 +221,7 @@
  * Note: 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           (CFG_FLASH_BASE + 0x70000)
 #define CFG_ENV_SIZE           0x1000  /* Size of the Environment              */
 #define CFG_ENV_SECT_SIZE      0x10000 /* Size of the Environment Sector       */

diff --git a/include/configs/PCIPPC6.h b/include/configs/PCIPPC6.h
index 9202794..e229bde 100644 (file)
--- a/include/configs/PCIPPC6.h
+++ b/include/configs/PCIPPC6.h
@@ -223,7 +223,7 @@
  * Note: 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           (CFG_FLASH_BASE + 0x70000)
 #define CFG_ENV_SIZE           0x1000  /* Size of the Environment              */
 #define CFG_ENV_SECT_SIZE      0x10000 /* Size of the Environment Sector       */

diff --git a/include/configs/PK1C20.h b/include/configs/PK1C20.h
index d90351a..48e9269 100644 (file)
--- a/include/configs/PK1C20.h
+++ b/include/configs/PK1C20.h
@@ -86,7 +86,7 @@
  * of flash. NOTE: the monitor length must be multiple of sector size
  * (which is common practice).
  *----------------------------------------------------------------------*/
-#define CFG_ENV_IS_IN_FLASH    1               /* Environment in flash */
+#define CONFIG_ENV_IS_IN_FLASH 1               /* Environment in flash */
 #define CFG_ENV_SIZE           (64 * 1024)     /* 64 KByte (1 sector)  */
 #define CONFIG_ENV_OVERWRITE                   /* Serial change Ok     */
 #define CFG_ENV_ADDR   (CFG_RESET_ADDR + CFG_MONITOR_LEN)

diff --git a/include/configs/PM520.h b/include/configs/PM520.h
index 5e0bb05..4da84ca 100644 (file)
--- a/include/configs/PM520.h
+++ b/include/configs/PM520.h
@@ -245,7 +245,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      0x40000
 #define CONFIG_ENV_OVERWRITE   1

diff --git a/include/configs/PM826.h b/include/configs/PM826.h
index de1ecde..0782ff0 100644 (file)
--- a/include/configs/PM826.h
+++ b/include/configs/PM826.h
@@ -257,7 +257,7 @@
 
 #if 0
 /* Start port with environment in flash; switch to EEPROM later */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_ADDR           (CFG_FLASH_BASE+0x40000)
 #define CFG_ENV_SIZE           0x40000
 #define CFG_ENV_SECT_SIZE      0x40000

diff --git a/include/configs/PM828.h b/include/configs/PM828.h
index cac8f27..a342824 100644 (file)
--- a/include/configs/PM828.h
+++ b/include/configs/PM828.h
@@ -250,7 +250,7 @@
 
 #if 0
 /* Start port with environment in flash; switch to EEPROM later */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_ADDR           (CFG_FLASH_BASE+0x40000)
 #define CFG_ENV_SIZE           0x40000
 #define CFG_ENV_SECT_SIZE      0x40000

diff --git a/include/configs/PM854.h b/include/configs/PM854.h
index 1212bcd..8babcb2 100644 (file)
--- a/include/configs/PM854.h
+++ b/include/configs/PM854.h
@@ -293,7 +293,7 @@
  * Environment
  */
 #ifndef CFG_RAMBOOT
-  #define CFG_ENV_IS_IN_FLASH  1
+  #define CONFIG_ENV_IS_IN_FLASH       1
   #define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x80000)
   #define CFG_ENV_SECT_SIZE    0x40000 /* 256K(one sector) for env */
   #define CFG_ENV_SIZE         0x2000

diff --git a/include/configs/PM856.h b/include/configs/PM856.h
index 75dba3b..9690bd7 100644 (file)
--- a/include/configs/PM856.h
+++ b/include/configs/PM856.h
@@ -293,7 +293,7 @@
  * Environment
  */
 #ifndef CFG_RAMBOOT
-  #define CFG_ENV_IS_IN_FLASH  1
+  #define CONFIG_ENV_IS_IN_FLASH       1
   #define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x80000)
   #define CFG_ENV_SECT_SIZE    0x40000 /* 256K(one sector) for env */
   #define CFG_ENV_SIZE         0x2000

diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h
index 5b25323..7a78776 100644 (file)
--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@@ -136,7 +136,7 @@
 #define CFG_FLASH_EMPTY_INFO   /* print 'E' for empty sector on flinfo */
 #define CFG_FLASH_QUIET_TEST   1       /* don't warn upon unknown flash        */
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      0x20000 /* size of one complete sector          */
 #define CFG_ENV_ADDR           ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE)
 #define        CFG_ENV_SIZE            0x2000  /* Total Size of Environment Sector     */

diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h
index a33bc3b..81085ec 100644 (file)
--- a/include/configs/PPChameleonEVB.h
+++ b/include/configs/PPChameleonEVB.h
@@ -423,7 +423,7 @@
 
 #else  /* DEFAULT: environment in flash, using redundand flash sectors */
 
-#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

diff --git a/include/configs/QS823.h b/include/configs/QS823.h
index cef9f42..3c7fc6f 100644 (file)
--- a/include/configs/QS823.h
+++ b/include/configs/QS823.h
@@ -223,7 +223,7 @@
 /*-----------------------------------------------------------------------
  * Environment variable storage is in FLASH, one sector before U-boot
  */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_SECT_SIZE      0x20000         /* 128Kb, one whole sector */
 #define CFG_ENV_SIZE           0x2000          /* 8kb */
 #define CFG_ENV_ADDR           0xffee0000      /* address of env sector */

diff --git a/include/configs/QS850.h b/include/configs/QS850.h
index ba5827a..44daf52 100644 (file)
--- a/include/configs/QS850.h
+++ b/include/configs/QS850.h
@@ -223,7 +223,7 @@
 /*-----------------------------------------------------------------------
  * Environment variable storage is in FLASH, one sector before U-boot
  */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_SECT_SIZE      0x20000         /* 128Kb, one whole sector */
 #define CFG_ENV_SIZE           0x2000          /* 8kb */
 #define CFG_ENV_ADDR           0xffee0000      /* address of env sector */

diff --git a/include/configs/QS860T.h b/include/configs/QS860T.h
index 9dfceef..dd79246 100644 (file)
--- a/include/configs/QS860T.h
+++ b/include/configs/QS860T.h
@@ -213,7 +213,7 @@ CONFIG_SPI
 #define CFG_FLASH_ERASE_TOUT   120000          /* Timeout for Flash Erase (in ms) */
 #define CFG_FLASH_WRITE_TOUT   500             /* Timeout for Flash Write (in ms) */
 
-#undef CFG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_FLASH
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/R360MPI.h b/include/configs/R360MPI.h
index a653cca..26729fc 100644 (file)
--- a/include/configs/R360MPI.h
+++ b/include/configs/R360MPI.h
@@ -229,7 +229,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          0x40000 /* Offset of Environment                */
 #define        CFG_ENV_SECT_SIZE       0x20000 /* Total Size of Environment sector     */
 #define        CFG_ENV_SIZE            0x4000  /* Used Size of Environment sector      */

diff --git a/include/configs/RBC823.h b/include/configs/RBC823.h
index 9222d21..8f59450 100644 (file)
--- a/include/configs/RBC823.h
+++ b/include/configs/RBC823.h
@@ -203,7 +203,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          0x10000 /*   Offset   of Environment Sector     */
 #define        CFG_ENV_SIZE            0x10000 /* Total Size of Environment Sector     */
 

diff --git a/include/configs/RPXClassic.h b/include/configs/RPXClassic.h
index 3762391..50345e5 100644 (file)
--- a/include/configs/RPXClassic.h
+++ b/include/configs/RPXClassic.h
@@ -219,7 +219,7 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #if 0
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define        CFG_ENV_OFFSET          0x20000 /*   Offset   of Environment Sector  */
 #define CFG_ENV_SECT_SIZE       0x8000
 #define        CFG_ENV_SIZE            0x8000  /* Total Size of Environment Sector  */

diff --git a/include/configs/RPXlite.h b/include/configs/RPXlite.h
index 671094b..2e4710a 100644 (file)
--- a/include/configs/RPXlite.h
+++ b/include/configs/RPXlite.h
@@ -155,7 +155,7 @@
 
 #define        CFG_DIRECT_FLASH_TFTP
 
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_ENV_SECT_SIZE      0x40000 /* We use one complete sector           */
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
 

diff --git a/include/configs/RPXlite_DW.h b/include/configs/RPXlite_DW.h
index d135818..724dc48 100644 (file)
--- a/include/configs/RPXlite_DW.h
+++ b/include/configs/RPXlite_DW.h
@@ -233,7 +233,7 @@
 #define CFG_ENV_ADDR           0xFA000100
 #define CFG_ENV_SIZE           0x1000
 #else
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_OFFSET         0x30000 /* Offset of Environment Sector         */
 #define CFG_ENV_SIZE           0x8000  /* Total Size of Environment Sector     */
 #endif /* CONFIG_ENV_IS_IN_NVRAM */

diff --git a/include/configs/RPXsuper.h b/include/configs/RPXsuper.h
index 2a9c627..8bdb401 100644 (file)
--- a/include/configs/RPXsuper.h
+++ b/include/configs/RPXsuper.h
@@ -300,7 +300,7 @@
 #define CFG_FLASH_WRITE_TOUT  1       /* Timeout for Flash Write (in ms)    */
 
 #ifndef CFG_RAMBOOT
-#  define CFG_ENV_IS_IN_FLASH  1
+#  define CONFIG_ENV_IS_IN_FLASH  1
 
 #  ifdef CFG_ENV_IN_OWN_SECT
 #    define CFG_ENV_ADDR       (CFG_MONITOR_BASE + 0x40000)

diff --git a/include/configs/RRvision.h b/include/configs/RRvision.h
index 6a71801..22d3da6 100644 (file)
--- a/include/configs/RRvision.h
+++ b/include/configs/RRvision.h
@@ -227,7 +227,7 @@
 #define CFG_FLASH_ERASE_TOUT   (120*CFG_HZ)    /* Timeout for Flash Erase      */
 #define CFG_FLASH_WRITE_TOUT   (1 * CFG_HZ)    /* Timeout for Flash Write      */
 
-#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     */
 

diff --git a/include/configs/Rattler.h b/include/configs/Rattler.h
index e8ed095..e603f29 100644 (file)
--- a/include/configs/Rattler.h
+++ b/include/configs/Rattler.h
@@ -223,12 +223,12 @@
 
 #define CFG_MONITOR_LEN                (256 << 10)     /* Reserve 256 kB for Monitor   */
 
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      0x10000
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
 
 #define CFG_DEFAULT_IMMR       0xFF010000
 

diff --git a/include/configs/SBC8540.h b/include/configs/SBC8540.h
index 6b25d56..64f2320 100644 (file)
--- a/include/configs/SBC8540.h
+++ b/include/configs/SBC8540.h
@@ -337,7 +337,7 @@
     #define CFG_ENV_ADDR       (CFG_FLASH_BASE + 0x100000)
     #define CFG_ENV_SIZE       0x2000
   #else
-    #define CFG_ENV_IS_IN_FLASH        1
+    #define CONFIG_ENV_IS_IN_FLASH     1
     #define CFG_ENV_SECT_SIZE  0x20000 /* 128K(one sector) for env */
     #define CFG_ENV_ADDR       (CFG_MONITOR_BASE - CFG_ENV_SECT_SIZE)
     #define CFG_ENV_SIZE       0x2000 /* CFG_ENV_SECT_SIZE */

diff --git a/include/configs/SCM.h b/include/configs/SCM.h
index 2c7e55f..bc779de 100644 (file)
--- a/include/configs/SCM.h
+++ b/include/configs/SCM.h
@@ -270,7 +270,7 @@
 
 #if 0
 /* Start port with environment in flash; switch to EEPROM later */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_ADDR           (CFG_FLASH_BASE+0x40000)
 #define CFG_ENV_SIZE           0x40000
 #define CFG_ENV_SECT_SIZE      0x40000

diff --git a/include/configs/SL8245.h b/include/configs/SL8245.h
index 31853c8..56436a4 100644 (file)
--- a/include/configs/SL8245.h
+++ b/include/configs/SL8245.h
@@ -257,7 +257,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           0xFFFF0000
 #define CFG_ENV_SIZE           0x00010000 /* Size of the Environment           */
 #define CFG_ENV_SECT_SIZE      0x00010000 /* Size of the Environment Sector    */

diff --git a/include/configs/SM850.h b/include/configs/SM850.h
index 465db47..138dbd2 100644 (file)
--- a/include/configs/SM850.h
+++ b/include/configs/SM850.h
@@ -163,7 +163,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     */
 

diff --git a/include/configs/SMN42.h b/include/configs/SMN42.h
index a5d3d69..583ee21 100644 (file)
--- a/include/configs/SMN42.h
+++ b/include/configs/SMN42.h
@@ -189,7 +189,7 @@
 
 #define CFG_MAX_FLASH_BANKS    2       /* max number of memory banks           */
 
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 /* The Environment Sector is in the CPU-internal flash */
 #define CFG_FLASH_BASE         0
 #define CFG_ENV_OFFSET         0x3C000

diff --git a/include/configs/SPD823TS.h b/include/configs/SPD823TS.h
index 395c7a1..39ab1c8 100644 (file)
--- a/include/configs/SPD823TS.h
+++ b/include/configs/SPD823TS.h
@@ -167,7 +167,7 @@
 #define CFG_FLASH_ERASE_TOUT   0       /* Timeout for Flash Erase (in ms)      */
 #define CFG_FLASH_WRITE_TOUT   0       /* 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           0x0800  /* Total Size of Environment Sector     */
 /*-----------------------------------------------------------------------

diff --git a/include/configs/SX1.h b/include/configs/SX1.h
index d233679..d1b6998 100644 (file)
--- a/include/configs/SX1.h
+++ b/include/configs/SX1.h
@@ -189,7 +189,7 @@
 #define CFG_FLASH_ERASE_TOUT   (20*CFG_HZ) /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT   (20*CFG_HZ) /* Timeout for Flash Write */
 
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_SECT_SIZE      PHYS_FLASH_SECT_SIZE
 #define CFG_ENV_SIZE           CFG_ENV_SECT_SIZE /* Total Size of Environment Sector */
 #define CFG_ENV_OFFSET ( CFG_MONITOR_BASE + CFG_MONITOR_LEN ) /* Environment after Monitor */

diff --git a/include/configs/SXNI855T.h b/include/configs/SXNI855T.h
index 85b3a9f..67b6071 100644 (file)
--- a/include/configs/SXNI855T.h
+++ b/include/configs/SXNI855T.h
@@ -449,8 +449,8 @@
 
 #define CONFIG_RESET_ON_PANIC          /* reset if system panic() */
 
-#define CFG_ENV_IS_IN_FLASH
-#ifdef CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
   /* environment is in FLASH */
   #define CFG_ENV_ADDR         0xF8040000      /* AM29LV641 or AM29LV800BT */
   #define CFG_ENV_ADDR_REDUND  0xF8050000      /* AM29LV641 or AM29LV800BT */

diff --git a/include/configs/Sandpoint8240.h b/include/configs/Sandpoint8240.h
index cfd16d3..7c880ab 100644 (file)
--- a/include/configs/Sandpoint8240.h
+++ b/include/configs/Sandpoint8240.h
@@ -176,7 +176,7 @@
 #else
 #define CFG_FLASH_SIZE         (1024 * 1024)   /* Unity has onboard 1MByte flash */
 #endif
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_OFFSET         0x00004000      /* Offset of Environment Sector */
 #define CFG_ENV_SIZE           0x00002000      /* Total Size of Environment Sector */
 

diff --git a/include/configs/Sandpoint8245.h b/include/configs/Sandpoint8245.h
index c0f2c57..39f66cb 100644 (file)
--- a/include/configs/Sandpoint8245.h
+++ b/include/configs/Sandpoint8245.h
@@ -146,7 +146,7 @@
 #else
 #define CFG_FLASH_SIZE         (1024 * 1024)   /* Unity has onboard 1MByte flash */
 #endif
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_OFFSET         0x00004000      /* Offset of Environment Sector */
 #define CFG_ENV_SIZE           0x00002000      /* Total Size of Environment Sector */
 

diff --git a/include/configs/TASREG.h b/include/configs/TASREG.h
index dccdf0c..1b2b70a 100644 (file)
--- a/include/configs/TASREG.h
+++ b/include/configs/TASREG.h
@@ -195,7 +195,7 @@
 #define CFG_GBL_DATA_OFFSET    (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
 #define CFG_INIT_SP_OFFSET     CFG_GBL_DATA_OFFSET
 
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_ADDR           0xFFC40000      /* Address of Environment Sector*/
 #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/TB5200.h b/include/configs/TB5200.h
index 3b68166..97a8d6f 100644 (file)
--- a/include/configs/TB5200.h
+++ b/include/configs/TB5200.h
@@ -296,7 +296,7 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_SIZE           0x10000
 #if defined(CONFIG_TQM5200_B)
 #define CFG_ENV_SECT_SIZE      0x40000

diff --git a/include/configs/TK885D.h b/include/configs/TK885D.h
index 8073b7e..9982916 100644 (file)
--- a/include/configs/TK885D.h
+++ b/include/configs/TK885D.h
@@ -254,7 +254,7 @@
 #define CFG_MAX_FLASH_BANKS    1       /* max number of memory banks */
 #define CFG_MAX_FLASH_SECT     256     /* max number of sectors on one chip */
 
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_OFFSET         0x40000 /*   Offset   of Environment Sector     */
 #define CFG_ENV_SIZE           0x08000 /* Total Size of Environment            */
 #define CFG_ENV_SECT_SIZE      0x40000 /* Total Size of Environment Sector     */

diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 0ba7455..d91d2e5 100644 (file)
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -456,7 +456,7 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_SIZE           0x4000  /* 16 k - keep small for fast booting */
 #if defined(CONFIG_TQM5200_B) || defined (CONFIG_CAM5200)
 #define CFG_ENV_SECT_SIZE      0x40000

diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h
index 839b6be..a979351 100644 (file)
--- a/include/configs/TQM823L.h
+++ b/include/configs/TQM823L.h
@@ -215,7 +215,7 @@
 #define CFG_MAX_FLASH_BANKS    2       /* max number of memory banks */
 #define CFG_MAX_FLASH_SECT     71      /* max number of sectors on one chip */
 
-#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     */
 

diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h
index b9a7a59..86432c6 100644 (file)
--- a/include/configs/TQM823M.h
+++ b/include/configs/TQM823M.h
@@ -210,7 +210,7 @@
 #define CFG_MAX_FLASH_BANKS    1       /* max number of memory banks */
 #define CFG_MAX_FLASH_SECT     256     /* max number of sectors on one chip */
 
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define        CFG_ENV_OFFSET          0x40000 /*   Offset   of Environment Sector     */
 #define        CFG_ENV_SIZE            0x08000 /* Total Size of Environment            */
 #define        CFG_ENV_SECT_SIZE       0x20000 /* Total Size of Environment Sector     */

diff --git a/include/configs/TQM8260.h b/include/configs/TQM8260.h
index a77b119..46ecb51 100644 (file)
--- a/include/configs/TQM8260.h
+++ b/include/configs/TQM8260.h
@@ -306,7 +306,7 @@
 
 #if 0
 /* Start port with environment in flash; switch to EEPROM later */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_ADDR           (CFG_FLASH_BASE+0x40000)
 #define CFG_ENV_SIZE           0x40000
 #define CFG_ENV_SECT_SIZE      0x40000

diff --git a/include/configs/TQM8272.h b/include/configs/TQM8272.h
index 039ecf1..8642a9f 100644 (file)
--- a/include/configs/TQM8272.h
+++ b/include/configs/TQM8272.h
@@ -381,7 +381,7 @@
 
 #define CFG_UPDATE_FLASH_SIZE
 
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x40000)
 #define CFG_ENV_SIZE           0x20000
 #define CFG_ENV_SECT_SIZE      0x20000

diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 2ab6991..0d47d70 100644 (file)
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -300,7 +300,7 @@ extern int tqm834x_num_flash_banks;
 #define CONFIG_ENV_OVERWRITE
 
 #ifndef CFG_RAMBOOT
-       #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

diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h
index 388fafc..1a80896 100644 (file)
--- a/include/configs/TQM850L.h
+++ b/include/configs/TQM850L.h
@@ -200,7 +200,7 @@
 #define CFG_MAX_FLASH_BANKS    2       /* max number of memory banks */
 #define CFG_MAX_FLASH_SECT     71      /* max number of sectors on one chip */
 
-#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     */
 

diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h
index 6f0864f..4626f2e 100644 (file)
--- a/include/configs/TQM850M.h
+++ b/include/configs/TQM850M.h
@@ -199,7 +199,7 @@
 #define CFG_MAX_FLASH_BANKS    1       /* max number of memory banks */
 #define CFG_MAX_FLASH_SECT     256     /* max number of sectors on one chip */
 
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define        CFG_ENV_OFFSET          0x40000 /*   Offset   of Environment Sector     */
 #define        CFG_ENV_SIZE            0x08000 /* Total Size of Environment            */
 #define        CFG_ENV_SECT_SIZE       0x20000 /* Total Size of Environment Sector     */

diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h
index 093d659..6582d97 100644 (file)
--- a/include/configs/TQM855L.h
+++ b/include/configs/TQM855L.h
@@ -205,7 +205,7 @@
 #define CFG_MAX_FLASH_BANKS    2       /* max number of memory banks */
 #define CFG_MAX_FLASH_SECT     71      /* max number of sectors on one chip */
 
-#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     */
 

diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h
index 64bbc39..2ff208c 100644 (file)
--- a/include/configs/TQM855M.h
+++ b/include/configs/TQM855M.h
@@ -239,7 +239,7 @@
 #define CFG_MAX_FLASH_BANKS    1       /* max number of memory banks */
 #define CFG_MAX_FLASH_SECT     256     /* max number of sectors on one chip */
 
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define        CFG_ENV_OFFSET          0x40000 /*   Offset   of Environment Sector     */
 #define        CFG_ENV_SIZE            0x08000 /* Total Size of Environment            */
 #define        CFG_ENV_SECT_SIZE       0x20000 /* Total Size of Environment Sector     */

diff --git a/include/configs/TQM85xx.h b/include/configs/TQM85xx.h
index 5e1cf95..c6bb4f9 100644 (file)
--- a/include/configs/TQM85xx.h
+++ b/include/configs/TQM85xx.h
@@ -558,7 +558,7 @@
 /*
  * Environment
  */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 
 #ifdef CONFIG_TQM_FLASH_N_TYPE
 #define CFG_ENV_SECT_SIZE      0x40000 /* 256K (one sector) for env    */

diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h
index dacc340..1daf866 100644 (file)
--- a/include/configs/TQM860L.h
+++ b/include/configs/TQM860L.h
@@ -204,7 +204,7 @@
 #define CFG_MAX_FLASH_BANKS    2       /* max number of memory banks */
 #define CFG_MAX_FLASH_SECT     71      /* max number of sectors on one chip */
 
-#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     */
 

diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h
index 3ec849c..dcdcdc1 100644 (file)
--- a/include/configs/TQM860M.h
+++ b/include/configs/TQM860M.h
@@ -204,7 +204,7 @@
 #define CFG_MAX_FLASH_BANKS    1       /* max number of memory banks */
 #define CFG_MAX_FLASH_SECT     256     /* max number of sectors on one chip */
 
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define        CFG_ENV_OFFSET          0x40000 /*   Offset   of Environment Sector     */
 #define        CFG_ENV_SIZE            0x08000 /* Total Size of Environment Sector     */
 #define        CFG_ENV_SECT_SIZE       0x40000 /* Total Size of Environment Sector     */

diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h
index 6c610ee..53a8f34 100644 (file)
--- a/include/configs/TQM862L.h
+++ b/include/configs/TQM862L.h
@@ -208,7 +208,7 @@
 #define CFG_MAX_FLASH_BANKS    2       /* max number of memory banks */
 #define CFG_MAX_FLASH_SECT     71      /* max number of sectors on one chip */
 
-#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     */
 

diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h
index 2eca59b..41a0cac 100644 (file)
--- a/include/configs/TQM862M.h
+++ b/include/configs/TQM862M.h
@@ -208,7 +208,7 @@
 #define CFG_MAX_FLASH_BANKS    1       /* max number of memory banks */
 #define CFG_MAX_FLASH_SECT     256     /* max number of sectors on one chip */
 
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define        CFG_ENV_OFFSET          0x40000 /*   Offset   of Environment Sector     */
 #define        CFG_ENV_SIZE            0x08000 /* Total Size of Environment            */
 #define        CFG_ENV_SECT_SIZE       0x20000 /* Total Size of Environment Sector     */

diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h
index 4683286..3e50cd4 100644 (file)
--- a/include/configs/TQM866M.h
+++ b/include/configs/TQM866M.h
@@ -248,7 +248,7 @@
 #define CFG_MAX_FLASH_BANKS    1       /* max number of memory banks */
 #define CFG_MAX_FLASH_SECT     256     /* max number of sectors on one chip */
 
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_OFFSET         0x40000 /*   Offset   of Environment Sector     */
 #define CFG_ENV_SIZE           0x08000 /* Total Size of Environment Sector     */
 #define CFG_ENV_SECT_SIZE      0x40000 /* Total Size of Environment Sector     */

diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h
index 5daaf04..ebdf17d 100644 (file)
--- a/include/configs/TQM885D.h
+++ b/include/configs/TQM885D.h
@@ -251,7 +251,7 @@
 #define CFG_MAX_FLASH_BANKS    1       /* max number of memory banks */
 #define CFG_MAX_FLASH_SECT     256     /* max number of sectors on one chip */
 
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_OFFSET         0x40000 /*   Offset   of Environment Sector     */
 #define CFG_ENV_SIZE           0x08000 /* Total Size of Environment            */
 #define CFG_ENV_SECT_SIZE      0x40000 /* Total Size of Environment Sector     */

diff --git a/include/configs/Total5200.h b/include/configs/Total5200.h
index 25e98e2..16584ec 100644 (file)
--- a/include/configs/Total5200.h
+++ b/include/configs/Total5200.h
@@ -232,7 +232,7 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_SIZE           0x40000
 #define CFG_ENV_SECT_SIZE      0x40000
 #define CONFIG_ENV_OVERWRITE   1

diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h
index 50dd7aa..9822d7d 100644 (file)
--- a/include/configs/VCMA9.h
+++ b/include/configs/VCMA9.h
@@ -239,7 +239,7 @@
 #define CFG_FLASH_WRITE_TOUT   (5*CFG_HZ) /* Timeout for Flash Write */
 
 #if 0
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_ENV_SIZE           0x10000 /* Total Size of Environment Sector */
 #endif
 

diff --git a/include/configs/VoVPN-GW.h b/include/configs/VoVPN-GW.h
index db05d82..d8d97e8 100644 (file)
--- a/include/configs/VoVPN-GW.h
+++ b/include/configs/VoVPN-GW.h
@@ -259,7 +259,7 @@
 #define CFG_MONITOR_OFFSET             0x00700000
 
 /* environment in flash */
-#define CFG_ENV_IS_IN_FLASH            1
+#define CONFIG_ENV_IS_IN_FLASH         1
 #define CFG_ENV_ADDR                   (CFG_FLASH_BASE + 0x00020000)
 #define CFG_ENV_SIZE                   0x00020000
 #define CFG_ENV_SECT_SIZE              0x00020000

diff --git a/include/configs/W7OLMC.h b/include/configs/W7OLMC.h
index d4ec03e..2471a44 100644 (file)
--- a/include/configs/W7OLMC.h
+++ b/include/configs/W7OLMC.h
@@ -261,7 +261,7 @@
 /*-----------------------------------------------------------------------
  * Flash EEPROM for environment
  */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_OFFSET         0x00040000      /* Offset of Environment Sector */
 #define CFG_ENV_SIZE           0x10000         /* Total Size of env. sector    */
 

diff --git a/include/configs/W7OLMG.h b/include/configs/W7OLMG.h
index ac52e39..fe09c9a 100644 (file)
--- a/include/configs/W7OLMG.h
+++ b/include/configs/W7OLMG.h
@@ -268,7 +268,7 @@
 /*-----------------------------------------------------------------------
  * Flash EEPROM for environment
  */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_OFFSET         0x00040000      /* Offset of Environment Sector */
 #define CFG_ENV_SIZE           0x10000         /* Total Size of env. sector    */
 

diff --git a/include/configs/Yukon8220.h b/include/configs/Yukon8220.h
index 9ace43e..ef230e1 100644 (file)
--- a/include/configs/Yukon8220.h
+++ b/include/configs/Yukon8220.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
 
 #ifndef CFG_JFFS2_FIRST_SECTOR

diff --git a/include/configs/ZPC1900.h b/include/configs/ZPC1900.h
index 4217900..5fade63 100644 (file)
--- a/include/configs/ZPC1900.h
+++ b/include/configs/ZPC1900.h
@@ -220,11 +220,11 @@
 #define CFG_MALLOC_LEN         (4096 << 10)    /* Reserve 4 MB for malloc()    */
 #define CFG_BOOTMAPSZ          (8 << 20)       /* Initial Memory map for Linux */
 
-#if !defined(CFG_ENV_IS_IN_FLASH) && !defined(CONFIG_ENV_IS_IN_NVRAM)
+#if !defined(CONFIG_ENV_IS_IN_FLASH) && !defined(CONFIG_ENV_IS_IN_NVRAM)
 #define CONFIG_ENV_IS_IN_NVRAM 1
 #endif
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #  define CFG_ENV_SECT_SIZE    0x10000
 #  define CFG_ENV_ADDR         (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
 #else

diff --git a/include/configs/ZUMA.h b/include/configs/ZUMA.h
index 5ba8d1a..1b71388 100644 (file)
--- a/include/configs/ZUMA.h
+++ b/include/configs/ZUMA.h
@@ -349,7 +349,7 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms) */
 #define CFG_FLASH_CFI          1
 
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_SIZE           0x1000  /* Total Size of Environment Sector */
 #define CFG_ENV_SECT_SIZE      0x10000 /* see README - env sect real size */
 #define CFG_ENV_ADDR           (0xfff80000 - CFG_ENV_SECT_SIZE)

diff --git a/include/configs/acadia.h b/include/configs/acadia.h
index 894a62b..ffaaa84 100644 (file)
--- a/include/configs/acadia.h
+++ b/include/configs/acadia.h
@@ -96,7 +96,7 @@
  * Environment
  *----------------------------------------------------------------------*/
 #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
-#define CFG_ENV_IS_IN_FLASH     1      /* use FLASH for environment vars       */
+#define CONFIG_ENV_IS_IN_FLASH     1   /* use FLASH for environment vars       */
 #else
 #define CONFIG_ENV_IS_IN_NAND  1       /* use NAND for environment vars        */
 #define CFG_ENV_IS_EMBEDDED    1       /* use embedded environment */
@@ -123,7 +123,7 @@
 #define        CFG_NO_FLASH            1       /* No NOR on Acadia when NAND-booting   */
 #endif
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      0x40000 /* size of one complete sector  */
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE)
 #define        CFG_ENV_SIZE            0x4000  /* Total Size of Environment Sector     */

diff --git a/include/configs/actux1.h b/include/configs/actux1.h
index 33a7494..d18c4b5 100644 (file)
--- a/include/configs/actux1.h
+++ b/include/configs/actux1.h
@@ -202,7 +202,7 @@
  * environment organization:
  * one flash sector, embedded in uboot area (bottom bootblock flash)
  */
-#define        CFG_ENV_IS_IN_FLASH             1
+#define        CONFIG_ENV_IS_IN_FLASH          1
 #define CFG_ENV_SIZE                   0x2000
 #define CFG_ENV_ADDR                   (PHYS_FLASH_1 + 0x4000)
 #define CFG_USE_PPCENV                 1

diff --git a/include/configs/actux2.h b/include/configs/actux2.h
index 75aaa11..f6919a5 100644 (file)
--- a/include/configs/actux2.h
+++ b/include/configs/actux2.h
@@ -179,7 +179,7 @@
  * environment organization:
  * one flash sector, embedded in uboot area (bottom bootblock flash)
  */
-#define        CFG_ENV_IS_IN_FLASH             1
+#define        CONFIG_ENV_IS_IN_FLASH          1
 #define CFG_ENV_SIZE                   0x2000
 #define CFG_ENV_ADDR                   (PHYS_FLASH_1 + 0x4000)
 #define CFG_USE_PPCENV                 1

diff --git a/include/configs/actux3.h b/include/configs/actux3.h
index 693c284..dfc8967 100644 (file)
--- a/include/configs/actux3.h
+++ b/include/configs/actux3.h
@@ -179,7 +179,7 @@
  * environment organization:
  * one flash sector, embedded in uboot area (bottom bootblock flash)
  */
-#define        CFG_ENV_IS_IN_FLASH             1
+#define        CONFIG_ENV_IS_IN_FLASH          1
 #define CFG_ENV_SIZE                   0x2000
 #define CFG_ENV_ADDR                   (PHYS_FLASH_1 + 0x4000)
 #define CFG_USE_PPCENV                 1

diff --git a/include/configs/actux4.h b/include/configs/actux4.h
index 7f8e0f4..48d3713 100644 (file)
--- a/include/configs/actux4.h
+++ b/include/configs/actux4.h
@@ -176,7 +176,7 @@
 #define CFG_CACHELINE_SIZE             32
 
 /* environment organization: one complete 4k flash sector */
-#define        CFG_ENV_IS_IN_FLASH             1
+#define        CONFIG_ENV_IS_IN_FLASH          1
 #define CFG_ENV_SIZE                   0x1000
 #define CFG_ENV_ADDR                   (PHYS_FLASH_1 + 0x3f000)
 

diff --git a/include/configs/ads5121.h b/include/configs/ads5121.h
index f516c46..eb6a645 100644 (file)
--- a/include/configs/ads5121.h
+++ b/include/configs/ads5121.h
@@ -320,7 +320,7 @@
 /*
  * Environment
  */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 /* This has to be a multiple of the Flash sector size */
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
 #define CFG_ENV_SIZE           0x2000

diff --git a/include/configs/aev.h b/include/configs/aev.h
index f27cc4a..bd7dab2 100644 (file)
--- a/include/configs/aev.h
+++ b/include/configs/aev.h
@@ -246,7 +246,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)

diff --git a/include/configs/alpr.h b/include/configs/alpr.h
index f342c7a..ee60644 100644 (file)
--- a/include/configs/alpr.h
+++ b/include/configs/alpr.h
@@ -93,7 +93,7 @@
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 #define CFG_FLASH_QUIET_TEST   1       /* don't warn upon unknown flash        */
 
-#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_SECT_SIZE      0x10000 /* size of one complete sector          */
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE)

diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h
index 3db609b..79f4d11 100644 (file)
--- a/include/configs/ap325rxa.h
+++ b/include/configs/ap325rxa.h
@@ -160,7 +160,7 @@
 #undef  CFG_DIRECT_FLASH_TFTP
 
 /* ENV setting */
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_OVERWRITE   1
 #define CFG_ENV_SECT_SIZE      (128 * 1024)
 #define CFG_ENV_SIZE           (CFG_ENV_SECT_SIZE)

diff --git a/include/configs/armadillo.h b/include/configs/armadillo.h
index 98a83db..45b20bd 100644 (file)
--- a/include/configs/armadillo.h
+++ b/include/configs/armadillo.h
@@ -147,7 +147,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_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_ENV_ADDR           (PHYS_FLASH_1 + 0x20000)        /* Addr of Environment Sector   */
 #define CFG_ENV_SIZE           0x20000 /* Total Size of Environment Sector     */
 

diff --git a/include/configs/assabet.h b/include/configs/assabet.h
index ed7b5ef..3cc4db4 100644 (file)
--- a/include/configs/assabet.h
+++ b/include/configs/assabet.h
@@ -160,9 +160,9 @@
 #undef CFG_FLASH_PROTECTION
 #define CFG_FLASH_BANKS_LIST    { CFG_FLASH_BASE }
 
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 
-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 #define CFG_ENV_IN_OWN_SECTOR  1
 #define CFG_ENV_ADDR           (PHYS_FLASH_1 + PHYS_FLASH_SECT_SIZE)
 #define CFG_ENV_SIZE           PHYS_FLASH_SECT_SIZE

diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h
index acf452b..fb5358c 100644 (file)
--- a/include/configs/at91cap9adk.h
+++ b/include/configs/at91cap9adk.h
@@ -163,7 +163,7 @@
 #else
 
 /* bootstrap + u-boot + env + linux in norflash */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_MONITOR_BASE       (PHYS_FLASH_1 + 0x8000)
 #define CFG_ENV_OFFSET         0x4000
 #define CFG_ENV_ADDR           (PHYS_FLASH_1 + CFG_ENV_OFFSET)

diff --git a/include/configs/at91rm9200dk.h b/include/configs/at91rm9200dk.h
index 92724ab..31d84d2 100644 (file)
--- a/include/configs/at91rm9200dk.h
+++ b/include/configs/at91rm9200dk.h
@@ -186,7 +186,7 @@
 #define CFG_ENV_ADDR                   (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
 #define CFG_ENV_SIZE                   0x2000  /* 0x8000 */
 #else
-#define CFG_ENV_IS_IN_FLASH            1
+#define CONFIG_ENV_IS_IN_FLASH         1
 #ifdef CONFIG_SKIP_LOWLEVEL_INIT
 #define CFG_ENV_ADDR                   (PHYS_FLASH_1 + 0xe000)  /* between boot.bin and u-boot.bin.gz */
 #define CFG_ENV_SIZE                   0x2000  /* 0x8000 */

diff --git a/include/configs/atc.h b/include/configs/atc.h
index 1e393a2..a7b154d 100644 (file)
--- a/include/configs/atc.h
+++ b/include/configs/atc.h
@@ -270,7 +270,7 @@
 
 #if 1
 /* environment is in Flash */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 # define CFG_ENV_ADDR          (CFG_FLASH_BASE+0x30000)
 # define CFG_ENV_SIZE          0x10000
 # define CFG_ENV_SECT_SIZE     0x10000

diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h
index 6d8c1b2..12da7f0 100644 (file)
--- a/include/configs/atngw100.h
+++ b/include/configs/atngw100.h
@@ -153,7 +153,7 @@
 #define CFG_INTRAM_SIZE                        INTERNAL_SRAM_SIZE
 #define CFG_SDRAM_BASE                 EBI_SDRAM_BASE
 
-#define CFG_ENV_IS_IN_FLASH            1
+#define CONFIG_ENV_IS_IN_FLASH         1
 #define CFG_ENV_SIZE                   65536
 #define CFG_ENV_ADDR                   (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE)
 

diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h
index 3a7d273..4a9a94e 100644 (file)
--- a/include/configs/atstk1002.h
+++ b/include/configs/atstk1002.h
@@ -177,7 +177,7 @@
 #define CFG_INTRAM_SIZE                        INTERNAL_SRAM_SIZE
 #define CFG_SDRAM_BASE                 EBI_SDRAM_BASE
 
-#define CFG_ENV_IS_IN_FLASH            1
+#define CONFIG_ENV_IS_IN_FLASH         1
 #define CFG_ENV_SIZE                   65536
 #define CFG_ENV_ADDR                   (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE)
 

diff --git a/include/configs/atstk1003.h b/include/configs/atstk1003.h
index 55ea7f2..62c1aff 100644 (file)
--- a/include/configs/atstk1003.h
+++ b/include/configs/atstk1003.h
@@ -160,7 +160,7 @@
 #define CFG_INTRAM_SIZE                        INTERNAL_SRAM_SIZE
 #define CFG_SDRAM_BASE                 EBI_SDRAM_BASE
 
-#define CFG_ENV_IS_IN_FLASH            1
+#define CONFIG_ENV_IS_IN_FLASH         1
 #define CFG_ENV_SIZE                   65536
 #define CFG_ENV_ADDR                   (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE)
 

diff --git a/include/configs/atstk1004.h b/include/configs/atstk1004.h
index 369c619..a9a9484 100644 (file)
--- a/include/configs/atstk1004.h
+++ b/include/configs/atstk1004.h
@@ -160,7 +160,7 @@
 #define CFG_INTRAM_SIZE                        INTERNAL_SRAM_SIZE
 #define CFG_SDRAM_BASE                 EBI_SDRAM_BASE
 
-#define CFG_ENV_IS_IN_FLASH            1
+#define CONFIG_ENV_IS_IN_FLASH         1
 #define CFG_ENV_SIZE                   65536
 #define CFG_ENV_ADDR                   (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE)
 

diff --git a/include/configs/atstk1006.h b/include/configs/atstk1006.h
index 902f822..c454ec0 100644 (file)
--- a/include/configs/atstk1006.h
+++ b/include/configs/atstk1006.h
@@ -177,7 +177,7 @@
 #define CFG_INTRAM_SIZE                        INTERNAL_SRAM_SIZE
 #define CFG_SDRAM_BASE                 EBI_SDRAM_BASE
 
-#define CFG_ENV_IS_IN_FLASH            1
+#define CONFIG_ENV_IS_IN_FLASH         1
 #define CFG_ENV_SIZE                   65536
 #define CFG_ENV_ADDR                   (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE)
 

diff --git a/include/configs/bamboo.h b/include/configs/bamboo.h
index 20ebc3f..2485477 100644 (file)
--- a/include/configs/bamboo.h
+++ b/include/configs/bamboo.h
@@ -103,7 +103,7 @@
  * Environment
  *----------------------------------------------------------------------*/
 #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
-#define CFG_ENV_IS_IN_FLASH     1      /* use FLASH for environment vars       */
+#define CONFIG_ENV_IS_IN_FLASH     1   /* use FLASH for environment vars       */
 #else
 #define CONFIG_ENV_IS_IN_NAND  1       /* use NAND for environment vars        */
 #define CFG_ENV_IS_EMBEDDED    1       /* use embedded environment */
@@ -126,7 +126,7 @@
 #define CFG_FLASH_2ND_16BIT_DEV 1      /* bamboo has 8 and 16bit device        */
 #define CFG_FLASH_2ND_ADDR      0x87800000  /* bamboo has 8 and 16bit device   */
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      0x10000 /* size of one complete sector          */
 #define CFG_ENV_ADDR           ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE)
 #define        CFG_ENV_SIZE            0x2000  /* Total Size of Environment Sector     */
@@ -134,7 +134,7 @@
 /* Address and size of Redundant Environment Sector    */
 #define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE)
 #define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*
  * IPL (Initial Program Loader, integrated inside CPU)

diff --git a/include/configs/barco.h b/include/configs/barco.h
index 4f57067..cbf5868 100644 (file)
--- a/include/configs/barco.h
+++ b/include/configs/barco.h
@@ -166,7 +166,7 @@
 
 #define CFG_FLASH_BASE         0xFFF00000
 #define CFG_FLASH_SIZE         (8 * 1024 * 1024)       /* Unity has onboard 1MByte flash */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_OFFSET         0x000047A4      /* Offset of Environment Sector */
 #define CFG_ENV_SIZE           0x00002000      /* Total Size of Environment Sector */
 /* #define ENV_CRC             0x8BF6F24B      XXX - FIXME: gets defined automatically */

diff --git a/include/configs/bf533-ezkit.h b/include/configs/bf533-ezkit.h
index 2f551ad..08fb639 100644 (file)
--- a/include/configs/bf533-ezkit.h
+++ b/include/configs/bf533-ezkit.h
@@ -138,7 +138,7 @@
 #define CFG_MAX_FLASH_BANKS    3       /* max number of memory banks */
 #define CFG_MAX_FLASH_SECT     40      /* max number of sectors on one chip */
 
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_ENV_ADDR           0x20020000
 #define        CFG_ENV_SECT_SIZE       0x10000 /* Total Size of Environment Sector */
 

diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h
index 842207f..2e71780 100644 (file)
--- a/include/configs/bf533-stamp.h
+++ b/include/configs/bf533-stamp.h
@@ -106,7 +106,7 @@
 #define CFG_ENV_OFFSET         0x4000
 #define CFG_ENV_HEADER         (CFG_ENV_OFFSET + 0x12A)        /* 0x12A is the length of LDR file header */
 #else
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_ADDR           0x20004000
 #define        CFG_ENV_OFFSET          (CFG_ENV_ADDR - CFG_FLASH_BASE)
 #endif

diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h
index 6d43839..5224eb2 100644 (file)
--- a/include/configs/bf537-stamp.h
+++ b/include/configs/bf537-stamp.h
@@ -239,7 +239,7 @@
 #define CFG_ENV_OFFSET         0x4000
 #define CFG_ENV_HEADER         (CFG_ENV_OFFSET + 0x16e) /* 0x12A is the length of LDR file header */
 #else
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_ENV_ADDR           0x20004000
 #define CFG_ENV_OFFSET         (CFG_ENV_ADDR - CFG_FLASH_BASE)
 #endif

diff --git a/include/configs/bf561-ezkit.h b/include/configs/bf561-ezkit.h
index e4a7f9d..ff10650 100644 (file)
--- a/include/configs/bf561-ezkit.h
+++ b/include/configs/bf561-ezkit.h
@@ -79,7 +79,7 @@
 #define CFG_FLASH_CFI          /* The flash is CFI compatible */
 #define CONFIG_FLASH_CFI_DRIVER        /* Use common CFI driver */
 #define CFG_FLASH_CFI_AMD_RESET
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_BASE         0x20000000
 #define CFG_MAX_FLASH_BANKS    1       /* max number of memory banks */
 #define CFG_MAX_FLASH_SECT     135     /* max number of sectors on one chip */

diff --git a/include/configs/bubinga.h b/include/configs/bubinga.h
index 4b42f8b..146d254 100644 (file)
--- a/include/configs/bubinga.h
+++ b/include/configs/bubinga.h
@@ -81,7 +81,7 @@
  *       supported for backward compatibility.
  */
 #if 1
-#define CFG_ENV_IS_IN_FLASH     1      /* use FLASH for environment vars       */
+#define CONFIG_ENV_IS_IN_FLASH     1   /* use FLASH for environment vars       */
 #else
 #define CONFIG_ENV_IS_IN_NVRAM 1       /* use NVRAM for environment vars       */
 #endif
@@ -194,7 +194,7 @@
 #define CFG_FLASH_ADDR1         0x2aaa
 #define CFG_FLASH_WORD_SIZE     unsigned char
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      0x10000 /* size of one complete sector  */
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE)
 #define        CFG_ENV_SIZE            0x4000  /* Total Size of Environment Sector     */
@@ -202,7 +202,7 @@
 /* Address and size of Redundant Environment Sector    */
 #define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE)
 #define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*-----------------------------------------------------------------------
  * NVRAM organization

diff --git a/include/configs/c2mon.h b/include/configs/c2mon.h
index 6f0d4b0..17178e9 100644 (file)
--- a/include/configs/c2mon.h
+++ b/include/configs/c2mon.h
@@ -177,7 +177,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     */
 

diff --git a/include/configs/canmb.h b/include/configs/canmb.h
index 38714cc..f0818b7 100644 (file)
--- a/include/configs/canmb.h
+++ b/include/configs/canmb.h
@@ -137,7 +137,7 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_OFFSET         (2*128*1024)
 #define CFG_ENV_SIZE           0x2000
 #define CFG_ENV_SECT_SIZE       (128*1024)

diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h
index 1891074..9ec49c1 100644 (file)
--- a/include/configs/canyonlands.h
+++ b/include/configs/canyonlands.h
@@ -112,7 +112,7 @@
  * Define here the location of the environment variables (FLASH).
  */
 #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
-#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_NAND_CS            3       /* NAND chip connected to CSx */
 #else
 #define        CONFIG_ENV_IS_IN_NAND   1       /* use NAND for environment vars  */
@@ -201,7 +201,7 @@
 #define CFG_FLASH_USE_BUFFER_WRITE 1   /* use buffered writes (20x faster)     */
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      0x20000         /* size of one complete sector  */
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE - CFG_ENV_SECT_SIZE)
 #define        CFG_ENV_SIZE            0x4000  /* Total Size of Environment Sector     */
@@ -209,7 +209,7 @@
 /* Address and size of Redundant Environment Sector    */
 #define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR - CFG_ENV_SECT_SIZE)
 #define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*-----------------------------------------------------------------------
  * NAND-FLASH related

diff --git a/include/configs/cerf250.h b/include/configs/cerf250.h
index c801f03..fb737d5 100644 (file)
--- a/include/configs/cerf250.h
+++ b/include/configs/cerf250.h
@@ -217,7 +217,7 @@
 #define CFG_FLASH_WRITE_TOUT   (25*CFG_HZ) /* Timeout for Flash Write */
 
 #define CFG_MONITOR_LEN                0x40000         /* 256 KiB */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_ADDR           (PHYS_FLASH_1 + CFG_MONITOR_LEN)
 #define CFG_ENV_SIZE           0x40000 /* Total Size of Environment Sector     */
 

diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h
index 0221dfe..5f0d3fb 100644 (file)
--- a/include/configs/cm5200.h
+++ b/include/configs/cm5200.h
@@ -264,7 +264,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           (CFG_FLASH_BASE + CFG_MONITOR_LEN)

diff --git a/include/configs/cmc_pu2.h b/include/configs/cmc_pu2.h
index bce5fcd..d9c1263 100644 (file)
--- a/include/configs/cmc_pu2.h
+++ b/include/configs/cmc_pu2.h
@@ -172,7 +172,7 @@
 #define CFG_FLASH_ERASE_TOUT           (11 * CFG_HZ)   /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT           ( 2 * CFG_HZ)   /* Timeout for Flash Write */
 
-#define CFG_ENV_IS_IN_FLASH            1
+#define CONFIG_ENV_IS_IN_FLASH         1
 #define CFG_ENV_OFFSET                 0x20000         /* after u-boot.bin */
 #define CFG_ENV_SECT_SIZE              (64 << 10)      /* sectors are 64 kB */
 #define CFG_ENV_SIZE                   (16 << 10)      /* Use only 16 kB */

diff --git a/include/configs/cmi_mpc5xx.h b/include/configs/cmi_mpc5xx.h
index ac2b7a1..ed6578a 100644 (file)
--- a/include/configs/cmi_mpc5xx.h
+++ b/include/configs/cmi_mpc5xx.h
@@ -168,9 +168,9 @@
 #define CFG_FLASH_WRITE_TOUT   600             /* Timeout for Flash Write (in ms)      */
 #define CFG_FLASH_PROTECTION    1              /* Physically section protection on     */
 
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_OFFSET         0x00020000      /* Environment starts at this adress    */
 #define        CFG_ENV_SIZE            0x00010000      /* Set whole sector as env              */
 #define        CFG_USE_PPCENV                          /* Environment embedded in sect .ppcenv */

diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
index 649b053..c908d5a 100644 (file)
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -126,12 +126,12 @@
 #ifndef CONFIG_MONITOR_IS_IN_RAM
 #define CFG_ENV_OFFSET         0x4000
 #define CFG_ENV_SECT_SIZE      0x2000
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_IS_EMBEDDED    1
 #else
 #define CFG_ENV_ADDR           0xffe04000
 #define CFG_ENV_SECT_SIZE      0x2000
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #endif
 
 

diff --git a/include/configs/cogent_mpc8260.h b/include/configs/cogent_mpc8260.h
index 84d50c7..fff35f9 100644 (file)
--- a/include/configs/cogent_mpc8260.h
+++ b/include/configs/cogent_mpc8260.h
@@ -257,7 +257,7 @@
 #define CFG_FLASH_ERASE_TOUT   120000  /* Flash Erase Timeout (in ms)  */
 #define CFG_FLASH_WRITE_TOUT   500     /* Flash Write Timeout (in ms)  */
 
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_ENV_ADDR           CFG_FLASH_BASE /* Addr of Environment Sector */
 #ifdef CONFIG_CMA302
 #define        CFG_ENV_SIZE            0x1000  /* Total Size of Environment Sector */

diff --git a/include/configs/cogent_mpc8xx.h b/include/configs/cogent_mpc8xx.h
index ce38af1..9d257d2 100644 (file)
--- a/include/configs/cogent_mpc8xx.h
+++ b/include/configs/cogent_mpc8xx.h
@@ -203,7 +203,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_ADDR           CFG_FLASH_BASE /* Addr of Environment Sector */
 #ifdef CONFIG_CMA302
 #define        CFG_ENV_SIZE            0x1000  /* Total Size of Environment Sector     */

diff --git a/include/configs/cpci5200.h b/include/configs/cpci5200.h
index 7974491..cbc5b2e 100644 (file)
--- a/include/configs/cpci5200.h
+++ b/include/configs/cpci5200.h
@@ -219,7 +219,7 @@
  * Environment settings
  */
 #if 1                          /* test-only */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_SIZE           0x20000
 #define CFG_ENV_SECT_SIZE      0x20000
 #define CONFIG_ENV_OVERWRITE   1

diff --git a/include/configs/cradle.h b/include/configs/cradle.h
index eb93a8f..ee319a7 100644 (file)
--- a/include/configs/cradle.h
+++ b/include/configs/cradle.h
@@ -152,7 +152,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_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_ADDR                           0x00020000      /* absolute address for now   */
 #define CFG_ENV_SIZE                           0x20000    /* 8K ouch, this may later be */
 

diff --git a/include/configs/csb226.h b/include/configs/csb226.h
index a807d00..c5d65e5 100644 (file)
--- a/include/configs/csb226.h
+++ b/include/configs/csb226.h
@@ -488,7 +488,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_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_ENV_ADDR            (PHYS_FLASH_1 + 0x1C000)
                                        /* Addr of Environment Sector       */
 #define CFG_ENV_SIZE            0x4000  /* Total Size of Environment Sector */

diff --git a/include/configs/csb272.h b/include/configs/csb272.h
index 880bee8..1d6a077 100644 (file)
--- a/include/configs/csb272.h
+++ b/include/configs/csb272.h
@@ -230,7 +230,7 @@
  * Environment configuration
  *
  */
-#define CFG_ENV_IS_IN_FLASH    1       /* environment is in FLASH      */
+#define CONFIG_ENV_IS_IN_FLASH 1       /* environment is in FLASH      */
 #undef CONFIG_ENV_IS_IN_NVRAM
 #undef CONFIG_ENV_IS_IN_EEPROM
 
@@ -252,7 +252,7 @@
 #define CFG_RAMSTART
 #endif
 
-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 #define CFG_ENV_IN_OWN_SECTOR  1          /* Give Environment own sector */
 #define CFG_ENV_ADDR           0xFFF00000 /* Address of Environment Sector */
 #define        CFG_ENV_SIZE            0x00001000 /* Size of Environment */

diff --git a/include/configs/csb472.h b/include/configs/csb472.h
index e343632..62bcc2f 100644 (file)
--- a/include/configs/csb472.h
+++ b/include/configs/csb472.h
@@ -229,7 +229,7 @@
  * Environment configuration
  *
  */
-#define CFG_ENV_IS_IN_FLASH    1       /* environment is in FLASH      */
+#define CONFIG_ENV_IS_IN_FLASH 1       /* environment is in FLASH      */
 #undef CONFIG_ENV_IS_IN_NVRAM
 #undef CONFIG_ENV_IS_IN_EEPROM
 
@@ -251,7 +251,7 @@
 #define CFG_RAMSTART
 #endif
 
-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
 #define CFG_ENV_IN_OWN_SECTOR  1          /* Give Environment own sector */
 #define CFG_ENV_ADDR           0xFFF00000 /* Address of Environment Sector */
 #define        CFG_ENV_SIZE            0x00001000 /* Size of Environment */

diff --git a/include/configs/csb637.h b/include/configs/csb637.h
index 6626524..c3054d3 100644 (file)
--- a/include/configs/csb637.h
+++ b/include/configs/csb637.h
@@ -198,7 +198,7 @@
 #define CFG_ENV_ADDR                   (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
 #define CFG_ENV_SIZE                   0x2000  /* 0x8000 */
 #else
-#define CFG_ENV_IS_IN_FLASH            1
+#define CONFIG_ENV_IS_IN_FLASH         1
 #define CFG_ENV_ADDR                   (PHYS_FLASH_1 + 0x20000)  /* after u-boot.bin */
 #define CFG_ENV_SIZE                   0x20000 /* sectors are 128K here */
 #endif /* CONFIG_ENV_IS_IN_DATAFLASH */

diff --git a/include/configs/davinci_dvevm.h b/include/configs/davinci_dvevm.h
index 9d79e3c..13f5e01 100644 (file)
--- a/include/configs/davinci_dvevm.h
+++ b/include/configs/davinci_dvevm.h
@@ -112,7 +112,7 @@
 /* Flash & Environment */
 /*=====================*/
 #ifdef CFG_USE_NAND
-#undef CFG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_FLASH
 #define CFG_NO_FLASH
 #define CONFIG_ENV_IS_IN_NAND          /* U-Boot env in NAND Flash  */
 #ifdef CFG_NAND_SMALLPAGE
@@ -138,7 +138,7 @@
 #undef CONFIG_SKIP_LOWLEVEL_INIT
 #undef CONFIG_SKIP_RELOCATE_UBOOT
 #endif
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 #undef CFG_NO_FLASH
 #define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI

diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h
index 4aed843..f6234ec 100644 (file)
--- a/include/configs/davinci_schmoogie.h
+++ b/include/configs/davinci_schmoogie.h
@@ -79,7 +79,7 @@
 /*=====================*/
 /* Flash & Environment */
 /*=====================*/
-#undef CFG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_FLASH
 #define CFG_NO_FLASH
 #define CONFIG_ENV_IS_IN_NAND          /* U-Boot env in NAND Flash  */
 #define CFG_ENV_SECT_SIZE      2048    /* Env sector Size */

diff --git a/include/configs/davinci_sffsdr.h b/include/configs/davinci_sffsdr.h
index c46a430..b4f4b11 100644 (file)
--- a/include/configs/davinci_sffsdr.h
+++ b/include/configs/davinci_sffsdr.h
@@ -75,7 +75,7 @@
 #define CONFIG_NET_RETRY_COUNT 10
 #define CONFIG_OVERWRITE_ETHADDR_ONCE
 /* Flash & Environment */
-#undef CFG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_FLASH
 #define CFG_NO_FLASH
 #define CONFIG_ENV_IS_IN_NAND          /* U-Boot env in NAND Flash  */
 #define CFG_ENV_SECT_SIZE      2048    /* Env sector Size */

diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h
index 9c54f08..cd781ed 100644 (file)
--- a/include/configs/davinci_sonata.h
+++ b/include/configs/davinci_sonata.h
@@ -112,7 +112,7 @@
 /* Flash & Environment */
 /*=====================*/
 #ifdef CFG_USE_NAND
-#undef CFG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_FLASH
 #define CFG_NO_FLASH
 #define CONFIG_ENV_IS_IN_NAND          /* U-Boot env in NAND Flash  */
 #define CFG_ENV_SECT_SIZE      512     /* Env sector Size */
@@ -133,7 +133,7 @@
 #undef CONFIG_SKIP_LOWLEVEL_INIT
 #undef CONFIG_SKIP_RELOCATE_UBOOT
 #endif
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 #undef CFG_NO_FLASH
 #define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI

diff --git a/include/configs/dnp1110.h b/include/configs/dnp1110.h
index e7873e9..4adfeed 100644 (file)
--- a/include/configs/dnp1110.h
+++ b/include/configs/dnp1110.h
@@ -155,7 +155,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_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_ENV_ADDR                   (PHYS_FLASH_1 + 0xF80000)       /* Addr of Environment Sector   */
 #define CFG_ENV_SIZE                   0x20000                                         /* Total Size of Environment Sector     */
 

diff --git a/include/configs/eXalion.h b/include/configs/eXalion.h
index 6ba0d3f..deb20aa 100644 (file)
--- a/include/configs/eXalion.h
+++ b/include/configs/eXalion.h
@@ -135,7 +135,7 @@
 #error Specific type of MPC824x must be defined (i.e. CONFIG_MPC8240)
 #endif
 
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_SECT_SIZE      0x20000 /* Size of one Flash sector */
 #define CFG_ENV_SIZE           CFG_ENV_SECT_SIZE       /* Use one Flash sector for enviroment  */
 #define CFG_ENV_ADDR           0xFFFC0000

diff --git a/include/configs/ebony.h b/include/configs/ebony.h
index 21c0866..2a3595a 100644 (file)
--- a/include/configs/ebony.h
+++ b/include/configs/ebony.h
@@ -49,7 +49,7 @@
  *       supported for backward compatibility.
  */
 #if 1
-#define CFG_ENV_IS_IN_FLASH     1      /* use FLASH for environment vars       */
+#define CONFIG_ENV_IS_IN_FLASH     1   /* use FLASH for environment vars       */
 #else
 #define CONFIG_ENV_IS_IN_NVRAM 1       /* use NVRAM for environment vars       */
 #endif
@@ -118,7 +118,7 @@
 #define CFG_FLASH_ADDR1         0x2aaa
 #define CFG_FLASH_WORD_SIZE     unsigned char
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      0x10000 /* size of one complete sector          */
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE)
 #define        CFG_ENV_SIZE            0x4000  /* Total Size of Environment Sector     */
@@ -126,7 +126,7 @@
 /* Address and size of Redundant Environment Sector    */
 #define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE)
 #define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*-----------------------------------------------------------------------
  * DDR SDRAM

diff --git a/include/configs/ep7312.h b/include/configs/ep7312.h
index 5433082..367e667 100644 (file)
--- a/include/configs/ep7312.h
+++ b/include/configs/ep7312.h
@@ -149,7 +149,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_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_ENV_ADDR           (PHYS_FLASH_1 + 0x20000)        /* Addr of Environment Sector   */
 #define CFG_ENV_SIZE           0x20000 /* Total Size of Environment Sector     */
 

diff --git a/include/configs/ep8248.h b/include/configs/ep8248.h
index ccc0d5d..54484ad 100644 (file)
--- a/include/configs/ep8248.h
+++ b/include/configs/ep8248.h
@@ -214,12 +214,12 @@
 
 #define CFG_MONITOR_LEN                (256 << 10)     /* Reserve 256KB for Monitor */
 
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      0x20000
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
 
 #define CFG_DEFAULT_IMMR       0x00010000
 

diff --git a/include/configs/ep8260.h b/include/configs/ep8260.h
index 094a14c..0911f8c 100644 (file)
--- a/include/configs/ep8260.h
+++ b/include/configs/ep8260.h
@@ -474,7 +474,7 @@
 #endif
 
 #ifndef CFG_RAMBOOT
-#  define CFG_ENV_IS_IN_FLASH  1
+#  define CONFIG_ENV_IS_IN_FLASH  1
 
 #  ifdef CFG_ENV_IN_OWN_SECT
 #    define CFG_ENV_ADDR       (CFG_MONITOR_BASE + 0x40000)

diff --git a/include/configs/ep82xxm.h b/include/configs/ep82xxm.h
index 4de879a..17c8496 100644 (file)
--- a/include/configs/ep82xxm.h
+++ b/include/configs/ep82xxm.h
@@ -192,7 +192,7 @@
  * Note: DENX encourages to use redundant environment in FLASH.
  */
 #if 1
-#define CFG_ENV_IS_IN_FLASH     1      /* use FLASH for environment vars       */
+#define CONFIG_ENV_IS_IN_FLASH     1   /* use FLASH for environment vars       */
 #else
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars      */
 #endif
@@ -207,10 +207,10 @@
 #define CFG_MAX_FLASH_SECT     512     /* max num of sects on one chip */
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector in flinfo */
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      0x20000
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*-----------------------------------------------------------------------
  * I2C

diff --git a/include/configs/evb4510.h b/include/configs/evb4510.h
index f2ed0df..35a020b 100644 (file)
--- a/include/configs/evb4510.h
+++ b/include/configs/evb4510.h
@@ -171,7 +171,7 @@
 #define CFG_FLASH_WRITE_TOUT   (2*CFG_HZ) /* Timeout for Flash Write */
 
 /* environment settings */
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 #undef CONFIG_ENV_IS_NOWHERE
 
 #define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x20000) /* environment start address */

diff --git a/include/configs/favr-32-ezkit.h b/include/configs/favr-32-ezkit.h
index 35d289f..ce19b1f 100644 (file)
--- a/include/configs/favr-32-ezkit.h
+++ b/include/configs/favr-32-ezkit.h
@@ -174,7 +174,7 @@
 #define CFG_INTRAM_SIZE                        INTERNAL_SRAM_SIZE
 #define CFG_SDRAM_BASE                 EBI_SDRAM_BASE
 
-#define CFG_ENV_IS_IN_FLASH            1
+#define CONFIG_ENV_IS_IN_FLASH         1
 #define CFG_ENV_SIZE                   65536
 #define CFG_ENV_ADDR                   (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE)
 

diff --git a/include/configs/gcplus.h b/include/configs/gcplus.h
index 1d9c05b..31e99f3 100644 (file)
--- a/include/configs/gcplus.h
+++ b/include/configs/gcplus.h
@@ -178,7 +178,7 @@
 #define CFG_FLASH_BANKS_LIST    { CFG_FLASH_BASE }
 #endif
 
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_ENV_ADDR           (PHYS_FLASH_1 + PHYS_FLASH_SECT_SIZE)   /* Addr of Environment Sector   */
 #define CFG_ENV_SIZE           PHYS_FLASH_SECT_SIZE
 

diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h
index 7fee1d2..e363d9a 100644 (file)
--- a/include/configs/gr_cpci_ax2000.h
+++ b/include/configs/gr_cpci_ax2000.h
@@ -219,7 +219,7 @@
  * Environment settings
  */
 /*#define CONFIG_ENV_IS_NOWHERE 1*/
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 /* CFG_ENV_ADDR need to be at sector boundary */
 #define CFG_ENV_SIZE           0x8000
 #define CFG_ENV_SECT_SIZE      0x20000

diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h
index 776fe40..7f83674 100644 (file)
--- a/include/configs/gr_ep2s60.h
+++ b/include/configs/gr_ep2s60.h
@@ -207,7 +207,7 @@
  * Environment settings
  */
 /*#define CONFIG_ENV_IS_NOWHERE 1*/
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 /* CFG_ENV_ADDR need to be at sector boundary */
 #define CFG_ENV_SIZE           0x8000
 #define CFG_ENV_SECT_SIZE      0x20000

diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h
index f0f770c..a6e34d0 100644 (file)
--- a/include/configs/gr_xc3s_1500.h
+++ b/include/configs/gr_xc3s_1500.h
@@ -183,7 +183,7 @@
  * Environment settings
  */
 /*#define CONFIG_ENV_IS_NOWHERE 1*/
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 /* CFG_ENV_ADDR need to be at sector boundary */
 #define CFG_ENV_SIZE           0x8000
 #define CFG_ENV_SECT_SIZE      0x20000

diff --git a/include/configs/grsim.h b/include/configs/grsim.h
index a23ac9c..2a8226a 100644 (file)
--- a/include/configs/grsim.h
+++ b/include/configs/grsim.h
@@ -210,7 +210,7 @@
  * Environment settings
  */
 #define CONFIG_ENV_IS_NOWHERE 1
-/*#define CFG_ENV_IS_IN_FLASH*/
+/*#define CONFIG_ENV_IS_IN_FLASH*/
 /*#define CFG_ENV_SIZE         0x8000*/
 #define CFG_ENV_SECT_SIZE      0x40000
 #define CONFIG_ENV_OVERWRITE   1

diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h
index c45b258..3cfeb20 100644 (file)
--- a/include/configs/grsim_leon2.h
+++ b/include/configs/grsim_leon2.h
@@ -207,7 +207,7 @@
  * Environment settings
  */
 #define CONFIG_ENV_IS_NOWHERE 1
-/*#define CFG_ENV_IS_IN_FLASH*/
+/*#define CONFIG_ENV_IS_IN_FLASH*/
 /*#define CFG_ENV_SIZE         0x8000*/
 #define CFG_ENV_SECT_SIZE      0x40000
 #define CONFIG_ENV_OVERWRITE   1

diff --git a/include/configs/gw8260.h b/include/configs/gw8260.h
index d918782..19641b7 100644 (file)
--- a/include/configs/gw8260.h
+++ b/include/configs/gw8260.h
@@ -463,7 +463,7 @@
 #define CFG_FLASH_ERASE_TOUT  8000 /* Timeout for Flash Erase (in ms)   */
 #define CFG_FLASH_WRITE_TOUT  1    /* Timeout for Flash Write (in ms)   */
 
-#define CFG_ENV_IS_IN_FLASH   1
+#define CONFIG_ENV_IS_IN_FLASH   1
 
 #ifdef CFG_ENV_IN_OWN_SECT
 #  define CFG_ENV_ADDR        (CFG_MONITOR_BASE +  (256 * 1024))

diff --git a/include/configs/hammerhead.h b/include/configs/hammerhead.h
index c44d62e..68bd4c8 100644 (file)
--- a/include/configs/hammerhead.h
+++ b/include/configs/hammerhead.h
@@ -143,7 +143,7 @@
 
 #define CFG_SDRAM_BASE                 0x10000000
 
-#define CFG_ENV_IS_IN_FLASH            1
+#define CONFIG_ENV_IS_IN_FLASH         1
 #define CFG_ENV_SIZE                   65536
 #define CFG_ENV_ADDR                   (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE)
 

diff --git a/include/configs/hcu4.h b/include/configs/hcu4.h
index 7f262cb..b98883e 100644 (file)
--- a/include/configs/hcu4.h
+++ b/include/configs/hcu4.h
@@ -122,7 +122,7 @@
  *----------------------------------------------------------------------*/
 
 #undef CONFIG_ENV_IS_IN_NVRAM
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 #undef  CONFIG_ENV_IS_NOWHERE
 
 #ifdef  CONFIG_ENV_IS_IN_EEPROM
@@ -132,7 +132,7 @@
 #define CFG_ENV_SIZE   (PROM_SIZE-CFG_ENV_OFFSET)
 #endif
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 /* Put the environment in Flash */
 #define CFG_ENV_SECT_SIZE      0x10000 /* size of one complete sector  */
 #define CFG_ENV_ADDR           ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE)

diff --git a/include/configs/hcu5.h b/include/configs/hcu5.h
index af0f7f4..91c5f22 100644 (file)
--- a/include/configs/hcu5.h
+++ b/include/configs/hcu5.h
@@ -107,7 +107,7 @@
  *----------------------------------------------------------------------*/
 
 #undef CONFIG_ENV_IS_IN_NVRAM
-#define  CFG_ENV_IS_IN_FLASH
+#define  CONFIG_ENV_IS_IN_FLASH
 #undef CONFIG_ENV_IS_IN_EEPROM
 #undef  CONFIG_ENV_IS_NOWHERE
 
@@ -119,7 +119,7 @@
 #define CFG_ENV_SIZE   (PROM_SIZE-CFG_ENV_OFFSET)
 #endif
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 /* Put the environment in Flash */
 #define CFG_ENV_SECT_SIZE      0x10000 /* size of one complete sector  */
 #define CFG_ENV_ADDR           ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE)

diff --git a/include/configs/hermes.h b/include/configs/hermes.h
index 48b23bd..1ecb4b5 100644 (file)
--- a/include/configs/hermes.h
+++ b/include/configs/hermes.h
@@ -155,7 +155,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          0x4000  /*   Offset   of Environment Sector     */
 #define        CFG_ENV_SIZE            0x2000  /* Total Size of Environment Sector     */
 /*-----------------------------------------------------------------------

diff --git a/include/configs/hmi1001.h b/include/configs/hmi1001.h
index 205f5cc..4d55761 100644 (file)
--- a/include/configs/hmi1001.h
+++ b/include/configs/hmi1001.h
@@ -163,7 +163,7 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_SIZE           0x4000
 #define CFG_ENV_SECT_SIZE      0x20000
 #define CFG_ENV_OFFSET_REDUND   (CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE)

diff --git a/include/configs/hymod.h b/include/configs/hymod.h
index 264192f..fd0bab1 100644 (file)
--- a/include/configs/hymod.h
+++ b/include/configs/hymod.h
@@ -403,7 +403,7 @@
 #define CFG_FLASH_ERASE_TOUT   120000  /* Flash Erase Timeout (in ms)  */
 #define CFG_FLASH_WRITE_TOUT   500     /* Flash Write Timeout (in ms)  */
 
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define        CFG_ENV_SIZE            0x40000 /* Total Size of Environment Sector */
 #define CFG_ENV_SECT_SIZE      0x40000 /* see README - env sect real size */
 #define        CFG_ENV_ADDR    (CFG_FLASH_BASE+CFG_MONITOR_LEN-CFG_ENV_SECT_SIZE)

diff --git a/include/configs/idmr.h b/include/configs/idmr.h
index 7c3ebad..43453b7 100644 (file)
--- a/include/configs/idmr.h
+++ b/include/configs/idmr.h
@@ -118,11 +118,11 @@
 #define CFG_ENV_ADDR           0xff820000
 #define CFG_ENV_SECT_SIZE      0x10000
 #define CFG_ENV_SIZE           0x2000
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 #else /* CONFIG_MONITOR_IS_IN_RAM */
 #define CFG_ENV_OFFSET         0x4000
 #define CFG_ENV_SECT_SIZE      0x2000
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 #endif /* !CONFIG_MONITOR_IS_IN_RAM */
 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */

diff --git a/include/configs/impa7.h b/include/configs/impa7.h
index e9704fc..7eb6921 100644 (file)
--- a/include/configs/impa7.h
+++ b/include/configs/impa7.h
@@ -151,7 +151,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_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_ENV_ADDR           (PHYS_FLASH_1 + 0x1C000)        /* Addr of Environment Sector   */
 #define CFG_ENV_SIZE           0x4000  /* Total Size of Environment Sector     */
 

diff --git a/include/configs/imx31_litekit.h b/include/configs/imx31_litekit.h
index c476333..1660b05 100644 (file)
--- a/include/configs/imx31_litekit.h
+++ b/include/configs/imx31_litekit.h
@@ -150,7 +150,7 @@
 #define CFG_MONITOR_BASE       CFG_FLASH_BASE /* Monitor at beginning of flash */
 
 #define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x001f0000)
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_ENV_SECT_SIZE      (64 * 1024)
 #define CFG_ENV_SIZE           (64 * 1024)
 

diff --git a/include/configs/incaip.h b/include/configs/incaip.h
index 2e4ee66..3d98974 100644 (file)
--- a/include/configs/incaip.h
+++ b/include/configs/incaip.h
@@ -150,7 +150,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_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 
 /* Address and size of Primary Environment Sector      */
 #define CFG_ENV_ADDR           0xB0030000

diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h
index efa2802..528f276 100644 (file)
--- a/include/configs/inka4x0.h
+++ b/include/configs/inka4x0.h
@@ -171,7 +171,7 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x4000)
 #define CFG_ENV_SIZE           0x2000
 #define CFG_ENV_SECT_SIZE      0x2000

diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h
index 5340f7c..d66ec3a 100644 (file)
--- a/include/configs/integratorcp.h
+++ b/include/configs/integratorcp.h
@@ -163,7 +163,7 @@ SIB at Block62 End Block62 address 0x24f80000
 #define CFG_FLASH_WRITE_TOUT   (2*CFG_HZ)      /* Timeout for Flash Write */
 
 #define CFG_MONITOR_LEN                0x00100000
-#define CFG_ENV_IS_IN_FLASH    (1)
+#define CONFIG_ENV_IS_IN_FLASH 1
 
 /*
  * Move up the U-Boot & monitor area if more flash is fitted.

diff --git a/include/configs/ixdp425.h b/include/configs/ixdp425.h
index 6b73abe..6559429 100644 (file)
--- a/include/configs/ixdp425.h
+++ b/include/configs/ixdp425.h
@@ -182,7 +182,7 @@
 
 #define CFG_FLASH_CFI                          /* The flash is CFI compatible  */
 #define CONFIG_FLASH_CFI_DRIVER                        /* Use common CFI driver        */
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 
 #define CFG_FLASH_BANKS_LIST   { PHYS_FLASH_1 }
 

diff --git a/include/configs/ixdpg425.h b/include/configs/ixdpg425.h
index d4e4871..484c2d9 100644 (file)
--- a/include/configs/ixdpg425.h
+++ b/include/configs/ixdpg425.h
@@ -211,7 +211,7 @@
 
 #define CFG_FLASH_CFI                          /* The flash is CFI compatible  */
 #define CONFIG_FLASH_CFI_DRIVER                        /* Use common CFI driver        */
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 
 #define CFG_FLASH_USE_BUFFER_WRITE 1   /* use buffered writes (20x faster)     */
 #define CFG_FLASH_PROTECTION   1       /* hardware flash protection            */

diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h
index af88a3f..ce90d7f 100644 (file)
--- a/include/configs/jupiter.h
+++ b/include/configs/jupiter.h
@@ -201,7 +201,7 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_SIZE           0x20000
 #define CFG_ENV_SECT_SIZE      0x20000
 #define CONFIG_ENV_OVERWRITE   1

diff --git a/include/configs/katmai.h b/include/configs/katmai.h
index 5dcca75..1876279 100644 (file)
--- a/include/configs/katmai.h
+++ b/include/configs/katmai.h
@@ -170,7 +170,7 @@
 /*-----------------------------------------------------------------------
  * Environment
  *----------------------------------------------------------------------*/
-#define        CFG_ENV_IS_IN_FLASH     1       /* Environment uses flash       */
+#define        CONFIG_ENV_IS_IN_FLASH  1       /* Environment uses flash       */
 
 /*
  * Default environment variables

diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h
index 01d861b..fec22d8 100644 (file)
--- a/include/configs/kilauea.h
+++ b/include/configs/kilauea.h
@@ -121,7 +121,7 @@
  * Environment
  *----------------------------------------------------------------------*/
 #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
-#define CFG_ENV_IS_IN_FLASH     1      /* use FLASH for environment vars       */
+#define CONFIG_ENV_IS_IN_FLASH     1   /* use FLASH for environment vars       */
 #else
 #define CONFIG_ENV_IS_IN_NAND  1       /* use NAND for environment vars        */
 #define CFG_ENV_IS_EMBEDDED    1       /* use embedded environment */
@@ -143,7 +143,7 @@
 #define CFG_FLASH_USE_BUFFER_WRITE 1   /* use buffered writes (20x faster)     */
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      0x20000 /* size of one complete sector  */
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE)
 #define        CFG_ENV_SIZE            0x4000  /* Total Size of Environment Sector     */
@@ -151,7 +151,7 @@
 /* Address and size of Redundant Environment Sector    */
 #define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE)
 #define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*
  * IPL (Initial Program Loader, integrated inside CPU)

diff --git a/include/configs/korat.h b/include/configs/korat.h
index a887446..b6984da 100644 (file)
--- a/include/configs/korat.h
+++ b/include/configs/korat.h
@@ -104,7 +104,7 @@
 /*
  * Environment
  */
-#define CFG_ENV_IS_IN_FLASH    1       /* use FLASH for environ vars   */
+#define CONFIG_ENV_IS_IN_FLASH 1       /* use FLASH for environ vars   */
 
 /*
  * FLASH related

diff --git a/include/configs/lart.h b/include/configs/lart.h
index 4570398..f38e5da 100644 (file)
--- a/include/configs/lart.h
+++ b/include/configs/lart.h
@@ -152,7 +152,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_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_ENV_ADDR           (PHYS_FLASH_1 + 0x1C000)        /* Addr of Environment Sector   */
 #define CFG_ENV_SIZE           0x4000  /* Total Size of Environment Sector     */
 

diff --git a/include/configs/linkstation.h b/include/configs/linkstation.h
index e5a0fb9..01ae317 100644 (file)
--- a/include/configs/linkstation.h
+++ b/include/configs/linkstation.h
@@ -449,7 +449,7 @@
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 #define CFG_FLASH_QUIET_TEST   1       /* don't warn upon unknown flash        */
 
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 /*
  * The original LinkStation flash organisation uses
  * 448 kB (0xFFF00000 - 0xFFF6FFFF) for the boot loader

diff --git a/include/configs/logodl.h b/include/configs/logodl.h
index 047b4a4..5e51d81 100644 (file)
--- a/include/configs/logodl.h
+++ b/include/configs/logodl.h
@@ -288,7 +288,7 @@
 #define CFG_FLASH_WRITE_TOUT    (2*CFG_HZ) /* Timeout for Flash Write */
 
 /* FIXME */
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_ENV_ADDR            (PHYS_FLASH_1 + 0x1C000)        /* Addr of Environment Sector   */
 #define CFG_ENV_SIZE            0x4000  /* Total Size of Environment Sector     */
 

diff --git a/include/configs/lpc2292sodimm.h b/include/configs/lpc2292sodimm.h
index e3fef5e..2f2a3e8 100644 (file)
--- a/include/configs/lpc2292sodimm.h
+++ b/include/configs/lpc2292sodimm.h
@@ -150,7 +150,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_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_ENV_ADDR           (0x0 + 0x3C000) /* Addr of Environment Sector   */
 #define CFG_ENV_SIZE           0x2000 /* Total Size of Environment Sector      */
 

diff --git a/include/configs/lpd7a400.h b/include/configs/lpd7a400.h
index 0414889..ae9503f 100644 (file)
--- a/include/configs/lpd7a400.h
+++ b/include/configs/lpd7a400.h
@@ -110,7 +110,7 @@
 #define CFG_MONITOR_BASE       CFG_FLASH_BASE
 #define CFG_MONITOR_LEN                (256<<10)
 
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 
 /* Address and size of Primary Environment Sector      */
 #define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0xFC0000)

diff --git a/include/configs/lpd7a404.h b/include/configs/lpd7a404.h
index 11ede96..7ea4342 100644 (file)
--- a/include/configs/lpd7a404.h
+++ b/include/configs/lpd7a404.h
@@ -110,7 +110,7 @@
 #define CFG_MONITOR_BASE       CFG_FLASH_BASE
 #define CFG_MONITOR_LEN                (256<<10)
 
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 
 /* Address and size of Primary Environment Sector      */
 #define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0xFC0000)

diff --git a/include/configs/luan.h b/include/configs/luan.h
index 805cc59..9aef77c 100644 (file)
--- a/include/configs/luan.h
+++ b/include/configs/luan.h
@@ -97,7 +97,7 @@
  * Define here the location of the environment variables (FLASH or EEPROM).
  * Note: DENX encourages to use redundant environment in FLASH.
  */
-#define CFG_ENV_IS_IN_FLASH     1      /* use FLASH for environment vars       */
+#define CONFIG_ENV_IS_IN_FLASH     1   /* use FLASH for environment vars       */
 
 /*-----------------------------------------------------------------------
  * FLASH related
@@ -114,7 +114,7 @@
 #define CFG_FLASH_ADDR1         0x2aa
 #define CFG_FLASH_WORD_SIZE     unsigned char
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      0x10000 /* size of one complete sector  */
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE)
 #define CFG_ENV_SIZE           0x2000  /* Total Size of Environment Sector     */
@@ -122,7 +122,7 @@
 /* Address and size of Redundant Environment Sector    */
 #define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE)
 #define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*-----------------------------------------------------------------------
  * DDR SDRAM

diff --git a/include/configs/lubbock.h b/include/configs/lubbock.h
index 82fe19c..7e0c4a2 100644 (file)
--- a/include/configs/lubbock.h
+++ b/include/configs/lubbock.h
@@ -231,7 +231,7 @@
  * second sector, not an environment.  You have been warned!
  */
 #define        CFG_MONITOR_LEN         PHYS_FLASH_SECT_SIZE
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_ADDR           (PHYS_FLASH_1 + PHYS_FLASH_SECT_SIZE)
 #define CFG_ENV_SECT_SIZE      PHYS_FLASH_SECT_SIZE
 #define CFG_ENV_SIZE           (PHYS_FLASH_SECT_SIZE / 16)

diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h
index 87abfba..73b988f 100644 (file)
--- a/include/configs/lwmon.h
+++ b/include/configs/lwmon.h
@@ -315,7 +315,7 @@
 #define CFG_FLASH_BUFFER_SIZE  (2*32)
 
 /* Put environment in flash which is much faster to boot than using the EEPROM */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_ADDR       0x40040000  /* Address    of Environment Sector     */
 #define CFG_ENV_SIZE           0x2000  /* Total Size of Environment            */
 #define CFG_ENV_SECT_SIZE      0x40000 /* we have BIG sectors only :-(         */

diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
index 3d135c4..8413615 100644 (file)
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -118,7 +118,7 @@
 /*-----------------------------------------------------------------------
  * Environment
  *----------------------------------------------------------------------*/
-#define CFG_ENV_IS_IN_FLASH     1      /* use FLASH for environment vars       */
+#define CONFIG_ENV_IS_IN_FLASH     1   /* use FLASH for environment vars       */
 
 /*-----------------------------------------------------------------------
  * FLASH related

diff --git a/include/configs/m501sk.h b/include/configs/m501sk.h
index 7024a83..bbc2b4e 100644 (file)
--- a/include/configs/m501sk.h
+++ b/include/configs/m501sk.h
@@ -159,7 +159,7 @@
 #define CFG_ENV_ADDR           (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
 #define CFG_ENV_SIZE           0x2000
 #else
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_ADDR           (PHYS_FLASH_1 + 0x00020000)
 #define CFG_ENV_SIZE           2048
 #endif

diff --git a/include/configs/makalu.h b/include/configs/makalu.h
index cfc6fdc..97715a3 100644 (file)
--- a/include/configs/makalu.h
+++ b/include/configs/makalu.h
@@ -119,7 +119,7 @@
 /*-----------------------------------------------------------------------
  * Environment
  *----------------------------------------------------------------------*/
-#define CFG_ENV_IS_IN_FLASH     1      /* use FLASH for environment vars       */
+#define CONFIG_ENV_IS_IN_FLASH     1   /* use FLASH for environment vars       */
 
 /*-----------------------------------------------------------------------
  * FLASH related
@@ -137,7 +137,7 @@
 #define CFG_FLASH_USE_BUFFER_WRITE 1   /* use buffered writes (20x faster)     */
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      0x20000 /* size of one complete sector  */
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE)
 #define        CFG_ENV_SIZE            0x4000  /* Total Size of Environment Sector     */
@@ -145,7 +145,7 @@
 /* Address and size of Redundant Environment Sector    */
 #define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE)
 #define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*-----------------------------------------------------------------------
  * DDR SDRAM

diff --git a/include/configs/mcc200.h b/include/configs/mcc200.h
index f512847..4e8c0d1 100644 (file)
--- a/include/configs/mcc200.h
+++ b/include/configs/mcc200.h
@@ -227,7 +227,7 @@
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 #define CFG_FLASH_QUIET_TEST   1       /* don't warn upon unknown flash        */
 
-#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_SECT_SIZE      0x40000 /* size of one complete sector  */
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE + CFG_MONITOR_LEN)

diff --git a/include/configs/mcu25.h b/include/configs/mcu25.h
index 35ecc65..67c8485 100644 (file)
--- a/include/configs/mcu25.h
+++ b/include/configs/mcu25.h
@@ -122,7 +122,7 @@
  *----------------------------------------------------------------------*/
 
 #undef CONFIG_ENV_IS_IN_NVRAM
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 #undef  CONFIG_ENV_IS_NOWHERE
 
 #ifdef  CONFIG_ENV_IS_IN_EEPROM
@@ -132,7 +132,7 @@
 #define CFG_ENV_SIZE   (PROM_SIZE-CFG_ENV_OFFSET)
 #endif
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 /* Put the environment in Flash */
 #define CFG_ENV_SECT_SIZE      0x10000 /* size of one complete sector */
 #define CFG_ENV_ADDR           ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE)

diff --git a/include/configs/mecp5200.h b/include/configs/mecp5200.h
index 1c2f1a2..e0bd6e3 100644 (file)
--- a/include/configs/mecp5200.h
+++ b/include/configs/mecp5200.h
@@ -191,7 +191,7 @@
  * Environment settings
  */
 #if 1 /* test-only */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_SIZE           0x10000
 #define CFG_ENV_SECT_SIZE      0x10000
 #define CONFIG_ENV_OVERWRITE   1

diff --git a/include/configs/mgcoge.h b/include/configs/mgcoge.h
index 5fe3075..015e4dc 100644 (file)
--- a/include/configs/mgcoge.h
+++ b/include/configs/mgcoge.h
@@ -169,12 +169,12 @@
 
 #define CFG_MONITOR_LEN                (256 << 10)     /* Reserve 256KB for Monitor */
 
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      0x20000
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
 
 #define CFG_IMMR               0xF0000000
 

diff --git a/include/configs/mgsuvd.h b/include/configs/mgsuvd.h
index 6f1c640..7fd5a47 100644 (file)
--- a/include/configs/mgsuvd.h
+++ b/include/configs/mgsuvd.h
@@ -196,7 +196,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         0x40000 /*   Offset   of Environment Sector     */
 #define CFG_ENV_SIZE           0x08000 /* Total Size of Environment Sector     */
 #define CFG_ENV_SECT_SIZE      0x40000 /* Total Size of Environment Sector     */

diff --git a/include/configs/mimc200.h b/include/configs/mimc200.h
index 57f64ba..69e99a6 100644 (file)
--- a/include/configs/mimc200.h
+++ b/include/configs/mimc200.h
@@ -149,7 +149,7 @@
 #define CFG_FRAM_BASE                  0x08000000
 #define CFG_FRAM_SIZE                  0x20000
 
-#define CFG_ENV_IS_IN_FLASH            1
+#define CONFIG_ENV_IS_IN_FLASH         1
 #define CFG_ENV_SIZE                   65536
 #define CFG_ENV_ADDR                   (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE)
 

diff --git a/include/configs/ml401.h b/include/configs/ml401.h
index c626702..75fcb6a 100644 (file)
--- a/include/configs/ml401.h
+++ b/include/configs/ml401.h
@@ -166,7 +166,7 @@
                #define CFG_ENV_ADDR            (CFG_MONITOR_BASE - CFG_ENV_SIZE)
 
        #else   /* !RAMENV */
-               #define CFG_ENV_IS_IN_FLASH     1
+               #define CONFIG_ENV_IS_IN_FLASH  1
                #define CFG_ENV_SECT_SIZE       0x40000 /* 256K(one sector) for env */
                #define CFG_ENV_ADDR            (CFG_FLASH_BASE + (2 * CFG_ENV_SECT_SIZE))
                #define CFG_ENV_SIZE            0x40000

diff --git a/include/configs/ml507.h b/include/configs/ml507.h
index 37d93bb..e34e43a 100644 (file)
--- a/include/configs/ml507.h
+++ b/include/configs/ml507.h
@@ -27,7 +27,7 @@
 #define CFG_SDRAM_SIZE_MB      256
 
 /*Env*/
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define        CFG_ENV_SIZE            0x20000
 #define        CFG_ENV_SECT_SIZE       0x20000
 #define CFG_ENV_OFFSET         0x340000

diff --git a/include/configs/modnet50.h b/include/configs/modnet50.h
index 84540f5..7cfd4fa 100644 (file)
--- a/include/configs/modnet50.h
+++ b/include/configs/modnet50.h
@@ -170,7 +170,7 @@
 #define CFG_FLASH_WRITE_TOUT   (2*CFG_HZ) /* Timeout for Flash Write */
 
 /* environment settings */
-#define        CFG_ENV_IS_IN_FLASH
+#define        CONFIG_ENV_IS_IN_FLASH
 #undef CONFIG_ENV_IS_NOWHERE
 
 #define CFG_ENV_ADDR           0x1001C000 /* environment start address */

diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h
index f2a35ee..8692ab8 100644 (file)
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -353,7 +353,7 @@ extern void __led_set(led_id_t id, int state);
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 /* This has to be a multiple of the Flash sector size */
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
 #define CFG_ENV_SIZE           0x1000

diff --git a/include/configs/mp2usb.h b/include/configs/mp2usb.h
index 87264fb..f0b5c9f 100644 (file)
--- a/include/configs/mp2usb.h
+++ b/include/configs/mp2usb.h
@@ -199,7 +199,7 @@
 #define CFG_FLASH_UNLOCK_TOUT          (10*CFG_HZ)     /* Timeout for Flash Clear Lock Bits */
 #define CFG_FLASH_PROTECTION                           /* "Real" (hardware) sectors protection */
 
-#define CFG_ENV_IS_IN_FLASH            1
+#define CONFIG_ENV_IS_IN_FLASH         1
 #define CFG_ENV_OFFSET                 0x20000         /* after u-boot.bin */
 #define CFG_ENV_ADDR                   (CFG_FLASH_BASE+CFG_ENV_OFFSET)
 #define CFG_ENV_SIZE                   0x20000

diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h
index 3df6e39..6e0721e 100644 (file)
--- a/include/configs/mpr2.h
+++ b/include/configs/mpr2.h
@@ -73,7 +73,7 @@
 #define CFG_MAX_FLASH_SECT     256
 #define CFG_MAX_FLASH_BANKS    1
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      (128 * 1024)
 #define CFG_ENV_SIZE           CFG_ENV_SECT_SIZE
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE + CFG_MONITOR_LEN)

diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h
index 1c3d277..ee19b02 100644 (file)
--- a/include/configs/ms7720se.h
+++ b/include/configs/ms7720se.h
@@ -92,7 +92,7 @@
 #define CFG_MAX_FLASH_BANKS    1
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
 
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      (64 * 1024)
 #define CFG_ENV_SIZE           CFG_ENV_SECT_SIZE
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE + CFG_MONITOR_LEN)

diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h
index 3809e71..55f264c 100644 (file)
--- a/include/configs/ms7722se.h
+++ b/include/configs/ms7722se.h
@@ -114,7 +114,7 @@
 
 #undef  CFG_DIRECT_FLASH_TFTP
 
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_OVERWRITE   1
 #define CFG_ENV_SECT_SIZE      (8 * 1024)
 #define CFG_ENV_SIZE           (CFG_ENV_SECT_SIZE)

diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h
index 4356a67..c4a1f54 100644 (file)
--- a/include/configs/ms7750se.h
+++ b/include/configs/ms7750se.h
@@ -92,7 +92,7 @@
 #define CFG_FLASH_EMPTY_INFO                           /* print 'E' for empty sector on flinfo */
 
 
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      0x20000
 #define CFG_ENV_SIZE           (CFG_ENV_SECT_SIZE)
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE + CFG_MONITOR_LEN)

diff --git a/include/configs/muas3001.h b/include/configs/muas3001.h
index a13648b..ded0f4c 100644 (file)
--- a/include/configs/muas3001.h
+++ b/include/configs/muas3001.h
@@ -227,12 +227,12 @@
 
 #define CFG_MONITOR_LEN                (256 << 10)     /* Reserve 256KB for Monitor */
 
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      0x10000
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*
  * I2C Bus

diff --git a/include/configs/mucmc52.h b/include/configs/mucmc52.h
index 18200ec..d3546c7 100644 (file)
--- a/include/configs/mucmc52.h
+++ b/include/configs/mucmc52.h
@@ -174,7 +174,7 @@
 /*
  * Environment settings
  */
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define        CFG_ENV_SIZE            0x4000
 #define        CFG_ENV_SECT_SIZE       0x20000
 #define        CFG_ENV_OFFSET_REDUND   (CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE)

diff --git a/include/configs/munices.h b/include/configs/munices.h
index cea2834..6d39580 100644 (file)
--- a/include/configs/munices.h
+++ b/include/configs/munices.h
@@ -152,7 +152,7 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_OFFSET         0x40000
 #define CFG_ENV_ADDR           (TEXT_BASE + CFG_ENV_OFFSET)
 #define CFG_ENV_SECT_SIZE      0x20000

diff --git a/include/configs/mx1ads.h b/include/configs/mx1ads.h
index 5125b21..bf43dad 100644 (file)
--- a/include/configs/mx1ads.h
+++ b/include/configs/mx1ads.h
@@ -174,7 +174,7 @@
 #define CFG_MAX_FLASH_SECT     (16)
 #define CFG_ENV_ADDR           (CFG_FLASH_BASE+0x00ff8000)
 
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_SIZE           0x04000 /* Total Size of Environment Sector */
 #define CFG_ENV_SECT_SIZE      0x100000
 

diff --git a/include/configs/mx1fs2.h b/include/configs/mx1fs2.h
index d527d09..8f4b42c 100644 (file)
--- a/include/configs/mx1fs2.h
+++ b/include/configs/mx1fs2.h
@@ -207,7 +207,7 @@
 
 #define CFG_MONITOR_BASE       0x10000000
 #define CFG_MONITOR_LEN                0x20000         /* 128b ( 1 flash sector )   */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_ADDR           0x10020000      /* absolute address for now  */
 #define CFG_ENV_SIZE           0x20000
 

diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h
index 9ede764..0bb0568 100644 (file)
--- a/include/configs/mx31ads.h
+++ b/include/configs/mx31ads.h
@@ -167,7 +167,7 @@
 #define CFG_MONITOR_BASE       CFG_FLASH_BASE  /* Monitor at beginning of flash */
 #define CFG_MONITOR_LEN                (256 * 1024)    /* Reserve 256KiB */
 
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_ENV_SECT_SIZE      (32 * 1024)
 #define CFG_ENV_SIZE           CFG_ENV_SECT_SIZE
 

diff --git a/include/configs/netstar.h b/include/configs/netstar.h
index 756b7c2..76d025c 100644 (file)
--- a/include/configs/netstar.h
+++ b/include/configs/netstar.h
@@ -75,7 +75,7 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_ADDR           0x4000
 #define CFG_ENV_SIZE           (8 * 1024)
 #define CFG_ENV_SECT_SIZE      (8 * 1024)

diff --git a/include/configs/ns9750dev.h b/include/configs/ns9750dev.h
index b9eec62..f8200f9 100644 (file)
--- a/include/configs/ns9750dev.h
+++ b/include/configs/ns9750dev.h
@@ -185,7 +185,7 @@
 #define CFG_FLASH_WRITE_TOUT   (5*CFG_HZ) /* Timeout for Flash Write */
 
 /* @TODO */
-/*#define      CFG_ENV_IS_IN_FLASH     1*/
+/*#define      CONFIG_ENV_IS_IN_FLASH  1*/
 #define CONFIG_ENV_IS_NOWHERE
 #define CFG_ENV_SIZE           0x10000 /* Total Size of Environment Sector */
 

diff --git a/include/configs/o2dnt.h b/include/configs/o2dnt.h
index 88bdb03..09995e8 100644 (file)
--- a/include/configs/o2dnt.h
+++ b/include/configs/o2dnt.h
@@ -203,7 +203,7 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_SIZE           0x20000
 #define CFG_ENV_SECT_SIZE      0x20000
 #define CONFIG_ENV_OVERWRITE   1

diff --git a/include/configs/ocotea.h b/include/configs/ocotea.h
index e8549e9..b0a2e5d 100644 (file)
--- a/include/configs/ocotea.h
+++ b/include/configs/ocotea.h
@@ -93,7 +93,7 @@
  *       supported for backward compatibility.
  */
 #if 1
-#define CFG_ENV_IS_IN_FLASH     1      /* use FLASH for environment vars       */
+#define CONFIG_ENV_IS_IN_FLASH     1   /* use FLASH for environment vars       */
 #else
 #define CONFIG_ENV_IS_IN_NVRAM 1       /* use NVRAM for environment vars       */
 #endif
@@ -132,7 +132,7 @@
 #define CFG_FLASH_ADDR1         0x2aaa
 #define CFG_FLASH_WORD_SIZE     unsigned char
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      0x10000         /* size of one complete sector  */
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE)
 #define        CFG_ENV_SIZE            0x4000  /* Total Size of Environment Sector     */
@@ -140,7 +140,7 @@
 /* Address and size of Redundant Environment Sector    */
 #define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE)
 #define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*-----------------------------------------------------------------------
  * DDR SDRAM

diff --git a/include/configs/omap1510inn.h b/include/configs/omap1510inn.h
index 46b30e0..fe6a0db 100644 (file)
--- a/include/configs/omap1510inn.h
+++ b/include/configs/omap1510inn.h
@@ -187,7 +187,7 @@
 #define CFG_FLASH_ERASE_TOUT   (20*CFG_HZ) /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT   (20*CFG_HZ) /* Timeout for Flash Write */
 
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_SECT_SIZE      PHYS_FLASH_SECT_SIZE    /* Total Size of Environment Sector */
 #define CFG_ENV_SIZE           CFG_ENV_SECT_SIZE
 #define CFG_ENV_OFFSET         ( CFG_MONITOR_BASE + CFG_MONITOR_LEN )  /* Environment after Monitor */

diff --git a/include/configs/omap1610h2.h b/include/configs/omap1610h2.h
index 74bba05..9d2051d 100644 (file)
--- a/include/configs/omap1610h2.h
+++ b/include/configs/omap1610h2.h
@@ -187,7 +187,7 @@ extern unsigned long omap_flash_base;               /* set in flash__init */
 #define CFG_FLASH_ERASE_TOUT   (20*CFG_HZ)     /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT   (20*CFG_HZ)     /* Timeout for Flash Write */
 
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_SIZE   0x20000 /* Total Size of Environment Sector */
 #define CFG_ENV_OFFSET 0x20000 /* environment starts here */
 

diff --git a/include/configs/omap1610inn.h b/include/configs/omap1610inn.h
index 734f354..edc42e4 100644 (file)
--- a/include/configs/omap1610inn.h
+++ b/include/configs/omap1610inn.h
@@ -192,7 +192,7 @@ extern unsigned long omap_flash_base;               /* set in flash__init */
 #define CFG_FLASH_ERASE_TOUT   (20*CFG_HZ)     /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT   (20*CFG_HZ)     /* Timeout for Flash Write */
 
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_SIZE   0x20000 /* Total Size of Environment Sector */
 #define CFG_ENV_OFFSET 0x20000 /* environment starts here  */
 

diff --git a/include/configs/omap2420h4.h b/include/configs/omap2420h4.h
index 461362f..ac98fb5 100644 (file)
--- a/include/configs/omap2420h4.h
+++ b/include/configs/omap2420h4.h
@@ -274,7 +274,7 @@
 #define CFG_ENV_OFFSET 0x80000 /* environment starts here  */
 #else
 #define CFG_ENV_ADDR             (CFG_FLASH_BASE + SZ_128K)
-#define        CFG_ENV_IS_IN_FLASH      1
+#define        CONFIG_ENV_IS_IN_FLASH      1
 #define CFG_ENV_SECT_SIZE      PHYS_FLASH_SECT_SIZE
 #define CFG_ENV_OFFSET ( CFG_MONITOR_BASE + CFG_MONITOR_LEN ) /* Environment after Monitor */
 #endif

diff --git a/include/configs/omap5912osk.h b/include/configs/omap5912osk.h
index 1c44ce0..0f56279 100644 (file)
--- a/include/configs/omap5912osk.h
+++ b/include/configs/omap5912osk.h
@@ -194,7 +194,7 @@
 /*-----------------------------------------------------------------------
  * FLASH and environment organization
  */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 /* addr of environment */
 #define CFG_ENV_ADDR   (CFG_FLASH_BASE + 0x020000)
 

diff --git a/include/configs/omap730p2.h b/include/configs/omap730p2.h
index c4d253a..b781f72 100644 (file)
--- a/include/configs/omap730p2.h
+++ b/include/configs/omap730p2.h
@@ -199,7 +199,7 @@
 #define CFG_FLASH_ERASE_TOUT       (20*CFG_HZ)   /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT       (20*CFG_HZ)   /* Timeout for Flash Write */
 
-#define CFG_ENV_IS_IN_FLASH       1
+#define CONFIG_ENV_IS_IN_FLASH    1
 #define CFG_ENV_SIZE              0x20000        /* Total Size of Environment Sector */
 #define CFG_ENV_OFFSET            0x20000        /* environment starts here  */
 

diff --git a/include/configs/p3mx.h b/include/configs/p3mx.h
index 33a94bc..1128c4e 100644 (file)
--- a/include/configs/p3mx.h
+++ b/include/configs/p3mx.h
@@ -137,7 +137,7 @@
 #define CFG_FLASH_PROTECTION   1       /* use hardware flash protection        */
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 
-#define CFG_ENV_IS_IN_FLASH     1      /* use FLASH for environment vars       */
+#define CONFIG_ENV_IS_IN_FLASH     1   /* use FLASH for environment vars       */
 #if defined (CONFIG_P3M750)
 #define CFG_ENV_SECT_SIZE      0x20000 /* one sector (1 device)                */
 #elif defined (CONFIG_P3M7448)

diff --git a/include/configs/p3p440.h b/include/configs/p3p440.h
index ac0d83a..046ec25 100644 (file)
--- a/include/configs/p3p440.h
+++ b/include/configs/p3p440.h
@@ -295,7 +295,7 @@
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 #define CFG_FLASH_QUIET_TEST   1       /* don't warn upon unknown flash        */
 
-#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_SECT_SIZE      0x20000 /* size of one complete sector          */
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE)

diff --git a/include/configs/pcs440ep.h b/include/configs/pcs440ep.h
index ba6d932..368a66b 100644 (file)
--- a/include/configs/pcs440ep.h
+++ b/include/configs/pcs440ep.h
@@ -92,7 +92,7 @@
 /*-----------------------------------------------------------------------
  * Environment
  *----------------------------------------------------------------------*/
-#define CFG_ENV_IS_IN_FLASH     1      /* use FLASH for environment vars       */
+#define CONFIG_ENV_IS_IN_FLASH     1   /* use FLASH for environment vars       */
 
 /*-----------------------------------------------------------------------
  * FLASH related
@@ -109,7 +109,7 @@
 
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      0x10000 /* size of one complete sector          */
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE)
 #define CFG_ENV_SIZE           0x2000  /* Total Size of Environment Sector     */
@@ -119,7 +119,7 @@
 /* Address and size of Redundant Environment Sector    */
 #define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE)
 #define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
 
 #define ENV_NAME_REVLEV        "revision_level"
 #define ENV_NAME_SOLDER        "solder_switch"

diff --git a/include/configs/pcu_e.h b/include/configs/pcu_e.h
index f15ce99..1a3bf1c 100644 (file)
--- a/include/configs/pcu_e.h
+++ b/include/configs/pcu_e.h
@@ -227,7 +227,7 @@
 
 #if 0
 /* Start port with environment in flash; switch to SPI EEPROM later */
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_ENV_SIZE           0x2000  /* Total Size of Environment            */
 #define CFG_ENV_ADDR       0xFFFFE000  /* Address    of Environment Sector     */
 #define CFG_ENV_SECT_SIZE      0x2000  /* use the top-most 8k boot sector      */

diff --git a/include/configs/pdnb3.h b/include/configs/pdnb3.h
index 889207a..0b7b6d4 100644 (file)
--- a/include/configs/pdnb3.h
+++ b/include/configs/pdnb3.h
@@ -243,7 +243,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           (CFG_FLASH_BASE + CFG_MONITOR_LEN)
 #if defined(CONFIG_SCPU)

diff --git a/include/configs/pf5200.h b/include/configs/pf5200.h
index a709d0e..6120f58 100644 (file)
--- a/include/configs/pf5200.h
+++ b/include/configs/pf5200.h
@@ -205,7 +205,7 @@
  * Environment settings
  */
 #if 1                          /* test-only */
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SIZE           0x10000
 #define CFG_ENV_SECT_SIZE      0x10000
 #define CONFIG_ENV_OVERWRITE   1

diff --git a/include/configs/pleb2.h b/include/configs/pleb2.h
index 863029d..799cf76 100644 (file)
--- a/include/configs/pleb2.h
+++ b/include/configs/pleb2.h
@@ -246,7 +246,7 @@
 #define CFG_FLASH_PROTECTION   1
 
 /* FIXME */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_ADDR           (PHYS_FLASH_1 + 0x3C000)        /* Addr of Environment Sector   */
 #define CFG_ENV_SIZE           0x4000  /* Total Size of Environment */
 #define CFG_ENV_SECT_SIZE      0x20000

diff --git a/include/configs/ppmc7xx.h b/include/configs/ppmc7xx.h
index 1d2d38b..cd5ef94 100644 (file)
--- a/include/configs/ppmc7xx.h
+++ b/include/configs/ppmc7xx.h
@@ -274,13 +274,13 @@
 /*
  * Environment config - see memory map details above
  *
- * CFG_ENV_IS_IN_FLASH         - The env variables are stored in flash
+ * CONFIG_ENV_IS_IN_FLASH              - The env variables are stored in flash
  * CFG_ENV_ADDR                        - Address of the sector containing env vars
  * CFG_ENV_SIZE                        - Ammount of RAM for env vars (used to save RAM, 4KB)
  * CFG_ENV_SECT_SIZE           - Size of sector containing env vars (32KB)
  */
 
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_ADDR           0xFFFE0000
 #define CFG_ENV_SIZE           0x1000
 #define CFG_ENV_ADDR_REDUND    0xFFFE8000

diff --git a/include/configs/ppmc8260.h b/include/configs/ppmc8260.h
index 6f1195b..a045f22 100644 (file)
--- a/include/configs/ppmc8260.h
+++ b/include/configs/ppmc8260.h
@@ -462,7 +462,7 @@
 
 #ifndef CFG_RAMBOOT
 
-#  define CFG_ENV_IS_IN_FLASH  1
+#  define CONFIG_ENV_IS_IN_FLASH       1
 #  ifdef CFG_ENV_IN_OWN_SECT
 #    define CFG_ENV_ADDR       (CFG_MONITOR_BASE + 0x40000)
 #    define CFG_ENV_SECT_SIZE  0x40000
@@ -473,7 +473,7 @@
 #  endif /* CFG_ENV_IN_OWN_SECT */
 
 #else
-#  define CFG_ENV_IS_IN_FLASH  1
+#  define CONFIG_ENV_IS_IN_FLASH       1
 #  define CFG_ENV_ADDR         (CFG_FLASH_BASE + 0x40000)
 #define CFG_ENV_SIZE           0x1000
 #  define CFG_ENV_SECT_SIZE    0x40000

diff --git a/include/configs/purple.h b/include/configs/purple.h
index ef92637..59743df 100644 (file)
--- a/include/configs/purple.h
+++ b/include/configs/purple.h
@@ -143,7 +143,7 @@
 #define CFG_FLASH_ERASE_TOUT   (6 * CFG_HZ) /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT   (6 * CFG_HZ) /* Timeout for Flash Write */
 
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 
 /* Address and size of Primary Environment Sector      */
 #define CFG_ENV_ADDR           0xB0008000

diff --git a/include/configs/pxa255_idp.h b/include/configs/pxa255_idp.h
index 179ff7a..9f83c7d 100644 (file)
--- a/include/configs/pxa255_idp.h
+++ b/include/configs/pxa255_idp.h
@@ -348,7 +348,7 @@
 #define CFG_FLASH_WRITE_TOUT   (25*CFG_HZ) /* Timeout for Flash Write */
 
 /* put cfg at end of flash for now */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
  /* Addr of Environment Sector */
 #define CFG_ENV_ADDR           (PHYS_FLASH_1 + PHYS_FLASH_SIZE - 0x40000)
 #define CFG_ENV_SIZE           PHYS_FLASH_SECT_SIZE    /* Total Size of Environment Sector     */

diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index 19e627b..e03e710 100644 (file)
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -149,7 +149,7 @@
 #define CONFIG_FLASH_CFI_DRIVER        1
 #define CFG_FLASH_USE_BUFFER_WRITE     1
 
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x40000)
 
 /* Address and size of Primary Environment Sector */

diff --git a/include/configs/quad100hd.h b/include/configs/quad100hd.h
index 94bdd8c..ad7f290 100644 (file)
--- a/include/configs/quad100hd.h
+++ b/include/configs/quad100hd.h
@@ -43,7 +43,7 @@
 
 /* the environment is in the EEPROM by default */
 #define CONFIG_ENV_IS_IN_EEPROM
-#undef CFG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_FLASH
 
 #define CONFIG_NET_MULTI       1
 #define CONFIG_HAS_ETH1                1
@@ -198,7 +198,7 @@
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 #define CFG_FLASH_QUIET_TEST   1       /* don't warn upon unknown flash */
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      0x10000 /* size of one complete sector  */
 /* the environment is located before u-boot */
 #define CFG_ENV_ADDR           (TEXT_BASE - CFG_ENV_SECT_SIZE)

diff --git a/include/configs/quantum.h b/include/configs/quantum.h
index 34a1ea6..a35418f 100644 (file)
--- a/include/configs/quantum.h
+++ b/include/configs/quantum.h
@@ -208,7 +208,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     0x00F40000  /*   Offset   of Environment Sector     absolute address 0xfff40000*/
 #define CFG_ENV_SECT_SIZE      0x40000 /* Total Size of Environment Sector     */
 #define CFG_ENV_SIZE           CFG_ENV_SECT_SIZE

diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 06ede3e..666219e 100644 (file)
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -71,7 +71,7 @@
 #define CFG_MAX_FLASH_SECT  256
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
 
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      0x40000
 #define CFG_ENV_SIZE        (CFG_ENV_SECT_SIZE)
 #define CFG_ENV_ADDR        (CFG_MONITOR_BASE + CFG_MONITOR_LEN)

diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h
index 77881e7..7123a83 100644 (file)
--- a/include/configs/r7780mp.h
+++ b/include/configs/r7780mp.h
@@ -112,7 +112,7 @@
 /* print 'E' for empty sector on flinfo */
 #define CFG_FLASH_EMPTY_INFO
 
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      (256 * 1024)
 #define CFG_ENV_SIZE           (CFG_ENV_SECT_SIZE)
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE + CFG_MONITOR_LEN)

diff --git a/include/configs/redwood.h b/include/configs/redwood.h
index b791589..c825f13 100644 (file)
--- a/include/configs/redwood.h
+++ b/include/configs/redwood.h
@@ -120,7 +120,7 @@
  * Environment
  *----------------------------------------------------------------------*/
 #undef CONFIG_ENV_IS_IN_NVRAM          /* ... not in NVRAM             */
-#define        CFG_ENV_IS_IN_FLASH     1       /* Environment uses flash       */
+#define        CONFIG_ENV_IS_IN_FLASH  1       /* Environment uses flash       */
 #undef CONFIG_ENV_IS_IN_EEPROM         /* ... not in EEPROM            */
 
 #define CONFIG_PREBOOT "echo;" \
@@ -175,11 +175,11 @@
 #define CFG_FLASH_ERASE_TOUT   120000  /* Timeout for Flash Erase (in ms) */
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms) */
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      0x10000 /* size of one complete sector  */
 #define CFG_ENV_ADDR           0xfffa0000
 #define CFG_ENV_SIZE           0x10000 /* Size of Environment vars     */
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*---------------------------------------------------------------------------*/
 

diff --git a/include/configs/rmu.h b/include/configs/rmu.h
index 596bf15..46f94da 100644 (file)
--- a/include/configs/rmu.h
+++ b/include/configs/rmu.h
@@ -188,7 +188,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_ADDR           ((TEXT_BASE) + 0x40000)
 #define        CFG_ENV_SIZE            0x40000 /* Total Size of Environment Sector     */
 

diff --git a/include/configs/rsdproto.h b/include/configs/rsdproto.h
index 6251383..89db35b 100644 (file)
--- a/include/configs/rsdproto.h
+++ b/include/configs/rsdproto.h
@@ -291,7 +291,7 @@
 /* turn off NVRAM env feature */
 #undef CONFIG_NVRAM_ENV
 
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_ENV_ADDR   (PHYS_FLASH + 0x28000)  /* Addr of Environment Sector   */
 #define CFG_ENV_SECT_SIZE      0x8000  /* Total Size of Environment Sector     */
 

diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h
index 23598f3..f6b013c 100644 (file)
--- a/include/configs/rsk7203.h
+++ b/include/configs/rsk7203.h
@@ -92,7 +92,7 @@
 #define CFG_MAX_FLASH_SECT     64
 #define CFG_MAX_FLASH_BANKS    1
 
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      (64 * 1024)
 #define CFG_ENV_SIZE           CFG_ENV_SECT_SIZE
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE + CFG_MONITOR_LEN)

diff --git a/include/configs/sacsng.h b/include/configs/sacsng.h
index 5c6ddc6..bce8c9c 100644 (file)
--- a/include/configs/sacsng.h
+++ b/include/configs/sacsng.h
@@ -707,7 +707,7 @@
 #define CFG_FLASH_WRITE_TOUT   1       /* Timeout for Flash Write (in ms)      */
 
 #ifndef CFG_RAMBOOT
-#  define CFG_ENV_IS_IN_FLASH  1
+#  define CONFIG_ENV_IS_IN_FLASH       1
 
 #  ifdef CFG_ENV_IN_OWN_SECT
 #    define CFG_ENV_ADDR       (CFG_MONITOR_BASE + CFG_MONITOR_LEN)

diff --git a/include/configs/sbc2410x.h b/include/configs/sbc2410x.h
index 08cadf6..8c14e8b 100644 (file)
--- a/include/configs/sbc2410x.h
+++ b/include/configs/sbc2410x.h
@@ -193,7 +193,7 @@
 #define CFG_FLASH_ERASE_TOUT   (5*CFG_HZ) /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT   (5*CFG_HZ) /* Timeout for Flash Write */
 
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_ENV_SIZE           0x10000 /* Total Size of Environment Sector */
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/sbc405.h b/include/configs/sbc405.h
index 60d401f..33eeca2 100644 (file)
--- a/include/configs/sbc405.h
+++ b/include/configs/sbc405.h
@@ -228,7 +228,7 @@
  * Environment Variable setup
  */
 #define CFG_ENV_ADDR   CFG_FLASH_BASE  /* starting right at the beginning      */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_OFFSET         0       /* starting right at the beginning      */
 #define CFG_ENV_SECT_SIZE      0x40000 /* see README - env sector total size   */
 #define CFG_ENV_SIZE           0x40000 /* Total Size of Environment Sector     */

diff --git a/include/configs/sbc8240.h b/include/configs/sbc8240.h
index 0e878f0..6e3c160 100644 (file)
--- a/include/configs/sbc8240.h
+++ b/include/configs/sbc8240.h
@@ -339,7 +339,7 @@ typedef unsigned int led_id_t;
        /* 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           0xFFF70000
 #define CFG_ENV_SIZE           0x4000  /* Size of the Environment              */
 #define CFG_ENV_OFFSET         0       /* starting right at the beginning      */

diff --git a/include/configs/sbc8260.h b/include/configs/sbc8260.h
index 6068c23..3a031de 100644 (file)
--- a/include/configs/sbc8260.h
+++ b/include/configs/sbc8260.h
@@ -603,7 +603,7 @@
 #define CFG_FLASH_WRITE_TOUT   1       /* Timeout for Flash Write (in ms)      */
 
 #ifndef CFG_RAMBOOT
-#  define CFG_ENV_IS_IN_FLASH  1
+#  define CONFIG_ENV_IS_IN_FLASH       1
 
 #  ifdef CFG_ENV_IN_OWN_SECT
 #    define CFG_ENV_ADDR       (CFG_MONITOR_BASE + 0x40000)

diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index 264f5ab..fa0ccd8 100644 (file)
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -413,7 +413,7 @@
  * Environment
  */
 #ifndef CFG_RAMBOOT
-       #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       0x20000 /* 128K(one sector) for env */
        #define CFG_ENV_SIZE            0x2000

diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index 9ef0bfd..1f6dc3f 100644 (file)
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -434,7 +434,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

diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h
index f39867f..72e4791 100644 (file)
--- a/include/configs/sbc8560.h
+++ b/include/configs/sbc8560.h
@@ -336,7 +336,7 @@
     #define CFG_ENV_ADDR       (CFG_FLASH_BASE + 0x100000)
     #define CFG_ENV_SIZE       0x2000
   #else
-    #define CFG_ENV_IS_IN_FLASH        1
+    #define CONFIG_ENV_IS_IN_FLASH     1
     #define CFG_ENV_SECT_SIZE  0x20000 /* 128K(one sector) for env */
     #define CFG_ENV_ADDR       (CFG_MONITOR_BASE - CFG_ENV_SECT_SIZE)
     #define CFG_ENV_SIZE       0x2000 /* CFG_ENV_SECT_SIZE */

diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
index c84240e..40211a0 100644 (file)
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -469,7 +469,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

diff --git a/include/configs/sc3.h b/include/configs/sc3.h
index 4205f46..1a614fd 100644 (file)
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -404,8 +404,8 @@ extern unsigned long offsetOfEnvironment;
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 #define CFG_WRITE_SWAPPED_DATA         /* swap Databytes between reading/writing */
 
-#define CFG_ENV_IS_IN_FLASH    1
-#ifdef CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH 1
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_OFFSET         0x00000000  /* Offset of Environment Sector in bottom type */
 #define CFG_ENV_SIZE           0x4000      /* Total Size of Environment Sector */
 #define CFG_ENV_SECT_SIZE      0x4000      /* see README - env sector total size       */

diff --git a/include/configs/sc520_spunk.h b/include/configs/sc520_spunk.h
index aa9dc97..a8f520c 100644 (file)
--- a/include/configs/sc520_spunk.h
+++ b/include/configs/sc520_spunk.h
@@ -153,7 +153,7 @@
 
 #if 0
 /* Environment in flash */
-#define CFG_ENV_IS_IN_FLASH     1
+#define CONFIG_ENV_IS_IN_FLASH     1
 # define CFG_ENV_ADDR          (0x387a0000)    /* Addr of Environment Sector   */
 # define CFG_ENV_SIZE          0x20000 /* Total Size of Environment Sector (or 0x10000) */
 # define CFG_ENV_OFFSET         0

diff --git a/include/configs/scb9328.h b/include/configs/scb9328.h
index 4ae25ad..51826d7 100644 (file)
--- a/include/configs/scb9328.h
+++ b/include/configs/scb9328.h
@@ -215,7 +215,7 @@
 
 #define CFG_MONITOR_BASE       0x10000000
 #define CFG_MONITOR_LEN                0x20000         /* 128b ( 1 flash sector )  */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_ADDR           0x10020000      /* absolute address for now  */
 #define CFG_ENV_SIZE           0x20000
 

diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h
index 0e28555..3574a6f 100644 (file)
--- a/include/configs/sequoia.h
+++ b/include/configs/sequoia.h
@@ -113,7 +113,7 @@
  * Environment
  */
 #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
-#define CFG_ENV_IS_IN_FLASH    1       /* use FLASH for environ vars   */
+#define CONFIG_ENV_IS_IN_FLASH 1       /* use FLASH for environ vars   */
 #else
 #define CONFIG_ENV_IS_IN_NAND  1       /* use NAND for environ vars    */
 #define CFG_ENV_IS_EMBEDDED    1       /* use embedded environment     */
@@ -139,7 +139,7 @@
 #define CFG_FLASH_EMPTY_INFO         /* print 'E' for empty sector on flinfo */
 #define CFG_FLASH_QUIET_TEST   1       /* don't warn upon unknown flash      */
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      0x20000 /* size of one complete sector        */
 #define CFG_ENV_ADDR           ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE)
 #define        CFG_ENV_SIZE            0x2000  /* Total Size of Environment Sector   */

diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h
index 1306702..05e3f96 100644 (file)
--- a/include/configs/sh7763rdp.h
+++ b/include/configs/sh7763rdp.h
@@ -103,7 +103,7 @@
 /* Use hardware flash sectors protection instead of U-Boot software protection */
 #undef  CFG_FLASH_PROTECTION
 #undef  CFG_DIRECT_FLASH_TFTP
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      (128 * 1024)
 #define CFG_ENV_SIZE           (CFG_ENV_SECT_SIZE)
 #define CFG_ENV_ADDR           (CFG_FLASH_BASE + (1 * CFG_ENV_SECT_SIZE))

diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index efdb163..f9bbb4d 100644 (file)
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -150,7 +150,7 @@
 #define CONFIG_RTL8169
 
 /* ENV setting */
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_OVERWRITE   1
 #define CFG_ENV_SECT_SIZE      (256 * 1024)
 #define CFG_ENV_SIZE           (CFG_ENV_SECT_SIZE)

diff --git a/include/configs/shannon.h b/include/configs/shannon.h
index 8bbc730..28fecf1 100644 (file)
--- a/include/configs/shannon.h
+++ b/include/configs/shannon.h
@@ -158,7 +158,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_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #ifdef CONFIG_INFERNO
 /* we take the last sector, 128 KB in size, but we only use 4 KB of it for stack reasons */
 #define CFG_ENV_ADDR           (PHYS_FLASH_1 + 0x003E0000)     /* Addr of Environment Sector   */

diff --git a/include/configs/smdk2400.h b/include/configs/smdk2400.h
index ac1642e..35eebeb 100644 (file)
--- a/include/configs/smdk2400.h
+++ b/include/configs/smdk2400.h
@@ -178,7 +178,7 @@
 #define CFG_FLASH_ERASE_TOUT   (5*CFG_HZ) /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT   (5*CFG_HZ) /* Timeout for Flash Write */
 
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 
 /* Address and size of Primary Environment Sector      */
 #define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x40000)

diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index efe4693..86ebcba 100644 (file)
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -178,7 +178,7 @@
 #define CFG_FLASH_ERASE_TOUT   (5*CFG_HZ) /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT   (5*CFG_HZ) /* Timeout for Flash Write */
 
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_ENV_SIZE           0x10000 /* Total Size of Environment Sector */
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/smmaco4.h b/include/configs/smmaco4.h
index 1d202d4..cf92fa7 100644 (file)
--- a/include/configs/smmaco4.h
+++ b/include/configs/smmaco4.h
@@ -226,7 +226,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)

diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index a981a8f..09e1c8c 100644 (file)
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -308,7 +308,7 @@
 /*
  * Environment
  */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_SECT_SIZE      0x20000 /* 128K(one sector) for env     */
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE - CFG_ENV_SECT_SIZE)
 #define CFG_ENV_SIZE           0x4000

diff --git a/include/configs/sorcery.h b/include/configs/sorcery.h
index b4da4ce..fef722b 100644 (file)
--- a/include/configs/sorcery.h
+++ b/include/configs/sorcery.h
@@ -197,7 +197,7 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x8000000 - 0x40000)
 #define CFG_ENV_SIZE           0x4000                       /* 16K */
 #define CFG_ENV_SECT_SIZE      0x20000
@@ -206,15 +206,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
 
 /*

diff --git a/include/configs/spc1920.h b/include/configs/spc1920.h
index daaa23f..73fa97f 100644 (file)
--- a/include/configs/spc1920.h
+++ b/include/configs/spc1920.h
@@ -185,7 +185,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       0x40000         /* We use one complete sector   */
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
 

diff --git a/include/configs/spieval.h b/include/configs/spieval.h
index 93798a4..8df56e3 100644 (file)
--- a/include/configs/spieval.h
+++ b/include/configs/spieval.h
@@ -308,7 +308,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)

diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h
index f4a8fa5..95230ac 100644 (file)
--- a/include/configs/stxgp3.h
+++ b/include/configs/stxgp3.h
@@ -288,7 +288,7 @@
 /* We use the top boot sector flash, so we have some 16K sectors for env
  */
 #ifndef CFG_RAMBOOT
-  #define CFG_ENV_IS_IN_FLASH  1
+  #define CONFIG_ENV_IS_IN_FLASH       1
   #define CFG_ENV_ADDR         (CFG_MONITOR_BASE + 0x60000)
   #define CFG_ENV_SECT_SIZE    0x4000  /* 16K (one top sector) for env */
   #define CFG_ENV_SIZE         0x2000

diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h
index 4f1d70c..21bb279 100644 (file)
--- a/include/configs/stxssa.h
+++ b/include/configs/stxssa.h
@@ -317,7 +317,7 @@
 # define CFG_ENV_OFFSET                0
 # define CFG_ENV_SIZE          2048
 #else  /* in flash */
-# define CFG_ENV_IS_IN_FLASH   1
+# define CONFIG_ENV_IS_IN_FLASH        1
 # ifdef CONFIG_STXSSA_4M
 #  define CFG_ENV_SECT_SIZE    0x20000
 # else /* default configuration - 64 MiB flash */

diff --git a/include/configs/stxxtc.h b/include/configs/stxxtc.h
index 0dc9f8a..c8b54bf 100644 (file)
--- a/include/configs/stxxtc.h
+++ b/include/configs/stxxtc.h
@@ -201,7 +201,7 @@
 /*-----------------------------------------------------------------------
  * FLASH organization
  */
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_ENV_SECT_SIZE      0x10000
 
 #define        CFG_ENV_ADDR            (CFG_FLASH_BASE + 0x00000000)

diff --git a/include/configs/svm_sc8xx.h b/include/configs/svm_sc8xx.h
index bbbfa15..b7831b4 100644 (file)
--- a/include/configs/svm_sc8xx.h
+++ b/include/configs/svm_sc8xx.h
@@ -227,7 +227,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
 
 #ifdef CONFIG_BOOT_8B
 #define        CFG_ENV_OFFSET          0x10000 /*   Offset   of Environment Sector     */

diff --git a/include/configs/taihu.h b/include/configs/taihu.h
index 2ef4545..ad0f5a9 100644 (file)
--- a/include/configs/taihu.h
+++ b/include/configs/taihu.h
@@ -74,7 +74,7 @@
 #endif
 /*----------------------------------------------------------------------------*/
 
-#define CFG_ENV_IS_IN_FLASH     1      /* use FLASH for environment vars */
+#define CONFIG_ENV_IS_IN_FLASH     1   /* use FLASH for environment vars */
 
 /*
  * Default environment variables
@@ -205,7 +205,7 @@ unsigned char spi_read(void);
 #define CFG_FLASH_ADDR1         0x2aa
 #define CFG_FLASH_WORD_SIZE     unsigned short
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      0x10000 /* size of one complete sector  */
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE)
 #define CFG_ENV_SIZE           0x4000  /* Total Size of Environment Sector     */
@@ -213,7 +213,7 @@ unsigned char spi_read(void);
 /* Address and size of Redundant Environment Sector    */
 #define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE)
 #define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*-----------------------------------------------------------------------
  * NVRAM organization

diff --git a/include/configs/taishan.h b/include/configs/taishan.h
index 81133bb..9bac0e2 100644 (file)
--- a/include/configs/taishan.h
+++ b/include/configs/taishan.h
@@ -83,7 +83,7 @@
 /*-----------------------------------------------------------------------
  * Environment
  *----------------------------------------------------------------------*/
-#define CFG_ENV_IS_IN_FLASH     1      /* use FLASH for environment vars       */
+#define CONFIG_ENV_IS_IN_FLASH     1   /* use FLASH for environment vars       */
 
 /*-----------------------------------------------------------------------
  * FLASH related

diff --git a/include/configs/tb0229.h b/include/configs/tb0229.h
index fc2357d..cf2af93 100644 (file)
--- a/include/configs/tb0229.h
+++ b/include/configs/tb0229.h
@@ -153,7 +153,7 @@
 #define CFG_FLASH_ERASE_TOUT   (20 * CFG_HZ) /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT   (2 * CFG_HZ) /* Timeout for Flash Write */
 
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 
 /* Address and size of Primary Environment Sector      */
 #define CFG_ENV_ADDR           0xBFC40000

diff --git a/include/configs/trab.h b/include/configs/trab.h
index b0615a0..1c8d3ce 100644 (file)
--- a/include/configs/trab.h
+++ b/include/configs/trab.h
@@ -403,7 +403,7 @@
 #define CFG_FLASH_ERASE_TOUT   (15*CFG_HZ) /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT   (2*CFG_HZ) /* Timeout for Flash Write */
 
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 
 /* Address and size of Primary Environment Sector      */
 #ifndef CONFIG_FLASH_8MB

diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h
index 6367f87..dcfb73c 100644 (file)
--- a/include/configs/trizepsiv.h
+++ b/include/configs/trizepsiv.h
@@ -309,7 +309,7 @@
 #define CFG_FLASH_USE_BUFFER_WRITE 1
 
 /* Flash environment locations */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_ADDR           (PHYS_FLASH_1 + CFG_MONITOR_LEN) /* Addr of Environment Sector  */
 #define CFG_ENV_SIZE           0x40000 /* Total Size of Environment            */
 #define CFG_ENV_SECT_SIZE      0x40000 /* Total Size of Environment Sector     */

diff --git a/include/configs/uc100.h b/include/configs/uc100.h
index 106e6f2..cdd7bdf 100644 (file)
--- a/include/configs/uc100.h
+++ b/include/configs/uc100.h
@@ -241,7 +241,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           (CFG_MONITOR_BASE+CFG_MONITOR_LEN)
 #define CFG_ENV_SECT_SIZE      0x20000 /* size of one complete sector          */
 #define        CFG_ENV_SIZE            0x4000  /* Total Size of Environment Sector     */

diff --git a/include/configs/uc101.h b/include/configs/uc101.h
index a186188..ac5285a 100644 (file)
--- a/include/configs/uc101.h
+++ b/include/configs/uc101.h
@@ -176,7 +176,7 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_SIZE           0x4000
 #define CFG_ENV_SECT_SIZE      0x10000
 #define CFG_ENV_OFFSET_REDUND   (CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE)

diff --git a/include/configs/utx8245.h b/include/configs/utx8245.h
index 1675ab7..2844c63 100644 (file)
--- a/include/configs/utx8245.h
+++ b/include/configs/utx8245.h
@@ -392,7 +392,7 @@ protect on ${u-boot_startaddr} ${u-boot_endaddr}"
 
 /*     NOTE: environment is not EMBEDDED in the u-boot code.
        It's stored in flash in its own separate sector.  */
-#define CFG_ENV_IS_IN_FLASH        1
+#define CONFIG_ENV_IS_IN_FLASH     1
 
 #if 1  /* AMD AM29LV033C */
 #define CFG_MAX_FLASH_SECT     64              /* Max number of sectors in one bank */

diff --git a/include/configs/v38b.h b/include/configs/v38b.h
index 3574548..e0bd8c7 100644 (file)
--- a/include/configs/v38b.h
+++ b/include/configs/v38b.h
@@ -213,7 +213,7 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x00040000)
 #define CFG_ENV_SIZE           0x10000
 #define CFG_ENV_SECT_SIZE      0x10000

diff --git a/include/configs/v5fx30teval.h b/include/configs/v5fx30teval.h
index 67d8d7f..5132293 100644 (file)
--- a/include/configs/v5fx30teval.h
+++ b/include/configs/v5fx30teval.h
@@ -27,7 +27,7 @@
 #define CFG_SDRAM_SIZE_MB      64
 
 /*Env*/
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define        CFG_ENV_SIZE            0x20000
 #define        CFG_ENV_SECT_SIZE       0x20000
 #define CFG_ENV_OFFSET         0x1A0000

diff --git a/include/configs/versatile.h b/include/configs/versatile.h
index f563c58..4a54b90 100644 (file)
--- 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 CONFIG_ENV_IS_NOWHERE */
+#define CONFIG_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/virtlab2.h b/include/configs/virtlab2.h
index 1a125f1..6250926 100644 (file)
--- a/include/configs/virtlab2.h
+++ b/include/configs/virtlab2.h
@@ -209,7 +209,7 @@
 #define CFG_MAX_FLASH_BANKS    2       /* max number of memory banks */
 #define CFG_MAX_FLASH_SECT     71      /* max number of sectors on one chip */
 
-#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     */
 

diff --git a/include/configs/voiceblue.h b/include/configs/voiceblue.h
index 20917ee..fee3ab9 100644 (file)
--- a/include/configs/voiceblue.h
+++ b/include/configs/voiceblue.h
@@ -74,7 +74,7 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_ADDR           (PHYS_FLASH_1 + CFG_MONITOR_LEN)
 #define CFG_ENV_SIZE           (8 * 1024)
 #define CFG_ENV_SECT_SIZE      (64 * 1024)

diff --git a/include/configs/walnut.h b/include/configs/walnut.h
index 4eecf77..fc267d1 100644 (file)
--- a/include/configs/walnut.h
+++ b/include/configs/walnut.h
@@ -137,7 +137,7 @@
  *      supported for backward compatibility.
  */
 #if 1
-#define CFG_ENV_IS_IN_FLASH    1       /* use FLASH for environment vars       */
+#define CONFIG_ENV_IS_IN_FLASH 1       /* use FLASH for environment vars       */
 #else
 #define CONFIG_ENV_IS_IN_NVRAM 1       /* use NVRAM for environment vars       */
 #endif
@@ -160,7 +160,7 @@
 #define CFG_FLASH_ADDR1                0x2aaa
 #define CFG_FLASH_WORD_SIZE    unsigned char
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      0x10000         /* size of one complete sector  */
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE)
 #define CFG_ENV_SIZE           0x4000  /* Total Size of Environment Sector     */
@@ -168,7 +168,7 @@
 /* Address and size of Redundant Environment Sector    */
 #define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE)
 #define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*-----------------------------------------------------------------------
  * NVRAM organization

diff --git a/include/configs/wepep250.h b/include/configs/wepep250.h
index f2efe9f..9baf730 100644 (file)
--- a/include/configs/wepep250.h
+++ b/include/configs/wepep250.h
@@ -178,7 +178,7 @@
 
 #define CFG_MONITOR_BASE       PHYS_FLASH_1
 #define CFG_MONITOR_LEN                0x20000         /* 128kb ( 1 flash sector )  */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_ADDR           0x20000         /* absolute address for now  */
 #define CFG_ENV_SIZE           0x2000
 

diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h
index dc0ee0b..3c32d9f 100644 (file)
--- a/include/configs/xaeniax.h
+++ b/include/configs/xaeniax.h
@@ -176,7 +176,7 @@
 #define CFG_FLASH_WRITE_TOUT   (25*CFG_HZ) /* Timeout for Flash Write */
 
 /* FIXME */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_ADDR           (PHYS_FLASH_1 + 0x40000)/* Addr of Environment Sector   */
 #define CFG_ENV_SIZE           0x40000                 /* Total Size of Environment Sector     */
 

diff --git a/include/configs/xilinx-ppc440-generic.h b/include/configs/xilinx-ppc440-generic.h
index 4e8080b..fdefc4e 100644 (file)
--- a/include/configs/xilinx-ppc440-generic.h
+++ b/include/configs/xilinx-ppc440-generic.h
@@ -27,7 +27,7 @@
 #define CFG_SDRAM_SIZE_MB      256
 
 /*Env*/
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define        CFG_ENV_SIZE            0x20000
 #define        CFG_ENV_SECT_SIZE       0x20000
 #define CFG_ENV_OFFSET         0x340000

diff --git a/include/configs/xm250.h b/include/configs/xm250.h
index bcd16ec..d01898f 100644 (file)
--- a/include/configs/xm250.h
+++ b/include/configs/xm250.h
@@ -184,7 +184,7 @@
 #define CFG_FLASH_UNLOCK_TOUT  (2*CFG_HZ)      /* Timeout for Flash Clear Lock Bits */
 #define CFG_FLASH_PROTECTION                   /* "Real" (hardware) sectors protection */
 
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_ADDR           (PHYS_FLASH_1 + 0x40000)        /* Addr of Environment Sector   */
 #define CFG_ENV_SIZE           0x4000
 #define CFG_ENV_SECT_SIZE      0x40000                         /* Size of the Environment Sector       */

diff --git a/include/configs/xsengine.h b/include/configs/xsengine.h
index 4d1bdd7..709423d 100644 (file)
--- a/include/configs/xsengine.h
+++ b/include/configs/xsengine.h
@@ -80,7 +80,7 @@
 
 /* Environment settings */
 #define CONFIG_ENV_OVERWRITE
-#define CFG_ENV_IS_IN_FLASH             1
+#define CONFIG_ENV_IS_IN_FLASH             1
 #define CFG_ENV_ADDR                    (PHYS_FLASH_1 + 0x40000)       /* Addr of Environment Sector (after monitor)*/
 #define CFG_ENV_SECT_SIZE               PHYS_FLASH_SECT_SIZE           /* Size of the Environment Sector */
 #define CFG_ENV_SIZE                    0x4000                         /* 16kB Total Size of Environment Sector */

diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h
index f90e9ec..528776a 100644 (file)
--- a/include/configs/yosemite.h
+++ b/include/configs/yosemite.h
@@ -96,7 +96,7 @@
  * Note: DENX encourages to use redundant environment in FLASH.
  */
 #if 1
-#define CFG_ENV_IS_IN_FLASH     1      /* use FLASH for environment vars       */
+#define CONFIG_ENV_IS_IN_FLASH     1   /* use FLASH for environment vars       */
 #else
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars      */
 #endif
@@ -118,7 +118,7 @@
 
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      0x20000 /* size of one complete sector          */
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE)
 #define        CFG_ENV_SIZE            0x2000  /* Total Size of Environment Sector     */
@@ -126,7 +126,7 @@
 /* Address and size of Redundant Environment Sector    */
 #define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE)
 #define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*-----------------------------------------------------------------------
  * DDR SDRAM

diff --git a/include/configs/yucca.h b/include/configs/yucca.h
index 9ccd308..d85da94 100644 (file)
--- a/include/configs/yucca.h
+++ b/include/configs/yucca.h
@@ -140,7 +140,7 @@
 /* #define CFG_NVRAM_SIZE      (0x2000 - 8) */ /* NVRAM size(8k)- RTC regs */
 
 #undef  CONFIG_ENV_IS_IN_NVRAM         /* ... not in NVRAM             */
-#define        CFG_ENV_IS_IN_FLASH     1       /* Environment uses flash       */
+#define        CONFIG_ENV_IS_IN_FLASH  1       /* Environment uses flash       */
 #undef CONFIG_ENV_IS_IN_EEPROM         /* ... not in EEPROM            */
 #define CONFIG_ENV_OVERWRITE   1
 
@@ -188,12 +188,12 @@
 #define CFG_FLASH_2ND_16BIT_DEV        1       /* evb440SPe has 8 and 16bit device */
 #define CFG_FLASH_2ND_ADDR     0xe7c00000 /* evb440SPe has 8 and 16bit device*/
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      0x10000 /* size of one complete sector  */
 #define CFG_ENV_ADDR           0xfffa0000
 /* #define CFG_ENV_ADDR                (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE) */
 #define CFG_ENV_SIZE           0x10000 /* Size of Environment vars     */
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
 /*-----------------------------------------------------------------------
  * PCI stuff
  *-----------------------------------------------------------------------

diff --git a/include/configs/zeus.h b/include/configs/zeus.h
index b50cba5..fdb4e37 100644 (file)
--- a/include/configs/zeus.h
+++ b/include/configs/zeus.h
@@ -42,7 +42,7 @@
 #define PLLMR0_DEFAULT         PLLMR0_333_111_55_111
 #define PLLMR1_DEFAULT         PLLMR1_333_111_55_111
 
-#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 CONFIG_OVERWRITE_ETHADDR_ONCE  1
 
@@ -226,7 +226,7 @@
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 #define CFG_FLASH_QUIET_TEST   1       /* don't warn upon unknown flash        */
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      0x20000 /* size of one complete sector          */
 #define CFG_ENV_ADDR           ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE)
 #define        CFG_ENV_SIZE            0x2000  /* Total Size of Environment Sector     */

diff --git a/include/environment.h b/include/environment.h
index 047f5f0..6fcc8ec 100644 (file)
--- a/include/environment.h
+++ b/include/environment.h
@@ -37,7 +37,7 @@
  **************************************************************************
  */
 
-#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
@@ -67,7 +67,7 @@
 # if defined(CFG_ENV_ADDR_REDUND) || defined(CFG_ENV_OFFSET_REDUND)
 #  define CFG_REDUNDAND_ENVIRONMENT    1
 # endif
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
 
 #if defined(CONFIG_ENV_IS_IN_NAND)
 # ifndef CFG_ENV_OFFSET

diff --git a/tools/envcrc.c b/tools/envcrc.c
index 550cf82..2f40051 100644 (file)
--- a/tools/envcrc.c
+++ b/tools/envcrc.c
@@ -33,7 +33,7 @@
 #include <config.h>
 #undef __ASSEMBLY__
 
-#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
@@ -56,7 +56,7 @@
 # if defined(CFG_ENV_ADDR_REDUND) || defined(CFG_ENV_OFFSET_REDUND)
 #  define CFG_REDUNDAND_ENVIRONMENT    1
 # endif
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
 
 #ifdef CFG_REDUNDAND_ENVIRONMENT
 # define ENV_HEADER_SIZE       (sizeof(uint32_t) + 1)

diff --git a/tools/updater/flash_hw.c b/tools/updater/flash_hw.c
index 2d9b8c8..50b4df0 100644 (file)
--- a/tools/updater/flash_hw.c
+++ b/tools/updater/flash_hw.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,