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 0da641296b38840a08d68b1b2bfb00dd162f9f91..49f9d888e0ac6402bb67fbbbd7331011ec49d5dd 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 c1b3b8513ee3a57aafc2cc50e90b9a941706654f..d77af357a3fec040298cb5794aed501030d5fd51 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 d46bf464654ca98c56ed2f016e867a44b7444d65..5e15e2048929f6dd2a55f8c1fcbbb7cba53e4f59 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 60580c948b7c4662f0e80ca392566731299be454..14296b2ab42a0dd5e06f4694e21fbb915c280942 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 d8e07e6450fef91630eaa898ef647a9b38b10ba1..287bbac8c6ccb00e8aa459f65b5b7247135892ec 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 13a5ca5b065aa6a370358e779b42b3f264154a09..98a027e783bf921f9ba6d8d2ef29cc1878f6646f 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 8a2e832cf48a7858e20b4545f9b95ffd890af139..f23fc249c42d905004e1b14a75506688afd9d38c 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 e4832ebf360fc98bda49a49360df3003bfb54ba3..0295b8c7083dfb8c39726d8179bba58dbad99557 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 e8fbbc493e8126e1cb55ff3b131268acee0cacdf..b49e05f6daf9e70664a9cd30fffb4751246875a8 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 7b1025526f5a70153ec103d4e49baa5524ab9a26..f407e195be7b9533e05e119b38c54280d69e8c4d 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 d3c3c0d058140a94f8a525ca0c531da5afdd0d99..3b2f9b746fab556ed4e8a19c68a5af1b15dec004 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 2b4d3d4b776a99ad04b28d6aa5939418371f9edb..fc79907baa35fa743e0cbf87892d734c8aa8115d 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 5614e20780ad4e627c813366da57c6ddca376cd7..88a76f7da608a287745cb51c2e2fbc9e08668653 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 176d5cf0dc9dfa6baee58bfcae78654edd47e405..c682c8e3e88d2cf49a11165ec2180bccce0c01d7 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 290259e73f9c0e91bf203167444cdcdb927ae06a..8ffcc393463d9e67c87c2fb5cde1937e6a68e245 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 056f9b9362a64dd504bfb78cc7ac5d95db8e5b6f..d47d263e9e10296f2fd2dfb1f9da0a9e2ba6f4f6 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 15b8a462bae389f77d2fefac328ebccda932925b..9256938dde7baa2ee27a4388c90befeac0bb03ad 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 2ab60e866b2ff40c93a297956e2c06338bbeda2e..9e4c6c512ea0d362a744ebe992cb8fa649e8565d 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 9502560d6769cdd638a0aaf89f44b71735f9daea..c6a01cacaac2cdcd7e814bf4a8622346f1d19b68 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 6d3cfab130a51743921c4841d3db0b75b115d9a7..4c7971aee5bc1bb3db1ebf0f6c458084c44825ff 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 b2be21c68451305aafd683670688289f776ef8b8..2a5e050abbdf9417371150a5365f4f61a91c2898 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 9983c7b78c0b01465d108254646b05a8af3c2031..0419d7620026cf9fc008f1485ad6bba8bb97c3a7 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 f57d8ecfe9027d7664ca499a3d620fc280cca3bf..aec6a8ef9216d9cd81daa61ecd2f992ba0663bef 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 969520d277be263972f54019cbd19cfd6516b4d9..fc3e5ff88ed2b03374c149e0abc20535f1abdb59 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 9a398686be068f0f329c20cc5f99c82c14f8a38d..db9a637b56ba4004bedea924ab923cf74377e5fc 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 b1048a36b6bdbcc48374178b50e4dc80943ebd13..e6a14b0d8f3a4d4eac7e9f928ac80d6a9b81df84 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 925a0e672254e4344a2a4fda2c469380abd4854e..b96a30c5a3007c0a8adbce88dcd15757876579ce 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 ec1a58633f55cde18b8c5bcf6c0f48c183e3c06a..5e55284a7dd512f2b25a2eac1b0604d5e54c4f41 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 d6161bf3586a5a158d7dbf5f05cef40b6ea6e5f2..0e8d337f723b5f74d6abb886b504b899bd5a4e3c 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 167f316c87eb3c963be2efbaeb81de13f727cdd9..8d996407cd8f479777516082ce30c54891c129c3 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 53afbc0b920634adcae2bf62738127d5352ce33c..55419eeb91bd3b697e589a301fc968092abe9b17 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 0cdaee445270ef5a9447da442d8494eab89be517..7c8fa74c6f9ca4e18eddf0c689f21eee24b731d0 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 6ab23dce2f7be486a185e77c0d5934e02b632f92..1691e108c2b28cdc7b872434c8f67a055818154e 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 401eead5d9f289af174e282775742eeb685d1138..4d83fd5efdb81ec79134ed4dfc779e27d1811590 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 0a8b98352adf4ccc4091990a05a5e892645a15dc..63b1e625e56962258cbc7aa167168ac063472126 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 7cda3a412ff60601a46cf5766085a204f82d61c6..742a88979bfc445892284f204a23ef20b53328d6 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 fd0082c135b05c4f320b1e2d04a6863bf5a57e2d..3303707817010e1041d7a405f8ef92f5905df0dc 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 59997aac4f46d51ce95aafaa0ce7df45459353d5..5f80f26e0c4aaf0fbd69e1bd728382578cdcec0a 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 9512c72a0b94bb843f4e8af9426b7fcfa312dc7b..aa533e4b90564c69a7c5b8e6f4f8815766d37812 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 7dd0d3f23468d8b80619d21a7bf8d6cae935961b..935adfa1a0d5311cd4f9677cef78c43ca789a5a7 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 13faaf39f3e32e95bae00a93a37c20b11d56b167..c558014e7d3d6ba572e0203991c6e527ca4eef1f 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 015ea7dda905e5d4443d171f3f3fa81228c4b996..e4b596b0ca16a8fc9f2f71e68a7dc8b73376a469 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 a2ed3bd1f98d2ee8dabb6098e8d4f41ed98e369b..5fb9578bb0560610fc7b12b11e5471e75ad66b30 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 2d4026a9de7c92798d708bf29d300e84bda96ec7..e6cf92e3df31730d862573a47a3091b8225cec66 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 ca5bcf31af5c01607c69221f82c27a29765f0f88..625d1a86476dad9ebd33cec3c990871a2e25298b 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 4eba4b9687a0b0a90dae5b3727d32ffe2b758b14..522fafe435398785358e22c05a1b7bc6e71a0b28 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 520514dea35a913af0ef0d3ff1734228ea500677..b510e900cd5c4a564550dc5d8ca662a6887e7bad 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 8fc6e5bd91cb408c0ac4b356dfeed9a3e0fcd1dc..2d773b1b04826f1e7f2c3c907a418eaf5a9de0e4 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 59961cdab6efa0933a83eb7e65f17867dd1d20e1..2a4256abdf7da1b6dee4115565af016d80b8e3e8 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 2cf23b3e8c521e8e44c601caf7b81ba11da66fb0..6bf4d8da6d15f55034a39dd36002734254daf396 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 4eca46720cc92ef395a3c5248ff203d23f15e71c..f8ab51a7e690b78aafb62c42129283089f73ecc2 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 140ba2d530fc2d8db4f25a7ce05d69bcc51b178e..f911fdb5bd9170b25245aca9f70b08f8a867d7fe 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 903c88f06c6c3972d22a7720dad7e116f957d33a..50bf5439f70d625fcd80928487f9398ece5b7d29 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 0faa82cba4d691a7c7c8fe50a09aa72657224c82..ddf680a3168838acd27d19ead7730b9edb368b46 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 b894887c937129013e5abca3c9e14a010e4f3eb6..7e4acc2481a20cf256fd836f166c67309a350384 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 79eb04ca87b65d0f5a1a3ee4e56a9f6b44ab788f..b129602a6e872d59d8b6a1acb5f842439b55573c 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 eb2702b6dfd7d0866c5ba7fcf94c38c51f5b2b82..a2e0244d89b355b047f0faf3b78a95ec5ee7ccc9 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 cd33d8ed333ed237ee297ad8ad23be63e1ce308b..df7bbc5488a5d8fe99a5184c6023e2613e9b110f 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 8d7c1726577b85dc6220ae1558c074f1321499b8..a7fc084afa9b9ba5d86d556b6141d94582780006 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 4ecdb25da8d0daa583c4b2aa5dae150e416b99b3..41fa2048dda4f1c71379e7d01bc47a90b6852d4a 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 349086ffb52200b246f06af62077b6b2d4ede08f..2aa0489da1346a1d407c41d18294c35bb3255ef8 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 4559b8033b41e9eefcdd3625b4f05b9ce8d60811..44e2300e94ab250dc78e66f0f39d4fe069542c9d 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 8c01415faed614cae2e74daf075303a5361fc999..b1fec97dd34ee9e90de282a4105176e4e5a07061 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 4301b8c23433b7bd6fbbdf45f90d7500672d5aac..c899ad34044e9f4f56f87fe377024e666c0fc4db 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 92a433a58788402329fe88f167a349d0aed22dae..e8e02893d76e4ec1cf3b0763b5b1a6909143711c 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 0e7bfe8b0e7ec47902ddceadd1ed113a5f9f47be..0620ea31065c9571651e2b12ee17181fbcd90d62 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 4d13612aff24072b93571e89e38ca5bf26c6968d..dd91da7d72c8e7cf86460659a0bd863572cc5f30 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 1baae35eb886a291a40b7c6e0db1f23cdfe60b8a..ee8a60e1be228929f17a4ffade448e0fa75efbd3 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 9b42960c7d3e63f3fcdfec14b3b27cc05a34ed6c..398e7342a7004fc745959fa70c867c57a02c0509 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 0f2c327a1cee1c1dc0b786217a9e18257f28e8fa..670faf0931094bf8c7ff6550bf355cf1d34a0bdd 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 b29032bc4695668a527d2bc7a2632e82ebdcfbe6..2d176947afe38a2398a70aed13d0fe625f0a1e1c 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 d9f6b3bacd73ba0569c7124c92bb0ed4c396f3a7..f9544580cf6ff8f576f9b852fb7070137509cf50 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 52e01def5b1b82fe35eda67234d20b3719d69081..f37be294238ae6c6056569236208d958a10d1908 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 cf066799381a4eff8d9346415d5df2678e4db0f3..60cb1915e5319b726506544141a49384950a7d4b 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 c43435fc5b8881033d325fdc34f0b92f12cdfd99..6d659b2d58c50e74a224f23f1e791e805f21c780 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 063972db5bbcff4df30c01b4a2b5ae14a6f2414b..815f0236d1e36ed5ca530600feb3d841622a7b40 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 05c364bb23f8d63dd97c25b8b44d46ee9f7820a8..5b812cb365c32d62c511aa10a885e513ee1ffbe6 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 7fb94631cf107ad8af4de5fa3a7fae535fbdb63c..f41dde058969904d0366c609d2ad83e743858c94 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 032989ba5616d4c764a866d7c7043666c7e89f5f..25ac3012c6909b516889e0b19b1fc7f3ca23d5a6 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 25e61dd5e5a8b615a0f854b6309de793ad553250..267be78f66cc4982f7422cbf9ec161e3be777d22 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 b3f095d807f3366af1412f6b04f77f94f4602bbc..bb12aaea4cc042f276ae3d2ac824a7689f4ce003 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 063972db5bbcff4df30c01b4a2b5ae14a6f2414b..815f0236d1e36ed5ca530600feb3d841622a7b40 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 1231c7c6f9347aa2598f94db1aa852cd88a94036..f9078cffd95a7c62b064de185b21d90ae71ad5cc 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 ae0e659c2e6de1ca1d558a50c2ecea1025fba53e..515d8c2cee8d0ef69f4c2c37bba836c03b930cdf 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 12a1335b757ad1b052a76c3dd3e271e965124e37..4d468d314dcb47acdc872914cab903511ebf1b73 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 fc9b94e0ec25ffd3cf9071d1fa0493fe729a01f1..f5b93df220e631716b702661e111028781f1626d 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 a92160ddfb3f8652fc35989b80823eb1af5a4a7d..c287b17404ded2fce09294733763ad244e3fbc5c 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 a74321d5c0eb2356b7a36a4b99d2b4e121973633..7937b61a816f52ca403f3c5db15129f7009e9a7a 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 dba1bf727d23f6e764609a943c20c92376a9b0ff..35180d636e02a678cf0ac8cceb3bf46304c8cb7b 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 148c905925e46b95ac69d65a18ae69a9db2e9af1..0069aabab7cf13269a5230a2040f1af08e9dfc6e 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 cc91c8d11d0f54d622a262a16d2eb00d6f9a810b..2999b2a0b7e5f343fd935c4c8bc392b38a114bda 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 035ebc6935592b97a769e86a69b5e04988e64c96..85a7ee91fe2ce0950c646f44e2122da395746a4c 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 f0e0282280a082710e23f11e676b7be3eb07915e..a4582148a9e56e0288955d4a652e9616b84bfdcb 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 06023819f9d95307d8995bddebb9489820ef2501..045849f76d9abb8a30c0f409733db8590e307b60 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 5bc28f18f90a0b1a1e8aed703999bd11262cc761..0ce81dbaf234dad5f4eb13f633285ffa0be3fdd9 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 07a9f4e934530083253fe05f44fb6adc0bec2f7f..3c2f4d646d8d27df442d9a0f1530160804029e9f 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 3d4cd36a49652904b1119e22fcd84877d60cc938..3b3c0bcbb119b417349d4bbc36977edfe2e51505 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 3c5d03812eb2bf6c9a2c98e3aebca20c5b866945..09c1995f09c3f7437a16bc8a78a0dfbc05a8ddf5 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 a4afccab9617c3d4b4e06a73d27dbd95d1984edd..d50be015f59829c8673d519f92d159d93c2e1540 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 1603c9c0bdada1f4a7865f1f57226906681690cd..b9c998eec6871fd7882d8f2056b1879f979b193e 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 57c122395d7efcbfc10e336df5107e6de718bce7..52b7b82cdc71c89673f1b554716844299eb8365a 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 11107d499a07840e154ead88ee1ad94d2947f82b..7ec48a127d80e47b74d9a21eeea9f286257bf522 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 48f308c76f6b8733335192590f3a00494399d770..7a185e847e160c4cd4476d489668ae8ecfd90da5 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 742ea463e59ea63d20761ded0124066331a1ca93..443b976495f9d5aac944dfb2b28f1a9321ef2cc1 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 db423a0ba9477ac7faa863d81c3f45117518f353..45075fa2e38c9ecba2256126eb739332ac6cc122 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 604779a691b27f4758d46638e4ac412fd10b1adc..c15a02ab961476a2a2ffc577a680667526c2aa70 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 f36d8dacc0cf7a94166b8986cb1cbdbaf587d2f9..3320c9aee7be40f5565fe000c473636ac32ffa6d 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 117a1367c1d519f5ffff51c6b3b8e0f7575b64ea..24370c93fdce6b4c0d303bc61e421dba74b88061 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 eef216dfae7ceb330cb89d8e8186d90b16f7cb90..3fc280fc388cc05e33e774dcd6351912b6ea7053 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 b14cd0df1a5e6030333cd879f5aafde4c20ea505..59a934e6943087a9b6a4f595acb5e7a058a2ed07 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 965827823613133acce1876344a470a5e9e43325..a1f4e0dc73be7f612a56096a61244d512915183c 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 e5bf8c7ccccc8c5f7b496b94dfbde2e43004665b..eda328ab3ec871af4d8f403e37a83903d11b94e3 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 b1d4ff3f6427687dec85b2347f7f7376ceb4eee8..37a7e3ae87e7030f1d242098debfbd17efbfa228 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 324eb6ce15bfef1e43858b73a1127be876dde6aa..80a6cb7bec68cd5f23387841e207156126be4994 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 b9178069b8b98a0d8c39a5b8d1b9738f8e2d34ff..11eca4c4d57e0331e4305853099e882d8633f58f 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 cfa6335927a5c77ed13e4cff00a6718b85f09a01..aaf61726db10a85ef702ea16778d178c2ad8bb26 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 7c526f759e7acb32dda06f659b6314952ff38a93..ae1e476fd34a8f4bcf0be9ab3f23ce00709b6144 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 1fe8f68c2e6f480a0e585b40b95a0be8b2ca19d2..7aedcca1dbeece042228d8c11d058e1f52216419 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 5f1743b2ff3a2dab5048a43ce88e4c663acbc06b..81d5e55461d5f52e431609c505278a24a5941fad 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 c699855a554a2d2367bf7af7f850ad621b1062e5..b7ec0d01058a33c660d69a062805df4249a20145 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 66e1203b7dd556243f711d4f3664fe584c11b457..24f0f4c1fbeff69899ef1c67fe506be2b32be91b 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 525051fb57e128f7e4a9f973c36506b207d789f7..940e53d23a395eb7b7695eaca8281a891cbba997 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 c9d8c271ba6a8a1dc452e0d8fed65ca5d139abf5..2a78fd648b909734544bf5cf15e659f8d8104f47 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 4193492ff9024d03b9b639159576041b692f51c2..fed8d4247f96e4b45cba8496fbe83a6a8467da3e 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 6f3e6a75b84653092259906c877b8518ee7c5904..c6c7b533be732f8b91a4a77e43901177b544f6a7 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 356705ba1fda5cf92bc87418370dd451e286ac7e..82a875719e64eabe623dc8909a9c9fa8d55a4f88 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 431844c7f3d1314a176b5cb283ec27c201333488..e7fcf751981514badd6e42d6c5a3a9dc2acead12 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 e694a0218fca7af702e1f835425c28cf2fc8f792..2b819c52f1223da8ce80ff36e6ad9405cae7a8e5 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 84b682415d4f714113070088091bb6fbeefa2a32..b3380dbbcbc5a32e06760383eefff067f33782ed 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 74e6ef70ee54b9c7e070478fc86b89b3e4a0c734..43926a280c9ada989275f04799a8aeeeed6d6f3c 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 51cf5794b9af66f62d2e6f0aa311804d965598a2..6a5a316dd22306547a77c531ee106eb374255115 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 f6d6ae0ce5bb823f12ef89ddb900402e96daaf0e..3cf7fb1d1a372a12ef7c27e008dda13f58230ba1 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 4a98c40638624ce622020b80b165ce46f2b310b9..d5816ae2f6bc3f55184e9d4a223a35823322c4ae 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 5deb84de5a6fa3e507d2bdc34c3f54e71d30c0b0..5168be0dc04a15f7098cb02edc5fbffd8c616bf8 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 a7e7c5744ec381dfd72ec79bfe1ce5b32b36ef73..406c352644be29cb3a20f8a9a48ea23fe90b90d9 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 87827ead1c893ea3d6cc795e7968e67819a7b04f..c80165ba59fc293e9ede586d437994e5b7e676bc 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 f693956d4284158ee839af078aa67d3ce4aa1eb4..caf7210a64ead093a1ea755fe12b98a0e79990cf 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 029bb9914b746b7c1d23d0a6f62743067aa8da40..459654e546e6c0cb178dad8a45ef20d57ed68d8a 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 63e7e5d452de6f4be84695c8b1b626b6f9638557..fa3c29ec9a7d0af67dfdf4be89c0743b2b96d346 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 7d564a0957df77efdcb9b2d062f3f5c159d72623..cea853204733026c7483b17c73701af599178077 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 27e46a432bb6d2919195f0cf80705ef2eb8d76dd..6de40da4ed7dae825d960f3a675a0ae411ffaf09 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 0ffdfac07cefdbab78f5d8542f122e4aeaa6c200..ee302d9a61fc5384042045fff65369f6d8c04851 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 ea3ffe0a10ae77838c67a9e3f8466a1e6c148481..1bdd0318e6aed2297ac7e633cc2f1c56cc1f219d 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 0b90946a364aa6fe6007ac5f523f41177963113f..804fc3f69cebc93767fb3450512478187ff08089 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 ecc344d8296e083676a91c2181cec1c233ab57e3..4bcd17a6ee91d25052536d1fcf6afc3343d0aab7 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 7208444bdd00ad03cb4dd98ab9026b000f7d8a09..897d8a0592796944fd1b15373af993b5fe96c0d0 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 e52fbfde0e74be74d3d97069e7992acd047ddc14..e40e53bb2fa3d32cd4d7e84e90cc71e5b2e761e5 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 be0c7af8f3e811c54969842991cae9ccccb2cfaf..29c3e2d7bac30b5b38c8d43704626aed6d3ca6da 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 e92069b5a935aebe0cc505522e12dfc9976779fe..dc6084877c1a4aee0bfe2369e48590996fc8a632 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 8713b02aaf9d3978827e961ef4916e08b8918e70..10b37b5e01fa4ee2665e353dc534ac79c5842121 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 b32eabe9a37957c7940686735f0204ec7abd941c..3f55594a3c4ab8fc4ecb6ebfcf58ba2c17fd7511 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 6bf2d99c9c1876d3a998693ac72115725cff6edc..c7544a8ebbc549b565441702fb150707d6abaa31 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 9f78f6ebc88932b2248735496f226cc04d75298e..72dd05db6637b269694a8e07cbd30b6699fc920f 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 6e14ebf5b1e21271810c114cd720d37cc566476f..cbf50fe713568164bfc4d974361771d159ec285f 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 78a1b93cf7597a031397d5f7a146b5f8a537cef6..482c262c81111f968531f2f06e3ce0dedf805359 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 fc457e3bcbbe7e44f995f9b3781d380fff0d6030..22124c961f2718124dbea0e970c3dd0214074166 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 430af6bfa21a52d97c4a4098cbe9113b75bfff00..0a30e0b1edea4d8aeda6fd96045bb31e68046feb 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 eb59c250dbfe3caa2e4399c0bc465e87c7147eee..1763f97b65e10cc12749cfa0af6f3b42bc8fc4fe 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 58948a20a9c863c461e453dcfceb3e4422185fcf..441f209c4af4341639fd8287af8814cd1170dcf9 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 814c3a610d1645aac8d89cacc31c254a0f4d5f07..f8212c6551a491aacab073a6f611ca6ae0ddc108 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 06e22443b3fecc74b15321337b046ccfd22117d1..d0a66ea8fe0590f20b257bf318415dca10d0ffda 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 45a244fae7ab08dcba9d97888b0bafad2d3ae789..9872d58d22ab39baced540a31f9faf41845eeafb 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 af6723c63753717faad66bdaf4d1ad7e305abd39..7913879489c883a04e15a74b5cda362ba01249d4 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 248db53d9a3fba4ac43ecff3f04c0cbdce21bc0e..df92a244193beddf477c66768f711ac9125f36a4 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 fdb840ec6cf5e13243995d4535390e7e50a4ee4a..b972390b0461526109d16ce3147ac6582fe12906 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 dde774271135bcc6329da3f030e0898c8084b85f..de7cb128f3eeb2cec46fe062204c340c572dea3a 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 3ce1807b52fdd6be714551b181550b6a07b8806c..a2703b1688b8c0468b1a41c534fd045ce8b2d867 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 4052e78628059951fb7ebc05f2c68a4e30b1d3b1..b145166f0302cb81b438290bc8305283a77bbfd5 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 735cfaae5be33f6f0ff3da21442d401e2804842c..9a7673231039f588b687523fe97a9db5f06b4bda 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 4429e99571d5ea769951c308678201dc9b202e37..e062717e6b79be50d4733daf052e3a1db6a346da 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 776fe9916016952047e42c6bf0df94f9c9e0040b..aef35781cde1eabcc520664d5e0d70e80841f53f 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 1edd9ced4bea9d0d669b2f79537cf1d24e165eae..92a6218427e4d7b7b30dca2a967547a4ab9a74d5 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 308f102161660274103cdfe1028066f5db5b8def..7e4849a91305c4fdae92a7b8122f6fe0906f6872 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 b98f3ee18e0281a0f01520ee0960a6d01fe8bdec..3102272ae392e492685071642c422bc87cb6dfed 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 e03f5ca09219191ffe378a26eb6db1de9facb827..d737cb44fa01515a25cc7d7291245cf1749b063a 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 7f5d303f001a6215e5a653a2389ae9925cc04ce6..7635c65e36171ce5bdcc5ca3e34d7bbdc59f4b38 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 c532eb1fc05af9a54806ca3ad32b1baccdeaf483..37173cc467540f1f3dcf57eeda0f8efae72ae2a1 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 47016005f2f06f96c035dffc4741b2561ae6dc51..b20f16504af86a20c874a00480035e89add62d73 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 220c148618fe77b714583a487bfceac1373badd6..21d7d2dd64d247419d7c827179169b0a01310459 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 289bcfaba4676d7c9b332af21a5858e208edab09..7ffc743c351299a0028a653eb2323b18eeeb98c7 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 dc304e7bcaf4250ab8c1990b786422128d2cf0a4..f290075d8ee2cd3001118a005857054f9947c59e 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 c23dcf66bff0e77098ae6b345c3fac77d859f127..0dc10965cec7cd93aabda271573cbf0c87566892 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 04bec2d02da7c9e12cac5cfdf0e131d793579e7a..d4df8a613b62cce1e07977393395fc8da982fb70 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 bfd86f50696deff25f9a303c85922cd8f877070e..569952daef418d25bc51a56aca51a133f83cc671 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 612e8f2a741f9cd967ee2b29f8bd9fdc1e25bead..02776b35fd7775274acd0a4a6837c06691d3521a 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 06965ed4b49db00f9150c641f84c6b608d796517..4afb7aeee542eee6e21d4945d462e76ffea483d5 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 a92c0fe301f274f82221546931f2366baab72199..c521336538768b04d5e770470d854c5950e2b35a 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 f661c8e3b4496c59797edaa2fac4683af805d3d5..72a8b25f484c4e8714bef75cb2f5cf25b469b0ff 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 8aeaa293bb9d29b2e1ca3088e211d6ea5f8119ec..5b1cf6f919bbf1f266f59d3327214970789ab756 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 b0094f310f636dd37e85a51777171062af13b9c5..94c02408f5853e27ee7c24ecb1af759830f9d135 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 2ee8d57015f2cbc0a8fee8002c7025d25c2731c4..744110f36c6bda45048c8acc3988dbf6acf0a773 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 170fbd6a5caf222eabeb91a9f48208bf292b9fb6..7b5c402e9b99bbdb8d419ccce2890d003cc40abc 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 4319e6c04c3e2ec3daa42d7a95286208a32839fb..4a7540ec592c058c434455fc3a7be420b20a0cd7 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 0ce88d6be6fbeb5406a162aa0e35852bde132d97..bf06ef831a2d8fecf2d58272f8ef5190c47ac054 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 849350fd8a4fcd74723cc324bf50fe185a88df5d..b8288571ab32ba181dee8523c5d5e9d59331e705 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 8e247af63cd43cff672a493cae02366511d5e9cf..819e72542e285a40faf03556594343d6bd0ff7df 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 87458e3624fd361a8a8b4d163d03f6eabcd40721..df1586bdfe384a7775735b4021614226c8959a40 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 40cf275786ba53530f40dab0060d8dd654253fed..59d6e9a131f65cb25c59b8982e3f9c8d2594341d 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 84c6e9b6179c7539c4405b7e98e876abea416a08..22bd0f070c23c3d557f1d19fdf76f2a18a4b79d4 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 1494190bf978e2e70be146c1279e3d6f84dcaafc..ac4c42493e6c022de8f94d5cd76cf7a911445fba 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 64806342aeba200fdbd206a8af68eade093c30f0..80aee5bc2aa838363d9f4ddd65bef78ec2109b3b 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 efa91e304a25bdfb750c37fe7e6087ceca5e6f0e..6cb39d9f836e970dc08e01ce0e7705611b2e7b46 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 40e09fba62005523deb96d66bf6491409cedbc7f..0d318e8247ad8750973027d0aa98a3092d112d14 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 31762b9a368b46cbcac13539a011f3274e4f822c..9991d6997614355d685d627c6d04b2c6a1072168 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 2a4bd4724c0fd2e320e251fce49264e1aca4170e..eddb52bece2c55d440578c35e685c7c79df669db 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 8d61bcd2d419eed84c495994982c03bea8cba9fc..d9b4224fe1e66d122153cec6c3f686f2717601ee 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 5a2d15770537776b773958eea17fd51010dd0861..232044b084f506072e13041798e302d760516b41 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 2676c78fa97f3b0a7df86db53999c7f8185a0938..96150447c71759c34df0b6ab7b933a033b78d6a6 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 abb9bfc25c73609010eed3625cc0475f089e8cb6..94f6f93454c670d80c4d396abfc6ad5e3a880b6c 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 6ebaa85e8c0fac710961d7e9c915b1a0a4781f05..af3b8ee5a2a45eeb23813d0687786dff8d1f2826 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 9202794ab21e9c1a3cb314e36db94c9939aaaa31..e229bde246f0852975cd2b788509581ac1d6d55c 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 d90351add35c80d15ed73e2a72f17579653dfda2..48e9269d99bcd061955623f8b6f829063bee3023 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 5e0bb056d80f30d9c153d6829dd4d4701317d50a..4da84ca9ff63d6223ee98ae1be8e742c9a795c55 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 de1ecde0d5fb9d9bf49a88efe85590d366812aec..0782ff0c470bf557c6f148fe7d8e8a56ceefd644 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 cac8f272665c0b95e41d0ba83a495e1af1dba727..a342824ef4c9d49e011f62586c26876590606406 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 1212bcdb7c2ce7a015a260f9a500bd2c3b00f070..8babcb2730b28f0fa007d1ab16439e0d90304fd0 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 75dba3bcb1fe78a02e0bde01b1b426a90253fbcf..9690bd7631c48f4be964ad5e8b150efa877fcbc5 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 5b253230c15f63642e328f7e6f44f084119a47f2..7a787761d2b4d4b0f24efac6894097fb19d06ce9 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 a33bc3ba5a1e3ad0194f2d9722b161b0c9bda3a3..81085ec0df2b19f08c07174f7095f8186562db14 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 cef9f42dfdc27c534e0784c2a155ddbd0599220c..3c7fc6f9067120e172f878ded9044e7427a3d547 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 ba5827a22d6d80683fb86a844e6d665cf50e831e..44daf520c19ce65cdb039ee259967821d70e1b2a 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 9dfceef3c833edb6105d447f540fc65268daa53c..dd792463016c305fd3b13e20b908ea6adedcd89f 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 a653cca96fe6337c3a8a574c424ac2af9ae77b33..26729fcb682194c6c283e17254212296d586a428 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 9222d21554ac5de92a93c51c098c1fcebf6f736e..8f5945090830dfd39d2ae6b4cd2bc3a16c4b5432 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 37623910abee84261a7a0da636fe3ee1494a30ae..50345e53e97bcfdd9846cbe0ca6c1f9e376179eb 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 671094b69df1a6c5e6e67ddd53a1585b8aa2a319..2e4710ac6f57376a981fa8f1a2230c77d1eecdde 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 d1358186a655ccd4be5cd5d4f2b660af2628d086..724dc48eb2cd9865b8b41af527b540199268a538 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 2a9c62709b765d7575988ede8efbd444c6062403..8bdb4015085e9981b166bd0fd65276d61f857871 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 6a71801935a0308ed5cc24e1b3652a2583a3bbf0..22d3da614dd4e8d193c9c331f998e9193cc9fb00 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 e8ed0951c8b992ee9a858f85a465b0326c576bc3..e603f29b3b3c515723fca5390cbf099fd3f10bd4 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 6b25d56fcbd01a9a33e99380c7a2bf39a0a6e6d7..64f23205744a8b833a08be583263796e63c473e6 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 2c7e55f287dd57c656552f1c3ce113f22ae1c524..bc779de80407a3fdecc4b3b2253e954ea466bfb8 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 31853c8de3a5e6e6d89c81c3524ebce30c47a827..56436a4354ee804ace3454202efcf44cbac5d5c9 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 465db4735f286199f6f30932ac31e97862af3985..138dbd24c7f288ec00c90e7f71c5080ae4019ce6 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 a5d3d695889192828a737df137047b91f1fd894f..583ee211144d88a0492bb7b534afbfc8aa7617b2 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 395c7a1e7a03ad805dbb5e0a48e3d8402ea51132..39ab1c80a6f04062b8727f8f6967490e53e90ae7 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 d23367979fbec805f2c704f29831645a2e96ad35..d1b6998b96943171e5e45c052a17d46633cb7584 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 85b3a9f75d841bf273112a49f80787c3f596b34b..67b6071be1d4b78f02f84db980e192acafaeef90 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 cfd16d3127414996eb9f7a24739bcfb636296dfc..7c880ab5ad3b913f0a04ac95d6e39dfecd7b2dbe 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 c0f2c5796a606c9ae80f365b6e3f871e2ca7dd23..39f66cbdb313e3464d6252f79c2f6f6a91a152e2 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 dccdf0ca9b4fcd08ede63f0e1fe13891287c1da9..1b2b70a4521c5f50499bafb705a43fee56d360a8 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 3b6816675a21022534422f80999b4530d29f3d5f..97a8d6f8a0ec4cb55c788fd2562436b7778c002b 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 8073b7ec6e5e9de81c4e33404dc373a926e35a1a..99829169ccf5be548db87f08b75d2bb2f2b0fdf3 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 0ba74558967a716789d88d95ce783e5c53962a12..d91d2e51b2b584dac6221377d3905daf14d3ffeb 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 839b6be91b904c71af39852afb48a90d579a54ab..a979351166f2c5d9f9c2bd70c7c3c9dfa8fb1628 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 b9a7a59c258da41c3dd769ee5c734010ec429e9f..86432c6eaeb20ceb1b271df4830d8dd3da4edcec 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 a77b1199bd8105a36de746c75a6ae6feb33ea064..46ecb5127a01b4ed0197c1db81bca89ec1383197 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 039ecf17bb8e631a26bccea988db56d8e429904c..8642a9f610b8332728614829571b48e324b232d6 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 2ab6991513a0a97498162c0b101d39cf9beeffd6..0d47d70fd13813a2fca557df5ec10eca75c503c5 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 388fafc555487794172647e1f6d512de623a95d4..1a8089617640d87ae065075b257dd243aeabde48 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 6f0864f47ab716ec064fa1b7b7309482779d5bb1..4626f2ef2779ca06f8822ac85379741872c50cf2 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 093d6599ea1569c51ede47b7ec657e556e309331..6582d97a119c6e96a4622ee8846a556626a200ac 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 64bbc39cf82ab444546ada21401f247eb5ec0c60..2ff208c44a7fffacfa309607df6b0351d1140820 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 5e1cf956f1bb20c99d181098eb3bfd563d66e473..c6bb4f902ead708d239558ecb433db4032dc41c3 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 dacc3406bb84ce55cb312a0a523b1da1050d7407..1daf8666bafd49f8cb6dc6158ec331278f2e0260 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 3ec849c8bc811211982476bcd284d96f189a5eb2..dcdcdc1ae94f21f5313f93d66449db73c4119767 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 6c610ee5904a8493658efbc797f53057b47a54bc..53a8f345030d4f71e92a322efd24e5926a4beb8e 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 2eca59b99dd6513675d2c262d71da882c797a51b..41a0cac8a3ec0f77fc94790171360d964437c34a 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 4683286d7a0af9040b097bbc6d49dde1cf5bb487..3e50cd4223b6b7e5bdb86b8f2d13afeeca37efdd 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 5daaf04be84c60c77dd850a4a74784076b378e65..ebdf17d39719d11022c95ac402f624ac19471972 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 25e98e249e5cd88e9dbf88415e0b2c2617bd94b4..16584ecbc371c3850a9493c7d1f462fb1f1a427b 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 50dd7aae9f729881ee4f67f1c93b1eedf9496736..9822d7d428e59c0ba1212bdbb618697a21faebf0 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 db05d82bfce1aff074ae599b8405b18e64de151e..d8d97e84fba1f03f633595c74494e21edd26cefe 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 d4ec03e5e8cc9a97d820914fcc6c189759b5d754..2471a44172f6d0d96a4e720484005733ddb95a34 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 ac52e39fe019d484481d263e86ff8838684f4818..fe09c9a13052bfb243c4c98b450854efebdfbbfe 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 9ace43eff9256c98349fa4df445bbc0742248ace..ef230e15dfa875c89911ba78ac17a03d7f5e6c57 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 4217900e604d840987d0ec43928d64cba9b69987..5fade6332eb176b3b63e2fe7f03965322ce88854 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 5ba8d1a7157d90318a73516f8c70ec8f5b1087f0..1b713884839a4598ea6661762ecbba65d20cb560 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 894a62b847c433aaec5db7b700e67e999f8e68c3..ffaaa847a3757892034eb15496165a6b30fb0edd 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 33a74949a541ff5ea014a8a9fa141254b6941f78..d18c4b5848b2c5415de56114ba738f4836301a53 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 75aaa1184213c8e5682ed83d1787ba92011ec23b..f6919a5edf547d75c2a8a62689fe272dfd148edd 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 693c2847fdb0d7608637a9011bcc57844661099d..dfc8967d2997be48859c1197c07f1823af9f866e 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 7f8e0f4d0f96b3404c59f5fe702e0ec92310c905..48d3713f36897beafa93735645a8996b8a776345 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 f516c4602c2c396e0cb1a0562b054cf451bdd9b8..eb6a6454a1acdac991bf4f384949d7daf7aa4d01 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 f27cc4a1500ac31339aac1b5ce8dc185cea9997d..bd7dab2f7bb397101cda5e55d2e236422234a58c 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 f342c7a6db6ffddfd53a5e14a1670db23e05b521..ee60644ad0040cfad3d6a37be05e8e18c2e3c28a 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 3db609bb3b88a62dda004ef3e3466b2dd63d9ded..79f4d11447a89d017d4ffd334f673e021fe8d2ab 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 98a83db296ce6e55c15927f6f23d2885d23d8f49..45b20bdc4a184844364eb74e14e7d4e578c2993f 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 ed7b5ef8ffd6b5c8c1bc7869fcb0daa2436f08d3..3cc4db43acb1b1108a202c07a31063cf228e7d70 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 acf452bbe3667745c0cd3c2708cdf16cb8c14b92..fb5358c787c91f6f499fe88eb64665b31c5fb258 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 92724abbe898ec2c7c1b21ccecd5d83fe636abec..31d84d21623bba4c8f058f8fd283a7dad672b7fb 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 1e393a2a1f124ad118ec4bc6771916b57a778879..a7b154ddbdbb120693fb98aeb61c7ae811b016ff 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 6d8c1b22a3878d4562d1eb33756729478b47168e..12da7f090608dfa73c673909e9a16830d263ba9b 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 3a7d27354f848fe588931328a714275c54c302aa..4a9a94e36559d1515df8c81a9b0c54938e90c553 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 55ea7f290f341ba7900e4c026808e8a4741941f1..62c1aff85bb3f0910587577623f224058c3902d3 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 369c61964903c5e8064304a492f45fb9e40b9bb4..a9a94841e16ad5368e7cbdc8df29c65992766071 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 902f822e45fcda7da3aa485564d3473db14e0490..c454ec01c87156d38cb3cc435fa500827acb97aa 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 20ebc3fb8f1c9ce2b2004483314b5d78d55ad585..2485477876cf69fd29b2d05af63aae28949d864d 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 4f57067db155110ac17c9d545a5febe31d976199..cbf5868a31c866cc05fddb39f67a72e993bd6c44 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 2f551adca4b73f212c5135a157741330c42a3855..08fb639c15361bf954568b3dc83ed5cc1207d84d 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 842207f731175e90931dc75227add7bc247a8619..2e71780d07baad294e6a95cff6f4ce9f8cd2ef66 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 6d438395933266725d69eda9cd9abab3094bd514..5224eb2ff0d14e3b520e8257bf6107003c9850a7 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 e4a7f9dbce3fe624b98052065391aad7cddaa1a2..ff10650eb76285f21398353221b82a1b2391700f 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 4b42f8b1a85ebefbce6674566776824ea4b842a3..146d25493aaac40619c01f3649acfcd64cb5a109 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 6f0d4b0f80aec5168e4c475e4a32acafb2d25ec7..17178e9f02e2f8104cbcd1a699afbf05c56a86a5 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 38714cc3069dfb42e7038c90f2426c8cc5ae2e4d..f0818b77dd8ef9ad5e5417fbe105d7bf55581140 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 189107448cb78262a53229d6ce1ee790dcfb7a6f..9ec49c10c7d2bcdb5bf7afebcc64d4da25c8d553 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 c801f037e1fae1e4c9becce34490ffa4be60667b..fb737d50cce855bf2caff86284ecd86a2ccfdd1e 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 0221dfeb8c1e02674293c1c4f39bd9fe39f93179..5f0d3fbcc950a6806020e52b6de26e41b5ac53df 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 bce5fcd82f520d0993e69f00d0d0702c667fe139..d9c1263326a38c2d2fb3be1442185eedbdc88418 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 ac2b7a1e71de1a00c477101b2ccf58034364dc74..ed6578a10ae29e29ba3ab9bd19d630b4be67a956 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 649b053c2b65d1adf500201d55f5852ef3c0fb3e..c908d5aa3d57d475b9592042e5e18d848800d1c1 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 84d50c71dd5f6f10ad65859cf445252fc5a85ac9..fff35f98ecf135ad17d8c0909a300eb5481edd0f 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 ce38af1dd851f8d4ee27810c04cc840d2dd8a112..9d257d29d1bf144ead9d4588d7fc8023058d34f4 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 7974491aca7002d042d1d84aa773248c7c555e2f..cbc5b2ea67b34d146ba13b9ee720bdbe8fbbe35b 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 eb93a8f083f7e4ab2f2039de445c90d4817013fb..ee319a7af7e43004792e02bfe07700d1f5237a93 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 a807d0084da9f9c54304bd23a52044f19440536f..c5d65e57965b2ecc40627a39d920c574346ebc61 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 880bee8612ce2ffcb47d5d8006b580528b765e9c..1d6a0775bbb3791ccbde864c9f7d0e985bd4d312 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 e343632935e14bfe2cca56f42df0d644bccf593b..62bcc2ff1cdb4b4dc30cd376171252cda6e26f69 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 66265242e693d85fbe981587059360fbb23f65ac..c3054d3709bd3712280b8a87df8b65c020521933 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 9d79e3cf741d2ab183c5ea01a7d29e09ed9e6d91..13f5e01a0022be8fa2bf12dfbbaaa30b0c2f9e03 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 4aed8439d5a7a0b4d9f1948dbb5d42ae59f73ba5..f6234ec3d0b3913975b50d8c39cb6dc4de02c556 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 c46a4305a83b39e740e96da963b18786d23a4457..b4f4b11682044fe8b5db2458cbc8dbd91cdb642f 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 9c54f084d4849497796c6d8bdd22adea8be579e2..cd781eda05e308758250acc5f7ffaca661b79c6c 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 e7873e95fdd6b030c6a7f1e09fcadfaeabd4ced0..4adfeed082a4fad4708249f30d55de03e847ad5b 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 6ba0d3fe57d15c8d3f8d4e16f3ba9093535c7ea2..deb20aab9b772f14a85ae5891aaf5c65b3722618 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 21c0866f895bdd4e58acc60498278c8629d2b52d..2a3595aa5703104cfebd1bdd944cfcbc563a3487 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 54330821b1f06024773fb065707b57d8b01a95d0..367e667a1019016c77fb910d6e79396697a2d0d5 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 ccc0d5d225be7f1228f36706ab52c264d36c902b..54484ad433b66f5360e771c82fb1175ae3752636 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 094a14c24bac7d461d6b9ed48659525691f937cb..0911f8c9259177f9e8898f1c4770dd4ac9e167f6 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 4de879abe239f87e00424695e05d97ba6715ee5f..17c84963c368e85831cb4ee1d0f1c0818745f68f 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 f2ed0df494d99e187735015091e7f28252bb6047..35a020bd6d64400a1c949caeefbad74e5092ca26 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 35d289fadc7627d4acad86a12e85ce75089f5595..ce19b1f8208b2833d6d4906e7786a14c5c472bda 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 1d9c05b729bf20d737551ad2e65fceededf65da8..31e99f3bec1c05b3706c6ae26a6ef6b70f983096 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 7fee1d2dfc11b10fdc6822c971a35c2aec4152ac..e363d9a078b5b6f198f6e5adf66c4c5bd0daa352 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 776fe40dec1b2479a882f03314846ab7e31ac069..7f8367436ca666a06a58690804679d3e97b1792f 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 f0f770cb3fe716fab5e689e75a1577c0c57f3da5..a6e34d0cc167ba25fd2de86ef353c44ecfd890f2 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 a23ac9ca49b80de0cd10ea32108d68fd95a67e8e..2a8226a8de616d69d176fb15480f509715662bbd 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 c45b258bda71e67fc8c0f998017eaee10aed8322..3cfeb204050097dca0e1c00c6a5285ff2f6e9ae3 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 d9187825e54052d69efa73ce9eca8697d0d72616..19641b7df5ea4e903eabeb3a187c62c67d74b411 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 c44d62eb0c51422b6907c06580792fa300665fe6..68bd4c8fa8bc58d03fcefe3f0a58141ae5454a10 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 7f262cbf91839331fba3d486214fe85235ee8a0e..b98883edbe639ccbbc8b7df34a2fbd5a7eb14376 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 af0f7f4758ea135f13f2ced9e8a2e5bd0b6adb03..91c5f22b549877e7618a4638fce8afb4ea6209ac 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 48b23bdcd64c08d75e659c329ce047cf2a97cae0..1ecb4b5ef4c8b7d57a01010f2493073eaea9b08a 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 205f5ccb03ad0f6a1f93da8ec96db27eeed80c85..4d557611469290e7395d4691a9d5002f0182f6ca 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 264192f2620b3b7999c3ab9b19e8fe5dffee4504..fd0bab1643bb47b9ff3f8353d8b642586bbad117 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 7c3ebad4b7fc958693c1cef21600d2e1de650203..43453b7cfca89ac239f1efe8fc53a2807e926f96 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 e9704fc9af813d39514cac798f9d3d3203ae4464..7eb6921b55edd0c4fbea02926e8be6b87c59a467 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 c4763335b6e33999936916c1d7b14b4304cd2c31..1660b0509e9788cdcc4c30a8c711621e58bfc5fd 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 2e4ee66cf6167e803970a508ea83ec7bb234c6f4..3d98974a2a474d0e05885c6c9323c79b104d2475 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 efa2802fee22d9f643b1a36b2653695862c6ef20..528f2762a5850a621e39d991b00f0b30115becc9 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 5340f7c2d1dee2f52649625cdd66654843311882..d66ec3a194f7b4c25da91cb01da2eaee90c7e63e 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 6b73abe1f6f8970ff05297f7ad57d95c1ecf24f9..6559429f82f6f9288de9161860c8d508e0b1a69d 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 d4e487124b16835967006037348a11684502ace9..484c2d98aa996c7b020ed4740094346a7ae43c91 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 af88a3fa2d10b08185ad5dd8e11cfe1d2a638608..ce90d7f170a3974e0e6b997e3dfa54d84d6a992d 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 5dcca7573371165d1dee756ad7de19ded8b65e17..1876279abd49ff763b1a492bbed46ab04f1cbc80 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 01d861b2ed8a6768e59a302d324d2a28484b34f9..fec22d89a4568b1f61aa402c57f1726f849947ae 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 a887446f262050af2a96eea048b688e9d9bf7465..b6984da2ca03fae3989e7ef03ad9c163c1553b14 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 4570398cd462b7c9f942a1f5ffb9a17abd80b55e..f38e5da0d04a7d722587ccd558628128198853fa 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 e5a0fb9715367b5d6985011a8963e427d6a236cf..01ae31769f6101b4d27fceb162241da534a45024 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 047b4a4f71a4b32e669b8d1390e5aba0debcf701..5e51d8134ed59bc6d12f283d0f8dfaa1f1f75ea1 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 e3fef5e2ce9e0f021e5e86b6d48726f53dbffe6f..2f2a3e823afe8d1c9cad7e3d35e92abf79fe79ed 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 04148898eaca979f87197467d55cb9ef72df5fa6..ae9503fd9f6feb24058d64c0b72ffdb33242746e 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 11ede968180822bea92f7397e38d895e74009f72..7ea4342a1be37527a59809d798a0747e69620807 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 805cc59b306a610ec9757063e7a78460f07c8616..9aef77cc5af411491aa213cb29b1afd90097f214 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 82fe19c725f02a02885b0a06f4025464dba03f7c..7e0c4a20cfb7a6c50203327057526d54f54a7d51 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 87abfba14c2be96ee71cc4555c8aeef9f6afbb95..73b988f29b6d32f3dc700f483942ebbe9b23afcc 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 3d135c4eaa6914789d05d51c6a797609b5c7572a..841361541a820b882c0411fb017359a3a3aa8f69 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 7024a833b24d69bdb64e194d45691114b67f5542..bbc2b4e3ebd0f4b3611062a6bdf18184e115a1ab 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 cfc6fdc3e06ce61ac8d15e80fa27690678807b41..97715a32928edd82d5b5206de572b8065e79a511 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 f5128474479a4208499f70bc7ea46f1a79decb60..4e8c0d110551307d59d67ae1f398365ff2ebb0ab 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 35ecc656b931cf3b2534f4d3b864fabf5e9ad029..67c848510ecc364ee7b4c363cda56afdd32e7f20 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 1c2f1a2ec5fb34aa19e07bc397aa7e34dce3a5e7..e0bd6e3e05eabc37740b0f2a927014326cfd9ede 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 5fe3075efc432569bc6c46cdef5c927822a79d4a..015e4dc527ec281dfc279a8b14abfe0585569765 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 6f1c640b1a329fd6969679b4be9c985d7597aeba..7fd5a47f337781f2627c71cea895f165cc0487c3 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 57f64ba4079b56ace9088f8016b370a4d6abd367..69e99a6db43ab2010127086e46d58ae8dbb9a844 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 c626702dd32a710e75582d9c640eca8e3e6fdb50..75fcb6a922b60fe83804c77093bdb676da0634d1 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 37d93bb3c70d99f7269384e87bfb741bec46fde9..e34e43a2e7bdd05e1148a53da58013a54209dbb1 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 84540f5e546d76cfce3c8e8f41040add5de7243d..7cfd4fa4ae67d56b43dcc6628ecda5900bdaf58d 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 f2a35ee2b39ad72055483d142c2acca8a0dd9cc3..8692ab8b8dd9fab62895b56b87cb633ccc08491e 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 87264fbb4b5726393dc8d5785616d6c32bd88995..f0b5c9fe9f336713e499b3fd8b3a8f258f8b3d19 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 3df6e39f49decf2dfbb0ca766cd96f9d5e455de7..6e0721e9869bc3f7f4eaf804e4cc35caf2006dfc 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 1c3d2771b08497eab1f51ae5388097a899bacfe0..ee19b026e7d8a257bbd78fd6648c8de5dfe32f79 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 3809e7120cd6745380be433bfc2d30a51bf452c8..55f264c323b20b14b45497a9223af85bd9438b21 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 4356a671e8369e402fd2c62832c910da7c086aea..c4a1f54885a90cbb92c15aec1dd4d0499ceb6f64 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 a13648b6efe251fb41556fd20876b13da825918b..ded0f4cbedaa7a7fd569cf1827541fa9c1eef320 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 18200ec81454131b2ad2719c3a576b4d1cebc261..d3546c7470f03db0ac027d9e6c475e7386f4552c 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 cea2834305dd6a78f88c0695518ba5e12bf1b0b6..6d39580b2720d6bf9fd7a8ea7280c179f8002936 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 5125b21e04f372f7158472604ad10a9627de4a54..bf43dad01b59f5dfa92c63455c1a16d7a39fd7c7 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 d527d098f5774ae43cdf81239bf67d787596d2ba..8f4b42c757caba5103e6f5d02d7bfae56a123eda 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 9ede7645d9e1230d97cdf99caa35c8fe68b39e02..0bb0568e424ad3615499ca4439650206b6131b96 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 756b7c2671759271bd40f098c1365b22b3287da3..76d025cf6956e1fef546c40ae2a10b8065420fd9 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 b9eec62cfa44fac3f6f45d4c47b7494353be8a76..f8200f99f2fa220929f7adfb4c1200ef891436c3 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 88bdb03e67af93694e92dec1bb897cda75aa244d..09995e87be0b45808c48c2bbd67611d0a3a0a59b 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 e8549e938617c09ac29341405df15fbbbafcacc4..b0a2e5d2071ebbd37fcaea153d87b0e0a27a936b 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 46b30e025a440429aec6ae3400eeb9fc542e9212..fe6a0db536943d0012746081c436c0d225303f07 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 74bba05fe8a2afd67db0bbdb5700e3c4ef207ef9..9d2051df3a3b5b3436ddc636909e05f718650080 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 734f3543927a4e28dfebdb497ad787d26413b688..edc42e45aeed98e1accceda858fb634585776ba0 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 461362f91a3c5f5f338d65f26da5458105c9409d..ac98fb5483d7582ede1b2186d043570ae5b13f9e 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 1c44ce032fee13bccaf23c0ac67bb522ea008e1e..0f56279e4deac51d31c93659becf09b158c1cebe 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 c4d253af45c03bfb8c6b8155127f34a10ddacaaf..b781f7273242893fcf8d9a6e6c6f03c2bdcafde8 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 33a94bc2ca79fc65b74f4b15f03745837dc6f47d..1128c4ecb4b4406cb9d9ca978d6c3afdbe8020dd 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 ac0d83ac1c5883b4d0958e340b9474818163d033..046ec254813081d4fff7911f374ca85967623437 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 ba6d9322497fa3cc50c79e1d4cb4e6b69f8fbc47..368a66b95dd40eacad67a1c958865df5018a20b0 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 f15ce9906e9138576033ca42c9cc0d55df569314..1a3bf1c6fe8f19aeaf18fc86c7c8f0d0442a7c87 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 889207a94e633cde9bfae9ed8d6f960729dc6ae8..0b7b6d4f87c4dd9f3d79566c136bc385ae2112f7 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 a709d0ed62a841f6c6abd0a48b54ce4e6b03a1e2..6120f5829045c2a11acb736e025794a66785a4a0 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 863029d146d8511e100f96f777df16ab742b1dda..799cf76996976bef4cb67e223d9a16e7586e270c 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 1d2d38b36bbc23b128bf86300ff7535c065a3b5b..cd5ef94579c70140094ad018742b4ac1a3490c72 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 6f1195b1e50211f713abd949de4e43333dc5c56e..a045f22410854761dc0f8b931fc95c9becd322eb 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 ef92637127ff050c8cd79ab976b2a919430c04f4..59743dfed01940da6832b248b532f753ba91eb32 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 179ff7ad50a60da0e2ef8c08279936e8daec59da..9f83c7df064dc3b16875f33a9afa9f92d76587ae 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 19e627b61ca6e77f2c44fa91c5600f7e038ce4a2..e03e71026a97a02f4f1b7188a3c73fc72155e5e8 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 94bdd8ca7d2c6f31ed42bbfaa9c686f71c158975..ad7f290376b7b50a3b314066e522c4342bb75fb0 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 34a1ea6e2c6d7750d4f5e1ec9d9796daba954e80..a35418fa896f630aaa7dd5832cf6ed5f6bd4fc3f 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 06ede3e039a171ad034118576d3615388223ead2..666219e3cfc25edabab47d528c070fe010cea303 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 77881e7a28d673d0032d2ce7adb904100a3582c4..7123a8370948cb8a13d21d6c865c4180dc00fb24 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 b791589adf12681a93f507049a04dcd84866819b..c825f13c26e6e672143b19052bd01b3d0bb6ba39 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 596bf15566056717a00569e0f150e00f4d715c75..46f94dac7013dae827b38a6ae6f55b882abbcc28 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 6251383f5586ec48280a68e0f2957014d20293b1..89db35b70e128efe21925932585c6a757561dd65 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 23598f33ca45600e5a02a7b5949ee329d6490285..f6b013c364409a8bc13fb0f5c228d47f2fd9c0de 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 5c6ddc6b47509557175c677b0a11a95432d6929c..bce8c9c8fe8ededa875ac9cfbbe4555ae8e63a98 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 08cadf62715352eeaacf0fe54886c6abc734d38e..8c14e8b62cb77a166198b83a1a509abbc7e044a7 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 60d401fa0e54f6a3736fcb800d3aa23b440f6a1a..33eeca220abed1930b83b9241b73384b2c6ac4a7 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 0e878f054ffb1889677581ce081a7589423ac91f..6e3c160ec86b58296f37259a7de214b09df1cfcc 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 6068c234ecf1a78f1c4dcee9e5f070886ad4faa8..3a031de08793f3a8b008c2fa5a67b8c7bfc4090f 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 264f5ab1d9753803782d89dfb3eb06f1a0b70257..fa0ccd813283278765031c6885fea7da95c1d399 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 9ef0bfdd86f016bd0ce0f15e15ecdc2acbf7292a..1f6dc3fe54cc4f37633c9b20c96fb71ecdea8a2a 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 f39867febc5ee852310d63328aa182d73d278144..72e4791f3011a03787f19427315e7b6ba938d209 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 c84240e03de5e64952af48147ad0f2f4a6207048..40211a0ac9a397d5ded6cdd698fe3f024dc65c9c 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 4205f46e5c9d7c458b810ca751de23a83924fd19..1a614fd6279bd6aa40197748a98f36992ed5677e 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 aa9dc9755f69909b4bca93216f33c28ec29db4b1..a8f520c3c2ebdc5e450622d3cfc0a9d560edf6c8 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 4ae25adde04c139017ad199e28fcb0ad72e87d2b..51826d7356206a762d754eb8f3ef0b41c8edda04 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 0e28555bfe50cbcde62d66c48c51f46dd1db95bc..3574a6f5f886d91e78812d5c01b0385d1810d09e 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 1306702fcbb23b74985fbce6a05c10cd1d495008..05e3f962497b47762f1d74ad229fe25caa13a21b 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 efdb163dd2dd3e9c6b948eb5b35a0ebb4aa59a6d..f9bbb4d0b1041f14a14a750e5530d5a92676ba63 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 8bbc730cb9cccbe0e782587637f54816cbe4e013..28fecf1fc92929c5ef6f12e9095631e7551fe9a8 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 ac1642e1fcef053ef3bd8ec0ce2fbcde9efa058c..35eebeb0c6b94873009a8462ed0c32f7d73393fd 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 efe4693ec6ffdd788c8235a4d6bba0d434465136..86ebcbaf014806ed79e52008da3bc8f6e11d0572 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 1d202d4b2f8381ea402f9205abc1d1a0a6dce737..cf92fa77f3a44cec07b34d0ce5fb377b50445408 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 a981a8fe953c0258ac5ce2d5c986203dc34cab21..09e1c8cfc5f3ded2663fb9555aa5999ce4896999 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 b4da4ce9206b565fe4292b0041c56a5b181ca5dc..fef722be8395d91f848673f2efcc1081b9fae423 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 daaa23f48e7ca2a2869c3f75c03fd37d9c943230..73fa97f14a6575330668e613ab3e014ae2569c25 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 93798a46f963c0b8d9f537e7b42b9f5bb6ef0f15..8df56e393a86e32eb15625a2452bd9ddfe2fc2eb 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 f4a8fa577d2ae9bbf4f42d312af1286a40e55475..95230ac17c70a4296fcd6ac8304c05c541589204 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 4f1d70c3d5daf450a18779bb1de638ab739aa9d7..21bb2797fc81158ba403c0ecd8435dbc019e87d3 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 0dc9f8a010d1ec3f660e3b3a97ac9f80665287a1..c8b54bf48593ce803e42336e637c88272eae35a7 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 bbbfa15db1d7e83fc68700149cec66bf043e9147..b7831b4473ebd2319b0f011b4562a845260e929c 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 2ef454532f833ecbb6b750dab1a3465a521cd1bb..ad0f5a944054c8029f77d621acf0a94b6ffdbb3d 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 81133bb5c8689eaadd8956badc49e3f0fb20e1eb..9bac0e28834038906c968595f43b07461cd8cd0e 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 fc2357d4064dd719863692df79dcf3ad5e11529e..cf2af93d37891414b6e35475115425cc9c31a8c5 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 b0615a0e37753b5d2481bfa82e1e414755630722..1c8d3cec19470f7ec3f714c9e60daf9b8e814f33 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 6367f873ef94414c5273d675abba39d133fc9e8a..dcfb73c859f9d4385896773f80eb6b7b43149620 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 106e6f27591dcb4fd3d59d68d02ef168a9fc8cd2..cdd7bdf75f8f2e737942e3b671caac36c0951786 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 a18618893cd132de4df0bc96338389d20a2027df..ac5285a866ff843bc0ebe16d3b362dc834a3a6f0 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 1675ab752cbb145de7139cc88187a180acd0ccd5..2844c6354a601e896d321b5b2a77897f25dda495 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 35745484d44ddb570b36f95f80a5088bce376357..e0bd8c79764bc514daf68215f7cd6519b7e296f9 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 67d8d7f63148a286deac640026fc852bc9f3439a..5132293def6677c28f9562d3905e4535b433339a 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 f563c580c2092268c12ab1205cda5c1fadfb39b2..4a54b9028d6d7c1aafa43f63e86ef2ec4dbc6247 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 1a125f16ce8c7106a2016d0365beb8992de1a6ed..6250926281bfbf7532310a7a71191037757df8db 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 20917ee9a5cfdc5273f7fa33ad8404893551e2d5..fee3ab996f881cc7b6485883415e5a341c4976b7 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 4eecf770867c91b1c644b7f19e5efd89d6abe6dc..fc267d114fc9c533212bb80effcee1c9c9f6df3b 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 f2efe9f410ba87f52fb2361fac7d13d07f588fac..9baf730798ff73e2f3fa9fada30e199cd2bf4f97 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 dc0ee0b2231d28b5bf9b679a653eaa09d55e7df2..3c32d9f9a30f9790846b2dffcfcdb707f35f1328 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 4e8080bf6bfb0368ee7a800d41f65c1d6f0334cf..fdefc4e833d6e5d4a0302ac6c81cbbde4407ae0e 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 bcd16ec5da026222813766c64ddc02498c6fcb0f..d01898f2df1c88b72e1bfd01edde6891de9e0d80 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 4d1bdd7b143883e126f8b58be31c2d964517802a..709423dbe0ad3630547a26546a110cd0aaf120ed 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 f90e9ecd735c31d6ce9d9d2935ce9f8592599ae6..528776a2432262a16a2461f077c0eaa520f4d7bc 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 9ccd308087639245ee03aa3dcb7b4bb0542cb19c..d85da94bd987433aa339981408a1f6f2a66a05ed 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 b50cba556cf79dfe77d3a7e6ab9836d259859b6f..fdb4e3711e560b143eb151ab4d0fdc6e6f2dc06e 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 047f5f059fda869dd6df095b83a3cda1c02aad25..6fcc8ec7d8e97757f5eddb59e89ba4dc27d07d00 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 550cf82d1720b08ee3e0e7e176380c6c14df0c8e..2f40051278c47494e4dd3a49895a848e7d683c1e 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 2d9b8c880286acdedb27d0e7e70fa0397019813e..50b4df02b894f8ab824a7962dc718079da4b69a9 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,