rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/README b/README
index 49f9d888e0ac6402bb67fbbbd7331011ec49d5dd..5135281ddc64cf84d0ec080142983956d74eea99 100644 (file)
--- a/README
+++ b/README
@@ -2120,22 +2120,22 @@ following configurations:
           environment in one of the last sectors, leaving a gap
           between U-Boot and the environment.
 
           environment in one of the last sectors, leaving a gap
           between U-Boot and the environment.
 

-       - CFG_ENV_OFFSET:
+       - CONFIG_ENV_OFFSET:

 
           Offset of environment data (variable area) to the
           beginning of flash memory; for instance, with bottom boot
           type flash chips the second sector can be used: the offset
           for this sector is given here.
 
 
           Offset of environment data (variable area) to the
           beginning of flash memory; for instance, with bottom boot
           type flash chips the second sector can be used: the offset
           for this sector is given here.
 

-          CFG_ENV_OFFSET is used relative to CFG_FLASH_BASE.
+          CONFIG_ENV_OFFSET is used relative to CFG_FLASH_BASE.

 
 

-       - CFG_ENV_ADDR:
+       - CONFIG_ENV_ADDR:

 
           This is just another way to specify the start address of
           the flash sector containing the environment (instead of
 
           This is just another way to specify the start address of
           the flash sector containing the environment (instead of

-          CFG_ENV_OFFSET).
+          CONFIG_ENV_OFFSET).

 
 

-       - CFG_ENV_SECT_SIZE:
+       - CONFIG_ENV_SECT_SIZE:

 
           Size of the sector containing the environment.
 
 
           Size of the sector containing the environment.
 


@@ -2144,10 +2144,10 @@ following configurations:
           In such a case you don't want to spend a whole sector for
           the environment.
 
           In such a case you don't want to spend a whole sector for
           the environment.
 

-       - CFG_ENV_SIZE:
+       - CONFIG_ENV_SIZE:

 
           If you use this in combination with CONFIG_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
+          and CONFIG_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.
 
           of this flash sector for the environment. This saves
           memory for the RAM copy of the environment.
 


@@ -2161,8 +2161,8 @@ following configurations:
           wrong before the contents has been restored from a copy in
           RAM, your target system will be dead.
 
           wrong before the contents has been restored from a copy in
           RAM, your target system will be dead.
 

-       - CFG_ENV_ADDR_REDUND
-         CFG_ENV_SIZE_REDUND
+       - CONFIG_ENV_ADDR_REDUND
+         CONFIG_ENV_SIZE_REDUND

 
           These settings describe a second storage area used to hold
           a redundant copy of the environment data, so that there is
 
           These settings describe a second storage area used to hold
           a redundant copy of the environment data, so that there is


@@ -2180,8 +2180,8 @@ accordingly!
        (NVRAM, battery buffered SRAM) which you want to use for the
        environment.
 
        (NVRAM, battery buffered SRAM) which you want to use for the
        environment.
 

-       - CFG_ENV_ADDR:
-       - CFG_ENV_SIZE:
+       - CONFIG_ENV_ADDR:
+       - CONFIG_ENV_SIZE:

 
          These two #defines are used to determine the memory area you
          want to use for environment. It is assumed that this memory
 
          These two #defines are used to determine the memory area you
          want to use for environment. It is assumed that this memory


@@ -2204,8 +2204,8 @@ to save the current settings.
        Use this if you have an EEPROM or similar serial access
        device and a driver for it.
 
        Use this if you have an EEPROM or similar serial access
        device and a driver for it.
 

-       - CFG_ENV_OFFSET:
-       - CFG_ENV_SIZE:
+       - CONFIG_ENV_OFFSET:
+       - CONFIG_ENV_SIZE:

 
          These two #defines specify the offset and size of the
          environment area within the total memory of your EEPROM.
 
          These two #defines specify the offset and size of the
          environment area within the total memory of your EEPROM.


@@ -2247,9 +2247,9 @@ to save the current settings.
        Define this if you have a DataFlash memory device which you
        want to use for the environment.
 
        Define this if you have a DataFlash memory device which you
        want to use for the environment.
 

-       - CFG_ENV_OFFSET:
-       - CFG_ENV_ADDR:
-       - CFG_ENV_SIZE:
+       - CONFIG_ENV_OFFSET:
+       - CONFIG_ENV_ADDR:
+       - CONFIG_ENV_SIZE:

 
          These three #defines specify the offset and size of the
          environment area within the total memory of your DataFlash placed
 
          These three #defines specify the offset and size of the
          environment area within the total memory of your DataFlash placed


@@ -2260,21 +2260,21 @@ to save the current settings.
        Define this if you have a NAND device which you want to use
        for the environment.
 
        Define this if you have a NAND device which you want to use
        for the environment.
 

-       - CFG_ENV_OFFSET:
-       - CFG_ENV_SIZE:
+       - CONFIG_ENV_OFFSET:
+       - CONFIG_ENV_SIZE:

 
          These two #defines specify the offset and size of the environment
          area within the first NAND device.
 
 
          These two #defines specify the offset and size of the environment
          area within the first NAND device.
 

-       - CFG_ENV_OFFSET_REDUND
+       - CONFIG_ENV_OFFSET_REDUND

 
 

-         This setting describes a second storage area of CFG_ENV_SIZE
+         This setting describes a second storage area of CONFIG_ENV_SIZE

          size used to hold a redundant copy of the environment data,
          so that there is a valid backup copy in case there is a
          power failure during a "saveenv" operation.
 
          size used to hold a redundant copy of the environment data,
          so that there is a valid backup copy in case there is a
          power failure during a "saveenv" operation.
 

-       Note: CFG_ENV_OFFSET and CFG_ENV_OFFSET_REDUND must be aligned
-       to a block boundary, and CFG_ENV_SIZE must be a multiple of
+       Note: CONFIG_ENV_OFFSET and CONFIG_ENV_OFFSET_REDUND must be aligned
+       to a block boundary, and CONFIG_ENV_SIZE must be a multiple of

        the NAND devices block size.
 
 - CFG_SPI_INIT_OFFSET
        the NAND devices block size.
 
 - CFG_SPI_INIT_OFFSET

diff --git a/api/api.c b/api/api.c
index 19c71540c0387f46dc480989404ed6394ee7b9cb..f51ebb7b1384d316230117fe2a9ce8404d75f6c0 100644 (file)
--- a/api/api.c
+++ b/api/api.c
@@ -534,7 +534,7 @@ static int API_env_enum(va_list ap)
 
                for (i = 0; env_get_char(i) != '\0'; i = n + 1) {
                        for (n = i; env_get_char(n) != '\0'; ++n) {
 
                for (i = 0; env_get_char(i) != '\0'; i = n + 1) {
                        for (n = i; env_get_char(n) != '\0'; ++n) {

-                               if (n >= CFG_ENV_SIZE) {
+                               if (n >= CONFIG_ENV_SIZE) {

                                        /* XXX shouldn't we set *next = NULL?? */
                                        return 0;
                                }
                                        /* XXX shouldn't we set *next = NULL?? */
                                        return 0;
                                }

diff --git a/board/LEOX/elpt860/flash.c b/board/LEOX/elpt860/flash.c
index d77af357a3fec040298cb5794aed501030d5fd51..668aee2f847862abc6d491f4a19ef4691ff6e785 100644 (file)
--- a/board/LEOX/elpt860/flash.c
+++ b/board/LEOX/elpt860/flash.c
@@ -61,8 +61,8 @@
 #include <mpc8xx.h>
 
 
 #include <mpc8xx.h>
 
 

-#ifndef        CFG_ENV_ADDR
-#  define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+#ifndef        CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR      (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

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


@@ -125,8 +125,8 @@ flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
   /* ENV protection ON by default */
   flash_protect(FLAG_PROTECT_SET,
 #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,
+               CONFIG_ENV_ADDR,
+               CONFIG_ENV_ADDR + CONFIG_ENV_SIZE-1,

                &flash_info[0]);
 #endif
 
                &flash_info[0]);
 #endif
 

diff --git a/board/MAI/AmigaOneG3SE/flash_new.c b/board/MAI/AmigaOneG3SE/flash_new.c
index 5e15e2048929f6dd2a55f8c1fcbbb7cba53e4f59..3efee7e98efcbed097d0dafb85b21673bec9ef6e 100644 (file)
--- a/board/MAI/AmigaOneG3SE/flash_new.c
+++ b/board/MAI/AmigaOneG3SE/flash_new.c
@@ -126,8 +126,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
                /* ENV protection ON by default */
                flash_protect(FLAG_PROTECT_SET,
 #ifdef CONFIG_ENV_IS_IN_FLASH
                /* ENV protection ON by default */
                flash_protect(FLAG_PROTECT_SET,

-                             CFG_ENV_ADDR,
-                             CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
+                             CONFIG_ENV_ADDR,
+                             CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,

                              &flash_info[0]);
 #endif
 
                              &flash_info[0]);
 #endif
 

diff --git a/board/RRvision/flash.c b/board/RRvision/flash.c
index 287bbac8c6ccb00e8aa459f65b5b7247135892ec..6608bca1374f8fc6adeb7988bc65f5c1828134c4 100644 (file)
--- a/board/RRvision/flash.c
+++ b/board/RRvision/flash.c
@@ -26,8 +26,8 @@
 #include <common.h>
 #include <mpc8xx.h>
 
 #include <common.h>
 #include <mpc8xx.h>
 

-#ifndef        CFG_ENV_ADDR
-#define CFG_ENV_ADDR   (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+#ifndef        CONFIG_ENV_ADDR
+#define CONFIG_ENV_ADDR        (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

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


@@ -80,8 +80,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
 #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,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,

                      &flash_info[0]);
 #endif
 
                      &flash_info[0]);
 #endif
 

diff --git a/board/a3000/flash.c b/board/a3000/flash.c
index 98a027e783bf921f9ba6d8d2ef29cc1878f6646f..add2a28866604e995bf6aa387f58d31253f83565 100644 (file)
--- a/board/a3000/flash.c
+++ b/board/a3000/flash.c
@@ -26,14 +26,14 @@
 #include <mpc824x.h>
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 #include <mpc824x.h>
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)

-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR  (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR  (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 # endif
 # endif

-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE  CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE  CONFIG_ENV_SECT_SIZE

 # endif
 # endif

-# ifndef  CFG_ENV_SECT_SIZE
-#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE
+# ifndef  CONFIG_ENV_SECT_SIZE
+#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE

 # endif
 #endif
 
 # endif
 #endif
 


@@ -110,10 +110,10 @@ unsigned long flash_init (void)
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */

-       DEBUGF("protect environtment %x @ %x\n", CFG_ENV_ADDR, CFG_ENV_SECT_SIZE);
+       DEBUGF("protect environtment %x @ %x\n", CONFIG_ENV_ADDR, CONFIG_ENV_SECT_SIZE);

        flash_protect(FLAG_PROTECT_SET,
        flash_protect(FLAG_PROTECT_SET,

-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,

                      &flash_info[0]);
 #endif
 
                      &flash_info[0]);
 #endif
 

diff --git a/board/alaska/flash.c b/board/alaska/flash.c
index 715616063ce21e63e14e31007899ddf059f8f3d2..556c16893fd036e12e13429c32e69bf1c5c0e494 100644 (file)
--- a/board/alaska/flash.c
+++ b/board/alaska/flash.c
@@ -144,11 +144,11 @@ unsigned long flash_init (void)
 #endif
 
        flash_protect (FLAG_PROTECT_SET,
 #endif
 
        flash_protect (FLAG_PROTECT_SET,

-                      CFG_ENV1_ADDR,
-                      CFG_ENV1_ADDR + CFG_ENV1_SIZE - 1, &flash_info[1]);
+                      CONFIG_ENV1_ADDR,
+                      CONFIG_ENV1_ADDR + CONFIG_ENV1_SIZE - 1, &flash_info[1]);

        flash_protect (FLAG_PROTECT_SET,
        flash_protect (FLAG_PROTECT_SET,

-                      CFG_ENV_ADDR,
-                      CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[3]);
+                      CONFIG_ENV_ADDR,
+                      CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[3]);

 
        return size;
 }
 
        return size;
 }

diff --git a/board/amcc/bamboo/flash.c b/board/amcc/bamboo/flash.c
index f23fc249c42d905004e1b14a75506688afd9d38c..d004ed7859f0be6654c54927772b7b9565d4af76 100644 (file)
--- a/board/amcc/bamboo/flash.c
+++ b/board/amcc/bamboo/flash.c
@@ -154,12 +154,12 @@ unsigned long flash_init(void)
                                    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
                                    &flash_info[i]);
 #if defined(CONFIG_ENV_IS_IN_FLASH)
                                    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
                                    &flash_info[i]);
 #if defined(CONFIG_ENV_IS_IN_FLASH)

-               (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
-                                   CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
+               (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
+                                   CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,

                                    &flash_info[i]);
                                    &flash_info[i]);

-#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,
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR_REDUND)
+               (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND,
+                                   CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,

                                    &flash_info[i]);
 #endif
 #endif
                                    &flash_info[i]);
 #endif
 #endif

diff --git a/board/amcc/bubinga/flash.c b/board/amcc/bubinga/flash.c
index 0295b8c7083dfb8c39726d8179bba58dbad99557..d71cc292e93d040497db948e31dd05ed489394ca 100644 (file)
--- a/board/amcc/bubinga/flash.c
+++ b/board/amcc/bubinga/flash.c
@@ -85,11 +85,11 @@ unsigned long flash_init(void)
                                    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
                                    &flash_info[0]);
 #ifdef CONFIG_ENV_IS_IN_FLASH
                                    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
                                    &flash_info[0]);
 #ifdef CONFIG_ENV_IS_IN_FLASH

-               (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
-                                   CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
+               (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
+                                   CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,

                                    &flash_info[0]);
                                    &flash_info[0]);

-               (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND,
-                                   CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1,
+               (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND,
+                                   CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,

                                    &flash_info[0]);
 #endif
 
                                    &flash_info[0]);
 #endif
 

diff --git a/board/amcc/ebony/flash.c b/board/amcc/ebony/flash.c
index b49e05f6daf9e70664a9cd30fffb4751246875a8..d9c69744b9d2fa8c970bc7d41c73af30a6a9644d 100644 (file)
--- a/board/amcc/ebony/flash.c
+++ b/board/amcc/ebony/flash.c
@@ -125,11 +125,11 @@ unsigned long flash_init(void)
                                    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
                                    &flash_info[2]);
 #ifdef CONFIG_ENV_IS_IN_FLASH
                                    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
                                    &flash_info[2]);
 #ifdef CONFIG_ENV_IS_IN_FLASH

-               (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
-                                   CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
+               (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
+                                   CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,

                                    &flash_info[2]);
                                    &flash_info[2]);

-               (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND,
-                                   CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1,
+               (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND,
+                                   CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,

                                    &flash_info[2]);
 #endif
 
                                    &flash_info[2]);
 #endif
 

diff --git a/board/amcc/luan/flash.c b/board/amcc/luan/flash.c
index 3b2f9b746fab556ed4e8a19c68a5af1b15dec004..d28bf9d23e039b180f270a492e698bff713eee00 100644 (file)
--- a/board/amcc/luan/flash.c
+++ b/board/amcc/luan/flash.c
@@ -96,11 +96,11 @@ unsigned long flash_init(void)
                                    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
                                    &flash_info[2]);
 #ifdef CONFIG_ENV_IS_IN_FLASH
                                    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
                                    &flash_info[2]);
 #ifdef CONFIG_ENV_IS_IN_FLASH

-               (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
-                                   CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
+               (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
+                                   CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,

                                    &flash_info[2]);
                                    &flash_info[2]);

-               (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND,
-                                   CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1,
+               (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND,
+                                   CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,

                                    &flash_info[2]);
 #endif
 
                                    &flash_info[2]);
 #endif
 

diff --git a/board/amcc/ocotea/flash.c b/board/amcc/ocotea/flash.c
index 88a76f7da608a287745cb51c2e2fbc9e08668653..46c6946f3e28e58ea1363addc3c1c6999b72d41e 100644 (file)
--- a/board/amcc/ocotea/flash.c
+++ b/board/amcc/ocotea/flash.c
@@ -135,11 +135,11 @@ unsigned long flash_init(void)
                                    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
                                    &flash_info[i]);
 #ifdef CONFIG_ENV_IS_IN_FLASH
                                    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
                                    &flash_info[i]);
 #ifdef CONFIG_ENV_IS_IN_FLASH

-               (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
-                                   CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
+               (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
+                                   CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,

                                    &flash_info[i]);
                                    &flash_info[i]);

-               (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND,
-                                   CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1,
+               (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND,
+                                   CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,

                                    &flash_info[i]);
 #endif
 
                                    &flash_info[i]);
 #endif
 

diff --git a/board/amcc/sequoia/sequoia.c b/board/amcc/sequoia/sequoia.c
index c682c8e3e88d2cf49a11165ec2180bccce0c01d7..e439fb90e2dc6df612678c926683ce315f88df8b 100644 (file)
--- a/board/amcc/sequoia/sequoia.c
+++ b/board/amcc/sequoia/sequoia.c
@@ -166,8 +166,8 @@ int misc_init_r(void)
 
        /* Env protection ON by default */
        (void)flash_protect(FLAG_PROTECT_SET,
 
        /* Env protection ON by default */
        (void)flash_protect(FLAG_PROTECT_SET,

-                           CFG_ENV_ADDR_REDUND,
-                           CFG_ENV_ADDR_REDUND + 2*CFG_ENV_SECT_SIZE - 1,
+                           CONFIG_ENV_ADDR_REDUND,
+                           CONFIG_ENV_ADDR_REDUND + 2*CONFIG_ENV_SECT_SIZE - 1,

                            &flash_info[0]);
 #endif
 
                            &flash_info[0]);
 #endif
 

diff --git a/board/amcc/taihu/flash.c b/board/amcc/taihu/flash.c
index 8ffcc393463d9e67c87c2fb5cde1937e6a68e245..ae92bb25b331be444cd607c6a0c44b097fc49973 100644 (file)
--- a/board/amcc/taihu/flash.c
+++ b/board/amcc/taihu/flash.c
@@ -88,11 +88,11 @@ unsigned long flash_init(void)
                                    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
                                    &flash_info[0]);
 #ifdef CONFIG_ENV_IS_IN_FLASH
                                    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
                                    &flash_info[0]);
 #ifdef CONFIG_ENV_IS_IN_FLASH

-               (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
-                                   CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
+               (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
+                                   CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,

                                    &flash_info[0]);
                                    &flash_info[0]);

-               (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND,
-                                   CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1,
+               (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND,
+                                   CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,

                                    &flash_info[0]);
 #endif
                /* Also protect sector containing initial power-up instruction */
                                    &flash_info[0]);
 #endif
                /* Also protect sector containing initial power-up instruction */

diff --git a/board/amcc/walnut/flash.c b/board/amcc/walnut/flash.c
index d47d263e9e10296f2fd2dfb1f9da0a9e2ba6f4f6..fe6ca6c5c5b7ce588997e8355256f2b8924e115e 100644 (file)
--- a/board/amcc/walnut/flash.c
+++ b/board/amcc/walnut/flash.c
@@ -83,11 +83,11 @@ unsigned long flash_init(void)
                                    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
                                    &flash_info[0]);
 #ifdef CONFIG_ENV_IS_IN_FLASH
                                    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
                                    &flash_info[0]);
 #ifdef CONFIG_ENV_IS_IN_FLASH

-               (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
-                                   CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
+               (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
+                                   CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,

                                    &flash_info[0]);
                                    &flash_info[0]);

-               (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND,
-                                   CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1,
+               (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND,
+                                   CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,

                                    &flash_info[0]);
 #endif
 
                                    &flash_info[0]);
 #endif
 

diff --git a/board/amcc/yucca/flash.c b/board/amcc/yucca/flash.c
index 9256938dde7baa2ee27a4388c90befeac0bb03ad..c4053465feddae09b94a9207a9bc10b1a67b545f 100644 (file)
--- a/board/amcc/yucca/flash.c
+++ b/board/amcc/yucca/flash.c
@@ -1038,12 +1038,12 @@ unsigned long flash_init(void)
                                    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
                                    &flash_info[i]);
 #if defined(CONFIG_ENV_IS_IN_FLASH)
                                    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
                                    &flash_info[i]);
 #if defined(CONFIG_ENV_IS_IN_FLASH)

-               (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
-                                   CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
+               (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
+                                   CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,

                                    &flash_info[i]);
                                    &flash_info[i]);

-#if defined(CFG_ENV_ADDR_REDUND)
-               (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND,
-                                   CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1,
+#if defined(CONFIG_ENV_ADDR_REDUND)
+               (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND,
+                                   CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,

                                    &flash_info[i]);
 #endif
 #endif
                                    &flash_info[i]);
 #endif
 #endif

diff --git a/board/armadillo/flash.c b/board/armadillo/flash.c
index 8518856cb1c3566c062893cb595a2ee5d1864f1a..6ed88f401b610d6038bda3ba20e250e839c78ac0 100644 (file)
--- a/board/armadillo/flash.c
+++ b/board/armadillo/flash.c
@@ -74,8 +74,8 @@ ulong flash_init (void)
                       &flash_info[0]);
 
        flash_protect (FLAG_PROTECT_SET,
                       &flash_info[0]);
 
        flash_protect (FLAG_PROTECT_SET,

-                      CFG_ENV_ADDR,
-                      CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                      CONFIG_ENV_ADDR,
+                      CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);

 
        return size;
 }
 
        return size;
 }

diff --git a/board/atc/flash.c b/board/atc/flash.c
index 9e4c6c512ea0d362a744ebe992cb8fa649e8565d..7835e8f45672469a4f2d579a94cd5ac813a48d24 100644 (file)
--- a/board/atc/flash.c
+++ b/board/atc/flash.c
@@ -98,9 +98,9 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
 #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,
-                     flash_get_info(CFG_ENV_ADDR));
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,
+                     flash_get_info(CONFIG_ENV_ADDR));

 #endif
 
 
 #endif
 
 

diff --git a/board/atmel/at91rm9200dk/flash.c b/board/atmel/at91rm9200dk/flash.c
index 0513d61d73f2df9d211c39bbf0e2b481e85aef57..ef8d9a8309cd2662db9ea9388c854c7363b69472 100644 (file)
--- a/board/atmel/at91rm9200dk/flash.c
+++ b/board/atmel/at91rm9200dk/flash.c
@@ -221,8 +221,8 @@ ulong flash_init (void)
 
        /* Protect environment variables */
        flash_protect (FLAG_PROTECT_SET,
 
        /* Protect environment variables */
        flash_protect (FLAG_PROTECT_SET,

-                      CFG_ENV_ADDR,
-                      CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                      CONFIG_ENV_ADDR,
+                      CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);

 
        /* Protect U-Boot gzipped image */
        flash_protect (FLAG_PROTECT_SET,
 
        /* Protect U-Boot gzipped image */
        flash_protect (FLAG_PROTECT_SET,

diff --git a/board/barco/flash.c b/board/barco/flash.c
index c6a01cacaac2cdcd7e814bf4a8622346f1d19b68..53fc58ca154bd6f3a1e025a5aec93b071a9fadb9 100644 (file)
--- a/board/barco/flash.c
+++ b/board/barco/flash.c
@@ -59,14 +59,14 @@
 flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips    */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips    */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)

-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR  (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR  (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 # endif
 # endif

-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE  CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE  CONFIG_ENV_SECT_SIZE

 # endif
 # endif

-# ifndef  CFG_ENV_SECT_SIZE
-#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE
+# ifndef  CONFIG_ENV_SECT_SIZE
+#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE

 # endif
 #endif
 
 # endif
 #endif
 


@@ -224,10 +224,10 @@ unsigned long flash_init(void)
                                &flash_info[0]);
 #endif
 
                                &flash_info[0]);
 #endif
 

-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)

                flash_protect(FLAG_PROTECT_SET,
                flash_protect(FLAG_PROTECT_SET,

-                               CFG_ENV_ADDR,
-                               CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+                               CONFIG_ENV_ADDR,
+                               CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

                                &flash_info[0]);
 #endif
 
                                &flash_info[0]);
 #endif
 

diff --git a/board/bmw/bmw.c b/board/bmw/bmw.c
index 043143163ae0e99c3cca11b2c4bc24b174febbf8..b629c38272d78605ebbf90bc3573518098074a14 100644 (file)
--- a/board/bmw/bmw.c
+++ b/board/bmw/bmw.c
@@ -125,7 +125,7 @@ void doc_init (void)
     doc_probe(DOC_BASE_ADDR);
 }
 
     doc_probe(DOC_BASE_ADDR);
 }
 

-#define NV_ADDR        ((volatile unsigned char *) CFG_ENV_ADDR)
+#define NV_ADDR        ((volatile unsigned char *) CONFIG_ENV_ADDR)

 
 /* Read from NVRAM */
 void*
 
 /* Read from NVRAM */
 void*

diff --git a/board/bmw/flash.c b/board/bmw/flash.c
index 4c7971aee5bc1bb3db1ebf0f6c458084c44825ff..0d0bc2f78b1ad1a993f34887b298f0f4be2e2b99 100644 (file)
--- a/board/bmw/flash.c
+++ b/board/bmw/flash.c
@@ -32,14 +32,14 @@
 flash_info_t flash_info[CFG_MAX_FLASH_BANKS];  /* info for FLASH chips    */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 flash_info_t flash_info[CFG_MAX_FLASH_BANKS];  /* info for FLASH chips    */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)

-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR  (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR  (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 # endif
 # endif

-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE  CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE  CONFIG_ENV_SECT_SIZE

 # endif
 # endif

-# ifndef  CFG_ENV_SECT_SIZE
-#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE
+# ifndef  CONFIG_ENV_SECT_SIZE
+#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE

 # endif
 #endif
 
 # endif
 #endif
 


@@ -224,10 +224,10 @@ unsigned long flash_init (void)
                               &flash_info[0]);
 #endif
 
                               &flash_info[0]);
 #endif
 

-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)

                flash_protect (FLAG_PROTECT_SET,
                flash_protect (FLAG_PROTECT_SET,

-                              CFG_ENV_ADDR,
-                              CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+                              CONFIG_ENV_ADDR,
+                              CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

                               &flash_info[0]);
 #endif
 
                               &flash_info[0]);
 #endif
 

diff --git a/board/c2mon/flash.c b/board/c2mon/flash.c
index 2a5e050abbdf9417371150a5365f4f61a91c2898..7cc5ef0c3bdfc74f67ea52dbd245f5fb8432e296 100644 (file)
--- a/board/c2mon/flash.c
+++ b/board/c2mon/flash.c
@@ -24,8 +24,8 @@
 #include <common.h>
 #include <mpc8xx.h>
 
 #include <common.h>
 #include <mpc8xx.h>
 

-#ifndef        CFG_ENV_ADDR
-#define CFG_ENV_ADDR   (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+#ifndef        CONFIG_ENV_ADDR
+#define CONFIG_ENV_ADDR        (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

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


@@ -98,8 +98,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
 #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,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,

                      &flash_info[0]);
 #endif
 
                      &flash_info[0]);
 #endif
 


@@ -125,8 +125,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
                /* ENV protection ON by default */
                flash_protect(FLAG_PROTECT_SET,
 #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,
+                             CONFIG_ENV_ADDR,
+                             CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,

                              &flash_info[1]);
 #endif
        } else {
                              &flash_info[1]);
 #endif
        } else {

diff --git a/board/cerf250/flash.c b/board/cerf250/flash.c
index ba82892dde557e22b1ea97b1e75828e17460c4ed..3ff19bc5e5c88a98ccb86487b7db4c4058d67ed9 100644 (file)
--- a/board/cerf250/flash.c
+++ b/board/cerf250/flash.c
@@ -90,8 +90,8 @@ unsigned long flash_init (void)
                        &flash_info[0] );
 
        flash_protect ( FLAG_PROTECT_SET,
                        &flash_info[0] );
 
        flash_protect ( FLAG_PROTECT_SET,

-                       CFG_ENV_ADDR,
-                       CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0] );
+                       CONFIG_ENV_ADDR,
+                       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0] );

 
        return size;
 }
 
        return size;
 }

diff --git a/board/cmc_pu2/flash.c b/board/cmc_pu2/flash.c
index 0419d7620026cf9fc008f1485ad6bba8bb97c3a7..8966399f7a6b662528814d75d3f75fff179abfb7 100644 (file)
--- a/board/cmc_pu2/flash.c
+++ b/board/cmc_pu2/flash.c
@@ -29,8 +29,8 @@
 
 #include <common.h>
 
 
 #include <common.h>
 

-#ifndef        CFG_ENV_ADDR
-#define CFG_ENV_ADDR   (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+#ifndef        CONFIG_ENV_ADDR
+#define CONFIG_ENV_ADDR        (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

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


@@ -74,9 +74,9 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
 #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,
-                     flash_get_info(CFG_ENV_ADDR));
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,
+                     flash_get_info(CONFIG_ENV_ADDR));

 #endif
 
        return size ? size : 1;
 #endif
 
        return size ? size : 1;

diff --git a/board/cmi/cmi.c b/board/cmi/cmi.c
index 8501cae21adf3260f27ab2e68bf475c73ed075f5..ee243db66a7071fa1f1210c6cfcfccad557bf9a4 100644 (file)
--- a/board/cmi/cmi.c
+++ b/board/cmi/cmi.c
@@ -70,4 +70,4 @@ phys_size_t initdram(int board_type)
 /*
  * Absolute environment address for linker file.
  */
 /*
  * Absolute environment address for linker file.
  */

-GEN_ABS(env_start, CFG_ENV_OFFSET + CFG_FLASH_BASE);
+GEN_ABS(env_start, CONFIG_ENV_OFFSET + CFG_FLASH_BASE);

diff --git a/board/cmi/flash.c b/board/cmi/flash.c
index aec6a8ef9216d9cd81daa61ecd2f992ba0663bef..0d4582b239b468e4f9e5980c3e9e55587d886d60 100644 (file)
--- a/board/cmi/flash.c
+++ b/board/cmi/flash.c
@@ -37,14 +37,14 @@
 #include <mpc5xx.h>
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 #include <mpc5xx.h>
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)

-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR      (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 # endif
 # endif

-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
 # endif

-# ifndef  CFG_ENV_SECT_SIZE
-#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE
+# ifndef  CONFIG_ENV_SECT_SIZE
+#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE

 # endif
 #endif
 
 # endif
 #endif
 


@@ -113,8 +113,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,

-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,

                      &flash_info[0]);
 #endif
 
                      &flash_info[0]);
 #endif
 

diff --git a/board/cogent/flash.c b/board/cogent/flash.c
index fc3e5ff88ed2b03374c149e0abc20535f1abdb59..942f33ab02d4a9aa75986a80216aa16a359bedd8 100644 (file)
--- a/board/cogent/flash.c
+++ b/board/cogent/flash.c
@@ -27,14 +27,14 @@
 flash_info_t   flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips        */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 flash_info_t   flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips        */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)

-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR      (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 # endif
 # endif

-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
 # endif

-# ifndef  CFG_ENV_SECT_SIZE
-#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE
+# ifndef  CONFIG_ENV_SECT_SIZE
+#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE

 # endif
 #endif
 
 # endif
 #endif
 


@@ -330,8 +330,8 @@ flash_init(void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,

-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,

                      &flash_info[0]);
 #endif
        return total;
                      &flash_info[0]);
 #endif
        return total;

diff --git a/board/cpc45/flash.c b/board/cpc45/flash.c
index db9a637b56ba4004bedea924ab923cf74377e5fc..3826a54a3dc7d89a2b7e2568816d5b3aad996282 100644 (file)
--- a/board/cpc45/flash.c
+++ b/board/cpc45/flash.c
@@ -26,14 +26,14 @@
 #include <asm/processor.h>
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 #include <asm/processor.h>
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)

-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR      (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 # endif
 # endif

-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
 # endif

-# ifndef  CFG_ENV_SECT_SIZE
-#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE
+# ifndef  CONFIG_ENV_SECT_SIZE
+#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE

 # endif
 #endif
 
 # endif
 #endif
 


@@ -174,15 +174,15 @@ unsigned long flash_init (void)
                       &flash_info[0]);
 #endif
 
                       &flash_info[0]);
 #endif
 

-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
-#if CFG_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
+#if CONFIG_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE

        flash_protect (FLAG_PROTECT_SET,
        flash_protect (FLAG_PROTECT_SET,

-                      CFG_ENV_ADDR,
-                      CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[1]);
+                      CONFIG_ENV_ADDR,
+                      CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[1]);

 #else
        flash_protect (FLAG_PROTECT_SET,
 #else
        flash_protect (FLAG_PROTECT_SET,

-                      CFG_ENV_ADDR,
-                      CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                      CONFIG_ENV_ADDR,
+                      CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);

 #endif
 #endif
 
 #endif
 #endif
 

diff --git a/board/cpu86/flash.c b/board/cpu86/flash.c
index e6a14b0d8f3a4d4eac7e9f928ac80d6a9b81df84..845a3b2af9af4a3adae7adf7f5f86160b928b23f 100644 (file)
--- a/board/cpu86/flash.c
+++ b/board/cpu86/flash.c
@@ -230,20 +230,20 @@ unsigned long flash_init (void)
 #endif
 #endif
 
 #endif
 #endif
 

-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
 # endif

-# if CFG_ENV_ADDR >= CFG_BOOTROM_BASE
+# if CONFIG_ENV_ADDR >= CFG_BOOTROM_BASE

        if (size_b1) {
                flash_protect (FLAG_PROTECT_SET,
        if (size_b1) {
                flash_protect (FLAG_PROTECT_SET,

-                               CFG_ENV_ADDR,
-                               CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[1]);
+                               CONFIG_ENV_ADDR,
+                               CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[1]);

        }
 # else
        flash_protect (FLAG_PROTECT_SET,
        }
 # else
        flash_protect (FLAG_PROTECT_SET,

-                      CFG_ENV_ADDR,
-                      CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                      CONFIG_ENV_ADDR,
+                      CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);

 # endif
 #endif
 
 # endif
 #endif
 

diff --git a/board/cpu87/flash.c b/board/cpu87/flash.c
index b96a30c5a3007c0a8adbce88dcd15757876579ce..f7e121f09cf57168871fb95cc4b7ee846bbb9614 100644 (file)
--- a/board/cpu87/flash.c
+++ b/board/cpu87/flash.c
@@ -236,20 +236,20 @@ unsigned long flash_init (void)
 #endif
 #endif
 
 #endif
 #endif
 

-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
 # endif

-# if CFG_ENV_ADDR >= CFG_BOOTROM_BASE
+# if CONFIG_ENV_ADDR >= CFG_BOOTROM_BASE

        if (size_b1) {
                flash_protect (FLAG_PROTECT_SET,
        if (size_b1) {
                flash_protect (FLAG_PROTECT_SET,

-                               CFG_ENV_ADDR,
-                               CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[1]);
+                               CONFIG_ENV_ADDR,
+                               CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[1]);

        }
 # else
        flash_protect (FLAG_PROTECT_SET,
        }
 # else
        flash_protect (FLAG_PROTECT_SET,

-                      CFG_ENV_ADDR,
-                      CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                      CONFIG_ENV_ADDR,
+                      CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);

 # endif
 #endif
 
 # endif
 #endif
 

diff --git a/board/cradle/flash.c b/board/cradle/flash.c
index f3f9a8ccea83842d64846f4e6425da451f930298..4783d92608b580c087fc37a4bab3380edc18a8da 100644 (file)
--- a/board/cradle/flash.c
+++ b/board/cradle/flash.c
@@ -76,8 +76,8 @@ ulong flash_init (void)
                       &flash_info[0]);
 
        flash_protect (FLAG_PROTECT_SET,
                       &flash_info[0]);
 
        flash_protect (FLAG_PROTECT_SET,

-                      CFG_ENV_ADDR,
-                      CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                      CONFIG_ENV_ADDR,
+                      CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);

 
        return size;
 }
 
        return size;
 }

diff --git a/board/csb226/flash.c b/board/csb226/flash.c
index f6dfd9617708a482582fbbcbcaa4c51cfc500d7d..2a609094a6d38a27431e673603eccdf2e3b6fe0b 100644 (file)
--- a/board/csb226/flash.c
+++ b/board/csb226/flash.c
@@ -81,8 +81,8 @@ ulong flash_init(void)
                        &flash_info[0]);
 
        flash_protect(FLAG_PROTECT_SET,
                        &flash_info[0]);
 
        flash_protect(FLAG_PROTECT_SET,

-                       CFG_ENV_ADDR,
-                       CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+                       CONFIG_ENV_ADDR,
+                       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

                        &flash_info[0]);
 
        return size;
                        &flash_info[0]);
 
        return size;

diff --git a/board/cu824/flash.c b/board/cu824/flash.c
index 5e55284a7dd512f2b25a2eac1b0604d5e54c4f41..6fe2978c209a374667fc6767f0dd28ae6e6c6d6b 100644 (file)
--- a/board/cu824/flash.c
+++ b/board/cu824/flash.c
@@ -26,14 +26,14 @@
 #include <asm/processor.h>
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 #include <asm/processor.h>
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)

-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR      (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 # endif
 # endif

-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
 # endif

-# ifndef  CFG_ENV_SECT_SIZE
-#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE
+# ifndef  CONFIG_ENV_SECT_SIZE
+#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE

 # endif
 #endif
 
 # endif
 #endif
 


@@ -135,16 +135,16 @@ unsigned long flash_init(void)
 #endif
 #endif
 
 #endif
 #endif
 

-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
-#if CFG_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
+#if CONFIG_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE

     flash_protect(FLAG_PROTECT_SET,
     flash_protect(FLAG_PROTECT_SET,

-             CFG_ENV_ADDR,
-             CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+             CONFIG_ENV_ADDR,
+             CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

              &flash_info[1]);
 #else
     flash_protect(FLAG_PROTECT_SET,
              &flash_info[1]);
 #else
     flash_protect(FLAG_PROTECT_SET,

-             CFG_ENV_ADDR,
-             CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+             CONFIG_ENV_ADDR,
+             CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

              &flash_info[0]);
 #endif
 #endif
              &flash_info[0]);
 #endif
 #endif

diff --git a/board/dnp1110/flash.c b/board/dnp1110/flash.c
index 60874ba9b834ca1355cbebc6981c60cfaebf5d01..84b820aaa108da315916f2d0adf26f5b4ca157cc 100644 (file)
--- a/board/dnp1110/flash.c
+++ b/board/dnp1110/flash.c
@@ -88,8 +88,8 @@ unsigned long flash_init (void)
                  &flash_info[0]);
 
     flash_protect(FLAG_PROTECT_SET,
                  &flash_info[0]);
 
     flash_protect(FLAG_PROTECT_SET,

-                 CFG_ENV_ADDR,
-                 CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+                 CONFIG_ENV_ADDR,
+                 CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

                  &flash_info[0]);
 
     return size;
                  &flash_info[0]);
 
     return size;

diff --git a/board/eltec/elppc/misc.c b/board/eltec/elppc/misc.c
index 5fb20ae66c079c8fa7cae827310bba4c1de79c46..5e3a81c6e196c0a1cc5abd9244ecde8403d8cc9c 100644 (file)
--- a/board/eltec/elppc/misc.c
+++ b/board/eltec/elppc/misc.c
@@ -42,7 +42,7 @@ extern int read_eeprom (struct eth_device *dev, int location, int addr_len);
 void *nvram_read (void *dest, const long src, size_t count)
 {
        uchar *d = (uchar *) dest;
 void *nvram_read (void *dest, const long src, size_t count)
 {
        uchar *d = (uchar *) dest;

-       uchar *s = (uchar *) (CFG_ENV_MAP_ADRS + src);
+       uchar *s = (uchar *) (CONFIG_ENV_MAP_ADRS + src);

 
        while (count--)
                *d++ = *s++;
 
        while (count--)
                *d++ = *s++;


@@ -52,7 +52,7 @@ void *nvram_read (void *dest, const long src, size_t count)
 
 void nvram_write (long dest, const void *src, size_t count)
 {
 
 void nvram_write (long dest, const void *src, size_t count)
 {

-       uchar *d = (uchar *) (CFG_ENV_MAP_ADRS + dest);
+       uchar *d = (uchar *) (CONFIG_ENV_MAP_ADRS + dest);

        uchar *s = (uchar *) src;
 
        while (count--)
        uchar *s = (uchar *) src;
 
        while (count--)

diff --git a/board/emk/common/flash.c b/board/emk/common/flash.c
index 0e8d337f723b5f74d6abb886b504b899bd5a4e3c..04c35bc93f388d3b840735a0b9580715474fef6f 100644 (file)
--- a/board/emk/common/flash.c
+++ b/board/emk/common/flash.c
@@ -116,9 +116,9 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
 #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,
-                     flash_get_info(CFG_ENV_ADDR));
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,
+                     flash_get_info(CONFIG_ENV_ADDR));

 #endif
 
 
 #endif
 
 

diff --git a/board/ep7312/flash.c b/board/ep7312/flash.c
index 272a9e5ccea3ce09eb5c47b07ee68079c1e45363..1ef06f861f131cad34ff684c026afcfd24ba8a1f 100644 (file)
--- a/board/ep7312/flash.c
+++ b/board/ep7312/flash.c
@@ -65,8 +65,8 @@ ulong flash_init (void)
                        &flash_info[0]);
 
        flash_protect ( FLAG_PROTECT_SET,
                        &flash_info[0]);
 
        flash_protect ( FLAG_PROTECT_SET,

-                       CFG_ENV_ADDR,
-                       CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                       CONFIG_ENV_ADDR,
+                       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);

 
        return size;
 }
 
        return size;
 }

diff --git a/board/ep8260/flash.c b/board/ep8260/flash.c
index 8d996407cd8f479777516082ce30c54891c129c3..d32486d3453a433919731426bb1b6ccbcd18f579 100644 (file)
--- a/board/ep8260/flash.c
+++ b/board/ep8260/flash.c
@@ -157,13 +157,13 @@ unsigned long flash_init (void)
                      &flash_info[0]);
 #endif
 
                      &flash_info[0]);
 #endif
 

-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
        flash_protect(FLAG_PROTECT_SET,
 # endif
        flash_protect(FLAG_PROTECT_SET,

-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

                      &flash_info[0]);
 #endif
 
                      &flash_info[0]);
 #endif
 

diff --git a/board/esd/cpci405/cpci405.c b/board/esd/cpci405/cpci405.c
index 005871cfe810d630484ac4ffb4d1ca0398dbcea7..fb349576a84224baf7fb6ad36828d055943bcad8 100644 (file)
--- a/board/esd/cpci405/cpci405.c
+++ b/board/esd/cpci405/cpci405.c
@@ -691,7 +691,7 @@ U_BOOT_CMD(
        );
 
 #define CFG_I2C_EEPROM_ADDR_2  0x51    /* EEPROM CAT28WC32             */
        );
 
 #define CFG_I2C_EEPROM_ADDR_2  0x51    /* EEPROM CAT28WC32             */

-#define CFG_ENV_SIZE_2 0x800   /* 2048 bytes may be used for env vars*/
+#define CONFIG_ENV_SIZE_2      0x800   /* 2048 bytes may be used for env vars*/

 
 /*
  * Write backplane ip-address...
 
 /*
  * Write backplane ip-address...


@@ -705,11 +705,11 @@ int do_get_bpip(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        char *ptr;
        IPaddr_t ipaddr;
 
        char *ptr;
        IPaddr_t ipaddr;
 

-       buf = malloc(CFG_ENV_SIZE_2);
-       if (eeprom_read(CFG_I2C_EEPROM_ADDR_2, 0, (uchar *)buf, CFG_ENV_SIZE_2)) {
+       buf = malloc(CONFIG_ENV_SIZE_2);
+       if (eeprom_read(CFG_I2C_EEPROM_ADDR_2, 0, (uchar *)buf, CONFIG_ENV_SIZE_2)) {

                puts("\nError reading backplane EEPROM!\n");
        } else {
                puts("\nError reading backplane EEPROM!\n");
        } else {

-               crc = crc32(0, (uchar *)(buf+4), CFG_ENV_SIZE_2-4);
+               crc = crc32(0, (uchar *)(buf+4), CONFIG_ENV_SIZE_2-4);

                if (crc != *(ulong *)buf) {
                        printf("ERROR: crc mismatch %08lx %08lx\n", crc, *(ulong *)buf);
                        return -1;
                if (crc != *(ulong *)buf) {
                        printf("ERROR: crc mismatch %08lx %08lx\n", crc, *(ulong *)buf);
                        return -1;


@@ -764,14 +764,14 @@ int do_set_bpip(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        }
 
        printf("Setting bp_ip to %s\n", argv[1]);
        }
 
        printf("Setting bp_ip to %s\n", argv[1]);

-       buf = malloc(CFG_ENV_SIZE_2);
-       memset(buf, 0, CFG_ENV_SIZE_2);
+       buf = malloc(CONFIG_ENV_SIZE_2);
+       memset(buf, 0, CONFIG_ENV_SIZE_2);

        sprintf(str, "bp_ip=%s", argv[1]);
        strcpy(buf+4, str);
        sprintf(str, "bp_ip=%s", argv[1]);
        strcpy(buf+4, str);

-       crc = crc32(0, (uchar *)(buf+4), CFG_ENV_SIZE_2-4);
+       crc = crc32(0, (uchar *)(buf+4), CONFIG_ENV_SIZE_2-4);

        *(ulong *)buf = crc;
 
        *(ulong *)buf = crc;
 

-       if (eeprom_write(CFG_I2C_EEPROM_ADDR_2, 0, (uchar *)buf, CFG_ENV_SIZE_2)) {
+       if (eeprom_write(CFG_I2C_EEPROM_ADDR_2, 0, (uchar *)buf, CONFIG_ENV_SIZE_2)) {

                puts("\nError writing backplane EEPROM!\n");
        }
 
                puts("\nError writing backplane EEPROM!\n");
        }
 

diff --git a/board/esd/pf5200/flash.c b/board/esd/pf5200/flash.c
index 55419eeb91bd3b697e589a301fc968092abe9b17..8178b56ce746e5ef8be9b84fcf3e84864a45441e 100644 (file)
--- a/board/esd/pf5200/flash.c
+++ b/board/esd/pf5200/flash.c
@@ -78,9 +78,9 @@ unsigned long flash_init(void)
 
 #ifdef  CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
 
 #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,
-                     flash_get_info(CFG_ENV_ADDR));
+       flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
+                     flash_get_info(CONFIG_ENV_ADDR));

 #endif
 
        flash_afterinit(i, flash_info[i].start[0], flash_info[i].size);
 #endif
 
        flash_afterinit(i, flash_info[i].start[0], flash_info[i].size);

diff --git a/board/esd/pmc440/cmd_pmc440.c b/board/esd/pmc440/cmd_pmc440.c
index ca5c177e3436be26ed4b94487afcf472affe5d32..74cf4c3e15be63d2d739082f66191e3e0c1d3455 100644 (file)
--- a/board/esd/pmc440/cmd_pmc440.c
+++ b/board/esd/pmc440/cmd_pmc440.c
@@ -363,11 +363,11 @@ int do_painit(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        printf("PARAM: @%08x\n", param);
 
        memset((void*)param, 0, (pram << 10));
        printf("PARAM: @%08x\n", param);
 
        memset((void*)param, 0, (pram << 10));

-       env_base = memsize - 4096 - ((CFG_ENV_SIZE + 4096) & ~(4096-1));
-       memcpy((void*)env_base, env_ptr, CFG_ENV_SIZE);
+       env_base = memsize - 4096 - ((CONFIG_ENV_SIZE + 4096) & ~(4096-1));
+       memcpy((void*)env_base, env_ptr, CONFIG_ENV_SIZE);

 
        lptr = (ulong*)memsize;
 
        lptr = (ulong*)memsize;

-       *(--lptr) = CFG_ENV_SIZE;
+       *(--lptr) = CONFIG_ENV_SIZE;

        *(--lptr) = memsize - env_base;
        *(--lptr) = crc32(0, (void*)(memsize - 0x08), 0x08);
        *(--lptr) = 0;
        *(--lptr) = memsize - env_base;
        *(--lptr) = crc32(0, (void*)(memsize - 0x08), 0x08);
        *(--lptr) = 0;

diff --git a/board/esd/pmc440/pmc440.c b/board/esd/pmc440/pmc440.c
index 7c8fa74c6f9ca4e18eddf0c689f21eee24b731d0..85ef26f67bed5ba34cfb657c54f452648c027763 100644 (file)
--- a/board/esd/pmc440/pmc440.c
+++ b/board/esd/pmc440/pmc440.c
@@ -248,8 +248,8 @@ int misc_init_r(void)
 
        /* Env protection ON by default */
        (void)flash_protect(FLAG_PROTECT_SET,
 
        /* Env protection ON by default */
        (void)flash_protect(FLAG_PROTECT_SET,

-                           CFG_ENV_ADDR_REDUND,
-                           CFG_ENV_ADDR_REDUND + 2*CFG_ENV_SECT_SIZE - 1,
+                           CONFIG_ENV_ADDR_REDUND,
+                           CONFIG_ENV_ADDR_REDUND + 2*CONFIG_ENV_SECT_SIZE - 1,

                            &flash_info[0]);
 #endif
 
                            &flash_info[0]);
 #endif
 

diff --git a/board/etin/debris/debris.c b/board/etin/debris/debris.c
index 3fcf78ecfd1a7487e41d9d3cbd23dc44e9a72554..a5d394c8f6e4755f9a167aa094a4c1fdb0aa4c7c 100644 (file)
--- a/board/etin/debris/debris.c
+++ b/board/etin/debris/debris.c
@@ -174,7 +174,7 @@ void nvram_write(long dest, const void *src, size_t count)
 int misc_init_r(void)
 {
        /* Write ethernet addr in NVRAM for VxWorks */
 int misc_init_r(void)
 {
        /* Write ethernet addr in NVRAM for VxWorks */

-       nvram_write(CFG_ENV_ADDR + CFG_NVRAM_VXWORKS_OFFS,
+       nvram_write(CONFIG_ENV_ADDR + CFG_NVRAM_VXWORKS_OFFS,

                        (char*)&gd->bd->bi_enetaddr[0], 6);
        return 0;
 }
                        (char*)&gd->bd->bi_enetaddr[0], 6);
        return 0;
 }

diff --git a/board/evb4510/flash.c b/board/evb4510/flash.c
index aff92f95e9351e8841290d0cb8bf76f734c79e29..bcefafcd933bbab9de9ede85c23c45f02e8b5210 100644 (file)
--- a/board/evb4510/flash.c
+++ b/board/evb4510/flash.c
@@ -399,7 +399,7 @@ unsigned long flash_init (void)
                       amd160base, amd160base + monitor_flash_len - 1, info);
 
        flash_protect (FLAG_PROTECT_SET,
                       amd160base, amd160base + monitor_flash_len - 1, info);
 
        flash_protect (FLAG_PROTECT_SET,

-                      CFG_ENV_ADDR, CFG_ENV_ADDR + CFG_ENV_SIZE - 1, info);
+                      CONFIG_ENV_ADDR, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, info);

 
 #if CFG_MAX_FLASH_BANKS == 2
        /* Configure AMD Am29LV040B (512KB) */
 
 #if CFG_MAX_FLASH_BANKS == 2
        /* Configure AMD Am29LV040B (512KB) */

diff --git a/board/evb64260/flash.c b/board/evb64260/flash.c
index 1691e108c2b28cdc7b872434c8f67a055818154e..f2d5390ac47cb9db8865f84fb456f1d59e512f6d 100644 (file)
--- a/board/evb64260/flash.c
+++ b/board/evb64260/flash.c
@@ -122,9 +122,9 @@ flash_init (void)
 #ifdef  CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
 #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,
-                     flash_get_info(CFG_ENV_ADDR));
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
+                     flash_get_info(CONFIG_ENV_ADDR));

 #endif
 
        flash_size = size_b0 + size_b1;
 #endif
 
        flash_size = size_b0 + size_b1;

diff --git a/board/exbitgen/flash.c b/board/exbitgen/flash.c
index 4d83fd5efdb81ec79134ed4dfc779e27d1811590..745fba2af8a8f513891076904f3fe7d9051af8d1 100644 (file)
--- a/board/exbitgen/flash.c
+++ b/board/exbitgen/flash.c
@@ -126,10 +126,10 @@ unsigned long flash_init (void)
 #endif
 #endif
 
 #endif
 #endif
 

-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)

        flash_protect(FLAG_PROTECT_SET,
        flash_protect(FLAG_PROTECT_SET,

-               CFG_ENV_ADDR,
-               CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+               CONFIG_ENV_ADDR,
+               CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

                &flash_info[0]);
 #endif
 
                &flash_info[0]);
 #endif
 

diff --git a/board/fads/fads.h b/board/fads/fads.h
index 63b1e625e56962258cbc7aa167168ac063472126..23310a4391eeb73c75e9bc6abc0eb092f083c984 100644 (file)
--- a/board/fads/fads.h
+++ b/board/fads/fads.h
@@ -227,9 +227,9 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #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            */
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* see README - env sector total size   */
+#define CONFIG_ENV_OFFSET              CONFIG_ENV_SECT_SIZE
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment            */

 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 #define        CFG_DIRECT_FLASH_TFTP
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 #define        CFG_DIRECT_FLASH_TFTP

diff --git a/board/fads/flash.c b/board/fads/flash.c
index 742a88979bfc445892284f204a23ef20b53328d6..cd0e4d5dc20a2e610f98fb7b773ca86b908c12fb 100644 (file)
--- a/board/fads/flash.c
+++ b/board/fads/flash.c
@@ -27,14 +27,14 @@
 flash_info_t flash_info[CFG_MAX_FLASH_BANKS];  /* info for FLASH chips */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 flash_info_t flash_info[CFG_MAX_FLASH_BANKS];  /* info for FLASH chips */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)

-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR      (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 # endif
 # endif

-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
 # endif

-# ifndef  CFG_ENV_SECT_SIZE
-#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE
+# ifndef  CONFIG_ENV_SECT_SIZE
+#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE

 # endif
 #endif
 
 # endif
 #endif
 


@@ -126,10 +126,10 @@ unsigned long flash_init (void)
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
                /* ENV protection ON by default */
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
                /* ENV protection ON by default */

-               if (CFG_ENV_ADDR >= flash_info[i].start[0])
+               if (CONFIG_ENV_ADDR >= flash_info[i].start[0])

                        flash_protect (FLAG_PROTECT_SET,
                        flash_protect (FLAG_PROTECT_SET,

-                                      CFG_ENV_ADDR,
-                                      CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+                                      CONFIG_ENV_ADDR,
+                                      CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

                                       &flash_info[i]);
 #endif
        }
                                       &flash_info[i]);
 #endif
        }

diff --git a/board/flagadm/flash.c b/board/flagadm/flash.c
index 3303707817010e1041d7a405f8ef92f5905df0dc..aa8b0f9943c3a92a4fe06a575633c62e6287fd9b 100644 (file)
--- a/board/flagadm/flash.c
+++ b/board/flagadm/flash.c
@@ -84,8 +84,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,

-                     CFG_ENV_OFFSET,
-                     CFG_ENV_OFFSET+CFG_ENV_SIZE-1,
+                     CONFIG_ENV_OFFSET,
+                     CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE-1,

                      &flash_info[0]);
 #endif
        return (flash_info[0].size);
                      &flash_info[0]);
 #endif
        return (flash_info[0].size);

diff --git a/board/freescale/mpc8260ads/flash.c b/board/freescale/mpc8260ads/flash.c
index 5f80f26e0c4aaf0fbd69e1bd728382578cdcec0a..7fcc874391048dcb3e0aeee9269d5896a01310d2 100644 (file)
--- a/board/freescale/mpc8260ads/flash.c
+++ b/board/freescale/mpc8260ads/flash.c
@@ -158,8 +158,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,

-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,

                      &flash_info[0]);
 #endif
        return (size);
                      &flash_info[0]);
 #endif
        return (size);

diff --git a/board/freescale/mpc8266ads/flash.c b/board/freescale/mpc8266ads/flash.c
index aa533e4b90564c69a7c5b8e6f4f8815766d37812..b4cdcd9104497d2c92fe70c6645735f7f4e17c90 100644 (file)
--- a/board/freescale/mpc8266ads/flash.c
+++ b/board/freescale/mpc8266ads/flash.c
@@ -32,14 +32,14 @@
 flash_info_t   flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips        */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 flash_info_t   flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips        */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)

-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR      (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 # endif
 # endif

-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
 # endif

-# ifndef  CFG_ENV_SECT_SIZE
-#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE
+# ifndef  CONFIG_ENV_SECT_SIZE
+#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE

 # endif
 #endif
 
 # endif
 #endif
 


@@ -108,8 +108,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,

-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,

                      &flash_info[0]);
 #endif
        return (size);
                      &flash_info[0]);
 #endif
        return (size);

diff --git a/board/funkwerk/vovpn-gw/flash.c b/board/funkwerk/vovpn-gw/flash.c
index 935adfa1a0d5311cd4f9677cef78c43ca789a5a7..0308611eb6bee383d3efebc5d0b1938ab73c2ee4 100644 (file)
--- a/board/funkwerk/vovpn-gw/flash.c
+++ b/board/funkwerk/vovpn-gw/flash.c
@@ -153,8 +153,8 @@ flash_init(void)
 #endif
 #ifdef CONFIG_ENV_IS_IN_FLASH
        flash_protect(FLAG_PROTECT_SET,
 #endif
 #ifdef CONFIG_ENV_IS_IN_FLASH
        flash_protect(FLAG_PROTECT_SET,

-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,

                      &flash_info[0]);
 #endif
        return (size);
                      &flash_info[0]);
 #endif
        return (size);

diff --git a/board/gcplus/flash.c b/board/gcplus/flash.c
index 36d7363a806e1d8c65337bf18e6d0e80e21eea41..48f33b2b7a03a404d06e9a20f09bef844a9fd158 100644 (file)
--- a/board/gcplus/flash.c
+++ b/board/gcplus/flash.c
@@ -87,8 +87,8 @@ flash_init(void)
                      CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]);
 
        flash_protect(FLAG_PROTECT_SET,
                      CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]);
 
        flash_protect(FLAG_PROTECT_SET,

-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);

 
        return size;
 }
 
        return size;
 }

diff --git a/board/gen860t/flash.c b/board/gen860t/flash.c
index c558014e7d3d6ba572e0203991c6e527ca4eef1f..a46e7e60803759e678b39429c49afb6cda872ed0 100644 (file)
--- a/board/gen860t/flash.c
+++ b/board/gen860t/flash.c
@@ -26,14 +26,14 @@
 #include <mpc8xx.h>
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 #include <mpc8xx.h>
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)

-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR      (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 # endif
 # endif

-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
 # endif

-# ifndef  CFG_ENV_SECT_SIZE
-#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE
+# ifndef  CONFIG_ENV_SECT_SIZE
+#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE

 # endif
 #endif
 
 # endif
 #endif
 


@@ -166,8 +166,8 @@ flash_init (void)
         * Environment protection ON by default
         */
        flash_protect(FLAG_PROTECT_SET,
         * Environment protection ON by default
         */
        flash_protect(FLAG_PROTECT_SET,

-                         CFG_ENV_ADDR,
-                         CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
+                         CONFIG_ENV_ADDR,
+                         CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,

                          &flash_info[0]);
 #endif
 
                          &flash_info[0]);
 #endif
 

diff --git a/board/gw8260/flash.c b/board/gw8260/flash.c
index e4b596b0ca16a8fc9f2f71e68a7dc8b73376a469..6cf311f2e0f66c024f517f3abe250d057b29f54c 100644 (file)
--- a/board/gw8260/flash.c
+++ b/board/gw8260/flash.c
@@ -100,13 +100,13 @@ unsigned long flash_init (void)
                  &flash_info[0]);
 #endif
 
                  &flash_info[0]);
 #endif
 

-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
     flash_protect(FLAG_PROTECT_SET,
 # endif
     flash_protect(FLAG_PROTECT_SET,

-                 CFG_ENV_ADDR,
-                 CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+                 CONFIG_ENV_ADDR,
+                 CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

                  &flash_info[0]);
 #endif
 
                  &flash_info[0]);
 #endif
 

diff --git a/board/hidden_dragon/flash.c b/board/hidden_dragon/flash.c
index 5fb9578bb0560610fc7b12b11e5471e75ad66b30..10293b4be90e25998f60e19fbe35e69444ea13fd 100644 (file)
--- a/board/hidden_dragon/flash.c
+++ b/board/hidden_dragon/flash.c
@@ -36,14 +36,14 @@
 flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips    */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips    */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)

-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR  (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR  (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 # endif
 # endif

-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE  CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE  CONFIG_ENV_SECT_SIZE

 # endif
 # endif

-# ifndef  CFG_ENV_SECT_SIZE
-#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE
+# ifndef  CONFIG_ENV_SECT_SIZE
+#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE

 # endif
 #endif
 
 # endif
 #endif
 


@@ -212,10 +212,10 @@ unsigned long flash_init (void)
                               &flash_info[0]);
 #endif
 
                               &flash_info[0]);
 #endif
 

-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)

                flash_protect (FLAG_PROTECT_SET,
                flash_protect (FLAG_PROTECT_SET,

-                              CFG_ENV_ADDR,
-                              CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+                              CONFIG_ENV_ADDR,
+                              CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

                               &flash_info[0]);
 #endif
 
                               &flash_info[0]);
 #endif
 

diff --git a/board/icecube/flash.c b/board/icecube/flash.c
index e6cf92e3df31730d862573a47a3091b8225cec66..0aa78eb27f9baf063748643220dc86a20a55f788 100644 (file)
--- a/board/icecube/flash.c
+++ b/board/icecube/flash.c
@@ -91,9 +91,9 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
 #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,
-                     flash_get_info(CFG_ENV_ADDR));
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,
+                     flash_get_info(CONFIG_ENV_ADDR));

 #endif
 
 
 #endif
 
 

diff --git a/board/icu862/flash.c b/board/icu862/flash.c
index 625d1a86476dad9ebd33cec3c990871a2e25298b..e6382f5fe92148367f34f3aceb2f42d2b60f80c2 100644 (file)
--- a/board/icu862/flash.c
+++ b/board/icu862/flash.c
@@ -27,14 +27,14 @@
 flash_info_t   flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips        */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 flash_info_t   flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips        */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)

-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR      (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 # endif
 # endif

-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
 # endif

-# ifndef  CFG_ENV_SECT_SIZE
-#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE
+# ifndef  CONFIG_ENV_SECT_SIZE
+#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE

 # endif
 #endif
 
 # endif
 #endif
 


@@ -111,8 +111,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
 #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,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,

                      &flash_info[0]);
 #endif
 
                      &flash_info[0]);
 #endif
 

diff --git a/board/ids8247/flash.c b/board/ids8247/flash.c
index 522fafe435398785358e22c05a1b7bc6e71a0b28..5800ce2f823225315a4423a6230c3567b1695047 100644 (file)
--- a/board/ids8247/flash.c
+++ b/board/ids8247/flash.c
@@ -34,14 +34,14 @@
 flash_info_t flash_info[CFG_MAX_FLASH_BANKS];  /* info for FLASH chips    */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 flash_info_t flash_info[CFG_MAX_FLASH_BANKS];  /* info for FLASH chips    */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)

-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR      (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 # endif
 # endif

-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
 # endif

-# ifndef  CFG_ENV_SECT_SIZE
-#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE
+# ifndef  CONFIG_ENV_SECT_SIZE
+#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE

 # endif
 #endif
 
 # endif
 #endif
 


@@ -116,8 +116,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect (FLAG_PROTECT_SET,
 #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,
+                       CONFIG_ENV_ADDR,
+                       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

                        &flash_info[0]);
 #endif
 
                        &flash_info[0]);
 #endif
 

diff --git a/board/impa7/flash.c b/board/impa7/flash.c
index ca76fe832703750926957a1a384788ce52367193..1dea22b3805be0b37cf40242620e51c83918b9d6 100644 (file)
--- a/board/impa7/flash.c
+++ b/board/impa7/flash.c
@@ -74,8 +74,8 @@ ulong flash_init (void)
                       &flash_info[0]);
 
        flash_protect (FLAG_PROTECT_SET,
                       &flash_info[0]);
 
        flash_protect (FLAG_PROTECT_SET,

-                      CFG_ENV_ADDR,
-                      CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                      CONFIG_ENV_ADDR,
+                      CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);

 
        return size;
 }
 
        return size;
 }

diff --git a/board/incaip/flash.c b/board/incaip/flash.c
index b510e900cd5c4a564550dc5d8ca662a6887e7bad..74dd6fee6218d8ab6d7f92cedd1499a82a13316c 100644 (file)
--- a/board/incaip/flash.c
+++ b/board/incaip/flash.c
@@ -107,9 +107,9 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
 #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,
-                     flash_get_info(CFG_ENV_ADDR));
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,
+                     flash_get_info(CONFIG_ENV_ADDR));

 #endif
 
 
 #endif
 
 

diff --git a/board/innokom/flash.c b/board/innokom/flash.c
index 2d773b1b04826f1e7f2c3c907a418eaf5a9de0e4..7f17ba6c1220c20ffcff4debd16b21b1caf2675a 100644 (file)
--- a/board/innokom/flash.c
+++ b/board/innokom/flash.c
@@ -116,8 +116,8 @@ ulong flash_init(void)
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
        flash_protect(FLAG_PROTECT_SET,
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
        flash_protect(FLAG_PROTECT_SET,

-                       CFG_ENV_ADDR,
-                       CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+                       CONFIG_ENV_ADDR,
+                       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

                        &flash_info[0]);
 #endif
 
                        &flash_info[0]);
 #endif
 

diff --git a/board/integratorcp/flash.c b/board/integratorcp/flash.c
index 2a4256abdf7da1b6dee4115565af016d80b8e3e8..7effea6aacd93bc3d00339855a08fbe27f2846f4 100644 (file)
--- a/board/integratorcp/flash.c
+++ b/board/integratorcp/flash.c
@@ -128,8 +128,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON */
        flash_protect(FLAG_PROTECT_SET,
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON */
        flash_protect(FLAG_PROTECT_SET,

-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,

                      &flash_info[0]);
 #endif
 
                      &flash_info[0]);
 #endif
 

diff --git a/board/ip860/flash.c b/board/ip860/flash.c
index 6bf4d8da6d15f55034a39dd36002734254daf396..10a96c58fda58913c127455eb5afa4d1553a8a17 100644 (file)
--- a/board/ip860/flash.c
+++ b/board/ip860/flash.c
@@ -27,14 +27,14 @@
 flash_info_t   flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips        */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 flash_info_t   flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips        */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)

-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR      (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 # endif
 # endif

-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
 # endif

-# ifndef  CFG_ENV_SECT_SIZE
-#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE
+# ifndef  CONFIG_ENV_SECT_SIZE
+#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE

 # endif
 #endif
 
 # endif
 #endif
 


@@ -97,8 +97,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,

-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,

                      &flash_info[0]);
 #endif
        return (size);
                      &flash_info[0]);
 #endif
        return (size);

diff --git a/board/iphase4539/flash.c b/board/iphase4539/flash.c
index f8ab51a7e690b78aafb62c42129283089f73ecc2..098dcc2a4dd04904b21e57413af1823be5e63f02 100644 (file)
--- a/board/iphase4539/flash.c
+++ b/board/iphase4539/flash.c
@@ -78,8 +78,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
                /* ENV protection ON by default */
                flash_protect(FLAG_PROTECT_SET,
 #ifdef CONFIG_ENV_IS_IN_FLASH
                /* ENV protection ON by default */
                flash_protect(FLAG_PROTECT_SET,

-                             CFG_ENV_ADDR,
-                             CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
+                             CONFIG_ENV_ADDR,
+                             CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,

                              flash_info + bank);
 #endif
 
                              flash_info + bank);
 #endif
 

diff --git a/board/ivm/flash.c b/board/ivm/flash.c
index f911fdb5bd9170b25245aca9f70b08f8a867d7fe..29821ba1393eb76bff9ffc9c7e758fc62fb92cdd 100644 (file)
--- a/board/ivm/flash.c
+++ b/board/ivm/flash.c
@@ -27,14 +27,14 @@
 flash_info_t   flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips        */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 flash_info_t   flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips        */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)

-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR      (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 # endif
 # endif

-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
 # endif

-# ifndef  CFG_ENV_SECT_SIZE
-#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE
+# ifndef  CONFIG_ENV_SECT_SIZE
+#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE

 # endif
 #endif
 
 # endif
 #endif
 


@@ -94,8 +94,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,

-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,

                      &flash_info[0]);
 #endif
 
                      &flash_info[0]);
 #endif
 

diff --git a/board/ixdp425/flash.c b/board/ixdp425/flash.c
index 704dea86379c54680113ef1aad3b28e4da503b05..0bae9e09ee8cb24ee89aa5d39f3dbf0525ba8882 100644 (file)
--- a/board/ixdp425/flash.c
+++ b/board/ixdp425/flash.c
@@ -86,8 +86,8 @@ unsigned long flash_init (void)
                       &flash_info[0]);
 
        flash_protect (FLAG_PROTECT_SET,
                       &flash_info[0]);
 
        flash_protect (FLAG_PROTECT_SET,

-                      CFG_ENV_ADDR,
-                      CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                      CONFIG_ENV_ADDR,
+                      CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);

 
        return size;
 }
 
        return size;
 }

diff --git a/board/korat/korat.c b/board/korat/korat.c
index 0d90fb31dadb34bf763abeec235d38bdda0c41cf..8787e231ec9a74a594e32a99124ecb4c01290c35 100644 (file)
--- a/board/korat/korat.c
+++ b/board/korat/korat.c
@@ -71,7 +71,7 @@ int board_early_init_f(void)
                if (gpio_read_in_bit(CFG_GPIO_RESET_PRESSED_)) {
                        /* This call does not return. */
                        korat_branch_absolute(
                if (gpio_read_in_bit(CFG_GPIO_RESET_PRESSED_)) {
                        /* This call does not return. */
                        korat_branch_absolute(

-                               CFG_FLASH1_TOP - 2 * CFG_ENV_SECT_SIZE - 4);
+                               CFG_FLASH1_TOP - 2 * CONFIG_ENV_SECT_SIZE - 4);

                }
        }
        korat_buzzer(1);
                }
        }
        korat_buzzer(1);


@@ -375,7 +375,7 @@ int misc_init_r(void)
         * environment
         */
        gd->bd->bi_flashoffset =
         * environment
         */
        gd->bd->bi_flashoffset =

-               CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - CFG_FLASH1_ADDR;
+               CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - CFG_FLASH1_ADDR;

 
        mtdcr(ebccfga, pb1cr);
        pbcr = mfdcr(ebccfgd);
 
        mtdcr(ebccfga, pb1cr);
        pbcr = mfdcr(ebccfgd);


@@ -395,11 +395,11 @@ int misc_init_r(void)
                            flash_info);
 #endif
        /* Env protection ON by default */
                            flash_info);
 #endif
        /* Env protection ON by default */

-       (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
-                           CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
+       (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
+                           CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,

                            flash_info);
                            flash_info);

-       (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND,
-                           CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1,
+       (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND,
+                           CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,

                            flash_info);
 
        /*
                            flash_info);
 
        /*

diff --git a/board/kup/common/flash.c b/board/kup/common/flash.c
index 50bf5439f70d625fcd80928487f9398ece5b7d29..7688ce2c4162dd7b195d79e0b92d2f31d15b000c 100644 (file)
--- a/board/kup/common/flash.c
+++ b/board/kup/common/flash.c
@@ -24,8 +24,8 @@
 #include <common.h>
 #include <mpc8xx.h>
 
 #include <common.h>
 #include <mpc8xx.h>
 

-#ifndef        CFG_ENV_ADDR
-#define CFG_ENV_ADDR   (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+#ifndef        CONFIG_ENV_ADDR
+#define CONFIG_ENV_ADDR        (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 #endif
 
 #define CONFIG_FLASH_16BIT
 #endif
 
 #define CONFIG_FLASH_16BIT


@@ -81,8 +81,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
 #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,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,

                      &flash_info[0]);
 #endif
 
                      &flash_info[0]);
 #endif
 

diff --git a/board/lantec/flash.c b/board/lantec/flash.c
index ddf680a3168838acd27d19ead7730b9edb368b46..e08da33b3599f51883ae6f576af1a34aa88319fd 100644 (file)
--- a/board/lantec/flash.c
+++ b/board/lantec/flash.c
@@ -30,14 +30,14 @@
 #include <mpc8xx.h>
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 #include <mpc8xx.h>
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)

-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR      (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 # endif
 # endif

-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
 # endif

-# ifndef  CFG_ENV_SECT_SIZE
-#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE
+# ifndef  CONFIG_ENV_SECT_SIZE
+#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE

 # endif
 #endif
 
 # endif
 #endif
 


@@ -141,8 +141,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,

-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,

                      &flash_info[0]);
 #endif
 
                      &flash_info[0]);
 #endif
 


@@ -173,8 +173,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
                /* ENV protection ON by default */
                flash_protect(FLAG_PROTECT_SET,
 #ifdef CONFIG_ENV_IS_IN_FLASH
                /* ENV protection ON by default */
                flash_protect(FLAG_PROTECT_SET,

-                             CFG_ENV_ADDR,
-                             CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1,
+                             CONFIG_ENV_ADDR,
+                             CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,

                              &flash_info[1]);
 #endif
        } else {
                              &flash_info[1]);
 #endif
        } else {

diff --git a/board/lart/flash.c b/board/lart/flash.c
index 28c4531c0232f3818ed3baa7a3732731e0c26091..4326d0738e5fee226e8bf480a86fdff1a9e121f4 100644 (file)
--- a/board/lart/flash.c
+++ b/board/lart/flash.c
@@ -109,8 +109,8 @@ ulong flash_init(void)
                  &flash_info[0]);
 
     flash_protect(FLAG_PROTECT_SET,
                  &flash_info[0]);
 
     flash_protect(FLAG_PROTECT_SET,

-                 CFG_ENV_ADDR,
-                 CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+                 CONFIG_ENV_ADDR,
+                 CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

                  &flash_info[0]);
 
     return size;
                  &flash_info[0]);
 
     return size;

diff --git a/board/logodl/flash.c b/board/logodl/flash.c
index 0807b8091300ad4baa0faa06013e83f326bb7e8f..4d9c118729812568858f44c57c625ee3f2115e73 100644 (file)
--- a/board/logodl/flash.c
+++ b/board/logodl/flash.c
@@ -109,8 +109,8 @@ ulong flash_init(void)
                  &flash_info[0]);
 
     flash_protect(FLAG_PROTECT_SET,
                  &flash_info[0]);
 
     flash_protect(FLAG_PROTECT_SET,

-                 CFG_ENV_ADDR,
-                 CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+                 CONFIG_ENV_ADDR,
+                 CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

                  &flash_info[0]);
 
     return size;
                  &flash_info[0]);
 
     return size;

diff --git a/board/lpc2292sodimm/flash.c b/board/lpc2292sodimm/flash.c
index 0fb08430c53edecfc43ad9742b4be1fbdb9eaa3f..449a768271cd6359f2185ebdc35fc6d1c9032d8d 100644 (file)
--- a/board/lpc2292sodimm/flash.c
+++ b/board/lpc2292sodimm/flash.c
@@ -97,8 +97,8 @@ ulong flash_init (void)
                 &flash_info[0]);
 
        flash_protect (FLAG_PROTECT_SET,
                 &flash_info[0]);
 
        flash_protect (FLAG_PROTECT_SET,

-                CFG_ENV_ADDR,
-                CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+                CONFIG_ENV_ADDR,
+                CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

                 &flash_info[0]);
 
        return size;
                 &flash_info[0]);
 
        return size;

diff --git a/board/lpd7a40x/flash.c b/board/lpd7a40x/flash.c
index d18720e5b20d2a6c6b81f57b54cbee41e2dd4dd4..ec438073b288c4f1e2dcf18643321d4d1c75f7c8 100644 (file)
--- a/board/lpd7a40x/flash.c
+++ b/board/lpd7a40x/flash.c
@@ -97,13 +97,13 @@ ulong flash_init (void)
                        &flash_info[0]);
 
        flash_protect ( FLAG_PROTECT_SET,
                        &flash_info[0]);
 
        flash_protect ( FLAG_PROTECT_SET,

-                       CFG_ENV_ADDR,
-                       CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                       CONFIG_ENV_ADDR,
+                       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);

 
 

-#ifdef CFG_ENV_ADDR_REDUND
+#ifdef CONFIG_ENV_ADDR_REDUND

        flash_protect ( FLAG_PROTECT_SET,
        flash_protect ( FLAG_PROTECT_SET,

-                       CFG_ENV_ADDR_REDUND,
-                       CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND - 1,
+                       CONFIG_ENV_ADDR_REDUND,
+                       CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1,

                        &flash_info[0]);
 #endif
 
                        &flash_info[0]);
 #endif
 

diff --git a/board/lubbock/flash.c b/board/lubbock/flash.c
index ba82892dde557e22b1ea97b1e75828e17460c4ed..3ff19bc5e5c88a98ccb86487b7db4c4058d67ed9 100644 (file)
--- a/board/lubbock/flash.c
+++ b/board/lubbock/flash.c
@@ -90,8 +90,8 @@ unsigned long flash_init (void)
                        &flash_info[0] );
 
        flash_protect ( FLAG_PROTECT_SET,
                        &flash_info[0] );
 
        flash_protect ( FLAG_PROTECT_SET,

-                       CFG_ENV_ADDR,
-                       CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0] );
+                       CONFIG_ENV_ADDR,
+                       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0] );

 
        return size;
 }
 
        return size;
 }

diff --git a/board/lwmon/flash.c b/board/lwmon/flash.c
index 7e4acc2481a20cf256fd836f166c67309a350384..8d98545a531ccfe08a256e27076e0e4b10abc5da 100644 (file)
--- a/board/lwmon/flash.c
+++ b/board/lwmon/flash.c
@@ -27,14 +27,14 @@
 #include <mpc8xx.h>
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 #include <mpc8xx.h>
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)

-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR      (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 # endif
 # endif

-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
 # endif

-# ifndef  CFG_ENV_SECT_SIZE
-#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE
+# ifndef  CONFIG_ENV_SECT_SIZE
+#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE

 # endif
 #endif
 
 # endif
 #endif
 


@@ -133,8 +133,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,

-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,

                      &flash_info[0]);
 #endif
 
                      &flash_info[0]);
 #endif
 


@@ -166,8 +166,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
                /* ENV protection ON by default */
                flash_protect(FLAG_PROTECT_SET,
 #ifdef CONFIG_ENV_IS_IN_FLASH
                /* ENV protection ON by default */
                flash_protect(FLAG_PROTECT_SET,

-                             CFG_ENV_ADDR,
-                             CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1,
+                             CONFIG_ENV_ADDR,
+                             CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,

                              &flash_info[1]);
 #endif
        } else {
                              &flash_info[1]);
 #endif
        } else {

diff --git a/board/lwmon5/lwmon5.c b/board/lwmon5/lwmon5.c
index 85795b7c2a787d86e32eabd8bd008f51af612fa5..8975bfd3d28af679b1e5d5af3a80a78fc9c63759 100644 (file)
--- a/board/lwmon5/lwmon5.c
+++ b/board/lwmon5/lwmon5.c
@@ -200,8 +200,8 @@ int misc_init_r(void)
 
        /* Env protection ON by default */
        (void)flash_protect(FLAG_PROTECT_SET,
 
        /* Env protection ON by default */
        (void)flash_protect(FLAG_PROTECT_SET,

-                           CFG_ENV_ADDR_REDUND,
-                           CFG_ENV_ADDR_REDUND + 2*CFG_ENV_SECT_SIZE - 1,
+                           CONFIG_ENV_ADDR_REDUND,
+                           CONFIG_ENV_ADDR_REDUND + 2*CONFIG_ENV_SECT_SIZE - 1,

                            &flash_info[1]);
 
        /*
                            &flash_info[1]);
 
        /*

diff --git a/board/mcc200/mcc200.c b/board/mcc200/mcc200.c
index 44446501f94b05c4184fee986d510cfd85f1842c..65b818471a817bdb6e7358383ee0dec3e97da5ee 100644 (file)
--- a/board/mcc200/mcc200.c
+++ b/board/mcc200/mcc200.c
@@ -263,14 +263,14 @@ int misc_init_r (void)
 
                /* Environment protection ON by default */
                flash_protect (FLAG_PROTECT_SET,
 
                /* Environment protection ON by default */
                flash_protect (FLAG_PROTECT_SET,

-                              CFG_ENV_ADDR,
-                              CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
+                              CONFIG_ENV_ADDR,
+                              CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,

                               &flash_info[CFG_MAX_FLASH_BANKS - 1]);
 
                /* Redundant environment protection ON by default */
                flash_protect (FLAG_PROTECT_SET,
                               &flash_info[CFG_MAX_FLASH_BANKS - 1]);
 
                /* Redundant environment protection ON by default */
                flash_protect (FLAG_PROTECT_SET,

-                              CFG_ENV_ADDR_REDUND,
-                              CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND - 1,
+                              CONFIG_ENV_ADDR_REDUND,
+                              CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1,

                               &flash_info[CFG_MAX_FLASH_BANKS - 1]);
        }
 
                               &flash_info[CFG_MAX_FLASH_BANKS - 1]);
        }
 

diff --git a/board/modnet50/flash.c b/board/modnet50/flash.c
index a50639e09b032cdaee191ff9b7c9004e4a91c482..fb12e03b6e14e0f98a8700fd1666270f2e9d2dc0 100644 (file)
--- a/board/modnet50/flash.c
+++ b/board/modnet50/flash.c
@@ -181,8 +181,8 @@ ulong flash_init (void)
                       &flash_info[0]);
 
        flash_protect (FLAG_PROTECT_SET,
                       &flash_info[0]);
 
        flash_protect (FLAG_PROTECT_SET,

-                      CFG_ENV_ADDR,
-                      CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                      CONFIG_ENV_ADDR,
+                      CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);

 
        return size;
 }
 
        return size;
 }

diff --git a/board/mp2usb/flash.c b/board/mp2usb/flash.c
index c19d445e20c1f7a41b9e4e299ffa49406d11f0a7..527e74ef13cef97d5a2bf14cea76d09992624399 100644 (file)
--- a/board/mp2usb/flash.c
+++ b/board/mp2usb/flash.c
@@ -98,8 +98,8 @@ unsigned long flash_init (void)
                        &flash_info[0] );
 
        flash_protect ( FLAG_PROTECT_SET,
                        &flash_info[0] );
 
        flash_protect ( FLAG_PROTECT_SET,

-                       CFG_ENV_ADDR,
-                       CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0] );
+                       CONFIG_ENV_ADDR,
+                       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0] );

 
        return size;
 }
 
        return size;
 }

diff --git a/board/mpc8540eval/flash.c b/board/mpc8540eval/flash.c
index b129602a6e872d59d8b6a1acb5f842439b55573c..98fd168859d3480744ebb1edd4a50b781adf14d5 100644 (file)
--- a/board/mpc8540eval/flash.c
+++ b/board/mpc8540eval/flash.c
@@ -36,14 +36,14 @@
 flash_info_t   flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips        */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 flash_info_t   flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips        */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)

-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR      (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 # endif
 # endif

-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
 # endif

-# ifndef  CFG_ENV_SECT_SIZE
-#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE
+# ifndef  CONFIG_ENV_SECT_SIZE
+#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE

 # endif
 #endif
 
 # endif
 #endif
 


@@ -106,8 +106,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,

-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,

                      &flash_info[0]);
 #endif
 #endif
                      &flash_info[0]);
 #endif
 #endif

diff --git a/board/mpl/common/common_util.c b/board/mpl/common/common_util.c
index 1f9a7726f16287a746d62b8027516cf29be9a8d6..8454420f10551ac8e08d589dbadd0a0a26592561 100644 (file)
--- a/board/mpl/common/common_util.c
+++ b/board/mpl/common/common_util.c
@@ -309,7 +309,7 @@ void clear_env_values(void)
        memset(&back,0xff,sizeof(backup_t));
        memset(env_crc,0x00,4);
        i2c_write(CFG_DEF_EEPROM_ADDR,I2C_BACKUP_ADDR,2,(void *)&back,sizeof(backup_t));
        memset(&back,0xff,sizeof(backup_t));
        memset(env_crc,0x00,4);
        i2c_write(CFG_DEF_EEPROM_ADDR,I2C_BACKUP_ADDR,2,(void *)&back,sizeof(backup_t));

-       i2c_write(CFG_DEF_EEPROM_ADDR,CFG_ENV_OFFSET,2,(void *)env_crc,4);
+       i2c_write(CFG_DEF_EEPROM_ADDR,CONFIG_ENV_OFFSET,2,(void *)env_crc,4);

 }
 
 /*
 }
 
 /*


@@ -323,7 +323,7 @@ int check_env_old_size(ulong oldsize)
 
        /* read old CRC */
        eeprom_read (CFG_DEF_EEPROM_ADDR,
 
        /* read old CRC */
        eeprom_read (CFG_DEF_EEPROM_ADDR,

-                    CFG_ENV_OFFSET,
+                    CONFIG_ENV_OFFSET,

                     (uchar *)&crc, sizeof(ulong));
 
        new = 0;
                     (uchar *)&crc, sizeof(ulong));
 
        new = 0;


@@ -333,7 +333,7 @@ int check_env_old_size(ulong oldsize)
        while (len > 0) {
                int n = (len > sizeof(buf)) ? sizeof(buf) : len;
 
        while (len > 0) {
                int n = (len > sizeof(buf)) ? sizeof(buf) : len;
 

-               eeprom_read (CFG_DEF_EEPROM_ADDR, CFG_ENV_OFFSET+off, buf, n);
+               eeprom_read (CFG_DEF_EEPROM_ADDR, CONFIG_ENV_OFFSET+off, buf, n);

                new = crc32 (new, buf, n);
                len -= n;
                off += n;
                new = crc32 (new, buf, n);
                len -= n;
                off += n;


@@ -362,7 +362,7 @@ void copy_old_env(ulong size)
        len=size;
        off = sizeof(long);
        while (len > off) {
        len=size;
        off = sizeof(long);
        while (len > off) {

-               eeprom_read (CFG_DEF_EEPROM_ADDR, CFG_ENV_OFFSET+off, &c, 1);
+               eeprom_read (CFG_DEF_EEPROM_ADDR, CONFIG_ENV_OFFSET+off, &c, 1);

                if(c != '=') {
                        *name++=c;
                        off++;
                if(c != '=') {
                        *name++=c;
                        off++;


@@ -371,7 +371,7 @@ void copy_old_env(ulong size)
                        *name++='\0';
                        off++;
                        do {
                        *name++='\0';
                        off++;
                        do {

-                               eeprom_read (CFG_DEF_EEPROM_ADDR, CFG_ENV_OFFSET+off, &c, 1);
+                               eeprom_read (CFG_DEF_EEPROM_ADDR, CONFIG_ENV_OFFSET+off, &c, 1);

                                *value++=c;
                                off++;
                                if(c == '\0')
                                *value++=c;
                                off++;
                                if(c == '\0')

diff --git a/board/mpl/common/flash.c b/board/mpl/common/flash.c
index a2e0244d89b355b047f0faf3b78a95ec5ee7ccc9..b2d4f6f5e5f734f5f8e4102be4b7131708c5b47a 100644 (file)
--- a/board/mpl/common/flash.c
+++ b/board/mpl/common/flash.c
@@ -259,8 +259,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,

-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,

                      &flash_info[0]);
 #endif
 #endif /* #if !defined(CONFIG_PATI) */
                      &flash_info[0]);
 #endif
 #endif /* #if !defined(CONFIG_PATI) */

diff --git a/board/mpl/pati/pati.c b/board/mpl/pati/pati.c
index 475741d2af77b50a677e225d887547d24c386103..0883c429faa27d297b9f772e6466ca4cf45e4ffb 100644 (file)
--- a/board/mpl/pati/pati.c
+++ b/board/mpl/pati/pati.c
@@ -615,4 +615,4 @@ void pci_con_disc(void)
 /*
  * Absolute environment address for linker file.
  */
 /*
  * Absolute environment address for linker file.
  */

-GEN_ABS(env_start, CFG_ENV_OFFSET + CFG_FLASH_BASE);
+GEN_ABS(env_start, CONFIG_ENV_OFFSET + CFG_FLASH_BASE);

diff --git a/board/mpl/vcma9/flash.c b/board/mpl/vcma9/flash.c
index d15a19115e511e47860d3f5656a097af453cf36d..3895263fbe150baeaa5a740a421473661a2d0d33 100644 (file)
--- a/board/mpl/vcma9/flash.c
+++ b/board/mpl/vcma9/flash.c
@@ -116,8 +116,8 @@ ulong flash_init (void)
                       &flash_info[0]);
 
        flash_protect (FLAG_PROTECT_SET,
                       &flash_info[0]);
 
        flash_protect (FLAG_PROTECT_SET,

-                      CFG_ENV_ADDR,
-                      CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                      CONFIG_ENV_ADDR,
+                      CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);

 
        return size;
 }
 
        return size;
 }

diff --git a/board/musenki/flash.c b/board/musenki/flash.c
index df7bbc5488a5d8fe99a5184c6023e2613e9b110f..46035d77ccb5d5924f364324cc11999f963b87d8 100644 (file)
--- a/board/musenki/flash.c
+++ b/board/musenki/flash.c
@@ -25,14 +25,14 @@
 #include <mpc824x.h>
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 #include <mpc824x.h>
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)

-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR      (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 # endif
 # endif

-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
 # endif

-# ifndef  CFG_ENV_SECT_SIZE
-#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE
+# ifndef  CONFIG_ENV_SECT_SIZE
+#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE

 # endif
 #endif
 
 # endif
 #endif
 


@@ -155,10 +155,10 @@ unsigned long flash_init (void)
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */

-       DEBUGF("protect environtment %x @ %x\n", CFG_ENV_ADDR, CFG_ENV_SECT_SIZE);
+       DEBUGF("protect environtment %x @ %x\n", CONFIG_ENV_ADDR, CONFIG_ENV_SECT_SIZE);

        flash_protect(FLAG_PROTECT_SET,
        flash_protect(FLAG_PROTECT_SET,

-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,

                      &flash_info[0]);
 #endif
 
                      &flash_info[0]);
 #endif
 


@@ -177,8 +177,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
                /* ENV protection ON by default */
                flash_protect(FLAG_PROTECT_SET,
 #ifdef CONFIG_ENV_IS_IN_FLASH
                /* ENV protection ON by default */
                flash_protect(FLAG_PROTECT_SET,

-                             CFG_ENV_ADDR,
-                             CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1,
+                             CONFIG_ENV_ADDR,
+                             CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,

                              &flash_info[1]);
 #endif
        } else {
                              &flash_info[1]);
 #endif
        } else {

diff --git a/board/mx1ads/syncflash.c b/board/mx1ads/syncflash.c
index fae9fbb39db4a4716c6ccabedec3d94c1adf3bc0..0ffc3783bf65f744bd5eb4a980f87da0b2dedf12 100644 (file)
--- a/board/mx1ads/syncflash.c
+++ b/board/mx1ads/syncflash.c
@@ -183,8 +183,8 @@ ulong flash_init(void) {
                &flash_info[0]);
 
        flash_protect(FLAG_PROTECT_SET,
                &flash_info[0]);
 
        flash_protect(FLAG_PROTECT_SET,

-               CFG_ENV_ADDR,
-               CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+               CONFIG_ENV_ADDR,
+               CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

                &flash_info[0]);
 
        return FLASH_BANK_SIZE;
                &flash_info[0]);
 
        return FLASH_BANK_SIZE;

diff --git a/board/mx1fs2/flash.c b/board/mx1fs2/flash.c
index 73ce8957e0662edd6a0dc150dfe0d35c25a96621..8be0f49116da47b837a57d208d3c15a854afa4f2 100644 (file)
--- a/board/mx1fs2/flash.c
+++ b/board/mx1fs2/flash.c
@@ -106,8 +106,8 @@ flash_init(void)
                      &flash_info[0]);
 
        flash_protect(FLAG_PROTECT_SET,
                      &flash_info[0]);
 
        flash_protect(FLAG_PROTECT_SET,

-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);

 
        return size;
 }
 
        return size;
 }

diff --git a/board/nc650/flash.c b/board/nc650/flash.c
index a7fc084afa9b9ba5d86d556b6141d94582780006..d23e97625a828c4b698da7408e90270d8b353ca7 100644 (file)
--- a/board/nc650/flash.c
+++ b/board/nc650/flash.c
@@ -42,14 +42,14 @@ DECLARE_GLOBAL_DATA_PTR;
 flash_info_t flash_info[CFG_MAX_FLASH_BANKS];  /* info for FLASH chips    */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 flash_info_t flash_info[CFG_MAX_FLASH_BANKS];  /* info for FLASH chips    */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)

-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR      (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 # endif
 # endif

-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
 # endif

-# ifndef  CFG_ENV_SECT_SIZE
-#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE
+# ifndef  CONFIG_ENV_SECT_SIZE
+#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE

 # endif
 #endif
 
 # endif
 #endif
 


@@ -174,8 +174,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect (FLAG_PROTECT_SET,
 #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,
+                       CONFIG_ENV_ADDR,
+                       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

                        &flash_info[0]);
 #endif
 
                        &flash_info[0]);
 #endif
 

diff --git a/board/netphone/flash.c b/board/netphone/flash.c
index 0c81140f238ae11765cd9eeab8702ef1cc8aece4..cf0bc095b11f2520d1cc1e366a3941d2295f852e 100644 (file)
--- a/board/netphone/flash.c
+++ b/board/netphone/flash.c
@@ -72,14 +72,14 @@ unsigned long flash_init(void)
                        &flash_info[0]);
 
        flash_protect ( FLAG_PROTECT_SET,
                        &flash_info[0]);
 
        flash_protect ( FLAG_PROTECT_SET,

-                       CFG_ENV_ADDR,
-                       CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+                       CONFIG_ENV_ADDR,
+                       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

                        &flash_info[0]);
 
                        &flash_info[0]);
 

-#ifdef CFG_ENV_ADDR_REDUND
+#ifdef CONFIG_ENV_ADDR_REDUND

        flash_protect ( FLAG_PROTECT_SET,
        flash_protect ( FLAG_PROTECT_SET,

-                       CFG_ENV_ADDR_REDUND,
-                       CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND - 1,
+                       CONFIG_ENV_ADDR_REDUND,
+                       CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1,

                        &flash_info[0]);
 #endif
 
                        &flash_info[0]);
 #endif
 

diff --git a/board/netstal/hcu5/hcu5.c b/board/netstal/hcu5/hcu5.c
index 41fa2048dda4f1c71379e7d01bc47a90b6852d4a..f3428c2ad882f64833761fcedf4aec7afddd578d 100644 (file)
--- a/board/netstal/hcu5/hcu5.c
+++ b/board/netstal/hcu5/hcu5.c
@@ -247,11 +247,11 @@ int misc_init_r(void)
                            0xffffffff,
                            &flash_info[0]);
 
                            0xffffffff,
                            &flash_info[0]);
 

-#ifdef CFG_ENV_ADDR_REDUND
+#ifdef CONFIG_ENV_ADDR_REDUND

        /* Env protection ON by default */
        (void)flash_protect(FLAG_PROTECT_SET,
        /* Env protection ON by default */
        (void)flash_protect(FLAG_PROTECT_SET,

-                           CFG_ENV_ADDR_REDUND,
-                           CFG_ENV_ADDR_REDUND + 2*CFG_ENV_SECT_SIZE - 1,
+                           CONFIG_ENV_ADDR_REDUND,
+                           CONFIG_ENV_ADDR_REDUND + 2*CONFIG_ENV_SECT_SIZE - 1,

                            &flash_info[0]);
 #endif
 #endif
                            &flash_info[0]);
 #endif
 #endif

diff --git a/board/netta/flash.c b/board/netta/flash.c
index ca3e061c2793d8deb76dc0859c4813ddce6fce34..531204c7657fd30199794918f68006a420f95e0f 100644 (file)
--- a/board/netta/flash.c
+++ b/board/netta/flash.c
@@ -68,14 +68,14 @@ unsigned long flash_init(void)
                        &flash_info[0]);
 
        flash_protect ( FLAG_PROTECT_SET,
                        &flash_info[0]);
 
        flash_protect ( FLAG_PROTECT_SET,

-                       CFG_ENV_ADDR,
-                       CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+                       CONFIG_ENV_ADDR,
+                       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

                        &flash_info[0]);
 
                        &flash_info[0]);
 

-#ifdef CFG_ENV_ADDR_REDUND
+#ifdef CONFIG_ENV_ADDR_REDUND

        flash_protect ( FLAG_PROTECT_SET,
        flash_protect ( FLAG_PROTECT_SET,

-                       CFG_ENV_ADDR_REDUND,
-                       CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND - 1,
+                       CONFIG_ENV_ADDR_REDUND,
+                       CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1,

                        &flash_info[0]);
 #endif
 
                        &flash_info[0]);
 #endif
 

diff --git a/board/netta2/flash.c b/board/netta2/flash.c
index a1c87f513102bdf019b5f153e265d779cc03f562..cefff71332cf3565624ab8f441c4c41f704b34f2 100644 (file)
--- a/board/netta2/flash.c
+++ b/board/netta2/flash.c
@@ -69,14 +69,14 @@ unsigned long flash_init(void)
                        &flash_info[0]);
 
        flash_protect ( FLAG_PROTECT_SET,
                        &flash_info[0]);
 
        flash_protect ( FLAG_PROTECT_SET,

-                       CFG_ENV_ADDR,
-                       CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+                       CONFIG_ENV_ADDR,
+                       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

                        &flash_info[0]);
 
                        &flash_info[0]);
 

-#ifdef CFG_ENV_ADDR_REDUND
+#ifdef CONFIG_ENV_ADDR_REDUND

        flash_protect ( FLAG_PROTECT_SET,
        flash_protect ( FLAG_PROTECT_SET,

-                       CFG_ENV_ADDR_REDUND,
-                       CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND - 1,
+                       CONFIG_ENV_ADDR_REDUND,
+                       CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1,

                        &flash_info[0]);
 #endif
 
                        &flash_info[0]);
 #endif
 

diff --git a/board/netvia/flash.c b/board/netvia/flash.c
index d31f7707f74595e16b7584ec014c8457f8557e28..647f5944b573bb457302a3035482d7a461a7a42b 100644 (file)
--- a/board/netvia/flash.c
+++ b/board/netvia/flash.c
@@ -68,14 +68,14 @@ unsigned long flash_init(void)
                        &flash_info[0]);
 
        flash_protect ( FLAG_PROTECT_SET,
                        &flash_info[0]);
 
        flash_protect ( FLAG_PROTECT_SET,

-                       CFG_ENV_ADDR,
-                       CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+                       CONFIG_ENV_ADDR,
+                       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

                        &flash_info[0]);
 
                        &flash_info[0]);
 

-#ifdef CFG_ENV_ADDR_REDUND
+#ifdef CONFIG_ENV_ADDR_REDUND

        flash_protect ( FLAG_PROTECT_SET,
        flash_protect ( FLAG_PROTECT_SET,

-                       CFG_ENV_ADDR_REDUND,
-                       CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND - 1,
+                       CONFIG_ENV_ADDR_REDUND,
+                       CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1,

                        &flash_info[0]);
 #endif
 
                        &flash_info[0]);
 #endif
 

diff --git a/board/ns9750dev/flash.c b/board/ns9750dev/flash.c
index e7d65157f75d3015600ecbc35f1ff4a05f52994e..2b62bef4d9749c954cf9d4be294adecfe160a709 100644 (file)
--- a/board/ns9750dev/flash.c
+++ b/board/ns9750dev/flash.c
@@ -108,8 +108,8 @@ unsigned long flash_init (void)
                        CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]);
 
        flash_protect (FLAG_PROTECT_SET,
                        CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]);
 
        flash_protect (FLAG_PROTECT_SET,

-                       CFG_ENV_ADDR,
-                       CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                       CONFIG_ENV_ADDR,
+                       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);

 
        return size;
 }
 
        return size;
 }

diff --git a/board/o2dnt/flash.c b/board/o2dnt/flash.c
index 2aa0489da1346a1d407c41d18294c35bb3255ef8..1cf78c7b82b17b3d4def3c755b6f9c6da7d56e3c 100644 (file)
--- a/board/o2dnt/flash.c
+++ b/board/o2dnt/flash.c
@@ -106,9 +106,9 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
 #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,
-                       flash_get_info(CFG_ENV_ADDR));
+                       CONFIG_ENV_ADDR,
+                       CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,
+                       flash_get_info(CONFIG_ENV_ADDR));

 #endif
 
 
 #endif
 
 

diff --git a/board/omap1610inn/flash.c b/board/omap1610inn/flash.c
index c8e4c9e25abb6aee3dc1b160aa56061f3ef847b1..d88a981d539e4b347c525f33c3f143cfc8e2da38 100644 (file)
--- a/board/omap1610inn/flash.c
+++ b/board/omap1610inn/flash.c
@@ -112,8 +112,8 @@ unsigned long flash_init (void)
                        CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]);
 
        flash_protect (FLAG_PROTECT_SET,
                        CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]);
 
        flash_protect (FLAG_PROTECT_SET,

-                       CFG_ENV_ADDR,
-                       CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                       CONFIG_ENV_ADDR,
+                       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);

 
        return size;
 }
 
        return size;
 }

diff --git a/board/omap730p2/flash.c b/board/omap730p2/flash.c
index e7d65157f75d3015600ecbc35f1ff4a05f52994e..2b62bef4d9749c954cf9d4be294adecfe160a709 100644 (file)
--- a/board/omap730p2/flash.c
+++ b/board/omap730p2/flash.c
@@ -108,8 +108,8 @@ unsigned long flash_init (void)
                        CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]);
 
        flash_protect (FLAG_PROTECT_SET,
                        CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]);
 
        flash_protect (FLAG_PROTECT_SET,

-                       CFG_ENV_ADDR,
-                       CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                       CONFIG_ENV_ADDR,
+                       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);

 
        return size;
 }
 
        return size;
 }

diff --git a/board/oxc/flash.c b/board/oxc/flash.c
index 44e2300e94ab250dc78e66f0f39d4fe069542c9d..94d2660e1d756241a4ecc9fbebb0126e24a364ea 100644 (file)
--- a/board/oxc/flash.c
+++ b/board/oxc/flash.c
@@ -73,13 +73,13 @@ unsigned long flash_init (void)
                  &flash_info[0]);
 #endif
 
                  &flash_info[0]);
 #endif
 

-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
     flash_protect(FLAG_PROTECT_SET,
 # endif
     flash_protect(FLAG_PROTECT_SET,

-                 CFG_ENV_ADDR,
-                 CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+                 CONFIG_ENV_ADDR,
+                 CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

                  &flash_info[0]);
 #endif
 
                  &flash_info[0]);
 #endif
 

diff --git a/board/pcippc2/flash.c b/board/pcippc2/flash.c
index b1fec97dd34ee9e90de282a4105176e4e5a07061..a915fbe63f8a7c9bf5f1b65bda7e4fa8388ee7f1 100644 (file)
--- a/board/pcippc2/flash.c
+++ b/board/pcippc2/flash.c
@@ -77,8 +77,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
                /* ENV protection ON by default */
                flash_protect(FLAG_PROTECT_SET,
 #ifdef CONFIG_ENV_IS_IN_FLASH
                /* ENV protection ON by default */
                flash_protect(FLAG_PROTECT_SET,

-                             CFG_ENV_ADDR,
-                             CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
+                             CONFIG_ENV_ADDR,
+                             CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,

                              &flash_info[0]);
 #endif
 
                              &flash_info[0]);
 #endif
 

diff --git a/board/pcs440ep/pcs440ep.c b/board/pcs440ep/pcs440ep.c
index f66f3f233ecf31d829aa3b9a904cb8e9dedb20c7..21405829d081c1232581e3e072c6a9c3041e7084 100644 (file)
--- a/board/pcs440ep/pcs440ep.c
+++ b/board/pcs440ep/pcs440ep.c
@@ -491,8 +491,8 @@ int misc_init_r (void)
 
        /* Env protection ON by default */
        (void)flash_protect(FLAG_PROTECT_SET,
 
        /* Env protection ON by default */
        (void)flash_protect(FLAG_PROTECT_SET,

-                           CFG_ENV_ADDR_REDUND,
-                           CFG_ENV_ADDR_REDUND + 2*CFG_ENV_SECT_SIZE - 1,
+                           CONFIG_ENV_ADDR_REDUND,
+                           CONFIG_ENV_ADDR_REDUND + 2*CONFIG_ENV_SECT_SIZE - 1,

                            &flash_info[1]);
 
        pcs440ep_readinputs ();
                            &flash_info[1]);
 
        pcs440ep_readinputs ();

diff --git a/board/pleb2/flash.c b/board/pleb2/flash.c
index 5a1eba6b3f7eb050095705c8c1de1094672b216d..3f01921bd4e1bbc3f1bb7b88f32508ce027f6d70 100644 (file)
--- a/board/pleb2/flash.c
+++ b/board/pleb2/flash.c
@@ -23,7 +23,7 @@
 
 #include <common.h>
 #include <mpc8xx.h>
 
 #include <common.h>
 #include <mpc8xx.h>

-/* environment.h defines the various CFG_ENV_... values in terms
+/* environment.h defines the various CONFIG_ENV_... values in terms

  * of whichever ones are given in the configuration file.
  */
 #include <environment.h>
  * of whichever ones are given in the configuration file.
  */
 #include <environment.h>


@@ -107,16 +107,16 @@ unsigned long flash_init (void)
                       &flash_info[0]);
 #endif
 
                       &flash_info[0]);
 #endif
 

-#ifdef CFG_ENV_ADDR
+#ifdef CONFIG_ENV_ADDR

        flash_protect (FLAG_PROTECT_SET,
        flash_protect (FLAG_PROTECT_SET,

-                      CFG_ENV_ADDR,
-                      CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                      CONFIG_ENV_ADDR,
+                      CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);

 #endif
 
 #endif
 

-#ifdef CFG_ENV_ADDR_REDUND
+#ifdef CONFIG_ENV_ADDR_REDUND

        flash_protect (FLAG_PROTECT_SET,
        flash_protect (FLAG_PROTECT_SET,

-                      CFG_ENV_ADDR_REDUND,
-                      CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND - 1,
+                      CONFIG_ENV_ADDR_REDUND,
+                      CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1,

                       &flash_info[0]);
 #endif
 
                       &flash_info[0]);
 #endif
 

diff --git a/board/pm520/flash.c b/board/pm520/flash.c
index c899ad34044e9f4f56f87fe377024e666c0fc4db..9ec843e11e43eebe7e1c59b8b56f95b9cae56e44 100644 (file)
--- a/board/pm520/flash.c
+++ b/board/pm520/flash.c
@@ -121,8 +121,8 @@ unsigned long flash_init (void)
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
        flash_protect ( FLAG_PROTECT_SET,
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
        flash_protect ( FLAG_PROTECT_SET,

-                       CFG_ENV_ADDR,
-                       CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0] );
+                       CONFIG_ENV_ADDR,
+                       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0] );

 #endif
 
        flash_afterinit(flash_info[0].start[0], flash_info[0].size);
 #endif
 
        flash_afterinit(flash_info[0].start[0], flash_info[0].size);

diff --git a/board/pm826/flash.c b/board/pm826/flash.c
index e8e02893d76e4ec1cf3b0763b5b1a6909143711c..bd6d7d988bbbad0e0856544c9ed68634f95908e7 100644 (file)
--- a/board/pm826/flash.c
+++ b/board/pm826/flash.c
@@ -144,13 +144,13 @@ unsigned long flash_init (void)
 # endif
 #endif /* CONFIG_BOOT_ROM */
 
 # endif
 #endif /* CONFIG_BOOT_ROM */
 

-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
        flash_protect (FLAG_PROTECT_SET,
 # endif
        flash_protect (FLAG_PROTECT_SET,

-                      CFG_ENV_ADDR,
-                      CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                      CONFIG_ENV_ADDR,
+                      CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);

 #endif
 
        return (size_b0);
 #endif
 
        return (size_b0);

diff --git a/board/pm828/flash.c b/board/pm828/flash.c
index 0620ea31065c9571651e2b12ee17181fbcd90d62..2e92c11f1ef212675053a5d6b8accc8fc6bff155 100644 (file)
--- a/board/pm828/flash.c
+++ b/board/pm828/flash.c
@@ -144,13 +144,13 @@ unsigned long flash_init (void)
 # endif
 #endif /* CONFIG_BOOT_ROM */
 
 # endif
 #endif /* CONFIG_BOOT_ROM */
 

-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
        flash_protect (FLAG_PROTECT_SET,
 # endif
        flash_protect (FLAG_PROTECT_SET,

-                      CFG_ENV_ADDR,
-                      CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                      CONFIG_ENV_ADDR,
+                      CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);

 #endif
 
        return (size_b0);
 #endif
 
        return (size_b0);

diff --git a/board/ppmc7xx/flash.c b/board/ppmc7xx/flash.c
index dd91da7d72c8e7cf86460659a0bd863572cc5f30..1722a35c95cba29ca9a2bfcb9dc2941a39e523f0 100644 (file)
--- a/board/ppmc7xx/flash.c
+++ b/board/ppmc7xx/flash.c
@@ -197,13 +197,13 @@ unsigned long flash_init (void)
                       CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]);
 #endif
 
                       CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]);
 #endif
 

-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
        flash_protect (FLAG_PROTECT_SET,
 # endif
        flash_protect (FLAG_PROTECT_SET,

-                      CFG_ENV_ADDR,
-                      CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                      CONFIG_ENV_ADDR,
+                      CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);

 #endif
 
        return (size_b0);
 #endif
 
        return (size_b0);

diff --git a/board/prodrive/pdnb3/flash.c b/board/prodrive/pdnb3/flash.c
index 0786324fba6ac7620dff84090c6d79c298b7ebfb..5738c5bd04cf3e7235d726ddb32735e04c6f1a37 100644 (file)
--- a/board/prodrive/pdnb3/flash.c
+++ b/board/prodrive/pdnb3/flash.c
@@ -71,14 +71,14 @@ unsigned long flash_init(void)
 
        /* Environment protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
 
        /* Environment protection ON by default */
        flash_protect(FLAG_PROTECT_SET,

-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,

                      &flash_info[CFG_MAX_FLASH_BANKS - 1]);
 
        /* Redundant environment protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
                      &flash_info[CFG_MAX_FLASH_BANKS - 1]);
 
        /* Redundant environment protection ON by default */
        flash_protect(FLAG_PROTECT_SET,

-                     CFG_ENV_ADDR_REDUND,
-                     CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND - 1,
+                     CONFIG_ENV_ADDR_REDUND,
+                     CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1,

                      &flash_info[CFG_MAX_FLASH_BANKS - 1]);
 
        flash_info[0].size = size;
                      &flash_info[CFG_MAX_FLASH_BANKS - 1]);
 
        flash_info[0].size = size;

diff --git a/board/purple/flash.c b/board/purple/flash.c
index ee8a60e1be228929f17a4ffade448e0fa75efbd3..640bc293e769f6713c1e9c1071051c9670fd30b2 100644 (file)
--- a/board/purple/flash.c
+++ b/board/purple/flash.c
@@ -240,9 +240,9 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
 #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,
-                     flash_get_info(CFG_ENV_ADDR));
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,
+                     flash_get_info(CONFIG_ENV_ADDR));

 #endif
 
        return size;
 #endif
 
        return size;

diff --git a/board/r360mpi/flash.c b/board/r360mpi/flash.c
index 398e7342a7004fc745959fa70c867c57a02c0509..8145437b1a07518ce960aa846863b76d2cced982 100644 (file)
--- a/board/r360mpi/flash.c
+++ b/board/r360mpi/flash.c
@@ -32,14 +32,14 @@
 flash_info_t flash_info[CFG_MAX_FLASH_BANKS];  /* info for FLASH chips    */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 flash_info_t flash_info[CFG_MAX_FLASH_BANKS];  /* info for FLASH chips    */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)

-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR      (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 # endif
 # endif

-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
 # endif

-# ifndef  CFG_ENV_SECT_SIZE
-#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE
+# ifndef  CONFIG_ENV_SECT_SIZE
+#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE

 # endif
 #endif
 
 # endif
 #endif
 


@@ -114,8 +114,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect (FLAG_PROTECT_SET,
 #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,
+                       CONFIG_ENV_ADDR,
+                       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

                        &flash_info[0]);
 #endif
 
                        &flash_info[0]);
 #endif
 

diff --git a/board/rmu/flash.c b/board/rmu/flash.c
index 670faf0931094bf8c7ff6550bf355cf1d34a0bdd..7c248a7ba270a59e772896e89f3ab1068efb1d56 100644 (file)
--- a/board/rmu/flash.c
+++ b/board/rmu/flash.c
@@ -84,19 +84,19 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
 #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,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,

                      &flash_info[0]);
 #endif
 
                      &flash_info[0]);
 #endif
 

-#if defined(CFG_ENV_ADDR_REDUND) || defined(CFG_ENV_OFFSET_REDUND)
+#if defined(CONFIG_ENV_ADDR_REDUND) || defined(CONFIG_ENV_OFFSET_REDUND)

        debug ("Protect redundand environment: %08lx ... %08lx\n",
        debug ("Protect redundand environment: %08lx ... %08lx\n",

-               (ulong)CFG_ENV_ADDR_REDUND,
-               (ulong)CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE - 1);
+               (ulong)CONFIG_ENV_ADDR_REDUND,
+               (ulong)CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE - 1);

 
        flash_protect(FLAG_PROTECT_SET,
 
        flash_protect(FLAG_PROTECT_SET,

-                     CFG_ENV_ADDR_REDUND,
-                     CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND - 1,
+                     CONFIG_ENV_ADDR_REDUND,
+                     CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1,

                      &flash_info[0]);
 #endif
 
                      &flash_info[0]);
 #endif
 

diff --git a/board/rpxsuper/flash.c b/board/rpxsuper/flash.c
index 2d176947afe38a2398a70aed13d0fe625f0a1e1c..5f444bf993ff2fd8bcba03b2cc848ceaa874a8a3 100644 (file)
--- a/board/rpxsuper/flash.c
+++ b/board/rpxsuper/flash.c
@@ -71,13 +71,13 @@ unsigned long flash_init (void)
                  &flash_info[0]);
 #endif
 
                  &flash_info[0]);
 #endif
 

-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
     flash_protect(FLAG_PROTECT_SET,
 # endif
     flash_protect(FLAG_PROTECT_SET,

-                 CFG_ENV_ADDR,
-                 CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+                 CONFIG_ENV_ADDR,
+                 CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

                  &flash_info[0]);
 #endif
 
                  &flash_info[0]);
 #endif
 

diff --git a/board/rsdproto/flash.c b/board/rsdproto/flash.c
index f9544580cf6ff8f576f9b852fb7070137509cf50..312b4001d054eb1a809aa3cb7716622d37c71618 100644 (file)
--- a/board/rsdproto/flash.c
+++ b/board/rsdproto/flash.c
@@ -131,17 +131,17 @@ unsigned long flash_init (void)
                      &flash_info[1]);
 #endif
 
                      &flash_info[1]);
 #endif
 

-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
        flash_protect(FLAG_PROTECT_SET,
 # endif
        flash_protect(FLAG_PROTECT_SET,

-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

                      &flash_info[0]);
        flash_protect(FLAG_PROTECT_SET,
                      &flash_info[0]);
        flash_protect(FLAG_PROTECT_SET,

-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

                      &flash_info[1]);
 #endif
 
                      &flash_info[1]);
 #endif
 

diff --git a/board/sacsng/flash.c b/board/sacsng/flash.c
index f37be294238ae6c6056569236208d958a10d1908..8fecf95900af1252cd80f841911d5bbc11c1ae78 100644 (file)
--- a/board/sacsng/flash.c
+++ b/board/sacsng/flash.c
@@ -27,11 +27,11 @@
 
 #undef  DEBUG
 
 
 #undef  DEBUG
 

-#ifndef        CFG_ENV_ADDR
-#define CFG_ENV_ADDR   (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+#ifndef        CONFIG_ENV_ADDR
+#define CONFIG_ENV_ADDR        (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 #endif
 #endif

-#ifndef CFG_ENV_SIZE
-#define CFG_ENV_SIZE   CFG_ENV_SECT_SIZE
+#ifndef CONFIG_ENV_SIZE
+#define CONFIG_ENV_SIZE        CONFIG_ENV_SECT_SIZE

 #endif
 
 
 #endif
 
 


@@ -76,8 +76,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
 #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,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,

                      &flash_info[0]);
 #endif
 
                      &flash_info[0]);
 #endif
 


@@ -93,8 +93,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
                /* ENV protection ON by default */
                flash_protect(FLAG_PROTECT_SET,
 #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,
+                             CONFIG_ENV_ADDR,
+                             CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,

                              &flash_info[1]);
 #endif
        } else {
                              &flash_info[1]);
 #endif
        } else {

diff --git a/board/sandpoint/flash.c b/board/sandpoint/flash.c
index 60cb1915e5319b726506544141a49384950a7d4b..0f3eca2cde0678a1c084b0803edfa7cc58fa6a7a 100644 (file)
--- a/board/sandpoint/flash.c
+++ b/board/sandpoint/flash.c
@@ -33,14 +33,14 @@
 flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips    */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips    */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)

-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR  (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR  (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 # endif
 # endif

-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE  CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE  CONFIG_ENV_SECT_SIZE

 # endif
 # endif

-# ifndef  CFG_ENV_SECT_SIZE
-#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE
+# ifndef  CONFIG_ENV_SECT_SIZE
+#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE

 # endif
 #endif
 
 # endif
 #endif
 


@@ -230,10 +230,10 @@ flash_init(void)
                &flash_info[0]);
 #endif
 
                &flash_info[0]);
 #endif
 

-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)

     flash_protect(FLAG_PROTECT_SET,
     flash_protect(FLAG_PROTECT_SET,

-               CFG_ENV_ADDR,
-               CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+               CONFIG_ENV_ADDR,
+               CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

                &flash_info[0]);
 #endif
 
                &flash_info[0]);
 #endif
 

diff --git a/board/sbc2410x/flash.c b/board/sbc2410x/flash.c
index 0c669e4d76c23f02a4db9044a4958f94ff85c5c3..fa3996ddcf55bbd7a40d1e75626829f8b2c042d4 100644 (file)
--- a/board/sbc2410x/flash.c
+++ b/board/sbc2410x/flash.c
@@ -114,8 +114,8 @@ ulong flash_init (void)
                       &flash_info[0]);
 
        flash_protect (FLAG_PROTECT_SET,
                       &flash_info[0]);
 
        flash_protect (FLAG_PROTECT_SET,

-                      CFG_ENV_ADDR,
-                      CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                      CONFIG_ENV_ADDR,
+                      CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);

 
        return size;
 }
 
        return size;
 }

diff --git a/board/sbc8260/flash.c b/board/sbc8260/flash.c
index 6d659b2d58c50e74a224f23f1e791e805f21c780..d3b1f310d7b7944ff63e536ba01e1990d3877bfb 100644 (file)
--- a/board/sbc8260/flash.c
+++ b/board/sbc8260/flash.c
@@ -67,13 +67,13 @@ unsigned long flash_init (void)
                  &flash_info[0]);
 #endif
 
                  &flash_info[0]);
 #endif
 

-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
     flash_protect(FLAG_PROTECT_SET,
 # endif
     flash_protect(FLAG_PROTECT_SET,

-                 CFG_ENV_ADDR,
-                 CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+                 CONFIG_ENV_ADDR,
+                 CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

                  &flash_info[0]);
 #endif
 
                  &flash_info[0]);
 #endif
 

diff --git a/board/sc520_cdp/flash.c b/board/sc520_cdp/flash.c
index d52a847c73bf4fe46fd9b2f9f409ba00c6007e41..493d51aca23117a92a15636240acda8daf710a38 100644 (file)
--- a/board/sc520_cdp/flash.c
+++ b/board/sc520_cdp/flash.c
@@ -276,10 +276,10 @@ ulong flash_init(void)
                      i386boot_start,
                      i386boot_end,
                      &flash_info[0]);
                      i386boot_start,
                      i386boot_end,
                      &flash_info[0]);

-#ifdef CFG_ENV_ADDR
+#ifdef CONFIG_ENV_ADDR

        flash_protect(FLAG_PROTECT_SET,
        flash_protect(FLAG_PROTECT_SET,

-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

                      &flash_info[0]);
 #endif
        return size;
                      &flash_info[0]);
 #endif
        return size;

diff --git a/board/sc520_cdp/flash_old.c b/board/sc520_cdp/flash_old.c
index 3c0f6d6a6803cf7c4b75956b3a75ed69e1201264..b68626e1549e60d54b793c19c58d209e9fdcdb1c 100644 (file)
--- a/board/sc520_cdp/flash_old.c
+++ b/board/sc520_cdp/flash_old.c
@@ -119,10 +119,10 @@ ulong flash_init(void)
                      i386boot_end-SC520_FLASH_BANK0_BASE,
                      &flash_info[0]);
 
                      i386boot_end-SC520_FLASH_BANK0_BASE,
                      &flash_info[0]);
 

-#ifdef CFG_ENV_ADDR
+#ifdef CONFIG_ENV_ADDR

        flash_protect(FLAG_PROTECT_SET,
        flash_protect(FLAG_PROTECT_SET,

-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

                      &flash_info[0]);
 #endif
        return size;
                      &flash_info[0]);
 #endif
        return size;

diff --git a/board/sc520_spunk/flash.c b/board/sc520_spunk/flash.c
index 0b4bf68894f15de688b8661cddd242632f88feac..609cc42d6bb1411465226a48fbeb0e51fbc24367 100644 (file)
--- a/board/sc520_spunk/flash.c
+++ b/board/sc520_spunk/flash.c
@@ -323,10 +323,10 @@ ulong flash_init(void)
                      i386boot_start,
                      i386boot_end,
                      &flash_info[0]);
                      i386boot_start,
                      i386boot_end,
                      &flash_info[0]);

-#ifdef CFG_ENV_ADDR
+#ifdef CONFIG_ENV_ADDR

        flash_protect(FLAG_PROTECT_SET,
        flash_protect(FLAG_PROTECT_SET,

-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

                      &flash_info[0]);
 #endif
        return size;
                      &flash_info[0]);
 #endif
        return size;

diff --git a/board/scb9328/flash.c b/board/scb9328/flash.c
index 304190cbf62e302e64ed6df1cb80a20d6b87a498..536725af203c295a6c1a79a262bcc321ea99489b 100644 (file)
--- a/board/scb9328/flash.c
+++ b/board/scb9328/flash.c
@@ -142,8 +142,8 @@ ulong flash_init (void)
                                   &flash_info[0]);
 
        flash_protect (FLAG_PROTECT_SET,
                                   &flash_info[0]);
 
        flash_protect (FLAG_PROTECT_SET,

-                                  CFG_ENV_ADDR,
-                                  CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                                  CONFIG_ENV_ADDR,
+                                  CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);

 
        return SCB9328_FLASH_BANK_SIZE;
 }
 
        return SCB9328_FLASH_BANK_SIZE;
 }

diff --git a/board/shannon/flash.c b/board/shannon/flash.c
index 475b76b30bdcafee719199c02c917e712f8cbcb8..7d6eca8bba5c12d2f80abbf06e2dd2357baf7e79 100644 (file)
--- a/board/shannon/flash.c
+++ b/board/shannon/flash.c
@@ -128,8 +128,8 @@ ulong flash_init(void)
                  &flash_info[0]);
 
     flash_protect(FLAG_PROTECT_SET,
                  &flash_info[0]);
 
     flash_protect(FLAG_PROTECT_SET,

-                 CFG_ENV_ADDR,
-                 CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+                 CONFIG_ENV_ADDR,
+                 CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

                  &flash_info[0]);
 #endif
     return size;
                  &flash_info[0]);
 #endif
     return size;

diff --git a/board/siemens/SCM/flash.c b/board/siemens/SCM/flash.c
index 815f0236d1e36ed5ca530600feb3d841622a7b40..500af923ac3218dce326388163c13632ad1d9698 100644 (file)
--- a/board/siemens/SCM/flash.c
+++ b/board/siemens/SCM/flash.c
@@ -207,13 +207,13 @@ unsigned long flash_init (void)
                       CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]);
 #endif
 
                       CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]);
 #endif
 

-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
        flash_protect (FLAG_PROTECT_SET,
 # endif
        flash_protect (FLAG_PROTECT_SET,

-                      CFG_ENV_ADDR,
-                      CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                      CONFIG_ENV_ADDR,
+                      CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);

 #endif
 
        return (size_b0);
 #endif
 
        return (size_b0);

diff --git a/board/siemens/SMN42/flash.c b/board/siemens/SMN42/flash.c
index 7d4977e0262cad44321b95174de4305f6194877c..ae64096f81147a9cd215fbbb9c74daa9916c9c2a 100644 (file)
--- a/board/siemens/SMN42/flash.c
+++ b/board/siemens/SMN42/flash.c
@@ -70,8 +70,8 @@ ulong flash_init (void)
                 &flash_info[0]);
 
        flash_protect (FLAG_PROTECT_SET,
                 &flash_info[0]);
 
        flash_protect (FLAG_PROTECT_SET,

-                CFG_ENV_ADDR,
-                CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+                CONFIG_ENV_ADDR,
+                CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,

                 &flash_info[0]);
 
        size += ext_flash_init();
                 &flash_info[0]);
 
        size += ext_flash_init();

diff --git a/board/siemens/pcu_e/flash.c b/board/siemens/pcu_e/flash.c
index 5b812cb365c32d62c511aa10a885e513ee1ffbe6..97b511e4d8a4c1a701399106f85e1793c9864b9e 100644 (file)
--- a/board/siemens/pcu_e/flash.c
+++ b/board/siemens/pcu_e/flash.c
@@ -25,14 +25,14 @@
 #include <mpc8xx.h>
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 #include <mpc8xx.h>
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)

-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR      (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 # endif
 # endif

-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
 # endif

-# ifndef  CFG_ENV_SECT_SIZE
-#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE
+# ifndef  CONFIG_ENV_SECT_SIZE
+#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE

 # endif
 #endif
 
 # endif
 #endif
 


@@ -154,8 +154,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,

-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,

                      &flash_info[0]);
 #endif
 
                      &flash_info[0]);
 #endif
 


@@ -181,8 +181,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
                /* ENV protection ON by default */
                flash_protect(FLAG_PROTECT_SET,
 #ifdef CONFIG_ENV_IS_IN_FLASH
                /* ENV protection ON by default */
                flash_protect(FLAG_PROTECT_SET,

-                             CFG_ENV_ADDR,
-                             CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1,
+                             CONFIG_ENV_ADDR,
+                             CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,

                              &flash_info[1]);
 #endif
                /*
                              &flash_info[1]);
 #endif
                /*

diff --git a/board/sixnet/flash.c b/board/sixnet/flash.c
index 61d758085c238f3309ad1e0f92d2e5c0325f0d37..3f2329966ab6ea2caaaabc64c1d8fa2c3b118037 100644 (file)
--- a/board/sixnet/flash.c
+++ b/board/sixnet/flash.c
@@ -23,7 +23,7 @@
 
 #include <common.h>
 #include <mpc8xx.h>
 
 #include <common.h>
 #include <mpc8xx.h>

-/* environment.h defines the various CFG_ENV_... values in terms
+/* environment.h defines the various CONFIG_ENV_... values in terms

  * of whichever ones are given in the configuration file.
  */
 #include <environment.h>
  * of whichever ones are given in the configuration file.
  */
 #include <environment.h>


@@ -108,16 +108,16 @@ unsigned long flash_init (void)
                      &flash_info[0]);
 #endif
 
                      &flash_info[0]);
 #endif
 

-#ifdef CFG_ENV_ADDR
+#ifdef CONFIG_ENV_ADDR

        flash_protect ( FLAG_PROTECT_SET,
        flash_protect ( FLAG_PROTECT_SET,

-                       CFG_ENV_ADDR,
-                       CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                       CONFIG_ENV_ADDR,
+                       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);

 #endif
 
 #endif
 

-#ifdef CFG_ENV_ADDR_REDUND
+#ifdef CONFIG_ENV_ADDR_REDUND

        flash_protect ( FLAG_PROTECT_SET,
        flash_protect ( FLAG_PROTECT_SET,

-                       CFG_ENV_ADDR_REDUND,
-                       CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND - 1,
+                       CONFIG_ENV_ADDR_REDUND,
+                       CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1,

                        &flash_info[0]);
 #endif
 
                        &flash_info[0]);
 #endif
 

diff --git a/board/sl8245/flash.c b/board/sl8245/flash.c
index f41dde058969904d0366c609d2ad83e743858c94..c787bfb94f10d8699e86d73fff60e37ac7063498 100644 (file)
--- a/board/sl8245/flash.c
+++ b/board/sl8245/flash.c
@@ -26,14 +26,14 @@
 #include <asm/processor.h>
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 #include <asm/processor.h>
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)

-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR      (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 # endif
 # endif

-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
 # endif

-# ifndef  CFG_ENV_SECT_SIZE
-#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE
+# ifndef  CONFIG_ENV_SECT_SIZE
+#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE

 # endif
 #endif
 
 # endif
 #endif
 


@@ -139,15 +139,15 @@ unsigned long flash_init (void)
 #endif
 #endif
 
 #endif
 #endif
 

-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
-#if CFG_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
+#if CONFIG_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE

        flash_protect ( FLAG_PROTECT_SET,
        flash_protect ( FLAG_PROTECT_SET,

-                       CFG_ENV_ADDR,
-                       CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[1]);
+                       CONFIG_ENV_ADDR,
+                       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[1]);

 #else
        flash_protect ( FLAG_PROTECT_SET,
 #else
        flash_protect ( FLAG_PROTECT_SET,

-                       CFG_ENV_ADDR,
-                       CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                       CONFIG_ENV_ADDR,
+                       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);

 #endif
 #endif
 
 #endif
 #endif
 

diff --git a/board/smdk2400/flash.c b/board/smdk2400/flash.c
index fd9992d366ad8be73fef38cece2741da35f414cb..af46bf6780b1a20cb6f92205ef212df8cc3b1ff8 100644 (file)
--- a/board/smdk2400/flash.c
+++ b/board/smdk2400/flash.c
@@ -97,13 +97,13 @@ ulong flash_init (void)
                        &flash_info[0]);
 
        flash_protect ( FLAG_PROTECT_SET,
                        &flash_info[0]);
 
        flash_protect ( FLAG_PROTECT_SET,

-                       CFG_ENV_ADDR,
-                       CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                       CONFIG_ENV_ADDR,
+                       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);

 
 

-#ifdef CFG_ENV_ADDR_REDUND
+#ifdef CONFIG_ENV_ADDR_REDUND

        flash_protect ( FLAG_PROTECT_SET,
        flash_protect ( FLAG_PROTECT_SET,

-                       CFG_ENV_ADDR_REDUND,
-                       CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND - 1,
+                       CONFIG_ENV_ADDR_REDUND,
+                       CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1,

                        &flash_info[0]);
 #endif
 
                        &flash_info[0]);
 #endif
 

diff --git a/board/smdk2410/flash.c b/board/smdk2410/flash.c
index 376930bd3cbf4b448fe5dd6b261c06b6fa7b4c34..32ae80d8aa0be22aa94e1d0d621b8bdad275971a 100644 (file)
--- a/board/smdk2410/flash.c
+++ b/board/smdk2410/flash.c
@@ -116,8 +116,8 @@ ulong flash_init (void)
                       &flash_info[0]);
 
        flash_protect (FLAG_PROTECT_SET,
                       &flash_info[0]);
 
        flash_protect (FLAG_PROTECT_SET,

-                      CFG_ENV_ADDR,
-                      CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                      CONFIG_ENV_ADDR,
+                      CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);

 
        return size;
 }
 
        return size;
 }

diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c
index 73a2d9d709ed5830b8a5b24e32a34ae1c66a3827..cdab1a2231900ccf72daf18ed1417bb36fa8658f 100644 (file)
--- a/board/socrates/socrates.c
+++ b/board/socrates/socrates.c
@@ -126,14 +126,14 @@ int misc_init_r (void)
 
                /* Environment protection ON by default */
                flash_protect (FLAG_PROTECT_SET,
 
                /* Environment protection ON by default */
                flash_protect (FLAG_PROTECT_SET,

-                              CFG_ENV_ADDR,
-                              CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
+                              CONFIG_ENV_ADDR,
+                              CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,

                               &flash_info[CFG_MAX_FLASH_BANKS - 1]);
 
                /* Redundant environment protection ON by default */
                flash_protect (FLAG_PROTECT_SET,
                               &flash_info[CFG_MAX_FLASH_BANKS - 1]);
 
                /* Redundant environment protection ON by default */
                flash_protect (FLAG_PROTECT_SET,

-                              CFG_ENV_ADDR_REDUND,
-                              CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND - 1,
+                              CONFIG_ENV_ADDR_REDUND,
+                              CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1,

                               &flash_info[CFG_MAX_FLASH_BANKS - 1]);
        }
 
                               &flash_info[CFG_MAX_FLASH_BANKS - 1]);
        }
 

diff --git a/board/ssv/adnpesc1/flash.c b/board/ssv/adnpesc1/flash.c
index fd8379b1b825b3c106e9fab24d2d7b205a60a5a0..261406885e3cee951f70657cbf67bcb25dbc609c 100644 (file)
--- a/board/ssv/adnpesc1/flash.c
+++ b/board/ssv/adnpesc1/flash.c
@@ -36,7 +36,7 @@
 /*---------------------------------------------------------------------*/
 #define        BANKSZ  (8 * 1024 * 1024)
 #define        SECTSZ  (64 * 1024)
 /*---------------------------------------------------------------------*/
 #define        BANKSZ  (8 * 1024 * 1024)
 #define        SECTSZ  (64 * 1024)

-#define        UBOOTSECS ((CFG_MONITOR_LEN + CFG_ENV_SIZE) / SECTSZ)
+#define        UBOOTSECS ((CFG_MONITOR_LEN + CONFIG_ENV_SIZE) / SECTSZ)

 #define        UBOOTAREA (UBOOTSECS * 64 * 1024)       /* monitor / env area */
 
 /*---------------------------------------------------------------------*/
 #define        UBOOTAREA (UBOOTSECS * 64 * 1024)       /* monitor / env area */
 
 /*---------------------------------------------------------------------*/

diff --git a/board/stxgp3/flash.c b/board/stxgp3/flash.c
index 25ac3012c6909b516889e0b19b1fc7f3ca23d5a6..1433491dc471bbb3b465bfec46b23893ea404abe 100644 (file)
--- a/board/stxgp3/flash.c
+++ b/board/stxgp3/flash.c
@@ -42,14 +42,14 @@
 flash_info_t   flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips        */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 flash_info_t   flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips        */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)

-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR      (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 # endif
 # endif

-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
 # endif

-# ifndef  CFG_ENV_SECT_SIZE
-#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE
+# ifndef  CONFIG_ENV_SECT_SIZE
+#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE

 # endif
 #endif
 
 # endif
 #endif
 


@@ -102,8 +102,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,

-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,

                      &flash_info[0]);
 #endif
 #endif
                      &flash_info[0]);
 #endif
 #endif

diff --git a/board/svm_sc8xx/flash.c b/board/svm_sc8xx/flash.c
index 267be78f66cc4982f7422cbf9ec161e3be777d22..00fed59f25e6e4d4eed4e094e38fe43cebb0e335 100644 (file)
--- a/board/svm_sc8xx/flash.c
+++ b/board/svm_sc8xx/flash.c
@@ -23,8 +23,8 @@
 #include <common.h>
 #include <mpc8xx.h>
 
 #include <common.h>
 #include <mpc8xx.h>
 

-#ifndef        CFG_ENV_ADDR
-#define CFG_ENV_ADDR   (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+#ifndef        CONFIG_ENV_ADDR
+#define CONFIG_ENV_ADDR        (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

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


@@ -155,8 +155,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
 #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,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,

                      &flash_info[0]);
 #endif
 
                      &flash_info[0]);
 #endif
 


@@ -182,8 +182,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
                /* ENV protection ON by default */
                flash_protect(FLAG_PROTECT_SET,
 #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,
+                             CONFIG_ENV_ADDR,
+                             CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,

                              &flash_info[1]);
 #endif
        } else {
                              &flash_info[1]);
 #endif
        } else {

diff --git a/board/tqc/tqm5200/cam5200_flash.c b/board/tqc/tqm5200/cam5200_flash.c
index bb12aaea4cc042f276ae3d2ac824a7689f4ce003..4fc4dc6c4e9811e51ffdb42b37b95fc513623cc9 100644 (file)
--- a/board/tqc/tqm5200/cam5200_flash.c
+++ b/board/tqc/tqm5200/cam5200_flash.c
@@ -769,12 +769,12 @@ unsigned long flash_init(void)
                                    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
                                    &flash_info[i]);
 #if defined(CONFIG_ENV_IS_IN_FLASH)
                                    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
                                    &flash_info[i]);
 #if defined(CONFIG_ENV_IS_IN_FLASH)

-               (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
-                                   CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
+               (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
+                                   CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,

                                    &flash_info[i]);
                                    &flash_info[i]);

-#if defined(CFG_ENV_ADDR_REDUND)
-               (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND,
-                                   CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1,
+#if defined(CONFIG_ENV_ADDR_REDUND)
+               (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND,
+                                   CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,

                                    &flash_info[i]);
 #endif
 #endif
                                    &flash_info[i]);
 #endif
 #endif

diff --git a/board/tqc/tqm8260/flash.c b/board/tqc/tqm8260/flash.c
index 815f0236d1e36ed5ca530600feb3d841622a7b40..500af923ac3218dce326388163c13632ad1d9698 100644 (file)
--- a/board/tqc/tqm8260/flash.c
+++ b/board/tqc/tqm8260/flash.c
@@ -207,13 +207,13 @@ unsigned long flash_init (void)
                       CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]);
 #endif
 
                       CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]);
 #endif
 

-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
        flash_protect (FLAG_PROTECT_SET,
 # endif
        flash_protect (FLAG_PROTECT_SET,

-                      CFG_ENV_ADDR,
-                      CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                      CONFIG_ENV_ADDR,
+                      CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);

 #endif
 
        return (size_b0);
 #endif
 
        return (size_b0);

diff --git a/board/tqc/tqm85xx/tqm85xx.c b/board/tqc/tqm85xx/tqm85xx.c
index 0e5bc2f730153406b30234c55f9ab252e1a4a579..5314d3399c538912813820790d5862bb36af2203 100644 (file)
--- a/board/tqc/tqm85xx/tqm85xx.c
+++ b/board/tqc/tqm85xx/tqm85xx.c
@@ -321,15 +321,15 @@ int misc_init_r (void)
 
        /* Environment protection ON by default */
        flash_protect (FLAG_PROTECT_SET,
 
        /* Environment protection ON by default */
        flash_protect (FLAG_PROTECT_SET,

-                      CFG_ENV_ADDR,
-                      CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
+                      CONFIG_ENV_ADDR,
+                      CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,

                       &flash_info[CFG_MAX_FLASH_BANKS - 1]);
 
                       &flash_info[CFG_MAX_FLASH_BANKS - 1]);
 

-#ifdef CFG_ENV_ADDR_REDUND
+#ifdef CONFIG_ENV_ADDR_REDUND

        /* Redundant environment protection ON by default */
        flash_protect (FLAG_PROTECT_SET,
        /* Redundant environment protection ON by default */
        flash_protect (FLAG_PROTECT_SET,

-                      CFG_ENV_ADDR_REDUND,
-                      CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND - 1,
+                      CONFIG_ENV_ADDR_REDUND,
+                      CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1,

                       &flash_info[CFG_MAX_FLASH_BANKS - 1]);
 #endif
 
                       &flash_info[CFG_MAX_FLASH_BANKS - 1]);
 #endif
 

diff --git a/board/tqc/tqm8xx/flash.c b/board/tqc/tqm8xx/flash.c
index f9078cffd95a7c62b064de185b21d90ae71ad5cc..ca35e916ad0f9b886b52403dc9169a7639841b2d 100644 (file)
--- a/board/tqc/tqm8xx/flash.c
+++ b/board/tqc/tqm8xx/flash.c
@@ -43,8 +43,8 @@ DECLARE_GLOBAL_DATA_PTR;
 # endif
 #endif /* CONFIG_TQM8xxL/M, !TQM866M, !TQM885D */
 
 # endif
 #endif /* CONFIG_TQM8xxL/M, !TQM866M, !TQM885D */
 

-#ifndef        CFG_ENV_ADDR
-#define CFG_ENV_ADDR   (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+#ifndef        CONFIG_ENV_ADDR
+#define CONFIG_ENV_ADDR        (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

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


@@ -178,30 +178,30 @@ unsigned long flash_init (void)
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */

-# ifdef CFG_ENV_ADDR_REDUND
+# ifdef CONFIG_ENV_ADDR_REDUND

        debug ("Protect primary   environment: %08lx ... %08lx\n",
        debug ("Protect primary   environment: %08lx ... %08lx\n",

-               (ulong)CFG_ENV_ADDR,
-               (ulong)CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1);
+               (ulong)CONFIG_ENV_ADDR,
+               (ulong)CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1);

 # else
        debug ("Protect environment: %08lx ... %08lx\n",
 # else
        debug ("Protect environment: %08lx ... %08lx\n",

-               (ulong)CFG_ENV_ADDR,
-               (ulong)CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1);
+               (ulong)CONFIG_ENV_ADDR,
+               (ulong)CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1);

 # endif
 
        flash_protect(FLAG_PROTECT_SET,
 # endif
 
        flash_protect(FLAG_PROTECT_SET,

-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,

                      &flash_info[0]);
 #endif
 
                      &flash_info[0]);
 #endif
 

-#ifdef CFG_ENV_ADDR_REDUND
+#ifdef CONFIG_ENV_ADDR_REDUND

        debug ("Protect redundand environment: %08lx ... %08lx\n",
        debug ("Protect redundand environment: %08lx ... %08lx\n",

-               (ulong)CFG_ENV_ADDR_REDUND,
-               (ulong)CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1);
+               (ulong)CONFIG_ENV_ADDR_REDUND,
+               (ulong)CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1);

 
        flash_protect(FLAG_PROTECT_SET,
 
        flash_protect(FLAG_PROTECT_SET,

-                     CFG_ENV_ADDR_REDUND,
-                     CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1,
+                     CONFIG_ENV_ADDR_REDUND,
+                     CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,

                      &flash_info[0]);
 #endif
 
                      &flash_info[0]);
 #endif
 


@@ -232,8 +232,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
                /* ENV protection ON by default */
                flash_protect(FLAG_PROTECT_SET,
 #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,
+                             CONFIG_ENV_ADDR,
+                             CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,

                              &flash_info[1]);
 #endif
        } else {
                              &flash_info[1]);
 #endif
        } else {

diff --git a/board/trab/flash.c b/board/trab/flash.c
index 3e8f105a0316632fc435c3f955e7e427cf4d5479..08723bd2995877dda588bf095ade0f8914a67385 100644 (file)
--- a/board/trab/flash.c
+++ b/board/trab/flash.c
@@ -107,13 +107,13 @@ ulong flash_init (void)
                        &flash_info[0]);
 
        flash_protect ( FLAG_PROTECT_SET,
                        &flash_info[0]);
 
        flash_protect ( FLAG_PROTECT_SET,

-                       CFG_ENV_ADDR,
-                       CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                       CONFIG_ENV_ADDR,
+                       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);

 
 

-#ifdef CFG_ENV_ADDR_REDUND
+#ifdef CONFIG_ENV_ADDR_REDUND

        flash_protect ( FLAG_PROTECT_SET,
        flash_protect ( FLAG_PROTECT_SET,

-                       CFG_ENV_ADDR_REDUND,
-                       CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND - 1,
+                       CONFIG_ENV_ADDR_REDUND,
+                       CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1,

                        &flash_info[0]);
 #endif
 
                        &flash_info[0]);
 #endif
 

diff --git a/board/utx8245/flash.c b/board/utx8245/flash.c
index 515d8c2cee8d0ef69f4c2c37bba836c03b930cdf..5aab8862ca0a4baa0b6ef45d1097e43c4308c614 100644 (file)
--- a/board/utx8245/flash.c
+++ b/board/utx8245/flash.c
@@ -34,14 +34,14 @@
 #define ROM_CS1_START  0xFF000000
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 #define ROM_CS1_START  0xFF000000
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)

-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR      (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 # endif
 # endif

-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
 # endif

-# ifndef  CFG_ENV_SECT_SIZE
-#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE
+# ifndef  CONFIG_ENV_SECT_SIZE
+#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE

 # endif
 #endif
 
 # endif
 #endif
 


@@ -169,9 +169,9 @@ unsigned long flash_init (void)
                                   &flash_info[0]);
 #endif
 
                                   &flash_info[0]);
 #endif
 

-#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]);
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
+       flash_protect (FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
+                       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);

 #endif
 
   Done:
 #endif
 
   Done:

diff --git a/board/wepep250/flash.c b/board/wepep250/flash.c
index e2e08f742d07c19265a2ff2ff8679afba4cad741..6223ec19c160848454afaceb5eded165b4a9cd5b 100644 (file)
--- a/board/wepep250/flash.c
+++ b/board/wepep250/flash.c
@@ -142,8 +142,8 @@ ulong flash_init (void)
                                   &flash_info[0]);
 
        flash_protect (FLAG_PROTECT_SET,
                                   &flash_info[0]);
 
        flash_protect (FLAG_PROTECT_SET,

-                                  CFG_ENV_ADDR,
-                                  CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                                  CONFIG_ENV_ADDR,
+                                  CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);

 
        return WEP_FLASH_BANK_SIZE;
 }
 
        return WEP_FLASH_BANK_SIZE;
 }

diff --git a/board/westel/amx860/flash.c b/board/westel/amx860/flash.c
index 4d468d314dcb47acdc872914cab903511ebf1b73..7768e2d85a86270bdb5d3a82e014588d192950c4 100644 (file)
--- a/board/westel/amx860/flash.c
+++ b/board/westel/amx860/flash.c
@@ -27,14 +27,14 @@
 flash_info_t   flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips        */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 flash_info_t   flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips        */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)

-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR      (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 # endif
 # endif

-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
 # endif

-# ifndef  CFG_ENV_SECT_SIZE
-#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE
+# ifndef  CONFIG_ENV_SECT_SIZE
+#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE

 # endif
 #endif
 
 # endif
 #endif
 


@@ -137,8 +137,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
 #ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,

-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,

                      &flash_info[0]);
 #endif
 
                      &flash_info[0]);
 #endif
 


@@ -169,8 +169,8 @@ unsigned long flash_init (void)
 # ifdef CONFIG_ENV_IS_IN_FLASH
                /* ENV protection ON by default */
                flash_protect(FLAG_PROTECT_SET,
 # ifdef CONFIG_ENV_IS_IN_FLASH
                /* ENV protection ON by default */
                flash_protect(FLAG_PROTECT_SET,

-                             CFG_ENV_ADDR,
-                             CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1,
+                             CONFIG_ENV_ADDR,
+                             CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,

                              &flash_info[1]);
 #endif
        } else {
                              &flash_info[1]);
 #endif
        } else {

diff --git a/board/xaeniax/flash.c b/board/xaeniax/flash.c
index 9874a14fb387b28cf36d4f8761a91f656a7bd711..cd257df5ba568b318697543a8c0a7c521d1918a9 100644 (file)
--- a/board/xaeniax/flash.c
+++ b/board/xaeniax/flash.c
@@ -90,8 +90,8 @@ unsigned long flash_init (void)
                        &flash_info[0] );
 
        flash_protect ( FLAG_PROTECT_SET,
                        &flash_info[0] );
 
        flash_protect ( FLAG_PROTECT_SET,

-                       CFG_ENV_ADDR,
-                       CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0] );
+                       CONFIG_ENV_ADDR,
+                       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0] );

 
        return size;
 }
 
        return size;
 }

diff --git a/board/xilinx/xilinx_iic/iic_adapter.c b/board/xilinx/xilinx_iic/iic_adapter.c
index 5d84ca794173ef0034150945cfe6b9fe94bdf1b1..ad19ade06c2e5d0dee9e7906cf715760bc2eac8a 100644 (file)
--- a/board/xilinx/xilinx_iic/iic_adapter.c
+++ b/board/xilinx/xilinx_iic/iic_adapter.c
@@ -221,7 +221,7 @@ read_crc(uchar * buffer, int len)
        u8 pre;                 /* previous EEPROM data bit */
        int i, loc;
 
        u8 pre;                 /* previous EEPROM data bit */
        int i, loc;
 

-       addr = CFG_ENV_OFFSET;  /* start from first env address */
+       addr = CONFIG_ENV_OFFSET;       /* start from first env address */

        n = 0;
        pre = 1;
        stop = 1;
        n = 0;
        pre = 1;
        stop = 1;


@@ -229,7 +229,7 @@ read_crc(uchar * buffer, int len)
 
        /* calculate runtime CRC according to ML300 and read back
           old CRC stored in the EEPROM */
 
        /* calculate runtime CRC according to ML300 and read back
           old CRC stored in the EEPROM */

-       while (n < CFG_ENV_SIZE) {
+       while (n < CONFIG_ENV_SIZE) {

                receive(addr, buffer, len);
 
                /* found two null chars, end of env */
                receive(addr, buffer, len);
 
                /* found two null chars, end of env */


@@ -270,7 +270,7 @@ read_crc(uchar * buffer, int len)
                crc = 0;
                n = 0;
                addr =
                crc = 0;
                n = 0;
                addr =

-                   CFG_ENV_OFFSET - offsetof(env_t, crc) + offsetof(env_t,
+                   CONFIG_ENV_OFFSET - offsetof(env_t, crc) + offsetof(env_t,

                                                                     data);
                /* calculate u-boot crc */
                while (n < ENV_SIZE) {
                                                                     data);
                /* calculate u-boot crc */
                while (n < ENV_SIZE) {


@@ -464,7 +464,7 @@ save_env(void)
 
        /* update EEPROM env values if there is enough space */
        if (update_crc(len, (uchar *)eprom) == 0)
 
        /* update EEPROM env values if there is enough space */
        if (update_crc(len, (uchar *)eprom) == 0)

-               send(CFG_ENV_OFFSET, (uchar *)eprom, len + 6);
+               send(CONFIG_ENV_OFFSET, (uchar *)eprom, len + 6);

 }
 
 /************************************************************************
 }
 
 /************************************************************************


@@ -483,7 +483,7 @@ i2c_read(uchar chip, uint addr, int alen, uchar * buffer, int len)
                /* then read out EEPROM content for runtime u-boot CRC calculation */
                receive(addr, buffer, len);
 
                /* then read out EEPROM content for runtime u-boot CRC calculation */
                receive(addr, buffer, len);
 

-               if (addr + len - CFG_ENV_OFFSET == CFG_ENV_SIZE)
+               if (addr + len - CONFIG_ENV_OFFSET == CONFIG_ENV_SIZE)

                        /* end of runtime crc read */
                        ++envStep;
                return 0;
                        /* end of runtime crc read */
                        ++envStep;
                return 0;


@@ -492,7 +492,7 @@ i2c_read(uchar chip, uint addr, int alen, uchar * buffer, int len)
        if (len < 2) {
                /* when call getenv_r */
                receive(addr, buffer, len);
        if (len < 2) {
                /* when call getenv_r */
                receive(addr, buffer, len);

-       } else if (addr + len < CFG_ENV_OFFSET + CFG_ENV_SIZE) {
+       } else if (addr + len < CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) {

                /* calling env_relocate(), but don't read out
                   crc value from EEPROM */
                receive(addr, buffer + 4, len);
                /* calling env_relocate(), but don't read out
                   crc value from EEPROM */
                receive(addr, buffer + 4, len);


@@ -511,7 +511,7 @@ int
 i2c_write(uchar chip, uint addr, int alen, uchar * buffer, int len)
 {
        /* save env on last page write called by u-boot */
 i2c_write(uchar chip, uint addr, int alen, uchar * buffer, int len)
 {
        /* save env on last page write called by u-boot */

-       if (addr + len >= CFG_ENV_OFFSET + CFG_ENV_SIZE)
+       if (addr + len >= CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)

                save_env();
 
        return 0;
                save_env();
 
        return 0;

diff --git a/board/xm250/flash.c b/board/xm250/flash.c
index aab47a0a55c409e7caf9de353a2a1f4d67222a2f..893351eea3863413ffe47c9bbf3e0cac311a940b 100644 (file)
--- a/board/xm250/flash.c
+++ b/board/xm250/flash.c
@@ -109,8 +109,8 @@ unsigned long flash_init (void)
                        &flash_info[0] );
 
        flash_protect ( FLAG_PROTECT_SET,
                        &flash_info[0] );
 
        flash_protect ( FLAG_PROTECT_SET,

-                       CFG_ENV_ADDR,
-                       CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0] );
+                       CONFIG_ENV_ADDR,
+                       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0] );

 
        return size;
 }
 
        return size;
 }

diff --git a/board/xsengine/flash.c b/board/xsengine/flash.c
index a188e244089e0e1a71e5e5c35ed40498fe324610..f29def268d10d0dd791ecfc77526ff2715b4a573 100644 (file)
--- a/board/xsengine/flash.c
+++ b/board/xsengine/flash.c
@@ -62,7 +62,7 @@ unsigned long flash_init (void)
 
        /* Protect monitor and environment sectors */
        flash_protect ( FLAG_PROTECT_SET,CFG_FLASH_BASE,CFG_FLASH_BASE + monitor_flash_len - 1,&flash_info[0] );
 
        /* Protect monitor and environment sectors */
        flash_protect ( FLAG_PROTECT_SET,CFG_FLASH_BASE,CFG_FLASH_BASE + monitor_flash_len - 1,&flash_info[0] );

-       flash_protect ( FLAG_PROTECT_SET,CFG_ENV_ADDR,CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0] );
+       flash_protect ( FLAG_PROTECT_SET,CONFIG_ENV_ADDR,CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0] );

 
        return size;
 }
 
        return size;
 }

diff --git a/board/zeus/zeus.c b/board/zeus/zeus.c
index 33d971ab024d33b5c9841474dcb3815e57f6bcfe..8e4c0e2fd77150bbdd27601ccd17cb0df3b26c28 100644 (file)
--- a/board/zeus/zeus.c
+++ b/board/zeus/zeus.c
@@ -150,8 +150,8 @@ int misc_init_r(void)
 
        /* Env protection ON by default */
        (void)flash_protect(FLAG_PROTECT_SET,
 
        /* Env protection ON by default */
        (void)flash_protect(FLAG_PROTECT_SET,

-                           CFG_ENV_ADDR_REDUND,
-                           CFG_ENV_ADDR_REDUND + 2*CFG_ENV_SECT_SIZE - 1,
+                           CONFIG_ENV_ADDR_REDUND,
+                           CONFIG_ENV_ADDR_REDUND + 2*CONFIG_ENV_SECT_SIZE - 1,

                            &flash_info[0]);
 
        return 0;
                            &flash_info[0]);
 
        return 0;


@@ -249,12 +249,12 @@ static int restore_default(void)
         * Unprotect and erase environment area
         */
        flash_protect(FLAG_PROTECT_CLEAR,
         * Unprotect and erase environment area
         */
        flash_protect(FLAG_PROTECT_CLEAR,

-                     CFG_ENV_ADDR_REDUND,
-                     CFG_ENV_ADDR_REDUND + 2*CFG_ENV_SECT_SIZE - 1,
+                     CONFIG_ENV_ADDR_REDUND,
+                     CONFIG_ENV_ADDR_REDUND + 2*CONFIG_ENV_SECT_SIZE - 1,

                      &flash_info[0]);
 
                      &flash_info[0]);
 

-       flash_sect_erase(CFG_ENV_ADDR_REDUND,
-                        CFG_ENV_ADDR_REDUND + 2*CFG_ENV_SECT_SIZE - 1);
+       flash_sect_erase(CONFIG_ENV_ADDR_REDUND,
+                        CONFIG_ENV_ADDR_REDUND + 2*CONFIG_ENV_SECT_SIZE - 1);

 
        /*
         * Now restore default environment from U-Boot image
 
        /*
         * Now restore default environment from U-Boot image

diff --git a/board/zylonite/flash.c b/board/zylonite/flash.c
index 883c1ba3b3f2f3ffabbc618e0a0c00438eae9e00..80b520b97629717dc5324f1f212a6b20720cb4a6 100644 (file)
--- a/board/zylonite/flash.c
+++ b/board/zylonite/flash.c
@@ -91,8 +91,8 @@ unsigned long flash_init (void)
                        &flash_info[0] );
 
        flash_protect ( FLAG_PROTECT_SET,
                        &flash_info[0] );
 
        flash_protect ( FLAG_PROTECT_SET,

-                       CFG_ENV_ADDR,
-                       CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0] );
+                       CONFIG_ENV_ADDR,
+                       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0] );

 
        return size;
 #endif
 
        return size;
 #endif

diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c
index 24ff9b9956eff07f77b9435f263f26297f81a2ec..f4d9d404e62771ecba7388d374ece7fe0c21fb08 100644 (file)
--- a/common/cmd_bdinfo.c
+++ b/common/cmd_bdinfo.c
@@ -224,7 +224,7 @@ int do_bdinfo(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        print_lnum("memsize                ", bd->bi_memsize);
        print_num("flashstart             ", bd->bi_flashstart);
        print_num("CFG_MONITOR_BASE       ", CFG_MONITOR_BASE);
        print_lnum("memsize                ", bd->bi_memsize);
        print_num("flashstart             ", bd->bi_flashstart);
        print_num("CFG_MONITOR_BASE       ", CFG_MONITOR_BASE);

-       print_num("CFG_ENV_ADDR           ", CFG_ENV_ADDR);
+       print_num("CONFIG_ENV_ADDR           ", CONFIG_ENV_ADDR);

        printf("CFG_RELOC_MONITOR_BASE = 0x%lx (%d)\n", CFG_RELOC_MONITOR_BASE,
               CFG_MONITOR_LEN);
        printf("CFG_MALLOC_BASE        = 0x%lx (%d)\n", CFG_MALLOC_BASE,
        printf("CFG_RELOC_MONITOR_BASE = 0x%lx (%d)\n", CFG_RELOC_MONITOR_BASE,
               CFG_MONITOR_LEN);
        printf("CFG_MALLOC_BASE        = 0x%lx (%d)\n", CFG_MALLOC_BASE,

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index f449715ca29fa00de399f40a44e3b9008bfbd45b..637d6c948d5f26bde36e00010a62b8014c3ee1fd 100644 (file)
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -503,7 +503,7 @@ char *getenv (char *name)
                int val;
 
                for (nxt=i; env_get_char(nxt) != '\0'; ++nxt) {
                int val;
 
                for (nxt=i; env_get_char(nxt) != '\0'; ++nxt) {

-                       if (nxt >= CFG_ENV_SIZE) {
+                       if (nxt >= CONFIG_ENV_SIZE) {

                                return (NULL);
                        }
                }
                                return (NULL);
                        }
                }


@@ -523,7 +523,7 @@ int getenv_r (char *name, char *buf, unsigned len)
                int val, n;
 
                for (nxt=i; env_get_char(nxt) != '\0'; ++nxt) {
                int val, n;
 
                for (nxt=i; env_get_char(nxt) != '\0'; ++nxt) {

-                       if (nxt >= CFG_ENV_SIZE) {
+                       if (nxt >= CONFIG_ENV_SIZE) {

                                return (-1);
                        }
                }
                                return (-1);
                        }
                }

diff --git a/common/env_common.c b/common/env_common.c
index c3946f0a74cd84bc39a525407f62aa0e6081962c..77f99441a1cc1d20b986d9cb36776cfcd60d1bf6 100644 (file)
--- a/common/env_common.c
+++ b/common/env_common.c
@@ -241,7 +241,7 @@ void env_relocate (void)
        /*
         * We must allocate a buffer for the environment
         */
        /*
         * We must allocate a buffer for the environment
         */

-       env_ptr = (env_t *)malloc (CFG_ENV_SIZE);
+       env_ptr = (env_t *)malloc (CONFIG_ENV_SIZE);

        DEBUGF ("%s[%d] malloced ENV at %p\n", __FUNCTION__,__LINE__,env_ptr);
 #endif
 
        DEBUGF ("%s[%d] malloced ENV at %p\n", __FUNCTION__,__LINE__,env_ptr);
 #endif
 

diff --git a/common/env_dataflash.c b/common/env_dataflash.c
index 2254b9b491a5adc49556094b239a01bd61ecf107..fed919e675ec6b3eb3c4d8ea6aa7d031e3f8db0c 100644 (file)
--- a/common/env_dataflash.c
+++ b/common/env_dataflash.c
@@ -41,22 +41,22 @@ extern uchar default_environment[];
 uchar env_get_char_spec (int index)
 {
        uchar c;
 uchar env_get_char_spec (int index)
 {
        uchar c;

-       read_dataflash(CFG_ENV_ADDR + index + offsetof(env_t,data),
+       read_dataflash(CONFIG_ENV_ADDR + index + offsetof(env_t,data),

        1, (char *)&c);
        return (c);
 }
 
 void env_relocate_spec (void)
 {
        1, (char *)&c);
        return (c);
 }
 
 void env_relocate_spec (void)
 {

-       read_dataflash(CFG_ENV_ADDR, CFG_ENV_SIZE, (char *)env_ptr);
+       read_dataflash(CONFIG_ENV_ADDR, CONFIG_ENV_SIZE, (char *)env_ptr);

 }
 
 int saveenv(void)
 {
        /* env must be copied to do not alter env structure in memory*/
 }
 
 int saveenv(void)
 {
        /* env must be copied to do not alter env structure in memory*/

-       unsigned char temp[CFG_ENV_SIZE];
-       memcpy(temp, env_ptr, CFG_ENV_SIZE);
-       return write_dataflash(CFG_ENV_ADDR, (unsigned long)temp, CFG_ENV_SIZE);
+       unsigned char temp[CONFIG_ENV_SIZE];
+       memcpy(temp, env_ptr, CONFIG_ENV_SIZE);
+       return write_dataflash(CONFIG_ENV_ADDR, (unsigned long)temp, CONFIG_ENV_SIZE);

 }
 
 /************************************************************************
 }
 
 /************************************************************************


@@ -74,14 +74,14 @@ int env_init(void)
                AT91F_DataflashInit();  /* prepare for DATAFLASH read/write */
 
                /* read old CRC */
                AT91F_DataflashInit();  /* prepare for DATAFLASH read/write */
 
                /* read old CRC */

-               read_dataflash(CFG_ENV_ADDR + offsetof(env_t, crc),
+               read_dataflash(CONFIG_ENV_ADDR + offsetof(env_t, crc),

                        sizeof(ulong), (char *)&crc);
                new = 0;
                len = ENV_SIZE;
                off = offsetof(env_t,data);
                while (len > 0) {
                        int n = (len > sizeof(buf)) ? sizeof(buf) : len;
                        sizeof(ulong), (char *)&crc);
                new = 0;
                len = ENV_SIZE;
                off = offsetof(env_t,data);
                while (len > 0) {
                        int n = (len > sizeof(buf)) ? sizeof(buf) : len;

-                       read_dataflash(CFG_ENV_ADDR + off, n, (char *)buf);
+                       read_dataflash(CONFIG_ENV_ADDR + off, n, (char *)buf);

                        new = crc32 (new, buf, n);
                        len -= n;
                        off += n;
                        new = crc32 (new, buf, n);
                        len -= n;
                        off += n;

diff --git a/common/env_eeprom.c b/common/env_eeprom.c
index df3e31e93ab56c2175a286e23bb7a8f41c7e207f..1f0f413cf877404319b87a478fb6aa8fe5f9c011 100644 (file)
--- a/common/env_eeprom.c
+++ b/common/env_eeprom.c
@@ -40,7 +40,7 @@ uchar env_get_char_spec (int index)
        uchar c;
 
        eeprom_read (CFG_DEF_EEPROM_ADDR,
        uchar c;
 
        eeprom_read (CFG_DEF_EEPROM_ADDR,

-                    CFG_ENV_OFFSET+index+offsetof(env_t,data),
+                    CONFIG_ENV_OFFSET+index+offsetof(env_t,data),

                     &c, 1);
 
        return (c);
                     &c, 1);
 
        return (c);


@@ -49,17 +49,17 @@ uchar env_get_char_spec (int index)
 void env_relocate_spec (void)
 {
        eeprom_read (CFG_DEF_EEPROM_ADDR,
 void env_relocate_spec (void)
 {
        eeprom_read (CFG_DEF_EEPROM_ADDR,

-                    CFG_ENV_OFFSET,
+                    CONFIG_ENV_OFFSET,

                     (uchar*)env_ptr,
                     (uchar*)env_ptr,

-                    CFG_ENV_SIZE);
+                    CONFIG_ENV_SIZE);

 }
 
 int saveenv(void)
 {
        return eeprom_write (CFG_DEF_EEPROM_ADDR,
 }
 
 int saveenv(void)
 {
        return eeprom_write (CFG_DEF_EEPROM_ADDR,

-                            CFG_ENV_OFFSET,
+                            CONFIG_ENV_OFFSET,

                             (uchar *)env_ptr,
                             (uchar *)env_ptr,

-                            CFG_ENV_SIZE);
+                            CONFIG_ENV_SIZE);

 }
 
 /************************************************************************
 }
 
 /************************************************************************


@@ -78,7 +78,7 @@ int env_init(void)
 
        /* read old CRC */
        eeprom_read (CFG_DEF_EEPROM_ADDR,
 
        /* read old CRC */
        eeprom_read (CFG_DEF_EEPROM_ADDR,

-                    CFG_ENV_OFFSET+offsetof(env_t,crc),
+                    CONFIG_ENV_OFFSET+offsetof(env_t,crc),

                     (uchar *)&crc, sizeof(ulong));
 
        new = 0;
                     (uchar *)&crc, sizeof(ulong));
 
        new = 0;


@@ -87,7 +87,7 @@ int env_init(void)
        while (len > 0) {
                int n = (len > sizeof(buf)) ? sizeof(buf) : len;
 
        while (len > 0) {
                int n = (len > sizeof(buf)) ? sizeof(buf) : len;
 

-               eeprom_read (CFG_DEF_EEPROM_ADDR, CFG_ENV_OFFSET+off, buf, n);
+               eeprom_read (CFG_DEF_EEPROM_ADDR, CONFIG_ENV_OFFSET+off, buf, n);

                new = crc32 (new, buf, n);
                len -= n;
                off += n;
                new = crc32 (new, buf, n);
                len -= n;
                off += n;

diff --git a/common/env_embedded.c b/common/env_embedded.c
index 3b9914f49846c1421178e3fe34f1e9a0a7e10d83..77e561912cb1d5a8151a354058ae85cb4753d074 100644 (file)
--- a/common/env_embedded.c
+++ b/common/env_embedded.c
@@ -180,7 +180,7 @@ env_t environment __PPCENV__ = {
        "\0"            /* Term. env_t.data with 2 NULs */
        }
 };
        "\0"            /* Term. env_t.data with 2 NULs */
        }
 };

-#ifdef CFG_ENV_ADDR_REDUND
+#ifdef CONFIG_ENV_ADDR_REDUND

 env_t redundand_environment __PPCENV__ = {
        0,              /* CRC Sum: invalid */
        0,              /* Flags:   invalid */
 env_t redundand_environment __PPCENV__ = {
        0,              /* CRC Sum: invalid */
        0,              /* Flags:   invalid */


@@ -188,7 +188,7 @@ env_t redundand_environment __PPCENV__ = {
        "\0"
        }
 };
        "\0"
        }
 };

-#endif /* CFG_ENV_ADDR_REDUND */
+#endif /* CONFIG_ENV_ADDR_REDUND */

 
 /*
  * These will end up in the .text section
 
 /*
  * These will end up in the .text section


@@ -203,6 +203,6 @@ unsigned long env_size __PPCTEXT__ = sizeof(env_t);
 /*
  * Add in absolutes.
  */
 /*
  * Add in absolutes.
  */

-GEN_ABS(env_offset, CFG_ENV_OFFSET);
+GEN_ABS(env_offset, CONFIG_ENV_OFFSET);

 
 #endif /* ENV_IS_EMBEDDED */
 
 #endif /* ENV_IS_EMBEDDED */

diff --git a/common/env_flash.c b/common/env_flash.c
index 84166afea856a32b65896369b47fddd818eaecef..75ee8ddc89ee6d761d2c6b25b8f02430529446cc 100644 (file)
--- a/common/env_flash.c
+++ b/common/env_flash.c
@@ -36,17 +36,17 @@ DECLARE_GLOBAL_DATA_PTR;
 
 #if defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)
 #define CMD_SAVEENV
 
 #if defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)
 #define CMD_SAVEENV

-#elif defined(CFG_ENV_ADDR_REDUND)
-#error Cannot use CFG_ENV_ADDR_REDUND without CONFIG_CMD_ENV & CONFIG_CMD_FLASH
+#elif defined(CONFIG_ENV_ADDR_REDUND)
+#error Cannot use CONFIG_ENV_ADDR_REDUND without CONFIG_CMD_ENV & CONFIG_CMD_FLASH

 #endif
 
 #endif
 

-#if defined(CFG_ENV_SIZE_REDUND) && (CFG_ENV_SIZE_REDUND < CFG_ENV_SIZE)
-#error CFG_ENV_SIZE_REDUND should not be less then CFG_ENV_SIZE
+#if defined(CONFIG_ENV_SIZE_REDUND) && (CONFIG_ENV_SIZE_REDUND < CONFIG_ENV_SIZE)
+#error CONFIG_ENV_SIZE_REDUND should not be less then CONFIG_ENV_SIZE

 #endif
 
 #ifdef CONFIG_INFERNO
 #endif
 
 #ifdef CONFIG_INFERNO

-# ifdef CFG_ENV_ADDR_REDUND
-#error CFG_ENV_ADDR_REDUND is not implemented for CONFIG_INFERNO
+# ifdef CONFIG_ENV_ADDR_REDUND
+#error CONFIG_ENV_ADDR_REDUND is not implemented for CONFIG_INFERNO

 # endif
 #endif
 
 # endif
 #endif
 


@@ -59,28 +59,28 @@ env_t *env_ptr = (env_t *)(&environment[0]);
 
 #ifdef CMD_SAVEENV
 /* static env_t *flash_addr = (env_t *)(&environment[0]);-broken on ARM-wd-*/
 
 #ifdef CMD_SAVEENV
 /* static env_t *flash_addr = (env_t *)(&environment[0]);-broken on ARM-wd-*/

-static env_t *flash_addr = (env_t *)CFG_ENV_ADDR;
+static env_t *flash_addr = (env_t *)CONFIG_ENV_ADDR;

 #endif
 
 #else /* ! ENV_IS_EMBEDDED */
 
 #endif
 
 #else /* ! ENV_IS_EMBEDDED */
 

-env_t *env_ptr = (env_t *)CFG_ENV_ADDR;
+env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;

 #ifdef CMD_SAVEENV
 #ifdef CMD_SAVEENV

-static env_t *flash_addr = (env_t *)CFG_ENV_ADDR;
+static env_t *flash_addr = (env_t *)CONFIG_ENV_ADDR;

 #endif
 
 #endif /* ENV_IS_EMBEDDED */
 
 #endif
 
 #endif /* ENV_IS_EMBEDDED */
 

-#ifdef CFG_ENV_ADDR_REDUND
-static env_t *flash_addr_new = (env_t *)CFG_ENV_ADDR_REDUND;
+#ifdef CONFIG_ENV_ADDR_REDUND
+static env_t *flash_addr_new = (env_t *)CONFIG_ENV_ADDR_REDUND;

 
 

-/* CFG_ENV_ADDR is supposed to be on sector boundary */
-static ulong end_addr = CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1;
-static ulong end_addr_new = CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1;
+/* CONFIG_ENV_ADDR is supposed to be on sector boundary */
+static ulong end_addr = CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1;
+static ulong end_addr_new = CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1;

 
 #define ACTIVE_FLAG   1
 #define OBSOLETE_FLAG 0
 
 #define ACTIVE_FLAG   1
 #define OBSOLETE_FLAG 0

-#endif /* CFG_ENV_ADDR_REDUND */
+#endif /* CONFIG_ENV_ADDR_REDUND */

 
 extern uchar default_environment[];
 extern int default_environment_size;
 
 extern uchar default_environment[];
 extern int default_environment_size;


@@ -91,7 +91,7 @@ uchar env_get_char_spec (int index)
        return ( *((uchar *)(gd->env_addr + index)) );
 }
 
        return ( *((uchar *)(gd->env_addr + index)) );
 }
 

-#ifdef CFG_ENV_ADDR_REDUND
+#ifdef CONFIG_ENV_ADDR_REDUND

 
 int  env_init(void)
 {
 
 int  env_init(void)
 {


@@ -142,7 +142,7 @@ int saveenv(void)
        char *saved_data = NULL;
        int rc = 1;
        char flag = OBSOLETE_FLAG, new_flag = ACTIVE_FLAG;
        char *saved_data = NULL;
        int rc = 1;
        char flag = OBSOLETE_FLAG, new_flag = ACTIVE_FLAG;

-#if CFG_ENV_SECT_SIZE > CFG_ENV_SIZE
+#if CONFIG_ENV_SECT_SIZE > CONFIG_ENV_SIZE

        ulong up_data = 0;
 #endif
 
        ulong up_data = 0;
 #endif
 


@@ -160,8 +160,8 @@ int saveenv(void)
                goto Done;
        }
 
                goto Done;
        }
 

-#if CFG_ENV_SECT_SIZE > CFG_ENV_SIZE
-       up_data = (end_addr_new + 1 - ((long)flash_addr_new + CFG_ENV_SIZE));
+#if CONFIG_ENV_SECT_SIZE > CONFIG_ENV_SIZE
+       up_data = (end_addr_new + 1 - ((long)flash_addr_new + CONFIG_ENV_SIZE));

        debug ("Data to save 0x%x\n", up_data);
        if (up_data) {
                if ((saved_data = malloc(up_data)) == NULL) {
        debug ("Data to save 0x%x\n", up_data);
        if (up_data) {
                if ((saved_data = malloc(up_data)) == NULL) {


@@ -170,9 +170,9 @@ int saveenv(void)
                        goto Done;
                }
                memcpy(saved_data,
                        goto Done;
                }
                memcpy(saved_data,

-                       (void *)((long)flash_addr_new + CFG_ENV_SIZE), up_data);
+                       (void *)((long)flash_addr_new + CONFIG_ENV_SIZE), up_data);

                debug ("Data (start 0x%x, len 0x%x) saved at 0x%x\n",
                debug ("Data (start 0x%x, len 0x%x) saved at 0x%x\n",

-                          (long)flash_addr_new + CFG_ENV_SIZE,
+                          (long)flash_addr_new + CONFIG_ENV_SIZE,

                                up_data, saved_data);
        }
 #endif
                                up_data, saved_data);
        }
 #endif


@@ -206,12 +206,12 @@ int saveenv(void)
        }
        puts ("done\n");
 
        }
        puts ("done\n");
 

-#if CFG_ENV_SECT_SIZE > CFG_ENV_SIZE
+#if CONFIG_ENV_SECT_SIZE > CONFIG_ENV_SIZE

        if (up_data) { /* restore the rest of sector */
                debug ("Restoring the rest of data to 0x%x len 0x%x\n",
        if (up_data) { /* restore the rest of sector */
                debug ("Restoring the rest of data to 0x%x len 0x%x\n",

-                          (long)flash_addr_new + CFG_ENV_SIZE, up_data);
+                          (long)flash_addr_new + CONFIG_ENV_SIZE, up_data);

                if (flash_write(saved_data,
                if (flash_write(saved_data,

-                               (long)flash_addr_new + CFG_ENV_SIZE,
+                               (long)flash_addr_new + CONFIG_ENV_SIZE,

                                up_data)) {
                        flash_perror(rc);
                        goto Done;
                                up_data)) {
                        flash_perror(rc);
                        goto Done;


@@ -242,7 +242,7 @@ Done:
 }
 #endif /* CMD_SAVEENV */
 
 }
 #endif /* CMD_SAVEENV */
 

-#else /* ! CFG_ENV_ADDR_REDUND */
+#else /* ! CONFIG_ENV_ADDR_REDUND */

 
 int  env_init(void)
 {
 
 int  env_init(void)
 {


@@ -264,36 +264,36 @@ int saveenv(void)
        int     len, rc;
        ulong   end_addr;
        ulong   flash_sect_addr;
        int     len, rc;
        ulong   end_addr;
        ulong   flash_sect_addr;

-#if defined(CFG_ENV_SECT_SIZE) && (CFG_ENV_SECT_SIZE > CFG_ENV_SIZE)
+#if defined(CONFIG_ENV_SECT_SIZE) && (CONFIG_ENV_SECT_SIZE > CONFIG_ENV_SIZE)

        ulong   flash_offset;
        ulong   flash_offset;

-       uchar   env_buffer[CFG_ENV_SECT_SIZE];
+       uchar   env_buffer[CONFIG_ENV_SECT_SIZE];

 #else
        uchar *env_buffer = (uchar *)env_ptr;
 #else
        uchar *env_buffer = (uchar *)env_ptr;

-#endif /* CFG_ENV_SECT_SIZE */
+#endif /* CONFIG_ENV_SECT_SIZE */

        int rcode = 0;
 
        int rcode = 0;
 

-#if defined(CFG_ENV_SECT_SIZE) && (CFG_ENV_SECT_SIZE > CFG_ENV_SIZE)
+#if defined(CONFIG_ENV_SECT_SIZE) && (CONFIG_ENV_SECT_SIZE > CONFIG_ENV_SIZE)

 
 

-       flash_offset    = ((ulong)flash_addr) & (CFG_ENV_SECT_SIZE-1);
-       flash_sect_addr = ((ulong)flash_addr) & ~(CFG_ENV_SECT_SIZE-1);
+       flash_offset    = ((ulong)flash_addr) & (CONFIG_ENV_SECT_SIZE-1);
+       flash_sect_addr = ((ulong)flash_addr) & ~(CONFIG_ENV_SECT_SIZE-1);

 
        debug ( "copy old content: "
                "sect_addr: %08lX  env_addr: %08lX  offset: %08lX\n",
                flash_sect_addr, (ulong)flash_addr, flash_offset);
 
        /* copy old contents to temporary buffer */
 
        debug ( "copy old content: "
                "sect_addr: %08lX  env_addr: %08lX  offset: %08lX\n",
                flash_sect_addr, (ulong)flash_addr, flash_offset);
 
        /* copy old contents to temporary buffer */

-       memcpy (env_buffer, (void *)flash_sect_addr, CFG_ENV_SECT_SIZE);
+       memcpy (env_buffer, (void *)flash_sect_addr, CONFIG_ENV_SECT_SIZE);

 
        /* copy current environment to temporary buffer */
        memcpy ((uchar *)((unsigned long)env_buffer + flash_offset),
                env_ptr,
 
        /* copy current environment to temporary buffer */
        memcpy ((uchar *)((unsigned long)env_buffer + flash_offset),
                env_ptr,

-               CFG_ENV_SIZE);
+               CONFIG_ENV_SIZE);

 
 

-       len      = CFG_ENV_SECT_SIZE;
+       len      = CONFIG_ENV_SECT_SIZE;

 #else
        flash_sect_addr = (ulong)flash_addr;
 #else
        flash_sect_addr = (ulong)flash_addr;

-       len      = CFG_ENV_SIZE;
-#endif /* CFG_ENV_SECT_SIZE */
+       len      = CONFIG_ENV_SIZE;
+#endif /* CONFIG_ENV_SECT_SIZE */

 
 #ifndef CONFIG_INFERNO
        end_addr = flash_sect_addr + len - 1;
 
 #ifndef CONFIG_INFERNO
        end_addr = flash_sect_addr + len - 1;


@@ -329,12 +329,12 @@ int saveenv(void)
 
 #endif /* CMD_SAVEENV */
 
 
 #endif /* CMD_SAVEENV */
 

-#endif /* CFG_ENV_ADDR_REDUND */
+#endif /* CONFIG_ENV_ADDR_REDUND */

 
 void env_relocate_spec (void)
 {
 
 void env_relocate_spec (void)
 {

-#if !defined(ENV_IS_EMBEDDED) || defined(CFG_ENV_ADDR_REDUND)
-#ifdef CFG_ENV_ADDR_REDUND
+#if !defined(ENV_IS_EMBEDDED) || defined(CONFIG_ENV_ADDR_REDUND)
+#ifdef CONFIG_ENV_ADDR_REDUND

        if (gd->env_addr != (ulong)&(flash_addr->data)) {
                env_t * etmp = flash_addr;
                ulong ltmp = end_addr;
        if (gd->env_addr != (ulong)&(flash_addr->data)) {
                env_t * etmp = flash_addr;
                ulong ltmp = end_addr;


@@ -374,9 +374,9 @@ void env_relocate_spec (void)
        if (gd->env_valid == 2)
                puts ("*** Warning - some problems detected "
                      "reading environment; recovered successfully\n\n");
        if (gd->env_valid == 2)
                puts ("*** Warning - some problems detected "
                      "reading environment; recovered successfully\n\n");

-#endif /* CFG_ENV_ADDR_REDUND */
+#endif /* CONFIG_ENV_ADDR_REDUND */

 #ifdef CMD_SAVEENV
 #ifdef CMD_SAVEENV

-       memcpy (env_ptr, (void*)flash_addr, CFG_ENV_SIZE);
+       memcpy (env_ptr, (void*)flash_addr, CONFIG_ENV_SIZE);

 #endif
 #endif

-#endif /* ! ENV_IS_EMBEDDED || CFG_ENV_ADDR_REDUND */
+#endif /* ! ENV_IS_EMBEDDED || CONFIG_ENV_ADDR_REDUND */

 }
 }

diff --git a/common/env_nand.c b/common/env_nand.c
index 9d01d7c7265cbfcd141d236758da808de392d9ea..8af9e74aac5717317277329deec4766d361c06fb 100644 (file)
--- a/common/env_nand.c
+++ b/common/env_nand.c
@@ -41,20 +41,20 @@
 
 #if defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)
 #define CMD_SAVEENV
 
 #if defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)
 #define CMD_SAVEENV

-#elif defined(CFG_ENV_OFFSET_REDUND)
-#error Cannot use CFG_ENV_OFFSET_REDUND without CONFIG_CMD_ENV & CONFIG_CMD_NAND
+#elif defined(CONFIG_ENV_OFFSET_REDUND)
+#error Cannot use CONFIG_ENV_OFFSET_REDUND without CONFIG_CMD_ENV & CONFIG_CMD_NAND

 #endif
 
 #endif
 

-#if defined(CFG_ENV_SIZE_REDUND) && (CFG_ENV_SIZE_REDUND != CFG_ENV_SIZE)
-#error CFG_ENV_SIZE_REDUND should be the same as CFG_ENV_SIZE
+#if defined(CONFIG_ENV_SIZE_REDUND) && (CONFIG_ENV_SIZE_REDUND != CONFIG_ENV_SIZE)
+#error CONFIG_ENV_SIZE_REDUND should be the same as CONFIG_ENV_SIZE

 #endif
 
 #ifdef CONFIG_INFERNO
 #error CONFIG_INFERNO not supported yet
 #endif
 
 #endif
 
 #ifdef CONFIG_INFERNO
 #error CONFIG_INFERNO not supported yet
 #endif
 

-#ifndef CFG_ENV_RANGE
-#define CFG_ENV_RANGE  CFG_ENV_SIZE
+#ifndef CONFIG_ENV_RANGE
+#define CONFIG_ENV_RANGE       CONFIG_ENV_SIZE

 #endif
 
 int nand_legacy_rw (struct nand_chip* nand, int cmd,
 #endif
 
 int nand_legacy_rw (struct nand_chip* nand, int cmd,


@@ -107,10 +107,10 @@ int env_init(void)
        int crc1_ok = 0, crc2_ok = 0;
        env_t *tmp_env1, *tmp_env2;
 
        int crc1_ok = 0, crc2_ok = 0;
        env_t *tmp_env1, *tmp_env2;
 

-       total = CFG_ENV_SIZE;
+       total = CONFIG_ENV_SIZE;

 
        tmp_env1 = env_ptr;
 
        tmp_env1 = env_ptr;

-       tmp_env2 = (env_t *)((ulong)env_ptr + CFG_ENV_SIZE);
+       tmp_env2 = (env_t *)((ulong)env_ptr + CONFIG_ENV_SIZE);

 
        crc1_ok = (crc32(0, tmp_env1->data, ENV_SIZE) == tmp_env1->crc);
        crc2_ok = (crc32(0, tmp_env2->data, ENV_SIZE) == tmp_env2->crc);
 
        crc1_ok = (crc32(0, tmp_env1->data, ENV_SIZE) == tmp_env1->crc);
        crc2_ok = (crc32(0, tmp_env2->data, ENV_SIZE) == tmp_env2->crc);


@@ -154,16 +154,16 @@ int env_init(void)
  */
 int writeenv(size_t offset, u_char *buf)
 {
  */
 int writeenv(size_t offset, u_char *buf)
 {

-       size_t end = offset + CFG_ENV_RANGE;
+       size_t end = offset + CONFIG_ENV_RANGE;

        size_t amount_saved = 0;
        size_t blocksize, len;
 
        u_char *char_ptr;
 
        blocksize = nand_info[0].erasesize;
        size_t amount_saved = 0;
        size_t blocksize, len;
 
        u_char *char_ptr;
 
        blocksize = nand_info[0].erasesize;

-       len = min(blocksize, CFG_ENV_SIZE);
+       len = min(blocksize, CONFIG_ENV_SIZE);

 
 

-       while (amount_saved < CFG_ENV_SIZE && offset < end) {
+       while (amount_saved < CONFIG_ENV_SIZE && offset < end) {

                if (nand_block_isbad(&nand_info[0], offset)) {
                        offset += blocksize;
                } else {
                if (nand_block_isbad(&nand_info[0], offset)) {
                        offset += blocksize;
                } else {


@@ -175,12 +175,12 @@ int writeenv(size_t offset, u_char *buf)
                        amount_saved += len;
                }
        }
                        amount_saved += len;
                }
        }

-       if (amount_saved != CFG_ENV_SIZE)
+       if (amount_saved != CONFIG_ENV_SIZE)

                return 1;
 
        return 0;
 }
                return 1;
 
        return 0;
 }

-#ifdef CFG_ENV_OFFSET_REDUND
+#ifdef CONFIG_ENV_OFFSET_REDUND

 int saveenv(void)
 {
        size_t total;
 int saveenv(void)
 {
        size_t total;


@@ -188,31 +188,31 @@ int saveenv(void)
        nand_erase_options_t nand_erase_options;
 
        env_ptr->flags++;
        nand_erase_options_t nand_erase_options;
 
        env_ptr->flags++;

-       total = CFG_ENV_SIZE;
+       total = CONFIG_ENV_SIZE;

 
 

-       nand_erase_options.length = CFG_ENV_RANGE;
+       nand_erase_options.length = CONFIG_ENV_RANGE;

        nand_erase_options.quiet = 0;
        nand_erase_options.jffs2 = 0;
        nand_erase_options.scrub = 0;
 
        nand_erase_options.quiet = 0;
        nand_erase_options.jffs2 = 0;
        nand_erase_options.scrub = 0;
 

-       if (CFG_ENV_RANGE < CFG_ENV_SIZE)
+       if (CONFIG_ENV_RANGE < CONFIG_ENV_SIZE)

                return 1;
        if(gd->env_valid == 1) {
                puts ("Erasing redundant Nand...\n");
                return 1;
        if(gd->env_valid == 1) {
                puts ("Erasing redundant Nand...\n");

-               nand_erase_options.offset = CFG_ENV_OFFSET_REDUND;
+               nand_erase_options.offset = CONFIG_ENV_OFFSET_REDUND;

                if (nand_erase_opts(&nand_info[0], &nand_erase_options))
                        return 1;
 
                puts ("Writing to redundant Nand... ");
                if (nand_erase_opts(&nand_info[0], &nand_erase_options))
                        return 1;
 
                puts ("Writing to redundant Nand... ");

-               ret = writeenv(CFG_ENV_OFFSET_REDUND, (u_char *) env_ptr);
+               ret = writeenv(CONFIG_ENV_OFFSET_REDUND, (u_char *) env_ptr);

        } else {
                puts ("Erasing Nand...\n");
        } else {
                puts ("Erasing Nand...\n");

-               nand_erase_options.offset = CFG_ENV_OFFSET;
+               nand_erase_options.offset = CONFIG_ENV_OFFSET;

                if (nand_erase_opts(&nand_info[0], &nand_erase_options))
                        return 1;
 
                puts ("Writing to Nand... ");
                if (nand_erase_opts(&nand_info[0], &nand_erase_options))
                        return 1;
 
                puts ("Writing to Nand... ");

-               ret = writeenv(CFG_ENV_OFFSET, (u_char *) env_ptr);
+               ret = writeenv(CONFIG_ENV_OFFSET, (u_char *) env_ptr);

        }
        if (ret) {
                puts("FAILED!\n");
        }
        if (ret) {
                puts("FAILED!\n");


@@ -223,28 +223,28 @@ int saveenv(void)
        gd->env_valid = (gd->env_valid == 2 ? 1 : 2);
        return ret;
 }
        gd->env_valid = (gd->env_valid == 2 ? 1 : 2);
        return ret;
 }

-#else /* ! CFG_ENV_OFFSET_REDUND */
+#else /* ! CONFIG_ENV_OFFSET_REDUND */

 int saveenv(void)
 {
        size_t total;
        int ret = 0;
        nand_erase_options_t nand_erase_options;
 
 int saveenv(void)
 {
        size_t total;
        int ret = 0;
        nand_erase_options_t nand_erase_options;
 

-       nand_erase_options.length = CFG_ENV_RANGE;
+       nand_erase_options.length = CONFIG_ENV_RANGE;

        nand_erase_options.quiet = 0;
        nand_erase_options.jffs2 = 0;
        nand_erase_options.scrub = 0;
        nand_erase_options.quiet = 0;
        nand_erase_options.jffs2 = 0;
        nand_erase_options.scrub = 0;

-       nand_erase_options.offset = CFG_ENV_OFFSET;
+       nand_erase_options.offset = CONFIG_ENV_OFFSET;

 
 

-       if (CFG_ENV_RANGE < CFG_ENV_SIZE)
+       if (CONFIG_ENV_RANGE < CONFIG_ENV_SIZE)

                return 1;
        puts ("Erasing Nand...\n");
        if (nand_erase_opts(&nand_info[0], &nand_erase_options))
                return 1;
 
        puts ("Writing to Nand... ");
                return 1;
        puts ("Erasing Nand...\n");
        if (nand_erase_opts(&nand_info[0], &nand_erase_options))
                return 1;
 
        puts ("Writing to Nand... ");

-       total = CFG_ENV_SIZE;
-       if (writeenv(CFG_ENV_OFFSET, (u_char *) env_ptr)) {
+       total = CONFIG_ENV_SIZE;
+       if (writeenv(CONFIG_ENV_OFFSET, (u_char *) env_ptr)) {

                puts("FAILED!\n");
                return 1;
        }
                puts("FAILED!\n");
                return 1;
        }


@@ -252,21 +252,21 @@ int saveenv(void)
        puts ("done\n");
        return ret;
 }
        puts ("done\n");
        return ret;
 }

-#endif /* CFG_ENV_OFFSET_REDUND */
+#endif /* CONFIG_ENV_OFFSET_REDUND */

 #endif /* CMD_SAVEENV */
 
 int readenv (size_t offset, u_char * buf)
 {
 #endif /* CMD_SAVEENV */
 
 int readenv (size_t offset, u_char * buf)
 {

-       size_t end = offset + CFG_ENV_RANGE;
+       size_t end = offset + CONFIG_ENV_RANGE;

        size_t amount_loaded = 0;
        size_t blocksize, len;
 
        u_char *char_ptr;
 
        blocksize = nand_info[0].erasesize;
        size_t amount_loaded = 0;
        size_t blocksize, len;
 
        u_char *char_ptr;
 
        blocksize = nand_info[0].erasesize;

-       len = min(blocksize, CFG_ENV_SIZE);
+       len = min(blocksize, CONFIG_ENV_SIZE);

 
 

-       while (amount_loaded < CFG_ENV_SIZE && offset < end) {
+       while (amount_loaded < CONFIG_ENV_SIZE && offset < end) {

                if (nand_block_isbad(&nand_info[0], offset)) {
                        offset += blocksize;
                } else {
                if (nand_block_isbad(&nand_info[0], offset)) {
                        offset += blocksize;
                } else {


@@ -277,13 +277,13 @@ int readenv (size_t offset, u_char * buf)
                        amount_loaded += len;
                }
        }
                        amount_loaded += len;
                }
        }

-       if (amount_loaded != CFG_ENV_SIZE)
+       if (amount_loaded != CONFIG_ENV_SIZE)

                return 1;
 
        return 0;
 }
 
                return 1;
 
        return 0;
 }
 

-#ifdef CFG_ENV_OFFSET_REDUND
+#ifdef CONFIG_ENV_OFFSET_REDUND

 void env_relocate_spec (void)
 {
 #if !defined(ENV_IS_EMBEDDED)
 void env_relocate_spec (void)
 {
 #if !defined(ENV_IS_EMBEDDED)


@@ -291,14 +291,14 @@ void env_relocate_spec (void)
        int crc1_ok = 0, crc2_ok = 0;
        env_t *tmp_env1, *tmp_env2;
 
        int crc1_ok = 0, crc2_ok = 0;
        env_t *tmp_env1, *tmp_env2;
 

-       total = CFG_ENV_SIZE;
+       total = CONFIG_ENV_SIZE;

 
 

-       tmp_env1 = (env_t *) malloc(CFG_ENV_SIZE);
-       tmp_env2 = (env_t *) malloc(CFG_ENV_SIZE);
+       tmp_env1 = (env_t *) malloc(CONFIG_ENV_SIZE);
+       tmp_env2 = (env_t *) malloc(CONFIG_ENV_SIZE);

 
 

-       if (readenv(CFG_ENV_OFFSET, (u_char *) tmp_env1))
+       if (readenv(CONFIG_ENV_OFFSET, (u_char *) tmp_env1))

                puts("No Valid Environment Area Found\n");
                puts("No Valid Environment Area Found\n");

-       if (readenv(CFG_ENV_OFFSET_REDUND, (u_char *) tmp_env2))
+       if (readenv(CONFIG_ENV_OFFSET_REDUND, (u_char *) tmp_env2))

                puts("No Valid Reundant Environment Area Found\n");
 
        crc1_ok = (crc32(0, tmp_env1->data, ENV_SIZE) == tmp_env1->crc);
                puts("No Valid Reundant Environment Area Found\n");
 
        crc1_ok = (crc32(0, tmp_env1->data, ENV_SIZE) == tmp_env1->crc);


@@ -336,7 +336,7 @@ void env_relocate_spec (void)
 
 #endif /* ! ENV_IS_EMBEDDED */
 }
 
 #endif /* ! ENV_IS_EMBEDDED */
 }

-#else /* ! CFG_ENV_OFFSET_REDUND */
+#else /* ! CONFIG_ENV_OFFSET_REDUND */

 /*
  * The legacy NAND code saved the environment in the first NAND device i.e.,
  * nand_dev_desc + 0. This is also the behaviour using the new NAND code.
 /*
  * The legacy NAND code saved the environment in the first NAND device i.e.,
  * nand_dev_desc + 0. This is also the behaviour using the new NAND code.


@@ -346,7 +346,7 @@ void env_relocate_spec (void)
 #if !defined(ENV_IS_EMBEDDED)
        int ret;
 
 #if !defined(ENV_IS_EMBEDDED)
        int ret;
 

-       ret = readenv(CFG_ENV_OFFSET, (u_char *) env_ptr);
+       ret = readenv(CONFIG_ENV_OFFSET, (u_char *) env_ptr);

        if (ret)
                return use_default();
 
        if (ret)
                return use_default();
 


@@ -354,7 +354,7 @@ void env_relocate_spec (void)
                return use_default();
 #endif /* ! ENV_IS_EMBEDDED */
 }
                return use_default();
 #endif /* ! ENV_IS_EMBEDDED */
 }

-#endif /* CFG_ENV_OFFSET_REDUND */
+#endif /* CONFIG_ENV_OFFSET_REDUND */

 
 #if !defined(ENV_IS_EMBEDDED)
 static void use_default()
 
 #if !defined(ENV_IS_EMBEDDED)
 static void use_default()

diff --git a/common/env_nvram.c b/common/env_nvram.c
index c59bf9faa1bdde58112737c117305d4c101de544..a8b79591dcdc6e385ed6346eadee2a3bb6011ae1 100644 (file)
--- a/common/env_nvram.c
+++ b/common/env_nvram.c
@@ -52,7 +52,7 @@ extern void *nvram_read(void *dest, const long src, size_t count);
 extern void nvram_write(long dest, const void *src, size_t count);
 env_t *env_ptr = NULL;
 #else
 extern void nvram_write(long dest, const void *src, size_t count);
 env_t *env_ptr = NULL;
 #else

-env_t *env_ptr = (env_t *)CFG_ENV_ADDR;
+env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;

 #endif
 
 char * env_name_spec = "NVRAM";
 #endif
 
 char * env_name_spec = "NVRAM";


@@ -66,7 +66,7 @@ uchar env_get_char_spec (int index)
 #ifdef CFG_NVRAM_ACCESS_ROUTINE
        uchar c;
 
 #ifdef CFG_NVRAM_ACCESS_ROUTINE
        uchar c;
 

-       nvram_read(&c, CFG_ENV_ADDR+index, 1);
+       nvram_read(&c, CONFIG_ENV_ADDR+index, 1);

 
        return c;
 #else
 
        return c;
 #else


@@ -83,7 +83,7 @@ uchar env_get_char_spec (int index)
 #ifdef CFG_NVRAM_ACCESS_ROUTINE
        uchar c;
 
 #ifdef CFG_NVRAM_ACCESS_ROUTINE
        uchar c;
 

-       nvram_read(&c, CFG_ENV_ADDR+index, 1);
+       nvram_read(&c, CONFIG_ENV_ADDR+index, 1);

 
        return c;
 #else
 
        return c;
 #else


@@ -95,9 +95,9 @@ uchar env_get_char_spec (int index)
 void env_relocate_spec (void)
 {
 #if defined(CFG_NVRAM_ACCESS_ROUTINE)
 void env_relocate_spec (void)
 {
 #if defined(CFG_NVRAM_ACCESS_ROUTINE)

-       nvram_read(env_ptr, CFG_ENV_ADDR, CFG_ENV_SIZE);
+       nvram_read(env_ptr, CONFIG_ENV_ADDR, CONFIG_ENV_SIZE);

 #else
 #else

-       memcpy (env_ptr, (void*)CFG_ENV_ADDR, CFG_ENV_SIZE);
+       memcpy (env_ptr, (void*)CONFIG_ENV_ADDR, CONFIG_ENV_SIZE);

 #endif
 }
 
 #endif
 }
 


@@ -108,9 +108,9 @@ int saveenv (void)
        enable_nvram();
 #endif
 #ifdef CFG_NVRAM_ACCESS_ROUTINE
        enable_nvram();
 #endif
 #ifdef CFG_NVRAM_ACCESS_ROUTINE

-       nvram_write(CFG_ENV_ADDR, env_ptr, CFG_ENV_SIZE);
+       nvram_write(CONFIG_ENV_ADDR, env_ptr, CONFIG_ENV_SIZE);

 #else
 #else

-       if (memcpy ((char *)CFG_ENV_ADDR, env_ptr, CFG_ENV_SIZE) == NULL)
+       if (memcpy ((char *)CONFIG_ENV_ADDR, env_ptr, CONFIG_ENV_SIZE) == NULL)

                    rcode = 1 ;
 #endif
 #ifdef CONFIG_AMIGAONEG3SE
                    rcode = 1 ;
 #endif
 #ifdef CONFIG_AMIGAONEG3SE


@@ -134,11 +134,11 @@ int env_init (void)
 #if defined(CFG_NVRAM_ACCESS_ROUTINE)
        ulong crc;
        uchar data[ENV_SIZE];
 #if defined(CFG_NVRAM_ACCESS_ROUTINE)
        ulong crc;
        uchar data[ENV_SIZE];

-       nvram_read (&crc, CFG_ENV_ADDR, sizeof(ulong));
-       nvram_read (data, CFG_ENV_ADDR+sizeof(ulong), ENV_SIZE);
+       nvram_read (&crc, CONFIG_ENV_ADDR, sizeof(ulong));
+       nvram_read (data, CONFIG_ENV_ADDR+sizeof(ulong), ENV_SIZE);

 
        if (crc32(0, data, ENV_SIZE) == crc) {
 
        if (crc32(0, data, ENV_SIZE) == crc) {

-               gd->env_addr  = (ulong)CFG_ENV_ADDR + sizeof(long);
+               gd->env_addr  = (ulong)CONFIG_ENV_ADDR + sizeof(long);

 #else
        if (crc32(0, env_ptr->data, ENV_SIZE) == env_ptr->crc) {
                gd->env_addr  = (ulong)&(env_ptr->data);
 #else
        if (crc32(0, env_ptr->data, ENV_SIZE) == env_ptr->crc) {
                gd->env_addr  = (ulong)&(env_ptr->data);

diff --git a/common/env_onenand.c b/common/env_onenand.c
index 09a79d01918acde9250c6467e6611ed3d39507a6..3c65b3e4873d3c7566fcc9b4b2a025a1e61ce08b 100644 (file)
--- a/common/env_onenand.c
+++ b/common/env_onenand.c
@@ -62,7 +62,7 @@ void env_relocate_spec(void)
        int use_default = 0;
        size_t retlen;
 
        int use_default = 0;
        size_t retlen;
 

-       env_addr = CFG_ENV_ADDR;
+       env_addr = CONFIG_ENV_ADDR;

 
        /* Check OneNAND exist */
        if (onenand_mtd.writesize)
 
        /* Check OneNAND exist */
        if (onenand_mtd.writesize)


@@ -89,13 +89,13 @@ void env_relocate_spec(void)
 
 int saveenv(void)
 {
 
 int saveenv(void)
 {

-       unsigned long env_addr = CFG_ENV_ADDR;
+       unsigned long env_addr = CONFIG_ENV_ADDR;

        struct erase_info instr = {
                .callback       = NULL,
        };
        size_t retlen;
 
        struct erase_info instr = {
                .callback       = NULL,
        };
        size_t retlen;
 

-       instr.len = CFG_ENV_SIZE;
+       instr.len = CONFIG_ENV_SIZE;

        instr.addr = env_addr;
        if (onenand_erase(&onenand_mtd, &instr)) {
                printf("OneNAND: erase failed at 0x%08lx\n", env_addr);
        instr.addr = env_addr;
        if (onenand_erase(&onenand_mtd, &instr)) {
                printf("OneNAND: erase failed at 0x%08lx\n", env_addr);

diff --git a/common/env_sf.c b/common/env_sf.c
index faf62608b4d28a54e49bbde566bba234b249a67d..1bbf93fdfa41903ce86b37ba6763b0c433c41db1 100644 (file)
--- a/common/env_sf.c
+++ b/common/env_sf.c
@@ -29,17 +29,17 @@
 #include <environment.h>
 #include <spi_flash.h>
 
 #include <environment.h>
 #include <spi_flash.h>
 

-#ifndef CFG_ENV_SPI_BUS
-# define CFG_ENV_SPI_BUS       0
+#ifndef CONFIG_ENV_SPI_BUS
+# define CONFIG_ENV_SPI_BUS    0

 #endif
 #endif

-#ifndef CFG_ENV_SPI_CS
-# define CFG_ENV_SPI_CS                0
+#ifndef CONFIG_ENV_SPI_CS
+# define CONFIG_ENV_SPI_CS             0

 #endif
 #endif

-#ifndef CFG_ENV_SPI_MAX_HZ
-# define CFG_ENV_SPI_MAX_HZ    1000000
+#ifndef CONFIG_ENV_SPI_MAX_HZ
+# define CONFIG_ENV_SPI_MAX_HZ 1000000

 #endif
 #endif

-#ifndef CFG_ENV_SPI_MODE
-# define CFG_ENV_SPI_MODE      SPI_MODE_3
+#ifndef CONFIG_ENV_SPI_MODE
+# define CONFIG_ENV_SPI_MODE   SPI_MODE_3

 #endif
 
 DECLARE_GLOBAL_DATA_PTR;
 #endif
 
 DECLARE_GLOBAL_DATA_PTR;


@@ -67,18 +67,18 @@ int saveenv(void)
                return 1;
        }
 
                return 1;
        }
 

-       if (CFG_ENV_SIZE > CFG_ENV_SECT_SIZE) {
-               sector = CFG_ENV_SIZE / CFG_ENV_SECT_SIZE;
-               if (CFG_ENV_SIZE % CFG_ENV_SECT_SIZE)
+       if (CONFIG_ENV_SIZE > CONFIG_ENV_SECT_SIZE) {
+               sector = CONFIG_ENV_SIZE / CONFIG_ENV_SECT_SIZE;
+               if (CONFIG_ENV_SIZE % CONFIG_ENV_SECT_SIZE)

                        sector++;
        }
 
        puts("Erasing SPI flash...");
                        sector++;
        }
 
        puts("Erasing SPI flash...");

-       if (spi_flash_erase(env_flash, CFG_ENV_OFFSET, sector * CFG_ENV_SECT_SIZE))
+       if (spi_flash_erase(env_flash, CONFIG_ENV_OFFSET, sector * CONFIG_ENV_SECT_SIZE))

                return 1;
 
        puts("Writing to SPI flash...");
                return 1;
 
        puts("Writing to SPI flash...");

-       if (spi_flash_write(env_flash, CFG_ENV_OFFSET, CFG_ENV_SIZE, env_ptr))
+       if (spi_flash_write(env_flash, CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE, env_ptr))

                return 1;
 
        puts("done\n");
                return 1;
 
        puts("done\n");


@@ -89,12 +89,12 @@ void env_relocate_spec(void)
 {
        int ret;
 
 {
        int ret;
 

-       env_flash = spi_flash_probe(CFG_ENV_SPI_BUS, CFG_ENV_SPI_CS,
-                       CFG_ENV_SPI_MAX_HZ, CFG_ENV_SPI_MODE);
+       env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS,
+                       CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE);

        if (!env_flash)
                goto err_probe;
 
        if (!env_flash)
                goto err_probe;
 

-       ret = spi_flash_read(env_flash, CFG_ENV_OFFSET, CFG_ENV_SIZE, env_ptr);
+       ret = spi_flash_read(env_flash, CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE, env_ptr);

        if (ret)
                goto err_read;
 
        if (ret)
                goto err_read;
 


@@ -112,7 +112,7 @@ err_probe:
 err_crc:
        puts("*** Warning - bad CRC, using default environment\n\n");
 
 err_crc:
        puts("*** Warning - bad CRC, using default environment\n\n");
 

-       if (default_environment_size > CFG_ENV_SIZE) {
+       if (default_environment_size > CONFIG_ENV_SIZE) {

                gd->env_valid = 0;
                puts("*** Error - default environment is too large\n\n");
                return;
                gd->env_valid = 0;
                puts("*** Error - default environment is too large\n\n");
                return;

diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index 7937b61a816f52ca403f3c5db15129f7009e9a7a..0d1ee8a459d0cd01d5880ae4a92ce1c8e64fded7 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(CONFIG_ENV_IS_IN_FLASH) || defined(CFG_ENV_ADDR_REDUND) || (CFG_MONITOR_BASE >= CFG_FLASH_BASE)
+#if defined(CONFIG_ENV_IS_IN_FLASH) || defined(CONFIG_ENV_ADDR_REDUND) || (CFG_MONITOR_BASE >= CFG_FLASH_BASE)

 static flash_info_t *flash_get_info(ulong base)
 {
        int i;
 static flash_info_t *flash_get_info(ulong base)
 {
        int i;


@@ -2033,17 +2033,17 @@ unsigned long flash_init (void)
        /* Environment protection ON by default */
 #ifdef CONFIG_ENV_IS_IN_FLASH
        flash_protect (FLAG_PROTECT_SET,
        /* Environment protection ON by default */
 #ifdef CONFIG_ENV_IS_IN_FLASH
        flash_protect (FLAG_PROTECT_SET,

-                      CFG_ENV_ADDR,
-                      CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
-                      flash_get_info(CFG_ENV_ADDR));
+                      CONFIG_ENV_ADDR,
+                      CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
+                      flash_get_info(CONFIG_ENV_ADDR));

 #endif
 
        /* Redundant environment protection ON by default */
 #endif
 
        /* Redundant environment protection ON by default */

-#ifdef CFG_ENV_ADDR_REDUND
+#ifdef CONFIG_ENV_ADDR_REDUND

        flash_protect (FLAG_PROTECT_SET,
        flash_protect (FLAG_PROTECT_SET,

-                      CFG_ENV_ADDR_REDUND,
-                      CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND - 1,
-                      flash_get_info(CFG_ENV_ADDR_REDUND));
+                      CONFIG_ENV_ADDR_REDUND,
+                      CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1,
+                      flash_get_info(CONFIG_ENV_ADDR_REDUND));

 #endif
 
 #if defined(CFG_FLASH_AUTOPROTECT_LIST)
 #endif
 
 #if defined(CFG_FLASH_AUTOPROTECT_LIST)

diff --git a/include/configs/A3000.h b/include/configs/A3000.h
index 35180d636e02a678cf0ac8cceb3bf46304c8cb7b..cee5560d14a55fef54522105535e94c5c5f09864 100644 (file)
--- a/include/configs/A3000.h
+++ b/include/configs/A3000.h
@@ -298,9 +298,9 @@
         * It's stored in flash separately.
         */
 #define CONFIG_ENV_IS_IN_FLASH     1
         * It's stored in flash separately.
         */
 #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    */
+#define CONFIG_ENV_ADDR                0xFFFE0000
+#define CONFIG_ENV_SIZE                0x00020000 /* Size of the Environment           */
+#define CONFIG_ENV_SECT_SIZE   0x00020000 /* Size of the Environment Sector    */

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/ADCIOP.h b/include/configs/ADCIOP.h
index 0069aabab7cf13269a5230a2040f1af08e9dfc6e..cc7eddc9e54dc2f05465fe4ea43a723459a5f4d0 100644 (file)
--- a/include/configs/ADCIOP.h
+++ b/include/configs/ADCIOP.h
@@ -163,18 +163,18 @@
 #define CONFIG_ENV_IS_IN_NVRAM 1       /* use NVRAM for environment vars       */
 #define CFG_NVRAM_BASE_ADDR    0x10000000              /* NVRAM base address   */
 #define CFG_NVRAM_SIZE         (32*1024)               /* NVRAM size           */
 #define CONFIG_ENV_IS_IN_NVRAM 1       /* use NVRAM for environment vars       */
 #define CFG_NVRAM_BASE_ADDR    0x10000000              /* NVRAM base address   */
 #define CFG_NVRAM_SIZE         (32*1024)               /* NVRAM size           */

-#define CFG_ENV_SIZE           0x0400          /* Size of Environment vars     */
-#define CFG_ENV_ADDR           \
-       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)       /* Env  */
+#define CONFIG_ENV_SIZE                0x0400          /* Size of Environment vars     */
+#define CONFIG_ENV_ADDR                \
+       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CONFIG_ENV_SIZE)    /* Env  */

 #define CFG_VXWORKS_MAC_PTR     (CFG_NVRAM_BASE_ADDR+0x7800) /* VxWorks eth-addr*/
 
 #else /* Use FLASH for environment variables */
 
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_VXWORKS_MAC_PTR     (CFG_NVRAM_BASE_ADDR+0x7800) /* VxWorks eth-addr*/
 
 #else /* Use FLASH for environment variables */
 
 #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     */
+#define CONFIG_ENV_OFFSET              0x00010000      /* Offset of Environment Sector */
+#define CONFIG_ENV_SIZE                0x1000  /* Total Size of Environment Sector     */

 
 

-#define CFG_ENV_SECT_SIZE      0x8000  /* see README - env sector total size   */
+#define CONFIG_ENV_SECT_SIZE   0x8000  /* see README - env sector total size   */

 
 #endif
 
 
 #endif
 

diff --git a/include/configs/ADNPESC1.h b/include/configs/ADNPESC1.h
index 2999b2a0b7e5f343fd935c4c8bc392b38a114bda..9b84d1f9710b14aafe9b0ea2a8afd733bf072933 100644 (file)
--- a/include/configs/ADNPESC1.h
+++ b/include/configs/ADNPESC1.h
@@ -87,7 +87,7 @@
  *----------------------------------------------------------------------*/
 #define CFG_MONITOR_LEN                (256 * 1024)    /* Reserve 256k         */
 #define CFG_GBL_DATA_SIZE      128             /* Global data size rsvd*/
  *----------------------------------------------------------------------*/
 #define CFG_MONITOR_LEN                (256 * 1024)    /* Reserve 256k         */
 #define CFG_GBL_DATA_SIZE      128             /* Global data size rsvd*/

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)

 
 #define CFG_MONITOR_BASE       TEXT_BASE
 #define CFG_MALLOC_BASE                (CFG_MONITOR_BASE - CFG_MALLOC_LEN)
 
 #define CFG_MONITOR_BASE       TEXT_BASE
 #define CFG_MALLOC_BASE                (CFG_MONITOR_BASE - CFG_MALLOC_LEN)


@@ -120,12 +120,12 @@
 
 /* Mem addr of environment */
 #if    defined(CONFIG_NIOS_BASE_32)
 
 /* Mem addr of environment */
 #if    defined(CONFIG_NIOS_BASE_32)

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + CFG_MONITOR_LEN)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + CFG_MONITOR_LEN)

 #else
 #else

-#error *** CFG_ERROR: you have to setup the environment base address CFG_ENV_ADDR
+#error *** CFG_ERROR: you have to setup the environment base address CONFIG_ENV_ADDR

 #endif
 
 #endif
 

-#define CFG_ENV_SIZE           (64 * 1024)     /* 64 KByte (1 sector)  */
+#define CONFIG_ENV_SIZE                (64 * 1024)     /* 64 KByte (1 sector)  */

 #define CONFIG_ENV_OVERWRITE                   /* Serial/eth change Ok */
 
 #else
 #define CONFIG_ENV_OVERWRITE                   /* Serial/eth change Ok */
 
 #else


@@ -135,7 +135,7 @@
 /*------------------------------------------------------------------------
  * NIOS APPLICATION CODE BASE AREA
  *----------------------------------------------------------------------*/
 /*------------------------------------------------------------------------
  * NIOS APPLICATION CODE BASE AREA
  *----------------------------------------------------------------------*/

-#if    ((CFG_ENV_ADDR + CFG_ENV_SIZE) == 0x1050000)
+#if    ((CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) == 0x1050000)

 #define        CFG_ADNPESC1_UPDATE_LOAD_ADDR   "0x2000100"
 #define CFG_ADNPESC1_NIOS_APPL_ENTRY   "0x1050000"
 #define CFG_ADNPESC1_NIOS_APPL_IDENT   "0x105000c"
 #define        CFG_ADNPESC1_UPDATE_LOAD_ADDR   "0x2000100"
 #define CFG_ADNPESC1_NIOS_APPL_ENTRY   "0x1050000"
 #define CFG_ADNPESC1_NIOS_APPL_IDENT   "0x105000c"

diff --git a/include/configs/AMX860.h b/include/configs/AMX860.h
index 85a7ee91fe2ce0950c646f44e2122da395746a4c..343123b4b7b1d245b94095d0c4c968c899576808 100644 (file)
--- a/include/configs/AMX860.h
+++ b/include/configs/AMX860.h
@@ -200,8 +200,8 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #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     */
+#define        CONFIG_ENV_OFFSET               0x8000  /*   Offset   of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/AP1000.h b/include/configs/AP1000.h
index a4582148a9e56e0288955d4a652e9616b84bfdcb..63d400357f73f88d34d048bb90adfe1284a42973 100644 (file)
--- a/include/configs/AP1000.h
+++ b/include/configs/AP1000.h
@@ -175,9 +175,9 @@
 
 /* BEG ENVIRONNEMENT FLASH */
 #ifdef CONFIG_ENV_IS_IN_FLASH
 
 /* BEG ENVIRONNEMENT 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   */
+#define CONFIG_ENV_OFFSET              0x00040000 /* Offset of Environment Sector      */
+#define CONFIG_ENV_SIZE                0x1000  /* Total Size of Environment Sector */
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* see README - env sector total size   */

 #endif
 /* END ENVIRONNEMENT FLASH */
 /*-----------------------------------------------------------------------
 #endif
 /* END ENVIRONNEMENT FLASH */
 /*-----------------------------------------------------------------------


@@ -187,9 +187,9 @@
 #define CFG_NVRAM_SIZE         0x1ff8          /* NVRAM size   */
 
 #ifdef CONFIG_ENV_IS_IN_NVRAM
 #define CFG_NVRAM_SIZE         0x1ff8          /* NVRAM size   */
 
 #ifdef CONFIG_ENV_IS_IN_NVRAM

-#define CFG_ENV_SIZE           0x1000          /* Size of Environment vars */
-#define CFG_ENV_ADDR       \
-    (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)  /* Env  */
+#define CONFIG_ENV_SIZE                0x1000          /* Size of Environment vars */
+#define CONFIG_ENV_ADDR            \
+    (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CONFIG_ENV_SIZE)       /* Env  */

 #endif
 
 /*
 #endif
 
 /*

diff --git a/include/configs/APC405.h b/include/configs/APC405.h
index 882d188e1e4071c000c8764224360f8bb17420e7..fa7798e8ff0c57276d20db0babaca4d96962c38f 100644 (file)
--- a/include/configs/APC405.h
+++ b/include/configs/APC405.h
@@ -292,9 +292,9 @@ extern int flash_banks;
  * Environment Variable setup
  */
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
  * Environment Variable setup
  */
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */

-#define CFG_ENV_OFFSET         0x000   /* environment starts at the */
+#define CONFIG_ENV_OFFSET              0x000   /* environment starts at the */

                                        /* beginning of the EEPROM */
                                        /* beginning of the EEPROM */

-#define CFG_ENV_SIZE           0x800   /* 2048 bytes may be used for env vars*/
+#define CONFIG_ENV_SIZE                0x800   /* 2048 bytes may be used for env vars*/

 #define CONFIG_ENV_OVERWRITE   1       /* allow overwriting vendor vars */
 
 #define CFG_NVRAM_BASE_ADDR    0xF0000500      /* NVRAM base address */
 #define CONFIG_ENV_OVERWRITE   1       /* allow overwriting vendor vars */
 
 #define CFG_NVRAM_BASE_ADDR    0xF0000500      /* NVRAM base address */

diff --git a/include/configs/AR405.h b/include/configs/AR405.h
index 045849f76d9abb8a30c0f409733db8590e307b60..18ca122a908972e1ca10bec027a9124abddc95d9 100644 (file)
--- a/include/configs/AR405.h
+++ b/include/configs/AR405.h
@@ -206,12 +206,12 @@
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 
 #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          */
+#define CONFIG_ENV_ADDR                0xFFFB0000      /* Address of Environment Sector*/
+#define CONFIG_ENV_SECT_SIZE   0x10000 /* see README - env sector total size   */
+#define CONFIG_ENV_SIZE                0x04000         /* Size of Environment          */

 
 

-#define CFG_ENV_ADDR_REDUND     0xFFFA0000
-#define CFG_ENV_SIZE_REDUND    CFG_ENV_SIZE
+#define CONFIG_ENV_ADDR_REDUND     0xFFFA0000
+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE

 
 /*
  * Init Memory Controller:
 
 /*
  * Init Memory Controller:

diff --git a/include/configs/ASH405.h b/include/configs/ASH405.h
index 56ae708eb382d78f37ad7cbfdc3d2154ce4777a1..228571419d0a26df9754cd8f1185b7dab765feae 100644 (file)
--- a/include/configs/ASH405.h
+++ b/include/configs/ASH405.h
@@ -234,8 +234,8 @@
  * Environment Variable setup
  */
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
  * Environment Variable setup
  */
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */

-#define CFG_ENV_OFFSET         0x100   /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE           0x700   /* 2048 bytes may be used for env vars*/
+#define CONFIG_ENV_OFFSET              0x100   /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE                0x700   /* 2048 bytes may be used for env vars*/

                                   /* total size of a CAT24WC16 is 2048 bytes */
 
 #define CFG_NVRAM_BASE_ADDR    0xF0000500              /* NVRAM base address   */
                                   /* total size of a CAT24WC16 is 2048 bytes */
 
 #define CFG_NVRAM_BASE_ADDR    0xF0000500              /* NVRAM base address   */

diff --git a/include/configs/ATUM8548.h b/include/configs/ATUM8548.h
index 0ce81dbaf234dad5f4eb13f633285ffa0be3fdd9..8efea005d8d588534882f1a45e69a8638fd3ba24 100644 (file)
--- a/include/configs/ATUM8548.h
+++ b/include/configs/ATUM8548.h
@@ -334,9 +334,9 @@
  * Environment
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
  * Environment
  */
 #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
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + 0x40000)
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* 256K(one sector) for env */
+#define CONFIG_ENV_SIZE                0x2000

 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change */
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change */

diff --git a/include/configs/Adder.h b/include/configs/Adder.h
index 3c2f4d646d8d27df442d9a0f1530160804029e9f..fcac64712770014531dd5fe34f063d2c3c2dc354 100644 (file)
--- a/include/configs/Adder.h
+++ b/include/configs/Adder.h
@@ -149,8 +149,8 @@
 
 /* Environment is in flash */
 #define CONFIG_ENV_IS_IN_FLASH
 
 /* Environment 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)
+#define CONFIG_ENV_SECT_SIZE   0x10000         /* We use one complete sector   */
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + CFG_MONITOR_LEN)

 
 #define CONFIG_ENV_OVERWRITE
 
 
 #define CONFIG_ENV_OVERWRITE
 

diff --git a/include/configs/Alaska8220.h b/include/configs/Alaska8220.h
index 3b3c0bcbb119b417349d4bbc36977edfe2e51505..431ed4e56fb8d8b8f9de10d16d7b75102d72ed1c 100644 (file)
--- a/include/configs/Alaska8220.h
+++ b/include/configs/Alaska8220.h
@@ -134,8 +134,8 @@
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 70
 /*
 #define CONFIG_ENV_IS_IN_EEPROM        1
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 70
 /*
 #define CONFIG_ENV_IS_IN_EEPROM        1

-#define CFG_ENV_OFFSET         0
-#define CFG_ENV_SIZE           256
+#define CONFIG_ENV_OFFSET              0
+#define CONFIG_ENV_SIZE                256

 */
 
 /* If CFG_AMD_BOOT is defined, the the system will boot from AMD.
 */
 
 /* If CFG_AMD_BOOT is defined, the the system will boot from AMD.


@@ -207,19 +207,19 @@
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
 #if defined (CFG_AMD_BOOT)
  */
 #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
-#define CFG_ENV_SECT_SIZE      PHYS_AMD_SECT_SIZE
-#define CFG_ENV1_ADDR          (CFG_FLASH1_BASE + CFG_CS1_MASK - PHYS_INTEL_SECT_SIZE)
-#define CFG_ENV1_SIZE          PHYS_INTEL_SECT_SIZE
-#define CFG_ENV1_SECT_SIZE     PHYS_INTEL_SECT_SIZE
+#define CONFIG_ENV_ADDR                (CFG_FLASH0_BASE + CFG_CS0_MASK - PHYS_AMD_SECT_SIZE)
+#define CONFIG_ENV_SIZE                PHYS_AMD_SECT_SIZE
+#define CONFIG_ENV_SECT_SIZE   PHYS_AMD_SECT_SIZE
+#define CONFIG_ENV1_ADDR               (CFG_FLASH1_BASE + CFG_CS1_MASK - PHYS_INTEL_SECT_SIZE)
+#define CONFIG_ENV1_SIZE               PHYS_INTEL_SECT_SIZE
+#define CONFIG_ENV1_SECT_SIZE  PHYS_INTEL_SECT_SIZE

 #else
 #else

-#define CFG_ENV_ADDR           (CFG_FLASH0_BASE + CFG_CS0_MASK - PHYS_INTEL_SECT_SIZE)
-#define CFG_ENV_SIZE           PHYS_INTEL_SECT_SIZE
-#define CFG_ENV_SECT_SIZE      PHYS_INTEL_SECT_SIZE
-#define CFG_ENV1_ADDR          (CFG_FLASH1_BASE + CFG_CS1_MASK - PHYS_AMD_SECT_SIZE)
-#define CFG_ENV1_SIZE          PHYS_AMD_SECT_SIZE
-#define CFG_ENV1_SECT_SIZE     PHYS_AMD_SECT_SIZE
+#define CONFIG_ENV_ADDR                (CFG_FLASH0_BASE + CFG_CS0_MASK - PHYS_INTEL_SECT_SIZE)
+#define CONFIG_ENV_SIZE                PHYS_INTEL_SECT_SIZE
+#define CONFIG_ENV_SECT_SIZE   PHYS_INTEL_SECT_SIZE
+#define CONFIG_ENV1_ADDR               (CFG_FLASH1_BASE + CFG_CS1_MASK - PHYS_AMD_SECT_SIZE)
+#define CONFIG_ENV1_SIZE               PHYS_AMD_SECT_SIZE
+#define CONFIG_ENV1_SECT_SIZE  PHYS_AMD_SECT_SIZE

 #endif
 
 #define CONFIG_ENV_OVERWRITE   1
 #endif
 
 #define CONFIG_ENV_OVERWRITE   1

diff --git a/include/configs/AmigaOneG3SE.h b/include/configs/AmigaOneG3SE.h
index 17f5909330a08b0bc680c4ed28131b35f030df68..a6e92287ff5bf6b9137f2885927fb08ec585921e 100644 (file)
--- a/include/configs/AmigaOneG3SE.h
+++ b/include/configs/AmigaOneG3SE.h
@@ -241,11 +241,11 @@
  * Environment is stored in NVRAM.
  */
 #define CONFIG_ENV_IS_IN_NVRAM 1
  * Environment is stored in NVRAM.
  */
 #define CONFIG_ENV_IS_IN_NVRAM 1

-#define CFG_ENV_ADDR           0xFD0E0000 /* This should be 0xFD0E0000, but we skip bytes to
+#define CONFIG_ENV_ADDR                0xFD0E0000 /* This should be 0xFD0E0000, but we skip bytes to

                                            * protect softex's settings for now.
                                            * Original 768 bytes where not enough.
                                            */
                                            * protect softex's settings for now.
                                            * Original 768 bytes where not enough.
                                            */

-#define CFG_ENV_SIZE           0x8000     /* Size of the Environment. See comment above */
+#define CONFIG_ENV_SIZE                0x8000     /* Size of the Environment. See comment above */

 
 #define CFG_CONSOLE_IS_IN_ENV  1 /* stdin/stdout/stderr are in environment */
 #define CFG_CONSOLE_OVERWRITE_ROUTINE  1
 
 #define CFG_CONSOLE_IS_IN_ENV  1 /* stdin/stdout/stderr are in environment */
 #define CFG_CONSOLE_OVERWRITE_ROUTINE  1

diff --git a/include/configs/B2.h b/include/configs/B2.h
index 1c4b6fee99e27d4ddad32ab2959c9dd22d9c93e9..1a8114b3173000107f07d89baa864347bbde82c3 100644 (file)
--- a/include/configs/B2.h
+++ b/include/configs/B2.h
@@ -49,8 +49,8 @@
  * Size of malloc() pool
  */
 #define CFG_MONITOR_LEN                (256 * 1024)    /* Reserve 256 kB for Monitor   */
  * Size of malloc() pool
  */
 #define CFG_MONITOR_LEN                (256 * 1024)    /* Reserve 256 kB for Monitor   */

-#define CFG_ENV_SIZE           1024            /* 1024 bytes may be used for env vars*/
-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024 )
+#define CONFIG_ENV_SIZE                1024            /* 1024 bytes may be used for env vars*/
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024 )

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -177,7 +177,7 @@
  * Environment Variable setup
  */
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
  * Environment Variable setup
  */
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */

-#define CFG_ENV_OFFSET         0x0     /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_OFFSET              0x0     /* environment starts at the beginning of the EEPROM */

 
 /*-----------------------------------------------------------------------
  * I2C EEPROM (STM24C02W6) for environment
 
 /*-----------------------------------------------------------------------
  * I2C EEPROM (STM24C02W6) for environment

diff --git a/include/configs/BAB7xx.h b/include/configs/BAB7xx.h
index c19f1e9f05920dd4ba6903214a1cabd65eac385f..bfbda52090e916914d61053b3b085341e2d32574 100644 (file)
--- a/include/configs/BAB7xx.h
+++ b/include/configs/BAB7xx.h
@@ -245,12 +245,12 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_ENV_IS_IN_NVRAM     1           /* use NVRAM for environment vars */
 #define CFG_NVRAM_SIZE          0x1ff0      /* NVRAM size (8kB), we must protect the clock data (16 bytes) */
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_ENV_IS_IN_NVRAM     1           /* use NVRAM for environment vars */
 #define CFG_NVRAM_SIZE          0x1ff0      /* NVRAM size (8kB), we must protect the clock data (16 bytes) */

-#define CFG_ENV_SIZE            0x400       /* Size of Environment vars (1kB) */
+#define CONFIG_ENV_SIZE            0x400       /* Size of Environment vars (1kB) */

 /*
  * We store the environment and an image of revision eeprom in the upper part of the NVRAM. Thus,
  * user applications can use the remaining space for other purposes.
  */
 /*
  * We store the environment and an image of revision eeprom in the upper part of the NVRAM. Thus,
  * user applications can use the remaining space for other purposes.
  */

-#define CFG_ENV_ADDR            (CFG_NVRAM_SIZE +0x10 -0x800)
+#define CONFIG_ENV_ADDR            (CFG_NVRAM_SIZE +0x10 -0x800)

 #define CFG_NV_SROM_COPY_ADDR   (CFG_NVRAM_SIZE +0x10 -0x400)
 #define CFG_NVRAM_ACCESS_ROUTINE            /* This board needs a special routine to access the NVRAM */
 #define CFG_SROM_SIZE           0x100       /* shadow of revision info is in nvram */
 #define CFG_NV_SROM_COPY_ADDR   (CFG_NVRAM_SIZE +0x10 -0x400)
 #define CFG_NVRAM_ACCESS_ROUTINE            /* This board needs a special routine to access the NVRAM */
 #define CFG_SROM_SIZE           0x100       /* shadow of revision info is in nvram */

diff --git a/include/configs/BC3450.h b/include/configs/BC3450.h
index 09c1995f09c3f7437a16bc8a78a0dfbc05a8ddf5..7fd6490766b5e952e167481f6a874158effd1740 100644 (file)
--- a/include/configs/BC3450.h
+++ b/include/configs/BC3450.h
@@ -336,9 +336,9 @@
 #undef CFG_FLASH_USE_BUFFER_WRITE      /* not supported yet for AMD */
 
 #if !defined(CFG_LOWBOOT)
 #undef CFG_FLASH_USE_BUFFER_WRITE      /* not supported yet for AMD */
 
 #if !defined(CFG_LOWBOOT)

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x00760000 + 0x00800000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x00760000 + 0x00800000)

 #else  /* CFG_LOWBOOT */
 #else  /* CFG_LOWBOOT */

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x00060000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x00060000)

 #endif /* CFG_LOWBOOT */
 #define CFG_MAX_FLASH_BANKS    1       /* max num of flash banks
                                           (= chip selects) */
 #endif /* CFG_LOWBOOT */
 #define CFG_MAX_FLASH_BANKS    1       /* max num of flash banks
                                           (= chip selects) */


@@ -359,10 +359,10 @@
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
  * Environment settings
  */
 #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)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_SIZE                0x10000
+#define CONFIG_ENV_SECT_SIZE   0x20000
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 /*
  * Memory map
 
 /*
  * Memory map

diff --git a/include/configs/BMW.h b/include/configs/BMW.h
index 5ba3e6d570af7c1252b48174cc51fdd86bfb4446..d5a398d1110c23b9b00106fcf92d32ef59d8c3ef 100644 (file)
--- a/include/configs/BMW.h
+++ b/include/configs/BMW.h
@@ -292,9 +292,9 @@
 #define CONFIG_ENV_IS_IN_NVRAM      1
 #define CONFIG_ENV_OVERWRITE     1
 #define CFG_NVRAM_ACCESS_ROUTINE 1
 #define CONFIG_ENV_IS_IN_NVRAM      1
 #define CONFIG_ENV_OVERWRITE     1
 #define CFG_NVRAM_ACCESS_ROUTINE 1

-#define CFG_ENV_ADDR           0x7c004000 /* right at the start of NVRAM  */
-#define CFG_ENV_SIZE           0x1ff0  /* Size of the Environment - 8K    */
-#define CFG_ENV_OFFSET         0       /* starting right at the beginning */
+#define CONFIG_ENV_ADDR                0x7c004000 /* right at the start of NVRAM  */
+#define CONFIG_ENV_SIZE                0x1ff0  /* Size of the Environment - 8K    */
+#define CONFIG_ENV_OFFSET              0       /* starting right at the beginning */

 
 /*
  * Cache Configuration
 
 /*
  * Cache Configuration

diff --git a/include/configs/CANBT.h b/include/configs/CANBT.h
index d50be015f59829c8673d519f92d159d93c2e1540..be588389c0e7d9d0a18a03ee2a15d75c29edd2e6 100644 (file)
--- a/include/configs/CANBT.h
+++ b/include/configs/CANBT.h
@@ -156,16 +156,16 @@
 #if 0 /* Use FLASH for environment variables */
 
 #define CONFIG_ENV_IS_IN_FLASH 1
 #if 0 /* Use FLASH for environment variables */
 
 #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     */
+#define CONFIG_ENV_OFFSET              0x00010000      /* Offset of Environment Sector */
+#define CONFIG_ENV_SIZE                0x1000  /* Total Size of Environment Sector     */

 
 

-#define CFG_ENV_SECT_SIZE      0x10000 /* see README - env sector total size   */
+#define CONFIG_ENV_SECT_SIZE   0x10000 /* see README - env sector total size   */

 
 #else /* Use EEPROM for environment variables */
 
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
 
 #else /* Use EEPROM for environment variables */
 
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */

-#define CFG_ENV_OFFSET         0x000   /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE           0x400   /* 1024 bytes may be used for env vars */
+#define CONFIG_ENV_OFFSET              0x000   /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE                0x400   /* 1024 bytes may be used for env vars */

                                   /* total size of a CAT24WC08 is 1024 bytes */
 #endif
 
                                   /* total size of a CAT24WC08 is 1024 bytes */
 #endif
 

diff --git a/include/configs/CATcenter.h b/include/configs/CATcenter.h
index b9c998eec6871fd7882d8f2056b1879f979b193e..8862898ce398d1502210cc642e0ec44f61421181 100644 (file)
--- a/include/configs/CATcenter.h
+++ b/include/configs/CATcenter.h
@@ -394,10 +394,10 @@
  * Environment Variable setup
  */
 #define CONFIG_ENV_IS_IN_FLASH 1       /* use FLASH for environment vars */
  * Environment Variable setup
  */
 #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
-#define CFG_ENV_SIZE_REDUND    0x2000
+#define CONFIG_ENV_ADDR                0xFFFF8000      /* environment starts at the first small sector */
+#define CONFIG_ENV_SECT_SIZE   0x2000  /* 8196 bytes may be used for env vars*/
+#define CONFIG_ENV_ADDR_REDUND 0xFFFFA000
+#define CONFIG_ENV_SIZE_REDUND 0x2000

 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 

diff --git a/include/configs/CCM.h b/include/configs/CCM.h
index 52b7b82cdc71c89673f1b554716844299eb8365a..435e8ecf59b8cafbdce5e584881f14db7cb08cc1 100644 (file)
--- a/include/configs/CCM.h
+++ b/include/configs/CCM.h
@@ -219,17 +219,17 @@
 #if 1
 /* Start port with environment in flash; switch to SPI EEPROM later */
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #if 1
 /* Start port with environment in flash; switch to SPI EEPROM later */
 #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     */
+#define        CONFIG_ENV_OFFSET               0x8000  /*   Offset   of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* Address and size of Redundant Environment Sector    */

-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET+CFG_ENV_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 #else
 /* Final version: environment in EEPROM */
 #define CONFIG_ENV_IS_IN_EEPROM        1
 #else
 /* Final version: environment in EEPROM */
 #define CONFIG_ENV_IS_IN_EEPROM        1

-#define CFG_ENV_OFFSET         2048
-#define CFG_ENV_SIZE           2048
+#define CONFIG_ENV_OFFSET              2048
+#define CONFIG_ENV_SIZE                2048

 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/CMS700.h b/include/configs/CMS700.h
index f157b5f7542c4961e32c75035f4025b1ca00c075..7c5efc2ea6853594265b69252afe9d4b28d55671 100644 (file)
--- a/include/configs/CMS700.h
+++ b/include/configs/CMS700.h
@@ -249,8 +249,8 @@
  * Environment Variable setup
  */
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
  * Environment Variable setup
  */
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */

-#define CFG_ENV_OFFSET         0x100   /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE           0x700   /* 2048 bytes may be used for env vars*/
+#define CONFIG_ENV_OFFSET              0x100   /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE                0x700   /* 2048 bytes may be used for env vars*/

                                   /* total size of a CAT24WC16 is 2048 bytes */
 
 /*-----------------------------------------------------------------------
                                   /* total size of a CAT24WC16 is 2048 bytes */
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/CPC45.h b/include/configs/CPC45.h
index 7ec48a127d80e47b74d9a21eeea9f286257bf522..a338af0e5c12e7a3525937220be6e7151696aea6 100644 (file)
--- a/include/configs/CPC45.h
+++ b/include/configs/CPC45.h
@@ -325,10 +325,10 @@
         */
 #define CONFIG_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              */
-#define CFG_ENV_OFFSET         0       /* starting right at the beginning      */
-#define CFG_ENV_SECT_SIZE      0x8000 /* Size of the Environment Sector        */
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x7F8000)
+#define CONFIG_ENV_SIZE                0x4000  /* Size of the Environment              */
+#define CONFIG_ENV_OFFSET              0       /* starting right at the beginning      */
+#define CONFIG_ENV_SECT_SIZE   0x8000 /* Size of the Environment Sector        */

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h
index 8b205c77207686a0b703f731f783a0dddcbe6d56..bd627e198fdbc320315cb92edf4f46430963b2ad 100644 (file)
--- a/include/configs/CPCI2DP.h
+++ b/include/configs/CPCI2DP.h
@@ -201,8 +201,8 @@
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */

-#define CFG_ENV_OFFSET         0x000   /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE           0x400   /* 1024 bytes may be used for env vars */
+#define CONFIG_ENV_OFFSET              0x000   /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE                0x400   /* 1024 bytes may be used for env vars */

 
 /*-----------------------------------------------------------------------
  * I2C EEPROM (CAT24WC16) for environment
 
 /*-----------------------------------------------------------------------
  * I2C EEPROM (CAT24WC16) for environment

diff --git a/include/configs/CPCI405.h b/include/configs/CPCI405.h
index 9a076ba14d662144d792496eabf030d107e26a40..85231341b60606e253138447f82a3ba4d57dad64 100644 (file)
--- a/include/configs/CPCI405.h
+++ b/include/configs/CPCI405.h
@@ -237,15 +237,15 @@
  * NVRAM organization
  */
 #define CONFIG_ENV_IS_IN_NVRAM 1       /* use NVRAM for environment vars       */
  * NVRAM organization
  */
 #define CONFIG_ENV_IS_IN_NVRAM 1       /* use NVRAM for environment vars       */

-#define CFG_ENV_SIZE           0x1000          /* Size of Environment vars     */
-#define CFG_ENV_ADDR           \
-       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)       /* Env  */
+#define CONFIG_ENV_SIZE                0x1000          /* Size of Environment vars     */
+#define CONFIG_ENV_ADDR                \
+       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CONFIG_ENV_SIZE)    /* Env  */

 
 #else /* Use EEPROM for environment variables */
 
 #define CONFIG_ENV_IS_IN_EEPROM    1       /* use EEPROM for environment vars */
 
 #else /* Use EEPROM for environment variables */
 
 #define CONFIG_ENV_IS_IN_EEPROM    1       /* use EEPROM for environment vars */

-#define CFG_ENV_OFFSET          0x000   /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE            0x400   /* 1024 bytes may be used for env vars */
+#define CONFIG_ENV_OFFSET          0x000   /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE            0x400   /* 1024 bytes may be used for env vars */

                                   /* total size of a CAT24WC08 is 1024 bytes */
 #endif
 
                                   /* total size of a CAT24WC08 is 1024 bytes */
 #endif
 

diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h
index 357c213173eb227aea53348c6658e6d557832898..228821a04e43ff315aa3b1daf121dd3a927c78c1 100644 (file)
--- a/include/configs/CPCI4052.h
+++ b/include/configs/CPCI4052.h
@@ -252,15 +252,15 @@
  * NVRAM organization
  */
 #define CONFIG_ENV_IS_IN_NVRAM 1       /* use NVRAM for environment vars       */
  * NVRAM organization
  */
 #define CONFIG_ENV_IS_IN_NVRAM 1       /* use NVRAM for environment vars       */

-#define CFG_ENV_SIZE           0x0ff8          /* Size of Environment vars     */
-#define CFG_ENV_ADDR           \
-       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-(CFG_ENV_SIZE+8))   /* Env  */
+#define CONFIG_ENV_SIZE                0x0ff8          /* Size of Environment vars     */
+#define CONFIG_ENV_ADDR                \
+       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-(CONFIG_ENV_SIZE+8))        /* Env  */

 
 #else /* Use EEPROM for environment variables */
 
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
 
 #else /* Use EEPROM for environment variables */
 
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */

-#define CFG_ENV_OFFSET         0x000   /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE           0x800   /* 2048 bytes may be used for env vars*/
+#define CONFIG_ENV_OFFSET              0x000   /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE                0x800   /* 2048 bytes may be used for env vars*/

                                   /* total size of a CAT24WC16 is 2048 bytes */
 #endif
 
                                   /* total size of a CAT24WC16 is 2048 bytes */
 #endif
 

diff --git a/include/configs/CPCI405AB.h b/include/configs/CPCI405AB.h
index 431054d39497dccb9dce98d33cea0ee2433e9f47..065b85547ab641f17a8adc5505480b4c6c42243e 100644 (file)
--- a/include/configs/CPCI405AB.h
+++ b/include/configs/CPCI405AB.h
@@ -264,8 +264,8 @@
 /* Use EEPROM for environment variables */
 
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
 /* Use EEPROM for environment variables */
 
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */

-#define CFG_ENV_OFFSET         0x000   /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE           0x800   /* 2048 bytes may be used for env vars*/
+#define CONFIG_ENV_OFFSET              0x000   /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE                0x800   /* 2048 bytes may be used for env vars*/

                                   /* total size of a CAT24WC32 is 4096 bytes */
 
 #define CFG_NVRAM_BASE_ADDR    0xf0200000              /* NVRAM base address   */
                                   /* total size of a CAT24WC32 is 4096 bytes */
 
 #define CFG_NVRAM_BASE_ADDR    0xf0200000              /* NVRAM base address   */

diff --git a/include/configs/CPCI405DT.h b/include/configs/CPCI405DT.h
index 53228c1b46dfab8000b8ce752aad4e7dfd6127d6..ffbe036346611353f68769f7005cba639c8551fd 100644 (file)
--- a/include/configs/CPCI405DT.h
+++ b/include/configs/CPCI405DT.h
@@ -255,15 +255,15 @@
  * NVRAM organization
  */
 #define CONFIG_ENV_IS_IN_NVRAM 1       /* use NVRAM for environment vars       */
  * NVRAM organization
  */
 #define CONFIG_ENV_IS_IN_NVRAM 1       /* use NVRAM for environment vars       */

-#define CFG_ENV_SIZE           0x0ff8          /* Size of Environment vars     */
-#define CFG_ENV_ADDR           \
-       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-(CFG_ENV_SIZE+8))   /* Env  */
+#define CONFIG_ENV_SIZE                0x0ff8          /* Size of Environment vars     */
+#define CONFIG_ENV_ADDR                \
+       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-(CONFIG_ENV_SIZE+8))        /* Env  */

 
 #else /* Use EEPROM for environment variables */
 
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
 
 #else /* Use EEPROM for environment variables */
 
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */

-#define CFG_ENV_OFFSET         0x000   /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE           0x800   /* 2048 bytes may be used for env vars*/
+#define CONFIG_ENV_OFFSET              0x000   /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE                0x800   /* 2048 bytes may be used for env vars*/

                                   /* total size of a CAT24WC16 is 2048 bytes */
 #endif
 
                                   /* total size of a CAT24WC16 is 2048 bytes */
 #endif
 

diff --git a/include/configs/CPCI750.h b/include/configs/CPCI750.h
index 7a185e847e160c4cd4476d489668ae8ecfd90da5..46f80d1d67d6ffd50ec0a40b20ff78f5f6f50bff 100644 (file)
--- a/include/configs/CPCI750.h
+++ b/include/configs/CPCI750.h
@@ -573,18 +573,18 @@
 
 #if 0
 #define CONFIG_ENV_IS_IN_FLASH
 
 #if 0
 #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 */
-/* #define CFG_ENV_ADDR           (CFG_FLASH_BASE+CFG_MONITOR_LEN-CFG_ENV_SECT_SIZE) */
+#define CONFIG_ENV_SIZE                0x1000  /* Total Size of Environment Sector */
+#define CONFIG_ENV_SECT_SIZE   0x10000
+#define CONFIG_ENV_ADDR                0xFFF78000 /* Marvell 8-Bit Bootflash last sector */
+/* #define CONFIG_ENV_ADDR        (CFG_FLASH_BASE+CFG_MONITOR_LEN-CONFIG_ENV_SECT_SIZE) */

 #endif
 
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
 #define CFG_EEPROM_PAGE_WRITE_BITS 5
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 20
 #define CFG_I2C_EEPROM_ADDR    0x050
 #endif
 
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
 #define CFG_EEPROM_PAGE_WRITE_BITS 5
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 20
 #define CFG_I2C_EEPROM_ADDR    0x050

-#define CFG_ENV_OFFSET         0x200   /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE           0x600   /* 2048 bytes may be used for env vars*/
+#define CONFIG_ENV_OFFSET              0x200   /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE                0x600   /* 2048 bytes may be used for env vars*/

 
 #define CFG_NVRAM_BASE_ADDR    0xf0000000              /* NVRAM base address   */
 #define CFG_NVRAM_SIZE         (32*1024)               /* NVRAM size           */
 
 #define CFG_NVRAM_BASE_ADDR    0xf0000000              /* NVRAM base address   */
 #define CFG_NVRAM_SIZE         (32*1024)               /* NVRAM size           */

diff --git a/include/configs/CPCIISER4.h b/include/configs/CPCIISER4.h
index 958b11151e464283d30ed20c67b002d859b8cfdd..bfb42421f5c1ae4e18274427dbb96ce3394dfc05 100644 (file)
--- a/include/configs/CPCIISER4.h
+++ b/include/configs/CPCIISER4.h
@@ -201,8 +201,8 @@
 #define CFG_EEPROM_PAGE_WRITE_ENABLE
 
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
 #define CFG_EEPROM_PAGE_WRITE_ENABLE
 
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */

-#define CFG_ENV_OFFSET         0x000   /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE           0x300   /* 768 bytes may be used for env vars */
+#define CONFIG_ENV_OFFSET              0x000   /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE                0x300   /* 768 bytes may be used for env vars */

                                   /* total size of a CAT24WC08 is 1024 bytes */
 
 /*
                                   /* total size of a CAT24WC08 is 1024 bytes */
 
 /*

diff --git a/include/configs/CPU86.h b/include/configs/CPU86.h
index 443b976495f9d5aac944dfb2b28f1a9321ef2cc1..5f4e0c76a5b1c2a459b17960599317587a3bef8c 100644 (file)
--- a/include/configs/CPU86.h
+++ b/include/configs/CPU86.h
@@ -326,9 +326,9 @@
 /* environment is in Flash */
 #define CONFIG_ENV_IS_IN_FLASH 1
 #ifdef CONFIG_BOOT_ROM
 /* environment is in Flash */
 #define CONFIG_ENV_IS_IN_FLASH 1
 #ifdef CONFIG_BOOT_ROM

-# define CFG_ENV_ADDR          (CFG_FLASH_BASE+0x70000)
-# define CFG_ENV_SIZE          0x10000
-# define CFG_ENV_SECT_SIZE     0x10000
+# define CONFIG_ENV_ADDR               (CFG_FLASH_BASE+0x70000)
+# define CONFIG_ENV_SIZE               0x10000
+# define CONFIG_ENV_SECT_SIZE  0x10000

 #endif
 #else
 /* environment is in EEPROM */
 #endif
 #else
 /* environment is in EEPROM */


@@ -339,8 +339,8 @@
 #define CFG_I2C_EEPROM_ADDR_OVERFLOW   0x07
 #define CFG_EEPROM_PAGE_WRITE_BITS     4
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10      /* and takes up to 10 msec */
 #define CFG_I2C_EEPROM_ADDR_OVERFLOW   0x07
 #define CFG_EEPROM_PAGE_WRITE_BITS     4
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10      /* and takes up to 10 msec */

-#define CFG_ENV_OFFSET         512
-#define CFG_ENV_SIZE           (2048 - 512)
+#define CONFIG_ENV_OFFSET              512
+#define CONFIG_ENV_SIZE                (2048 - 512)

 #endif
 
 /*
 #endif
 
 /*

diff --git a/include/configs/CPU87.h b/include/configs/CPU87.h
index 45075fa2e38c9ecba2256126eb739332ac6cc122..e087624e9f4ea3ced1137d86d5981ba41da77e47 100644 (file)
--- a/include/configs/CPU87.h
+++ b/include/configs/CPU87.h
@@ -341,9 +341,9 @@
 /* environment is in Flash */
 #define CONFIG_ENV_IS_IN_FLASH 1
 #ifdef CONFIG_BOOT_ROM
 /* environment is in Flash */
 #define CONFIG_ENV_IS_IN_FLASH 1
 #ifdef CONFIG_BOOT_ROM

-# define CFG_ENV_ADDR          (CFG_FLASH_BASE+0x70000)
-# define CFG_ENV_SIZE          0x10000
-# define CFG_ENV_SECT_SIZE     0x10000
+# define CONFIG_ENV_ADDR               (CFG_FLASH_BASE+0x70000)
+# define CONFIG_ENV_SIZE               0x10000
+# define CONFIG_ENV_SECT_SIZE  0x10000

 #endif
 #else
 /* environment is in EEPROM */
 #endif
 #else
 /* environment is in EEPROM */


@@ -354,8 +354,8 @@
 #define CFG_I2C_EEPROM_ADDR_OVERFLOW   0x07
 #define CFG_EEPROM_PAGE_WRITE_BITS     4
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10      /* and takes up to 10 msec */
 #define CFG_I2C_EEPROM_ADDR_OVERFLOW   0x07
 #define CFG_EEPROM_PAGE_WRITE_BITS     4
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10      /* and takes up to 10 msec */

-#define CFG_ENV_OFFSET         512
-#define CFG_ENV_SIZE           (2048 - 512)
+#define CONFIG_ENV_OFFSET              512
+#define CONFIG_ENV_SIZE                (2048 - 512)

 #endif
 
 /*
 #endif
 
 /*

diff --git a/include/configs/CRAYL1.h b/include/configs/CRAYL1.h
index c15a02ab961476a2a2ffc577a680667526c2aa70..4639d30b6d21f984315e3810270aa4b4b6b1509b 100644 (file)
--- a/include/configs/CRAYL1.h
+++ b/include/configs/CRAYL1.h
@@ -169,10 +169,10 @@
 #define CFG_FLASH_WRITE_TOUT 500       /* Timeout for Flash Write (in ms)      */
 
 /* BEG ENVIRONNEMENT FLASH: needs to be a whole FlashSector  */
 #define CFG_FLASH_WRITE_TOUT 500       /* Timeout for Flash Write (in ms)      */
 
 /* BEG ENVIRONNEMENT FLASH: needs to be a whole FlashSector  */

-#define CFG_ENV_OFFSET         0x3c8000
+#define CONFIG_ENV_OFFSET              0x3c8000

 #define CONFIG_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  */
+#define        CONFIG_ENV_SIZE         0x1000   /* Total Size of Environment area      */
+#define CONFIG_ENV_SECT_SIZE   0x10000  /* see README - env sector total size  */

 
 /* Memory tests: U-BOOT relocates itself to the top of Ram, so its at
  * 32meg-(128k+some_malloc_space+copy-of-ENV sector)..
 
 /* Memory tests: U-BOOT relocates itself to the top of Ram, so its at
  * 32meg-(128k+some_malloc_space+copy-of-ENV sector)..


@@ -186,7 +186,7 @@
 #define CFG_MALLOC_LEN         (128 << 10)     /* 128k for malloc space */
 #define CFG_MEM_END_USAGE      ( CFG_MONITOR_LEN \
                                + CFG_MALLOC_LEN \
 #define CFG_MALLOC_LEN         (128 << 10)     /* 128k for malloc space */
 #define CFG_MEM_END_USAGE      ( CFG_MONITOR_LEN \
                                + CFG_MALLOC_LEN \

-                               + CFG_ENV_SECT_SIZE \
+                               + CONFIG_ENV_SECT_SIZE \

                                + CFG_STACK_USAGE )
 
 #define CFG_MEMTEST_END                (CFG_SDRAM_SIZE * 1024 * 1024 - CFG_MEM_END_USAGE)
                                + CFG_STACK_USAGE )
 
 #define CFG_MEMTEST_END                (CFG_SDRAM_SIZE * 1024 * 1024 - CFG_MEM_END_USAGE)

diff --git a/include/configs/CU824.h b/include/configs/CU824.h
index 3320c9aee7be40f5565fe000c473636ac32ffa6d..a40df76f3e820677a36cf7a1190af96443e527ea 100644 (file)
--- a/include/configs/CU824.h
+++ b/include/configs/CU824.h
@@ -273,13 +273,13 @@
         */
 #define CONFIG_ENV_IS_IN_FLASH     1
 #if 0
         */
 #define CONFIG_ENV_IS_IN_FLASH     1
 #if 0

-#define CFG_ENV_ADDR           0xFF008000
-#define CFG_ENV_SIZE           0x8000  /* Size of the Environment Sector       */
+#define CONFIG_ENV_ADDR                0xFF008000
+#define CONFIG_ENV_SIZE                0x8000  /* Size of the Environment Sector       */

 #else
 #else

-#define CFG_ENV_ADDR           0xFFFC0000
-#define CFG_ENV_SIZE           0x4000  /* Size of the Environment              */
-#define CFG_ENV_OFFSET         0       /* starting right at the beginning      */
-#define CFG_ENV_SECT_SIZE      0x40000 /* Size of the Environment Sector       */
+#define CONFIG_ENV_ADDR                0xFFFC0000
+#define CONFIG_ENV_SIZE                0x4000  /* Size of the Environment              */
+#define CONFIG_ENV_OFFSET              0       /* starting right at the beginning      */
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* Size of the Environment Sector       */

 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/DASA_SIM.h b/include/configs/DASA_SIM.h
index 24370c93fdce6b4c0d303bc61e421dba74b88061..3ddf1bf3f53a01500b8de13566273043ec855680 100644 (file)
--- a/include/configs/DASA_SIM.h
+++ b/include/configs/DASA_SIM.h
@@ -158,13 +158,13 @@
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 
 #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     */
+#define CONFIG_ENV_OFFSET              0x00010000      /* Offset of Environment Sector */
+#define CONFIG_ENV_SIZE                0x1000  /* Total Size of Environment Sector     */

 
 #if 0
 
 #if 0

-#define CFG_ENV_SECT_SIZE      0x8000  /* see README - env sector total size   */
+#define CONFIG_ENV_SECT_SIZE   0x8000  /* see README - env sector total size   */

 #else
 #else

-#define CFG_ENV_SECT_SIZE      0x10000 /* see README - env sector total size   */
+#define CONFIG_ENV_SECT_SIZE   0x10000 /* see README - env sector total size   */

 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/DB64360.h b/include/configs/DB64360.h
index 3fc280fc388cc05e33e774dcd6351912b6ea7053..0edd51abfa4e2ca9a53e6b31725c2226fa61f59d 100644 (file)
--- a/include/configs/DB64360.h
+++ b/include/configs/DB64360.h
@@ -560,10 +560,10 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
 #define CFG_FLASH_CFI          1
 
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_FLASH_CFI          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 */
-/* #define CFG_ENV_ADDR           (CFG_FLASH_BASE+CFG_MONITOR_LEN-CFG_ENV_SECT_SIZE) */
+#define CONFIG_ENV_SIZE                0x1000  /* Total Size of Environment Sector */
+#define CONFIG_ENV_SECT_SIZE   0x10000
+#define CONFIG_ENV_ADDR              0xFFF78000 /* Marvell 8-Bit Bootflash last sector */
+/* #define CONFIG_ENV_ADDR        (CFG_FLASH_BASE+CFG_MONITOR_LEN-CONFIG_ENV_SECT_SIZE) */

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/DB64460.h b/include/configs/DB64460.h
index 59a934e6943087a9b6a4f595acb5e7a058a2ed07..30615a464fe51dd4c0775d4ed33ce91f1613bb9b 100644 (file)
--- a/include/configs/DB64460.h
+++ b/include/configs/DB64460.h
@@ -498,10 +498,10 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
 #define CFG_FLASH_CFI          1
 
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_FLASH_CFI          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 */
-/* #define CFG_ENV_ADDR           (CFG_FLASH_BASE+CFG_MONITOR_LEN-CFG_ENV_SECT_SIZE) */
+#define CONFIG_ENV_SIZE                0x1000  /* Total Size of Environment Sector */
+#define CONFIG_ENV_SECT_SIZE   0x10000
+#define CONFIG_ENV_ADDR              0xFFF78000 /* Marvell 8-Bit Bootflash last sector */
+/* #define CONFIG_ENV_ADDR        (CFG_FLASH_BASE+CFG_MONITOR_LEN-CONFIG_ENV_SECT_SIZE) */

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/DK1C20.h b/include/configs/DK1C20.h
index a1f4e0dc73be7f612a56096a61244d512915183c..3e1fc0affceb4e2801fc679903fc970e5a6fca1c 100644 (file)
--- a/include/configs/DK1C20.h
+++ b/include/configs/DK1C20.h
@@ -82,7 +82,7 @@
  *----------------------------------------------------------------------*/
 #define CFG_MONITOR_LEN                (256 * 1024)    /* Reserve 256k         */
 #define CFG_GBL_DATA_SIZE      128             /* Global data size rsvd*/
  *----------------------------------------------------------------------*/
 #define CFG_MONITOR_LEN                (256 * 1024)    /* Reserve 256k         */
 #define CFG_GBL_DATA_SIZE      128             /* Global data size rsvd*/

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)

 
 #define CFG_MONITOR_BASE       TEXT_BASE
 #define CFG_MALLOC_BASE                (CFG_MONITOR_BASE - CFG_MALLOC_LEN)
 
 #define CFG_MONITOR_BASE       TEXT_BASE
 #define CFG_MALLOC_BASE                (CFG_MONITOR_BASE - CFG_MALLOC_LEN)


@@ -112,8 +112,8 @@
 #if    (CFG_NIOS_CPU_FLASH_SIZE != 0)
 
 #define        CONFIG_ENV_IS_IN_FLASH  1               /* Environment in flash */
 #if    (CFG_NIOS_CPU_FLASH_SIZE != 0)
 
 #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_ADDR                CFG_FLASH_BASE  /* Mem addr of env      */
+#define CONFIG_ENV_SIZE                (64 * 1024)     /* 64 KByte (1 sector)  */

 #define CONFIG_ENV_OVERWRITE                   /* Serial/eth change Ok */
 
 #else
 #define CONFIG_ENV_OVERWRITE                   /* Serial/eth change Ok */
 
 #else

diff --git a/include/configs/DK1S10.h b/include/configs/DK1S10.h
index eda328ab3ec871af4d8f403e37a83903d11b94e3..12d4e6b427c6b5d48f23897c80e727a964226454 100644 (file)
--- a/include/configs/DK1S10.h
+++ b/include/configs/DK1S10.h
@@ -90,7 +90,7 @@
  *----------------------------------------------------------------------*/
 #define CFG_MONITOR_LEN                (256 * 1024)    /* Reserve 256k         */
 #define CFG_GBL_DATA_SIZE      128             /* Global data size rsvd*/
  *----------------------------------------------------------------------*/
 #define CFG_MONITOR_LEN                (256 * 1024)    /* Reserve 256k         */
 #define CFG_GBL_DATA_SIZE      128             /* Global data size rsvd*/

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)

 
 #define CFG_MONITOR_BASE       TEXT_BASE
 #define CFG_MALLOC_BASE                (CFG_MONITOR_BASE - CFG_MALLOC_LEN)
 
 #define CFG_MONITOR_BASE       TEXT_BASE
 #define CFG_MALLOC_BASE                (CFG_MONITOR_BASE - CFG_MALLOC_LEN)


@@ -122,14 +122,14 @@
 #define        CONFIG_ENV_IS_IN_FLASH  1               /* Environment in flash */
 
 #if    defined(CONFIG_NIOS_STANDARD_32)
 #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      */
+#define CONFIG_ENV_ADDR                CFG_FLASH_BASE  /* Mem addr of env      */

 #elif  defined(CONFIG_NIOS_MTX_LDK_20)
 #elif  defined(CONFIG_NIOS_MTX_LDK_20)

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + CFG_MONITOR_LEN)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + CFG_MONITOR_LEN)

 #else
 #else

-#error *** CFG_ERROR: you have to setup the environment base address CFG_ENV_ADDR
+#error *** CFG_ERROR: you have to setup the environment base address CONFIG_ENV_ADDR

 #endif
 
 #endif
 

-#define CFG_ENV_SIZE           (64 * 1024)     /* 64 KByte (1 sector)  */
+#define CONFIG_ENV_SIZE                (64 * 1024)     /* 64 KByte (1 sector)  */

 #define CONFIG_ENV_OVERWRITE                   /* Serial/eth change Ok */
 
 #else
 #define CONFIG_ENV_OVERWRITE                   /* Serial/eth change Ok */
 
 #else

diff --git a/include/configs/DP405.h b/include/configs/DP405.h
index 50d44a0326ef37467c0c5a1e73186afd2acda701..acc2bd2639ebefc1ba408e24e4ec855d4f24b4e0 100644 (file)
--- a/include/configs/DP405.h
+++ b/include/configs/DP405.h
@@ -217,8 +217,8 @@
  * Environment Variable setup
  */
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
  * Environment Variable setup
  */
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */

-#define CFG_ENV_OFFSET         0x100   /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE           0x700   /* 2048 bytes may be used for env vars*/
+#define CONFIG_ENV_OFFSET              0x100   /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE                0x700   /* 2048 bytes may be used for env vars*/

                                   /* total size of a CAT24WC16 is 2048 bytes */
 
 #define CFG_NVRAM_BASE_ADDR    0xF0000500              /* NVRAM base address   */
                                   /* total size of a CAT24WC16 is 2048 bytes */
 
 #define CFG_NVRAM_BASE_ADDR    0xF0000500              /* NVRAM base address   */

diff --git a/include/configs/DU405.h b/include/configs/DU405.h
index 811b9c3f9b6cbc408b32beda546076282294fe96..7debc69af31bf5019090aed6679fc1dd688cf04a 100644 (file)
--- a/include/configs/DU405.h
+++ b/include/configs/DU405.h
@@ -228,8 +228,8 @@
 #define CFG_EEPROM_PAGE_WRITE_ENABLE
 
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
 #define CFG_EEPROM_PAGE_WRITE_ENABLE
 
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */

-#define CFG_ENV_OFFSET         0x000   /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE           0x400   /* 1024 bytes may be used for env vars */
+#define CONFIG_ENV_OFFSET              0x000   /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE                0x400   /* 1024 bytes may be used for env vars */

                                   /* total size of a CAT24WC08 is 1024 bytes */
 
 /*
                                   /* total size of a CAT24WC08 is 1024 bytes */
 
 /*

diff --git a/include/configs/DU440.h b/include/configs/DU440.h
index 37a7e3ae87e7030f1d242098debfbd17efbfa228..9f8c423b437f9d35b0bb8d0947eda2d672bfc502 100644 (file)
--- a/include/configs/DU440.h
+++ b/include/configs/DU440.h
@@ -137,19 +137,19 @@
 #define CFG_FLASH_QUIET_TEST   1       /* don't warn upon unknown flash      */
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_FLASH_QUIET_TEST   1       /* don't warn upon unknown 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   */
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* size of one complete sector        */
+#define CONFIG_ENV_ADDR                ((-CFG_MONITOR_LEN)-CONFIG_ENV_SECT_SIZE)
+#define        CONFIG_ENV_SIZE         0x2000  /* Total Size of Environment Sector   */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 #endif
 
 #ifdef CONFIG_ENV_IS_IN_EEPROM
 #endif
 
 #ifdef CONFIG_ENV_IS_IN_EEPROM

-#define CFG_ENV_OFFSET         0       /* environment starts at */
+#define CONFIG_ENV_OFFSET              0       /* environment starts at */

                                        /* the beginning of the EEPROM */
                                        /* the beginning of the EEPROM */

-#define CFG_ENV_SIZE           0x1000 /* 4096 bytes may be used for env vars */
+#define CONFIG_ENV_SIZE                0x1000 /* 4096 bytes may be used for env vars */

 #endif
 
 /*
 #endif
 
 /*

diff --git a/include/configs/EB+MCF-EV123.h b/include/configs/EB+MCF-EV123.h
index 80a6cb7bec68cd5f23387841e207156126be4994..a949454f7ea3dbc93309c0bd81cb4d650e696abb 100644 (file)
--- a/include/configs/EB+MCF-EV123.h
+++ b/include/configs/EB+MCF-EV123.h
@@ -51,17 +51,17 @@
  * Environment is embedded in u-boot in the second sector of the flash
  */
 #ifndef CONFIG_MONITOR_IS_IN_RAM
  * Environment is embedded in u-boot in the second sector of the flash
  */
 #ifndef CONFIG_MONITOR_IS_IN_RAM

-#define CFG_ENV_ADDR           0xF003C000      /* End of 256K */
-#define CFG_ENV_SECT_SIZE      0x4000
+#define CONFIG_ENV_ADDR                0xF003C000      /* End of 256K */
+#define CONFIG_ENV_SECT_SIZE   0x4000

 #define CONFIG_ENV_IS_IN_FLASH 1
 /*
 #define CONFIG_ENV_IS_IN_FLASH 1
 /*

-#define CFG_ENV_IS_EMBEDDED    1
-#define CFG_ENV_ADDR_REDUND            0xF0018000
-#define CFG_ENV_SECT_SIZE_REDUND       0x4000
+#define CONFIG_ENV_IS_EMBEDDED 1
+#define CONFIG_ENV_ADDR_REDUND         0xF0018000
+#define CONFIG_ENV_SECT_SIZE_REDUND    0x4000

 */
 #else
 */
 #else

-#define CFG_ENV_ADDR           0xFFE04000
-#define CFG_ENV_SECT_SIZE      0x2000
+#define CONFIG_ENV_ADDR                0xFFE04000
+#define CONFIG_ENV_SECT_SIZE   0x2000

 #define CONFIG_ENV_IS_IN_FLASH 1
 #endif
 
 #define CONFIG_ENV_IS_IN_FLASH 1
 #endif
 

diff --git a/include/configs/ELPPC.h b/include/configs/ELPPC.h
index 8c6840011560eaff381b336829e262aba13fd3a9..08e3d7113485dddff7de5723385d5daa1adcb83e 100644 (file)
--- a/include/configs/ELPPC.h
+++ b/include/configs/ELPPC.h
@@ -220,10 +220,10 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_ENV_IS_IN_NVRAM     1           /* use NVRAM for environment vars */
 #define CFG_NVRAM_SIZE          0x800       /* NVRAM size (2kB) */
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_ENV_IS_IN_NVRAM     1           /* use NVRAM for environment vars */
 #define CFG_NVRAM_SIZE          0x800       /* NVRAM size (2kB) */

-#define CFG_ENV_SIZE            0x400       /* Size of Environment vars (1kB) */
-#define CFG_ENV_ADDR            0x0
-#define CFG_ENV_MAP_ADRS        0xff000000
-#define CFG_NV_SROM_COPY_ADDR   (CFG_ENV_ADDR + CFG_ENV_SIZE)
+#define CONFIG_ENV_SIZE            0x400       /* Size of Environment vars (1kB) */
+#define CONFIG_ENV_ADDR            0x0
+#define CONFIG_ENV_MAP_ADRS        0xff000000
+#define CFG_NV_SROM_COPY_ADDR   (CONFIG_ENV_ADDR + CONFIG_ENV_SIZE)

 #define CFG_NVRAM_ACCESS_ROUTINE            /* only byte accsess alowed */
 #define CFG_SROM_SIZE           0x100       /* shadow of revision info is in nvram */
 
 #define CFG_NVRAM_ACCESS_ROUTINE            /* only byte accsess alowed */
 #define CFG_SROM_SIZE           0x100       /* shadow of revision info is in nvram */
 

diff --git a/include/configs/ELPT860.h b/include/configs/ELPT860.h
index 11eca4c4d57e0331e4305853099e882d8633f58f..c6a3b8b7000b782f387fabab143abae81d523eac 100644 (file)
--- a/include/configs/ELPT860.h
+++ b/include/configs/ELPT860.h
@@ -214,8 +214,8 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)   */
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)   */
 
 #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  */
+#  define CONFIG_ENV_OFFSET    0x10000 /* Offset   of Environment Sector    */
+#  define CONFIG_ENV_SIZE              0x10000 /* Total Size of Environment Sector  */

 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------


@@ -226,8 +226,8 @@
                                               /*   8 top NVRAM locations    */
 
 #if defined(CONFIG_ENV_IS_IN_NVRAM)
                                               /*   8 top NVRAM locations    */
 
 #if defined(CONFIG_ENV_IS_IN_NVRAM)

-#  define CFG_ENV_ADDR         CFG_NVRAM_BASE /* Base address of NVRAM area */
-#  define CFG_ENV_SIZE         0x4000  /* Total Size of Environment Sector  */
+#  define CONFIG_ENV_ADDR              CFG_NVRAM_BASE /* Base address of NVRAM area */
+#  define CONFIG_ENV_SIZE              0x4000  /* Total Size of Environment Sector  */

 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/EP1C20.h b/include/configs/EP1C20.h
index aaf61726db10a85ef702ea16778d178c2ad8bb26..90e3637533601df134fe096b5bafe93def186499 100644 (file)
--- a/include/configs/EP1C20.h
+++ b/include/configs/EP1C20.h
@@ -63,7 +63,7 @@
  *----------------------------------------------------------------------*/
 #define CFG_MONITOR_LEN                (256 * 1024)    /* Reserve 128k         */
 #define CFG_GBL_DATA_SIZE      128             /* Global data size rsvd*/
  *----------------------------------------------------------------------*/
 #define CFG_MONITOR_LEN                (256 * 1024)    /* Reserve 128k         */
 #define CFG_GBL_DATA_SIZE      128             /* Global data size rsvd*/

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)

 
 #define CFG_MONITOR_BASE       TEXT_BASE
 #define CFG_MALLOC_BASE                (CFG_MONITOR_BASE - CFG_MALLOC_LEN)
 
 #define CFG_MONITOR_BASE       TEXT_BASE
 #define CFG_MALLOC_BASE                (CFG_MONITOR_BASE - CFG_MALLOC_LEN)


@@ -87,9 +87,9 @@
  * (which is common practice).
  *----------------------------------------------------------------------*/
 #define CONFIG_ENV_IS_IN_FLASH 1               /* Environment in flash */
  * (which is common practice).
  *----------------------------------------------------------------------*/
 #define CONFIG_ENV_IS_IN_FLASH 1               /* Environment in flash */

-#define CFG_ENV_SIZE           (64 * 1024)     /* 64 KByte (1 sector)  */
+#define CONFIG_ENV_SIZE                (64 * 1024)     /* 64 KByte (1 sector)  */

 #define CONFIG_ENV_OVERWRITE                   /* Serial change Ok     */
 #define CONFIG_ENV_OVERWRITE                   /* Serial change Ok     */

-#define CFG_ENV_ADDR   (CFG_RESET_ADDR + CFG_MONITOR_LEN)
+#define CONFIG_ENV_ADDR        (CFG_RESET_ADDR + CFG_MONITOR_LEN)

 
 /*------------------------------------------------------------------------
  * CONSOLE
 
 /*------------------------------------------------------------------------
  * CONSOLE

diff --git a/include/configs/EP1S10.h b/include/configs/EP1S10.h
index ae1e476fd34a8f4bcf0be9ab3f23ce00709b6144..ae9409f48416db56f0cf641489bb00e06f2d96c8 100644 (file)
--- a/include/configs/EP1S10.h
+++ b/include/configs/EP1S10.h
@@ -62,7 +62,7 @@
  *----------------------------------------------------------------------*/
 #define CFG_MONITOR_LEN                (256 * 1024)    /* Reserve 256k         */
 #define CFG_GBL_DATA_SIZE      128             /* Global data size rsvd*/
  *----------------------------------------------------------------------*/
 #define CFG_MONITOR_LEN                (256 * 1024)    /* Reserve 256k         */
 #define CFG_GBL_DATA_SIZE      128             /* Global data size rsvd*/

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 256*1024) /* 256k heap */
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 256*1024) /* 256k heap */

 
 #define CFG_MONITOR_BASE       TEXT_BASE
 #define CFG_MALLOC_BASE                (CFG_MONITOR_BASE - CFG_MALLOC_LEN)
 
 #define CFG_MONITOR_BASE       TEXT_BASE
 #define CFG_MALLOC_BASE                (CFG_MONITOR_BASE - CFG_MALLOC_LEN)


@@ -85,9 +85,9 @@
  * (which is common practice).
  *----------------------------------------------------------------------*/
 #define CONFIG_ENV_IS_IN_FLASH 1               /* Environment in flash */
  * (which is common practice).
  *----------------------------------------------------------------------*/
 #define CONFIG_ENV_IS_IN_FLASH 1               /* Environment in flash */

-#define CFG_ENV_SIZE           (64 * 1024)     /* 64 KByte (1 sector)  */
+#define CONFIG_ENV_SIZE                (64 * 1024)     /* 64 KByte (1 sector)  */

 #define CONFIG_ENV_OVERWRITE                   /* Serial change Ok     */
 #define CONFIG_ENV_OVERWRITE                   /* Serial change Ok     */

-#define CFG_ENV_ADDR   (CFG_FLASH_BASE + CFG_MONITOR_LEN)
+#define CONFIG_ENV_ADDR        (CFG_FLASH_BASE + CFG_MONITOR_LEN)

 
 /*------------------------------------------------------------------------
  * CONSOLE
 
 /*------------------------------------------------------------------------
  * CONSOLE

diff --git a/include/configs/EP1S40.h b/include/configs/EP1S40.h
index 7aedcca1dbeece042228d8c11d058e1f52216419..95ae14772bf3caea6da2010af19f9bed1d2ac6b0 100644 (file)
--- a/include/configs/EP1S40.h
+++ b/include/configs/EP1S40.h
@@ -62,7 +62,7 @@
  *----------------------------------------------------------------------*/
 #define CFG_MONITOR_LEN                (256 * 1024)    /* Reserve 256k         */
 #define CFG_GBL_DATA_SIZE      128             /* Global data size rsvd*/
  *----------------------------------------------------------------------*/
 #define CFG_MONITOR_LEN                (256 * 1024)    /* Reserve 256k         */
 #define CFG_GBL_DATA_SIZE      128             /* Global data size rsvd*/

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 256*1024) /* 256k heap */
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 256*1024) /* 256k heap */

 
 #define CFG_MONITOR_BASE       TEXT_BASE
 #define CFG_MALLOC_BASE                (CFG_MONITOR_BASE - CFG_MALLOC_LEN)
 
 #define CFG_MONITOR_BASE       TEXT_BASE
 #define CFG_MALLOC_BASE                (CFG_MONITOR_BASE - CFG_MALLOC_LEN)


@@ -85,9 +85,9 @@
  * (which is common practice).
  *----------------------------------------------------------------------*/
 #define CONFIG_ENV_IS_IN_FLASH 1               /* Environment in flash */
  * (which is common practice).
  *----------------------------------------------------------------------*/
 #define CONFIG_ENV_IS_IN_FLASH 1               /* Environment in flash */

-#define CFG_ENV_SIZE           (64 * 1024)     /* 64 KByte (1 sector)  */
+#define CONFIG_ENV_SIZE                (64 * 1024)     /* 64 KByte (1 sector)  */

 #define CONFIG_ENV_OVERWRITE                   /* Serial change Ok     */
 #define CONFIG_ENV_OVERWRITE                   /* Serial change Ok     */

-#define CFG_ENV_ADDR   (CFG_FLASH_BASE + CFG_MONITOR_LEN)
+#define CONFIG_ENV_ADDR        (CFG_FLASH_BASE + CFG_MONITOR_LEN)

 
 /*------------------------------------------------------------------------
  * CONSOLE
 
 /*------------------------------------------------------------------------
  * CONSOLE

diff --git a/include/configs/EP88x.h b/include/configs/EP88x.h
index 81d5e55461d5f52e431609c505278a24a5941fad..106cc6fba525bd3b8785e2b5cab71124405a6b94 100644 (file)
--- a/include/configs/EP88x.h
+++ b/include/configs/EP88x.h
@@ -144,8 +144,8 @@
 
 /* Environment is in flash */
 #define CONFIG_ENV_IS_IN_FLASH
 
 /* Environment 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)
+#define CONFIG_ENV_SECT_SIZE   0x20000         /* We use one complete sector   */
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + CFG_MONITOR_LEN)

 
 #define CFG_OR0_PRELIM         0xFC000160
 #define CFG_BR0_PRELIM         (CFG_FLASH_BASE | BR_PS_32 | BR_MS_GPCM | BR_V)
 
 #define CFG_OR0_PRELIM         0xFC000160
 #define CFG_BR0_PRELIM         (CFG_FLASH_BASE | BR_PS_32 | BR_MS_GPCM | BR_V)

diff --git a/include/configs/ERIC.h b/include/configs/ERIC.h
index b7ec0d01058a33c660d69a062805df4249a20145..c3c7aa4f96ef9a4240c26203a621bb575f6f95b6 100644 (file)
--- a/include/configs/ERIC.h
+++ b/include/configs/ERIC.h
@@ -49,8 +49,8 @@
 #endif
 #if 0
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use I2C RTC X1240 for environment vars */
 #endif
 #if 0
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use I2C RTC X1240 for environment vars */

-#define CFG_ENV_OFFSET         0x000   /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE           0x800   /* 2048 bytes may be used for env vars */
+#define CONFIG_ENV_OFFSET              0x000   /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE                0x800   /* 2048 bytes may be used for env vars */

 #endif                                 /* total size of a X1240 is 2048 bytes */
 
 #define CONFIG_HARD_I2C                1       /* I2C with hardware support */
 #endif                                 /* total size of a X1240 is 2048 bytes */
 
 #define CONFIG_HARD_I2C                1       /* I2C with hardware support */


@@ -299,15 +299,15 @@
 
 /* BEG ENVIRONNEMENT FLASH */
 #ifdef CONFIG_ENV_IS_IN_FLASH
 
 /* BEG ENVIRONNEMENT FLASH */
 #ifdef CONFIG_ENV_IS_IN_FLASH

-#define CFG_ENV_SECT_SIZE       (128*1024)
+#define CONFIG_ENV_SECT_SIZE       (128*1024)

 
 #if 0  /* force ENV to be NOT embedded */
 
 #if 0  /* force ENV to be NOT embedded */

-#define CFG_ENV_ADDR            0xfffa0000
+#define CONFIG_ENV_ADDR            0xfffa0000

 #else  /* force ENV to be embedded */
 #else  /* force ENV to be embedded */

-#define        CFG_ENV_SIZE            (2 * 1024) /* Total Size of Environment Sector 2k */
-#define CFG_ENV_ADDR            (CFG_MONITOR_BASE + CFG_MONITOR_LEN - CFG_ENV_SIZE - 0x10) /* let space for reset vector */
-/* #define CFG_ENV_ADDR            (CFG_MONITOR_BASE)*/
-#define CFG_ENV_OFFSET          (CFG_ENV_ADDR - CFG_FLASH_BASE)
+#define        CONFIG_ENV_SIZE         (2 * 1024) /* Total Size of Environment Sector 2k */
+#define CONFIG_ENV_ADDR            (CFG_MONITOR_BASE + CFG_MONITOR_LEN - CONFIG_ENV_SIZE - 0x10) /* let space for reset vector */
+/* #define CONFIG_ENV_ADDR            (CFG_MONITOR_BASE)*/
+#define CONFIG_ENV_OFFSET          (CONFIG_ENV_ADDR - CFG_FLASH_BASE)

 #endif
 
 #endif
 #endif
 
 #endif


@@ -319,9 +319,9 @@
 #define CFG_NVRAM_SIZE         0x7F8           /* NVRAM size 2kByte - 8 Byte for RTC */
 
 #ifdef CONFIG_ENV_IS_IN_NVRAM
 #define CFG_NVRAM_SIZE         0x7F8           /* NVRAM size 2kByte - 8 Byte for RTC */
 
 #ifdef CONFIG_ENV_IS_IN_NVRAM

-#define CFG_ENV_SIZE           0x7F8           /* Size of Environment vars     */
-#define CFG_ENV_ADDR           \
-       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)       /* Env  */
+#define CONFIG_ENV_SIZE                0x7F8           /* Size of Environment vars     */
+#define CONFIG_ENV_ADDR                \
+       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CONFIG_ENV_SIZE)    /* Env  */

 #endif
 
 /*
 #endif
 
 /*

diff --git a/include/configs/ESTEEM192E.h b/include/configs/ESTEEM192E.h
index 24f0f4c1fbeff69899ef1c67fe506be2b32be91b..02539e2630894a1b055ba78104567959297a8d6b 100644 (file)
--- a/include/configs/ESTEEM192E.h
+++ b/include/configs/ESTEEM192E.h
@@ -155,8 +155,8 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #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     */
+#define        CONFIG_ENV_OFFSET               0x8000  /*   Offset   of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x2000  /* Total Size of Environment Sector     */

 /*-----------------------------------------------------------------------
  * Cache Configuration
  */
 /*-----------------------------------------------------------------------
  * Cache Configuration
  */

diff --git a/include/configs/ETX094.h b/include/configs/ETX094.h
index 940e53d23a395eb7b7695eaca8281a891cbba997..adf79c7376149597f86b886162086890c310bb97 100644 (file)
--- a/include/configs/ETX094.h
+++ b/include/configs/ETX094.h
@@ -173,11 +173,11 @@
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #ifdef CONFIG_FLASH_16BIT
 
 #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     */
+#define CONFIG_ENV_OFFSET              0x8000  /* Offset   of Environment Sector       */
+#define        CONFIG_ENV_SIZE         0x8000  /* Total Size of Environment Sector     */

 #else
 #else

-#define CFG_ENV_OFFSET         0x8000  /* Offset   of Environment Sector       */
-#define        CFG_ENV_SIZE            0x4000  /* Total Size of Environment Sector     */
+#define CONFIG_ENV_OFFSET              0x8000  /* Offset   of Environment Sector       */
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */

 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/EVB64260.h b/include/configs/EVB64260.h
index 2a78fd648b909734544bf5cf15e659f8d8104f47..f98831e7d8d1aa6e17b59bbbde0216bc7c0cebf7 100644 (file)
--- a/include/configs/EVB64260.h
+++ b/include/configs/EVB64260.h
@@ -392,9 +392,9 @@
 #define CFG_FLASH_CFI          1
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_CFI          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)
+#define        CONFIG_ENV_SIZE         0x1000  /* Total Size of Environment Sector */
+#define CONFIG_ENV_SECT_SIZE   0x10000
+#define CONFIG_ENV_ADDR    (CFG_FLASH_BASE+CFG_MONITOR_LEN-CONFIG_ENV_SECT_SIZE)

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/EXBITGEN.h b/include/configs/EXBITGEN.h
index fed8d4247f96e4b45cba8496fbe83a6a8467da3e..5ba1706b226c364416877a90b3eac954672addd4 100644 (file)
--- a/include/configs/EXBITGEN.h
+++ b/include/configs/EXBITGEN.h
@@ -57,8 +57,8 @@
 #define CFG_I2C_EEPROM_ADDR_OVERFLOW   1       /* ... and 1 bit in I2C address */
 #define CFG_EEPROM_PAGE_WRITE_BITS     3       /* 4 bytes per page */
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 40      /* write takes up to 40 msec */
 #define CFG_I2C_EEPROM_ADDR_OVERFLOW   1       /* ... and 1 bit in I2C address */
 #define CFG_EEPROM_PAGE_WRITE_BITS     3       /* 4 bytes per page */
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 40      /* write takes up to 40 msec */

-#define CFG_ENV_OFFSET         4       /* Offset of Environment Sector */
-#define        CFG_ENV_SIZE            350     /* that is 350 bytes only!      */
+#define CONFIG_ENV_OFFSET              4       /* Offset of Environment Sector */
+#define        CONFIG_ENV_SIZE         350     /* that is 350 bytes only!      */

 #endif
 
 #define CONFIG_BOOTDELAY       10      /* autoboot after 10 seconds    */
 #endif
 
 #define CONFIG_BOOTDELAY       10      /* autoboot after 10 seconds    */


@@ -189,9 +189,9 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #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 */
+#define CONFIG_ENV_OFFSET              0x00060000 /* Offset of Environment Sector      */
+#define        CONFIG_ENV_SIZE         0x00010000 /* Total Size of Environment Sector  */
+#define CONFIG_ENV_SECT_SIZE   0x00010000 /* see README - env sector total size */

 #endif
 
 /* On Chip Memory location/size */
 #endif
 
 /* On Chip Memory location/size */

diff --git a/include/configs/FADS823.h b/include/configs/FADS823.h
index c6c7b533be732f8b91a4a77e43901177b544f6a7..abf51ef0145d3f3e6cfc43656219df0fe62da7b2 100644 (file)
--- a/include/configs/FADS823.h
+++ b/include/configs/FADS823.h
@@ -204,8 +204,8 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #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 CONFIG_ENV_OFFSET              0x00040000      /* Offset of Environment Sector */
+#define        CONFIG_ENV_SIZE         0x40000 /* Total Size of Environment Sector     */

 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 /*-----------------------------------------------------------------------
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/FADS850SAR.h b/include/configs/FADS850SAR.h
index 82a875719e64eabe623dc8909a9c9fa8d55a4f88..d6178689a6abdc71f81addd7e07fabbe9982eafb 100644 (file)
--- a/include/configs/FADS850SAR.h
+++ b/include/configs/FADS850SAR.h
@@ -154,8 +154,8 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #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 CONFIG_ENV_OFFSET              0x00040000      /* Offset of Environment Sector */
+#define        CONFIG_ENV_SIZE         0x40000 /* Total Size of Environment Sector     */

 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 /*-----------------------------------------------------------------------
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/FLAGADM.h b/include/configs/FLAGADM.h
index e7fcf751981514badd6e42d6c5a3a9dc2acead12..52b5ab467999443f279127bf8c7b6b7905d01526 100644 (file)
--- a/include/configs/FLAGADM.h
+++ b/include/configs/FLAGADM.h
@@ -163,8 +163,8 @@
  * assigne a whole sector for the environment, so that we can safely
  * erase and write it without disturbing the boot sector
  */
  * assigne a whole sector for the environment, so that we can safely
  * erase and write it without disturbing the boot sector
  */

-#define CFG_ENV_OFFSET         0x20000 /*   Offset   of Environment Sector     */
-#define CFG_ENV_SIZE           0x20000 /* Total Size of Environment Sector     */
+#define CONFIG_ENV_OFFSET              0x20000 /*   Offset   of Environment Sector     */
+#define CONFIG_ENV_SIZE                0x20000 /* Total Size of Environment Sector     */

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/FPS850L.h b/include/configs/FPS850L.h
index 2b819c52f1223da8ce80ff36e6ad9405cae7a8e5..dd8051d6377cf90a076c040f27d9437a349a0616 100644 (file)
--- a/include/configs/FPS850L.h
+++ b/include/configs/FPS850L.h
@@ -202,12 +202,12 @@
 #define CFG_MAX_FLASH_SECT     71      /* max number of sectors on one chip */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_MAX_FLASH_SECT     71      /* max number of sectors on one chip */
 
 #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     */
+#define        CONFIG_ENV_OFFSET               0x8000  /*   Offset   of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* Address and size of Redundant Environment Sector    */

-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET+CFG_ENV_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 

diff --git a/include/configs/FPS860L.h b/include/configs/FPS860L.h
index b3380dbbcbc5a32e06760383eefff067f33782ed..1af28b39f54ce3f8b6a75690dc8e0b07fda964af 100644 (file)
--- a/include/configs/FPS860L.h
+++ b/include/configs/FPS860L.h
@@ -202,12 +202,12 @@
 #define CFG_MAX_FLASH_SECT     71      /* max number of sectors on one chip */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_MAX_FLASH_SECT     71      /* max number of sectors on one chip */
 
 #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     */
+#define        CONFIG_ENV_OFFSET               0x8000  /*   Offset   of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* Address and size of Redundant Environment Sector    */

-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET+CFG_ENV_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 

diff --git a/include/configs/G2000.h b/include/configs/G2000.h
index 43926a280c9ada989275f04799a8aeeeed6d6f3c..81a12f159d64a78f4284976b0dbe813ecc44321d 100644 (file)
--- a/include/configs/G2000.h
+++ b/include/configs/G2000.h
@@ -300,15 +300,15 @@
  */
 #if 1 /* test-only */
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
  */
 #if 1 /* test-only */
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */

-#define CFG_ENV_OFFSET         0x100   /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE           0x700   /* 2048 bytes may be used for env vars*/
+#define CONFIG_ENV_OFFSET              0x100   /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE                0x700   /* 2048 bytes may be used for env vars*/

                                   /* total size of a CAT24WC16 is 2048 bytes */
 
 #else  /* DEFAULT: environment in flash, using redundand flash sectors */
 
 #define CONFIG_ENV_IS_IN_FLASH 1       /* use FLASH for environment vars */
                                   /* total size of a CAT24WC16 is 2048 bytes */
 
 #else  /* DEFAULT: environment in flash, using redundand flash sectors */
 
 #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*/
+#define CONFIG_ENV_ADDR                0xFFFA0000 /* environment starts before u-boot */
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* 128k bytes may be used for env vars*/

 
 #endif
 
 
 #endif
 

diff --git a/include/configs/GEN860T.h b/include/configs/GEN860T.h
index 6a5a316dd22306547a77c531ee106eb374255115..1627344458e4dbf6d15d4c6e096a5221230a7bf0 100644 (file)
--- a/include/configs/GEN860T.h
+++ b/include/configs/GEN860T.h
@@ -166,7 +166,7 @@
 #define CFG_EEPROM_PAGE_WRITE_BITS             6               /* 64 byte pages                */
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 12              /* 10 mS w/ 20% margin  */
 #define        CFG_I2C_EEPROM_ADDR_LEN                 2               /* need 16 bit address  */
 #define CFG_EEPROM_PAGE_WRITE_BITS             6               /* 64 byte pages                */
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 12              /* 10 mS w/ 20% margin  */
 #define        CFG_I2C_EEPROM_ADDR_LEN                 2               /* need 16 bit address  */

-#define CFG_ENV_EEPROM_SIZE                            (32 * 1024)
+#define CONFIG_ENV_EEPROM_SIZE                         (32 * 1024)

 
 /*
  * Enable I2C and select the hardware/software driver
 
 /*
  * Enable I2C and select the hardware/software driver


@@ -438,17 +438,17 @@
 #define CONFIG_ENV_IS_IN_EEPROM
 
 #if defined(CONFIG_ENV_IS_IN_EEPROM)
 #define CONFIG_ENV_IS_IN_EEPROM
 
 #if defined(CONFIG_ENV_IS_IN_EEPROM)

-#define CFG_ENV_SIZE                   (2 * 1024)
-#define CFG_ENV_OFFSET                 (CFG_ENV_EEPROM_SIZE - (8 * 1024))
+#define CONFIG_ENV_SIZE                        (2 * 1024)
+#define CONFIG_ENV_OFFSET                      (CONFIG_ENV_EEPROM_SIZE - (8 * 1024))

 #else
 #else

-#define CFG_ENV_SIZE                   0x1000
-#define CFG_ENV_SECT_SIZE              CFG_FLASH_SECT_SIZE
+#define CONFIG_ENV_SIZE                        0x1000
+#define CONFIG_ENV_SECT_SIZE           CFG_FLASH_SECT_SIZE

 
 /*
  * This ultimately gets passed right into the linker script, so we have to
  * use a number :(
  */
 
 /*
  * This ultimately gets passed right into the linker script, so we have to
  * use a number :(
  */

-#define CFG_ENV_OFFSET                 0x060000
+#define CONFIG_ENV_OFFSET                      0x060000

 #endif
 
 /*
 #endif
 
 /*

diff --git a/include/configs/GENIETV.h b/include/configs/GENIETV.h
index 3cf7fb1d1a372a12ef7c27e008dda13f58230ba1..b6cc17b52dd6192c00d4152ee88e923f7bbc2b5d 100644 (file)
--- a/include/configs/GENIETV.h
+++ b/include/configs/GENIETV.h
@@ -197,8 +197,8 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #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)*/
+#define CONFIG_ENV_OFFSET              0x10000 /* Offset of Environment Sector         */
+#define        CONFIG_ENV_SIZE         0x10000 /* Total Size of Environment Sector (64k)*/

 
 /* values according to the manual */
 
 
 /* values according to the manual */
 

diff --git a/include/configs/GTH.h b/include/configs/GTH.h
index d5816ae2f6bc3f55184e9d4a223a35823322c4ae..18bbbc3f29225670d99f6b06d8cdb146588632e8 100644 (file)
--- a/include/configs/GTH.h
+++ b/include/configs/GTH.h
@@ -196,10 +196,10 @@
 
 #define        CONFIG_ENV_IS_IN_FLASH 1
 #undef CONFIG_ENV_IS_IN_EEPROM
 
 #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     */
+#define CONFIG_ENV_OFFSET              0x000E0000
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */

 
 

-#define CFG_ENV_SECT_SIZE      0x50000 /* see README - env sector total size   */
+#define CONFIG_ENV_SECT_SIZE   0x50000 /* see README - env sector total size   */

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/HH405.h b/include/configs/HH405.h
index cf5fcf12cba062d0a24802c512a349070f2fe583..7ff03b17a70f082f30f7d63be3af058354891997 100644 (file)
--- a/include/configs/HH405.h
+++ b/include/configs/HH405.h
@@ -321,8 +321,8 @@
  * Environment Variable setup
  */
 #define CONFIG_ENV_IS_IN_EEPROM    1       /* use EEPROM for environment vars */
  * Environment Variable setup
  */
 #define CONFIG_ENV_IS_IN_EEPROM    1       /* use EEPROM for environment vars */

-#define CFG_ENV_OFFSET          0x100   /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE            0x700   /* 2048 bytes may be used for env vars*/
+#define CONFIG_ENV_OFFSET          0x100   /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE            0x700   /* 2048 bytes may be used for env vars*/

                                   /* total size of a CAT24WC16 is 2048 bytes */
 
 #define CFG_NVRAM_BASE_ADDR    0xF4080000              /* NVRAM base address   */
                                   /* total size of a CAT24WC16 is 2048 bytes */
 
 #define CFG_NVRAM_BASE_ADDR    0xF4080000              /* NVRAM base address   */

diff --git a/include/configs/HIDDEN_DRAGON.h b/include/configs/HIDDEN_DRAGON.h
index 5168be0dc04a15f7098cb02edc5fbffd8c616bf8..c8c040930d8efdf97c907b56ba45416d5f0fa59a 100644 (file)
--- a/include/configs/HIDDEN_DRAGON.h
+++ b/include/configs/HIDDEN_DRAGON.h
@@ -146,8 +146,8 @@
 #define CFG_FLASH_BASE         0xFFE00000
 #define CFG_FLASH_SIZE         (2 * 1024 * 1024)       /* Unity has onboard 1MByte flash */
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_FLASH_BASE         0xFFE00000
 #define CFG_FLASH_SIZE         (2 * 1024 * 1024)       /* Unity has onboard 1MByte flash */
 #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 */
+#define CONFIG_ENV_OFFSET              0x00004000      /* Offset of Environment Sector */
+#define CONFIG_ENV_SIZE                0x00002000      /* Total Size of Environment Sector */

 
 #define CFG_MALLOC_LEN         (512 << 10)     /* Reserve 512 kB for malloc()  */
 
 
 #define CFG_MALLOC_LEN         (512 << 10)     /* Reserve 512 kB for malloc()  */
 

diff --git a/include/configs/HMI10.h b/include/configs/HMI10.h
index 406c352644be29cb3a20f8a9a48ea23fe90b90d9..807781c1c23ae5712edfae8282ca86aa030d351d 100644 (file)
--- a/include/configs/HMI10.h
+++ b/include/configs/HMI10.h
@@ -235,12 +235,12 @@
 #define CFG_MAX_FLASH_SECT     71      /* max number of sectors on one chip */
 
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_MAX_FLASH_SECT     71      /* max number of sectors on one chip */
 
 #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     */
+#define CONFIG_ENV_OFFSET              0x8000  /*   Offset   of Environment Sector     */
+#define CONFIG_ENV_SIZE                0x4000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* Address and size of Redundant Environment Sector    */

-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET+CFG_ENV_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 /*-----------------------------------------------------------------------
  * Hardware Information Block
 
 /*-----------------------------------------------------------------------
  * Hardware Information Block

diff --git a/include/configs/HUB405.h b/include/configs/HUB405.h
index 8992706951938f244f8b462cb068593440b6b8b4..0727606bbb87bc776dec10717363950537b1694e 100644 (file)
--- a/include/configs/HUB405.h
+++ b/include/configs/HUB405.h
@@ -233,8 +233,8 @@
  * Environment Variable setup
  */
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
  * Environment Variable setup
  */
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */

-#define CFG_ENV_OFFSET         0x100   /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE           0x700   /* 2048 bytes may be used for env vars*/
+#define CONFIG_ENV_OFFSET              0x100   /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE                0x700   /* 2048 bytes may be used for env vars*/

                                   /* total size of a CAT24WC16 is 2048 bytes */
 
 #define CFG_NVRAM_BASE_ADDR    0xF0000500              /* NVRAM base address   */
                                   /* total size of a CAT24WC16 is 2048 bytes */
 
 #define CFG_NVRAM_BASE_ADDR    0xF0000500              /* NVRAM base address   */

diff --git a/include/configs/IAD210.h b/include/configs/IAD210.h
index c80165ba59fc293e9ede586d437994e5b7e676bc..a4944f160b3704ff3fd2335583357f761fdeebb2 100644 (file)
--- a/include/configs/IAD210.h
+++ b/include/configs/IAD210.h
@@ -221,8 +221,8 @@
 #define CFG_FLASH_WRITE_TOUT   500             /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   500             /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1

-#define CFG_ENV_OFFSET         0x8000
-#define        CFG_ENV_SIZE            0x4000  /* Total Size of Environment Sector     */
+#define CONFIG_ENV_OFFSET              0x8000
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/ICU862.h b/include/configs/ICU862.h
index caf7210a64ead093a1ea755fe12b98a0e79990cf..0ff7fa9e6b5d04527c2ed86bcf951b2b29f8c037 100644 (file)
--- a/include/configs/ICU862.h
+++ b/include/configs/ICU862.h
@@ -230,10 +230,10 @@
 
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 
 
 #define        CONFIG_ENV_IS_IN_FLASH  1

-#define CFG_ENV_OFFSET         0x00F40000
+#define CONFIG_ENV_OFFSET              0x00F40000

 
 

-#define CFG_ENV_SECT_SIZE      0x40000 /* Total Size of Environment sector     */
-#define        CFG_ENV_SIZE            0x4000  /* Used Size of Environment Sector      */
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* Total Size of Environment sector     */
+#define        CONFIG_ENV_SIZE         0x4000  /* Used Size of Environment Sector      */

 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 /*-----------------------------------------------------------------------
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/IDS8247.h b/include/configs/IDS8247.h
index 459654e546e6c0cb178dad8a45ef20d57ed68d8a..4d0397c457902a0570fe2b5eb180e549833bc421 100644 (file)
--- a/include/configs/IDS8247.h
+++ b/include/configs/IDS8247.h
@@ -252,9 +252,9 @@
 
 /* Environment in flash */
 #define CONFIG_ENV_IS_IN_FLASH 1
 
 /* Environment in flash */
 #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
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE+0x60000)
+#define CONFIG_ENV_SIZE                0x20000
+#define CONFIG_ENV_SECT_SIZE   0x20000

 
 /*-----------------------------------------------------------------------
  * NAND-FLASH stuff
 
 /*-----------------------------------------------------------------------
  * NAND-FLASH stuff

diff --git a/include/configs/IP860.h b/include/configs/IP860.h
index fa3c29ec9a7d0af67dfdf4be89c0743b2b96d346..c0bf3673028df2736d4d43d2829933bd4c90b12a 100644 (file)
--- a/include/configs/IP860.h
+++ b/include/configs/IP860.h
@@ -193,13 +193,13 @@
 #define        CONFIG_ENV_IS_IN_EEPROM
 
 #ifdef CONFIG_ENV_IS_IN_NVRAM
 #define        CONFIG_ENV_IS_IN_EEPROM
 
 #ifdef CONFIG_ENV_IS_IN_NVRAM

-#define CFG_ENV_ADDR           0x20000000      /* use SRAM     */
-#define CFG_ENV_SIZE           (16<<10)        /* use 16 kB    */
+#define CONFIG_ENV_ADDR                0x20000000      /* use SRAM     */
+#define CONFIG_ENV_SIZE                (16<<10)        /* use 16 kB    */

 #endif /* CONFIG_ENV_IS_IN_NVRAM */
 
 #ifdef CONFIG_ENV_IS_IN_EEPROM
 #endif /* CONFIG_ENV_IS_IN_NVRAM */
 
 #ifdef CONFIG_ENV_IS_IN_EEPROM

-#define CFG_ENV_OFFSET          512    /* Leave 512 bytes free for other data  */
-#define CFG_ENV_SIZE           1536    /* Use remaining space                  */
+#define CONFIG_ENV_OFFSET               512    /* Leave 512 bytes free for other data  */
+#define CONFIG_ENV_SIZE                1536    /* Use remaining space                  */

 #endif /* CONFIG_ENV_IS_IN_EEPROM */
 
 /*-----------------------------------------------------------------------
 #endif /* CONFIG_ENV_IS_IN_EEPROM */
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/IPHASE4539.h b/include/configs/IPHASE4539.h
index cea853204733026c7483b17c73701af599178077..31fbf329222e7fc2010541e07cdd822e0118e37a 100644 (file)
--- a/include/configs/IPHASE4539.h
+++ b/include/configs/IPHASE4539.h
@@ -209,8 +209,8 @@
 
 /* Environment in FLASH, there is little space left in Serial EEPROM */
 #define CONFIG_ENV_IS_IN_FLASH 1
 
 /* Environment in FLASH, there is little space left in Serial EEPROM */
 #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 */
+#define CONFIG_ENV_SECT_SIZE   0x10000 /* We use one complete sector   */
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x10000) /* 2. sector */

 
 
 /*-----------------------------------------------------------------------
 
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/ISPAN.h b/include/configs/ISPAN.h
index 6de40da4ed7dae825d960f3a675a0ae411ffaf09..8b6f3ce0523f0a3cd9ece088c0f5203324fc3d6d 100644 (file)
--- a/include/configs/ISPAN.h
+++ b/include/configs/ISPAN.h
@@ -186,11 +186,11 @@
 
 /* Environment is in flash, there is little space left in Serial EEPROM */
 #define CONFIG_ENV_IS_IN_FLASH
 
 /* Environment is in flash, there is little space left in Serial EEPROM */
 #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)
-#define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_SECT_SIZE   0x10000         /* We use one complete sector   */
+#define CONFIG_ENV_SIZE                (CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 /*-----------------------------------------------------------------------
  * Hard Reset Configuration Words
 
 /*-----------------------------------------------------------------------
  * Hard Reset Configuration Words

diff --git a/include/configs/IVML24.h b/include/configs/IVML24.h
index ee302d9a61fc5384042045fff65369f6d8c04851..6a422c8e2fd6b4183bbdf0a3fa9dd5f6b56e896e 100644 (file)
--- a/include/configs/IVML24.h
+++ b/include/configs/IVML24.h
@@ -185,8 +185,8 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #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     */
+#define        CONFIG_ENV_OFFSET               0x7A000 /*   Offset   of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x2000  /* Total Size of Environment Sector     */

 /*-----------------------------------------------------------------------
  * Cache Configuration
  */
 /*-----------------------------------------------------------------------
  * Cache Configuration
  */

diff --git a/include/configs/IVMS8.h b/include/configs/IVMS8.h
index 1bdd0318e6aed2297ac7e633cc2f1c56cc1f219d..54477eec27b524d8ec69afde7065a89c4fa82640 100644 (file)
--- a/include/configs/IVMS8.h
+++ b/include/configs/IVMS8.h
@@ -181,8 +181,8 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #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     */
+#define        CONFIG_ENV_OFFSET               0x7A000 /*   Offset   of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x2000  /* Total Size of Environment Sector     */

 /*-----------------------------------------------------------------------
  * Cache Configuration
  */
 /*-----------------------------------------------------------------------
  * Cache Configuration
  */

diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h
index 804fc3f69cebc93767fb3450512478187ff08089..a705ac1a8cf799d7de03567181e1402f556c2999 100644 (file)
--- a/include/configs/IceCube.h
+++ b/include/configs/IceCube.h
@@ -213,26 +213,26 @@
 #define CFG_FLASH_BASE         0xFE000000
 #define CFG_FLASH_SIZE         0x01000000
 #if !defined(CFG_LOWBOOT)
 #define CFG_FLASH_BASE         0xFE000000
 #define CFG_FLASH_SIZE         0x01000000
 #if !defined(CFG_LOWBOOT)

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x01760000 + 0x00800000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x01760000 + 0x00800000)

 #else  /* CFG_LOWBOOT */
 #if defined(CFG_LOWBOOT08)
 # error CFG_LOWBOOT08 is incompatible with the Lite5200B
 #endif
 #if defined(CFG_LOWBOOT16)
 #else  /* CFG_LOWBOOT */
 #if defined(CFG_LOWBOOT08)
 # error CFG_LOWBOOT08 is incompatible with the Lite5200B
 #endif
 #if defined(CFG_LOWBOOT16)

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x01060000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x01060000)

 #endif
 #endif /* CFG_LOWBOOT */
 #else /* !CONFIG_LITE5200B (IceCube)*/
 #define CFG_FLASH_BASE         0xFF000000
 #define CFG_FLASH_SIZE         0x01000000
 #if !defined(CFG_LOWBOOT)
 #endif
 #endif /* CFG_LOWBOOT */
 #else /* !CONFIG_LITE5200B (IceCube)*/
 #define CFG_FLASH_BASE         0xFF000000
 #define CFG_FLASH_SIZE         0x01000000
 #if !defined(CFG_LOWBOOT)

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x00740000 + 0x00800000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x00740000 + 0x00800000)

 #else  /* CFG_LOWBOOT */
 #if defined(CFG_LOWBOOT08)
 #else  /* CFG_LOWBOOT */
 #if defined(CFG_LOWBOOT08)

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x00040000 + 0x00800000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x00040000 + 0x00800000)

 #endif
 #if defined(CFG_LOWBOOT16)
 #endif
 #if defined(CFG_LOWBOOT16)

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x00040000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x00040000)

 #endif
 #endif /* CFG_LOWBOOT */
 #endif /* CONFIG_LITE5200B */
 #endif
 #endif /* CFG_LOWBOOT */
 #endif /* CONFIG_LITE5200B */


@@ -256,11 +256,11 @@
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_FLASH 1

-#define CFG_ENV_SIZE           0x10000
+#define CONFIG_ENV_SIZE                0x10000

 #if defined(CONFIG_LITE5200B)
 #if defined(CONFIG_LITE5200B)

-#define CFG_ENV_SECT_SIZE      0x20000
+#define CONFIG_ENV_SECT_SIZE   0x20000

 #else
 #else

-#define CFG_ENV_SECT_SIZE      0x10000
+#define CONFIG_ENV_SECT_SIZE   0x10000

 #endif
 #define CONFIG_ENV_OVERWRITE   1
 
 #endif
 #define CONFIG_ENV_OVERWRITE   1
 

diff --git a/include/configs/JSE.h b/include/configs/JSE.h
index 4bcd17a6ee91d25052536d1fcf6afc3343d0aab7..b457272be3588db50342a910e43a8192215784b1 100644 (file)
--- a/include/configs/JSE.h
+++ b/include/configs/JSE.h
@@ -92,8 +92,8 @@
 #define CFG_EEPROM_PAGE_WRITE_BITS 4
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
   /* Put the environment in the second half. */
 #define CFG_EEPROM_PAGE_WRITE_BITS 4
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
   /* Put the environment in the second half. */

-#define CFG_ENV_OFFSET 0x00
-#define CFG_ENV_SIZE   512
+#define CONFIG_ENV_OFFSET      0x00
+#define CONFIG_ENV_SIZE        512

 
 
   /* The JSE connects UART1 to the console tap connector. */
 
 
   /* The JSE connects UART1 to the console tap connector. */

diff --git a/include/configs/KAREF.h b/include/configs/KAREF.h
index 897d8a0592796944fd1b15373af993b5fe96c0d0..eeb39241d7ee84371acc053645028a0ebeebd9ca 100644 (file)
--- a/include/configs/KAREF.h
+++ b/include/configs/KAREF.h
@@ -146,8 +146,8 @@
 #undef CONFIG_ENV_IS_IN_EEPROM              /* ... not in EEPROM       */
 #define CONFIG_ENV_OVERWRITE  1                     /* allow env overwrite     */
 
 #undef CONFIG_ENV_IS_IN_EEPROM              /* ... not in EEPROM       */
 #define CONFIG_ENV_OVERWRITE  1                     /* allow env overwrite     */
 

-#define CFG_ENV_SIZE         0x1000         /* Size of Env vars        */
-#define CFG_ENV_ADDR         (CFG_NVRAM_BASE_ADDR)
+#define CONFIG_ENV_SIZE              0x1000         /* Size of Env vars        */
+#define CONFIG_ENV_ADDR              (CFG_NVRAM_BASE_ADDR)

 
 #define CONFIG_BOOTDELAY      5                    /* 5 second autoboot */
 
 
 #define CONFIG_BOOTDELAY      5                    /* 5 second autoboot */
 

diff --git a/include/configs/KUP4K.h b/include/configs/KUP4K.h
index e40e53bb2fa3d32cd4d7e84e90cc71e5b2e761e5..6f99c1b318e71e0591a7fe02d94d01d366fec067 100644 (file)
--- a/include/configs/KUP4K.h
+++ b/include/configs/KUP4K.h
@@ -255,14 +255,14 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #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
+#define CONFIG_ENV_OFFSET              0x40000 /*   Offset   of Environment Sector     */
+#define CONFIG_ENV_SIZE                0x1000  /* Total Size of Environment Sector     */
+#define CONFIG_ENV_SECT_SIZE   0x10000

 
 /* Address and size of Redundant Environment Sector    */
 #if 0
 
 /* Address and size of Redundant Environment Sector    */
 #if 0

-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET+CFG_ENV_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 #endif
 /*-----------------------------------------------------------------------
  * Hardware Information Block
 #endif
 /*-----------------------------------------------------------------------
  * Hardware Information Block

diff --git a/include/configs/KUP4X.h b/include/configs/KUP4X.h
index 29c3e2d7bac30b5b38c8d43704626aed6d3ca6da..a71be0f261baed12b3b161cb7075486ac48183fe 100644 (file)
--- a/include/configs/KUP4X.h
+++ b/include/configs/KUP4X.h
@@ -267,14 +267,14 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #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
+#define CONFIG_ENV_OFFSET              0x40000 /*   Offset   of Environment Sector     */
+#define CONFIG_ENV_SIZE                0x1000  /* Total Size of Environment Sector     */
+#define CONFIG_ENV_SECT_SIZE   0x10000

 
 /* Address and size of Redundant Environment Sector    */
 #if 0
 
 /* Address and size of Redundant Environment Sector    */
 #if 0

-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET+CFG_ENV_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 #endif
 /*-----------------------------------------------------------------------
  * Hardware Information Block
 #endif
 /*-----------------------------------------------------------------------
  * Hardware Information Block

diff --git a/include/configs/LANTEC.h b/include/configs/LANTEC.h
index dc6084877c1a4aee0bfe2369e48590996fc8a632..8b7b1e1b929e05179055a62216caf15a5d8f1aca 100644 (file)
--- a/include/configs/LANTEC.h
+++ b/include/configs/LANTEC.h
@@ -186,8 +186,8 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #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     */
+#define        CONFIG_ENV_OFFSET               0x8000  /*   Offset   of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h
index 10b37b5e01fa4ee2665e353dc534ac79c5842121..7f24c4e59f466cb81e0161b84813d880d19cafca 100644 (file)
--- a/include/configs/M52277EVB.h
+++ b/include/configs/M52277EVB.h
@@ -194,15 +194,15 @@
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CONFIG_ENV_OVERWRITE   1
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CONFIG_ENV_OVERWRITE   1

-#undef CFG_ENV_IS_EMBEDDED
+#undef CONFIG_ENV_IS_EMBEDDED

 
 /*-----------------------------------------------------------------------
  * FLASH organization
  */
 #define CFG_FLASH_BASE         CFG_CS0_BASE
 #define CFG_FLASH0_BASE                CFG_CS0_BASE
 
 /*-----------------------------------------------------------------------
  * FLASH organization
  */
 #define CFG_FLASH_BASE         CFG_CS0_BASE
 #define CFG_FLASH0_BASE                CFG_CS0_BASE

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x8000)
-#define CFG_ENV_SECT_SIZE      0x8000
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x8000)
+#define CONFIG_ENV_SECT_SIZE   0x8000

 
 #define CFG_FLASH_CFI
 #ifdef CFG_FLASH_CFI
 
 #define CFG_FLASH_CFI
 #ifdef CFG_FLASH_CFI

diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index 3f55594a3c4ab8fc4ecb6ebfcf58ba2c17fd7511..f352db123d2b689e3da5cd30419a4a13fc0de282 100644 (file)
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -221,15 +221,15 @@
  * Environment is embedded in u-boot in the second sector of the flash
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
  * Environment is embedded in u-boot in the second sector of the flash
  */
 #define CONFIG_ENV_IS_IN_FLASH 1

-#define CFG_ENV_IS_EMBEDDED    1
+#define CONFIG_ENV_IS_EMBEDDED 1

 #ifdef NORFLASH_PS32BIT
 #ifdef NORFLASH_PS32BIT

-#      define CFG_ENV_OFFSET           (0x8000)
-#      define CFG_ENV_SIZE             0x4000
-#      define CFG_ENV_SECT_SIZE        0x4000
+#      define CONFIG_ENV_OFFSET                (0x8000)
+#      define CONFIG_ENV_SIZE          0x4000
+#      define CONFIG_ENV_SECT_SIZE     0x4000

 #else
 #else

-#      define CFG_ENV_OFFSET           (0x4000)
-#      define CFG_ENV_SIZE             0x2000
-#      define CFG_ENV_SECT_SIZE        0x2000
+#      define CONFIG_ENV_OFFSET                (0x4000)
+#      define CONFIG_ENV_SIZE          0x2000
+#      define CONFIG_ENV_SECT_SIZE     0x2000

 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h
index c7544a8ebbc549b565441702fb150707d6abaa31..4525e2df2fd0b7ad372ab3664ba7eb69930eef0b 100644 (file)
--- a/include/configs/M5249EVB.h
+++ b/include/configs/M5249EVB.h
@@ -114,9 +114,9 @@
 #define CFG_INIT_SP_OFFSET     CFG_GBL_DATA_OFFSET
 
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_INIT_SP_OFFSET     CFG_GBL_DATA_OFFSET
 
 #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    */
+#define CONFIG_ENV_OFFSET              0x4000  /* Address of Environment Sector*/
+#define CONFIG_ENV_SIZE                0x2000  /* Total Size of Environment Sector     */
+#define CONFIG_ENV_SECT_SIZE   0x2000 /* see README - env sector total size    */

 
 /*-----------------------------------------------------------------------
  * Start addresses for the final memory configuration
 
 /*-----------------------------------------------------------------------
  * Start addresses for the final memory configuration

diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index 72dd05db6637b269694a8e07cbd30b6699fc920f..8d9bfa3dd09beb6b5f81e010f2dc99f9981e5a30 100644 (file)
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -43,12 +43,12 @@
  * Environment is embedded in u-boot in the second sector of the flash
  */
 #ifdef CONFIG_MONITOR_IS_IN_RAM
  * Environment is embedded in u-boot in the second sector of the flash
  */
 #ifdef CONFIG_MONITOR_IS_IN_RAM

-#      define CFG_ENV_OFFSET           0x4000
-#      define CFG_ENV_SECT_SIZE        0x1000
+#      define CONFIG_ENV_OFFSET                0x4000
+#      define CONFIG_ENV_SECT_SIZE     0x1000

 #      define CONFIG_ENV_IS_IN_FLASH   1
 #else
 #      define CONFIG_ENV_IS_IN_FLASH   1
 #else

-#      define CFG_ENV_ADDR             (CFG_FLASH_BASE + 0x4000)
-#      define CFG_ENV_SECT_SIZE        0x1000
+#      define CONFIG_ENV_ADDR          (CFG_FLASH_BASE + 0x4000)
+#      define CONFIG_ENV_SECT_SIZE     0x1000

 #      define CONFIG_ENV_IS_IN_FLASH   1
 #endif
 
 #      define CONFIG_ENV_IS_IN_FLASH   1
 #endif
 

diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h
index cbf50fe713568164bfc4d974361771d159ec285f..f58f89cfb211cf4eb138f8e744d27962007fc8e5 100644 (file)
--- a/include/configs/M5253EVBE.h
+++ b/include/configs/M5253EVBE.h
@@ -43,12 +43,12 @@
  * Environment is embedded in u-boot in the second sector of the flash
  */
 #ifndef CONFIG_MONITOR_IS_IN_RAM
  * Environment is embedded in u-boot in the second sector of the flash
  */
 #ifndef CONFIG_MONITOR_IS_IN_RAM

-#define CFG_ENV_OFFSET         0x4000
-#define CFG_ENV_SECT_SIZE      0x2000
+#define CONFIG_ENV_OFFSET              0x4000
+#define CONFIG_ENV_SECT_SIZE   0x2000

 #define CONFIG_ENV_IS_IN_FLASH 1
 #else
 #define CONFIG_ENV_IS_IN_FLASH 1
 #else

-#define CFG_ENV_ADDR           0xffe04000
-#define CFG_ENV_SECT_SIZE      0x2000
+#define CONFIG_ENV_ADDR                0xffe04000
+#define CONFIG_ENV_SECT_SIZE   0x2000

 #define CONFIG_ENV_IS_IN_FLASH 1
 #endif
 
 #define CONFIG_ENV_IS_IN_FLASH 1
 #endif
 

diff --git a/include/configs/M5271EVB.h b/include/configs/M5271EVB.h
index 482c262c81111f968531f2f06e3ce0dedf805359..844b74fb606774f5fb70327a6c0ffce7b59023b1 100644 (file)
--- a/include/configs/M5271EVB.h
+++ b/include/configs/M5271EVB.h
@@ -51,11 +51,11 @@
  * Environment is embedded in u-boot in the second sector of the flash
  */
 #ifndef CONFIG_MONITOR_IS_IN_RAM
  * Environment is embedded in u-boot in the second sector of the flash
  */
 #ifndef CONFIG_MONITOR_IS_IN_RAM

-#define CFG_ENV_OFFSET         0x4000
+#define CONFIG_ENV_OFFSET              0x4000

 #else
 #else

-#define CFG_ENV_ADDR           0xffe04000
+#define CONFIG_ENV_ADDR                0xffe04000

 #endif
 #endif

-#define CFG_ENV_SECT_SIZE      0x2000
+#define CONFIG_ENV_SECT_SIZE   0x2000

 #define CONFIG_ENV_IS_IN_FLASH 1
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 #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 22124c961f2718124dbea0e970c3dd0214074166..d2dcdd28a5c0a1d73b485c804044ef33557862c2 100644 (file)
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -52,13 +52,13 @@
  * Environment is embedded in u-boot in the second sector of the flash
  */
 #ifndef CONFIG_MONITOR_IS_IN_RAM
  * Environment is embedded in u-boot in the second sector of the flash
  */
 #ifndef CONFIG_MONITOR_IS_IN_RAM

-#define CFG_ENV_OFFSET         0x4000
-#define CFG_ENV_SECT_SIZE      0x2000
+#define CONFIG_ENV_OFFSET              0x4000
+#define CONFIG_ENV_SECT_SIZE   0x2000

 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CONFIG_ENV_IS_IN_FLASH 1

-#define CFG_ENV_IS_EMBEDDED    1
+#define CONFIG_ENV_IS_EMBEDDED 1

 #else
 #else

-#define CFG_ENV_ADDR           0xffe04000
-#define CFG_ENV_SECT_SIZE      0x2000
+#define CONFIG_ENV_ADDR                0xffe04000
+#define CONFIG_ENV_SECT_SIZE   0x2000

 #define CONFIG_ENV_IS_IN_FLASH 1
 #endif
 
 #define CONFIG_ENV_IS_IN_FLASH 1
 #endif
 

diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h
index 0a30e0b1edea4d8aeda6fd96045bb31e68046feb..b0ef41ec2c8b53a8704c9b166da10ce7066f35b6 100644 (file)
--- a/include/configs/M5275EVB.h
+++ b/include/configs/M5275EVB.h
@@ -52,13 +52,13 @@
  * Environment is embedded in u-boot in the second sector of the flash
  */
 #ifndef CONFIG_MONITOR_IS_IN_RAM
  * Environment is embedded in u-boot in the second sector of the flash
  */
 #ifndef CONFIG_MONITOR_IS_IN_RAM

-#define CFG_ENV_OFFSET         0x4000
-#define CFG_ENV_SECT_SIZE      0x2000
+#define CONFIG_ENV_OFFSET              0x4000
+#define CONFIG_ENV_SECT_SIZE   0x2000

 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CONFIG_ENV_IS_IN_FLASH 1

-#define CFG_ENV_IS_EMBEDDED    1
+#define CONFIG_ENV_IS_EMBEDDED 1

 #else
 #else

-#define CFG_ENV_ADDR           0xffe04000
-#define CFG_ENV_SECT_SIZE      0x2000
+#define CONFIG_ENV_ADDR                0xffe04000
+#define CONFIG_ENV_SECT_SIZE   0x2000

 #define CONFIG_ENV_IS_IN_FLASH 1
 #endif
 
 #define CONFIG_ENV_IS_IN_FLASH 1
 #endif
 

diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index 1763f97b65e10cc12749cfa0af6f3b42bc8fc4fe..5cc64c167f2c250fb69940cc246051860bf28dab 100644 (file)
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -48,8 +48,8 @@
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
  */
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
  */

-#define CFG_ENV_ADDR           0xffe04000
-#define CFG_ENV_SIZE           0x2000
+#define CONFIG_ENV_ADDR                0xffe04000
+#define CONFIG_ENV_SIZE                0x2000

 #define CONFIG_ENV_IS_IN_FLASH 1
 
 /*
 #define CONFIG_ENV_IS_IN_FLASH 1
 
 /*

diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index 441f209c4af4341639fd8287af8814cd1170dcf9..3a8e49a88913c141584b8c477a6c77db61c36634 100644 (file)
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -228,10 +228,10 @@
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
  */
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
  */

-#define CFG_ENV_OFFSET         0x4000
-#define CFG_ENV_SECT_SIZE      0x2000
+#define CONFIG_ENV_OFFSET              0x4000
+#define CONFIG_ENV_SECT_SIZE   0x2000

 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CONFIG_ENV_IS_IN_FLASH 1

-#define CFG_ENV_IS_EMBEDDED    1
+#define CONFIG_ENV_IS_EMBEDDED 1

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index f8212c6551a491aacab073a6f611ca6ae0ddc108..34698eee37d87c81cc97e997c98b44d04f8e576e 100644 (file)
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -228,10 +228,10 @@
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
  */
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
  */

-#define CFG_ENV_OFFSET         0x4000
-#define CFG_ENV_SECT_SIZE      0x2000
+#define CONFIG_ENV_OFFSET              0x4000
+#define CONFIG_ENV_SECT_SIZE   0x2000

 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CONFIG_ENV_IS_IN_FLASH 1

-#define CFG_ENV_IS_EMBEDDED    1
+#define CONFIG_ENV_IS_EMBEDDED 1

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h
index d0a66ea8fe0590f20b257bf318415dca10d0ffda..03d21bec4dd9b2f8929ed9a6a5a9785f7d4fcba5 100644 (file)
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@@ -267,17 +267,17 @@
  */
 #if defined(CONFIG_CF_SBF)
 #      define CONFIG_ENV_IS_IN_SPI_FLASH       1
  */
 #if defined(CONFIG_CF_SBF)
 #      define CONFIG_ENV_IS_IN_SPI_FLASH       1

-#      define CFG_ENV_SPI_CS           1
-#      define CFG_ENV_OFFSET           0x20000
-#      define CFG_ENV_SIZE             0x2000
-#      define CFG_ENV_SECT_SIZE        0x10000
+#      define CONFIG_ENV_SPI_CS                1
+#      define CONFIG_ENV_OFFSET                0x20000
+#      define CONFIG_ENV_SIZE          0x2000
+#      define CONFIG_ENV_SECT_SIZE     0x10000

 #else
 #      define CONFIG_ENV_IS_IN_FLASH   1
 #else
 #      define CONFIG_ENV_IS_IN_FLASH   1

-#      define CFG_ENV_ADDR             (CFG_FLASH_BASE + 0x4000)
-#      define CFG_ENV_SECT_SIZE        0x2000
+#      define CONFIG_ENV_ADDR          (CFG_FLASH_BASE + 0x4000)
+#      define CONFIG_ENV_SECT_SIZE     0x2000

 #endif
 #undef CONFIG_ENV_OVERWRITE
 #endif
 #undef CONFIG_ENV_OVERWRITE

-#undef CFG_ENV_IS_EMBEDDED
+#undef CONFIG_ENV_IS_EMBEDDED

 
 /*-----------------------------------------------------------------------
  * FLASH organization
 
 /*-----------------------------------------------------------------------
  * FLASH organization

diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index 9872d58d22ab39baced540a31f9faf41845eeafb..9513279fed212ece52b0b1b0002f8f9b73acdf06 100644 (file)
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -332,12 +332,12 @@
  */
 #ifdef CONFIG_CF_SBF
 #      define CONFIG_ENV_IS_IN_SPI_FLASH
  */
 #ifdef CONFIG_CF_SBF
 #      define CONFIG_ENV_IS_IN_SPI_FLASH

-#      define CFG_ENV_SPI_CS           1
+#      define CONFIG_ENV_SPI_CS                1

 #else
 #      define CONFIG_ENV_IS_IN_FLASH   1
 #endif
 #undef CONFIG_ENV_OVERWRITE
 #else
 #      define CONFIG_ENV_IS_IN_FLASH   1
 #endif
 #undef CONFIG_ENV_OVERWRITE

-#undef CFG_ENV_IS_EMBEDDED
+#undef CONFIG_ENV_IS_EMBEDDED

 
 /*-----------------------------------------------------------------------
  * FLASH organization
 
 /*-----------------------------------------------------------------------
  * FLASH organization


@@ -347,24 +347,24 @@
 #      define CFG_FLASH0_BASE          CFG_SER_FLASH_BASE
 #      define CFG_FLASH1_BASE          CFG_CS0_BASE
 #      define CFG_FLASH2_BASE          CFG_CS1_BASE
 #      define CFG_FLASH0_BASE          CFG_SER_FLASH_BASE
 #      define CFG_FLASH1_BASE          CFG_CS0_BASE
 #      define CFG_FLASH2_BASE          CFG_CS1_BASE

-#      define CFG_ENV_OFFSET           0x30000
-#      define CFG_ENV_SIZE             0x2000
-#      define CFG_ENV_SECT_SIZE        0x10000
+#      define CONFIG_ENV_OFFSET                0x30000
+#      define CONFIG_ENV_SIZE          0x2000
+#      define CONFIG_ENV_SECT_SIZE     0x10000

 #endif
 #ifdef CFG_ATMEL_BOOT
 #      define CFG_FLASH_BASE           CFG_CS0_BASE
 #      define CFG_FLASH0_BASE          CFG_CS0_BASE
 #      define CFG_FLASH1_BASE          CFG_CS1_BASE
 #endif
 #ifdef CFG_ATMEL_BOOT
 #      define CFG_FLASH_BASE           CFG_CS0_BASE
 #      define CFG_FLASH0_BASE          CFG_CS0_BASE
 #      define CFG_FLASH1_BASE          CFG_CS1_BASE

-#      define CFG_ENV_ADDR             (CFG_FLASH_BASE + 0x4000)
-#      define CFG_ENV_SECT_SIZE        0x2000
+#      define CONFIG_ENV_ADDR          (CFG_FLASH_BASE + 0x4000)
+#      define CONFIG_ENV_SECT_SIZE     0x2000

 #endif
 #ifdef CFG_INTEL_BOOT
 #      define CFG_FLASH_BASE           CFG_CS0_BASE
 #      define CFG_FLASH0_BASE          CFG_CS0_BASE
 #      define CFG_FLASH1_BASE          CFG_CS1_BASE
 #endif
 #ifdef CFG_INTEL_BOOT
 #      define CFG_FLASH_BASE           CFG_CS0_BASE
 #      define CFG_FLASH0_BASE          CFG_CS0_BASE
 #      define CFG_FLASH1_BASE          CFG_CS1_BASE

-#      define CFG_ENV_ADDR             (CFG_FLASH_BASE + 0x40000)
-#      define CFG_ENV_SIZE             0x2000
-#      define CFG_ENV_SECT_SIZE        0x20000
+#      define CONFIG_ENV_ADDR          (CFG_FLASH_BASE + 0x40000)
+#      define CONFIG_ENV_SIZE          0x2000
+#      define CONFIG_ENV_SECT_SIZE     0x20000

 #endif
 
 #define CFG_FLASH_CFI
 #endif
 
 #define CFG_FLASH_CFI

diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h
index 7913879489c883a04e15a74b5cda362ba01249d4..37b1c603dca67dacf13f4a5f35350433a057911a 100644 (file)
--- a/include/configs/M5475EVB.h
+++ b/include/configs/M5475EVB.h
@@ -277,10 +277,10 @@
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
  */
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
  */

-#define CFG_ENV_OFFSET         0x2000
-#define CFG_ENV_SECT_SIZE      0x2000
+#define CONFIG_ENV_OFFSET              0x2000
+#define CONFIG_ENV_SECT_SIZE   0x2000

 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CONFIG_ENV_IS_IN_FLASH 1

-#define CFG_ENV_IS_EMBEDDED    1
+#define CONFIG_ENV_IS_EMBEDDED 1

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h
index df92a244193beddf477c66768f711ac9125f36a4..482136e1149d161b40f197e6bd2c583c8ba420c3 100644 (file)
--- a/include/configs/M5485EVB.h
+++ b/include/configs/M5485EVB.h
@@ -263,10 +263,10 @@
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
  */
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
  */

-#define CFG_ENV_OFFSET         0x2000
-#define CFG_ENV_SECT_SIZE      0x2000
+#define CONFIG_ENV_OFFSET              0x2000
+#define CONFIG_ENV_SECT_SIZE   0x2000

 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CONFIG_ENV_IS_IN_FLASH 1

-#define CFG_ENV_IS_EMBEDDED    1
+#define CONFIG_ENV_IS_EMBEDDED 1

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/MBX.h b/include/configs/MBX.h
index 44e1861884e620ab54dc9e86dff35a383ea2ff08..fed4d7399d27fd9a82060aedd7d50f58d43443f9 100644 (file)
--- a/include/configs/MBX.h
+++ b/include/configs/MBX.h
@@ -194,8 +194,8 @@
  * access the NVRAM at the offset 0x1000.
  */
 #define CONFIG_ENV_IS_IN_NVRAM 1       /* turn on NVRAM env feature */
  * access the NVRAM at the offset 0x1000.
  */
 #define CONFIG_ENV_IS_IN_NVRAM 1       /* turn on NVRAM env feature */

-#define CFG_ENV_ADDR           (CFG_NVRAM_BASE + 0x1000)
-#define CFG_ENV_SIZE           0x1000
+#define CONFIG_ENV_ADDR                (CFG_NVRAM_BASE + 0x1000)
+#define CONFIG_ENV_SIZE                0x1000

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/MBX860T.h b/include/configs/MBX860T.h
index 4a537e8104e13483487ca3e6ac0730a2a7d3a9f2..cc051115211cd8cee31ee642756cfdc6265c3904 100644 (file)
--- a/include/configs/MBX860T.h
+++ b/include/configs/MBX860T.h
@@ -144,8 +144,8 @@
  * access the NVRAM at the offset 0x1000.
  */
 #define CONFIG_ENV_IS_IN_NVRAM 1       /* turn on NVRAM env feature */
  * access the NVRAM at the offset 0x1000.
  */
 #define CONFIG_ENV_IS_IN_NVRAM 1       /* turn on NVRAM env feature */

-#define CFG_ENV_ADDR           (CFG_NVRAM_BASE + 0x1000)
-#define CFG_ENV_SIZE           0x1000
+#define CONFIG_ENV_ADDR                (CFG_NVRAM_BASE + 0x1000)
+#define CONFIG_ENV_SIZE                0x1000

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/METROBOX.h b/include/configs/METROBOX.h
index b972390b0461526109d16ce3147ac6582fe12906..16d236388e48b6e062fdcab25717fca3f2fe13a4 100644 (file)
--- a/include/configs/METROBOX.h
+++ b/include/configs/METROBOX.h
@@ -208,8 +208,8 @@
 #undef CONFIG_ENV_IS_IN_EEPROM              /* ... not in EEPROM       */
 #define CONFIG_ENV_OVERWRITE  1                     /* allow env overwrite     */
 
 #undef CONFIG_ENV_IS_IN_EEPROM              /* ... not in EEPROM       */
 #define CONFIG_ENV_OVERWRITE  1                     /* allow env overwrite     */
 

-#define CFG_ENV_SIZE         0x1000         /* Size of Env vars        */
-#define CFG_ENV_ADDR         (CFG_NVRAM_BASE_ADDR)
+#define CONFIG_ENV_SIZE              0x1000         /* Size of Env vars        */
+#define CONFIG_ENV_ADDR              (CFG_NVRAM_BASE_ADDR)

 
 #define CONFIG_BOOTARGS              "console=ttyS0,9600 root=/dev/nfs rw nfsroot=$serverip:/home/metrobox0 nfsaddrs=$ipaddr:::::eth0:none "
 #define CONFIG_BOOTCOMMAND    "tftp 8000000 pImage.metrobox;bootm 8000000"
 
 #define CONFIG_BOOTARGS              "console=ttyS0,9600 root=/dev/nfs rw nfsroot=$serverip:/home/metrobox0 nfsaddrs=$ipaddr:::::eth0:none "
 #define CONFIG_BOOTCOMMAND    "tftp 8000000 pImage.metrobox;bootm 8000000"

diff --git a/include/configs/MHPC.h b/include/configs/MHPC.h
index de7cb128f3eeb2cec46fe062204c340c572dea3a..a7901e5655faee595939a8ffd8f2e6a7247c3e89 100644 (file)
--- a/include/configs/MHPC.h
+++ b/include/configs/MHPC.h
@@ -229,8 +229,8 @@
 #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 CONFIG_ENV_IS_IN_FLASH 1
 #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 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    */
+#define CONFIG_ENV_OFFSET              CFG_MONITOR_LEN /* Offset of Environment */
+#define CONFIG_ENV_SIZE                0x20000 /* Total Size of Environment    */

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index e0f938625c85ad03c55222b044751b14265be8cc..4527c17eac7e4ac213d0208b990650a33e37b286 100644 (file)
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -115,8 +115,8 @@
 
 
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
 
 
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */

-#define CFG_ENV_OFFSET         0x00000 /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE           0x00800 /* 2k bytes may be used for env vars */
+#define CONFIG_ENV_OFFSET              0x00000 /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE                0x00800 /* 2k bytes may be used for env vars */

 
 /***************************************************************
  * Definitions for Serial Presence Detect EEPROM address
 
 /***************************************************************
  * Definitions for Serial Presence Detect EEPROM address

diff --git a/include/configs/ML2.h b/include/configs/ML2.h
index a2703b1688b8c0468b1a41c534fd045ce8b2d867..11323dbe84512807c710808bd4eede08316df38b 100644 (file)
--- a/include/configs/ML2.h
+++ b/include/configs/ML2.h
@@ -185,9 +185,9 @@
 
 /* BEG ENVIRONNEMENT FLASH */
 #ifdef CONFIG_ENV_IS_IN_FLASH
 
 /* BEG ENVIRONNEMENT 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   */
+#define CONFIG_ENV_OFFSET              0x00050000 /* Offset of Environment Sector  */
+#define        CONFIG_ENV_SIZE         0x10000 /* Total Size of Environment Sector     */
+#define CONFIG_ENV_SECT_SIZE   0x10000 /* see README - env sector total size   */

 #endif
 /* END ENVIRONNEMENT FLASH */
 /*-----------------------------------------------------------------------
 #endif
 /* END ENVIRONNEMENT FLASH */
 /*-----------------------------------------------------------------------


@@ -197,9 +197,9 @@
 #define CFG_NVRAM_SIZE         0x1ff8          /* NVRAM size   */
 
 #ifdef CONFIG_ENV_IS_IN_NVRAM
 #define CFG_NVRAM_SIZE         0x1ff8          /* NVRAM size   */
 
 #ifdef CONFIG_ENV_IS_IN_NVRAM

-#define CFG_ENV_SIZE           0x1000          /* Size of Environment vars     */
-#define CFG_ENV_ADDR           \
-       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)       /* Env  */
+#define CONFIG_ENV_SIZE                0x1000          /* Size of Environment vars     */
+#define CONFIG_ENV_ADDR                \
+       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CONFIG_ENV_SIZE)    /* Env  */

 #endif
 
 /*
 #endif
 
 /*

diff --git a/include/configs/MOUSSE.h b/include/configs/MOUSSE.h
index b145166f0302cb81b438290bc8305283a77bbfd5..b69ced66233600a0c3c730776c5d754938db2657 100644 (file)
--- a/include/configs/MOUSSE.h
+++ b/include/configs/MOUSSE.h
@@ -299,13 +299,13 @@
 
 #if 0
 #define        CONFIG_ENV_IS_IN_FLASH      1
 
 #if 0
 #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    */
+#define CONFIG_ENV_OFFSET          0x8000  /* Offset of the Environment Sector */
+#define CONFIG_ENV_SIZE            0x4000  /* Size of the Environment Sector    */

 #else
 #define CONFIG_ENV_IS_IN_NVRAM          1
 #else
 #define CONFIG_ENV_IS_IN_NVRAM          1

-#define CFG_ENV_ADDR            NV_OFF_U_BOOT_ADDR /* PortX NVM Free addr*/
-#define CFG_ENV_OFFSET          CFG_ENV_ADDR
-#define CFG_ENV_SIZE            NV_U_BOOT_ENV_SIZE /* 2K */
+#define CONFIG_ENV_ADDR            NV_OFF_U_BOOT_ADDR /* PortX NVM Free addr*/
+#define CONFIG_ENV_OFFSET          CONFIG_ENV_ADDR
+#define CONFIG_ENV_SIZE            NV_U_BOOT_ENV_SIZE /* 2K */

 #endif
 /*-----------------------------------------------------------------------
  * Cache Configuration
 #endif
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h
index 9a7673231039f588b687523fe97a9db5f06b4bda..763ad4ca2e7bef299ce0919c1c82dcfd5494d680 100644 (file)
--- a/include/configs/MPC8260ADS.h
+++ b/include/configs/MPC8260ADS.h
@@ -381,12 +381,12 @@
 
 #ifndef CFG_RAMBOOT
 #  define CONFIG_ENV_IS_IN_FLASH       1
 
 #ifndef CFG_RAMBOOT
 #  define CONFIG_ENV_IS_IN_FLASH       1

-#  define CFG_ENV_SECT_SIZE    0x40000
-#  define CFG_ENV_ADDR         (CFG_MONITOR_BASE + CFG_ENV_SECT_SIZE)
+#  define CONFIG_ENV_SECT_SIZE 0x40000
+#  define CONFIG_ENV_ADDR              (CFG_MONITOR_BASE + CONFIG_ENV_SECT_SIZE)

 #else
 #  define CONFIG_ENV_IS_IN_NVRAM       1
 #else
 #  define CONFIG_ENV_IS_IN_NVRAM       1

-#  define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
-#  define CFG_ENV_SIZE         0x200
+#  define CONFIG_ENV_ADDR              (CFG_MONITOR_BASE - 0x1000)
+#  define CONFIG_ENV_SIZE              0x200

 #endif /* CFG_RAMBOOT */
 
 #define CFG_CACHELINE_SIZE     32      /* For MPC8260 CPU */
 #endif /* CFG_RAMBOOT */
 
 #define CFG_CACHELINE_SIZE     32      /* For MPC8260 CPU */

diff --git a/include/configs/MPC8266ADS.h b/include/configs/MPC8266ADS.h
index e062717e6b79be50d4733daf052e3a1db6a346da..26c6fbe502366ecc17dc6346e188d6f199d962d8 100644 (file)
--- a/include/configs/MPC8266ADS.h
+++ b/include/configs/MPC8266ADS.h
@@ -428,12 +428,12 @@
 
 #ifndef CFG_RAMBOOT
 #  define CONFIG_ENV_IS_IN_FLASH       1
 
 #ifndef CFG_RAMBOOT
 #  define CONFIG_ENV_IS_IN_FLASH       1

-#    define CFG_ENV_ADDR       (CFG_MONITOR_BASE + 0x40000)
-#    define CFG_ENV_SECT_SIZE  0x40000
+#    define CONFIG_ENV_ADDR    (CFG_MONITOR_BASE + 0x40000)
+#    define CONFIG_ENV_SECT_SIZE       0x40000

 #else
 #  define CONFIG_ENV_IS_IN_NVRAM       1
 #else
 #  define CONFIG_ENV_IS_IN_NVRAM       1

-#  define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
-#  define CFG_ENV_SIZE         0x200
+#  define CONFIG_ENV_ADDR              (CFG_MONITOR_BASE - 0x1000)
+#  define CONFIG_ENV_SIZE              0x200

 #endif /* CFG_RAMBOOT */
 
 #define CFG_CACHELINE_SIZE     32      /* For MPC8260 CPU */
 #endif /* CFG_RAMBOOT */
 
 #define CFG_CACHELINE_SIZE     32      /* For MPC8260 CPU */

diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index aef35781cde1eabcc520664d5e0d70e80841f53f..55d78528dbad0a0826e7f7ca687e0e757062d3f9 100644 (file)
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -209,7 +209,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_GBL_DATA_OFFSET    (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
 #define CFG_INIT_SP_OFFSET     CFG_GBL_DATA_OFFSET
 

-/* CFG_MONITOR_LEN must be a multiple of CFG_ENV_SECT_SIZE */
+/* CFG_MONITOR_LEN must be a multiple of CONFIG_ENV_SECT_SIZE */

 #define CFG_MONITOR_LEN                (256 * 1024)    /* Reserve 256 kB for Mon */
 #define CFG_MALLOC_LEN         (512 * 1024)    /* Reserved for malloc */
 
 #define CFG_MONITOR_LEN                (256 * 1024)    /* Reserve 256 kB for Mon */
 #define CFG_MALLOC_LEN         (512 * 1024)    /* Reserved for malloc */
 


@@ -386,23 +386,23 @@
  */
 #if defined(CONFIG_NAND_U_BOOT)
        #define CONFIG_ENV_IS_IN_NAND   1
  */
 #if defined(CONFIG_NAND_U_BOOT)
        #define CONFIG_ENV_IS_IN_NAND   1

-       #define CFG_ENV_OFFSET          (512 * 1024)
-       #define CFG_ENV_SECT_SIZE       CFG_NAND_BLOCK_SIZE
-       #define CFG_ENV_SIZE            CFG_ENV_SECT_SIZE
-       #define CFG_ENV_SIZE_REDUND     CFG_ENV_SIZE
-       #define CFG_ENV_RANGE           (CFG_ENV_SECT_SIZE * 4)
-       #define CFG_ENV_OFFSET_REDUND   (CFG_ENV_OFFSET + CFG_ENV_RANGE)
+       #define CONFIG_ENV_OFFSET               (512 * 1024)
+       #define CONFIG_ENV_SECT_SIZE    CFG_NAND_BLOCK_SIZE
+       #define CONFIG_ENV_SIZE         CONFIG_ENV_SECT_SIZE
+       #define CONFIG_ENV_SIZE_REDUND  CONFIG_ENV_SIZE
+       #define CONFIG_ENV_RANGE                (CONFIG_ENV_SECT_SIZE * 4)
+       #define CONFIG_ENV_OFFSET_REDUND        (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)

 #elif !defined(CFG_RAMBOOT)
        #define CONFIG_ENV_IS_IN_FLASH  1
 #elif !defined(CFG_RAMBOOT)
        #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
+       #define CONFIG_ENV_ADDR         (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+       #define CONFIG_ENV_SECT_SIZE    0x10000 /* 64K(one sector) for env */
+       #define CONFIG_ENV_SIZE         0x2000

 
 /* Address and size of Redundant Environment Sector */
 #else
        #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */
 
 /* Address and size of Redundant Environment Sector */
 #else
        #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */

-       #define CFG_ENV_ADDR            (CFG_MONITOR_BASE - 0x1000)
-       #define CFG_ENV_SIZE            0x2000
+       #define CONFIG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
+       #define CONFIG_ENV_SIZE         0x2000

 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */

diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index 92a6218427e4d7b7b30dca2a967547a4ab9a74d5..5879a823b8515eab51327fb7afcbe38526e25826 100644 (file)
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -378,14 +378,14 @@
  */
 #ifndef CFG_RAMBOOT
        #define CONFIG_ENV_IS_IN_FLASH  1
  */
 #ifndef CFG_RAMBOOT
        #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
+       #define CONFIG_ENV_ADDR         (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+       #define CONFIG_ENV_SECT_SIZE    0x10000 /* 64K(one sector) for env */
+       #define CONFIG_ENV_SIZE         0x2000

 #else
        #define CFG_NO_FLASH            1       /* Flash is not usable now */
        #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */
 #else
        #define CFG_NO_FLASH            1       /* Flash is not usable now */
        #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */

-       #define CFG_ENV_ADDR            (CFG_MONITOR_BASE - 0x1000)
-       #define CFG_ENV_SIZE            0x2000
+       #define CONFIG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
+       #define CONFIG_ENV_SIZE         0x2000

 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */

diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index 7e4849a91305c4fdae92a7b8122f6fe0906f6872..977142b10f3ed7aa4bb17835d46510454c9ac2ba 100644 (file)
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -155,7 +155,7 @@
 #undef  CFG_RAMBOOT
 #endif
 
 #undef  CFG_RAMBOOT
 #endif
 

-/* CFG_MONITOR_LEN must be a multiple of CFG_ENV_SECT_SIZE */
+/* CFG_MONITOR_LEN must be a multiple of CONFIG_ENV_SECT_SIZE */

 #define CFG_MONITOR_LEN                (256 * 1024)    /* Reserve 256 kB for Mon */
 #define CFG_MALLOC_LEN         (128 * 1024)    /* Reserved for malloc */
 
 #define CFG_MONITOR_LEN                (256 * 1024)    /* Reserve 256 kB for Mon */
 #define CFG_MALLOC_LEN         (128 * 1024)    /* Reserved for malloc */
 


@@ -392,14 +392,14 @@
  */
 #ifndef CFG_RAMBOOT
        #define CONFIG_ENV_IS_IN_FLASH  1
  */
 #ifndef CFG_RAMBOOT
        #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
+       #define CONFIG_ENV_ADDR         (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+       #define CONFIG_ENV_SECT_SIZE    0x20000
+       #define CONFIG_ENV_SIZE         0x2000

 #else
        #define CFG_NO_FLASH            1       /* Flash is not usable now */
        #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */
 #else
        #define CFG_NO_FLASH            1       /* Flash is not usable now */
        #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */

-       #define CFG_ENV_ADDR            (CFG_MONITOR_BASE - 0x1000)
-       #define CFG_ENV_SIZE            0x2000
+       #define CONFIG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
+       #define CONFIG_ENV_SIZE         0x2000

 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */

diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index 3102272ae392e492685071642c422bc87cb6dfed..01cf557bab5955488cbc0cee870c41a3cf704a35 100644 (file)
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -143,7 +143,7 @@
 #undef  CFG_RAMBOOT
 #endif
 
 #undef  CFG_RAMBOOT
 #endif
 

-/* CFG_MONITOR_LEN must be a multiple of CFG_ENV_SECT_SIZE */
+/* CFG_MONITOR_LEN must be a multiple of CONFIG_ENV_SECT_SIZE */

 #define CFG_MONITOR_LEN                (256 * 1024)    /* Reserve 256 kB for Mon */
 #define CFG_MALLOC_LEN         (128 * 1024)    /* Reserved for malloc */
 
 #define CFG_MONITOR_LEN                (256 * 1024)    /* Reserve 256 kB for Mon */
 #define CFG_MALLOC_LEN         (128 * 1024)    /* Reserved for malloc */
 


@@ -404,14 +404,14 @@
  */
 #ifndef CFG_RAMBOOT
        #define CONFIG_ENV_IS_IN_FLASH  1
  */
 #ifndef CFG_RAMBOOT
        #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
+       #define CONFIG_ENV_ADDR         (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+       #define CONFIG_ENV_SECT_SIZE    0x20000
+       #define CONFIG_ENV_SIZE         0x2000

 #else
        #define CFG_NO_FLASH            1       /* Flash is not usable now */
        #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */
 #else
        #define CFG_NO_FLASH            1       /* Flash is not usable now */
        #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */

-       #define CFG_ENV_ADDR            (CFG_MONITOR_BASE - 0x1000)
-       #define CFG_ENV_SIZE            0x2000
+       #define CONFIG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
+       #define CONFIG_ENV_SIZE         0x2000

 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */

diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index d737cb44fa01515a25cc7d7291245cf1749b063a..87f1672f1a1afe74e306ac5db80e33138248b2f1 100644 (file)
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -466,19 +466,19 @@
  */
 #ifndef CFG_RAMBOOT
        #define CONFIG_ENV_IS_IN_FLASH  1
  */
 #ifndef CFG_RAMBOOT
        #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
+       #define CONFIG_ENV_ADDR         (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+       #define CONFIG_ENV_SECT_SIZE    0x20000 /* 128K(one sector) for env */
+       #define CONFIG_ENV_SIZE         0x2000

 
 /* Address and size of Redundant Environment Sector    */
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 #else
        #define CFG_NO_FLASH            1       /* Flash is not usable now */
        #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */
 
 #else
        #define CFG_NO_FLASH            1       /* Flash is not usable now */
        #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */

-       #define CFG_ENV_ADDR            (CFG_MONITOR_BASE - 0x1000)
-       #define CFG_ENV_SIZE            0x2000
+       #define CONFIG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
+       #define CONFIG_ENV_SIZE         0x2000

 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */

diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index 7635c65e36171ce5bdcc5ca3e34d7bbdc59f4b38..fa0c0a7150088264c5c7087ce60e0609a29af0f4 100644 (file)
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -274,7 +274,7 @@ boards, we say we have two, but don't display a message if we find only one. */
 #define CFG_GBL_DATA_OFFSET    (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
 #define CFG_INIT_SP_OFFSET     CFG_GBL_DATA_OFFSET
 
 #define CFG_GBL_DATA_OFFSET    (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
 #define CFG_INIT_SP_OFFSET     CFG_GBL_DATA_OFFSET
 

-/* CFG_MONITOR_LEN must be a multiple of CFG_ENV_SECT_SIZE */
+/* CFG_MONITOR_LEN must be a multiple of CONFIG_ENV_SECT_SIZE */

 #define CFG_MONITOR_LEN                (256 * 1024) /* Reserve 256 kB for Mon */
 #define CFG_MALLOC_LEN         (128 * 1024) /* Reserved for malloc */
 
 #define CFG_MONITOR_LEN                (256 * 1024) /* Reserve 256 kB for Mon */
 #define CFG_MALLOC_LEN         (128 * 1024) /* Reserved for malloc */
 


@@ -414,15 +414,15 @@ boards, we say we have two, but don't display a message if we find only one. */
 
 #ifndef CFG_RAMBOOT
   #define CONFIG_ENV_IS_IN_FLASH
 
 #ifndef CFG_RAMBOOT
   #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
+  #define CONFIG_ENV_ADDR              (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+  #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K (one sector) for environment */
+  #define CONFIG_ENV_SIZE              0x2000

 #else
   #define CFG_NO_FLASH         /* Flash is not usable now */
   #undef  CONFIG_FLASH_CFI_DRIVER
   #define CONFIG_ENV_IS_NOWHERE        /* Store ENV in memory only */
 #else
   #define CFG_NO_FLASH         /* Flash is not usable now */
   #undef  CONFIG_FLASH_CFI_DRIVER
   #define CONFIG_ENV_IS_NOWHERE        /* Store ENV in memory only */

-  #define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
-  #define CFG_ENV_SIZE         0x2000
+  #define CONFIG_ENV_ADDR              (CFG_MONITOR_BASE - 0x1000)
+  #define CONFIG_ENV_SIZE              0x2000

 #endif
 
 #define CONFIG_LOADS_ECHO      /* echo on for serial download */
 #endif
 
 #define CONFIG_LOADS_ECHO      /* echo on for serial download */

diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h
index 37173cc467540f1f3dcf57eeda0f8efae72ae2a1..f60d7a7b03c08cf09d769cd86fa3818720dcf723 100644 (file)
--- a/include/configs/MPC8360EMDS.h
+++ b/include/configs/MPC8360EMDS.h
@@ -168,7 +168,7 @@
 #undef CFG_RAMBOOT
 #endif
 
 #undef CFG_RAMBOOT
 #endif
 

-/* CFG_MONITOR_LEN must be a multiple of CFG_ENV_SECT_SIZE */
+/* CFG_MONITOR_LEN must be a multiple of CONFIG_ENV_SECT_SIZE */

 #define CFG_MONITOR_LEN                (256 * 1024) /* Reserve 256 kB for Mon */
 #define CFG_MALLOC_LEN         (128 * 1024) /* Reserved for malloc */
 
 #define CFG_MONITOR_LEN                (256 * 1024) /* Reserve 256 kB for Mon */
 #define CFG_MALLOC_LEN         (128 * 1024) /* Reserved for malloc */
 


@@ -435,14 +435,14 @@
 
 #ifndef CFG_RAMBOOT
        #define CONFIG_ENV_IS_IN_FLASH  1
 
 #ifndef CFG_RAMBOOT
        #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
+       #define CONFIG_ENV_ADDR         (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+       #define CONFIG_ENV_SECT_SIZE    0x20000
+       #define CONFIG_ENV_SIZE         0x2000

 #else
        #define CFG_NO_FLASH            1       /* Flash is not usable now */
        #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */
 #else
        #define CFG_NO_FLASH            1       /* Flash is not usable now */
        #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */

-       #define CFG_ENV_ADDR            (CFG_MONITOR_BASE - 0x1000)
-       #define CFG_ENV_SIZE            0x2000
+       #define CONFIG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
+       #define CONFIG_ENV_SIZE         0x2000

 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */

diff --git a/include/configs/MPC8360ERDK.h b/include/configs/MPC8360ERDK.h
index b20f16504af86a20c874a00480035e89add62d73..b2e6b3b84df166f92f7f348e6eed57b4a3927dd8 100644 (file)
--- a/include/configs/MPC8360ERDK.h
+++ b/include/configs/MPC8360ERDK.h
@@ -340,14 +340,14 @@
 
 #ifndef CFG_RAMBOOT
 #define CONFIG_ENV_IS_IN_FLASH 1
 
 #ifndef CFG_RAMBOOT
 #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
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + 0x40000)
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* 128K(one sector) for env */
+#define CONFIG_ENV_SIZE                0x20000

 #else /* CFG_RAMBOOT */
 #define CFG_NO_FLASH           1       /* Flash is not usable now */
 #define CONFIG_ENV_IS_NOWHERE  1       /* Store ENV in memory only */
 #else /* CFG_RAMBOOT */
 #define CFG_NO_FLASH           1       /* Flash is not usable now */
 #define CONFIG_ENV_IS_NOWHERE  1       /* Store ENV in memory only */

-#define CFG_ENV_ADDR           (CFG_MONITOR_BASE - 0x1000)
-#define CFG_ENV_SIZE           0x2000
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE - 0x1000)
+#define CONFIG_ENV_SIZE                0x2000

 #endif /* CFG_RAMBOOT */
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #endif /* CFG_RAMBOOT */
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */

diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index 21d7d2dd64d247419d7c827179169b0a01310459..7c87388980388f424d0c016b6b8bd08c2c24ced1 100644 (file)
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -203,7 +203,7 @@
 #undef CFG_RAMBOOT
 #endif
 
 #undef CFG_RAMBOOT
 #endif
 

-/* CFG_MONITOR_LEN must be a multiple of CFG_ENV_SECT_SIZE */
+/* CFG_MONITOR_LEN must be a multiple of CONFIG_ENV_SECT_SIZE */

 #define CFG_MONITOR_LEN                (256 * 1024) /* Reserve 256 kB for Mon */
 #define CFG_MALLOC_LEN         (512 * 1024) /* Reserved for malloc */
 
 #define CFG_MONITOR_LEN                (256 * 1024) /* Reserve 256 kB for Mon */
 #define CFG_MALLOC_LEN         (512 * 1024) /* Reserved for malloc */
 


@@ -422,14 +422,14 @@
  */
 #ifndef CFG_RAMBOOT
        #define CONFIG_ENV_IS_IN_FLASH  1
  */
 #ifndef CFG_RAMBOOT
        #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
+       #define CONFIG_ENV_ADDR         (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+       #define CONFIG_ENV_SECT_SIZE    0x20000 /* 128K(one sector) for env */
+       #define CONFIG_ENV_SIZE         0x2000

 #else
        #define CFG_NO_FLASH            1       /* Flash is not usable now */
        #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */
 #else
        #define CFG_NO_FLASH            1       /* Flash is not usable now */
        #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */

-       #define CFG_ENV_ADDR            (CFG_MONITOR_BASE - 0x1000)
-       #define CFG_ENV_SIZE            0x2000
+       #define CONFIG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
+       #define CONFIG_ENV_SIZE         0x2000

 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 7ffc743c351299a0028a653eb2323b18eeeb98c7..2ac4ad0fa45a2b81b18db5fb02922d1e4f04c508 100644 (file)
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -443,14 +443,14 @@
  */
 #ifndef CFG_RAMBOOT
        #define CONFIG_ENV_IS_IN_FLASH  1
  */
 #ifndef CFG_RAMBOOT
        #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
+       #define CONFIG_ENV_ADDR         (CFG_MONITOR_BASE+CFG_MONITOR_LEN)
+       #define CONFIG_ENV_SECT_SIZE    0x10000 /* 64K (one sector) for env */
+       #define CONFIG_ENV_SIZE         0x4000

 #else
        #define CFG_NO_FLASH            1       /* Flash is not usable now */
        #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */
 #else
        #define CFG_NO_FLASH            1       /* Flash is not usable now */
        #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */

-       #define CFG_ENV_ADDR            (CFG_MONITOR_BASE-0x1000)
-       #define CFG_ENV_SIZE            0x2000
+       #define CONFIG_ENV_ADDR         (CFG_MONITOR_BASE-0x1000)
+       #define CONFIG_ENV_SIZE         0x2000

 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */

diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index f290075d8ee2cd3001118a005857054f9947c59e..2578bef2781d4f0dfe5d65e6aa2d014ebfd70dab 100644 (file)
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -448,12 +448,12 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
 #if CFG_MONITOR_BASE > 0xfff80000
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
 #if CFG_MONITOR_BASE > 0xfff80000

-#define CFG_ENV_ADDR           0xfff80000
+#define CONFIG_ENV_ADDR                0xfff80000

 #else
 #else

-#define CFG_ENV_ADDR           (CFG_MONITOR_BASE + 0x60000)
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + 0x60000)

 #endif
 #endif

-#define CFG_ENV_SIZE           0x2000
-#define CFG_ENV_SECT_SIZE      0x20000 /* 128K (one sector) */
+#define CONFIG_ENV_SIZE                0x2000
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* 128K (one sector) */

 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change */
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change */

diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index 0dc10965cec7cd93aabda271573cbf0c87566892..0f5f8348581ff589691c5a4f22235fd66e6a84b1 100644 (file)
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -382,14 +382,14 @@
  */
 #ifndef CFG_RAMBOOT
   #define CONFIG_ENV_IS_IN_FLASH       1
  */
 #ifndef CFG_RAMBOOT
   #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
+  #define CONFIG_ENV_ADDR              (CFG_MONITOR_BASE + 0x40000)
+  #define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */
+  #define CONFIG_ENV_SIZE              0x2000

 #else
   #define CFG_NO_FLASH         1       /* Flash is not usable now */
   #define CONFIG_ENV_IS_NOWHERE        1       /* Store ENV in memory only */
 #else
   #define CFG_NO_FLASH         1       /* Flash is not usable now */
   #define CONFIG_ENV_IS_NOWHERE        1       /* Store ENV in memory only */

-  #define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
-  #define CFG_ENV_SIZE         0x2000
+  #define CONFIG_ENV_ADDR              (CFG_MONITOR_BASE - 0x1000)
+  #define CONFIG_ENV_SIZE              0x2000

 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */

diff --git a/include/configs/MPC8540EVAL.h b/include/configs/MPC8540EVAL.h
index d4df8a613b62cce1e07977393395fc8da982fb70..ee4f41f8efaf904b084a3e4706cee2d333d5b346 100644 (file)
--- a/include/configs/MPC8540EVAL.h
+++ b/include/configs/MPC8540EVAL.h
@@ -257,19 +257,19 @@
 #ifndef CFG_RAMBOOT
 #if defined(CONFIG_RAM_AS_FLASH)
 #define CONFIG_ENV_IS_NOWHERE
 #ifndef CFG_RAMBOOT
 #if defined(CONFIG_RAM_AS_FLASH)
 #define CONFIG_ENV_IS_NOWHERE

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x100000)
-#define CFG_ENV_SIZE           0x2000
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x100000)
+#define CONFIG_ENV_SIZE                0x2000

 #else
 #define CONFIG_ENV_IS_IN_FLASH 1
 #else
 #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 CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + 0x40000)
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* 256K(one sector) for env */

 #endif
 #endif

-#define CFG_ENV_SIZE           0x2000
+#define CONFIG_ENV_SIZE                0x2000

 #else
 /* #define CFG_NO_FLASH                1 */    /* Flash is not usable now      */
 #define CONFIG_ENV_IS_NOWHERE  1       /* Store ENV in memory only     */
 #else
 /* #define CFG_NO_FLASH                1 */    /* Flash is not usable now      */
 #define CONFIG_ENV_IS_NOWHERE  1       /* Store ENV in memory only     */

-#define CFG_ENV_ADDR           (CFG_MONITOR_BASE - 0x1000)
-#define CFG_ENV_SIZE           0x2000
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE - 0x1000)
+#define CONFIG_ENV_SIZE                0x2000

 #endif
 
 #define CONFIG_BOOTARGS        "root=/dev/ram rw console=ttyS0,115200"
 #endif
 
 #define CONFIG_BOOTARGS        "root=/dev/ram rw console=ttyS0,115200"

diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h
index 569952daef418d25bc51a56aca51a133f83cc671..6a400f577e05119c7a6fe259ff0ce72e3f7860c7 100644 (file)
--- a/include/configs/MPC8541CDS.h
+++ b/include/configs/MPC8541CDS.h
@@ -406,9 +406,9 @@ extern unsigned long get_clock_freq(void);
  * Environment
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
  * Environment
  */
 #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
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + 0x40000)
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* 256K(one sector) for env */
+#define CONFIG_ENV_SIZE                0x2000

 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change */
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change */

diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index 02776b35fd7775274acd0a4a6837c06691d3521a..b650874225425733a14d7f78e9b9565a42288630 100644 (file)
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -396,12 +396,12 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
 #if CFG_MONITOR_BASE > 0xfff80000
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
 #if CFG_MONITOR_BASE > 0xfff80000

-#define CFG_ENV_ADDR           0xfff80000
+#define CONFIG_ENV_ADDR                0xfff80000

 #else
 #else

-#define CFG_ENV_ADDR           (CFG_MONITOR_BASE + 0x70000)
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + 0x70000)

 #endif
 #endif

-#define CFG_ENV_SIZE           0x2000
-#define CFG_ENV_SECT_SIZE      0x10000 /* 64K (one sector) */
+#define CONFIG_ENV_SIZE                0x2000
+#define CONFIG_ENV_SECT_SIZE   0x10000 /* 64K (one sector) */

 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change */
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change */

diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 4afb7aeee542eee6e21d4945d462e76ffea483d5..68bc10607badeb974f43f6367a0beb2a339bd229 100644 (file)
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -467,9 +467,9 @@ extern unsigned long get_clock_freq(void);
  * Environment
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
  * Environment
  */
 #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
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + 0x40000)
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* 256K(one sector) for env */
+#define CONFIG_ENV_SIZE                0x2000

 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change */
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change */

diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h
index c521336538768b04d5e770470d854c5950e2b35a..ab4bc8641fbf04b4ca06712c6dfc9bb2dcb7d6d1 100644 (file)
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@@ -404,9 +404,9 @@ extern unsigned long get_clock_freq(void);
  * Environment
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
  * Environment
  */
 #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
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + 0x40000)
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* 256K(one sector) for env */
+#define CONFIG_ENV_SIZE                0x2000

 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change */
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change */

diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index 72a8b25f484c4e8714bef75cb2f5cf25b469b0ff..2bd8724895ed8090ae72131a91698a128fad78a3 100644 (file)
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -413,14 +413,14 @@
  */
 #ifndef CFG_RAMBOOT
   #define CONFIG_ENV_IS_IN_FLASH       1
  */
 #ifndef CFG_RAMBOOT
   #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
+  #define CONFIG_ENV_ADDR              (CFG_MONITOR_BASE + 0x40000)
+  #define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */
+  #define CONFIG_ENV_SIZE              0x2000

 #else
   #define CFG_NO_FLASH         1       /* Flash is not usable now */
   #define CONFIG_ENV_IS_NOWHERE        1       /* Store ENV in memory only */
 #else
   #define CFG_NO_FLASH         1       /* Flash is not usable now */
   #define CONFIG_ENV_IS_NOWHERE        1       /* Store ENV in memory only */

-  #define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
-  #define CFG_ENV_SIZE         0x2000
+  #define CONFIG_ENV_ADDR              (CFG_MONITOR_BASE - 0x1000)
+  #define CONFIG_ENV_SIZE              0x2000

 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */

diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index 5b1cf6f919bbf1f266f59d3327214970789ab756..80697a5ce31c74c78779ddda2e1c9c1404372451 100644 (file)
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -425,9 +425,9 @@ extern unsigned long get_clock_freq(void);
  * Environment
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
  * Environment
  */
 #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
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + 0x40000)
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* 256K(one sector) for env */
+#define CONFIG_ENV_SIZE                0x2000

 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change */
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change */

diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index 94c02408f5853e27ee7c24ecb1af759830f9d135..d7e3a887cf8658253e84f7353d9624943fb80294 100644 (file)
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -428,12 +428,12 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
 #if CFG_MONITOR_BASE > 0xfff80000
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
 #if CFG_MONITOR_BASE > 0xfff80000

-#define CFG_ENV_ADDR           0xfff80000
+#define CONFIG_ENV_ADDR                0xfff80000

 #else
 #else

-#define CFG_ENV_ADDR           (CFG_MONITOR_BASE + 0x70000)
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + 0x70000)

 #endif
 #endif

-#define CFG_ENV_SIZE           0x2000
-#define CFG_ENV_SECT_SIZE      0x20000 /* 128K (one sector) */
+#define CONFIG_ENV_SIZE                0x2000
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* 128K (one sector) */

 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change */
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change */

diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 744110f36c6bda45048c8acc3988dbf6acf0a773..4eee21ca8561988ac29cf36b2b5a30be86445551 100644 (file)
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -439,13 +439,13 @@
  */
 #ifndef CFG_RAMBOOT
 #define CONFIG_ENV_IS_IN_FLASH 1
  */
 #ifndef CFG_RAMBOOT
 #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
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* 126k (one sector) for env */
+#define CONFIG_ENV_SIZE                0x2000

 #else
 #define CONFIG_ENV_IS_NOWHERE  1       /* Store ENV in memory only */
 #else
 #define CONFIG_ENV_IS_NOWHERE  1       /* Store ENV in memory only */

-#define CFG_ENV_ADDR           (CFG_MONITOR_BASE - 0x1000)
-#define CFG_ENV_SIZE           0x2000
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE - 0x1000)
+#define CONFIG_ENV_SIZE                0x2000

 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */

diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index 7b5c402e9b99bbdb8d419ccce2890d003cc40abc..fc55febeeec9cc9a59a3fd475e72cf93e3bece6d 100644 (file)
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -505,13 +505,13 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
  */
 #ifndef CFG_RAMBOOT
     #define CONFIG_ENV_IS_IN_FLASH     1
  */
 #ifndef CFG_RAMBOOT
     #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
+    #define CONFIG_ENV_ADDR            (CFG_MONITOR_BASE + 0x60000)
+    #define CONFIG_ENV_SECT_SIZE               0x10000 /* 64K(one sector) for env */
+    #define CONFIG_ENV_SIZE            0x2000

 #else
     #define CONFIG_ENV_IS_NOWHERE      1       /* Store ENV in memory only */
 #else
     #define CONFIG_ENV_IS_NOWHERE      1       /* Store ENV in memory only */

-    #define CFG_ENV_ADDR               (CFG_MONITOR_BASE - 0x1000)
-    #define CFG_ENV_SIZE               0x2000
+    #define CONFIG_ENV_ADDR            (CFG_MONITOR_BASE - 0x1000)
+    #define CONFIG_ENV_SIZE            0x2000

 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */

diff --git a/include/configs/MUSENKI.h b/include/configs/MUSENKI.h
index 4a7540ec592c058c434455fc3a7be420b20a0cd7..88d807218213e11b578551d5b76c194a327658b7 100644 (file)
--- a/include/configs/MUSENKI.h
+++ b/include/configs/MUSENKI.h
@@ -281,9 +281,9 @@
         * It's stored in flash separately.
         */
 #define CONFIG_ENV_IS_IN_FLASH     1
         * It's stored in flash separately.
         */
 #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       */
+#define CONFIG_ENV_ADDR                0xFFFF0000
+#define CONFIG_ENV_SIZE                0x00010000 /* Size of the Environment           */
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* Size of the Environment Sector       */

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/MVBC_P.h b/include/configs/MVBC_P.h
index bf06ef831a2d8fecf2d58272f8ef5190c47ac054..21475fb665b73ae4dba7d73056da4b6e150ebcbe 100644 (file)
--- a/include/configs/MVBC_P.h
+++ b/include/configs/MVBC_P.h
@@ -218,11 +218,11 @@
 #define CONFIG_ENV_IS_IN_FLASH
 #undef CFG_FLASH_PROTECTION
 
 #define CONFIG_ENV_IS_IN_FLASH
 #undef CFG_FLASH_PROTECTION
 

-#define CFG_ENV_ADDR           0xFFFE0000
-#define CFG_ENV_SIZE           0x10000
-#define CFG_ENV_SECT_SIZE      0x10000
-#define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR+CFG_ENV_SIZE)
-#define CFG_ENV_SIZE_REDUND    CFG_ENV_SIZE
+#define CONFIG_ENV_ADDR                0xFFFE0000
+#define CONFIG_ENV_SIZE                0x10000
+#define CONFIG_ENV_SECT_SIZE   0x10000
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE

 
 /*
  * Memory map
 
 /*
  * Memory map


@@ -243,7 +243,7 @@
 #define CFG_RAMBOOT            1
 #endif
 
 #define CFG_RAMBOOT            1
 #endif
 

-/* CFG_MONITOR_LEN must be a multiple of CFG_ENV_SECT_SIZE */
+/* CFG_MONITOR_LEN must be a multiple of CONFIG_ENV_SECT_SIZE */

 #define CFG_MONITOR_LEN                (512 << 10)
 #define CFG_MALLOC_LEN         (512 << 10)
 #define CFG_BOOTMAPSZ          (8 << 20)
 #define CFG_MONITOR_LEN                (512 << 10)
 #define CFG_MALLOC_LEN         (512 << 10)
 #define CFG_BOOTMAPSZ          (8 << 20)

diff --git a/include/configs/MVBLM7.h b/include/configs/MVBLM7.h
index b8288571ab32ba181dee8523c5d5e9d59331e705..ec36f55420cb762004b212827190e5d51ba5c9ed 100644 (file)
--- a/include/configs/MVBLM7.h
+++ b/include/configs/MVBLM7.h
@@ -139,7 +139,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_GBL_DATA_OFFSET    (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
 #define CFG_INIT_SP_OFFSET     CFG_GBL_DATA_OFFSET
 

-/* CFG_MONITOR_LEN must be a multiple of CFG_ENV_SECT_SIZE */
+/* CFG_MONITOR_LEN must be a multiple of CONFIG_ENV_SECT_SIZE */

 #define CFG_MONITOR_LEN                (512 * 1024)
 #define CFG_MALLOC_LEN         (512 * 1024)
 
 #define CFG_MONITOR_LEN                (512 * 1024)
 #define CFG_MALLOC_LEN         (512 * 1024)
 


@@ -256,11 +256,11 @@
 #define CONFIG_ENV_OVERWRITE
 
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CONFIG_ENV_OVERWRITE
 
 #define CONFIG_ENV_IS_IN_FLASH 1

-#define CFG_ENV_ADDR           0xFF800000
-#define CFG_ENV_SIZE           0x2000
-#define CFG_ENV_SECT_SIZE      0x2000
-#define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR+CFG_ENV_SIZE)
-#define CFG_ENV_SIZE_REDUND    CFG_ENV_SIZE
+#define CONFIG_ENV_ADDR                0xFF800000
+#define CONFIG_ENV_SIZE                0x2000
+#define CONFIG_ENV_SECT_SIZE   0x2000
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
+#define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE

 
 #define CONFIG_LOADS_ECHO
 #define CFG_LOADS_BAUD_CHANGE
 
 #define CONFIG_LOADS_ECHO
 #define CFG_LOADS_BAUD_CHANGE

diff --git a/include/configs/MVBLUE.h b/include/configs/MVBLUE.h
index 819e72542e285a40faf03556594343d6bd0ff7df..2518dbe30e9b928a87a491f4ef0d18a2c2e00fb5 100644 (file)
--- a/include/configs/MVBLUE.h
+++ b/include/configs/MVBLUE.h
@@ -330,9 +330,9 @@
 
 #define CONFIG_ENV_IS_IN_FLASH
 
 
 #define CONFIG_ENV_IS_IN_FLASH
 

-#define CFG_ENV_OFFSET         0x00010000
-#define CFG_ENV_SIZE           0x00010000
-#define CFG_ENV_SECT_SIZE      0x00010000
+#define CONFIG_ENV_OFFSET              0x00010000
+#define CONFIG_ENV_SIZE                0x00010000
+#define CONFIG_ENV_SECT_SIZE   0x00010000

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/MVS1.h b/include/configs/MVS1.h
index df1586bdfe384a7775735b4021614226c8959a40..da8231c2bffbd6b2203f290fcd9ac7d88e6c3b88 100644 (file)
--- a/include/configs/MVS1.h
+++ b/include/configs/MVS1.h
@@ -177,8 +177,8 @@
 #define        CONFIG_ENV_IS_IN_FLASH  1
 
 /* 4MB flash - use bottom sectors of a bottom boot sector flash (16 bit access) */
 #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) */
-#define        CFG_ENV_SIZE            0x2000  /* Used Size of Environment Sector 8k   */
+#define        CONFIG_ENV_OFFSET               0x8000  /* Offset of Environment Sector (bottom boot sector) */
+#define        CONFIG_ENV_SIZE         0x2000  /* Used Size of Environment Sector 8k   */

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h
index 59d6e9a131f65cb25c59b8982e3f9c8d2594341d..7d90e1674a626321017987b1f88cb15cae6f0806 100644 (file)
--- a/include/configs/MigoR.h
+++ b/include/configs/MigoR.h
@@ -132,12 +132,12 @@
 /* ENV setting */
 #define CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_OVERWRITE   1
 /* ENV setting */
 #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)
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + CFG_MONITOR_LEN)
+#define CONFIG_ENV_SECT_SIZE   (128 * 1024)
+#define CONFIG_ENV_SIZE                (CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + CFG_MONITOR_LEN)

 /* Offset of env Flash sector relative to CFG_FLASH_BASE */
 /* Offset of env Flash sector relative to CFG_FLASH_BASE */

-#define CFG_ENV_OFFSET         (CFG_ENV_ADDR - CFG_FLASH_BASE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SECT_SIZE)
+#define CONFIG_ENV_OFFSET              (CONFIG_ENV_ADDR - CFG_FLASH_BASE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SECT_SIZE)

 
 /* Board Clock */
 #define CONFIG_SYS_CLK_FREQ    33333333
 
 /* Board Clock */
 #define CONFIG_SYS_CLK_FREQ    33333333

diff --git a/include/configs/NC650.h b/include/configs/NC650.h
index 22bd0f070c23c3d557f1d19fdf76f2a18a4b79d4..3e64a7ef8e51e46822a7a8861259707cad1994f8 100644 (file)
--- a/include/configs/NC650.h
+++ b/include/configs/NC650.h
@@ -233,10 +233,10 @@
 
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 
 
 #define        CONFIG_ENV_IS_IN_FLASH  1

-#define CFG_ENV_OFFSET         0x00740000
+#define CONFIG_ENV_OFFSET              0x00740000

 
 

-#define CFG_ENV_SECT_SIZE      0x20000 /* Total Size of Environment sector     */
-#define        CFG_ENV_SIZE            0x4000  /* Used Size of Environment Sector      */
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* Total Size of Environment sector     */
+#define        CONFIG_ENV_SIZE         0x4000  /* Used Size of Environment Sector      */

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/NETPHONE.h b/include/configs/NETPHONE.h
index ac4c42493e6c022de8f94d5cd76cf7a911445fba..7cc6364bda2999c55ff3c7ec53db42e1905e9d1e 100644 (file)
--- a/include/configs/NETPHONE.h
+++ b/include/configs/NETPHONE.h
@@ -217,15 +217,15 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1

-#define CFG_ENV_SECT_SIZE      0x10000
+#define CONFIG_ENV_SECT_SIZE   0x10000

 
 

-#define        CFG_ENV_ADDR            (CFG_FLASH_BASE + 0x60000)
-#define CFG_ENV_OFFSET         0
-#define        CFG_ENV_SIZE            0x4000
+#define        CONFIG_ENV_ADDR         (CFG_FLASH_BASE + 0x60000)
+#define CONFIG_ENV_OFFSET              0
+#define        CONFIG_ENV_SIZE         0x4000

 
 

-#define CFG_ENV_ADDR_REDUND    (CFG_FLASH_BASE + 0x70000)
-#define CFG_ENV_OFFSET_REDUND  0
-#define CFG_ENV_SIZE_REDUND    CFG_ENV_SIZE
+#define CONFIG_ENV_ADDR_REDUND (CFG_FLASH_BASE + 0x70000)
+#define CONFIG_ENV_OFFSET_REDUND       0
+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/NETTA.h b/include/configs/NETTA.h
index 80aee5bc2aa838363d9f4ddd65bef78ec2109b3b..805b82a5a7f0706cbf71f82b394c0a42799f0341 100644 (file)
--- a/include/configs/NETTA.h
+++ b/include/configs/NETTA.h
@@ -221,15 +221,15 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1

-#define CFG_ENV_SECT_SIZE      0x10000
+#define CONFIG_ENV_SECT_SIZE   0x10000

 
 

-#define        CFG_ENV_ADDR            (CFG_FLASH_BASE + 0x60000)
-#define CFG_ENV_OFFSET         0
-#define        CFG_ENV_SIZE            0x4000
+#define        CONFIG_ENV_ADDR         (CFG_FLASH_BASE + 0x60000)
+#define CONFIG_ENV_OFFSET              0
+#define        CONFIG_ENV_SIZE         0x4000

 
 

-#define CFG_ENV_ADDR_REDUND    (CFG_FLASH_BASE + 0x70000)
-#define CFG_ENV_OFFSET_REDUND  0
-#define CFG_ENV_SIZE_REDUND    CFG_ENV_SIZE
+#define CONFIG_ENV_ADDR_REDUND (CFG_FLASH_BASE + 0x70000)
+#define CONFIG_ENV_OFFSET_REDUND       0
+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/NETTA2.h b/include/configs/NETTA2.h
index 6cb39d9f836e970dc08e01ce0e7705611b2e7b46..687db1d2e974406314f3b89892130a17a852d38f 100644 (file)
--- a/include/configs/NETTA2.h
+++ b/include/configs/NETTA2.h
@@ -218,15 +218,15 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1

-#define CFG_ENV_SECT_SIZE      0x10000
+#define CONFIG_ENV_SECT_SIZE   0x10000

 
 

-#define        CFG_ENV_ADDR            (CFG_FLASH_BASE + 0x60000)
-#define CFG_ENV_OFFSET         0
-#define        CFG_ENV_SIZE            0x4000
+#define        CONFIG_ENV_ADDR         (CFG_FLASH_BASE + 0x60000)
+#define CONFIG_ENV_OFFSET              0
+#define        CONFIG_ENV_SIZE         0x4000

 
 

-#define CFG_ENV_ADDR_REDUND    (CFG_FLASH_BASE + 0x70000)
-#define CFG_ENV_OFFSET_REDUND  0
-#define CFG_ENV_SIZE_REDUND    CFG_ENV_SIZE
+#define CONFIG_ENV_ADDR_REDUND (CFG_FLASH_BASE + 0x70000)
+#define CONFIG_ENV_OFFSET_REDUND       0
+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/NETVIA.h b/include/configs/NETVIA.h
index 0d318e8247ad8750973027d0aa98a3092d112d14..e55003028d9df4c57741ffa44b94b0577d19b35b 100644 (file)
--- a/include/configs/NETVIA.h
+++ b/include/configs/NETVIA.h
@@ -188,15 +188,15 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1

-#define CFG_ENV_SECT_SIZE      0x10000
+#define CONFIG_ENV_SECT_SIZE   0x10000

 
 

-#define        CFG_ENV_ADDR            (CFG_FLASH_BASE + 0x60000)
-#define CFG_ENV_OFFSET         0
-#define        CFG_ENV_SIZE            0x4000
+#define        CONFIG_ENV_ADDR         (CFG_FLASH_BASE + 0x60000)
+#define CONFIG_ENV_OFFSET              0
+#define        CONFIG_ENV_SIZE         0x4000

 
 

-#define CFG_ENV_ADDR_REDUND    (CFG_FLASH_BASE + 0x70000)
-#define CFG_ENV_OFFSET_REDUND  0
-#define CFG_ENV_SIZE_REDUND    CFG_ENV_SIZE
+#define CONFIG_ENV_ADDR_REDUND (CFG_FLASH_BASE + 0x70000)
+#define CONFIG_ENV_OFFSET_REDUND       0
+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/NSCU.h b/include/configs/NSCU.h
index 9991d6997614355d685d627c6d04b2c6a1072168..e297c84abcc7c8c1cfe6cee200d7bf14e69f0606 100644 (file)
--- a/include/configs/NSCU.h
+++ b/include/configs/NSCU.h
@@ -208,12 +208,12 @@
 #define CFG_MAX_FLASH_SECT     71      /* max number of sectors on one chip */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_MAX_FLASH_SECT     71      /* max number of sectors on one chip */
 
 #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     */
+#define        CONFIG_ENV_OFFSET               0x8000  /*   Offset   of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* Address and size of Redundant Environment Sector    */

-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET+CFG_ENV_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 

diff --git a/include/configs/NX823.h b/include/configs/NX823.h
index eddb52bece2c55d440578c35e685c7c79df669db..1f4c329f8282157fb668b73354fa173af246ca35 100644 (file)
--- a/include/configs/NX823.h
+++ b/include/configs/NX823.h
@@ -150,11 +150,11 @@
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define xEMBED
 #ifdef EMBED
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define xEMBED
 #ifdef EMBED

-#define CFG_ENV_SIZE           0x200   /* FIXME How big when embedded?? */
-#define CFG_ENV_ADDR           CFG_MONITOR_BASE
+#define CONFIG_ENV_SIZE                0x200   /* FIXME How big when embedded?? */
+#define CONFIG_ENV_ADDR                CFG_MONITOR_BASE

 #else
 #else

-#define CFG_ENV_ADDR           0x40020000      /* absolute address for now   */
-#define CFG_ENV_SIZE           0x20000 /* 8K ouch, this may later be */
+#define CONFIG_ENV_ADDR                0x40020000      /* absolute address for now   */
+#define CONFIG_ENV_SIZE                0x20000 /* 8K ouch, this may later be */

 #endif
 
 #define CFG_FLASH_SN_BASE      0x4001fff0      /* programmer automagically puts    */
 #endif
 
 #define CFG_FLASH_SN_BASE      0x4001fff0      /* programmer automagically puts    */

diff --git a/include/configs/OCRTC.h b/include/configs/OCRTC.h
index f839eadd46cf61f788603e80357a706fbd9d9949..17b00a15f9bae72f7e41e3895552c8459d808ab6 100644 (file)
--- a/include/configs/OCRTC.h
+++ b/include/configs/OCRTC.h
@@ -192,16 +192,16 @@
 #define CONFIG_ENV_IS_IN_NVRAM 1       /* use NVRAM for environment vars       */
 #define CFG_NVRAM_BASE_ADDR    0xf0200000              /* NVRAM base address   */
 #define CFG_NVRAM_SIZE         (32*1024)               /* NVRAM size           */
 #define CONFIG_ENV_IS_IN_NVRAM 1       /* use NVRAM for environment vars       */
 #define CFG_NVRAM_BASE_ADDR    0xf0200000              /* NVRAM base address   */
 #define CFG_NVRAM_SIZE         (32*1024)               /* NVRAM size           */

-#define CFG_ENV_SIZE           0x1000          /* Size of Environment vars     */
-#define CFG_ENV_ADDR           \
-       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)       /* Env  */
+#define CONFIG_ENV_SIZE                0x1000          /* Size of Environment vars     */
+#define CONFIG_ENV_ADDR                \
+       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CONFIG_ENV_SIZE)    /* Env  */

 #define CFG_NVRAM_VXWORKS_OFFS 0x6900          /* Offset for VxWorks eth-addr  */
 
 #else /* Use EEPROM for environment variables */
 
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
 #define CFG_NVRAM_VXWORKS_OFFS 0x6900          /* Offset for VxWorks eth-addr  */
 
 #else /* Use EEPROM for environment variables */
 
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */

-#define CFG_ENV_OFFSET         0x000   /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE           0x300   /* 768 bytes may be used for env vars */
+#define CONFIG_ENV_OFFSET              0x000   /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE                0x300   /* 768 bytes may be used for env vars */

                                   /* total size of a CAT24WC08 is 1024 bytes */
 #endif
 
                                   /* total size of a CAT24WC08 is 1024 bytes */
 #endif
 

diff --git a/include/configs/ORSG.h b/include/configs/ORSG.h
index 18f14bc8f16b94832565690567e71a15c97748aa..4f4b13ddbf45241c2d6770949eb08886aa6729c0 100644 (file)
--- a/include/configs/ORSG.h
+++ b/include/configs/ORSG.h
@@ -190,16 +190,16 @@
 #define CONFIG_ENV_IS_IN_NVRAM 1       /* use NVRAM for environment vars       */
 #define CFG_NVRAM_BASE_ADDR    0xf0200000              /* NVRAM base address   */
 #define CFG_NVRAM_SIZE         (32*1024)               /* NVRAM size           */
 #define CONFIG_ENV_IS_IN_NVRAM 1       /* use NVRAM for environment vars       */
 #define CFG_NVRAM_BASE_ADDR    0xf0200000              /* NVRAM base address   */
 #define CFG_NVRAM_SIZE         (32*1024)               /* NVRAM size           */

-#define CFG_ENV_SIZE           0x1000          /* Size of Environment vars     */
-#define CFG_ENV_ADDR           \
-       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)       /* Env  */
+#define CONFIG_ENV_SIZE                0x1000          /* Size of Environment vars     */
+#define CONFIG_ENV_ADDR                \
+       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CONFIG_ENV_SIZE)    /* Env  */

 #define CFG_NVRAM_VXWORKS_OFFS 0x6900          /* Offset for VxWorks eth-addr  */
 
 #else /* Use EEPROM for environment variables */
 
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
 #define CFG_NVRAM_VXWORKS_OFFS 0x6900          /* Offset for VxWorks eth-addr  */
 
 #else /* Use EEPROM for environment variables */
 
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */

-#define CFG_ENV_OFFSET         0x000   /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE           0x300   /* 768 bytes may be used for env vars */
+#define CONFIG_ENV_OFFSET              0x000   /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE                0x300   /* 768 bytes may be used for env vars */

                                   /* total size of a CAT24WC08 is 1024 bytes */
 #endif
 
                                   /* total size of a CAT24WC08 is 1024 bytes */
 #endif
 

diff --git a/include/configs/OXC.h b/include/configs/OXC.h
index d9b4224fe1e66d122153cec6c3f686f2717601ee..2ccaf47411cfa387a253039b93227fda6797c559 100644 (file)
--- a/include/configs/OXC.h
+++ b/include/configs/OXC.h
@@ -194,9 +194,9 @@
  */
 
 #define CONFIG_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  */
+#define CONFIG_ENV_ADDR                0xFFF30000      /* Offset of Environment Sector */
+#define CONFIG_ENV_SIZE                0x00010000      /* Total Size of Environment Sector */
+#define        CONFIG_ENV_IS_EMBEDDED  1               /* short-cut compile-time test  */

 #define CONFIG_ENV_OVERWRITE    1              /* Allow modifying the environment */
 
 /*
 #define CONFIG_ENV_OVERWRITE    1              /* Allow modifying the environment */
 
 /*

diff --git a/include/configs/P3G4.h b/include/configs/P3G4.h
index 232044b084f506072e13041798e302d760516b41..815009182d50782ebc4ab72a0bb300e46779d222 100644 (file)
--- a/include/configs/P3G4.h
+++ b/include/configs/P3G4.h
@@ -398,9 +398,9 @@
 #define CFG_FLASH_CFI          1
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_CFI          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
+#define        CONFIG_ENV_SIZE         0x1000  /* Total Size of Environment Sector */
+#define CONFIG_ENV_SECT_SIZE   0x20000
+#define CONFIG_ENV_ADDR                0xFFFE0000

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/PATI.h b/include/configs/PATI.h
index 96150447c71759c34df0b6ab7b933a033b78d6a6..42b155e513471d23ef3b43ff035a2d3637e72c3a 100644 (file)
--- a/include/configs/PATI.h
+++ b/include/configs/PATI.h
@@ -174,14 +174,14 @@
 
 #define        CONFIG_ENV_IS_IN_EEPROM
 #ifdef CONFIG_ENV_IS_IN_EEPROM
 
 #define        CONFIG_ENV_IS_IN_EEPROM
 #ifdef CONFIG_ENV_IS_IN_EEPROM

-#define CFG_ENV_OFFSET         0
-#define CFG_ENV_SIZE           2048
+#define CONFIG_ENV_OFFSET              0
+#define CONFIG_ENV_SIZE                2048

 #endif
 
 #undef  CONFIG_ENV_IS_IN_FLASH
 #ifdef CONFIG_ENV_IS_IN_FLASH
 #endif
 
 #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    */
+#define        CONFIG_ENV_SIZE         0x00002000              /* Set whole sector as env              */
+#define CONFIG_ENV_OFFSET              ((0 - CFG_FLASH_BASE) - CONFIG_ENV_SIZE)                /* Environment starts at this adress    */

 #endif
 
 
 #endif
 
 

diff --git a/include/configs/PCI405.h b/include/configs/PCI405.h
index 6c6a4703d92a0cc3402569b0e9bc40233152fb17..2837b51175c2d33d8d6d027feda7c0f2366a23d8 100644 (file)
--- a/include/configs/PCI405.h
+++ b/include/configs/PCI405.h
@@ -219,15 +219,15 @@
  * NVRAM organization
  */
 #define CONFIG_ENV_IS_IN_NVRAM 1       /* use NVRAM for environment vars       */
  * NVRAM organization
  */
 #define CONFIG_ENV_IS_IN_NVRAM 1       /* use NVRAM for environment vars       */

-#define CFG_ENV_SIZE           0x0ff8          /* Size of Environment vars     */
-#define CFG_ENV_ADDR           \
-       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-(CFG_ENV_SIZE+8))   /* Env  */
+#define CONFIG_ENV_SIZE                0x0ff8          /* Size of Environment vars     */
+#define CONFIG_ENV_ADDR                \
+       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-(CONFIG_ENV_SIZE+8))        /* Env  */

 
 #else /* Use EEPROM for environment variables */
 
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
 
 #else /* Use EEPROM for environment variables */
 
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */

-#define CFG_ENV_OFFSET         0x000   /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE           0x400   /* 1024 bytes may be used for env vars*/
+#define CONFIG_ENV_OFFSET              0x000   /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE                0x400   /* 1024 bytes may be used for env vars*/

                                   /* total size of a CAT24WC08 is 1024 bytes */
 #endif
 
                                   /* total size of a CAT24WC08 is 1024 bytes */
 #endif
 

diff --git a/include/configs/PCI5441.h b/include/configs/PCI5441.h
index 94f6f93454c670d80c4d396abfc6ad5e3a880b6c..b88a17344b884a9380975029f90528cfd21ef7d9 100644 (file)
--- a/include/configs/PCI5441.h
+++ b/include/configs/PCI5441.h
@@ -61,7 +61,7 @@
  *----------------------------------------------------------------------*/
 #define CFG_MONITOR_LEN                (128 * 1024)    /* Reserve 128k         */
 #define CFG_GBL_DATA_SIZE      128             /* Global data size rsvd*/
  *----------------------------------------------------------------------*/
 #define CFG_MONITOR_LEN                (128 * 1024)    /* Reserve 128k         */
 #define CFG_GBL_DATA_SIZE      128             /* Global data size rsvd*/

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)

 
 #define CFG_MONITOR_BASE       TEXT_BASE
 #define CFG_MALLOC_BASE                (CFG_MONITOR_BASE - CFG_MALLOC_LEN)
 
 #define CFG_MONITOR_BASE       TEXT_BASE
 #define CFG_MALLOC_BASE                (CFG_MONITOR_BASE - CFG_MALLOC_LEN)


@@ -85,9 +85,9 @@
  * (which is common practice).
  *----------------------------------------------------------------------*/
 #define        CONFIG_ENV_IS_IN_FLASH  1               /* Environment in flash */
  * (which is common practice).
  *----------------------------------------------------------------------*/
 #define        CONFIG_ENV_IS_IN_FLASH  1               /* Environment in flash */

-#define CFG_ENV_SIZE           (64 * 1024)     /* 64 KByte (1 sector)  */
+#define CONFIG_ENV_SIZE                (64 * 1024)     /* 64 KByte (1 sector)  */

 #define CONFIG_ENV_OVERWRITE                   /* Serial change Ok     */
 #define CONFIG_ENV_OVERWRITE                   /* Serial change Ok     */

-#define CFG_ENV_ADDR   (CFG_RESET_ADDR + CFG_MONITOR_LEN)
+#define CONFIG_ENV_ADDR        (CFG_RESET_ADDR + CFG_MONITOR_LEN)

 
 /*------------------------------------------------------------------------
  * CONSOLE
 
 /*------------------------------------------------------------------------
  * CONSOLE

diff --git a/include/configs/PCIPPC2.h b/include/configs/PCIPPC2.h
index af3b8ee5a2a45eeb23813d0687786dff8d1f2826..048e8964d6b67799436bdc6281cb9faf45e2fd1c 100644 (file)
--- a/include/configs/PCIPPC2.h
+++ b/include/configs/PCIPPC2.h
@@ -222,9 +222,9 @@
  * It's stored in flash separately.
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
  * It's stored in flash separately.
  */
 #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       */
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x70000)
+#define CONFIG_ENV_SIZE                0x1000  /* Size of the Environment              */
+#define CONFIG_ENV_SECT_SIZE   0x10000 /* Size of the Environment Sector       */

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/PCIPPC6.h b/include/configs/PCIPPC6.h
index e229bde246f0852975cd2b788509581ac1d6d55c..acaab7fbf69e4e2a3b52dcfcf45624eccf86b5c4 100644 (file)
--- a/include/configs/PCIPPC6.h
+++ b/include/configs/PCIPPC6.h
@@ -224,9 +224,9 @@
  * It's stored in flash separately.
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
  * It's stored in flash separately.
  */
 #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       */
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x70000)
+#define CONFIG_ENV_SIZE                0x1000  /* Size of the Environment              */
+#define CONFIG_ENV_SECT_SIZE   0x10000 /* Size of the Environment Sector       */

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index 7876177f04aa41a37ebec25db677e6098667ecd8..895b89c20468baa6618853b2faca541ff52321ea 100644 (file)
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -96,8 +96,8 @@
 #define CFG_I2C_EEPROM_ADDR    0x53
 #define CFG_I2C_EEPROM_ADDR_LEN        2
 #define CONFIG_ENV_IS_IN_EEPROM    1       /* use EEPROM for environment vars */
 #define CFG_I2C_EEPROM_ADDR    0x53
 #define CFG_I2C_EEPROM_ADDR_LEN        2
 #define CONFIG_ENV_IS_IN_EEPROM    1       /* use EEPROM for environment vars */

-#define CFG_ENV_OFFSET          0x000   /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE            0x800   /* 2 kBytes may be used for env vars */
+#define CONFIG_ENV_OFFSET          0x000   /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE            0x800   /* 2 kBytes may be used for env vars */

 
 #undef CFG_I2C_EEPROM_ADDR_OVERFLOW
 #define CFG_EEPROM_PAGE_WRITE_BITS 6   /* The Atmel 24C128/256 has     */
 
 #undef CFG_I2C_EEPROM_ADDR_OVERFLOW
 #define CFG_EEPROM_PAGE_WRITE_BITS 6   /* The Atmel 24C128/256 has     */

diff --git a/include/configs/PK1C20.h b/include/configs/PK1C20.h
index 48e9269d99bcd061955623f8b6f829063bee3023..5d2bc2f9249559afb6188b6c7ba621daec490c96 100644 (file)
--- a/include/configs/PK1C20.h
+++ b/include/configs/PK1C20.h
@@ -63,7 +63,7 @@
  *----------------------------------------------------------------------*/
 #define CFG_MONITOR_LEN                (256 * 1024)    /* Reserve 128k         */
 #define CFG_GBL_DATA_SIZE      128             /* Global data size rsvd*/
  *----------------------------------------------------------------------*/
 #define CFG_MONITOR_LEN                (256 * 1024)    /* Reserve 128k         */
 #define CFG_GBL_DATA_SIZE      128             /* Global data size rsvd*/

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)

 
 #define CFG_MONITOR_BASE       TEXT_BASE
 #define CFG_MALLOC_BASE                (CFG_MONITOR_BASE - CFG_MALLOC_LEN)
 
 #define CFG_MONITOR_BASE       TEXT_BASE
 #define CFG_MALLOC_BASE                (CFG_MONITOR_BASE - CFG_MALLOC_LEN)


@@ -87,9 +87,9 @@
  * (which is common practice).
  *----------------------------------------------------------------------*/
 #define CONFIG_ENV_IS_IN_FLASH 1               /* Environment in flash */
  * (which is common practice).
  *----------------------------------------------------------------------*/
 #define CONFIG_ENV_IS_IN_FLASH 1               /* Environment in flash */

-#define CFG_ENV_SIZE           (64 * 1024)     /* 64 KByte (1 sector)  */
+#define CONFIG_ENV_SIZE                (64 * 1024)     /* 64 KByte (1 sector)  */

 #define CONFIG_ENV_OVERWRITE                   /* Serial change Ok     */
 #define CONFIG_ENV_OVERWRITE                   /* Serial change Ok     */

-#define CFG_ENV_ADDR   (CFG_RESET_ADDR + CFG_MONITOR_LEN)
+#define CONFIG_ENV_ADDR        (CFG_RESET_ADDR + CFG_MONITOR_LEN)

 
 /*------------------------------------------------------------------------
  * CONSOLE
 
 /*------------------------------------------------------------------------
  * CONSOLE

diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h
index 75cdc2fcfb9bedf79f1ce5e5c79ed75a8630e65e..8463ed52b9941c35647939d8ae522bcf59e32e60 100644 (file)
--- a/include/configs/PLU405.h
+++ b/include/configs/PLU405.h
@@ -274,8 +274,8 @@
  * Environment Variable setup
  */
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
  * Environment Variable setup
  */
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */

-#define CFG_ENV_OFFSET         0x100   /* reseve 0x100 bytes for strapping */
-#define CFG_ENV_SIZE           0x700
+#define CONFIG_ENV_OFFSET              0x100   /* reseve 0x100 bytes for strapping */
+#define CONFIG_ENV_SIZE                0x700

 
 /*
  * I2C EEPROM (24WC16) for environment
 
 /*
  * I2C EEPROM (24WC16) for environment

diff --git a/include/configs/PM520.h b/include/configs/PM520.h
index 4da84ca9ff63d6223ee98ae1be8e742c9a795c55..2676d7d357f704b0bd9e69646915f474e21a3514 100644 (file)
--- a/include/configs/PM520.h
+++ b/include/configs/PM520.h
@@ -212,7 +212,7 @@
 #define CFG_FLASH_SIZE         0x04000000
 #define CFG_BOOTROM_BASE       0xFFF00000
 #define CFG_BOOTROM_SIZE       0x00080000
 #define CFG_FLASH_SIZE         0x04000000
 #define CFG_BOOTROM_BASE       0xFFF00000
 #define CFG_BOOTROM_SIZE       0x00080000

-#define CFG_ENV_ADDR           (0xFDF00000 + 0x40000)
+#define CONFIG_ENV_ADDR                (0xFDF00000 + 0x40000)

 #else
 /*
  * Flash configuration (8,16 or 32 MB)
 #else
 /*
  * Flash configuration (8,16 or 32 MB)


@@ -225,7 +225,7 @@
  */
 #define CFG_FLASH_BASE         0xFC000000
 #define CFG_FLASH_SIZE         0x04000000
  */
 #define CFG_FLASH_BASE         0xFC000000
 #define CFG_FLASH_SIZE         0x04000000

-#define CFG_ENV_ADDR           (0xFFF00000 + 0x40000)
+#define CONFIG_ENV_ADDR                (0xFFF00000 + 0x40000)

 #endif
 #define CFG_MAX_FLASH_BANKS    1       /* max num of memory banks      */
 
 #endif
 #define CFG_MAX_FLASH_BANKS    1       /* max num of memory banks      */
 


@@ -246,8 +246,8 @@
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_FLASH 1

-#define CFG_ENV_SIZE           0x10000
-#define CFG_ENV_SECT_SIZE      0x40000
+#define CONFIG_ENV_SIZE                0x10000
+#define CONFIG_ENV_SECT_SIZE   0x40000

 #define CONFIG_ENV_OVERWRITE   1
 
 /*
 #define CONFIG_ENV_OVERWRITE   1
 
 /*

diff --git a/include/configs/PM826.h b/include/configs/PM826.h
index 0782ff0c470bf557c6f148fe7d8e8a56ceefd644..f6253613f19f9ec6ead4219d51ce6a1e991eb68b 100644 (file)
--- a/include/configs/PM826.h
+++ b/include/configs/PM826.h
@@ -258,9 +258,9 @@
 #if 0
 /* Start port with environment in flash; switch to EEPROM later */
 #define CONFIG_ENV_IS_IN_FLASH 1
 #if 0
 /* Start port with environment in flash; switch to EEPROM later */
 #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
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE+0x40000)
+#define CONFIG_ENV_SIZE                0x40000
+#define CONFIG_ENV_SECT_SIZE   0x40000

 #else
 /* Final version: environment in EEPROM */
 #define CONFIG_ENV_IS_IN_EEPROM        1
 #else
 /* Final version: environment in EEPROM */
 #define CONFIG_ENV_IS_IN_EEPROM        1


@@ -268,8 +268,8 @@
 #define CFG_I2C_EEPROM_ADDR_LEN        1
 #define CFG_EEPROM_PAGE_WRITE_BITS     4
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10      /* and takes up to 10 msec */
 #define CFG_I2C_EEPROM_ADDR_LEN        1
 #define CFG_EEPROM_PAGE_WRITE_BITS     4
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10      /* and takes up to 10 msec */

-#define CFG_ENV_OFFSET         512
-#define CFG_ENV_SIZE           (2048 - 512)
+#define CONFIG_ENV_OFFSET              512
+#define CONFIG_ENV_SIZE                (2048 - 512)

 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/PM828.h b/include/configs/PM828.h
index a342824ef4c9d49e011f62586c26876590606406..f437d21c69b1128551d343f71e18485daf411c9f 100644 (file)
--- a/include/configs/PM828.h
+++ b/include/configs/PM828.h
@@ -251,9 +251,9 @@
 #if 0
 /* Start port with environment in flash; switch to EEPROM later */
 #define CONFIG_ENV_IS_IN_FLASH 1
 #if 0
 /* Start port with environment in flash; switch to EEPROM later */
 #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
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE+0x40000)
+#define CONFIG_ENV_SIZE                0x40000
+#define CONFIG_ENV_SECT_SIZE   0x40000

 #else
 /* Final version: environment in EEPROM */
 #define CONFIG_ENV_IS_IN_EEPROM        1
 #else
 /* Final version: environment in EEPROM */
 #define CONFIG_ENV_IS_IN_EEPROM        1


@@ -261,8 +261,8 @@
 #define CFG_I2C_EEPROM_ADDR_LEN 1
 #define CFG_EEPROM_PAGE_WRITE_BITS     4
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10      /* and takes up to 10 msec */
 #define CFG_I2C_EEPROM_ADDR_LEN 1
 #define CFG_EEPROM_PAGE_WRITE_BITS     4
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10      /* and takes up to 10 msec */

-#define CFG_ENV_OFFSET         512
-#define CFG_ENV_SIZE           (2048 - 512)
+#define CONFIG_ENV_OFFSET              512
+#define CONFIG_ENV_SIZE                (2048 - 512)

 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/PM854.h b/include/configs/PM854.h
index 8babcb2730b28f0fa007d1ab16439e0d90304fd0..1beee0fb4c67d76987eb9e5f83bec2ed9d048b66 100644 (file)
--- a/include/configs/PM854.h
+++ b/include/configs/PM854.h
@@ -294,14 +294,14 @@
  */
 #ifndef CFG_RAMBOOT
   #define CONFIG_ENV_IS_IN_FLASH       1
  */
 #ifndef CFG_RAMBOOT
   #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
+  #define CONFIG_ENV_ADDR              (CFG_MONITOR_BASE - 0x80000)
+  #define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */
+  #define CONFIG_ENV_SIZE              0x2000

 #else
   #define CFG_NO_FLASH         1       /* Flash is not usable now */
   #define CONFIG_ENV_IS_NOWHERE        1       /* Store ENV in memory only */
 #else
   #define CFG_NO_FLASH         1       /* Flash is not usable now */
   #define CONFIG_ENV_IS_NOWHERE        1       /* Store ENV in memory only */

-  #define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
-  #define CFG_ENV_SIZE         0x2000
+  #define CONFIG_ENV_ADDR              (CFG_MONITOR_BASE - 0x1000)
+  #define CONFIG_ENV_SIZE              0x2000

 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */

diff --git a/include/configs/PM856.h b/include/configs/PM856.h
index 9690bd7631c48f4be964ad5e8b150efa877fcbc5..9d535b6bb47eafd971f67118e2408cd17ef35aa0 100644 (file)
--- a/include/configs/PM856.h
+++ b/include/configs/PM856.h
@@ -294,14 +294,14 @@
  */
 #ifndef CFG_RAMBOOT
   #define CONFIG_ENV_IS_IN_FLASH       1
  */
 #ifndef CFG_RAMBOOT
   #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
+  #define CONFIG_ENV_ADDR              (CFG_MONITOR_BASE - 0x80000)
+  #define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */
+  #define CONFIG_ENV_SIZE              0x2000

 #else
   #define CFG_NO_FLASH         1       /* Flash is not usable now */
   #define CONFIG_ENV_IS_NOWHERE        1       /* Store ENV in memory only */
 #else
   #define CFG_NO_FLASH         1       /* Flash is not usable now */
   #define CONFIG_ENV_IS_NOWHERE        1       /* Store ENV in memory only */

-  #define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
-  #define CFG_ENV_SIZE         0x2000
+  #define CONFIG_ENV_ADDR              (CFG_MONITOR_BASE - 0x1000)
+  #define CONFIG_ENV_SIZE              0x2000

 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */

diff --git a/include/configs/PMC405.h b/include/configs/PMC405.h
index f6274229013f34743e136de409b204bfd845245e..e5430592d19142cf66cf22a245f9af7171bdba29 100644 (file)
--- a/include/configs/PMC405.h
+++ b/include/configs/PMC405.h
@@ -245,8 +245,8 @@
  * Environment Variable setup
  */
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
  * Environment Variable setup
  */
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */

-#define CFG_ENV_OFFSET         0x000   /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE           0x800   /* 2048 bytes may be used for env vars*/
+#define CONFIG_ENV_OFFSET              0x000   /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE                0x800   /* 2048 bytes may be used for env vars*/

                                   /* total size of a CAT24WC16 is 2048 bytes */
 
 #define CFG_NVRAM_BASE_ADDR    0xF0000500              /* NVRAM base address   */
                                   /* total size of a CAT24WC16 is 2048 bytes */
 
 #define CFG_NVRAM_BASE_ADDR    0xF0000500              /* NVRAM base address   */

diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h
index 7a787761d2b4d4b0f24efac6894097fb19d06ce9..467a11c10782b8b7a95e889e739fe2f64ef138b4 100644 (file)
--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@@ -108,7 +108,7 @@
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use FLASH for environment vars */
 #else
 #define CONFIG_ENV_IS_IN_NAND  1       /* use NAND for environment vars */
 #define CONFIG_ENV_IS_IN_EEPROM        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 */
+#define CONFIG_ENV_IS_EMBEDDED 1       /* use embedded environment */

 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------


@@ -137,18 +137,18 @@
 #define CFG_FLASH_QUIET_TEST   1       /* don't warn upon unknown flash        */
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_FLASH_QUIET_TEST   1       /* don't warn upon unknown 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     */
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* size of one complete sector          */
+#define CONFIG_ENV_ADDR                ((-CFG_MONITOR_LEN)-CONFIG_ENV_SECT_SIZE)
+#define        CONFIG_ENV_SIZE         0x2000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 #endif
 
 #ifdef CONFIG_ENV_IS_IN_EEPROM
 #endif
 
 #ifdef CONFIG_ENV_IS_IN_EEPROM

-#define CFG_ENV_OFFSET         0       /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE           0x1000  /* 4096 bytes may be used for env vars */
+#define CONFIG_ENV_OFFSET              0       /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE                0x1000  /* 4096 bytes may be used for env vars */

 #endif
 
 /*
 #endif
 
 /*


@@ -205,9 +205,9 @@
  * For NAND booting the environment is embedded in the U-Boot image. Please take
  * look at the file board/amcc/sequoia/u-boot-nand.lds for details.
  */
  * For NAND booting the environment is embedded in the U-Boot image. Please take
  * look at the file board/amcc/sequoia/u-boot-nand.lds for details.
  */

-#define CFG_ENV_SIZE           CFG_NAND_BLOCK_SIZE
-#define CFG_ENV_OFFSET         (CFG_NAND_U_BOOT_OFFS + CFG_ENV_SIZE)
-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET + CFG_ENV_SIZE)
+#define CONFIG_ENV_SIZE                CFG_NAND_BLOCK_SIZE
+#define CONFIG_ENV_OFFSET              (CFG_NAND_U_BOOT_OFFS + CONFIG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)

 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/PN62.h b/include/configs/PN62.h
index 074e8a1a98e44db360533245eb616c296750bded..192cbd411f87d830c7b7920bc62bcf781e3a45ca 100644 (file)
--- a/include/configs/PN62.h
+++ b/include/configs/PN62.h
@@ -161,8 +161,8 @@
 #define CFG_NO_FLASH           1               /* There is no FLASH memory     */
 
 #define CONFIG_ENV_IS_NOWHERE  1               /* Store ENV in memory only     */
 #define CFG_NO_FLASH           1               /* There is no FLASH memory     */
 
 #define CONFIG_ENV_IS_NOWHERE  1               /* Store ENV in memory only     */

-#define CFG_ENV_OFFSET         0x00004000      /* Offset of Environment Sector */
-#define CFG_ENV_SIZE           0x00002000      /* Total Size of Environment Sector */
+#define CONFIG_ENV_OFFSET              0x00004000      /* Offset of Environment Sector */
+#define CONFIG_ENV_SIZE                0x00002000      /* Total Size of Environment Sector */

 
 #define CFG_MALLOC_LEN         (512 << 10)     /* Reserve 512 kB for malloc()  */
 
 
 #define CFG_MALLOC_LEN         (512 << 10)     /* Reserve 512 kB for malloc()  */
 

diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h
index 81085ec0df2b19f08c07174f7095f8186562db14..cc3ef1c3925c100da07f273f6f12a7ccaee67827 100644 (file)
--- a/include/configs/PPChameleonEVB.h
+++ b/include/configs/PPChameleonEVB.h
@@ -418,16 +418,16 @@
 #ifdef ENVIRONMENT_IN_EEPROM
 
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
 #ifdef ENVIRONMENT_IN_EEPROM
 
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */

-#define CFG_ENV_OFFSET         0x100   /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE           0x700   /* 2048-256 bytes may be used for env vars (total size of a CAT24WC16 is 2048 bytes)*/
+#define CONFIG_ENV_OFFSET              0x100   /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE                0x700   /* 2048-256 bytes may be used for env vars (total size of a CAT24WC16 is 2048 bytes)*/

 
 #else  /* DEFAULT: environment in flash, using redundand flash sectors */
 
 #define CONFIG_ENV_IS_IN_FLASH 1       /* use FLASH for environment vars */
 
 #else  /* DEFAULT: environment in flash, using redundand flash sectors */
 
 #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
-#define CFG_ENV_SIZE_REDUND    0x2000
+#define CONFIG_ENV_ADDR                0xFFFF8000      /* environment starts at the first small sector */
+#define CONFIG_ENV_SECT_SIZE   0x2000  /* 8196 bytes may be used for env vars*/
+#define CONFIG_ENV_ADDR_REDUND 0xFFFFA000
+#define CONFIG_ENV_SIZE_REDUND 0x2000

 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 

diff --git a/include/configs/QS823.h b/include/configs/QS823.h
index 3c7fc6f9067120e172f878ded9044e7427a3d547..258605806e12cef1e954df46170fa7bb04bd7b06 100644 (file)
--- a/include/configs/QS823.h
+++ b/include/configs/QS823.h
@@ -224,9 +224,9 @@
  * Environment variable storage is in FLASH, one sector before U-boot
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
  * Environment variable storage is in FLASH, one sector before U-boot
  */
 #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 */
+#define CONFIG_ENV_SECT_SIZE   0x20000         /* 128Kb, one whole sector */
+#define CONFIG_ENV_SIZE                0x2000          /* 8kb */
+#define CONFIG_ENV_ADDR                0xffee0000      /* address of env sector */

 
 /*-----------------------------------------------------------------------
  * Miscellaneous configurable options
 
 /*-----------------------------------------------------------------------
  * Miscellaneous configurable options

diff --git a/include/configs/QS850.h b/include/configs/QS850.h
index 44daf520c19ce65cdb039ee259967821d70e1b2a..87a184b0ba80e7e1116bb98a9c555cd6b8a906af 100644 (file)
--- a/include/configs/QS850.h
+++ b/include/configs/QS850.h
@@ -224,9 +224,9 @@
  * Environment variable storage is in FLASH, one sector before U-boot
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
  * Environment variable storage is in FLASH, one sector before U-boot
  */
 #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 */
+#define CONFIG_ENV_SECT_SIZE   0x20000         /* 128Kb, one whole sector */
+#define CONFIG_ENV_SIZE                0x2000          /* 8kb */
+#define CONFIG_ENV_ADDR                0xffee0000      /* address of env sector */

 
 /*-----------------------------------------------------------------------
  * Miscellaneous configurable options
 
 /*-----------------------------------------------------------------------
  * Miscellaneous configurable options

diff --git a/include/configs/QS860T.h b/include/configs/QS860T.h
index dd792463016c305fd3b13e20b908ea6adedcd89f..54dbc308baf6bed7e3caf79543b113f9df1b1f2c 100644 (file)
--- a/include/configs/QS860T.h
+++ b/include/configs/QS860T.h
@@ -133,8 +133,8 @@ CONFIG_SPI
  * Environment variable storage is in NVRAM
  */
 #define CONFIG_ENV_IS_IN_NVRAM 1
  * Environment variable storage is in NVRAM
  */
 #define CONFIG_ENV_IS_IN_NVRAM 1

-#define CFG_ENV_SIZE           0x00001000      /* We use only the last 4K for PPCBoot */
-#define CFG_ENV_ADDR           0xD100E000
+#define CONFIG_ENV_SIZE                0x00001000      /* We use only the last 4K for PPCBoot */
+#define CONFIG_ENV_ADDR                0xD100E000

 
 /*
  * Miscellaneous configurable options
 
 /*
  * Miscellaneous configurable options

diff --git a/include/configs/R360MPI.h b/include/configs/R360MPI.h
index 26729fcb682194c6c283e17254212296d586a428..001ac1cf0f608fab72758ea3059e83d5f3c89fee 100644 (file)
--- a/include/configs/R360MPI.h
+++ b/include/configs/R360MPI.h
@@ -230,9 +230,9 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #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      */
+#define        CONFIG_ENV_OFFSET               0x40000 /* Offset of Environment                */
+#define        CONFIG_ENV_SECT_SIZE    0x20000 /* Total Size of Environment sector     */
+#define        CONFIG_ENV_SIZE         0x4000  /* Used Size of Environment sector      */

 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 /*-----------------------------------------------------------------------
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/RBC823.h b/include/configs/RBC823.h
index 8f5945090830dfd39d2ae6b4cd2bc3a16c4b5432..aec204b8d51aa3ec27f8c6d9bbc39fd17ea7cf3b 100644 (file)
--- a/include/configs/RBC823.h
+++ b/include/configs/RBC823.h
@@ -204,8 +204,8 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #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     */
+#define        CONFIG_ENV_OFFSET               0x10000 /*   Offset   of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x10000 /* Total Size of Environment Sector     */

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/RPXClassic.h b/include/configs/RPXClassic.h
index 50345e53e97bcfdd9846cbe0ca6c1f9e376179eb..4fa21b8fe38561689365f5ef66d90ff6fdd3afa8 100644 (file)
--- a/include/configs/RPXClassic.h
+++ b/include/configs/RPXClassic.h
@@ -220,13 +220,13 @@
 
 #if 0
 #define        CONFIG_ENV_IS_IN_FLASH  1
 
 #if 0
 #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  */
+#define        CONFIG_ENV_OFFSET               0x20000 /*   Offset   of Environment Sector  */
+#define CONFIG_ENV_SECT_SIZE       0x8000
+#define        CONFIG_ENV_SIZE         0x8000  /* Total Size of Environment Sector  */

 #else
 #define CONFIG_ENV_IS_IN_NVRAM     1
 #else
 #define CONFIG_ENV_IS_IN_NVRAM     1

-#define CFG_ENV_ADDR            0xfa000100
-#define CFG_ENV_SIZE            0x1000
+#define CONFIG_ENV_ADDR            0xfa000100
+#define CONFIG_ENV_SIZE            0x1000

 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/RPXlite.h b/include/configs/RPXlite.h
index 2e4710ac6f57376a981fa8f1a2230c77d1eecdde..2870659c67f43ac7c8b2e703f0e2453a801b9244 100644 (file)
--- a/include/configs/RPXlite.h
+++ b/include/configs/RPXlite.h
@@ -156,8 +156,8 @@
 #define        CFG_DIRECT_FLASH_TFTP
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define        CFG_DIRECT_FLASH_TFTP
 
 #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)
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* We use one complete sector           */
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + CFG_MONITOR_LEN)

 
 #define CONFIG_ENV_OVERWRITE
 
 
 #define CONFIG_ENV_OVERWRITE
 

diff --git a/include/configs/RPXlite_DW.h b/include/configs/RPXlite_DW.h
index 724dc48eb2cd9865b8b41af527b540199268a538..6e72e9668e0960efc38185b1edea1261b39653bf 100644 (file)
--- a/include/configs/RPXlite_DW.h
+++ b/include/configs/RPXlite_DW.h
@@ -230,12 +230,12 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #ifdef CONFIG_ENV_IS_IN_NVRAM
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #ifdef CONFIG_ENV_IS_IN_NVRAM

-#define CFG_ENV_ADDR           0xFA000100
-#define CFG_ENV_SIZE           0x1000
+#define CONFIG_ENV_ADDR                0xFA000100
+#define CONFIG_ENV_SIZE                0x1000

 #else
 #define CONFIG_ENV_IS_IN_FLASH
 #else
 #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     */
+#define CONFIG_ENV_OFFSET              0x30000 /* Offset of Environment Sector         */
+#define CONFIG_ENV_SIZE                0x8000  /* Total Size of Environment Sector     */

 #endif /* CONFIG_ENV_IS_IN_NVRAM */
 
 #define CFG_RESET_ADDRESS      ((ulong)((((immap_t *)CFG_IMMR)->im_clkrst.res)))
 #endif /* CONFIG_ENV_IS_IN_NVRAM */
 
 #define CFG_RESET_ADDRESS      ((ulong)((((immap_t *)CFG_IMMR)->im_clkrst.res)))

diff --git a/include/configs/RPXsuper.h b/include/configs/RPXsuper.h
index 8bdb4015085e9981b166bd0fd65276d61f857871..e805213bd25b4ed19d7d5c8a7cb90b23ed64716d 100644 (file)
--- a/include/configs/RPXsuper.h
+++ b/include/configs/RPXsuper.h
@@ -126,7 +126,7 @@
  * put in the same sector as U-Boot, and changing variables
  * will erase U-Boot temporarily
  */
  * put in the same sector as U-Boot, and changing variables
  * will erase U-Boot temporarily
  */

-#define CFG_ENV_IN_OWN_SECT
+#define CONFIG_ENV_IN_OWN_SECT

 
 /* Define to allow the user to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 
 /* Define to allow the user to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE


@@ -302,18 +302,18 @@
 #ifndef CFG_RAMBOOT
 #  define CONFIG_ENV_IS_IN_FLASH  1
 
 #ifndef CFG_RAMBOOT
 #  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
+#  ifdef CONFIG_ENV_IN_OWN_SECT
+#    define CONFIG_ENV_ADDR       (CFG_MONITOR_BASE + 0x40000)
+#    define CONFIG_ENV_SECT_SIZE  0x40000

 #  else
 #  else

-#    define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CFG_ENV_SECT_SIZE)
-#    define CFG_ENV_SIZE       0x1000  /* Total Size of Environment Sector */
-#    define CFG_ENV_SECT_SIZE  0x10000 /* see README - env sect real size */
-#  endif /* CFG_ENV_IN_OWN_SECT */
+#    define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CONFIG_ENV_SECT_SIZE)
+#    define CONFIG_ENV_SIZE       0x1000  /* Total Size of Environment Sector */
+#    define CONFIG_ENV_SECT_SIZE  0x10000 /* see README - env sect real size */
+#  endif /* CONFIG_ENV_IN_OWN_SECT */

 #else
 #  define CONFIG_ENV_IS_IN_NVRAM  1
 #else
 #  define CONFIG_ENV_IS_IN_NVRAM  1

-#  define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
-#  define CFG_ENV_SIZE         0x200
+#  define CONFIG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
+#  define CONFIG_ENV_SIZE         0x200

 #endif /* CFG_RAMBOOT */
 
 /*-----------------------------------------------------------------------
 #endif /* CFG_RAMBOOT */
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/RRvision.h b/include/configs/RRvision.h
index 22d3da614dd4e8d193c9c331f998e9193cc9fb00..541d58690fb03fe8c9bdc2a582dfcce9b036be40 100644 (file)
--- a/include/configs/RRvision.h
+++ b/include/configs/RRvision.h
@@ -228,12 +228,12 @@
 #define CFG_FLASH_WRITE_TOUT   (1 * CFG_HZ)    /* Timeout for Flash Write      */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   (1 * CFG_HZ)    /* Timeout for Flash Write      */
 
 #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     */
+#define        CONFIG_ENV_OFFSET               0x8000  /*   Offset   of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* Address and size of Redundant Environment Sector    */

-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET+CFG_ENV_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 

diff --git a/include/configs/Rattler.h b/include/configs/Rattler.h
index e603f29b3b3c515723fca5390cbf099fd3f10bd4..6ec52e69f7c42d9decc5335380fcd102699d4185 100644 (file)
--- a/include/configs/Rattler.h
+++ b/include/configs/Rattler.h
@@ -226,8 +226,8 @@
 #define CONFIG_ENV_IS_IN_FLASH
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_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)
+#define CONFIG_ENV_SECT_SIZE   0x10000
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + CFG_MONITOR_LEN)

 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 #define CFG_DEFAULT_IMMR       0xFF010000
 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 #define CFG_DEFAULT_IMMR       0xFF010000

diff --git a/include/configs/SBC8540.h b/include/configs/SBC8540.h
index 64f23205744a8b833a08be583263796e63c473e6..2cf75e3d0be4615d9d77addcd5baa799b67c2bd2 100644 (file)
--- a/include/configs/SBC8540.h
+++ b/include/configs/SBC8540.h
@@ -334,19 +334,19 @@
 #if !defined(CFG_RAMBOOT)
   #if defined(CONFIG_RAM_AS_FLASH)
     #define CONFIG_ENV_IS_NOWHERE
 #if !defined(CFG_RAMBOOT)
   #if defined(CONFIG_RAM_AS_FLASH)
     #define CONFIG_ENV_IS_NOWHERE

-    #define CFG_ENV_ADDR       (CFG_FLASH_BASE + 0x100000)
-    #define CFG_ENV_SIZE       0x2000
+    #define CONFIG_ENV_ADDR    (CFG_FLASH_BASE + 0x100000)
+    #define CONFIG_ENV_SIZE    0x2000

   #else
     #define CONFIG_ENV_IS_IN_FLASH     1
   #else
     #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 */
+    #define CONFIG_ENV_SECT_SIZE       0x20000 /* 128K(one sector) for env */
+    #define CONFIG_ENV_ADDR    (CFG_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
+    #define CONFIG_ENV_SIZE    0x2000 /* CONFIG_ENV_SECT_SIZE */

   #endif
 #else
   #define CFG_NO_FLASH         1       /* Flash is not usable now      */
   #define CONFIG_ENV_IS_NOWHERE        1       /* Store ENV in memory only     */
   #endif
 #else
   #define CFG_NO_FLASH         1       /* Flash is not usable now      */
   #define CONFIG_ENV_IS_NOWHERE        1       /* Store ENV in memory only     */

-  #define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
-  #define CFG_ENV_SIZE         0x2000
+  #define CONFIG_ENV_ADDR              (CFG_MONITOR_BASE - 0x1000)
+  #define CONFIG_ENV_SIZE              0x2000

 #endif
 
 #define CONFIG_BOOTARGS "root=/dev/nfs rw nfsroot=192.168.0.251:/tftpboot ip=192.168.0.105:192.168.0.251::255.255.255.0:sbc8560:eth0:off console=ttyS0,9600"
 #endif
 
 #define CONFIG_BOOTARGS "root=/dev/nfs rw nfsroot=192.168.0.251:/tftpboot ip=192.168.0.105:192.168.0.251::255.255.255.0:sbc8560:eth0:off console=ttyS0,9600"

diff --git a/include/configs/SCM.h b/include/configs/SCM.h
index bc779de80407a3fdecc4b3b2253e954ea466bfb8..50cf499b76b4687e3ee98127aef3b174a2b157d6 100644 (file)
--- a/include/configs/SCM.h
+++ b/include/configs/SCM.h
@@ -271,14 +271,14 @@
 #if 0
 /* Start port with environment in flash; switch to EEPROM later */
 #define CONFIG_ENV_IS_IN_FLASH 1
 #if 0
 /* Start port with environment in flash; switch to EEPROM later */
 #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
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE+0x40000)
+#define CONFIG_ENV_SIZE                0x40000
+#define CONFIG_ENV_SECT_SIZE   0x40000

 #else
 /* Final version: environment in EEPROM */
 #define CONFIG_ENV_IS_IN_EEPROM        1
 #else
 /* Final version: environment in EEPROM */
 #define CONFIG_ENV_IS_IN_EEPROM        1

-#define CFG_ENV_OFFSET         0
-#define CFG_ENV_SIZE           2048
+#define CONFIG_ENV_OFFSET              0
+#define CONFIG_ENV_SIZE                2048

 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/SL8245.h b/include/configs/SL8245.h
index 56436a4354ee804ace3454202efcf44cbac5d5c9..89d1461066cfe3008cb9ccbebadd9d201a547dc1 100644 (file)
--- a/include/configs/SL8245.h
+++ b/include/configs/SL8245.h
@@ -258,9 +258,9 @@
         * It's stored in flash separately.
         */
 #define CONFIG_ENV_IS_IN_FLASH     1
         * It's stored in flash separately.
         */
 #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    */
+#define CONFIG_ENV_ADDR                0xFFFF0000
+#define CONFIG_ENV_SIZE                0x00010000 /* Size of the Environment           */
+#define CONFIG_ENV_SECT_SIZE   0x00010000 /* Size of the Environment Sector    */

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/SM850.h b/include/configs/SM850.h
index 138dbd24c7f288ec00c90e7f71c5080ae4019ce6..d30c7bcf476366b61399dc758e4d5556a564a04f 100644 (file)
--- a/include/configs/SM850.h
+++ b/include/configs/SM850.h
@@ -164,8 +164,8 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #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     */
+#define        CONFIG_ENV_OFFSET               0x8000  /*   Offset   of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */

 
 /*-----------------------------------------------------------------------
  * Hardware Information Block
 
 /*-----------------------------------------------------------------------
  * Hardware Information Block

diff --git a/include/configs/SMN42.h b/include/configs/SMN42.h
index 583ee211144d88a0492bb7b534afbfc8aa7617b2..45fe14b419a563ea68755006fe1f44945aa4ed02 100644 (file)
--- a/include/configs/SMN42.h
+++ b/include/configs/SMN42.h
@@ -49,7 +49,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -192,9 +192,9 @@
 #define        CONFIG_ENV_IS_IN_FLASH  1
 /* The Environment Sector is in the CPU-internal flash */
 #define CFG_FLASH_BASE         0
 #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
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + CFG_ENV_OFFSET)
-#define CFG_ENV_SIZE           0x2000 /* Total Size of Environment Sector      */
+#define CONFIG_ENV_OFFSET              0x3C000
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
+#define CONFIG_ENV_SIZE                0x2000 /* Total Size of Environment Sector      */

 
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS

diff --git a/include/configs/SPD823TS.h b/include/configs/SPD823TS.h
index 39ab1c80a6f04062b8727f8f6967490e53e90ae7..929a4b6aaf2064746acea016d28cfb7aeabf977f 100644 (file)
--- a/include/configs/SPD823TS.h
+++ b/include/configs/SPD823TS.h
@@ -168,8 +168,8 @@
 #define CFG_FLASH_WRITE_TOUT   0       /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   0       /* Timeout for Flash Write (in ms)      */
 
 #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     */
+#define CONFIG_ENV_OFFSET              0x8000  /*   Offset   of Environment Sector     */
+#define CONFIG_ENV_SIZE                0x0800  /* Total Size of Environment Sector     */

 /*-----------------------------------------------------------------------
  * Cache Configuration
  */
 /*-----------------------------------------------------------------------
  * Cache Configuration
  */

diff --git a/include/configs/SX1.h b/include/configs/SX1.h
index d1b6998b96943171e5e45c052a17d46633cb7584..ff4e1a01f7fb69b34272ffb76b6b73b1cdb506b0 100644 (file)
--- a/include/configs/SX1.h
+++ b/include/configs/SX1.h
@@ -46,7 +46,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -172,7 +172,7 @@
 #define PHYS_FLASH_SIZE                (16 << 10) /* 16 MB */
 #define PHYS_FLASH_SECT_SIZE   (128*1024) /* Size of a sector (128kB) */
 #define CFG_MAX_FLASH_SECT     (128)   /* max number of sectors on one chip */
 #define PHYS_FLASH_SIZE                (16 << 10) /* 16 MB */
 #define PHYS_FLASH_SECT_SIZE   (128*1024) /* Size of a sector (128kB) */
 #define CFG_MAX_FLASH_SECT     (128)   /* max number of sectors on one chip */

-#define CFG_ENV_ADDR   (CFG_FLASH_BASE + PHYS_FLASH_SECT_SIZE) /* addr of environment */
+#define CONFIG_ENV_ADDR        (CFG_FLASH_BASE + PHYS_FLASH_SECT_SIZE) /* addr of environment */

 #define CFG_MONITOR_BASE       CFG_FLASH_BASE  /* Monitor at beginning of flash */
 #define CFG_MONITOR_LEN                PHYS_FLASH_SECT_SIZE    /* Reserve 1 sector */
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE, CFG_FLASH_BASE + PHYS_FLASH_SIZE }
 #define CFG_MONITOR_BASE       CFG_FLASH_BASE  /* Monitor at beginning of flash */
 #define CFG_MONITOR_LEN                PHYS_FLASH_SECT_SIZE    /* Reserve 1 sector */
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE, CFG_FLASH_BASE + PHYS_FLASH_SIZE }


@@ -190,12 +190,12 @@
 #define CFG_FLASH_WRITE_TOUT   (20*CFG_HZ) /* Timeout for Flash Write */
 
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_FLASH_WRITE_TOUT   (20*CFG_HZ) /* Timeout for Flash Write */
 
 #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 */
+#define CONFIG_ENV_SECT_SIZE   PHYS_FLASH_SECT_SIZE
+#define CONFIG_ENV_SIZE                CONFIG_ENV_SECT_SIZE /* Total Size of Environment Sector */
+#define CONFIG_ENV_OFFSET      ( CFG_MONITOR_BASE + CFG_MONITOR_LEN ) /* Environment after Monitor */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* Address and size of Redundant Environment Sector    */

-#define CFG_ENV_SIZE_REDUND    0x20000
-#define CFG_ENV_OFFSET_REDUND  0x40000
+#define CONFIG_ENV_SIZE_REDUND 0x20000
+#define CONFIG_ENV_OFFSET_REDUND       0x40000

 
 #endif /* __CONFIG_H */
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/SXNI855T.h b/include/configs/SXNI855T.h
index 67b6071be1d4b78f02f84db980e192acafaeef90..0cc4fe431cd632defe67566ae65a241ea6a18076 100644 (file)
--- a/include/configs/SXNI855T.h
+++ b/include/configs/SXNI855T.h
@@ -452,15 +452,15 @@
 #define CONFIG_ENV_IS_IN_FLASH
 #ifdef CONFIG_ENV_IS_IN_FLASH
   /* environment 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 */
-  #define CFG_ENV_SECT_SIZE    0x00010000
-  #define CFG_ENV_SIZE         0x00002000
+  #define CONFIG_ENV_ADDR              0xF8040000      /* AM29LV641 or AM29LV800BT */
+  #define CONFIG_ENV_ADDR_REDUND       0xF8050000      /* AM29LV641 or AM29LV800BT */
+  #define CONFIG_ENV_SECT_SIZE 0x00010000
+  #define CONFIG_ENV_SIZE              0x00002000

 #else
   /* environment is in EEPROM */
   #define CONFIG_ENV_IS_IN_EEPROM              1
 #else
   /* environment is in EEPROM */
   #define CONFIG_ENV_IS_IN_EEPROM              1

-  #define CFG_ENV_OFFSET               0       /* at beginning of EEPROM */
-  #define CFG_ENV_SIZE              1024       /* Use only a part of it*/
+  #define CONFIG_ENV_OFFSET            0       /* at beginning of EEPROM */
+  #define CONFIG_ENV_SIZE                   1024       /* Use only a part of it*/

 #endif
 
 #if 1
 #endif
 
 #if 1

diff --git a/include/configs/Sandpoint8240.h b/include/configs/Sandpoint8240.h
index 7c880ab5ad3b913f0a04ac95d6e39dfecd7b2dbe..9898a8b8b627832281f3c0750766ffd8e8c8abaa 100644 (file)
--- a/include/configs/Sandpoint8240.h
+++ b/include/configs/Sandpoint8240.h
@@ -177,8 +177,8 @@
 #define CFG_FLASH_SIZE         (1024 * 1024)   /* Unity has onboard 1MByte flash */
 #endif
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_FLASH_SIZE         (1024 * 1024)   /* Unity has onboard 1MByte flash */
 #endif
 #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 */
+#define CONFIG_ENV_OFFSET              0x00004000      /* Offset of Environment Sector */
+#define CONFIG_ENV_SIZE                0x00002000      /* Total Size of Environment Sector */

 
 #define CFG_MALLOC_LEN         (512 << 10)     /* Reserve 512 kB for malloc()  */
 
 
 #define CFG_MALLOC_LEN         (512 << 10)     /* Reserve 512 kB for malloc()  */
 

diff --git a/include/configs/Sandpoint8245.h b/include/configs/Sandpoint8245.h
index 39f66cbdb313e3464d6252f79c2f6f6a91a152e2..41835f01e018c889183eadf61b11f0c59864d26d 100644 (file)
--- a/include/configs/Sandpoint8245.h
+++ b/include/configs/Sandpoint8245.h
@@ -147,8 +147,8 @@
 #define CFG_FLASH_SIZE         (1024 * 1024)   /* Unity has onboard 1MByte flash */
 #endif
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_FLASH_SIZE         (1024 * 1024)   /* Unity has onboard 1MByte flash */
 #endif
 #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 */
+#define CONFIG_ENV_OFFSET              0x00004000      /* Offset of Environment Sector */
+#define CONFIG_ENV_SIZE                0x00002000      /* Total Size of Environment Sector */

 
 #define CFG_MALLOC_LEN         (512 << 10)     /* Reserve 512 kB for malloc()  */
 
 
 #define CFG_MALLOC_LEN         (512 << 10)     /* Reserve 512 kB for malloc()  */
 

diff --git a/include/configs/TASREG.h b/include/configs/TASREG.h
index 1b2b70a4521c5f50499bafb705a43fee56d360a8..dd074dc5cd79574845d77a16e8e40d4cc5920803 100644 (file)
--- a/include/configs/TASREG.h
+++ b/include/configs/TASREG.h
@@ -196,9 +196,9 @@
 #define CFG_INIT_SP_OFFSET     CFG_GBL_DATA_OFFSET
 
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_INIT_SP_OFFSET     CFG_GBL_DATA_OFFSET
 
 #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   */
+#define CONFIG_ENV_ADDR                0xFFC40000      /* Address of Environment Sector*/
+#define CONFIG_ENV_SIZE                0x10000 /* Total Size of Environment Sector     */
+#define CONFIG_ENV_SECT_SIZE   0x10000 /* see README - env sector total size   */

 
 /*-----------------------------------------------------------------------
  * Start addresses for the final memory configuration
 
 /*-----------------------------------------------------------------------
  * Start addresses for the final memory configuration

diff --git a/include/configs/TB5200.h b/include/configs/TB5200.h
index 97a8d6f8a0ec4cb55c788fd2562436b7778c002b..e4e1367079076440517b09ff2a562ddecc65ad5d 100644 (file)
--- a/include/configs/TB5200.h
+++ b/include/configs/TB5200.h
@@ -263,12 +263,12 @@
 #define CFG_FLASH_USE_BUFFER_WRITE     1
 
 #if !defined(CFG_LOWBOOT)
 #define CFG_FLASH_USE_BUFFER_WRITE     1
 
 #if !defined(CFG_LOWBOOT)

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x00760000 + 0x00800000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x00760000 + 0x00800000)

 #else  /* CFG_LOWBOOT */
 #if defined(CONFIG_TQM5200_B)
 #else  /* CFG_LOWBOOT */
 #if defined(CONFIG_TQM5200_B)

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x00080000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x00080000)

 #else
 #else

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x00060000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x00060000)

 #endif /* CONFIG_TQM5200_B */
 #endif /* CFG_LOWBOOT */
 #define CFG_MAX_FLASH_BANKS    1       /* max num of flash banks
 #endif /* CONFIG_TQM5200_B */
 #endif /* CFG_LOWBOOT */
 #define CFG_MAX_FLASH_BANKS    1       /* max num of flash banks


@@ -297,13 +297,13 @@
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_FLASH 1

-#define CFG_ENV_SIZE           0x10000
+#define CONFIG_ENV_SIZE                0x10000

 #if defined(CONFIG_TQM5200_B)
 #if defined(CONFIG_TQM5200_B)

-#define CFG_ENV_SECT_SIZE      0x40000
+#define CONFIG_ENV_SECT_SIZE   0x40000

 #else
 #else

-#define CFG_ENV_SECT_SIZE      0x20000
-#define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_SECT_SIZE   0x20000
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 #endif /* CONFIG_TQM5200_B */
 
 /*
 #endif /* CONFIG_TQM5200_B */
 
 /*

diff --git a/include/configs/TK885D.h b/include/configs/TK885D.h
index 99829169ccf5be548db87f08b75d2bb2f2b0fdf3..2efc10a6cf9dea28576b416fec261783e1b00a5e 100644 (file)
--- a/include/configs/TK885D.h
+++ b/include/configs/TK885D.h
@@ -255,13 +255,13 @@
 #define CFG_MAX_FLASH_SECT     256     /* max number of sectors on one chip */
 
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_MAX_FLASH_SECT     256     /* max number of sectors on one chip */
 
 #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     */
+#define CONFIG_ENV_OFFSET              0x40000 /*   Offset   of Environment Sector     */
+#define CONFIG_ENV_SIZE                0x08000 /* Total Size of Environment            */
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* Address and size of Redundant Environment Sector    */

-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET+CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 /*-----------------------------------------------------------------------
  * Hardware Information Block
 
 /*-----------------------------------------------------------------------
  * Hardware Information Block

diff --git a/include/configs/TOP5200.h b/include/configs/TOP5200.h
index 083686c28d2fdf4fffc71a2221ff177da2170ea3..38183686a94a1f2766407bab5f06dd68ff40f1af 100644 (file)
--- a/include/configs/TOP5200.h
+++ b/include/configs/TOP5200.h
@@ -233,7 +233,7 @@
 #define CFG_FLASH_BASE         0xff000000
 #define CFG_FLASH_SIZE         0x01000000
 #define CFG_MAX_FLASH_BANKS    1       /* max num of memory banks      */
 #define CFG_FLASH_BASE         0xff000000
 #define CFG_FLASH_SIZE         0x01000000
 #define CFG_MAX_FLASH_BANKS    1       /* max num of memory banks      */

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0)

 
 #define CFG_MAX_FLASH_SECT     256     /* max num of sects on one chip */
 
 
 #define CFG_MAX_FLASH_SECT     256     /* max num of sects on one chip */
 


@@ -272,8 +272,8 @@
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* turn on EEPROM env feature */
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* turn on EEPROM env feature */

-#define CFG_ENV_OFFSET         0x1000
-#define CFG_ENV_SIZE           0x0700
+#define CONFIG_ENV_OFFSET              0x1000
+#define CONFIG_ENV_SIZE                0x0700

 
 /*
  * VPD settings
 
 /*
  * VPD settings

diff --git a/include/configs/TOP860.h b/include/configs/TOP860.h
index 288019fbbb770b6849d2fb5109817ca5dc013966..b2708321705985faea7905a8654ad935e5bf3890 100644 (file)
--- a/include/configs/TOP860.h
+++ b/include/configs/TOP860.h
@@ -161,8 +161,8 @@
  */
 #define        CONFIG_SOFT_I2C
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* turn on EEPROM env feature */
  */
 #define        CONFIG_SOFT_I2C
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* turn on EEPROM env feature */

-#define CFG_ENV_OFFSET         0x1000
-#define CFG_ENV_SIZE           0x0700
+#define CONFIG_ENV_OFFSET              0x1000
+#define CONFIG_ENV_SIZE                0x0700

 #define CFG_I2C_EEPROM_ADDR 0x57
 #define CFG_FACT_OFFSET                0x1800
 #define CFG_FACT_SIZE          0x0800
 #define CFG_I2C_EEPROM_ADDR 0x57
 #define CFG_FACT_OFFSET                0x1800
 #define CFG_FACT_SIZE          0x0800

diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index d91d2e51b2b584dac6221377d3905daf14d3ffeb..efc8da498ce711f41d2346b4a5a9acf9c051098d 100644 (file)
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -399,11 +399,11 @@
 #define CFG_FLASH_USE_BUFFER_WRITE     1
 
 #if defined (CONFIG_CAM5200)
 #define CFG_FLASH_USE_BUFFER_WRITE     1
 
 #if defined (CONFIG_CAM5200)

-# define CFG_ENV_ADDR          (CFG_FLASH_BASE + 0x00040000)
+# define CONFIG_ENV_ADDR               (CFG_FLASH_BASE + 0x00040000)

 #elif defined(CONFIG_TQM5200_B)
 #elif defined(CONFIG_TQM5200_B)

-# define CFG_ENV_ADDR          (CFG_FLASH_BASE + 0x00080000)
+# define CONFIG_ENV_ADDR               (CFG_FLASH_BASE + 0x00080000)

 #else
 #else

-# define CFG_ENV_ADDR          (CFG_FLASH_BASE + 0x00060000)
+# define CONFIG_ENV_ADDR               (CFG_FLASH_BASE + 0x00060000)

 #endif
 
 /* Dynamic MTD partition support */
 #endif
 
 /* Dynamic MTD partition support */


@@ -457,14 +457,14 @@
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_FLASH 1

-#define CFG_ENV_SIZE           0x4000  /* 16 k - keep small for fast booting */
+#define CONFIG_ENV_SIZE                0x4000  /* 16 k - keep small for fast booting */

 #if defined(CONFIG_TQM5200_B) || defined (CONFIG_CAM5200)
 #if defined(CONFIG_TQM5200_B) || defined (CONFIG_CAM5200)

-#define CFG_ENV_SECT_SIZE      0x40000
+#define CONFIG_ENV_SECT_SIZE   0x40000

 #else
 #else

-#define CFG_ENV_SECT_SIZE      0x20000
+#define CONFIG_ENV_SECT_SIZE   0x20000

 #endif /* CONFIG_TQM5200_B */
 #endif /* CONFIG_TQM5200_B */

-#define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 /*
  * Memory map
 
 /*
  * Memory map

diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h
index a979351166f2c5d9f9c2bd70c7c3c9dfa8fb1628..631190295ccae8475ae220b5bbfd6a28a5df856a 100644 (file)
--- a/include/configs/TQM823L.h
+++ b/include/configs/TQM823L.h
@@ -216,12 +216,12 @@
 #define CFG_MAX_FLASH_SECT     71      /* max number of sectors on one chip */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_MAX_FLASH_SECT     71      /* max number of sectors on one chip */
 
 #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     */
+#define        CONFIG_ENV_OFFSET               0x8000  /*   Offset   of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* Address and size of Redundant Environment Sector    */

-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET+CFG_ENV_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 

diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h
index 86432c6eaeb20ceb1b271df4830d8dd3da4edcec..53272e1722084fd27eb1943b7e760d96ab4ceda3 100644 (file)
--- a/include/configs/TQM823M.h
+++ b/include/configs/TQM823M.h
@@ -211,13 +211,13 @@
 #define CFG_MAX_FLASH_SECT     256     /* max number of sectors on one chip */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_MAX_FLASH_SECT     256     /* max number of sectors on one chip */
 
 #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     */
+#define        CONFIG_ENV_OFFSET               0x40000 /*   Offset   of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x08000 /* Total Size of Environment            */
+#define        CONFIG_ENV_SECT_SIZE    0x20000 /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* Address and size of Redundant Environment Sector    */

-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET+CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 

diff --git a/include/configs/TQM8260.h b/include/configs/TQM8260.h
index 46ecb5127a01b4ed0197c1db81bca89ec1383197..2d54d2399f04a2aa03f8c7508f524513f73e9e26 100644 (file)
--- a/include/configs/TQM8260.h
+++ b/include/configs/TQM8260.h
@@ -307,14 +307,14 @@
 #if 0
 /* Start port with environment in flash; switch to EEPROM later */
 #define CONFIG_ENV_IS_IN_FLASH 1
 #if 0
 /* Start port with environment in flash; switch to EEPROM later */
 #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
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE+0x40000)
+#define CONFIG_ENV_SIZE                0x40000
+#define CONFIG_ENV_SECT_SIZE   0x40000

 #else
 /* Final version: environment in EEPROM */
 #define CONFIG_ENV_IS_IN_EEPROM        1
 #else
 /* Final version: environment in EEPROM */
 #define CONFIG_ENV_IS_IN_EEPROM        1

-#define CFG_ENV_OFFSET         0
-#define CFG_ENV_SIZE           2048
+#define CONFIG_ENV_OFFSET              0
+#define CONFIG_ENV_SIZE                2048

 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/TQM8272.h b/include/configs/TQM8272.h
index 8642a9f610b8332728614829571b48e324b232d6..4e8cccd9a73c98d85e72cfa33b23ff334f7d342c 100644 (file)
--- a/include/configs/TQM8272.h
+++ b/include/configs/TQM8272.h
@@ -382,11 +382,11 @@
 #define CFG_UPDATE_FLASH_SIZE
 
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_UPDATE_FLASH_SIZE
 
 #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
-#define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR + CFG_ENV_SIZE)
-#define CFG_ENV_SIZE_REDUND    0x20000
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x40000)
+#define CONFIG_ENV_SIZE                0x20000
+#define CONFIG_ENV_SECT_SIZE   0x20000
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SIZE)
+#define CONFIG_ENV_SIZE_REDUND 0x20000

 
 /* Where is the Hardwareinformation Block (from Monitor Sources) */
 #define MON_RES_LENGTH         (0x0003FC00)
 
 /* Where is the Hardwareinformation Block (from Monitor Sources) */
 #define MON_RES_LENGTH         (0x0003FC00)

diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 0d47d70fd13813a2fca557df5ec10eca75c503c5..3fd46a0966d19e3a8904c306bebdc6b53797e101 100644 (file)
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -301,14 +301,14 @@ extern int tqm834x_num_flash_banks;
 
 #ifndef CFG_RAMBOOT
        #define CONFIG_ENV_IS_IN_FLASH  1
 
 #ifndef CFG_RAMBOOT
        #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
+       #define CONFIG_ENV_ADDR         (CFG_MONITOR_BASE + 0x40000)
+       #define CONFIG_ENV_SECT_SIZE    0x40000 /* 256K(one sector) for env */
+       #define CONFIG_ENV_SIZE         0x2000

 #else
        #define CFG_NO_FLASH            1       /* Flash is not usable now */
        #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */
 #else
        #define CFG_NO_FLASH            1       /* Flash is not usable now */
        #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */

-       #define CFG_ENV_ADDR            (CFG_MONITOR_BASE - 0x1000)
-       #define CFG_ENV_SIZE            0x2000
+       #define CONFIG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
+       #define CONFIG_ENV_SIZE         0x2000

 #endif
 
 #define CONFIG_LOADS_ECHO              1       /* echo on for serial download */
 #endif
 
 #define CONFIG_LOADS_ECHO              1       /* echo on for serial download */

diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h
index 1a8089617640d87ae065075b257dd243aeabde48..812cea16c05305741ead22cf84bf7b61404c89fc 100644 (file)
--- a/include/configs/TQM850L.h
+++ b/include/configs/TQM850L.h
@@ -201,12 +201,12 @@
 #define CFG_MAX_FLASH_SECT     71      /* max number of sectors on one chip */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_MAX_FLASH_SECT     71      /* max number of sectors on one chip */
 
 #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     */
+#define        CONFIG_ENV_OFFSET               0x8000  /*   Offset   of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* Address and size of Redundant Environment Sector    */

-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET+CFG_ENV_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 

diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h
index 4626f2ef2779ca06f8822ac85379741872c50cf2..512c55dc0ce26cd2bd518483875db688f0a2c867 100644 (file)
--- a/include/configs/TQM850M.h
+++ b/include/configs/TQM850M.h
@@ -200,13 +200,13 @@
 #define CFG_MAX_FLASH_SECT     256     /* max number of sectors on one chip */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_MAX_FLASH_SECT     256     /* max number of sectors on one chip */
 
 #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     */
+#define        CONFIG_ENV_OFFSET               0x40000 /*   Offset   of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x08000 /* Total Size of Environment            */
+#define        CONFIG_ENV_SECT_SIZE    0x20000 /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* Address and size of Redundant Environment Sector    */

-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET+CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 

diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h
index 6582d97a119c6e96a4622ee8846a556626a200ac..36e2fbf2e2dc991fba5e5e4d06caada156e98b42 100644 (file)
--- a/include/configs/TQM855L.h
+++ b/include/configs/TQM855L.h
@@ -206,12 +206,12 @@
 #define CFG_MAX_FLASH_SECT     71      /* max number of sectors on one chip */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_MAX_FLASH_SECT     71      /* max number of sectors on one chip */
 
 #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     */
+#define        CONFIG_ENV_OFFSET               0x8000  /*   Offset   of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* Address and size of Redundant Environment Sector    */

-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET+CFG_ENV_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 

diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h
index 2ff208c44a7fffacfa309607df6b0351d1140820..2da1f3ae09c234a2465b9c2f2674b0eebc7954b1 100644 (file)
--- a/include/configs/TQM855M.h
+++ b/include/configs/TQM855M.h
@@ -240,13 +240,13 @@
 #define CFG_MAX_FLASH_SECT     256     /* max number of sectors on one chip */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_MAX_FLASH_SECT     256     /* max number of sectors on one chip */
 
 #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     */
+#define        CONFIG_ENV_OFFSET               0x40000 /*   Offset   of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x08000 /* Total Size of Environment            */
+#define        CONFIG_ENV_SECT_SIZE    0x20000 /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* Address and size of Redundant Environment Sector    */

-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET+CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 

diff --git a/include/configs/TQM85xx.h b/include/configs/TQM85xx.h
index c6bb4f902ead708d239558ecb433db4032dc41c3..fcf0f59ba57a1da2a1a819265e69543190c5fc08 100644 (file)
--- a/include/configs/TQM85xx.h
+++ b/include/configs/TQM85xx.h
@@ -561,14 +561,14 @@
 #define CONFIG_ENV_IS_IN_FLASH 1
 
 #ifdef CONFIG_TQM_FLASH_N_TYPE
 #define CONFIG_ENV_IS_IN_FLASH 1
 
 #ifdef CONFIG_TQM_FLASH_N_TYPE

-#define CFG_ENV_SECT_SIZE      0x40000 /* 256K (one sector) for env    */
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* 256K (one sector) for env    */

 #else /* !CONFIG_TQM_FLASH_N_TYPE */
 #else /* !CONFIG_TQM_FLASH_N_TYPE */

-#define CFG_ENV_SECT_SIZE      0x20000 /* 128K (one sector) for env    */
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* 128K (one sector) for env    */

 #endif /* CONFIG_TQM_FLASH_N_TYPE */
 #endif /* CONFIG_TQM_FLASH_N_TYPE */

-#define CFG_ENV_ADDR           (CFG_MONITOR_BASE - CFG_ENV_SECT_SIZE)
-#define CFG_ENV_SIZE           0x2000
-#define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR - CFG_ENV_SECT_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE                0x2000
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR - CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change        */
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change        */


@@ -678,20 +678,20 @@
  * Setup some board specific values for the default environment variables
  */
 #ifdef CONFIG_CPM2
  * Setup some board specific values for the default environment variables
  */
 #ifdef CONFIG_CPM2

-#define CFG_ENV_CONSDEV                "consdev=ttyCPM0\0"
+#define CONFIG_ENV_CONSDEV             "consdev=ttyCPM0\0"

 #else
 #else

-#define CFG_ENV_CONSDEV                "consdev=ttyS0\0"
+#define CONFIG_ENV_CONSDEV             "consdev=ttyS0\0"

 #endif
 #endif

-#define CFG_ENV_FDT_FILE       "fdt_file="MK_STR(CONFIG_HOSTNAME)"/" \
+#define CONFIG_ENV_FDT_FILE    "fdt_file="MK_STR(CONFIG_HOSTNAME)"/" \

                                MK_STR(CONFIG_HOSTNAME)".dtb\0"
                                MK_STR(CONFIG_HOSTNAME)".dtb\0"

-#define CFG_ENV_BOOTFILE       "bootfile="MK_STR(CONFIG_HOSTNAME)"/uImage\0"
-#define CFG_ENV_UBOOT          "uboot="MK_STR(CONFIG_HOSTNAME)"/u-boot.bin\0" \
+#define CONFIG_ENV_BOOTFILE    "bootfile="MK_STR(CONFIG_HOSTNAME)"/uImage\0"
+#define CONFIG_ENV_UBOOT               "uboot="MK_STR(CONFIG_HOSTNAME)"/u-boot.bin\0" \

                                "uboot_addr="MK_STR(TEXT_BASE)"\0"
 
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
                                "uboot_addr="MK_STR(TEXT_BASE)"\0"
 
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \

-       CFG_ENV_BOOTFILE                                                \
-       CFG_ENV_FDT_FILE                                                \
-       CFG_ENV_CONSDEV                                                 \
+       CONFIG_ENV_BOOTFILE                                             \
+       CONFIG_ENV_FDT_FILE                                             \
+       CONFIG_ENV_CONSDEV                                                      \

        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
                "nfsroot=$serverip:$rootpath\0"                         \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
                "nfsroot=$serverip:$rootpath\0"                         \


@@ -715,7 +715,7 @@
        "fdt_addr=ffec0000\0"                                           \
        "kernel_addr=ffd00000\0"                                        \
        "ramdisk_addr=ff800000\0"                                       \
        "fdt_addr=ffec0000\0"                                           \
        "kernel_addr=ffd00000\0"                                        \
        "ramdisk_addr=ff800000\0"                                       \

-       CFG_ENV_UBOOT                                                   \
+       CONFIG_ENV_UBOOT                                                        \

        "load=tftp 100000 $uboot\0"                                     \
        "update=protect off $uboot_addr +$filesize;"                    \
                "erase $uboot_addr +$filesize;"                         \
        "load=tftp 100000 $uboot\0"                                     \
        "update=protect off $uboot_addr +$filesize;"                    \
                "erase $uboot_addr +$filesize;"                         \

diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h
index 1daf8666bafd49f8cb6dc6158ec331278f2e0260..87462a56112ac649459b78b66c2c83a12e27ec58 100644 (file)
--- a/include/configs/TQM860L.h
+++ b/include/configs/TQM860L.h
@@ -205,12 +205,12 @@
 #define CFG_MAX_FLASH_SECT     71      /* max number of sectors on one chip */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_MAX_FLASH_SECT     71      /* max number of sectors on one chip */
 
 #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     */
+#define        CONFIG_ENV_OFFSET               0x8000  /*   Offset   of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* Address and size of Redundant Environment Sector    */

-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET+CFG_ENV_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 

diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h
index dcdcdc1ae94f21f5313f93d66449db73c4119767..9dc874550c5ff2b6a4801cbca6e2ddb00a438b96 100644 (file)
--- a/include/configs/TQM860M.h
+++ b/include/configs/TQM860M.h
@@ -205,13 +205,13 @@
 #define CFG_MAX_FLASH_SECT     256     /* max number of sectors on one chip */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_MAX_FLASH_SECT     256     /* max number of sectors on one chip */
 
 #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     */
+#define        CONFIG_ENV_OFFSET               0x40000 /*   Offset   of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x08000 /* Total Size of Environment Sector     */
+#define        CONFIG_ENV_SECT_SIZE    0x40000 /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* Address and size of Redundant Environment Sector    */

-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET+CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 

diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h
index 53a8f345030d4f71e92a322efd24e5926a4beb8e..c039e9d3e308e3ab9da2a3942e18cf31c5e70271 100644 (file)
--- a/include/configs/TQM862L.h
+++ b/include/configs/TQM862L.h
@@ -209,12 +209,12 @@
 #define CFG_MAX_FLASH_SECT     71      /* max number of sectors on one chip */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_MAX_FLASH_SECT     71      /* max number of sectors on one chip */
 
 #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     */
+#define        CONFIG_ENV_OFFSET               0x8000  /*   Offset   of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* Address and size of Redundant Environment Sector    */

-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET+CFG_ENV_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 

diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h
index 41a0cac8a3ec0f77fc94790171360d964437c34a..cc5ee6da0765328f89585c903f524957c52fc1c0 100644 (file)
--- a/include/configs/TQM862M.h
+++ b/include/configs/TQM862M.h
@@ -209,13 +209,13 @@
 #define CFG_MAX_FLASH_SECT     256     /* max number of sectors on one chip */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_MAX_FLASH_SECT     256     /* max number of sectors on one chip */
 
 #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     */
+#define        CONFIG_ENV_OFFSET               0x40000 /*   Offset   of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x08000 /* Total Size of Environment            */
+#define        CONFIG_ENV_SECT_SIZE    0x20000 /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* Address and size of Redundant Environment Sector    */

-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET+CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 

diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h
index 3e50cd4223b6b7e5bdb86b8f2d13afeeca37efdd..bf3bbb264a38c7064838c3aa72379b8df4a87499 100644 (file)
--- a/include/configs/TQM866M.h
+++ b/include/configs/TQM866M.h
@@ -249,13 +249,13 @@
 #define CFG_MAX_FLASH_SECT     256     /* max number of sectors on one chip */
 
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_MAX_FLASH_SECT     256     /* max number of sectors on one chip */
 
 #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     */
+#define CONFIG_ENV_OFFSET              0x40000 /*   Offset   of Environment Sector     */
+#define CONFIG_ENV_SIZE                0x08000 /* Total Size of Environment Sector     */
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* Address and size of Redundant Environment Sector    */

-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET+CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 

diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h
index ebdf17d39719d11022c95ac402f624ac19471972..66f4a982ddb34ca58d39c84fbcdc8c7999f599b0 100644 (file)
--- a/include/configs/TQM885D.h
+++ b/include/configs/TQM885D.h
@@ -252,13 +252,13 @@
 #define CFG_MAX_FLASH_SECT     256     /* max number of sectors on one chip */
 
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_MAX_FLASH_SECT     256     /* max number of sectors on one chip */
 
 #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     */
+#define CONFIG_ENV_OFFSET              0x40000 /*   Offset   of Environment Sector     */
+#define CONFIG_ENV_SIZE                0x08000 /* Total Size of Environment            */
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* Address and size of Redundant Environment Sector    */

-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET+CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 /*-----------------------------------------------------------------------
  * Hardware Information Block
 
 /*-----------------------------------------------------------------------
  * Hardware Information Block

diff --git a/include/configs/Total5200.h b/include/configs/Total5200.h
index 16584ecbc371c3850a9493c7d1f462fb1f1a427b..19b3be7dba814b18074109b3a867ecf5bcf76170 100644 (file)
--- a/include/configs/Total5200.h
+++ b/include/configs/Total5200.h
@@ -224,17 +224,17 @@
 #endif /* CONFIG_TOTAL5200_REV */
 
 #if defined(CFG_LOWBOOT)
 #endif /* CONFIG_TOTAL5200_REV */
 
 #if defined(CFG_LOWBOOT)

-#   define CFG_ENV_ADDR                0xFE040000
+#   define CONFIG_ENV_ADDR             0xFE040000

 #else  /* CFG_LOWBOOT */
 #else  /* CFG_LOWBOOT */

-#   define CFG_ENV_ADDR                0xFFF40000
+#   define CONFIG_ENV_ADDR             0xFFF40000

 #endif /* CFG_LOWBOOT */
 
 /*
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
 #endif /* CFG_LOWBOOT */
 
 /*
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_FLASH 1

-#define CFG_ENV_SIZE           0x40000
-#define CFG_ENV_SECT_SIZE      0x40000
+#define CONFIG_ENV_SIZE                0x40000
+#define CONFIG_ENV_SECT_SIZE   0x40000

 #define CONFIG_ENV_OVERWRITE   1
 
 /*
 #define CONFIG_ENV_OVERWRITE   1
 
 /*

diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h
index 9822d7d428e59c0ba1212bdbb618697a21faebf0..aeb649e190f1313252f201027b0a23fac3b6f19e 100644 (file)
--- a/include/configs/VCMA9.h
+++ b/include/configs/VCMA9.h
@@ -90,8 +90,8 @@
 #define CFG_I2C_EEPROM_ADDR    0x50
 #define CFG_I2C_EEPROM_ADDR_LEN        2
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
 #define CFG_I2C_EEPROM_ADDR    0x50
 #define CFG_I2C_EEPROM_ADDR_LEN        2
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */

-#define CFG_ENV_OFFSET         0x000   /* environment starts at offset 0 */
-#define CFG_ENV_SIZE           0x800   /* 2KB should be more than enough */
+#define CONFIG_ENV_OFFSET              0x000   /* environment starts at offset 0 */
+#define CONFIG_ENV_SIZE                0x800   /* 2KB should be more than enough */

 
 #undef CFG_I2C_EEPROM_ADDR_OVERFLOW
 #define CFG_EEPROM_PAGE_WRITE_BITS 6   /* 64 bytes page write mode on 24C256 */
 
 #undef CFG_I2C_EEPROM_ADDR_OVERFLOW
 #define CFG_EEPROM_PAGE_WRITE_BITS 6   /* 64 bytes page write mode on 24C256 */


@@ -100,7 +100,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-/*#define CONFIG_MALLOC_SIZE   (CFG_ENV_SIZE + 128*1024)*/
+/*#define CONFIG_MALLOC_SIZE   (CONFIG_ENV_SIZE + 128*1024)*/

 #define CFG_GBL_DATA_SIZE      128             /* size in bytes reserved for initial data */
 
 #define CFG_MONITOR_LEN                (256 * 1024)
 #define CFG_GBL_DATA_SIZE      128             /* size in bytes reserved for initial data */
 
 #define CFG_MONITOR_LEN                (256 * 1024)


@@ -226,12 +226,12 @@
 #ifdef CONFIG_AMD_LV800
 #define PHYS_FLASH_SIZE                0x00100000 /* 1MB */
 #define CFG_MAX_FLASH_SECT     (19)    /* max number of sectors on one chip */
 #ifdef CONFIG_AMD_LV800
 #define PHYS_FLASH_SIZE                0x00100000 /* 1MB */
 #define CFG_MAX_FLASH_SECT     (19)    /* max number of sectors on one chip */

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x0F0000) /* addr of environment */
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x0F0000) /* addr of environment */

 #endif
 #ifdef CONFIG_AMD_LV400
 #define PHYS_FLASH_SIZE                0x00080000 /* 512KB */
 #define CFG_MAX_FLASH_SECT     (11)    /* max number of sectors on one chip */
 #endif
 #ifdef CONFIG_AMD_LV400
 #define PHYS_FLASH_SIZE                0x00080000 /* 512KB */
 #define CFG_MAX_FLASH_SECT     (11)    /* max number of sectors on one chip */

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x070000) /* addr of environment */
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x070000) /* addr of environment */

 #endif
 
 /* timeout values are in ticks */
 #endif
 
 /* timeout values are in ticks */


@@ -240,7 +240,7 @@
 
 #if 0
 #define        CONFIG_ENV_IS_IN_FLASH  1
 
 #if 0
 #define        CONFIG_ENV_IS_IN_FLASH  1

-#define CFG_ENV_SIZE           0x10000 /* Total Size of Environment Sector */
+#define CONFIG_ENV_SIZE                0x10000 /* Total Size of Environment Sector */

 #endif
 
 
 #endif
 
 

diff --git a/include/configs/VOH405.h b/include/configs/VOH405.h
index 5d36f24c336b58680de6fb16bd6ef054f64804cf..d5c0a5e05c01af03b96cfc2600e51452dd644830 100644 (file)
--- a/include/configs/VOH405.h
+++ b/include/configs/VOH405.h
@@ -267,8 +267,8 @@
  * Environment Variable setup
  */
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
  * Environment Variable setup
  */
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */

-#define CFG_ENV_OFFSET         0x100   /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE           0x700   /* 2048 bytes may be used for env vars*/
+#define CONFIG_ENV_OFFSET              0x100   /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE                0x700   /* 2048 bytes may be used for env vars*/

                                   /* total size of a CAT24WC16 is 2048 bytes */
 
 #define CFG_NVRAM_BASE_ADDR    0xF0000500              /* NVRAM base address   */
                                   /* total size of a CAT24WC16 is 2048 bytes */
 
 #define CFG_NVRAM_BASE_ADDR    0xF0000500              /* NVRAM base address   */

diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h
index eb8cbc81fe918be8234b71ba29c57573aa770432..b952e0cbd42c694e5741717e8b89b54d391816c2 100644 (file)
--- a/include/configs/VOM405.h
+++ b/include/configs/VOM405.h
@@ -192,8 +192,8 @@
  * Environment Variable setup
  */
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
  * Environment Variable setup
  */
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */

-#define CFG_ENV_OFFSET         0x100   /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE           0x700   /* 2048 bytes may be used for env vars*/
+#define CONFIG_ENV_OFFSET              0x100   /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE                0x700   /* 2048 bytes may be used for env vars*/

                                   /* total size of a CAT24WC16 is 2048 bytes */
 
 #define CFG_NVRAM_BASE_ADDR    0xF0000500              /* NVRAM base address   */
                                   /* total size of a CAT24WC16 is 2048 bytes */
 
 #define CFG_NVRAM_BASE_ADDR    0xF0000500              /* NVRAM base address   */

diff --git a/include/configs/VoVPN-GW.h b/include/configs/VoVPN-GW.h
index d8d97e84fba1f03f633595c74494e21edd26cefe..f72da78dcc44c23c338572661ff4f0f3af1a6d9b 100644 (file)
--- a/include/configs/VoVPN-GW.h
+++ b/include/configs/VoVPN-GW.h
@@ -260,9 +260,9 @@
 
 /* environment in flash */
 #define CONFIG_ENV_IS_IN_FLASH         1
 
 /* environment in flash */
 #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
+#define CONFIG_ENV_ADDR                        (CFG_FLASH_BASE + 0x00020000)
+#define CONFIG_ENV_SIZE                        0x00020000
+#define CONFIG_ENV_SECT_SIZE           0x00020000

 
 /*
  * Initial memory map for linux
 
 /*
  * Initial memory map for linux

diff --git a/include/configs/W7OLMC.h b/include/configs/W7OLMC.h
index 2471a44172f6d0d96a4e720484005733ddb95a34..95e4556076735fb2d37f3c0bf572b78a33620f27 100644 (file)
--- a/include/configs/W7OLMC.h
+++ b/include/configs/W7OLMC.h
@@ -252,20 +252,20 @@
 #define CONFIG_ENV_IS_IN_NVRAM 1               /* use NVRAM for env vars       */
 #define CFG_NVRAM_BASE_ADDR    0xfc000000      /* NVRAM base address           */
 #define CFG_NVRAM_SIZE         (32*1024)       /* NVRAM size                   */
 #define CONFIG_ENV_IS_IN_NVRAM 1               /* use NVRAM for env vars       */
 #define CFG_NVRAM_BASE_ADDR    0xfc000000      /* NVRAM base address           */
 #define CFG_NVRAM_SIZE         (32*1024)       /* NVRAM size                   */

-#define CFG_ENV_SIZE           0x1000          /* Size of Environment vars     */
-/*define CFG_ENV_ADDR           \
-       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE) Env  */
-#define CFG_ENV_ADDR           CFG_NVRAM_BASE_ADDR
+#define CONFIG_ENV_SIZE                0x1000          /* Size of Environment vars     */
+/*define CONFIG_ENV_ADDR                \
+       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CONFIG_ENV_SIZE) Env  */
+#define CONFIG_ENV_ADDR                CFG_NVRAM_BASE_ADDR

 
 #else /* Use Boot Flash for environment variables */
 /*-----------------------------------------------------------------------
  * Flash EEPROM for environment
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
 
 #else /* Use Boot Flash for environment variables */
 /*-----------------------------------------------------------------------
  * Flash EEPROM for environment
  */
 #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    */
+#define CONFIG_ENV_OFFSET              0x00040000      /* Offset of Environment Sector */
+#define CONFIG_ENV_SIZE                0x10000         /* Total Size of env. sector    */

 
 

-#define CFG_ENV_SECT_SIZE      0x10000         /* see README - env sec tot sze */
+#define CONFIG_ENV_SECT_SIZE   0x10000         /* see README - env sec tot sze */

 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/W7OLMG.h b/include/configs/W7OLMG.h
index fe09c9a13052bfb243c4c98b450854efebdfbbfe..9c5bbff9fee4014c3c170fd105fb298b5c0358cc 100644 (file)
--- a/include/configs/W7OLMG.h
+++ b/include/configs/W7OLMG.h
@@ -259,20 +259,20 @@
 #define CONFIG_ENV_IS_IN_NVRAM 1               /* use NVRAM for env vars       */
 #define CFG_NVRAM_BASE_ADDR    0xfc000000      /* NVRAM base address           */
 #define CFG_NVRAM_SIZE         (32*1024)       /* NVRAM size                   */
 #define CONFIG_ENV_IS_IN_NVRAM 1               /* use NVRAM for env vars       */
 #define CFG_NVRAM_BASE_ADDR    0xfc000000      /* NVRAM base address           */
 #define CFG_NVRAM_SIZE         (32*1024)       /* NVRAM size                   */

-#define CFG_ENV_SIZE           0x1000          /* Size of Environment vars     */
-/*define CFG_ENV_ADDR           \
-       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE) Env  */
-#define CFG_ENV_ADDR           CFG_NVRAM_BASE_ADDR
+#define CONFIG_ENV_SIZE                0x1000          /* Size of Environment vars     */
+/*define CONFIG_ENV_ADDR                \
+       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CONFIG_ENV_SIZE) Env  */
+#define CONFIG_ENV_ADDR                CFG_NVRAM_BASE_ADDR

 
 #else /* Use Boot Flash for environment variables */
 /*-----------------------------------------------------------------------
  * Flash EEPROM for environment
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
 
 #else /* Use Boot Flash for environment variables */
 /*-----------------------------------------------------------------------
  * Flash EEPROM for environment
  */
 #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    */
+#define CONFIG_ENV_OFFSET              0x00040000      /* Offset of Environment Sector */
+#define CONFIG_ENV_SIZE                0x10000         /* Total Size of env. sector    */

 
 

-#define CFG_ENV_SECT_SIZE      0x10000         /* see README - env sec tot sze */
+#define CONFIG_ENV_SECT_SIZE   0x10000         /* see README - env sec tot sze */

 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/WUH405.h b/include/configs/WUH405.h
index 9c0bd4398e463d257ec7ff8cafce82d2b1486855..c3fc3afeac57a7dfef85f2aeac0bffe07313a5e6 100644 (file)
--- a/include/configs/WUH405.h
+++ b/include/configs/WUH405.h
@@ -230,8 +230,8 @@
  * Environment Variable setup
  */
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
  * Environment Variable setup
  */
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */

-#define CFG_ENV_OFFSET         0x100   /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE           0x700   /* 2048 bytes may be used for env vars*/
+#define CONFIG_ENV_OFFSET              0x100   /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE                0x700   /* 2048 bytes may be used for env vars*/

                                   /* total size of a CAT24WC16 is 2048 bytes */
 
 #define CFG_NVRAM_BASE_ADDR    0xF0000500              /* NVRAM base address   */
                                   /* total size of a CAT24WC16 is 2048 bytes */
 
 #define CFG_NVRAM_BASE_ADDR    0xF0000500              /* NVRAM base address   */

diff --git a/include/configs/XPEDITE1K.h b/include/configs/XPEDITE1K.h
index c3b0e083f91edf49786b760f11b4db061366ef18..77b29f48af3e14df9f2da1c0a39b7023d82d620e 100644 (file)
--- a/include/configs/XPEDITE1K.h
+++ b/include/configs/XPEDITE1K.h
@@ -152,8 +152,8 @@ extern void out32(unsigned int, unsigned long);
  * Environment
  *----------------------------------------------------------------------*/
 #define CONFIG_ENV_IS_IN_EEPROM 1
  * Environment
  *----------------------------------------------------------------------*/
 #define CONFIG_ENV_IS_IN_EEPROM 1

-#define CFG_ENV_SIZE           0x100       /* Size of Environment vars */
-#define CFG_ENV_OFFSET         0x100
+#define CONFIG_ENV_SIZE                0x100       /* Size of Environment vars */
+#define CONFIG_ENV_OFFSET              0x100

 #define CFG_I2C_EEPROM_ADDR    0x50            /* this is actually the second page of the eeprom */
 #define CFG_I2C_EEPROM_ADDR_LEN 1
 #define CFG_EEPROM_PAGE_WRITE_ENABLE
 #define CFG_I2C_EEPROM_ADDR    0x50            /* this is actually the second page of the eeprom */
 #define CFG_I2C_EEPROM_ADDR_LEN 1
 #define CFG_EEPROM_PAGE_WRITE_ENABLE

diff --git a/include/configs/Yukon8220.h b/include/configs/Yukon8220.h
index ef230e15dfa875c89911ba78ac17a03d7f5e6c57..cbc1ed688a74a07fae91e16782be13069e831df6 100644 (file)
--- a/include/configs/Yukon8220.h
+++ b/include/configs/Yukon8220.h
@@ -134,8 +134,8 @@
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 70
 /*
 #define CONFIG_ENV_IS_IN_EEPROM        1
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 70
 /*
 #define CONFIG_ENV_IS_IN_EEPROM        1

-#define CFG_ENV_OFFSET         0
-#define CFG_ENV_SIZE           256
+#define CONFIG_ENV_OFFSET              0
+#define CONFIG_ENV_SIZE                256

 */
 
 /* If CFG_AMD_BOOT is defined, the the system will boot from AMD.
 */
 
 /* If CFG_AMD_BOOT is defined, the the system will boot from AMD.


@@ -207,19 +207,19 @@
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
 #if defined (CFG_AMD_BOOT)
  */
 #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
-#define CFG_ENV_SECT_SIZE      PHYS_AMD_SECT_SIZE
-#define CFG_ENV1_ADDR          (CFG_FLASH1_BASE + CFG_CS1_MASK - PHYS_INTEL_SECT_SIZE)
-#define CFG_ENV1_SIZE          PHYS_INTEL_SECT_SIZE
-#define CFG_ENV1_SECT_SIZE     PHYS_INTEL_SECT_SIZE
+#define CONFIG_ENV_ADDR                (CFG_FLASH0_BASE + CFG_CS0_MASK - PHYS_AMD_SECT_SIZE)
+#define CONFIG_ENV_SIZE                PHYS_AMD_SECT_SIZE
+#define CONFIG_ENV_SECT_SIZE   PHYS_AMD_SECT_SIZE
+#define CONFIG_ENV1_ADDR               (CFG_FLASH1_BASE + CFG_CS1_MASK - PHYS_INTEL_SECT_SIZE)
+#define CONFIG_ENV1_SIZE               PHYS_INTEL_SECT_SIZE
+#define CONFIG_ENV1_SECT_SIZE  PHYS_INTEL_SECT_SIZE

 #else
 #else

-#define CFG_ENV_ADDR           (CFG_FLASH0_BASE + CFG_CS0_MASK - PHYS_INTEL_SECT_SIZE)
-#define CFG_ENV_SIZE           PHYS_INTEL_SECT_SIZE
-#define CFG_ENV_SECT_SIZE      PHYS_INTEL_SECT_SIZE
-#define CFG_ENV1_ADDR          (CFG_FLASH1_BASE + CFG_CS1_MASK - PHYS_AMD_SECT_SIZE)
-#define CFG_ENV1_SIZE          PHYS_AMD_SECT_SIZE
-#define CFG_ENV1_SECT_SIZE     PHYS_AMD_SECT_SIZE
+#define CONFIG_ENV_ADDR                (CFG_FLASH0_BASE + CFG_CS0_MASK - PHYS_INTEL_SECT_SIZE)
+#define CONFIG_ENV_SIZE                PHYS_INTEL_SECT_SIZE
+#define CONFIG_ENV_SECT_SIZE   PHYS_INTEL_SECT_SIZE
+#define CONFIG_ENV1_ADDR               (CFG_FLASH1_BASE + CFG_CS1_MASK - PHYS_AMD_SECT_SIZE)
+#define CONFIG_ENV1_SIZE               PHYS_AMD_SECT_SIZE
+#define CONFIG_ENV1_SECT_SIZE  PHYS_AMD_SECT_SIZE

 #endif
 
 #define CONFIG_ENV_OVERWRITE   1
 #endif
 
 #define CONFIG_ENV_OVERWRITE   1

diff --git a/include/configs/ZPC1900.h b/include/configs/ZPC1900.h
index 5fade6332eb176b3b63e2fe7f03965322ce88854..59cca0b60744543a8eb54fc9d87699fe5b7eaa90 100644 (file)
--- a/include/configs/ZPC1900.h
+++ b/include/configs/ZPC1900.h
@@ -225,11 +225,11 @@
 #endif
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
 #endif
 
 #ifdef CONFIG_ENV_IS_IN_FLASH

-#  define CFG_ENV_SECT_SIZE    0x10000
-#  define CFG_ENV_ADDR         (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#  define CONFIG_ENV_SECT_SIZE 0x10000
+#  define CONFIG_ENV_ADDR              (CFG_MONITOR_BASE + CFG_MONITOR_LEN)

 #else
 #else

-#  define CFG_ENV_ADDR         (CFG_EEPROM + 0x400)
-#  define CFG_ENV_SIZE         0x1000
+#  define CONFIG_ENV_ADDR              (CFG_EEPROM + 0x400)
+#  define CONFIG_ENV_SIZE              0x1000

 #  define CFG_NVRAM_ACCESS_ROUTINE
 #endif
 
 #  define CFG_NVRAM_ACCESS_ROUTINE
 #endif
 

diff --git a/include/configs/ZUMA.h b/include/configs/ZUMA.h
index 1b713884839a4598ea6661762ecbba65d20cb560..170553ceb9d01c52916bd20bd5ce6d6c3948f4cd 100644 (file)
--- a/include/configs/ZUMA.h
+++ b/include/configs/ZUMA.h
@@ -350,9 +350,9 @@
 #define CFG_FLASH_CFI          1
 
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_FLASH_CFI          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)
+#define CONFIG_ENV_SIZE                0x1000  /* Total Size of Environment Sector */
+#define CONFIG_ENV_SECT_SIZE   0x10000 /* see README - env sect real size */
+#define CONFIG_ENV_ADDR                (0xfff80000 - CONFIG_ENV_SECT_SIZE)

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/acadia.h b/include/configs/acadia.h
index ffaaa847a3757892034eb15496165a6b30fb0edd..1b1fd296c3b60c77dd2034cf3129b6e842de949e 100644 (file)
--- a/include/configs/acadia.h
+++ b/include/configs/acadia.h
@@ -99,7 +99,7 @@
 #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 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 */
+#define CONFIG_ENV_IS_EMBEDDED 1       /* use embedded environment */

 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------


@@ -124,13 +124,13 @@
 #endif
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
 #endif
 
 #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     */
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* size of one complete sector  */
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE-CONFIG_ENV_SECT_SIZE)
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 #endif
 
 /*
 #endif
 
 /*


@@ -185,9 +185,9 @@
  * For NAND booting the environment is embedded in the U-Boot image. Please take
  * look at the file board/amcc/sequoia/u-boot-nand.lds for details.
  */
  * For NAND booting the environment is embedded in the U-Boot image. Please take
  * look at the file board/amcc/sequoia/u-boot-nand.lds for details.
  */

-#define CFG_ENV_SIZE           CFG_NAND_BLOCK_SIZE
-#define CFG_ENV_OFFSET         (CFG_NAND_U_BOOT_OFFS + CFG_ENV_SIZE)
-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET + CFG_ENV_SIZE)
+#define CONFIG_ENV_SIZE                CFG_NAND_BLOCK_SIZE
+#define CONFIG_ENV_OFFSET              (CFG_NAND_U_BOOT_OFFS + CONFIG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)

 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/actux1.h b/include/configs/actux1.h
index d18c4b5848b2c5415de56114ba738f4836301a53..ec1d4693c8cb166d1fc79b466408c7318d7ac64b 100644 (file)
--- a/include/configs/actux1.h
+++ b/include/configs/actux1.h
@@ -52,7 +52,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN                 (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN                 (CONFIG_ENV_SIZE + 128*1024)

 /* size in bytes reserved for initial data */
 #define CFG_GBL_DATA_SIZE              128
 
 /* size in bytes reserved for initial data */
 #define CFG_GBL_DATA_SIZE              128
 


@@ -203,8 +203,8 @@
  * one flash sector, embedded in uboot area (bottom bootblock flash)
  */
 #define        CONFIG_ENV_IS_IN_FLASH          1
  * one flash sector, embedded in uboot area (bottom bootblock flash)
  */
 #define        CONFIG_ENV_IS_IN_FLASH          1

-#define CFG_ENV_SIZE                   0x2000
-#define CFG_ENV_ADDR                   (PHYS_FLASH_1 + 0x4000)
+#define CONFIG_ENV_SIZE                        0x2000
+#define CONFIG_ENV_ADDR                        (PHYS_FLASH_1 + 0x4000)

 #define CFG_USE_PPCENV                 1
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 #define CFG_USE_PPCENV                 1
 
 #define CONFIG_EXTRA_ENV_SETTINGS \

diff --git a/include/configs/actux2.h b/include/configs/actux2.h
index f6919a5edf547d75c2a8a62689fe272dfd148edd..a3f5a4a43cb7b8b39ab82ac56a5ab99c2559418c 100644 (file)
--- a/include/configs/actux2.h
+++ b/include/configs/actux2.h
@@ -43,7 +43,7 @@
 #undef CONFIG_USE_IRQ
 
 /* Size of malloc() pool */
 #undef CONFIG_USE_IRQ
 
 /* Size of malloc() pool */

-#define CFG_MALLOC_LEN                 (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN                 (CONFIG_ENV_SIZE + 128*1024)

 /* size in bytes reserved for initial data */
 #define CFG_GBL_DATA_SIZE              128
 
 /* size in bytes reserved for initial data */
 #define CFG_GBL_DATA_SIZE              128
 


@@ -180,8 +180,8 @@
  * one flash sector, embedded in uboot area (bottom bootblock flash)
  */
 #define        CONFIG_ENV_IS_IN_FLASH          1
  * one flash sector, embedded in uboot area (bottom bootblock flash)
  */
 #define        CONFIG_ENV_IS_IN_FLASH          1

-#define CFG_ENV_SIZE                   0x2000
-#define CFG_ENV_ADDR                   (PHYS_FLASH_1 + 0x4000)
+#define CONFIG_ENV_SIZE                        0x2000
+#define CONFIG_ENV_ADDR                        (PHYS_FLASH_1 + 0x4000)

 #define CFG_USE_PPCENV                 1
 
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
 #define CFG_USE_PPCENV                 1
 
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \

diff --git a/include/configs/actux3.h b/include/configs/actux3.h
index dfc8967d2997be48859c1197c07f1823af9f866e..fc2d02fc39bdc58d9c767006643fba6621dc26fa 100644 (file)
--- a/include/configs/actux3.h
+++ b/include/configs/actux3.h
@@ -43,7 +43,7 @@
 #undef CONFIG_USE_IRQ
 
 /* Size of malloc() pool */
 #undef CONFIG_USE_IRQ
 
 /* Size of malloc() pool */

-#define CFG_MALLOC_LEN                 (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN                 (CONFIG_ENV_SIZE + 128*1024)

 /* size in bytes reserved for initial data */
 #define CFG_GBL_DATA_SIZE              128
 
 /* size in bytes reserved for initial data */
 #define CFG_GBL_DATA_SIZE              128
 


@@ -180,8 +180,8 @@
  * one flash sector, embedded in uboot area (bottom bootblock flash)
  */
 #define        CONFIG_ENV_IS_IN_FLASH          1
  * one flash sector, embedded in uboot area (bottom bootblock flash)
  */
 #define        CONFIG_ENV_IS_IN_FLASH          1

-#define CFG_ENV_SIZE                   0x2000
-#define CFG_ENV_ADDR                   (PHYS_FLASH_1 + 0x4000)
+#define CONFIG_ENV_SIZE                        0x2000
+#define CONFIG_ENV_ADDR                        (PHYS_FLASH_1 + 0x4000)

 #define CFG_USE_PPCENV                 1
 
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
 #define CFG_USE_PPCENV                 1
 
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \

diff --git a/include/configs/actux4.h b/include/configs/actux4.h
index 48d3713f36897beafa93735645a8996b8a776345..83bd7f569a2714f6a1cdfc6e24f640440f3c82f5 100644 (file)
--- a/include/configs/actux4.h
+++ b/include/configs/actux4.h
@@ -43,7 +43,7 @@
 #undef CONFIG_USE_IRQ
 
 /* Size of malloc() pool */
 #undef CONFIG_USE_IRQ
 
 /* Size of malloc() pool */

-#define CFG_MALLOC_LEN                 (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN                 (CONFIG_ENV_SIZE + 128*1024)

 /* size in bytes reserved for initial data */
 #define CFG_GBL_DATA_SIZE              128
 
 /* size in bytes reserved for initial data */
 #define CFG_GBL_DATA_SIZE              128
 


@@ -177,8 +177,8 @@
 
 /* environment organization: one complete 4k flash sector */
 #define        CONFIG_ENV_IS_IN_FLASH          1
 
 /* environment organization: one complete 4k flash sector */
 #define        CONFIG_ENV_IS_IN_FLASH          1

-#define CFG_ENV_SIZE                   0x1000
-#define CFG_ENV_ADDR                   (PHYS_FLASH_1 + 0x3f000)
+#define CONFIG_ENV_SIZE                        0x1000
+#define CONFIG_ENV_ADDR                        (PHYS_FLASH_1 + 0x3f000)

 
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "mtd=IXP4XX-Flash.0:252k(uboot),4k(uboot_env);"                 \
 
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "mtd=IXP4XX-Flash.0:252k(uboot),4k(uboot_env);"                 \

diff --git a/include/configs/ads5121.h b/include/configs/ads5121.h
index eb6a6454a1acdac991bf4f384949d7daf7aa4d01..d99f23fcd0644644b50dcab8ed954b33b60c6002 100644 (file)
--- a/include/configs/ads5121.h
+++ b/include/configs/ads5121.h
@@ -322,17 +322,17 @@
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
 /* This has to be a multiple of the Flash sector size */
  */
 #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
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#define CONFIG_ENV_SIZE                0x2000

 #ifdef CONFIG_BKUP_FLASH
 #ifdef CONFIG_BKUP_FLASH

-#define CFG_ENV_SECT_SIZE      0x20000 /* one sector (256K) for env */
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* one sector (256K) for env */

 #else
 #else

-#define CFG_ENV_SECT_SIZE      0x40000 /* one sector (256K) for env */
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* one sector (256K) for env */

 #endif
 
 /* Address and size of Redundant Environment Sector    */
 #endif
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change */
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change */

diff --git a/include/configs/aev.h b/include/configs/aev.h
index bd7dab2f7bb397101cda5e55d2e236422234a58c..2dcaa581e5a35a901f9bbe5a8240a2455db2190e 100644 (file)
--- a/include/configs/aev.h
+++ b/include/configs/aev.h
@@ -233,9 +233,9 @@
 #undef CFG_FLASH_USE_BUFFER_WRITE      /* not supported yet for AMD */
 
 #if !defined(CFG_LOWBOOT)
 #undef CFG_FLASH_USE_BUFFER_WRITE      /* not supported yet for AMD */
 
 #if !defined(CFG_LOWBOOT)

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x00760000 + 0x00800000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x00760000 + 0x00800000)

 #else  /* CFG_LOWBOOT */
 #else  /* CFG_LOWBOOT */

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x00060000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x00060000)

 #endif /* CFG_LOWBOOT */
 #define CFG_MAX_FLASH_BANKS    1       /* max num of flash banks
                                           (= chip selects) */
 #endif /* CFG_LOWBOOT */
 #define CFG_MAX_FLASH_BANKS    1       /* max num of flash banks
                                           (= chip selects) */


@@ -247,10 +247,10 @@
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
  * Environment settings
  */
 #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)
-#define        CFG_ENV_SIZE_REDUND     (CFG_ENV_SIZE)
+#define CONFIG_ENV_SIZE                0x10000
+#define CONFIG_ENV_SECT_SIZE   0x20000
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
+#define        CONFIG_ENV_SIZE_REDUND  (CONFIG_ENV_SIZE)

 
 /*
  * Memory map
 
 /*
  * Memory map

diff --git a/include/configs/alpr.h b/include/configs/alpr.h
index ee60644ad0040cfad3d6a37be05e8e18c2e3c28a..c80c76afd563ac581e7ca4a58f4d0e81a923e117 100644 (file)
--- a/include/configs/alpr.h
+++ b/include/configs/alpr.h
@@ -95,13 +95,13 @@
 
 #define CONFIG_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)
-#define        CFG_ENV_SIZE            0x2000  /* Total Size of Environment Sector     */
+#define CONFIG_ENV_SECT_SIZE   0x10000 /* size of one complete sector          */
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE-CONFIG_ENV_SECT_SIZE)
+#define        CONFIG_ENV_SIZE         0x2000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 /*-----------------------------------------------------------------------
  * DDR SDRAM
 
 /*-----------------------------------------------------------------------
  * DDR SDRAM

diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h
index 79f4d11447a89d017d4ffd334f673e021fe8d2ab..cfcd85c6b4c9473ccb7ac12d85e0e9a09415fcf9 100644 (file)
--- a/include/configs/ap325rxa.h
+++ b/include/configs/ap325rxa.h
@@ -162,12 +162,12 @@
 /* ENV setting */
 #define CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_OVERWRITE   1
 /* ENV setting */
 #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)
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + CFG_MONITOR_LEN)
+#define CONFIG_ENV_SECT_SIZE   (128 * 1024)
+#define CONFIG_ENV_SIZE                (CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + CFG_MONITOR_LEN)

 /* Offset of env Flash sector relative to CFG_FLASH_BASE */
 /* Offset of env Flash sector relative to CFG_FLASH_BASE */

-#define CFG_ENV_OFFSET         (CFG_ENV_ADDR - CFG_FLASH_BASE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SECT_SIZE)
+#define CONFIG_ENV_OFFSET              (CONFIG_ENV_ADDR - CFG_FLASH_BASE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SECT_SIZE)

 
 /* Board Clock */
 #define CONFIG_SYS_CLK_FREQ    33333333
 
 /* Board Clock */
 #define CONFIG_SYS_CLK_FREQ    33333333

diff --git a/include/configs/apollon.h b/include/configs/apollon.h
index 6e34ddfef1761e3e1cee107a8f6c693e136bd784..edfae2743f31526f4ff45a088364d2b6cece90a9 100644 (file)
--- a/include/configs/apollon.h
+++ b/include/configs/apollon.h
@@ -72,8 +72,8 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define        CFG_ENV_SIZE SZ_128K    /* Total Size of Environment Sector */
-#define        CFG_MALLOC_LEN  (CFG_ENV_SIZE + SZ_128K)
+#define        CONFIG_ENV_SIZE SZ_128K /* Total Size of Environment Sector */
+#define        CFG_MALLOC_LEN  (CONFIG_ENV_SIZE + SZ_128K)

 #define        CFG_GBL_DATA_SIZE       128     /* bytes reserved for initial data */
 
 /*
 #define        CFG_GBL_DATA_SIZE       128     /* bytes reserved for initial data */
 
 /*


@@ -226,6 +226,6 @@
 /* OneNAND boot, OneNAND has CS0, NOR boot ONeNAND has CS2 */
 #define        CFG_ONENAND_BASE        0x00000000
 #define        CONFIG_ENV_IS_IN_ONENAND        1
 /* OneNAND boot, OneNAND has CS0, NOR boot ONeNAND has CS2 */
 #define        CFG_ONENAND_BASE        0x00000000
 #define        CONFIG_ENV_IS_IN_ONENAND        1

-#define CFG_ENV_ADDR           0x00020000
+#define CONFIG_ENV_ADDR                0x00020000

 
 #endif /* __CONFIG_H */
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/armadillo.h b/include/configs/armadillo.h
index 45b20bdc4a184844364eb74e14e7d4e578c2993f..668c2c10a169b302d9ff181714b7e69010da0e10 100644 (file)
--- a/include/configs/armadillo.h
+++ b/include/configs/armadillo.h
@@ -50,7 +50,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -148,8 +148,8 @@
 #define CFG_FLASH_WRITE_TOUT   (2*CFG_HZ) /* Timeout for Flash Write */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   (2*CFG_HZ) /* Timeout for Flash Write */
 
 #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     */
+#define CONFIG_ENV_ADDR                (PHYS_FLASH_1 + 0x20000)        /* Addr of Environment Sector   */
+#define CONFIG_ENV_SIZE                0x20000 /* Total Size of Environment Sector     */

 
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS

diff --git a/include/configs/assabet.h b/include/configs/assabet.h
index 3cc4db43acb1b1108a202c07a31063cf228e7d70..28864ea16ff3092068b426aae803f10bbf5b973b 100644 (file)
--- a/include/configs/assabet.h
+++ b/include/configs/assabet.h
@@ -45,7 +45,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN          (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN          (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE       128    /* size rsrvd for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE       128    /* size rsrvd for initial data */
 
 /*


@@ -163,10 +163,10 @@
 #define CONFIG_ENV_IS_IN_FLASH 1
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 #define CONFIG_ENV_IS_IN_FLASH 1
 
 #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
-#define CFG_ENV_SECT_SIZE      PHYS_FLASH_SECT_SIZE
+#define CONFIG_ENV_IN_OWN_SECTOR       1
+#define CONFIG_ENV_ADDR                (PHYS_FLASH_1 + PHYS_FLASH_SECT_SIZE)
+#define CONFIG_ENV_SIZE                PHYS_FLASH_SECT_SIZE
+#define CONFIG_ENV_SECT_SIZE   PHYS_FLASH_SECT_SIZE

 #endif
 
 #endif /* __CONFIG_H */
 #endif
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h
index fb5358c787c91f6f499fe88eb64665b31c5fb258..fd06245f4cd9b93a250e1742e9f7ab8a8a792b3c 100644 (file)
--- a/include/configs/at91cap9adk.h
+++ b/include/configs/at91cap9adk.h
@@ -150,9 +150,9 @@
 /* bootstrap + u-boot + env + linux in dataflash */
 #define CONFIG_ENV_IS_IN_DATAFLASH     1
 #define CFG_MONITOR_BASE       (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
 /* bootstrap + u-boot + env + linux in dataflash */
 #define CONFIG_ENV_IS_IN_DATAFLASH     1
 #define CFG_MONITOR_BASE       (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)

-#define CFG_ENV_OFFSET         0x4200
-#define CFG_ENV_ADDR           (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
-#define CFG_ENV_SIZE           0x4200
+#define CONFIG_ENV_OFFSET              0x4200
+#define CONFIG_ENV_ADDR                (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
+#define CONFIG_ENV_SIZE                0x4200

 #define CONFIG_BOOTCOMMAND     "cp.b 0xC0042000 0x72000000 0x210000; bootm"
 #define CONFIG_BOOTARGS                "console=ttyS0,115200 "                 \
                                "root=/dev/mtdblock1 "                  \
 #define CONFIG_BOOTCOMMAND     "cp.b 0xC0042000 0x72000000 0x210000; bootm"
 #define CONFIG_BOOTARGS                "console=ttyS0,115200 "                 \
                                "root=/dev/mtdblock1 "                  \


@@ -165,9 +165,9 @@
 /* bootstrap + u-boot + env + linux in norflash */
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_MONITOR_BASE       (PHYS_FLASH_1 + 0x8000)
 /* bootstrap + u-boot + env + linux in norflash */
 #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)
-#define CFG_ENV_SIZE           0x4000
+#define CONFIG_ENV_OFFSET              0x4000
+#define CONFIG_ENV_ADDR                (PHYS_FLASH_1 + CONFIG_ENV_OFFSET)
+#define CONFIG_ENV_SIZE                0x4000

 #define CONFIG_BOOTCOMMAND     "cp.b 0x10040000 0x72000000 0x200000; bootm"
 #define CONFIG_BOOTARGS                "console=ttyS0,115200 "                 \
                                "root=/dev/mtdblock4 "                  \
 #define CONFIG_BOOTCOMMAND     "cp.b 0x10040000 0x72000000 0x200000; bootm"
 #define CONFIG_BOOTARGS                "console=ttyS0,115200 "                 \
                                "root=/dev/mtdblock4 "                  \


@@ -192,7 +192,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         ROUND(CFG_ENV_SIZE + 128*1024, 0x1000)
+#define CFG_MALLOC_LEN         ROUND(CONFIG_ENV_SIZE + 128*1024, 0x1000)

 #define CFG_GBL_DATA_SIZE      128     /* 128 bytes for initial data */
 
 #define CONFIG_STACKSIZE       (32*1024)       /* regular stack */
 #define CFG_GBL_DATA_SIZE      128     /* 128 bytes for initial data */
 
 #define CONFIG_STACKSIZE       (32*1024)       /* regular stack */

diff --git a/include/configs/at91rm9200dk.h b/include/configs/at91rm9200dk.h
index 31d84d21623bba4c8f058f8fd283a7dad672b7fb..000eb0edf7324b8b3eaa22849252a6192857418f 100644 (file)
--- a/include/configs/at91rm9200dk.h
+++ b/include/configs/at91rm9200dk.h
@@ -76,7 +76,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 #define CONFIG_BAUDRATE 115200
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 #define CONFIG_BAUDRATE 115200


@@ -182,17 +182,17 @@
 #undef CONFIG_ENV_IS_IN_DATAFLASH
 
 #ifdef CONFIG_ENV_IS_IN_DATAFLASH
 #undef CONFIG_ENV_IS_IN_DATAFLASH
 
 #ifdef CONFIG_ENV_IS_IN_DATAFLASH

-#define CFG_ENV_OFFSET                 0x20000
-#define CFG_ENV_ADDR                   (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
-#define CFG_ENV_SIZE                   0x2000  /* 0x8000 */
+#define CONFIG_ENV_OFFSET                      0x20000
+#define CONFIG_ENV_ADDR                        (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
+#define CONFIG_ENV_SIZE                        0x2000  /* 0x8000 */

 #else
 #define CONFIG_ENV_IS_IN_FLASH         1
 #ifdef CONFIG_SKIP_LOWLEVEL_INIT
 #else
 #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 */
+#define CONFIG_ENV_ADDR                        (PHYS_FLASH_1 + 0xe000)  /* between boot.bin and u-boot.bin.gz */
+#define CONFIG_ENV_SIZE                        0x2000  /* 0x8000 */

 #else
 #else

-#define CFG_ENV_ADDR                   (PHYS_FLASH_1 + 0x60000)  /* after u-boot.bin */
-#define CFG_ENV_SIZE                   0x10000 /* sectors are 64K here */
+#define CONFIG_ENV_ADDR                        (PHYS_FLASH_1 + 0x60000)  /* after u-boot.bin */
+#define CONFIG_ENV_SIZE                        0x10000 /* sectors are 64K here */

 #endif /* CONFIG_SKIP_LOWLEVEL_INIT */
 #endif /* CONFIG_ENV_IS_IN_DATAFLASH */
 
 #endif /* CONFIG_SKIP_LOWLEVEL_INIT */
 #endif /* CONFIG_ENV_IS_IN_DATAFLASH */
 

diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index 0ddc079463d6d930f0aa3408c6088d07299e1ec3..41d1da32c34cbb293b08fd416b7cb3154b86b8bd 100644 (file)
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -136,9 +136,9 @@
 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
 #define CONFIG_ENV_IS_IN_DATAFLASH     1
 #define CFG_MONITOR_BASE       (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
 #define CONFIG_ENV_IS_IN_DATAFLASH     1
 #define CFG_MONITOR_BASE       (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)

-#define CFG_ENV_OFFSET         0x4200
-#define CFG_ENV_ADDR           (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
-#define CFG_ENV_SIZE           0x4200
+#define CONFIG_ENV_OFFSET              0x4200
+#define CONFIG_ENV_ADDR                (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
+#define CONFIG_ENV_SIZE                0x4200

 #define CONFIG_BOOTCOMMAND     "cp.b 0xC0042000 0x22000000 0x210000; bootm"
 #define CONFIG_BOOTARGS                "console=ttyS0,115200 "                 \
                                "root=/dev/mtdblock0 "                  \
 #define CONFIG_BOOTCOMMAND     "cp.b 0xC0042000 0x22000000 0x210000; bootm"
 #define CONFIG_BOOTARGS                "console=ttyS0,115200 "                 \
                                "root=/dev/mtdblock0 "                  \


@@ -150,9 +150,9 @@
 /* bootstrap + u-boot + env + linux in dataflash on CS1 */
 #define CONFIG_ENV_IS_IN_DATAFLASH     1
 #define CFG_MONITOR_BASE       (CFG_DATAFLASH_LOGIC_ADDR_CS1 + 0x8400)
 /* bootstrap + u-boot + env + linux in dataflash on CS1 */
 #define CONFIG_ENV_IS_IN_DATAFLASH     1
 #define CFG_MONITOR_BASE       (CFG_DATAFLASH_LOGIC_ADDR_CS1 + 0x8400)

-#define CFG_ENV_OFFSET         0x4200
-#define CFG_ENV_ADDR           (CFG_DATAFLASH_LOGIC_ADDR_CS1 + CFG_ENV_OFFSET)
-#define CFG_ENV_SIZE           0x4200
+#define CONFIG_ENV_OFFSET              0x4200
+#define CONFIG_ENV_ADDR                (CFG_DATAFLASH_LOGIC_ADDR_CS1 + CONFIG_ENV_OFFSET)
+#define CONFIG_ENV_SIZE                0x4200

 #define CONFIG_BOOTCOMMAND     "cp.b 0xD0042000 0x22000000 0x210000; bootm"
 #define CONFIG_BOOTARGS                "console=ttyS0,115200 "                 \
                                "root=/dev/mtdblock0 "                  \
 #define CONFIG_BOOTCOMMAND     "cp.b 0xD0042000 0x22000000 0x210000; bootm"
 #define CONFIG_BOOTARGS                "console=ttyS0,115200 "                 \
                                "root=/dev/mtdblock0 "                  \


@@ -163,9 +163,9 @@
 
 /* bootstrap + u-boot + env + linux in nandflash */
 #define CONFIG_ENV_IS_IN_NAND  1
 
 /* bootstrap + u-boot + env + linux in nandflash */
 #define CONFIG_ENV_IS_IN_NAND  1

-#define CFG_ENV_OFFSET         0x60000
-#define CFG_ENV_OFFSET_REDUND  0x80000
-#define CFG_ENV_SIZE           0x20000         /* 1 sector = 128 kB */
+#define CONFIG_ENV_OFFSET              0x60000
+#define CONFIG_ENV_OFFSET_REDUND       0x80000
+#define CONFIG_ENV_SIZE                0x20000         /* 1 sector = 128 kB */

 #define CONFIG_BOOTCOMMAND     "nand read 0x22000000 0xA0000 0x200000; bootm"
 #define CONFIG_BOOTARGS                "console=ttyS0,115200 "                 \
                                "root=/dev/mtdblock5 "                  \
 #define CONFIG_BOOTCOMMAND     "nand read 0x22000000 0xA0000 0x200000; bootm"
 #define CONFIG_BOOTARGS                "console=ttyS0,115200 "                 \
                                "root=/dev/mtdblock5 "                  \


@@ -190,7 +190,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         ROUND(3 * CFG_ENV_SIZE + 128*1024, 0x1000)
+#define CFG_MALLOC_LEN         ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000)

 #define CFG_GBL_DATA_SIZE      128     /* 128 bytes for initial data */
 
 #define CONFIG_STACKSIZE       (32*1024)       /* regular stack */
 #define CFG_GBL_DATA_SIZE      128     /* 128 bytes for initial data */
 
 #define CONFIG_STACKSIZE       (32*1024)       /* regular stack */

diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index a4a08315d1195faed1483ee140d0bbf49150c057..80c3b034e269b59623db2442efc94139fc845370 100644 (file)
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -150,9 +150,9 @@
 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
 #define CONFIG_ENV_IS_IN_DATAFLASH     1
 #define CFG_MONITOR_BASE       (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
 #define CONFIG_ENV_IS_IN_DATAFLASH     1
 #define CFG_MONITOR_BASE       (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)

-#define CFG_ENV_OFFSET         0x4200
-#define CFG_ENV_ADDR           (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
-#define CFG_ENV_SIZE           0x4200
+#define CONFIG_ENV_OFFSET              0x4200
+#define CONFIG_ENV_ADDR                (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
+#define CONFIG_ENV_SIZE                0x4200

 #define CONFIG_BOOTCOMMAND     "cp.b 0xC0042000 0x22000000 0x210000; bootm"
 #define CONFIG_BOOTARGS                "console=ttyS0,115200 "                 \
                                "root=/dev/mtdblock0 "                  \
 #define CONFIG_BOOTCOMMAND     "cp.b 0xC0042000 0x22000000 0x210000; bootm"
 #define CONFIG_BOOTARGS                "console=ttyS0,115200 "                 \
                                "root=/dev/mtdblock0 "                  \


@@ -163,9 +163,9 @@
 
 /* bootstrap + u-boot + env + linux in nandflash */
 #define CONFIG_ENV_IS_IN_NAND  1
 
 /* bootstrap + u-boot + env + linux in nandflash */
 #define CONFIG_ENV_IS_IN_NAND  1

-#define CFG_ENV_OFFSET         0x60000
-#define CFG_ENV_OFFSET_REDUND  0x80000
-#define CFG_ENV_SIZE           0x20000         /* 1 sector = 128 kB */
+#define CONFIG_ENV_OFFSET              0x60000
+#define CONFIG_ENV_OFFSET_REDUND       0x80000
+#define CONFIG_ENV_SIZE                0x20000         /* 1 sector = 128 kB */

 #define CONFIG_BOOTCOMMAND     "nand read 0x22000000 0xA0000 0x200000; bootm"
 #define CONFIG_BOOTARGS                "console=ttyS0,115200 "                 \
                                "root=/dev/mtdblock5 "                  \
 #define CONFIG_BOOTCOMMAND     "nand read 0x22000000 0xA0000 0x200000; bootm"
 #define CONFIG_BOOTARGS                "console=ttyS0,115200 "                 \
                                "root=/dev/mtdblock5 "                  \


@@ -190,7 +190,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         ROUND(3 * CFG_ENV_SIZE + 128*1024, 0x1000)
+#define CFG_MALLOC_LEN         ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000)

 #define CFG_GBL_DATA_SIZE      128     /* 128 bytes for initial data */
 
 #define CONFIG_STACKSIZE       (32*1024)       /* regular stack */
 #define CFG_GBL_DATA_SIZE      128     /* 128 bytes for initial data */
 
 #define CONFIG_STACKSIZE       (32*1024)       /* regular stack */

diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index 1d2431196084fc0b949d6b505ea7f4bf5687355a..b4368effa18c57cb86a85ff53ea5f8354de5b680 100644 (file)
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -156,9 +156,9 @@
 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
 #define CONFIG_ENV_IS_IN_DATAFLASH     1
 #define CFG_MONITOR_BASE       (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
 #define CONFIG_ENV_IS_IN_DATAFLASH     1
 #define CFG_MONITOR_BASE       (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)

-#define CFG_ENV_OFFSET         0x4200
-#define CFG_ENV_ADDR           (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
-#define CFG_ENV_SIZE           0x4200
+#define CONFIG_ENV_OFFSET              0x4200
+#define CONFIG_ENV_ADDR                (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
+#define CONFIG_ENV_SIZE                0x4200

 #define CONFIG_BOOTCOMMAND     "cp.b 0xC0042000 0x22000000 0x210000; bootm"
 #define CONFIG_BOOTARGS                "console=ttyS0,115200 " \
                                "root=/dev/mtdblock0 " \
 #define CONFIG_BOOTCOMMAND     "cp.b 0xC0042000 0x22000000 0x210000; bootm"
 #define CONFIG_BOOTARGS                "console=ttyS0,115200 " \
                                "root=/dev/mtdblock0 " \


@@ -169,9 +169,9 @@
 
 /* bootstrap + u-boot + env + linux in nandflash */
 #define CONFIG_ENV_IS_IN_NAND  1
 
 /* bootstrap + u-boot + env + linux in nandflash */
 #define CONFIG_ENV_IS_IN_NAND  1

-#define CFG_ENV_OFFSET         0x60000
-#define CFG_ENV_OFFSET_REDUND  0x80000
-#define CFG_ENV_SIZE           0x20000         /* 1 sector = 128 kB */
+#define CONFIG_ENV_OFFSET              0x60000
+#define CONFIG_ENV_OFFSET_REDUND       0x80000
+#define CONFIG_ENV_SIZE                0x20000         /* 1 sector = 128 kB */

 #define CONFIG_BOOTCOMMAND     "nand read 0x22000000 0xA0000 0x200000; bootm"
 #define CONFIG_BOOTARGS                "console=ttyS0,115200 " \
                                "root=/dev/mtdblock5 " \
 #define CONFIG_BOOTCOMMAND     "nand read 0x22000000 0xA0000 0x200000; bootm"
 #define CONFIG_BOOTARGS                "console=ttyS0,115200 " \
                                "root=/dev/mtdblock5 " \


@@ -194,7 +194,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         ROUND(3 * CFG_ENV_SIZE + 128*1024, 0x1000)
+#define CFG_MALLOC_LEN         ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000)

 #define CFG_GBL_DATA_SIZE      128     /* 128 bytes for initial data */
 
 #define CONFIG_STACKSIZE       (32*1024)       /* regular stack */
 #define CFG_GBL_DATA_SIZE      128     /* 128 bytes for initial data */
 
 #define CONFIG_STACKSIZE       (32*1024)       /* regular stack */

diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index 8162475ff38ab20cb7e0f3837298efb62d059741..32168dc4329322e034a75f9ee737a45fe8e0574c 100644 (file)
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -125,9 +125,9 @@
 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
 #define CONFIG_ENV_IS_IN_DATAFLASH     1
 #define CFG_MONITOR_BASE       (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
 #define CONFIG_ENV_IS_IN_DATAFLASH     1
 #define CFG_MONITOR_BASE       (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)

-#define CFG_ENV_OFFSET         0x4200
-#define CFG_ENV_ADDR           (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
-#define CFG_ENV_SIZE           0x4200
+#define CONFIG_ENV_OFFSET              0x4200
+#define CONFIG_ENV_ADDR                (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
+#define CONFIG_ENV_SIZE                0x4200

 #define CONFIG_BOOTCOMMAND     "cp.b 0xC0042000 0x22000000 0x210000; bootm"
 #define CONFIG_BOOTARGS                "console=ttyS0,115200 " \
                                "root=/dev/mtdblock0 " \
 #define CONFIG_BOOTCOMMAND     "cp.b 0xC0042000 0x22000000 0x210000; bootm"
 #define CONFIG_BOOTARGS                "console=ttyS0,115200 " \
                                "root=/dev/mtdblock0 " \


@@ -138,9 +138,9 @@
 
 /* bootstrap + u-boot + env + linux in nandflash */
 #define CONFIG_ENV_IS_IN_NAND  1
 
 /* bootstrap + u-boot + env + linux in nandflash */
 #define CONFIG_ENV_IS_IN_NAND  1

-#define CFG_ENV_OFFSET         0x60000
-#define CFG_ENV_OFFSET_REDUND  0x80000
-#define CFG_ENV_SIZE           0x20000         /* 1 sector = 128 kB */
+#define CONFIG_ENV_OFFSET              0x60000
+#define CONFIG_ENV_OFFSET_REDUND       0x80000
+#define CONFIG_ENV_SIZE                0x20000         /* 1 sector = 128 kB */

 #define CONFIG_BOOTCOMMAND     "nand read 0x22000000 0xA0000 0x200000; bootm"
 #define CONFIG_BOOTARGS                "console=ttyS0,115200 " \
                                "root=/dev/mtdblock5 " \
 #define CONFIG_BOOTCOMMAND     "nand read 0x22000000 0xA0000 0x200000; bootm"
 #define CONFIG_BOOTARGS                "console=ttyS0,115200 " \
                                "root=/dev/mtdblock5 " \


@@ -163,7 +163,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         ROUND(3 * CFG_ENV_SIZE + 128*1024, 0x1000)
+#define CFG_MALLOC_LEN         ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000)

 #define CFG_GBL_DATA_SIZE      128     /* 128 bytes for initial data */
 
 #define CONFIG_STACKSIZE       (32*1024)       /* regular stack */
 #define CFG_GBL_DATA_SIZE      128     /* 128 bytes for initial data */
 
 #define CONFIG_STACKSIZE       (32*1024)       /* regular stack */

diff --git a/include/configs/atc.h b/include/configs/atc.h
index a7b154ddbdbb120693fb98aeb61c7ae811b016ff..02ec2392160cbc073efc6139c804e1ef95eb6e21 100644 (file)
--- a/include/configs/atc.h
+++ b/include/configs/atc.h
@@ -271,13 +271,13 @@
 #if 1
 /* environment is in Flash */
 #define CONFIG_ENV_IS_IN_FLASH 1
 #if 1
 /* environment is in Flash */
 #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
+# define CONFIG_ENV_ADDR               (CFG_FLASH_BASE+0x30000)
+# define CONFIG_ENV_SIZE               0x10000
+# define CONFIG_ENV_SECT_SIZE  0x10000

 #else
 #define CONFIG_ENV_IS_IN_EEPROM        1
 #else
 #define CONFIG_ENV_IS_IN_EEPROM        1

-#define CFG_ENV_OFFSET         0
-#define CFG_ENV_SIZE           2048
+#define CONFIG_ENV_OFFSET              0
+#define CONFIG_ENV_SIZE                2048

 #define CFG_EEPROM_PAGE_WRITE_BITS     4       /* 16-byte page size    */
 #endif
 /*
 #define CFG_EEPROM_PAGE_WRITE_BITS     4       /* 16-byte page size    */
 #endif
 /*

diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h
index 12da7f090608dfa73c673909e9a16830d263ba9b..5c286380953b39eafd4c6c95ab798726ea9689f5 100644 (file)
--- a/include/configs/atngw100.h
+++ b/include/configs/atngw100.h
@@ -154,8 +154,8 @@
 #define CFG_SDRAM_BASE                 EBI_SDRAM_BASE
 
 #define CONFIG_ENV_IS_IN_FLASH         1
 #define CFG_SDRAM_BASE                 EBI_SDRAM_BASE
 
 #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)
+#define CONFIG_ENV_SIZE                        65536
+#define CONFIG_ENV_ADDR                        (CFG_FLASH_BASE + CFG_FLASH_SIZE - CONFIG_ENV_SIZE)

 
 #define CFG_INIT_SP_ADDR               (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
 
 
 #define CFG_INIT_SP_ADDR               (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
 

diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h
index 4a9a94e36559d1515df8c81a9b0c54938e90c553..faa7a01b6fe74e8d582da608f51475c986265370 100644 (file)
--- a/include/configs/atstk1002.h
+++ b/include/configs/atstk1002.h
@@ -178,8 +178,8 @@
 #define CFG_SDRAM_BASE                 EBI_SDRAM_BASE
 
 #define CONFIG_ENV_IS_IN_FLASH         1
 #define CFG_SDRAM_BASE                 EBI_SDRAM_BASE
 
 #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)
+#define CONFIG_ENV_SIZE                        65536
+#define CONFIG_ENV_ADDR                        (CFG_FLASH_BASE + CFG_FLASH_SIZE - CONFIG_ENV_SIZE)

 
 #define CFG_INIT_SP_ADDR               (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
 
 
 #define CFG_INIT_SP_ADDR               (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
 

diff --git a/include/configs/atstk1003.h b/include/configs/atstk1003.h
index 62c1aff85bb3f0910587577623f224058c3902d3..e3084d49910f95a1c48356afdc96823ab6ae0293 100644 (file)
--- a/include/configs/atstk1003.h
+++ b/include/configs/atstk1003.h
@@ -161,8 +161,8 @@
 #define CFG_SDRAM_BASE                 EBI_SDRAM_BASE
 
 #define CONFIG_ENV_IS_IN_FLASH         1
 #define CFG_SDRAM_BASE                 EBI_SDRAM_BASE
 
 #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)
+#define CONFIG_ENV_SIZE                        65536
+#define CONFIG_ENV_ADDR                        (CFG_FLASH_BASE + CFG_FLASH_SIZE - CONFIG_ENV_SIZE)

 
 #define CFG_INIT_SP_ADDR               (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
 
 
 #define CFG_INIT_SP_ADDR               (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
 

diff --git a/include/configs/atstk1004.h b/include/configs/atstk1004.h
index a9a94841e16ad5368e7cbdc8df29c65992766071..c87c5b7afc197e309af2336e100cd7d7d4dd028f 100644 (file)
--- a/include/configs/atstk1004.h
+++ b/include/configs/atstk1004.h
@@ -161,8 +161,8 @@
 #define CFG_SDRAM_BASE                 EBI_SDRAM_BASE
 
 #define CONFIG_ENV_IS_IN_FLASH         1
 #define CFG_SDRAM_BASE                 EBI_SDRAM_BASE
 
 #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)
+#define CONFIG_ENV_SIZE                        65536
+#define CONFIG_ENV_ADDR                        (CFG_FLASH_BASE + CFG_FLASH_SIZE - CONFIG_ENV_SIZE)

 
 #define CFG_INIT_SP_ADDR               (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
 
 
 #define CFG_INIT_SP_ADDR               (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
 

diff --git a/include/configs/atstk1006.h b/include/configs/atstk1006.h
index c454ec01c87156d38cb3cc435fa500827acb97aa..fe7a99bec09358c17f80eb8af9790e664021025c 100644 (file)
--- a/include/configs/atstk1006.h
+++ b/include/configs/atstk1006.h
@@ -178,8 +178,8 @@
 #define CFG_SDRAM_BASE                 EBI_SDRAM_BASE
 
 #define CONFIG_ENV_IS_IN_FLASH         1
 #define CFG_SDRAM_BASE                 EBI_SDRAM_BASE
 
 #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)
+#define CONFIG_ENV_SIZE                        65536
+#define CONFIG_ENV_ADDR                        (CFG_FLASH_BASE + CFG_FLASH_SIZE - CONFIG_ENV_SIZE)

 
 #define CFG_INIT_SP_ADDR               (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
 
 
 #define CFG_INIT_SP_ADDR               (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
 

diff --git a/include/configs/bamboo.h b/include/configs/bamboo.h
index 2485477876cf69fd29b2d05af63aae28949d864d..31c725f011323f51c328f13c6cc9f18135de7f92 100644 (file)
--- a/include/configs/bamboo.h
+++ b/include/configs/bamboo.h
@@ -106,7 +106,7 @@
 #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 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 */
+#define CONFIG_ENV_IS_EMBEDDED 1       /* use embedded environment */

 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------


@@ -127,13 +127,13 @@
 #define CFG_FLASH_2ND_ADDR      0x87800000  /* bamboo has 8 and 16bit device   */
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_FLASH_2ND_ADDR      0x87800000  /* bamboo has 8 and 16bit device   */
 
 #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     */
+#define CONFIG_ENV_SECT_SIZE   0x10000 /* size of one complete sector          */
+#define CONFIG_ENV_ADDR                ((-CFG_MONITOR_LEN)-CONFIG_ENV_SECT_SIZE)
+#define        CONFIG_ENV_SIZE         0x2000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*
 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*


@@ -188,9 +188,9 @@
  * For NAND booting the environment is embedded in the U-Boot image. Please take
  * look at the file board/amcc/sequoia/u-boot-nand.lds for details.
  */
  * For NAND booting the environment is embedded in the U-Boot image. Please take
  * look at the file board/amcc/sequoia/u-boot-nand.lds for details.
  */

-#define CFG_ENV_SIZE           CFG_NAND_BLOCK_SIZE
-#define CFG_ENV_OFFSET         (CFG_NAND_U_BOOT_OFFS + CFG_ENV_SIZE)
-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET + CFG_ENV_SIZE)
+#define CONFIG_ENV_SIZE                CFG_NAND_BLOCK_SIZE
+#define CONFIG_ENV_OFFSET              (CFG_NAND_U_BOOT_OFFS + CONFIG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)

 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------


@@ -234,8 +234,8 @@
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
 
 #ifdef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
 
 #ifdef CONFIG_ENV_IS_IN_EEPROM

-#define CFG_ENV_SIZE           0x200       /* Size of Environment vars */
-#define CFG_ENV_OFFSET         0x0
+#define CONFIG_ENV_SIZE                0x200       /* Size of Environment vars */
+#define CONFIG_ENV_OFFSET              0x0

 #endif /* CONFIG_ENV_IS_IN_EEPROM */
 
 /*
 #endif /* CONFIG_ENV_IS_IN_EEPROM */
 
 /*

diff --git a/include/configs/barco.h b/include/configs/barco.h
index cbf5868a31c866cc05fddb39f67a72e993bd6c44..9afb10edc6f8d4ac5e5ff863a90794767889d0c7 100644 (file)
--- a/include/configs/barco.h
+++ b/include/configs/barco.h
@@ -167,8 +167,8 @@
 #define CFG_FLASH_BASE         0xFFF00000
 #define CFG_FLASH_SIZE         (8 * 1024 * 1024)       /* Unity has onboard 1MByte flash */
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_FLASH_BASE         0xFFF00000
 #define CFG_FLASH_SIZE         (8 * 1024 * 1024)       /* Unity has onboard 1MByte flash */
 #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 CONFIG_ENV_OFFSET              0x000047A4      /* Offset of Environment Sector */
+#define CONFIG_ENV_SIZE                0x00002000      /* Total Size of Environment Sector */

 /* #define ENV_CRC             0x8BF6F24B      XXX - FIXME: gets defined automatically */
 
 #define CFG_MALLOC_LEN         (512 << 10)     /* Reserve 512 kB for malloc()  */
 /* #define ENV_CRC             0x8BF6F24B      XXX - FIXME: gets defined automatically */
 
 #define CFG_MALLOC_LEN         (512 << 10)     /* Reserve 512 kB for malloc()  */

diff --git a/include/configs/bf533-ezkit.h b/include/configs/bf533-ezkit.h
index 08fb639c15361bf954568b3dc83ed5cc1207d84d..b35e362d8d747c1f2d26db27457b80f72f74992b 100644 (file)
--- a/include/configs/bf533-ezkit.h
+++ b/include/configs/bf533-ezkit.h
@@ -139,8 +139,8 @@
 #define CFG_MAX_FLASH_SECT     40      /* max number of sectors on one chip */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_MAX_FLASH_SECT     40      /* max number of sectors on one chip */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1

-#define CFG_ENV_ADDR           0x20020000
-#define        CFG_ENV_SECT_SIZE       0x10000 /* Total Size of Environment Sector */
+#define CONFIG_ENV_ADDR                0x20020000
+#define        CONFIG_ENV_SECT_SIZE    0x10000 /* Total Size of Environment Sector */

 
 /* JFFS Partition offset set  */
 #define CFG_JFFS2_FIRST_BANK   0
 
 /* JFFS Partition offset set  */
 #define CFG_JFFS2_FIRST_BANK   0

diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h
index 2e71780d07baad294e6a95cff6f4ce9f8cd2ef66..6e138b8620092de6f2d3f777b5076f1f0ca4df69 100644 (file)
--- a/include/configs/bf533-stamp.h
+++ b/include/configs/bf533-stamp.h
@@ -103,16 +103,16 @@
 
 #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_SPI_MASTER)
 #define CONFIG_ENV_IS_IN_EEPROM        1
 
 #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_SPI_MASTER)
 #define CONFIG_ENV_IS_IN_EEPROM        1

-#define CFG_ENV_OFFSET         0x4000
-#define CFG_ENV_HEADER         (CFG_ENV_OFFSET + 0x12A)        /* 0x12A is the length of LDR file header */
+#define CONFIG_ENV_OFFSET              0x4000
+#define CONFIG_ENV_HEADER              (CONFIG_ENV_OFFSET + 0x12A)     /* 0x12A is the length of LDR file header */

 #else
 #define CONFIG_ENV_IS_IN_FLASH 1
 #else
 #define CONFIG_ENV_IS_IN_FLASH 1

-#define CFG_ENV_ADDR           0x20004000
-#define        CFG_ENV_OFFSET          (CFG_ENV_ADDR - CFG_FLASH_BASE)
+#define CONFIG_ENV_ADDR                0x20004000
+#define        CONFIG_ENV_OFFSET               (CONFIG_ENV_ADDR - CFG_FLASH_BASE)

 #endif
 
 #endif
 

-#define        CFG_ENV_SIZE            0x2000
-#define CFG_ENV_SECT_SIZE      0x2000  /* Total Size of Environment Sector */
+#define        CONFIG_ENV_SIZE         0x2000
+#define CONFIG_ENV_SECT_SIZE   0x2000  /* Total Size of Environment Sector */

 #define        ENV_IS_EMBEDDED
 
 #define CFG_FLASH_ERASE_TOUT   30000   /* Timeout for Chip Erase (in ms) */
 #define        ENV_IS_EMBEDDED
 
 #define CFG_FLASH_ERASE_TOUT   30000   /* Timeout for Chip Erase (in ms) */

diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h
index 5224eb2ff0d14e3b520e8257bf6107003c9850a7..01e185a9f3e0e4c7fe5668c5d1d8042926f2ec07 100644 (file)
--- a/include/configs/bf537-stamp.h
+++ b/include/configs/bf537-stamp.h
@@ -236,15 +236,15 @@
 
 #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_SPI_MASTER)
 #define CONFIG_ENV_IS_IN_EEPROM        1
 
 #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_SPI_MASTER)
 #define CONFIG_ENV_IS_IN_EEPROM        1

-#define CFG_ENV_OFFSET         0x4000
-#define CFG_ENV_HEADER         (CFG_ENV_OFFSET + 0x16e) /* 0x12A is the length of LDR file header */
+#define CONFIG_ENV_OFFSET              0x4000
+#define CONFIG_ENV_HEADER              (CONFIG_ENV_OFFSET + 0x16e) /* 0x12A is the length of LDR file header */

 #else
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #else
 #define        CONFIG_ENV_IS_IN_FLASH  1

-#define CFG_ENV_ADDR           0x20004000
-#define CFG_ENV_OFFSET         (CFG_ENV_ADDR - CFG_FLASH_BASE)
+#define CONFIG_ENV_ADDR                0x20004000
+#define CONFIG_ENV_OFFSET              (CONFIG_ENV_ADDR - CFG_FLASH_BASE)

 #endif
 #endif

-#define CFG_ENV_SIZE           0x2000
-#define        CFG_ENV_SECT_SIZE       0x2000  /* Total Size of Environment Sector */
+#define CONFIG_ENV_SIZE                0x2000
+#define        CONFIG_ENV_SECT_SIZE    0x2000  /* Total Size of Environment Sector */

 #define ENV_IS_EMBEDDED
 
 /* JFFS Partition offset set  */
 #define ENV_IS_EMBEDDED
 
 /* JFFS Partition offset set  */

diff --git a/include/configs/bf561-ezkit.h b/include/configs/bf561-ezkit.h
index ff10650eb76285f21398353221b82a1b2391700f..59a0f3f6c21271f6c77e3c35d33a7f5a00d99090 100644 (file)
--- a/include/configs/bf561-ezkit.h
+++ b/include/configs/bf561-ezkit.h
@@ -83,8 +83,8 @@
 #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 */
 #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 */

-#define CFG_ENV_ADDR           0x20020000
-#define        CFG_ENV_SECT_SIZE       0x10000 /* Total Size of Environment Sector */
+#define CONFIG_ENV_ADDR                0x20020000
+#define        CONFIG_ENV_SECT_SIZE    0x10000 /* Total Size of Environment Sector */

 /* JFFS Partition offset set  */
 #define CFG_JFFS2_FIRST_BANK   0
 #define CFG_JFFS2_NUM_BANKS    1
 /* JFFS Partition offset set  */
 #define CFG_JFFS2_FIRST_BANK   0
 #define CFG_JFFS2_NUM_BANKS    1

diff --git a/include/configs/bubinga.h b/include/configs/bubinga.h
index 146d25493aaac40619c01f3649acfcd64cb5a109..49abcc6204d9a7dea6c1ef8fec536bbd89247828 100644 (file)
--- a/include/configs/bubinga.h
+++ b/include/configs/bubinga.h
@@ -195,13 +195,13 @@
 #define CFG_FLASH_WORD_SIZE     unsigned char
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_FLASH_WORD_SIZE     unsigned char
 
 #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     */
+#define CONFIG_ENV_SECT_SIZE   0x10000 /* size of one complete sector  */
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE-CONFIG_ENV_SECT_SIZE)
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*-----------------------------------------------------------------------
 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*-----------------------------------------------------------------------


@@ -211,9 +211,9 @@
 #define CFG_NVRAM_SIZE         0x1ff8          /* NVRAM size   */
 
 #ifdef CONFIG_ENV_IS_IN_NVRAM
 #define CFG_NVRAM_SIZE         0x1ff8          /* NVRAM size   */
 
 #ifdef CONFIG_ENV_IS_IN_NVRAM

-#define CFG_ENV_SIZE           0x0ff8          /* Size of Environment vars     */
-#define CFG_ENV_ADDR           \
-       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)       /* Env  */
+#define CONFIG_ENV_SIZE                0x0ff8          /* Size of Environment vars     */
+#define CONFIG_ENV_ADDR                \
+       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CONFIG_ENV_SIZE)    /* Env  */

 #endif
 
 /*
 #endif
 
 /*

diff --git a/include/configs/c2mon.h b/include/configs/c2mon.h
index 17178e9f02e2f8104cbcd1a699afbf05c56a86a5..dca7b477c67dfb724291631f077b878281915ac3 100644 (file)
--- a/include/configs/c2mon.h
+++ b/include/configs/c2mon.h
@@ -178,8 +178,8 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #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     */
+#define        CONFIG_ENV_OFFSET               0x8000  /*   Offset   of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/canmb.h b/include/configs/canmb.h
index f0818b77dd8ef9ad5e5417fbe105d7bf55581140..59e4cb397c59099ec9072b349717a45cbe9748fd 100644 (file)
--- a/include/configs/canmb.h
+++ b/include/configs/canmb.h
@@ -138,9 +138,9 @@
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
  * Environment settings
  */
 #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)
+#define CONFIG_ENV_OFFSET              (2*128*1024)
+#define CONFIG_ENV_SIZE                0x2000
+#define CONFIG_ENV_SECT_SIZE       (128*1024)

 
 /*
  * Memory map
 
 /*
  * Memory map

diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h
index 9ec49c10c7d2bcdb5bf7afebcc64d4da25c8d553..2f162e1f1a8ded41b044447e4466cf91e9d9635f 100644 (file)
--- a/include/configs/canyonlands.h
+++ b/include/configs/canyonlands.h
@@ -117,7 +117,7 @@
 #else
 #define        CONFIG_ENV_IS_IN_NAND   1       /* use NAND for environment vars  */
 #define CFG_NAND_CS            0       /* NAND chip connected to CSx */
 #else
 #define        CONFIG_ENV_IS_IN_NAND   1       /* use NAND for environment vars  */
 #define CFG_NAND_CS            0       /* NAND chip connected to CSx */

-#define CFG_ENV_IS_EMBEDDED    1       /* use embedded environment */
+#define CONFIG_ENV_IS_EMBEDDED 1       /* use embedded environment */

 #endif
 
 /*
 #endif
 
 /*


@@ -179,9 +179,9 @@
  * For NAND booting the environment is embedded in the U-Boot image. Please take
  * look at the file board/amcc/canyonlands/u-boot-nand.lds for details.
  */
  * For NAND booting the environment is embedded in the U-Boot image. Please take
  * look at the file board/amcc/canyonlands/u-boot-nand.lds for details.
  */

-#define CFG_ENV_SIZE           CFG_NAND_BLOCK_SIZE
-#define CFG_ENV_OFFSET         (CFG_NAND_U_BOOT_OFFS + CFG_ENV_SIZE)
-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET + CFG_ENV_SIZE)
+#define CONFIG_ENV_SIZE                CFG_NAND_BLOCK_SIZE
+#define CONFIG_ENV_OFFSET              (CFG_NAND_U_BOOT_OFFS + CONFIG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)

 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------


@@ -202,13 +202,13 @@
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 
 #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     */
+#define CONFIG_ENV_SECT_SIZE   0x20000         /* size of one complete sector  */
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR - CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*-----------------------------------------------------------------------
 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/cerf250.h b/include/configs/cerf250.h
index fb737d50cce855bf2caff86284ecd86a2ccfdd1e..96184257b42f8925456bd55e932dfef17e943d21 100644 (file)
--- a/include/configs/cerf250.h
+++ b/include/configs/cerf250.h
@@ -44,7 +44,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN     (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN     (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -218,8 +218,8 @@
 
 #define CFG_MONITOR_LEN                0x40000         /* 256 KiB */
 #define CONFIG_ENV_IS_IN_FLASH 1
 
 #define CFG_MONITOR_LEN                0x40000         /* 256 KiB */
 #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     */
+#define CONFIG_ENV_ADDR                (PHYS_FLASH_1 + CFG_MONITOR_LEN)
+#define CONFIG_ENV_SIZE                0x40000 /* Total Size of Environment Sector     */

 
 
 #endif /* __CONFIG_H */
 
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/cm4008.h b/include/configs/cm4008.h
index 85f45b7e06e0e7048e8e645c7e53e986a27c14d3..c9c057c638861efada2746806eafbc1d9406491c 100644 (file)
--- a/include/configs/cm4008.h
+++ b/include/configs/cm4008.h
@@ -42,7 +42,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -131,6 +131,6 @@
 #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_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_SIZE           0x20000     /* Total Size of Environment */
+#define CONFIG_ENV_SIZE                0x20000     /* Total Size of Environment */

 
 #endif /* __CONFIG_H */
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/cm41xx.h b/include/configs/cm41xx.h
index f34dc5c97247d4914ac0a6f45b4cce1ec13cbe89..940e3e11bc477c4a09efbbe52f859aaf73226c33 100644 (file)
--- a/include/configs/cm41xx.h
+++ b/include/configs/cm41xx.h
@@ -42,7 +42,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -131,6 +131,6 @@
 #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_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_SIZE           0x20000     /* Total Size of Environment */
+#define CONFIG_ENV_SIZE                0x20000     /* Total Size of Environment */

 
 #endif /* __CONFIG_H */
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h
index 5f0d3fbcc950a6806020e52b6de26e41b5ac53df..5257db328ae283fd09bcfb79ba44daf4e8032ebc 100644 (file)
--- a/include/configs/cm5200.h
+++ b/include/configs/cm5200.h
@@ -265,12 +265,12 @@
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
  * Environment settings
  */
 #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)
+#define CONFIG_ENV_SIZE                0x10000
+#define CONFIG_ENV_SECT_SIZE   0x20000
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + CFG_MONITOR_LEN)

 /* Configuration of redundant environment */
 /* Configuration of redundant environment */

-#define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 /*
  * Pin multiplexing configuration
 
 /*
  * Pin multiplexing configuration

diff --git a/include/configs/cmc_pu2.h b/include/configs/cmc_pu2.h
index d9c1263326a38c2d2fb3be1442185eedbdc88418..9b744384ac781e9c3994f3a59ff3ad5316abb84b 100644 (file)
--- a/include/configs/cmc_pu2.h
+++ b/include/configs/cmc_pu2.h
@@ -76,7 +76,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 #define CONFIG_BAUDRATE                9600
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 #define CONFIG_BAUDRATE                9600


@@ -173,9 +173,9 @@
 #define CFG_FLASH_WRITE_TOUT           ( 2 * CFG_HZ)   /* Timeout for Flash Write */
 
 #define CONFIG_ENV_IS_IN_FLASH         1
 #define CFG_FLASH_WRITE_TOUT           ( 2 * CFG_HZ)   /* Timeout for Flash Write */
 
 #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 */
+#define CONFIG_ENV_OFFSET                      0x20000         /* after u-boot.bin */
+#define CONFIG_ENV_SECT_SIZE           (64 << 10)      /* sectors are 64 kB */
+#define CONFIG_ENV_SIZE                        (16 << 10)      /* Use only 16 kB */

 
 #define CFG_LOAD_ADDR          0x21000000  /* default load address */
 
 
 #define CFG_LOAD_ADDR          0x21000000  /* default load address */
 

diff --git a/include/configs/cmi_mpc5xx.h b/include/configs/cmi_mpc5xx.h
index ed6578a10ae29e29ba3ab9bd19d630b4be67a956..19c28364bcea1c5bc46317e35d7037ac92f37341 100644 (file)
--- a/include/configs/cmi_mpc5xx.h
+++ b/include/configs/cmi_mpc5xx.h
@@ -171,8 +171,8 @@
 #define        CONFIG_ENV_IS_IN_FLASH  1
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
 #define        CONFIG_ENV_IS_IN_FLASH  1
 
 #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 CONFIG_ENV_OFFSET              0x00020000      /* Environment starts at this adress    */
+#define        CONFIG_ENV_SIZE         0x00010000      /* Set whole sector as env              */

 #define        CFG_USE_PPCENV                          /* Environment embedded in sect .ppcenv */
 #endif
 
 #define        CFG_USE_PPCENV                          /* Environment embedded in sect .ppcenv */
 #endif
 

diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
index c908d5aa3d57d475b9592042e5e18d848800d1c1..9b729acf8edfde1cdd1bb209b2e4d45944d82cf6 100644 (file)
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -124,13 +124,13 @@
  */
 
 #ifndef CONFIG_MONITOR_IS_IN_RAM
  */
 
 #ifndef CONFIG_MONITOR_IS_IN_RAM

-#define CFG_ENV_OFFSET         0x4000
-#define CFG_ENV_SECT_SIZE      0x2000
+#define CONFIG_ENV_OFFSET              0x4000
+#define CONFIG_ENV_SECT_SIZE   0x2000

 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CONFIG_ENV_IS_IN_FLASH 1

-#define CFG_ENV_IS_EMBEDDED    1
+#define CONFIG_ENV_IS_EMBEDDED 1

 #else
 #else

-#define CFG_ENV_ADDR           0xffe04000
-#define CFG_ENV_SECT_SIZE      0x2000
+#define CONFIG_ENV_ADDR                0xffe04000
+#define CONFIG_ENV_SECT_SIZE   0x2000

 #define CONFIG_ENV_IS_IN_FLASH 1
 #endif
 
 #define CONFIG_ENV_IS_IN_FLASH 1
 #endif
 

diff --git a/include/configs/cogent_mpc8260.h b/include/configs/cogent_mpc8260.h
index fff35f98ecf135ad17d8c0909a300eb5481edd0f..b39f4cb86dc468f5bf25bf51e134e67177e58056 100644 (file)
--- a/include/configs/cogent_mpc8260.h
+++ b/include/configs/cogent_mpc8260.h
@@ -258,12 +258,12 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Flash Write Timeout (in ms)  */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   500     /* Flash Write Timeout (in ms)  */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1

-#define CFG_ENV_ADDR           CFG_FLASH_BASE /* Addr of Environment Sector */
+#define CONFIG_ENV_ADDR                CFG_FLASH_BASE /* Addr of Environment Sector */

 #ifdef CONFIG_CMA302
 #ifdef CONFIG_CMA302

-#define        CFG_ENV_SIZE            0x1000  /* Total Size of Environment Sector */
-#define CFG_ENV_SECT_SIZE      (512*1024) /* see README - env sect real size */
+#define        CONFIG_ENV_SIZE         0x1000  /* Total Size of Environment Sector */
+#define CONFIG_ENV_SECT_SIZE   (512*1024) /* see README - env sect real size */

 #else
 #else

-#define        CFG_ENV_SIZE            0x4000  /* Total Size of Environment Sector */
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector */

 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/cogent_mpc8xx.h b/include/configs/cogent_mpc8xx.h
index 9d257d29d1bf144ead9d4588d7fc8023058d34f4..c77f9a25cce8c052bb1bfaec57430912ea75d407 100644 (file)
--- a/include/configs/cogent_mpc8xx.h
+++ b/include/configs/cogent_mpc8xx.h
@@ -204,12 +204,12 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1

-#define CFG_ENV_ADDR           CFG_FLASH_BASE /* Addr of Environment Sector */
+#define CONFIG_ENV_ADDR                CFG_FLASH_BASE /* Addr of Environment Sector */

 #ifdef CONFIG_CMA302
 #ifdef CONFIG_CMA302

-#define        CFG_ENV_SIZE            0x1000  /* Total Size of Environment Sector     */
-#define CFG_ENV_SECT_SIZE      (512*1024) /* see README - env sect real size */
+#define        CONFIG_ENV_SIZE         0x1000  /* Total Size of Environment Sector     */
+#define CONFIG_ENV_SECT_SIZE   (512*1024) /* see README - env sect real size */

 #else
 #else

-#define        CFG_ENV_SIZE            0x4000  /* Total Size of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */

 #endif
 /*-----------------------------------------------------------------------
  * Cache Configuration
 #endif
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/cpci5200.h b/include/configs/cpci5200.h
index cbc5b2ea67b34d146ba13b9ee720bdbe8fbbe35b..1f53ddcf94d1c3e72679a04b19c016ad6e553221 100644 (file)
--- a/include/configs/cpci5200.h
+++ b/include/configs/cpci5200.h
@@ -205,7 +205,7 @@
 #define CFG_FLASH_BASE         0xFE000000
 #define CFG_FLASH_SIZE         0x02000000
 #define CFG_FLASH_INCREMENT    0x01000000
 #define CFG_FLASH_BASE         0xFE000000
 #define CFG_FLASH_SIZE         0x02000000
 #define CFG_FLASH_INCREMENT    0x01000000

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x00000000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x00000000)

 #define CFG_MAX_FLASH_BANKS    2       /* max num of memory banks      */
 #define CFG_MAX_FLASH_SECT     128
 
 #define CFG_MAX_FLASH_BANKS    2       /* max num of memory banks      */
 #define CFG_MAX_FLASH_SECT     128
 


@@ -220,13 +220,13 @@
  */
 #if 1                          /* test-only */
 #define CONFIG_ENV_IS_IN_FLASH 1
  */
 #if 1                          /* test-only */
 #define CONFIG_ENV_IS_IN_FLASH 1

-#define CFG_ENV_SIZE           0x20000
-#define CFG_ENV_SECT_SIZE      0x20000
+#define CONFIG_ENV_SIZE                0x20000
+#define CONFIG_ENV_SECT_SIZE   0x20000

 #define CONFIG_ENV_OVERWRITE   1
 #else
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
 #define CONFIG_ENV_OVERWRITE   1
 #else
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */

-#define CFG_ENV_OFFSET         0x0000  /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE           0x0400  /* 8192 bytes may be used for env vars */
+#define CONFIG_ENV_OFFSET              0x0000  /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE                0x0400  /* 8192 bytes may be used for env vars */

                                   /* total size of a CAT24WC32 is 8192 bytes */
 #define CONFIG_ENV_OVERWRITE   1
 #endif
                                   /* total size of a CAT24WC32 is 8192 bytes */
 #define CONFIG_ENV_OVERWRITE   1
 #endif

diff --git a/include/configs/cradle.h b/include/configs/cradle.h
index ee319a7af7e43004792e02bfe07700d1f5237a93..34a265d5d7a96aa0c4aaab37b4284610b751473b 100644 (file)
--- a/include/configs/cradle.h
+++ b/include/configs/cradle.h
@@ -40,7 +40,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -153,8 +153,8 @@
 #define CFG_FLASH_WRITE_TOUT    (2*CFG_HZ) /* Timeout for Flash Write */
 
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_FLASH_WRITE_TOUT    (2*CFG_HZ) /* Timeout for Flash Write */
 
 #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 */
+#define CONFIG_ENV_ADDR                                0x00020000      /* absolute address for now   */
+#define CONFIG_ENV_SIZE                                0x20000    /* 8K ouch, this may later be */

 
 /******************************************************************************
  *
 
 /******************************************************************************
  *

diff --git a/include/configs/csb226.h b/include/configs/csb226.h
index c5d65e57965b2ecc40627a39d920c574346ebc61..266e0e6533c0b8504298d8100b69460ed78c173b 100644 (file)
--- a/include/configs/csb226.h
+++ b/include/configs/csb226.h
@@ -489,8 +489,8 @@
 #define CFG_FLASH_WRITE_TOUT    (2*CFG_HZ) /* Timeout for Flash Write       */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT    (2*CFG_HZ) /* Timeout for Flash Write       */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1

-#define CFG_ENV_ADDR            (PHYS_FLASH_1 + 0x1C000)
+#define CONFIG_ENV_ADDR            (PHYS_FLASH_1 + 0x1C000)

                                        /* Addr of Environment Sector       */
                                        /* Addr of Environment Sector       */

-#define CFG_ENV_SIZE            0x4000  /* Total Size of Environment Sector */
+#define CONFIG_ENV_SIZE            0x4000  /* Total Size of Environment Sector */

 
 #endif  /* __CONFIG_H */
 
 #endif  /* __CONFIG_H */

diff --git a/include/configs/csb272.h b/include/configs/csb272.h
index 1d6a0775bbb3791ccbde864c9f7d0e985bd4d312..13892e6c135bc117a139a565886025118afb4bf0 100644 (file)
--- a/include/configs/csb272.h
+++ b/include/configs/csb272.h
@@ -253,10 +253,10 @@
 #endif
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 #endif
 
 #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 */
-#define CFG_ENV_SECT_SIZE      0x00040000 /* Size of Environment Sector */
+#define CONFIG_ENV_IN_OWN_SECTOR       1          /* Give Environment own sector */
+#define CONFIG_ENV_ADDR                0xFFF00000 /* Address of Environment Sector */
+#define        CONFIG_ENV_SIZE         0x00001000 /* Size of Environment */
+#define CONFIG_ENV_SECT_SIZE   0x00040000 /* Size of Environment Sector */

 #endif
 
 /*
 #endif
 
 /*

diff --git a/include/configs/csb472.h b/include/configs/csb472.h
index 62bcc2ff1cdb4b4dc30cd376171252cda6e26f69..064498271663a31396c3270c55fb5ac73d3f3ded 100644 (file)
--- a/include/configs/csb472.h
+++ b/include/configs/csb472.h
@@ -252,10 +252,10 @@
 #endif
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 #endif
 
 #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 */
-#define CFG_ENV_SECT_SIZE      0x00040000 /* Size of Environment Sector */
+#define CONFIG_ENV_IN_OWN_SECTOR       1          /* Give Environment own sector */
+#define CONFIG_ENV_ADDR                0xFFF00000 /* Address of Environment Sector */
+#define        CONFIG_ENV_SIZE         0x00001000 /* Size of Environment */
+#define CONFIG_ENV_SECT_SIZE   0x00040000 /* Size of Environment Sector */

 #endif
 
 /*
 #endif
 
 /*

diff --git a/include/configs/csb637.h b/include/configs/csb637.h
index c3054d3709bd3712280b8a87df8b65c020521933..0760084fb24c6c908f3a1650d4f2f9647a3e22ae 100644 (file)
--- a/include/configs/csb637.h
+++ b/include/configs/csb637.h
@@ -76,7 +76,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 #define CONFIG_BAUDRATE 115200
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 #define CONFIG_BAUDRATE 115200


@@ -194,13 +194,13 @@
 #undef CONFIG_ENV_IS_IN_DATAFLASH
 
 #ifdef CONFIG_ENV_IS_IN_DATAFLASH
 #undef CONFIG_ENV_IS_IN_DATAFLASH
 
 #ifdef CONFIG_ENV_IS_IN_DATAFLASH

-#define CFG_ENV_OFFSET                 0x20000
-#define CFG_ENV_ADDR                   (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
-#define CFG_ENV_SIZE                   0x2000  /* 0x8000 */
+#define CONFIG_ENV_OFFSET                      0x20000
+#define CONFIG_ENV_ADDR                        (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
+#define CONFIG_ENV_SIZE                        0x2000  /* 0x8000 */

 #else
 #define CONFIG_ENV_IS_IN_FLASH         1
 #else
 #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 */
+#define CONFIG_ENV_ADDR                        (PHYS_FLASH_1 + 0x20000)  /* after u-boot.bin */
+#define CONFIG_ENV_SIZE                        0x20000 /* sectors are 128K here */

 #endif /* CONFIG_ENV_IS_IN_DATAFLASH */
 
 
 #endif /* CONFIG_ENV_IS_IN_DATAFLASH */
 
 

diff --git a/include/configs/davinci_dvevm.h b/include/configs/davinci_dvevm.h
index 13f5e01a0022be8fa2bf12dfbbaaa30b0c2f9e03..ae2f6a5a34c83b619e2e6fd0aaf36e82085a6aa2 100644 (file)
--- a/include/configs/davinci_dvevm.h
+++ b/include/configs/davinci_dvevm.h
@@ -116,11 +116,11 @@
 #define CFG_NO_FLASH
 #define CONFIG_ENV_IS_IN_NAND          /* U-Boot env in NAND Flash  */
 #ifdef CFG_NAND_SMALLPAGE
 #define CFG_NO_FLASH
 #define CONFIG_ENV_IS_IN_NAND          /* U-Boot env in NAND Flash  */
 #ifdef CFG_NAND_SMALLPAGE

-#define CFG_ENV_SECT_SIZE      512     /* Env sector Size */
-#define CFG_ENV_SIZE           SZ_16K
+#define CONFIG_ENV_SECT_SIZE   512     /* Env sector Size */
+#define CONFIG_ENV_SIZE                SZ_16K

 #else
 #else

-#define CFG_ENV_SECT_SIZE      2048    /* Env sector Size */
-#define CFG_ENV_SIZE           SZ_128K
+#define CONFIG_ENV_SECT_SIZE   2048    /* Env sector Size */
+#define CONFIG_ENV_SIZE                SZ_128K

 #endif
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* U-Boot is loaded by a bootloader */
 #define CONFIG_SKIP_RELOCATE_UBOOT     /* to a proper address, init done */
 #endif
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* U-Boot is loaded by a bootloader */
 #define CONFIG_SKIP_RELOCATE_UBOOT     /* to a proper address, init done */


@@ -128,7 +128,7 @@
 #define CFG_NAND_HW_ECC
 #define CFG_MAX_NAND_DEVICE    1       /* Max number of NAND devices */
 #define NAND_MAX_CHIPS         1
 #define CFG_NAND_HW_ECC
 #define CFG_MAX_NAND_DEVICE    1       /* Max number of NAND devices */
 #define NAND_MAX_CHIPS         1

-#define CFG_ENV_OFFSET         0x0     /* Block 0--not used by bootcode */
+#define CONFIG_ENV_OFFSET              0x0     /* Block 0--not used by bootcode */

 #define DEF_BOOTM              ""
 #elif defined(CFG_USE_NOR)
 #ifdef CONFIG_NOR_UART_BOOT
 #define DEF_BOOTM              ""
 #elif defined(CFG_USE_NOR)
 #ifdef CONFIG_NOR_UART_BOOT


@@ -144,12 +144,12 @@
 #define CFG_FLASH_CFI
 #define CFG_MAX_FLASH_BANKS    1               /* max number of flash banks */
 #define CFG_FLASH_SECT_SZ      0x10000         /* 64KB sect size AMD Flash */
 #define CFG_FLASH_CFI
 #define CFG_MAX_FLASH_BANKS    1               /* max number of flash banks */
 #define CFG_FLASH_SECT_SZ      0x10000         /* 64KB sect size AMD Flash */

-#define CFG_ENV_OFFSET         (CFG_FLASH_SECT_SZ*3)
+#define CONFIG_ENV_OFFSET              (CFG_FLASH_SECT_SZ*3)

 #define PHYS_FLASH_1           0x02000000      /* CS2 Base address      */
 #define CFG_FLASH_BASE         PHYS_FLASH_1    /* Flash Base for U-Boot */
 #define PHYS_FLASH_SIZE                0x2000000       /* Flash size 32MB       */
 #define CFG_MAX_FLASH_SECT     (PHYS_FLASH_SIZE/CFG_FLASH_SECT_SZ)
 #define PHYS_FLASH_1           0x02000000      /* CS2 Base address      */
 #define CFG_FLASH_BASE         PHYS_FLASH_1    /* Flash Base for U-Boot */
 #define PHYS_FLASH_SIZE                0x2000000       /* Flash size 32MB       */
 #define CFG_MAX_FLASH_SECT     (PHYS_FLASH_SIZE/CFG_FLASH_SECT_SZ)

-#define CFG_ENV_SECT_SIZE      CFG_FLASH_SECT_SZ       /* Env sector Size */
+#define CONFIG_ENV_SECT_SIZE   CFG_FLASH_SECT_SZ       /* Env sector Size */

 #endif
 /*==============================*/
 /* U-Boot general configuration */
 #endif
 /*==============================*/
 /* U-Boot general configuration */

diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h
index f6234ec3d0b3913975b50d8c39cb6dc4de02c556..016a8970d9e65068ba9847a284b99cfcb8b0af49 100644 (file)
--- a/include/configs/davinci_schmoogie.h
+++ b/include/configs/davinci_schmoogie.h
@@ -82,15 +82,15 @@
 #undef CONFIG_ENV_IS_IN_FLASH
 #define CFG_NO_FLASH
 #define CONFIG_ENV_IS_IN_NAND          /* U-Boot env in NAND 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 */
-#define CFG_ENV_SIZE           SZ_128K
+#define CONFIG_ENV_SECT_SIZE   2048    /* Env sector Size */
+#define CONFIG_ENV_SIZE                SZ_128K

 #define CONFIG_SKIP_LOWLEVEL_INIT      /* U-Boot is loaded by a bootloader */
 #define CONFIG_SKIP_RELOCATE_UBOOT     /* to a proper address, init done */
 #define CFG_NAND_BASE          0x02000000
 #define CFG_NAND_HW_ECC
 #define CFG_MAX_NAND_DEVICE    1       /* Max number of NAND devices */
 #define NAND_MAX_CHIPS         1
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* U-Boot is loaded by a bootloader */
 #define CONFIG_SKIP_RELOCATE_UBOOT     /* to a proper address, init done */
 #define CFG_NAND_BASE          0x02000000
 #define CFG_NAND_HW_ECC
 #define CFG_MAX_NAND_DEVICE    1       /* Max number of NAND devices */
 #define NAND_MAX_CHIPS         1

-#define CFG_ENV_OFFSET         0x0     /* Block 0--not used by bootcode */
+#define CONFIG_ENV_OFFSET              0x0     /* Block 0--not used by bootcode */

 /*=====================*/
 /* Board related stuff */
 /*=====================*/
 /*=====================*/
 /* Board related stuff */
 /*=====================*/

diff --git a/include/configs/davinci_sffsdr.h b/include/configs/davinci_sffsdr.h
index b4f4b11682044fe8b5db2458cbc8dbd91cdb642f..39fb2a560356715bef9c84b17e3d627875c67950 100644 (file)
--- a/include/configs/davinci_sffsdr.h
+++ b/include/configs/davinci_sffsdr.h
@@ -78,15 +78,15 @@
 #undef CONFIG_ENV_IS_IN_FLASH
 #define CFG_NO_FLASH
 #define CONFIG_ENV_IS_IN_NAND          /* U-Boot env in NAND 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 */
-#define CFG_ENV_SIZE           SZ_128K
+#define CONFIG_ENV_SECT_SIZE   2048    /* Env sector Size */
+#define CONFIG_ENV_SIZE                SZ_128K

 #define CONFIG_SKIP_LOWLEVEL_INIT      /* U-Boot is loaded by a bootloader */
 #define CONFIG_SKIP_RELOCATE_UBOOT     /* to a proper address, init done */
 #define CFG_NAND_BASE          0x02000000
 #define CFG_NAND_HW_ECC
 #define CFG_MAX_NAND_DEVICE    1       /* Max number of NAND devices */
 #define NAND_MAX_CHIPS         1
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* U-Boot is loaded by a bootloader */
 #define CONFIG_SKIP_RELOCATE_UBOOT     /* to a proper address, init done */
 #define CFG_NAND_BASE          0x02000000
 #define CFG_NAND_HW_ECC
 #define CFG_MAX_NAND_DEVICE    1       /* Max number of NAND devices */
 #define NAND_MAX_CHIPS         1

-#define CFG_ENV_OFFSET         0x0     /* Block 0--not used by bootcode */
+#define CONFIG_ENV_OFFSET              0x0     /* Block 0--not used by bootcode */

 /* I2C switch definitions for PCA9543 chip */
 #define CFG_I2C_PCA9543_ADDR           0x70
 #define CFG_I2C_PCA9543_ADDR_LEN       0       /* Single register. */
 /* I2C switch definitions for PCA9543 chip */
 #define CFG_I2C_PCA9543_ADDR           0x70
 #define CFG_I2C_PCA9543_ADDR_LEN       0       /* Single register. */

diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h
index cd781eda05e308758250acc5f7ffaca661b79c6c..bb42a545852998608d0cba5982a9fe9c116a5464 100644 (file)
--- a/include/configs/davinci_sonata.h
+++ b/include/configs/davinci_sonata.h
@@ -115,15 +115,15 @@
 #undef CONFIG_ENV_IS_IN_FLASH
 #define CFG_NO_FLASH
 #define CONFIG_ENV_IS_IN_NAND          /* U-Boot env in NAND 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 */
-#define CFG_ENV_SIZE           SZ_16K
+#define CONFIG_ENV_SECT_SIZE   512     /* Env sector Size */
+#define CONFIG_ENV_SIZE                SZ_16K

 #define CONFIG_SKIP_LOWLEVEL_INIT      /* U-Boot is loaded by a bootloader */
 #define CONFIG_SKIP_RELOCATE_UBOOT     /* to a proper address, init done */
 #define CFG_NAND_BASE          0x02000000
 #define CFG_NAND_HW_ECC
 #define CFG_MAX_NAND_DEVICE    1       /* Max number of NAND devices */
 #define NAND_MAX_CHIPS         1
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* U-Boot is loaded by a bootloader */
 #define CONFIG_SKIP_RELOCATE_UBOOT     /* to a proper address, init done */
 #define CFG_NAND_BASE          0x02000000
 #define CFG_NAND_HW_ECC
 #define CFG_MAX_NAND_DEVICE    1       /* Max number of NAND devices */
 #define NAND_MAX_CHIPS         1

-#define CFG_ENV_OFFSET         0x0     /* Block 0--not used by bootcode */
+#define CONFIG_ENV_OFFSET              0x0     /* Block 0--not used by bootcode */

 #define DEF_BOOTM              ""
 #elif defined(CFG_USE_NOR)
 #ifdef CONFIG_NOR_UART_BOOT
 #define DEF_BOOTM              ""
 #elif defined(CFG_USE_NOR)
 #ifdef CONFIG_NOR_UART_BOOT


@@ -139,12 +139,12 @@
 #define CFG_FLASH_CFI
 #define CFG_MAX_FLASH_BANKS    1               /* max number of flash banks */
 #define CFG_FLASH_SECT_SZ      0x20000         /* 128KB sect size AMD Flash */
 #define CFG_FLASH_CFI
 #define CFG_MAX_FLASH_BANKS    1               /* max number of flash banks */
 #define CFG_FLASH_SECT_SZ      0x20000         /* 128KB sect size AMD Flash */

-#define CFG_ENV_OFFSET         (CFG_FLASH_SECT_SZ*2)
+#define CONFIG_ENV_OFFSET              (CFG_FLASH_SECT_SZ*2)

 #define PHYS_FLASH_1           0x02000000      /* CS2 Base address      */
 #define CFG_FLASH_BASE         PHYS_FLASH_1    /* Flash Base for U-Boot */
 #define PHYS_FLASH_SIZE                0x2000000       /* Flash size 32MB       */
 #define CFG_MAX_FLASH_SECT     (PHYS_FLASH_SIZE/CFG_FLASH_SECT_SZ)
 #define PHYS_FLASH_1           0x02000000      /* CS2 Base address      */
 #define CFG_FLASH_BASE         PHYS_FLASH_1    /* Flash Base for U-Boot */
 #define PHYS_FLASH_SIZE                0x2000000       /* Flash size 32MB       */
 #define CFG_MAX_FLASH_SECT     (PHYS_FLASH_SIZE/CFG_FLASH_SECT_SZ)

-#define CFG_ENV_SECT_SIZE      CFG_FLASH_SECT_SZ       /* Env sector Size */
+#define CONFIG_ENV_SECT_SIZE   CFG_FLASH_SECT_SZ       /* Env sector Size */

 #endif
 /*==============================*/
 /* U-Boot general configuration */
 #endif
 /*==============================*/
 /* U-Boot general configuration */

diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index d422cce202dd369cf96c4a01a9e070b74b57c49b..d7e48d0bc1fdeb23948f1cff8389af06a5c5d85f 100644 (file)
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -201,8 +201,8 @@
 #define        CONFIG_ENV_IS_NOWHERE   1
 
 /* Address and size of Primary Environment Sector      */
 #define        CONFIG_ENV_IS_NOWHERE   1
 
 /* Address and size of Primary Environment Sector      */

-#define CFG_ENV_ADDR           0xB0030000
-#define CFG_ENV_SIZE           0x10000
+#define CONFIG_ENV_ADDR                0xB0030000
+#define CONFIG_ENV_SIZE                0x10000

 
 #define CONFIG_FLASH_16BIT
 
 
 #define CONFIG_FLASH_16BIT
 

diff --git a/include/configs/debris.h b/include/configs/debris.h
index 68c9e549b1196547f3794dd14a1739e531547299..3ea4fa68859c01fd0d8a51bc92b142f9856c0a57 100644 (file)
--- a/include/configs/debris.h
+++ b/include/configs/debris.h
@@ -254,9 +254,9 @@
 #define CONFIG_ENV_IS_IN_NVRAM      1
 #define CONFIG_ENV_OVERWRITE     1
 #define CFG_NVRAM_ACCESS_ROUTINE 1
 #define CONFIG_ENV_IS_IN_NVRAM      1
 #define CONFIG_ENV_OVERWRITE     1
 #define CFG_NVRAM_ACCESS_ROUTINE 1

-#define CFG_ENV_ADDR           0xFF000000 /* right at the start of NVRAM  */
-#define CFG_ENV_SIZE           0x400   /* Size of the Environment - 8K    */
-#define CFG_ENV_OFFSET         0       /* starting right at the beginning */
+#define CONFIG_ENV_ADDR                0xFF000000 /* right at the start of NVRAM  */
+#define CONFIG_ENV_SIZE                0x400   /* Size of the Environment - 8K    */
+#define CONFIG_ENV_OFFSET              0       /* starting right at the beginning */

 
 #define CFG_NVRAM_BASE_ADDR    0xff000000
 
 
 #define CFG_NVRAM_BASE_ADDR    0xff000000
 

diff --git a/include/configs/delta.h b/include/configs/delta.h
index 5a5240eb6310e656ca26c5d754fdc587b00c6d8f..4b75e158bd91975867834b3f9d14f81979c7526a 100644 (file)
--- a/include/configs/delta.h
+++ b/include/configs/delta.h
@@ -43,7 +43,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN     (CFG_ENV_SIZE + 256*1024)
+#define CFG_MALLOC_LEN     (CONFIG_ENV_SIZE + 256*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -263,8 +263,8 @@
 #define CFG_NO_FLASH           1
 
 #define CONFIG_ENV_IS_IN_NAND  1
 #define CFG_NO_FLASH           1
 
 #define CONFIG_ENV_IS_IN_NAND  1

-#define CFG_ENV_OFFSET         0x40000
-#define CFG_ENV_OFFSET_REDUND  0x44000
-#define CFG_ENV_SIZE           0x4000
+#define CONFIG_ENV_OFFSET              0x40000
+#define CONFIG_ENV_OFFSET_REDUND       0x44000
+#define CONFIG_ENV_SIZE                0x4000

 
 #endif /* __CONFIG_H */
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/dnp1110.h b/include/configs/dnp1110.h
index 4adfeed082a4fad4708249f30d55de03e847ad5b..2249fc8dd0dcb0a1711796baac406b5254643b8f 100644 (file)
--- a/include/configs/dnp1110.h
+++ b/include/configs/dnp1110.h
@@ -46,7 +46,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -156,7 +156,7 @@
 #define CFG_FLASH_WRITE_TOUT   (2*CFG_HZ) /* Timeout for Flash Write */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   (2*CFG_HZ) /* Timeout for Flash Write */
 
 #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     */
+#define CONFIG_ENV_ADDR                        (PHYS_FLASH_1 + 0xF80000)       /* Addr of Environment Sector   */
+#define CONFIG_ENV_SIZE                        0x20000                                         /* Total Size of Environment Sector     */

 
 #endif /* __CONFIG_H */
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/eXalion.h b/include/configs/eXalion.h
index deb20aab9b772f14a85ae5891aaf5c65b3722618..ecf4c5e0b90378f532636bf2ca05c4255f5100a2 100644 (file)
--- a/include/configs/eXalion.h
+++ b/include/configs/eXalion.h
@@ -136,10 +136,10 @@
 #endif
 
 #define CONFIG_ENV_IS_IN_FLASH 1
 #endif
 
 #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
-#define CFG_ENV_OFFSET         0       /* starting right at the beginning  */
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* Size of one Flash sector */
+#define CONFIG_ENV_SIZE                CONFIG_ENV_SECT_SIZE    /* Use one Flash sector for enviroment  */
+#define CONFIG_ENV_ADDR                0xFFFC0000
+#define CONFIG_ENV_OFFSET              0       /* starting right at the beginning  */

 
 #define CFG_MALLOC_LEN         (128 * 1024)    /* Reserve 128 kB for malloc()  */
 
 
 #define CFG_MALLOC_LEN         (128 * 1024)    /* Reserve 128 kB for malloc()  */
 

diff --git a/include/configs/ebony.h b/include/configs/ebony.h
index 2a3595aa5703104cfebd1bdd944cfcbc563a3487..3affdd2f668072e4a18eaddfdfd70d0a46dfc261 100644 (file)
--- a/include/configs/ebony.h
+++ b/include/configs/ebony.h
@@ -98,9 +98,9 @@
 #define CONFIG_RTC_DS174x      1                   /* DS1743 RTC               */
 
 #ifdef CONFIG_ENV_IS_IN_NVRAM
 #define CONFIG_RTC_DS174x      1                   /* DS1743 RTC               */
 
 #ifdef CONFIG_ENV_IS_IN_NVRAM

-#define CFG_ENV_SIZE           0x1000      /* Size of Environment vars */
-#define CFG_ENV_ADDR           \
-       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)
+#define CONFIG_ENV_SIZE                0x1000      /* Size of Environment vars */
+#define CONFIG_ENV_ADDR                \
+       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CONFIG_ENV_SIZE)

 #endif /* CONFIG_ENV_IS_IN_NVRAM */
 
 /*-----------------------------------------------------------------------
 #endif /* CONFIG_ENV_IS_IN_NVRAM */
 
 /*-----------------------------------------------------------------------


@@ -119,13 +119,13 @@
 #define CFG_FLASH_WORD_SIZE     unsigned char
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_FLASH_WORD_SIZE     unsigned char
 
 #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     */
+#define CONFIG_ENV_SECT_SIZE   0x10000 /* size of one complete sector          */
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE-CONFIG_ENV_SECT_SIZE)
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*-----------------------------------------------------------------------
 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/ep7312.h b/include/configs/ep7312.h
index 367e667a1019016c77fb910d6e79396697a2d0d5..60c87bdce83a317dd349d106aa2f61f8eea3bd1e 100644 (file)
--- a/include/configs/ep7312.h
+++ b/include/configs/ep7312.h
@@ -41,7 +41,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -150,8 +150,8 @@
 #define CFG_FLASH_WRITE_TOUT   (2*CFG_HZ) /* Timeout for Flash Write */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   (2*CFG_HZ) /* Timeout for Flash Write */
 
 #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     */
+#define CONFIG_ENV_ADDR                (PHYS_FLASH_1 + 0x20000)        /* Addr of Environment Sector   */
+#define CONFIG_ENV_SIZE                0x20000 /* Total Size of Environment Sector     */

 
 /*
  * JFFS2 partitions
 
 /*
  * JFFS2 partitions

diff --git a/include/configs/ep8248.h b/include/configs/ep8248.h
index 54484ad433b66f5360e771c82fb1175ae3752636..d8f1aaf1c455a931687fe89500ff9a2ab1539e13 100644 (file)
--- a/include/configs/ep8248.h
+++ b/include/configs/ep8248.h
@@ -217,8 +217,8 @@
 #define CONFIG_ENV_IS_IN_FLASH
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_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)
+#define CONFIG_ENV_SECT_SIZE   0x20000
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + CFG_MONITOR_LEN)

 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 #define CFG_DEFAULT_IMMR       0x00010000
 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 #define CFG_DEFAULT_IMMR       0x00010000

diff --git a/include/configs/ep8260.h b/include/configs/ep8260.h
index 0911f8c9259177f9e8898f1c4770dd4ac9e167f6..9a602c3afb91642f96db9303451f6fceb99cf764 100644 (file)
--- a/include/configs/ep8260.h
+++ b/include/configs/ep8260.h
@@ -252,7 +252,7 @@
  * put in the same sector as U-Boot, and changing variables
  * will erase U-Boot temporarily
  */
  * put in the same sector as U-Boot, and changing variables
  * will erase U-Boot temporarily
  */

-#define CFG_ENV_IN_OWN_SECT
+#define CONFIG_ENV_IN_OWN_SECT

 
 /* Define to allow the user to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 
 /* Define to allow the user to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE


@@ -476,18 +476,18 @@
 #ifndef CFG_RAMBOOT
 #  define CONFIG_ENV_IS_IN_FLASH  1
 
 #ifndef CFG_RAMBOOT
 #  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
+#  ifdef CONFIG_ENV_IN_OWN_SECT
+#    define CONFIG_ENV_ADDR       (CFG_MONITOR_BASE + 0x40000)
+#    define CONFIG_ENV_SECT_SIZE  0x40000

 #  else
 #  else

-#    define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CFG_ENV_SECT_SIZE)
-#    define CFG_ENV_SIZE       0x1000  /* Total Size of Environment Sector */
-#    define CFG_ENV_SECT_SIZE  0x10000 /* see README - env sect real size */
-#  endif /* CFG_ENV_IN_OWN_SECT */
+#    define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CONFIG_ENV_SECT_SIZE)
+#    define CONFIG_ENV_SIZE       0x1000  /* Total Size of Environment Sector */
+#    define CONFIG_ENV_SECT_SIZE  0x10000 /* see README - env sect real size */
+#  endif /* CONFIG_ENV_IN_OWN_SECT */

 #else
 #  define CONFIG_ENV_IS_IN_NVRAM  1
 #else
 #  define CONFIG_ENV_IS_IN_NVRAM  1

-#  define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
-#  define CFG_ENV_SIZE         0x200
+#  define CONFIG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
+#  define CONFIG_ENV_SIZE         0x200

 #endif /* CFG_RAMBOOT */
 
 /*-----------------------------------------------------------------------
 #endif /* CFG_RAMBOOT */
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/ep82xxm.h b/include/configs/ep82xxm.h
index 17c84963c368e85831cb4ee1d0f1c0818745f68f..a5019001baa8234de8a1342102394fce02d3efce 100644 (file)
--- a/include/configs/ep82xxm.h
+++ b/include/configs/ep82xxm.h
@@ -144,7 +144,7 @@
 #define CONFIG_GATEWAYIP       10.0.0.1
 #define CONFIG_NETMASK         255.255.255.0
 #define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds */
 #define CONFIG_GATEWAYIP       10.0.0.1
 #define CONFIG_NETMASK         255.255.255.0
 #define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds */

-#define CFG_ENV_IN_OWN_SECT    1
+#define CONFIG_ENV_IN_OWN_SECT 1

 #define CONFIG_AUTO_COMPLETE   1
 #define        CONFIG_EXTRA_ENV_SETTINGS       "ethprime=FCC3 ETHERNET"
 
 #define CONFIG_AUTO_COMPLETE   1
 #define        CONFIG_EXTRA_ENV_SETTINGS       "ethprime=FCC3 ETHERNET"
 


@@ -208,8 +208,8 @@
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector in flinfo */
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector in flinfo */
 
 #ifdef CONFIG_ENV_IS_IN_FLASH

-#define CFG_ENV_SECT_SIZE      0x20000
-#define CFG_ENV_ADDR           (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#define CONFIG_ENV_SECT_SIZE   0x20000
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + CFG_MONITOR_LEN)

 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*-----------------------------------------------------------------------
 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*-----------------------------------------------------------------------


@@ -224,8 +224,8 @@
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
 
 #ifdef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
 
 #ifdef CONFIG_ENV_IS_IN_EEPROM

-#define CFG_ENV_SIZE           0x200       /* Size of Environment vars */
-#define CFG_ENV_OFFSET         0x0
+#define CONFIG_ENV_SIZE                0x200       /* Size of Environment vars */
+#define CONFIG_ENV_OFFSET              0x0

 #endif /* CONFIG_ENV_IS_IN_EEPROM */
 
 /* RTC Configuration */
 #endif /* CONFIG_ENV_IS_IN_EEPROM */
 
 /* RTC Configuration */

diff --git a/include/configs/evb4510.h b/include/configs/evb4510.h
index 35a020bd6d64400a1c949caeefbad74e5092ca26..63ca2a5cb4e37c77ffd09647c1646fc298b0c371 100644 (file)
--- a/include/configs/evb4510.h
+++ b/include/configs/evb4510.h
@@ -51,7 +51,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128
 
 /*
 #define CFG_GBL_DATA_SIZE      128
 
 /*


@@ -174,8 +174,8 @@
 #define CONFIG_ENV_IS_IN_FLASH
 #undef CONFIG_ENV_IS_NOWHERE
 
 #define CONFIG_ENV_IS_IN_FLASH
 #undef CONFIG_ENV_IS_NOWHERE
 

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x20000) /* environment start address */
-#define CFG_ENV_SECT_SIZE      0x10000    /* Total Size of Environment Sector */
-#define CFG_ENV_SIZE           0x1000     /* max size for environment */
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x20000) /* environment start address */
+#define CONFIG_ENV_SECT_SIZE   0x10000    /* Total Size of Environment Sector */
+#define CONFIG_ENV_SIZE                0x1000     /* max size for environment */

 
 #endif /* __CONFIG_H */
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/favr-32-ezkit.h b/include/configs/favr-32-ezkit.h
index ce19b1f8208b2833d6d4906e7786a14c5c472bda..e445a135bf5743e9a4db5362cea3abcb9f636469 100644 (file)
--- a/include/configs/favr-32-ezkit.h
+++ b/include/configs/favr-32-ezkit.h
@@ -175,8 +175,8 @@
 #define CFG_SDRAM_BASE                 EBI_SDRAM_BASE
 
 #define CONFIG_ENV_IS_IN_FLASH         1
 #define CFG_SDRAM_BASE                 EBI_SDRAM_BASE
 
 #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)
+#define CONFIG_ENV_SIZE                        65536
+#define CONFIG_ENV_ADDR                        (CFG_FLASH_BASE + CFG_FLASH_SIZE - CONFIG_ENV_SIZE)

 
 #define CFG_INIT_SP_ADDR               (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
 
 
 #define CFG_INIT_SP_ADDR               (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
 

diff --git a/include/configs/gcplus.h b/include/configs/gcplus.h
index 31e99f3bec1c05b3706c6ae26a6ef6b70f983096..5863f83395a94d006435c66d39b47499fc96f854 100644 (file)
--- a/include/configs/gcplus.h
+++ b/include/configs/gcplus.h
@@ -57,7 +57,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN          (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN          (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE       128     /* size rsrvd for initial data */
 
 
 #define CFG_GBL_DATA_SIZE       128     /* size rsrvd for initial data */
 
 


@@ -179,7 +179,7 @@
 #endif
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #endif
 
 #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
+#define CONFIG_ENV_ADDR                (PHYS_FLASH_1 + PHYS_FLASH_SECT_SIZE)   /* Addr of Environment Sector   */
+#define CONFIG_ENV_SIZE                PHYS_FLASH_SECT_SIZE

 
 #endif /* __CONFIG_H */
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h
index e363d9a078b5b6f198f6e5adf66c4c5bd0daa352..5a7a580b0950b42f9eca972ecf3b09c398d59e2e 100644 (file)
--- a/include/configs/gr_cpci_ax2000.h
+++ b/include/configs/gr_cpci_ax2000.h
@@ -220,10 +220,10 @@
  */
 /*#define CONFIG_ENV_IS_NOWHERE 1*/
 #define CONFIG_ENV_IS_IN_FLASH 1
  */
 /*#define CONFIG_ENV_IS_NOWHERE 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
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE+CFG_FLASH_SIZE-CFG_ENV_SECT_SIZE)
+/* CONFIG_ENV_ADDR need to be at sector boundary */
+#define CONFIG_ENV_SIZE                0x8000
+#define CONFIG_ENV_SECT_SIZE   0x20000
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE+CFG_FLASH_SIZE-CONFIG_ENV_SECT_SIZE)

 #define CONFIG_ENV_OVERWRITE   1
 
 /*
 #define CONFIG_ENV_OVERWRITE   1
 
 /*

diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h
index 7f8367436ca666a06a58690804679d3e97b1792f..3133c0d2b8c9fa9373cf1a3fd53534d163805276 100644 (file)
--- a/include/configs/gr_ep2s60.h
+++ b/include/configs/gr_ep2s60.h
@@ -208,10 +208,10 @@
  */
 /*#define CONFIG_ENV_IS_NOWHERE 1*/
 #define CONFIG_ENV_IS_IN_FLASH 1
  */
 /*#define CONFIG_ENV_IS_NOWHERE 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
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE+CFG_FLASH_SIZE-CFG_ENV_SECT_SIZE)
+/* CONFIG_ENV_ADDR need to be at sector boundary */
+#define CONFIG_ENV_SIZE                0x8000
+#define CONFIG_ENV_SECT_SIZE   0x20000
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE+CFG_FLASH_SIZE-CONFIG_ENV_SECT_SIZE)

 #define CONFIG_ENV_OVERWRITE   1
 
 /*
 #define CONFIG_ENV_OVERWRITE   1
 
 /*

diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h
index a6e34d0cc167ba25fd2de86ef353c44ecfd890f2..316b003c59eebcac8640c34625036067e5bce804 100644 (file)
--- a/include/configs/gr_xc3s_1500.h
+++ b/include/configs/gr_xc3s_1500.h
@@ -184,10 +184,10 @@
  */
 /*#define CONFIG_ENV_IS_NOWHERE 1*/
 #define CONFIG_ENV_IS_IN_FLASH 1
  */
 /*#define CONFIG_ENV_IS_NOWHERE 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
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE+CFG_FLASH_SIZE-CFG_ENV_SECT_SIZE)
+/* CONFIG_ENV_ADDR need to be at sector boundary */
+#define CONFIG_ENV_SIZE                0x8000
+#define CONFIG_ENV_SECT_SIZE   0x20000
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE+CFG_FLASH_SIZE-CONFIG_ENV_SECT_SIZE)

 #define CONFIG_ENV_OVERWRITE   1
 
 /*
 #define CONFIG_ENV_OVERWRITE   1
 
 /*

diff --git a/include/configs/grsim.h b/include/configs/grsim.h
index 2a8226a8de616d69d176fb15480f509715662bbd..a5ef6e1d4cb831ef6b6edd15d8c88ff08b77cc62 100644 (file)
--- a/include/configs/grsim.h
+++ b/include/configs/grsim.h
@@ -181,9 +181,9 @@
 #define CFG_NO_FLASH           1
 #define CFG_FLASH_BASE         0x00000000
 #define CFG_FLASH_SIZE         0x00800000
 #define CFG_NO_FLASH           1
 #define CFG_FLASH_BASE         0x00000000
 #define CFG_FLASH_SIZE         0x00800000

-#define CFG_ENV_SIZE           0x8000
+#define CONFIG_ENV_SIZE                0x8000

 
 

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE+CFG_FLASH_SIZE-CFG_ENV_SIZE)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE+CFG_FLASH_SIZE-CONFIG_ENV_SIZE)

 
 #define PHYS_FLASH_SECT_SIZE   0x00020000      /* 128 KB sectors */
 #define CFG_MAX_FLASH_SECT     64      /* max num of sects on one chip */
 
 #define PHYS_FLASH_SECT_SIZE   0x00020000      /* 128 KB sectors */
 #define CFG_MAX_FLASH_SECT     64      /* max num of sects on one chip */


@@ -211,8 +211,8 @@
  */
 #define CONFIG_ENV_IS_NOWHERE 1
 /*#define CONFIG_ENV_IS_IN_FLASH*/
  */
 #define CONFIG_ENV_IS_NOWHERE 1
 /*#define CONFIG_ENV_IS_IN_FLASH*/

-/*#define CFG_ENV_SIZE         0x8000*/
-#define CFG_ENV_SECT_SIZE      0x40000
+/*#define CONFIG_ENV_SIZE              0x8000*/
+#define CONFIG_ENV_SECT_SIZE   0x40000

 #define CONFIG_ENV_OVERWRITE   1
 
 /*
 #define CONFIG_ENV_OVERWRITE   1
 
 /*

diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h
index 3cfeb204050097dca0e1c00c6a5285ff2f6e9ae3..a88ddb3d6f508546323f4e9e2b40d3c975d2b44e 100644 (file)
--- a/include/configs/grsim_leon2.h
+++ b/include/configs/grsim_leon2.h
@@ -178,9 +178,9 @@
 #define CFG_NO_FLASH           1
 #define CFG_FLASH_BASE         0x00000000
 #define CFG_FLASH_SIZE         0x00800000
 #define CFG_NO_FLASH           1
 #define CFG_FLASH_BASE         0x00000000
 #define CFG_FLASH_SIZE         0x00800000

-#define CFG_ENV_SIZE           0x8000
+#define CONFIG_ENV_SIZE                0x8000

 
 

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE+CFG_FLASH_SIZE-CFG_ENV_SIZE)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE+CFG_FLASH_SIZE-CONFIG_ENV_SIZE)

 
 #define PHYS_FLASH_SECT_SIZE   0x00020000      /* 128 KB sectors */
 #define CFG_MAX_FLASH_SECT     64      /* max num of sects on one chip */
 
 #define PHYS_FLASH_SECT_SIZE   0x00020000      /* 128 KB sectors */
 #define CFG_MAX_FLASH_SECT     64      /* max num of sects on one chip */


@@ -208,8 +208,8 @@
  */
 #define CONFIG_ENV_IS_NOWHERE 1
 /*#define CONFIG_ENV_IS_IN_FLASH*/
  */
 #define CONFIG_ENV_IS_NOWHERE 1
 /*#define CONFIG_ENV_IS_IN_FLASH*/

-/*#define CFG_ENV_SIZE         0x8000*/
-#define CFG_ENV_SECT_SIZE      0x40000
+/*#define CONFIG_ENV_SIZE              0x8000*/
+#define CONFIG_ENV_SECT_SIZE   0x40000

 #define CONFIG_ENV_OVERWRITE   1
 
 /*
 #define CONFIG_ENV_OVERWRITE   1
 
 /*

diff --git a/include/configs/gth2.h b/include/configs/gth2.h
index ad8bb5958042d1ce29bc8d9ff3c4b7a26b94d901..aaf1e4ac5504e033136fb504c6dfcf3e15a76488 100644 (file)
--- a/include/configs/gth2.h
+++ b/include/configs/gth2.h
@@ -156,8 +156,8 @@
 #define CONFIG_ENV_IS_NOWHERE  1
 
 /* Address and size of Primary Environment Sector      */
 #define CONFIG_ENV_IS_NOWHERE  1
 
 /* Address and size of Primary Environment Sector      */

-#define CFG_ENV_ADDR           0xB0030000
-#define CFG_ENV_SIZE           0x10000
+#define CONFIG_ENV_ADDR                0xB0030000
+#define CONFIG_ENV_SIZE                0x10000

 
 #define CONFIG_FLASH_16BIT
 
 
 #define CONFIG_FLASH_16BIT
 

diff --git a/include/configs/gw8260.h b/include/configs/gw8260.h
index 19641b7df5ea4e903eabeb3a187c62c67d74b411..e187764e2e5987ed2727c755228cc42834d4cbff 100644 (file)
--- a/include/configs/gw8260.h
+++ b/include/configs/gw8260.h
@@ -139,7 +139,7 @@
  *                     Monitor Stack Buffer (0x80)
  *     0x00F5 FFB0     Board Info Data
  *     0x00F6 0000     Malloc Arena
  *                     Monitor Stack Buffer (0x80)
  *     0x00F5 FFB0     Board Info Data
  *     0x00F6 0000     Malloc Arena

- *           :          CFG_ENV_SECT_SIZE, 256k
+ *           :          CONFIG_ENV_SECT_SIZE, 256k

  *           :          CFG_MALLOC_LEN,    128k
  *     0x00FC 0000     RAM Copy of Monitor Code
  *           :              CFG_MONITOR_LEN,   256k
  *           :          CFG_MALLOC_LEN,    128k
  *     0x00FC 0000     RAM Copy of Monitor Code
  *           :              CFG_MONITOR_LEN,   256k


@@ -162,7 +162,7 @@
  *                     Monitor Stack Buffer (0x80)
  *     0x03F5 FFB0     Board Info Data
  *     0x03F6 0000     Malloc Arena
  *                     Monitor Stack Buffer (0x80)
  *     0x03F5 FFB0     Board Info Data
  *     0x03F6 0000     Malloc Arena

- *           :          CFG_ENV_SECT_SIZE, 256k
+ *           :          CONFIG_ENV_SECT_SIZE, 256k

  *           :          CFG_MALLOC_LEN,    128k
  *     0x03FC 0000     RAM Copy of Monitor Code
  *           :              CFG_MONITOR_LEN,   256k
  *           :          CFG_MALLOC_LEN,    128k
  *     0x03FC 0000     RAM Copy of Monitor Code
  *           :              CFG_MONITOR_LEN,   256k


@@ -258,7 +258,7 @@
  * put in the same sector as U-Boot, and changing variables
  * will erase U-Boot temporarily
  */
  * put in the same sector as U-Boot, and changing variables
  * will erase U-Boot temporarily
  */

-#define CFG_ENV_IN_OWN_SECT
+#define CONFIG_ENV_IN_OWN_SECT

 
 /* Define to allow the user to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 
 /* Define to allow the user to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE


@@ -374,7 +374,7 @@
 
 #define CFG_MEM_END_USAGE   ( CFG_MONITOR_LEN \
                            + CFG_MALLOC_LEN \
 
 #define CFG_MEM_END_USAGE   ( CFG_MONITOR_LEN \
                            + CFG_MALLOC_LEN \

-                           + CFG_ENV_SECT_SIZE \
+                           + CONFIG_ENV_SECT_SIZE \

                            + CFG_STACK_USAGE )
 
 #define CFG_MEMTEST_END     ( CFG_SDRAM_SIZE * 1024 * 1024 \
                            + CFG_STACK_USAGE )
 
 #define CFG_MEMTEST_END     ( CFG_SDRAM_SIZE * 1024 * 1024 \


@@ -465,14 +465,14 @@
 
 #define CONFIG_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))
-#  define CFG_ENV_SECT_SIZE   (256 * 1024)
+#ifdef CONFIG_ENV_IN_OWN_SECT
+#  define CONFIG_ENV_ADDR        (CFG_MONITOR_BASE +  (256 * 1024))
+#  define CONFIG_ENV_SECT_SIZE   (256 * 1024)

 #else
 #else

-#  define CFG_ENV_SIZE        (16 * 1024)/* Size of Environment Sector  */
-#  define CFG_ENV_ADD  ((CFG_MONITOR_BASE + CFG_MONITOR_LEN) - CFG_ENV_SIZE)
-#  define CFG_ENV_SECT_SIZE (256 * 1024)/* see README - env sect real size  */
-#endif /* CFG_ENV_IN_OWN_SECT */
+#  define CONFIG_ENV_SIZE        (16 * 1024)/* Size of Environment Sector  */
+#  define CONFIG_ENV_ADD  ((CFG_MONITOR_BASE + CFG_MONITOR_LEN) - CONFIG_ENV_SIZE)
+#  define CONFIG_ENV_SECT_SIZE (256 * 1024)/* see README - env sect real size  */
+#endif /* CONFIG_ENV_IN_OWN_SECT */

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/hammerhead.h b/include/configs/hammerhead.h
index 68bd4c8fa8bc58d03fcefe3f0a58141ae5454a10..5426c7a4ede25a10a0b27b9e1a1d99f9b1c23d07 100644 (file)
--- a/include/configs/hammerhead.h
+++ b/include/configs/hammerhead.h
@@ -144,8 +144,8 @@
 #define CFG_SDRAM_BASE                 0x10000000
 
 #define CONFIG_ENV_IS_IN_FLASH         1
 #define CFG_SDRAM_BASE                 0x10000000
 
 #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)
+#define CONFIG_ENV_SIZE                        65536
+#define CONFIG_ENV_ADDR                        (CFG_FLASH_BASE + CFG_FLASH_SIZE - CONFIG_ENV_SIZE)

 
 #define CFG_INIT_SP_ADDR               (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
 
 
 #define CFG_INIT_SP_ADDR               (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
 

diff --git a/include/configs/hcu4.h b/include/configs/hcu4.h
index b98883edbe639ccbbc8b7df34a2fbd5a7eb14376..b51ea4ea31c2289f051d618739a4b9bd70653549 100644 (file)
--- a/include/configs/hcu4.h
+++ b/include/configs/hcu4.h
@@ -128,19 +128,19 @@
 #ifdef  CONFIG_ENV_IS_IN_EEPROM
 /* Put the environment after the SDRAM configuration */
 #define PROM_SIZE      2048
 #ifdef  CONFIG_ENV_IS_IN_EEPROM
 /* Put the environment after the SDRAM configuration */
 #define PROM_SIZE      2048

-#define CFG_ENV_OFFSET  512
-#define CFG_ENV_SIZE   (PROM_SIZE-CFG_ENV_OFFSET)
+#define CONFIG_ENV_OFFSET       512
+#define CONFIG_ENV_SIZE        (PROM_SIZE-CONFIG_ENV_OFFSET)

 #endif
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
 /* Put the environment in Flash */
 #endif
 
 #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)
-#define        CFG_ENV_SIZE            8*1024  /* 8 KB Environment Sector      */
+#define CONFIG_ENV_SECT_SIZE   0x10000 /* size of one complete sector  */
+#define CONFIG_ENV_ADDR                ((-CFG_MONITOR_LEN)-CONFIG_ENV_SECT_SIZE)
+#define        CONFIG_ENV_SIZE         8*1024  /* 8 KB Environment Sector      */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/hcu5.h b/include/configs/hcu5.h
index 91c5f22b549877e7618a4638fce8afb4ea6209ac..1874ff238f3a4b49d71aa04c7e017f900634cb89 100644 (file)
--- a/include/configs/hcu5.h
+++ b/include/configs/hcu5.h
@@ -115,19 +115,19 @@
 /* Put the environment after the SDRAM and bootstrap configuration */
 #define PROM_SIZE      2048
 #define CFG_BOOSTRAP_OPTION_OFFSET      512
 /* Put the environment after the SDRAM and bootstrap configuration */
 #define PROM_SIZE      2048
 #define CFG_BOOSTRAP_OPTION_OFFSET      512

-#define CFG_ENV_OFFSET  (CFG_BOOSTRAP_OPTION_OFFSET + 0x10)
-#define CFG_ENV_SIZE   (PROM_SIZE-CFG_ENV_OFFSET)
+#define CONFIG_ENV_OFFSET       (CFG_BOOSTRAP_OPTION_OFFSET + 0x10)
+#define CONFIG_ENV_SIZE        (PROM_SIZE-CONFIG_ENV_OFFSET)

 #endif
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
 /* Put the environment in Flash */
 #endif
 
 #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)
-#define CFG_ENV_SIZE           8*1024  /* 8 KB Environment Sector      */
+#define CONFIG_ENV_SECT_SIZE   0x10000 /* size of one complete sector  */
+#define CONFIG_ENV_ADDR                ((-CFG_MONITOR_LEN)-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE                8*1024  /* 8 KB Environment Sector      */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 #endif
 
 
 #endif
 

diff --git a/include/configs/hermes.h b/include/configs/hermes.h
index 1ecb4b5ef4c8b7d57a01010f2493073eaea9b08a..e1a0846d48ccdc1907cc07e0a951a79f51c535d3 100644 (file)
--- a/include/configs/hermes.h
+++ b/include/configs/hermes.h
@@ -156,8 +156,8 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #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     */
+#define        CONFIG_ENV_OFFSET               0x4000  /*   Offset   of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x2000  /* Total Size of Environment Sector     */

 /*-----------------------------------------------------------------------
  * Cache Configuration
  */
 /*-----------------------------------------------------------------------
  * Cache Configuration
  */

diff --git a/include/configs/hmi1001.h b/include/configs/hmi1001.h
index 4d557611469290e7395d4691a9d5002f0182f6ca..e816b6d64ccb27a094c817506bb82b8a6ff66855 100644 (file)
--- a/include/configs/hmi1001.h
+++ b/include/configs/hmi1001.h
@@ -149,7 +149,7 @@
 #define CFG_FLASH_SIZE         0x00800000 /* 8 MByte */
 #define CFG_MAX_FLASH_SECT     67      /* max num of sects on one chip */
 
 #define CFG_FLASH_SIZE         0x00800000 /* 8 MByte */
 #define CFG_MAX_FLASH_SECT     67      /* max num of sects on one chip */
 

-#define CFG_ENV_ADDR           (TEXT_BASE+0x40000) /* second sector */
+#define CONFIG_ENV_ADDR                (TEXT_BASE+0x40000) /* second sector */

 #define CFG_MAX_FLASH_BANKS    1       /* max num of flash banks
                                           (= chip selects) */
 #define CFG_FLASH_ERASE_TOUT   240000  /* Flash Erase Timeout (in ms)  */
 #define CFG_MAX_FLASH_BANKS    1       /* max num of flash banks
                                           (= chip selects) */
 #define CFG_FLASH_ERASE_TOUT   240000  /* Flash Erase Timeout (in ms)  */


@@ -164,10 +164,10 @@
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
  * Environment settings
  */
 #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)
-#define CFG_ENV_SIZE_REDUND     (CFG_ENV_SIZE)
+#define CONFIG_ENV_SIZE                0x4000
+#define CONFIG_ENV_SECT_SIZE   0x20000
+#define CONFIG_ENV_OFFSET_REDUND   (CONFIG_ENV_OFFSET+CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND     (CONFIG_ENV_SIZE)

 
 /*
  * Memory map
 
 /*
  * Memory map

diff --git a/include/configs/hymod.h b/include/configs/hymod.h
index fd0bab1643bb47b9ff3f8353d8b642586bbad117..9c704c651daa103f29283ab6d214ad6ae6af209a 100644 (file)
--- a/include/configs/hymod.h
+++ b/include/configs/hymod.h
@@ -404,9 +404,9 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Flash Write Timeout (in ms)  */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   500     /* Flash Write Timeout (in ms)  */
 
 #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)
+#define        CONFIG_ENV_SIZE         0x40000 /* Total Size of Environment Sector */
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* see README - env sect real size */
+#define        CONFIG_ENV_ADDR (CFG_FLASH_BASE+CFG_MONITOR_LEN-CONFIG_ENV_SECT_SIZE)

 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 /*-----------------------------------------------------------------------
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/idmr.h b/include/configs/idmr.h
index 43453b7cfca89ac239f1efe8fc53a2807e926f96..a1f1517dfb7d3336b45240f7286662ba54021ef7 100644 (file)
--- a/include/configs/idmr.h
+++ b/include/configs/idmr.h
@@ -115,13 +115,13 @@
  * Configuration for environment, which occupies third sector in flash.
  */
 #ifndef CONFIG_MONITOR_IS_IN_RAM
  * Configuration for environment, which occupies third sector in flash.
  */
 #ifndef CONFIG_MONITOR_IS_IN_RAM

-#define CFG_ENV_ADDR           0xff820000
-#define CFG_ENV_SECT_SIZE      0x10000
-#define CFG_ENV_SIZE           0x2000
+#define CONFIG_ENV_ADDR                0xff820000
+#define CONFIG_ENV_SECT_SIZE   0x10000
+#define CONFIG_ENV_SIZE                0x2000

 #define CONFIG_ENV_IS_IN_FLASH
 #else /* CONFIG_MONITOR_IS_IN_RAM */
 #define CONFIG_ENV_IS_IN_FLASH
 #else /* CONFIG_MONITOR_IS_IN_RAM */

-#define CFG_ENV_OFFSET         0x4000
-#define CFG_ENV_SECT_SIZE      0x2000
+#define CONFIG_ENV_OFFSET              0x4000
+#define CONFIG_ENV_SECT_SIZE   0x2000

 #define CONFIG_ENV_IS_IN_FLASH
 #endif /* !CONFIG_MONITOR_IS_IN_RAM */
 
 #define CONFIG_ENV_IS_IN_FLASH
 #endif /* !CONFIG_MONITOR_IS_IN_RAM */
 

diff --git a/include/configs/impa7.h b/include/configs/impa7.h
index 7eb6921b55edd0c4fbea02926e8be6b87c59a467..52eb88811161f6b12f610a47940fc38f9567a2c5 100644 (file)
--- a/include/configs/impa7.h
+++ b/include/configs/impa7.h
@@ -41,7 +41,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -152,8 +152,8 @@
 #define CFG_FLASH_WRITE_TOUT   (2*CFG_HZ) /* Timeout for Flash Write */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   (2*CFG_HZ) /* Timeout for Flash Write */
 
 #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     */
+#define CONFIG_ENV_ADDR                (PHYS_FLASH_1 + 0x1C000)        /* Addr of Environment Sector   */
+#define CONFIG_ENV_SIZE                0x4000  /* Total Size of Environment Sector     */

 
 /*
  * JFFS2 partitions
 
 /*
  * JFFS2 partitions

diff --git a/include/configs/imx31_litekit.h b/include/configs/imx31_litekit.h
index 1660b0509e9788cdcc4c30a8c711621e58bfc5fd..b6981366b060f9537be6f6bc47f52b75ad7395cf 100644 (file)
--- a/include/configs/imx31_litekit.h
+++ b/include/configs/imx31_litekit.h
@@ -53,7 +53,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128 * 1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128 * 1024)

 #define CFG_GBL_DATA_SIZE      128  /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128  /* size in bytes reserved for initial data */
 
 /*


@@ -149,10 +149,10 @@
 #define CFG_MAX_FLASH_SECT     128          /* max number of sectors on one chip */
 #define CFG_MONITOR_BASE       CFG_FLASH_BASE /* Monitor at beginning of flash */
 
 #define CFG_MAX_FLASH_SECT     128          /* max number of sectors on one chip */
 #define CFG_MONITOR_BASE       CFG_FLASH_BASE /* Monitor at beginning of flash */
 

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x001f0000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x001f0000)

 #define        CONFIG_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)
+#define CONFIG_ENV_SECT_SIZE   (64 * 1024)
+#define CONFIG_ENV_SIZE                (64 * 1024)

 
 /*-----------------------------------------------------------------------
  * CFI FLASH driver setup
 
 /*-----------------------------------------------------------------------
  * CFI FLASH driver setup

diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index 18ff450f0c96404483b33b8030c8e16d8139f014..bf2a8dd4bbc35904d548b5a7ef4387ae645d40e5 100644 (file)
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -51,7 +51,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128 * 1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128 * 1024)

 #define CFG_GBL_DATA_SIZE      128  /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128  /* size in bytes reserved for initial data */
 
 /*


@@ -153,8 +153,8 @@
 #define CFG_MONITOR_BASE       CFG_FLASH_BASE /* Monitor at beginning of flash */
 
 #define        CONFIG_ENV_IS_IN_EEPROM         1
 #define CFG_MONITOR_BASE       CFG_FLASH_BASE /* Monitor at beginning of flash */
 
 #define        CONFIG_ENV_IS_IN_EEPROM         1

-#define CFG_ENV_OFFSET                 0x00    /* environment starts here     */
-#define CFG_ENV_SIZE                   4096
+#define CONFIG_ENV_OFFSET                      0x00    /* environment starts here     */
+#define CONFIG_ENV_SIZE                        4096

 #define CFG_I2C_EEPROM_ADDR            0x52
 #define CFG_EEPROM_PAGE_WRITE_BITS     5       /* 5 bits = 32 octets          */
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10      /* between stop and start      */
 #define CFG_I2C_EEPROM_ADDR            0x52
 #define CFG_EEPROM_PAGE_WRITE_BITS     5       /* 5 bits = 32 octets          */
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10      /* between stop and start      */

diff --git a/include/configs/incaip.h b/include/configs/incaip.h
index 3d98974a2a474d0e05885c6c9323c79b104d2475..5368ac8e5e12ab18bcc928f8b2c3b7b642acb09b 100644 (file)
--- a/include/configs/incaip.h
+++ b/include/configs/incaip.h
@@ -153,8 +153,8 @@
 #define        CONFIG_ENV_IS_IN_FLASH  1
 
 /* Address and size of Primary Environment Sector      */
 #define        CONFIG_ENV_IS_IN_FLASH  1
 
 /* Address and size of Primary Environment Sector      */

-#define CFG_ENV_ADDR           0xB0030000
-#define CFG_ENV_SIZE           0x10000
+#define CONFIG_ENV_ADDR                0xB0030000
+#define CONFIG_ENV_SIZE                0x10000

 
 #define CONFIG_FLASH_16BIT
 
 
 #define CONFIG_FLASH_16BIT
 

diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h
index 528f2762a5850a621e39d991b00f0b30115becc9..32d48719d2b7218e26da81da10703f276abc55a3 100644 (file)
--- a/include/configs/inka4x0.h
+++ b/include/configs/inka4x0.h
@@ -172,9 +172,9 @@
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
  * Environment settings
  */
 #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
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x4000)
+#define CONFIG_ENV_SIZE                0x2000
+#define CONFIG_ENV_SECT_SIZE   0x2000

 #define CONFIG_ENV_OVERWRITE   1
 #define CFG_USE_PPCENV                 /* Environment embedded in sect .ppcenv */
 
 #define CONFIG_ENV_OVERWRITE   1
 #define CFG_USE_PPCENV                 /* Environment embedded in sect .ppcenv */
 

diff --git a/include/configs/innokom.h b/include/configs/innokom.h
index 1435d049cef043cb5f63d8c6c8b4f7017f0f3ddb..f9535c9840d3ba26e1c26b35057a89cdc89a60aa 100644 (file)
--- a/include/configs/innokom.h
+++ b/include/configs/innokom.h
@@ -142,8 +142,8 @@
 
 #define CONFIG_ENV_IS_IN_EEPROM                1
 
 
 #define CONFIG_ENV_IS_IN_EEPROM                1
 

-#define CFG_ENV_OFFSET                 0x00    /* environment starts here  */
-#define CFG_ENV_SIZE                   1024    /* 1 KiB                    */
+#define CONFIG_ENV_OFFSET                      0x00    /* environment starts here  */
+#define CONFIG_ENV_SIZE                        1024    /* 1 KiB                    */

 #define CFG_I2C_EEPROM_ADDR            0x50    /* A0 = 0 (hardwired)       */
 #define CFG_EEPROM_PAGE_WRITE_BITS     5       /* 5 bits = 32 octets       */
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 15      /* between stop and start   */
 #define CFG_I2C_EEPROM_ADDR            0x50    /* A0 = 0 (hardwired)       */
 #define CFG_EEPROM_PAGE_WRITE_BITS     5       /* 5 bits = 32 octets       */
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 15      /* between stop and start   */

diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h
index dd070be13b5c12d9bbf1e5e159b4a5bbd678ef23..f951a016d235c00a06844254cf515cfad3a1a1b7 100644 (file)
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -52,7 +52,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -135,7 +135,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_MAX_FLASH_SECT     128
 #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_MAX_FLASH_SECT     128

-#define CFG_ENV_SIZE           32768
+#define CONFIG_ENV_SIZE                32768

 
 #define PHYS_FLASH_1           (CFG_FLASH_BASE)
 
 
 #define PHYS_FLASH_1           (CFG_FLASH_BASE)
 

diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h
index d66ec3a194f7b4c25da91cb01da2eaee90c7e63e..6dbe4b307ce489bb34957ed171ad0b69ab83c161 100644 (file)
--- a/include/configs/integratorcp.h
+++ b/include/configs/integratorcp.h
@@ -47,7 +47,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -169,29 +169,29 @@ SIB at Block62 End Block62 address 0x24f80000
  * Move up the U-Boot & monitor area if more flash is fitted.
  * If this U-Boot is to be run on Integrators with varying flash sizes,
  * drivers/mtd/cfi_flash.c::flash_init() can read the Integrator CP_FLASHPROG
  * Move up the U-Boot & monitor area if more flash is fitted.
  * If this U-Boot is to be run on Integrators with varying flash sizes,
  * drivers/mtd/cfi_flash.c::flash_init() can read the Integrator CP_FLASHPROG

- * register and dynamically assign CFG_ENV_ADDR & CFG_MONITOR_BASE
+ * register and dynamically assign CONFIG_ENV_ADDR & CFG_MONITOR_BASE

  * - CFG_MONITOR_BASE is set to indicate that the environment is not
  * embedded in the boot monitor(s) area
  */
 #if ( PHYS_FLASH_SIZE == 0x04000000 )
 
  * - CFG_MONITOR_BASE is set to indicate that the environment is not
  * embedded in the boot monitor(s) area
  */
 #if ( PHYS_FLASH_SIZE == 0x04000000 )
 

-#define CFG_ENV_ADDR           0x27F00000
+#define CONFIG_ENV_ADDR                0x27F00000

 #define CFG_MONITOR_BASE       0x27F40000
 
 #elif (PHYS_FLASH_SIZE == 0x02000000 )
 
 #define CFG_MONITOR_BASE       0x27F40000
 
 #elif (PHYS_FLASH_SIZE == 0x02000000 )
 

-#define CFG_ENV_ADDR           0x25F00000
+#define CONFIG_ENV_ADDR                0x25F00000

 #define CFG_MONITOR_BASE       0x25F40000
 
 #else
 
 #define CFG_MONITOR_BASE       0x25F40000
 
 #else
 

-#define CFG_ENV_ADDR           0x24F00000
+#define CONFIG_ENV_ADDR                0x24F00000

 #define CFG_MONITOR_BASE       0x27F40000
 
 #endif
 
 #define CFG_MONITOR_BASE       0x27F40000
 
 #endif
 

-#define CFG_ENV_SECT_SIZE      0x40000         /* 256KB */
-#define CFG_ENV_SIZE           8192            /* 8KB */
+#define CONFIG_ENV_SECT_SIZE   0x40000         /* 256KB */
+#define CONFIG_ENV_SIZE                8192            /* 8KB */

 /*-----------------------------------------------------------------------
  * CP control registers
  */
 /*-----------------------------------------------------------------------
  * CP control registers
  */

diff --git a/include/configs/ixdp425.h b/include/configs/ixdp425.h
index 6559429f82f6f9288de9161860c8d508e0b1a69d..b9334759fe35acceb031e1051221c606d69dc17d 100644 (file)
--- a/include/configs/ixdp425.h
+++ b/include/configs/ixdp425.h
@@ -45,7 +45,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN      (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN      (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /* allow to overwrite serial and ethaddr */
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /* allow to overwrite serial and ethaddr */


@@ -193,8 +193,8 @@
 
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 
 
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 

-#define CFG_ENV_SECT_SIZE      0x20000 /* size of one complete sector  */
-#define CFG_ENV_ADDR           (PHYS_FLASH_1 + 0x20000)
-#define        CFG_ENV_SIZE            0x2000  /* Total Size of Environment Sector     */
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* size of one complete sector  */
+#define CONFIG_ENV_ADDR                (PHYS_FLASH_1 + 0x20000)
+#define        CONFIG_ENV_SIZE         0x2000  /* Total Size of Environment Sector     */

 
 #endif  /* __CONFIG_H */
 
 #endif  /* __CONFIG_H */

diff --git a/include/configs/ixdpg425.h b/include/configs/ixdpg425.h
index 484c2d98aa996c7b020ed4740094346a7ae43c91..241728da4902ac34d379c3053d1c9d919af81cac 100644 (file)
--- a/include/configs/ixdpg425.h
+++ b/include/configs/ixdpg425.h
@@ -225,13 +225,13 @@
 
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 
 
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 

-#define CFG_ENV_SECT_SIZE      0x20000 /* size of one complete sector  */
-#define CFG_ENV_ADDR           (PHYS_FLASH_1 + 0x40000)
-#define        CFG_ENV_SIZE            0x2000  /* Total Size of Environment Sector     */
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* size of one complete sector  */
+#define CONFIG_ENV_ADDR                (PHYS_FLASH_1 + 0x40000)
+#define        CONFIG_ENV_SIZE         0x2000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 /*
  * GPIO settings
 
 /*
  * GPIO settings

diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h
index ce90d7f170a3974e0e6b997e3dfa54d84d6a992d..5d8e3a6fb2cd14f32a18a022a9c791b40363fada 100644 (file)
--- a/include/configs/jupiter.h
+++ b/include/configs/jupiter.h
@@ -184,7 +184,7 @@
 
 #define CFG_MAX_FLASH_SECT     128     /* max num of sects on one chip */
 
 
 #define CFG_MAX_FLASH_SECT     128     /* max num of sects on one chip */
 

-#define CFG_ENV_ADDR           (TEXT_BASE + 0x40000) /* third sector */
+#define CONFIG_ENV_ADDR                (TEXT_BASE + 0x40000) /* third sector */

 
 #define CFG_FLASH_ERASE_TOUT   240000  /* Flash Erase Timeout (in ms)  */
 #define CFG_FLASH_WRITE_TOUT   500     /* Flash Write Timeout (in ms)  */
 
 #define CFG_FLASH_ERASE_TOUT   240000  /* Flash Erase Timeout (in ms)  */
 #define CFG_FLASH_WRITE_TOUT   500     /* Flash Write Timeout (in ms)  */


@@ -202,13 +202,13 @@
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_FLASH 1

-#define CFG_ENV_SIZE           0x20000
-#define CFG_ENV_SECT_SIZE      0x20000
+#define CONFIG_ENV_SIZE                0x20000
+#define CONFIG_ENV_SECT_SIZE   0x20000

 #define CONFIG_ENV_OVERWRITE   1
 
 /* Address and size of Redundant Environment Sector    */
 #define CONFIG_ENV_OVERWRITE   1
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 /*
  * Memory map
 
 /*
  * Memory map

diff --git a/include/configs/katmai.h b/include/configs/katmai.h
index 1876279abd49ff763b1a492bbed46ab04f1cbc80..fac284456abe85aa0b75fe20eca1dff83e66d554 100644 (file)
--- a/include/configs/katmai.h
+++ b/include/configs/katmai.h
@@ -219,13 +219,13 @@
 #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_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_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     */
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* size of one complete sector  */
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE-CONFIG_ENV_SECT_SIZE)
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 /*-----------------------------------------------------------------------
  * PCI stuff
 
 /*-----------------------------------------------------------------------
  * PCI stuff

diff --git a/include/configs/kb9202.h b/include/configs/kb9202.h
index 8df222b88ef1fe08dd3c3d7a8771abad9537284f..3c514177ff32e8f1ccf64a71b4381254299f4afe 100644 (file)
--- a/include/configs/kb9202.h
+++ b/include/configs/kb9202.h
@@ -60,7 +60,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN (roundup(CFG_ENV_SIZE,4096) + 128*1024)
+#define CFG_MALLOC_LEN (roundup(CONFIG_ENV_SIZE,4096) + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 #define CONFIG_BAUDRATE 115200
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 #define CONFIG_BAUDRATE 115200


@@ -131,11 +131,11 @@
 #define        CONFIG_ENV_IS_IN_EEPROM
 
 #ifdef CONFIG_KB9202
 #define        CONFIG_ENV_IS_IN_EEPROM
 
 #ifdef CONFIG_KB9202

-#define CFG_ENV_OFFSET                 0x3E00
-#define CFG_ENV_SIZE                   0x0200
+#define CONFIG_ENV_OFFSET                      0x3E00
+#define CONFIG_ENV_SIZE                        0x0200

 #else
 #else

-#define CFG_ENV_OFFSET                 0x1000
-#define CFG_ENV_SIZE                   0x1000
+#define CONFIG_ENV_OFFSET                      0x1000
+#define CONFIG_ENV_SIZE                        0x1000

 #endif
 #define        CFG_I2C_EEPROM_ADDR             0x50
 #define        CFG_EEPROM_PAGE_WRITE_BITS      6
 #endif
 #define        CFG_I2C_EEPROM_ADDR             0x50
 #define        CFG_EEPROM_PAGE_WRITE_BITS      6

diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h
index fec22d89a4568b1f61aa402c57f1726f849947ae..58918d491863cc9ce314924fb7c70103d47418eb 100644 (file)
--- a/include/configs/kilauea.h
+++ b/include/configs/kilauea.h
@@ -124,7 +124,7 @@
 #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 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 */
+#define CONFIG_ENV_IS_EMBEDDED 1       /* use embedded environment */

 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------


@@ -144,13 +144,13 @@
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 
 #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     */
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* size of one complete sector  */
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE-CONFIG_ENV_SECT_SIZE)
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*
 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*


@@ -205,9 +205,9 @@
  * For NAND booting the environment is embedded in the U-Boot image. Please take
  * look at the file board/amcc/sequoia/u-boot-nand.lds for details.
  */
  * For NAND booting the environment is embedded in the U-Boot image. Please take
  * look at the file board/amcc/sequoia/u-boot-nand.lds for details.
  */

-#define CFG_ENV_SIZE           CFG_NAND_BLOCK_SIZE
-#define CFG_ENV_OFFSET         (CFG_NAND_U_BOOT_OFFS + CFG_ENV_SIZE)
-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET + CFG_ENV_SIZE)
+#define CONFIG_ENV_SIZE                CFG_NAND_BLOCK_SIZE
+#define CONFIG_ENV_OFFSET              (CFG_NAND_U_BOOT_OFFS + CONFIG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)

 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/korat.h b/include/configs/korat.h
index b6984da2ca03fae3989e7ef03ad9c163c1553b14..214cb429bcd97d03c9fbabf2d49b222c552b0ca6 100644 (file)
--- a/include/configs/korat.h
+++ b/include/configs/korat.h
@@ -127,13 +127,13 @@
 #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_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_SECT_SIZE      0x20000 /* size of one complete sector        */
-#define CFG_ENV_ADDR           (CFG_FLASH1_TOP - CFG_ENV_SECT_SIZE)
-#define CFG_ENV_SIZE           0x2000  /* Total Size of Environment Sector   */
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* size of one complete sector        */
+#define CONFIG_ENV_ADDR                (CFG_FLASH1_TOP - CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE                0x2000  /* Total Size of Environment Sector   */

 
 /* Address and size of Redundant Environment Sector */
 
 /* 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
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR - CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE

 
 /*
  * DDR SDRAM
 
 /*
  * DDR SDRAM

diff --git a/include/configs/kvme080.h b/include/configs/kvme080.h
index 7d903aa13c710dac640a912cb7fe00407c5f155e..098b92b4749e67efcf31fc23fe3962f1bee0db08 100644 (file)
--- a/include/configs/kvme080.h
+++ b/include/configs/kvme080.h
@@ -160,9 +160,9 @@
 #define CONFIG_ENV_IS_IN_NVRAM 1
 #define CONFIG_ENV_OVERWRITE   1
 #define CFG_NVRAM_ACCESS_ROUTINE
 #define CONFIG_ENV_IS_IN_NVRAM 1
 #define CONFIG_ENV_OVERWRITE   1
 #define CFG_NVRAM_ACCESS_ROUTINE

-#define CFG_ENV_ADDR           CFG_NVRAM_BASE_ADDR
-#define CFG_ENV_SIZE           0x400
-#define CFG_ENV_OFFSET         0
+#define CONFIG_ENV_ADDR                CFG_NVRAM_BASE_ADDR
+#define CONFIG_ENV_SIZE                0x400
+#define CONFIG_ENV_OFFSET              0

 
 #define CFG_NS16550
 #define CFG_NS16550_SERIAL
 
 #define CFG_NS16550
 #define CFG_NS16550_SERIAL

diff --git a/include/configs/lart.h b/include/configs/lart.h
index f38e5da0d04a7d722587ccd558628128198853fa..d7b8cfc8a2839cd8724ae5c0c2570b486cf70b2d 100644 (file)
--- a/include/configs/lart.h
+++ b/include/configs/lart.h
@@ -39,7 +39,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -153,7 +153,7 @@
 #define CFG_FLASH_WRITE_TOUT   (2*CFG_HZ) /* Timeout for Flash Write */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   (2*CFG_HZ) /* Timeout for Flash Write */
 
 #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     */
+#define CONFIG_ENV_ADDR                (PHYS_FLASH_1 + 0x1C000)        /* Addr of Environment Sector   */
+#define CONFIG_ENV_SIZE                0x4000  /* Total Size of Environment Sector     */

 
 #endif /* __CONFIG_H */
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/linkstation.h b/include/configs/linkstation.h
index 01ae31769f6101b4d27fceb162241da534a45024..be2f71cb72761396af69733972473915436eb927 100644 (file)
--- a/include/configs/linkstation.h
+++ b/include/configs/linkstation.h
@@ -456,9 +456,9 @@
  * We use the last sector of this area to store the environment
  * which leaves max. 384 kB for the U-Boot itself
  */
  * We use the last sector of this area to store the environment
  * which leaves max. 384 kB for the U-Boot itself
  */

-#define CFG_ENV_ADDR           0xFFF60000
-#define CFG_ENV_SIZE           0x00010000
-#define CFG_ENV_SECT_SIZE      0x00010000
+#define CONFIG_ENV_ADDR                0xFFF60000
+#define CONFIG_ENV_SIZE                0x00010000
+#define CONFIG_ENV_SECT_SIZE   0x00010000

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/logodl.h b/include/configs/logodl.h
index 5e51d8134ed59bc6d12f283d0f8dfaa1f1f75ea1..dcbae9795eb801a5c6da4ff413ee753d97754a6a 100644 (file)
--- a/include/configs/logodl.h
+++ b/include/configs/logodl.h
@@ -289,7 +289,7 @@
 
 /* FIXME */
 #define        CONFIG_ENV_IS_IN_FLASH  1
 
 /* FIXME */
 #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     */
+#define CONFIG_ENV_ADDR            (PHYS_FLASH_1 + 0x1C000)        /* Addr of Environment Sector   */
+#define CONFIG_ENV_SIZE            0x4000  /* Total Size of Environment Sector     */

 
 #endif  /* __CONFIG_H */
 
 #endif  /* __CONFIG_H */

diff --git a/include/configs/lpc2292sodimm.h b/include/configs/lpc2292sodimm.h
index 2f2a3e823afe8d1c9cad7e3d35e92abf79fe79ed..3d173d71fe2346364449c6c8563999b7c732cbd2 100644 (file)
--- a/include/configs/lpc2292sodimm.h
+++ b/include/configs/lpc2292sodimm.h
@@ -49,7 +49,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -151,8 +151,8 @@
 #define CFG_FLASH_WRITE_TOUT   (2*CFG_HZ) /* Timeout for Flash Write */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   (2*CFG_HZ) /* Timeout for Flash Write */
 
 #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      */
+#define CONFIG_ENV_ADDR                (0x0 + 0x3C000) /* Addr of Environment Sector   */
+#define CONFIG_ENV_SIZE                0x2000 /* Total Size of Environment Sector      */

 
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS

diff --git a/include/configs/lpd7a400.h b/include/configs/lpd7a400.h
index ae9503fd9f6feb24058d64c0b72ffdb33242746e..9e6ea1a286eaad6899c0875e940803b3125359f8 100644 (file)
--- a/include/configs/lpd7a400.h
+++ b/include/configs/lpd7a400.h
@@ -37,7 +37,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -113,7 +113,7 @@
 #define        CONFIG_ENV_IS_IN_FLASH  1
 
 /* Address and size of Primary Environment Sector      */
 #define        CONFIG_ENV_IS_IN_FLASH  1
 
 /* Address and size of Primary Environment Sector      */

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0xFC0000)
-#define CFG_ENV_SIZE           0x40000
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0xFC0000)
+#define CONFIG_ENV_SIZE                0x40000

 
 #endif  /* __LPD7A400_H_ */
 
 #endif  /* __LPD7A400_H_ */

diff --git a/include/configs/lpd7a404.h b/include/configs/lpd7a404.h
index 7ea4342a1be37527a59809d798a0747e69620807..9c9591341191ee83309a202fac4d3f74e392687a 100644 (file)
--- a/include/configs/lpd7a404.h
+++ b/include/configs/lpd7a404.h
@@ -37,7 +37,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -113,7 +113,7 @@
 #define        CONFIG_ENV_IS_IN_FLASH  1
 
 /* Address and size of Primary Environment Sector      */
 #define        CONFIG_ENV_IS_IN_FLASH  1
 
 /* Address and size of Primary Environment Sector      */

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0xFC0000)
-#define CFG_ENV_SIZE           0x40000
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0xFC0000)
+#define CONFIG_ENV_SIZE                0x40000

 
 #endif  /* __LPD7A404_H_ */
 
 #endif  /* __LPD7A404_H_ */

diff --git a/include/configs/luan.h b/include/configs/luan.h
index 9aef77cc5af411491aa213cb29b1afd90097f214..2259ec34de005d11dcb2d05f07c915384efd7b18 100644 (file)
--- a/include/configs/luan.h
+++ b/include/configs/luan.h
@@ -115,13 +115,13 @@
 #define CFG_FLASH_WORD_SIZE     unsigned char
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_FLASH_WORD_SIZE     unsigned char
 
 #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     */
+#define CONFIG_ENV_SECT_SIZE   0x10000 /* size of one complete sector  */
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE                0x2000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*-----------------------------------------------------------------------
 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/lubbock.h b/include/configs/lubbock.h
index 7e0c4a20cfb7a6c50203327057526d54f54a7d51..3c921c0c9240dace45537de3064ad2c69938f8d1 100644 (file)
--- a/include/configs/lubbock.h
+++ b/include/configs/lubbock.h
@@ -49,7 +49,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN     (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN     (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -232,9 +232,9 @@
  */
 #define        CFG_MONITOR_LEN         PHYS_FLASH_SECT_SIZE
 #define CONFIG_ENV_IS_IN_FLASH 1
  */
 #define        CFG_MONITOR_LEN         PHYS_FLASH_SECT_SIZE
 #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)
+#define CONFIG_ENV_ADDR                (PHYS_FLASH_1 + PHYS_FLASH_SECT_SIZE)
+#define CONFIG_ENV_SECT_SIZE   PHYS_FLASH_SECT_SIZE
+#define CONFIG_ENV_SIZE                (PHYS_FLASH_SECT_SIZE / 16)

 
 
 /*
 
 
 /*

diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h
index 73b988f29b6d32f3dc700f483942ebbe9b23afcc..e4ee099fa8526f2bbbc2a1579f5c89f147824ddc 100644 (file)
--- a/include/configs/lwmon.h
+++ b/include/configs/lwmon.h
@@ -316,9 +316,9 @@
 
 /* Put environment in flash which is much faster to boot than using the EEPROM */
 #define CONFIG_ENV_IS_IN_FLASH 1
 
 /* Put environment in flash which is much faster to boot than using the EEPROM */
 #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 :-(         */
+#define CONFIG_ENV_ADDR            0x40040000  /* Address    of Environment Sector     */
+#define CONFIG_ENV_SIZE                0x2000  /* Total Size of Environment            */
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* we have BIG sectors only :-(         */

 
 /*-----------------------------------------------------------------------
  * I2C/EEPROM Configuration
 
 /*-----------------------------------------------------------------------
  * I2C/EEPROM Configuration

diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
index 841361541a820b882c0411fb017359a3a3aa8f69..c09e301ce058f5268a987e17ca75f54f63a7a373 100644 (file)
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -142,13 +142,13 @@
 #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_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_SECT_SIZE      0x40000 /* 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     */
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* size of one complete sector          */
+#define CONFIG_ENV_ADDR                ((-CFG_MONITOR_LEN)-CONFIG_ENV_SECT_SIZE)
+#define        CONFIG_ENV_SIZE         0x2000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 /*-----------------------------------------------------------------------
  * DDR SDRAM
 
 /*-----------------------------------------------------------------------
  * DDR SDRAM

diff --git a/include/configs/m501sk.h b/include/configs/m501sk.h
index bbc2b4e3ebd0f4b3611062a6bdf18184e115a1ab..32403f7de6ec2c03db300ecd3fa6db91c575f6ce 100644 (file)
--- a/include/configs/m501sk.h
+++ b/include/configs/m501sk.h
@@ -45,7 +45,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* Bytes reserved for initial data */
 
 #define CONFIG_BAUDRATE                        115200
 #define CFG_GBL_DATA_SIZE      128     /* Bytes reserved for initial data */
 
 #define CONFIG_BAUDRATE                        115200


@@ -58,7 +58,7 @@
  */
 #define CFG_FLASH_CFI          1
 #define CONFIG_FLASH_CFI_DRIVER        1
  */
 #define CFG_FLASH_CFI          1
 #define CONFIG_FLASH_CFI_DRIVER        1

-#define CFG_ENV_SECT_SIZE      0x20000
+#define CONFIG_ENV_SECT_SIZE   0x20000

 #define CFG_FLASH_USE_BUFFER_WRITE
 #define CFG_FLASH_PROTECTION   /*for Intel P30 Flash*/
 #define CONFIG_HARD_I2C
 #define CFG_FLASH_USE_BUFFER_WRITE
 #define CFG_FLASH_PROTECTION   /*for Intel P30 Flash*/
 #define CONFIG_HARD_I2C


@@ -155,18 +155,18 @@
 #define CFG_FLASH_WRITE_TOUT   (2*CFG_HZ) /* Timeout for Flash Write */
 
 #ifdef CONFIG_ENV_IS_IN_DATAFLASH
 #define CFG_FLASH_WRITE_TOUT   (2*CFG_HZ) /* Timeout for Flash Write */
 
 #ifdef CONFIG_ENV_IS_IN_DATAFLASH

-#define CFG_ENV_OFFSET         0x20000
-#define CFG_ENV_ADDR           (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
-#define CFG_ENV_SIZE           0x2000
+#define CONFIG_ENV_OFFSET              0x20000
+#define CONFIG_ENV_ADDR                (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
+#define CONFIG_ENV_SIZE                0x2000

 #else
 #define CONFIG_ENV_IS_IN_FLASH
 #else
 #define CONFIG_ENV_IS_IN_FLASH

-#define CFG_ENV_ADDR           (PHYS_FLASH_1 + 0x00020000)
-#define CFG_ENV_SIZE           2048
+#define CONFIG_ENV_ADDR                (PHYS_FLASH_1 + 0x00020000)
+#define CONFIG_ENV_SIZE                2048

 #endif
 
 #ifdef CONFIG_ENV_IS_IN_EEPROM
 #endif
 
 #ifdef CONFIG_ENV_IS_IN_EEPROM

-#define CFG_ENV_OFFSET         1024
-#define CFG_ENV_SIZE           1024
+#define CONFIG_ENV_OFFSET              1024
+#define CONFIG_ENV_SIZE                1024

 #endif
 
 #define CFG_LOAD_ADDR          0x21000000 /* default load address */
 #endif
 
 #define CFG_LOAD_ADDR          0x21000000 /* default load address */

diff --git a/include/configs/makalu.h b/include/configs/makalu.h
index 97715a32928edd82d5b5206de572b8065e79a511..b7dddb70ea338673bcf85f5b042aa83bb5a96bec 100644 (file)
--- a/include/configs/makalu.h
+++ b/include/configs/makalu.h
@@ -138,13 +138,13 @@
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 
 #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     */
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* size of one complete sector  */
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE-CONFIG_ENV_SECT_SIZE)
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*-----------------------------------------------------------------------
 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/mcc200.h b/include/configs/mcc200.h
index 4e8c0d110551307d59d67ae1f398365ff2ebb0ab..c3a600e6776afe62b60a645dd9d85b29b0d95c71 100644 (file)
--- a/include/configs/mcc200.h
+++ b/include/configs/mcc200.h
@@ -229,13 +229,13 @@
 
 #define CONFIG_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)
-#define        CFG_ENV_SIZE            0x2000  /* Total Size of Environment Sector     */
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* size of one complete sector  */
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#define        CONFIG_ENV_SIZE         0x2000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 #define CONFIG_ENV_OVERWRITE   1       /* allow modification of vendor params */
 
 
 #define CONFIG_ENV_OVERWRITE   1       /* allow modification of vendor params */
 

diff --git a/include/configs/mcu25.h b/include/configs/mcu25.h
index 67c848510ecc364ee7b4c363cda56afdd32e7f20..9a83f083a8a85118abe3fcc07f7e7f40bd656ac1 100644 (file)
--- a/include/configs/mcu25.h
+++ b/include/configs/mcu25.h
@@ -128,19 +128,19 @@
 #ifdef  CONFIG_ENV_IS_IN_EEPROM
 /* Put the environment after the SDRAM configuration */
 #define PROM_SIZE      2048
 #ifdef  CONFIG_ENV_IS_IN_EEPROM
 /* Put the environment after the SDRAM configuration */
 #define PROM_SIZE      2048

-#define CFG_ENV_OFFSET  512
-#define CFG_ENV_SIZE   (PROM_SIZE-CFG_ENV_OFFSET)
+#define CONFIG_ENV_OFFSET       512
+#define CONFIG_ENV_SIZE        (PROM_SIZE-CONFIG_ENV_OFFSET)

 #endif
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
 /* Put the environment in Flash */
 #endif
 
 #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)
-#define        CFG_ENV_SIZE            8*1024  /* 8 KB Environment Sector */
+#define CONFIG_ENV_SECT_SIZE   0x10000 /* size of one complete sector */
+#define CONFIG_ENV_ADDR                ((-CFG_MONITOR_LEN)-CONFIG_ENV_SECT_SIZE)
+#define        CONFIG_ENV_SIZE         8*1024  /* 8 KB Environment Sector */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/mecp5200.h b/include/configs/mecp5200.h
index e0bd6e3e05eabc37740b0f2a927014326cfd9ede..8b13fc0acb4d122089beb0204bec28e42e002c4b 100644 (file)
--- a/include/configs/mecp5200.h
+++ b/include/configs/mecp5200.h
@@ -180,7 +180,7 @@
  */
 #define CFG_FLASH_BASE         0xFFC00000
 #define CFG_FLASH_SIZE         0x00400000
  */
 #define CFG_FLASH_BASE         0xFFC00000
 #define CFG_FLASH_SIZE         0x00400000

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x003E0000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x003E0000)

 #define CFG_MAX_FLASH_BANKS    1       /* max num of memory banks      */
 #define CFG_MAX_FLASH_SECT     512
 
 #define CFG_MAX_FLASH_BANKS    1       /* max num of memory banks      */
 #define CFG_MAX_FLASH_SECT     512
 


@@ -192,13 +192,13 @@
  */
 #if 1 /* test-only */
 #define CONFIG_ENV_IS_IN_FLASH 1
  */
 #if 1 /* test-only */
 #define CONFIG_ENV_IS_IN_FLASH 1

-#define CFG_ENV_SIZE           0x10000
-#define CFG_ENV_SECT_SIZE      0x10000
+#define CONFIG_ENV_SIZE                0x10000
+#define CONFIG_ENV_SECT_SIZE   0x10000

 #define CONFIG_ENV_OVERWRITE   1
 #else
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
 #define CONFIG_ENV_OVERWRITE   1
 #else
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */

-#define CFG_ENV_OFFSET         0x0000  /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE           0x0400  /* 8192 bytes may be used for env vars*/
+#define CONFIG_ENV_OFFSET              0x0000  /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE                0x0400  /* 8192 bytes may be used for env vars*/

                                   /* total size of a CAT24WC32 is 8192 bytes */
 #define CONFIG_ENV_OVERWRITE   1
 #endif
                                   /* total size of a CAT24WC32 is 8192 bytes */
 #define CONFIG_ENV_OVERWRITE   1
 #endif

diff --git a/include/configs/mgcoge.h b/include/configs/mgcoge.h
index 015e4dc527ec281dfc279a8b14abfe0585569765..23af3ec4834ce924285d093b756ee53aacad7073 100644 (file)
--- a/include/configs/mgcoge.h
+++ b/include/configs/mgcoge.h
@@ -172,8 +172,8 @@
 #define CONFIG_ENV_IS_IN_FLASH
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_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)
+#define CONFIG_ENV_SECT_SIZE   0x20000
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + CFG_MONITOR_LEN)

 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 #define CFG_IMMR               0xF0000000
 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 #define CFG_IMMR               0xF0000000

diff --git a/include/configs/mgsuvd.h b/include/configs/mgsuvd.h
index 7fd5a47f337781f2627c71cea895f165cc0487c3..740767e1e2f340e751b0f6a5007fd27f558af26e 100644 (file)
--- a/include/configs/mgsuvd.h
+++ b/include/configs/mgsuvd.h
@@ -197,13 +197,13 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #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     */
+#define CONFIG_ENV_OFFSET              0x40000 /*   Offset   of Environment Sector     */
+#define CONFIG_ENV_SIZE                0x08000 /* Total Size of Environment Sector     */
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* Address and size of Redundant Environment Sector    */

-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET+CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 

diff --git a/include/configs/mimc200.h b/include/configs/mimc200.h
index 69e99a6db43ab2010127086e46d58ae8dbb9a844..da307aca2d855e0d196e9fa5b293a1594e6a588e 100644 (file)
--- a/include/configs/mimc200.h
+++ b/include/configs/mimc200.h
@@ -150,8 +150,8 @@
 #define CFG_FRAM_SIZE                  0x20000
 
 #define CONFIG_ENV_IS_IN_FLASH         1
 #define CFG_FRAM_SIZE                  0x20000
 
 #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)
+#define CONFIG_ENV_SIZE                        65536
+#define CONFIG_ENV_ADDR                        (CFG_FLASH_BASE + CFG_FLASH_SIZE - CONFIG_ENV_SIZE)

 
 #define CFG_INIT_SP_ADDR               (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
 
 
 #define CFG_INIT_SP_ADDR               (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
 

diff --git a/include/configs/ml300.h b/include/configs/ml300.h
index 67129a55addf07c429d1cfc8bbeda26597ca260d..8d482216dd62f712ac3cf8a42a06a253446badf5 100644 (file)
--- a/include/configs/ml300.h
+++ b/include/configs/ml300.h
@@ -68,7 +68,7 @@
 #ifdef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_I2C_EEPROM_ADDR    XPAR_PERSISTENT_0_IIC_0_EEPROMADDR
 #define CFG_I2C_EEPROM_ADDR_LEN 1
 #ifdef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_I2C_EEPROM_ADDR    XPAR_PERSISTENT_0_IIC_0_EEPROMADDR
 #define CFG_I2C_EEPROM_ADDR_LEN 1

-#define CFG_ENV_OFFSET         XPAR_PERSISTENT_0_IIC_0_BASEADDR
+#define CONFIG_ENV_OFFSET              XPAR_PERSISTENT_0_IIC_0_BASEADDR

 #define CONFIG_MISC_INIT_R     1       /* used to call out convert_env() */
 #define CONFIG_ENV_OVERWRITE   1       /* allow users to update ethaddr and serial# */
 #endif
 #define CONFIG_MISC_INIT_R     1       /* used to call out convert_env() */
 #define CONFIG_ENV_OVERWRITE   1       /* allow users to update ethaddr and serial# */
 #endif


@@ -76,7 +76,7 @@
 #include "../board/xilinx/ml300/xparameters.h"
 
 #define CFG_NO_FLASH           1       /* no flash */
 #include "../board/xilinx/ml300/xparameters.h"
 
 #define CFG_NO_FLASH           1       /* no flash */

-#define CFG_ENV_SIZE           XPAR_PERSISTENT_0_IIC_0_HIGHADDR - XPAR_PERSISTENT_0_IIC_0_BASEADDR + 1
+#define CONFIG_ENV_SIZE                XPAR_PERSISTENT_0_IIC_0_HIGHADDR - XPAR_PERSISTENT_0_IIC_0_BASEADDR + 1

 #define CONFIG_BAUDRATE                9600
 #define CONFIG_BOOTDELAY       3       /* autoboot after 3 seconds     */
 
 #define CONFIG_BAUDRATE                9600
 #define CONFIG_BOOTDELAY       3       /* autoboot after 3 seconds     */
 

diff --git a/include/configs/ml401.h b/include/configs/ml401.h
index 75fcb6a922b60fe83804c77093bdb676da0634d1..2a6c68c656b9bc8c3177b588bdce8552d14703cc 100644 (file)
--- a/include/configs/ml401.h
+++ b/include/configs/ml401.h
@@ -162,21 +162,21 @@
 
        #ifdef  RAMENV
                #define CONFIG_ENV_IS_NOWHERE   1
 
        #ifdef  RAMENV
                #define CONFIG_ENV_IS_NOWHERE   1

-               #define CFG_ENV_SIZE            0x1000
-               #define CFG_ENV_ADDR            (CFG_MONITOR_BASE - CFG_ENV_SIZE)
+               #define CONFIG_ENV_SIZE         0x1000
+               #define CONFIG_ENV_ADDR         (CFG_MONITOR_BASE - CONFIG_ENV_SIZE)

 
        #else   /* !RAMENV */
                #define CONFIG_ENV_IS_IN_FLASH  1
 
        #else   /* !RAMENV */
                #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
+               #define CONFIG_ENV_SECT_SIZE    0x40000 /* 256K(one sector) for env */
+               #define CONFIG_ENV_ADDR         (CFG_FLASH_BASE + (2 * CONFIG_ENV_SECT_SIZE))
+               #define CONFIG_ENV_SIZE         0x40000

        #endif /* !RAMBOOT */
 #else /* !FLASH */
        /* ENV in RAM */
        #define CFG_NO_FLASH            1
        #define CONFIG_ENV_IS_NOWHERE   1
        #endif /* !RAMBOOT */
 #else /* !FLASH */
        /* ENV in RAM */
        #define CFG_NO_FLASH            1
        #define CONFIG_ENV_IS_NOWHERE   1

-       #define CFG_ENV_SIZE            0x1000
-       #define CFG_ENV_ADDR            (CFG_MONITOR_BASE - CFG_ENV_SIZE)
+       #define CONFIG_ENV_SIZE         0x1000
+       #define CONFIG_ENV_ADDR         (CFG_MONITOR_BASE - CONFIG_ENV_SIZE)

        #define CFG_FLASH_PROTECTION            /* hardware flash protection */
 #endif /* !FLASH */
 
        #define CFG_FLASH_PROTECTION            /* hardware flash protection */
 #endif /* !FLASH */
 

diff --git a/include/configs/ml507.h b/include/configs/ml507.h
index e34e43a2e7bdd05e1148a53da58013a54209dbb1..22a972f3bcf0f977f0344f50b832271252e1d0ef 100644 (file)
--- a/include/configs/ml507.h
+++ b/include/configs/ml507.h
@@ -28,10 +28,10 @@
 
 /*Env*/
 #define        CONFIG_ENV_IS_IN_FLASH  1
 
 /*Env*/
 #define        CONFIG_ENV_IS_IN_FLASH  1

-#define        CFG_ENV_SIZE            0x20000
-#define        CFG_ENV_SECT_SIZE       0x20000
-#define CFG_ENV_OFFSET         0x340000
-#define CFG_ENV_ADDR           (XPAR_FLASH_MEM0_BASEADDR+CFG_ENV_OFFSET)
+#define        CONFIG_ENV_SIZE         0x20000
+#define        CONFIG_ENV_SECT_SIZE    0x20000
+#define CONFIG_ENV_OFFSET              0x340000
+#define CONFIG_ENV_ADDR                (XPAR_FLASH_MEM0_BASEADDR+CONFIG_ENV_OFFSET)

 
 /*Misc*/
 #define CFG_PROMPT             "ml507:/# "     /* Monitor Command Prompt    */
 
 /*Misc*/
 #define CFG_PROMPT             "ml507:/# "     /* Monitor Command Prompt    */

diff --git a/include/configs/modnet50.h b/include/configs/modnet50.h
index 7cfd4fa4ae67d56b43dcc6628ecda5900bdaf58d..8f4011a1c1aa2f6303cfa55571c3a686ee52f968 100644 (file)
--- a/include/configs/modnet50.h
+++ b/include/configs/modnet50.h
@@ -45,7 +45,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128
 
 /*
 #define CFG_GBL_DATA_SIZE      128
 
 /*


@@ -173,9 +173,9 @@
 #define        CONFIG_ENV_IS_IN_FLASH
 #undef CONFIG_ENV_IS_NOWHERE
 
 #define        CONFIG_ENV_IS_IN_FLASH
 #undef CONFIG_ENV_IS_NOWHERE
 

-#define CFG_ENV_ADDR           0x1001C000 /* environment start address */
-#define CFG_ENV_SECT_SIZE       0x10000 /* Total Size of Environment Sector */
-#define CFG_ENV_SIZE           0x4000  /* max size for environment */
+#define CONFIG_ENV_ADDR                0x1001C000 /* environment start address */
+#define CONFIG_ENV_SECT_SIZE       0x10000 /* Total Size of Environment Sector */
+#define CONFIG_ENV_SIZE                0x4000  /* max size for environment */

 
 /*
  * JFFS2 partitions
 
 /*
  * JFFS2 partitions

diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h
index 8692ab8b8dd9fab62895b56b87cb633ccc08491e..73a03a8ee5d7171b4337b4a42cbd29ad5507cec6 100644 (file)
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -355,13 +355,13 @@ extern void __led_set(led_id_t id, int state);
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
 /* This has to be a multiple of the Flash sector size */
  */
 #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
-#define CFG_ENV_SECT_SIZE      0x20000
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#define CONFIG_ENV_SIZE                0x1000
+#define CONFIG_ENV_SECT_SIZE   0x20000

 
 /* Configuration of redundant environment */
 
 /* Configuration of redundant environment */

-#define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 /*
  * Pin multiplexing configuration
 
 /*
  * Pin multiplexing configuration

diff --git a/include/configs/mp2usb.h b/include/configs/mp2usb.h
index f0b5c9fe9f336713e499b3fd8b3a8f258f8b3d19..ba1ed0dcad4236ab40aa1aa84ff8d8ad96aee533 100644 (file)
--- a/include/configs/mp2usb.h
+++ b/include/configs/mp2usb.h
@@ -81,7 +81,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 #define CONFIG_BAUDRATE                115200
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 #define CONFIG_BAUDRATE                115200


@@ -200,9 +200,9 @@
 #define CFG_FLASH_PROTECTION                           /* "Real" (hardware) sectors protection */
 
 #define CONFIG_ENV_IS_IN_FLASH         1
 #define CFG_FLASH_PROTECTION                           /* "Real" (hardware) sectors protection */
 
 #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
+#define CONFIG_ENV_OFFSET                      0x20000         /* after u-boot.bin */
+#define CONFIG_ENV_ADDR                        (CFG_FLASH_BASE+CONFIG_ENV_OFFSET)
+#define CONFIG_ENV_SIZE                        0x20000

 
 #define CFG_LOAD_ADDR          0x21000000  /* default load address */
 
 
 #define CFG_LOAD_ADDR          0x21000000  /* default load address */
 

diff --git a/include/configs/mpc7448hpc2.h b/include/configs/mpc7448hpc2.h
index 7fd06a6ec4f1770c0f6381930849e100b053a7f4..308a7b94299cc76a327afb2b24310e783bed7797 100644 (file)
--- a/include/configs/mpc7448hpc2.h
+++ b/include/configs/mpc7448hpc2.h
@@ -382,10 +382,10 @@
 #define CFG_MAX_FLASH_SECT     (128)
 
 #define CONFIG_ENV_IS_IN_NVRAM
 #define CFG_MAX_FLASH_SECT     (128)
 
 #define CONFIG_ENV_IS_IN_NVRAM

-#define CFG_ENV_ADDR           0xFC000000
+#define CONFIG_ENV_ADDR                0xFC000000

 
 

-#define CFG_ENV_OFFSET 0x00000000      /* Offset of Environment Sector */
-#define CFG_ENV_SIZE   0x00000400      /* Total Size of Environment Space */
+#define CONFIG_ENV_OFFSET      0x00000000      /* Offset of Environment Sector */
+#define CONFIG_ENV_SIZE        0x00000400      /* Total Size of Environment Space */

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h
index 6e0721e9869bc3f7f4eaf804e4cc35caf2006dfc..6b378ac7d0302dee04078dc5d9d3d62501960d4f 100644 (file)
--- a/include/configs/mpr2.h
+++ b/include/configs/mpr2.h
@@ -74,9 +74,9 @@
 #define CFG_MAX_FLASH_BANKS    1
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
 #define CONFIG_ENV_IS_IN_FLASH
 #define CFG_MAX_FLASH_BANKS    1
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
 #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)
+#define CONFIG_ENV_SECT_SIZE   (128 * 1024)
+#define CONFIG_ENV_SIZE                CONFIG_ENV_SECT_SIZE
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + CFG_MONITOR_LEN)

 #define CFG_FLASH_ERASE_TOUT   120000
 #define CFG_FLASH_WRITE_TOUT   500
 
 #define CFG_FLASH_ERASE_TOUT   120000
 #define CFG_FLASH_WRITE_TOUT   500
 

diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h
index ee19b026e7d8a257bbd78fd6648c8de5dfe32f79..f308460c75cd50d2811af61813dac43b8ed2adfc 100644 (file)
--- a/include/configs/ms7720se.h
+++ b/include/configs/ms7720se.h
@@ -93,9 +93,9 @@
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
 
 #define CONFIG_ENV_IS_IN_FLASH
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
 
 #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)
+#define CONFIG_ENV_SECT_SIZE   (64 * 1024)
+#define CONFIG_ENV_SIZE                CONFIG_ENV_SECT_SIZE
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + CFG_MONITOR_LEN)

 #define CFG_FLASH_ERASE_TOUT   120000
 #define CFG_FLASH_WRITE_TOUT   500
 
 #define CFG_FLASH_ERASE_TOUT   120000
 #define CFG_FLASH_WRITE_TOUT   500
 

diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h
index 55f264c323b20b14b45497a9223af85bd9438b21..5f5970b54d1ba18e1a5b17d0be0244c16acca019 100644 (file)
--- a/include/configs/ms7722se.h
+++ b/include/configs/ms7722se.h
@@ -116,12 +116,12 @@
 
 #define CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_OVERWRITE   1
 
 #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)
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + (1 * CFG_ENV_SECT_SIZE))
-#define CFG_ENV_OFFSET         (CFG_ENV_ADDR - CFG_FLASH_BASE) /* Offset of env Flash sector relative to CFG_FLASH_BASE */
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SECT_SIZE)
-#define CFG_ENV_ADDR_REDUND    (CFG_FLASH_BASE + (2 * CFG_ENV_SECT_SIZE))
+#define CONFIG_ENV_SECT_SIZE   (8 * 1024)
+#define CONFIG_ENV_SIZE                (CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + (1 * CONFIG_ENV_SECT_SIZE))
+#define CONFIG_ENV_OFFSET              (CONFIG_ENV_ADDR - CFG_FLASH_BASE)      /* Offset of env Flash sector relative to CFG_FLASH_BASE */
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_ADDR_REDUND (CFG_FLASH_BASE + (2 * CONFIG_ENV_SECT_SIZE))

 
 /* Board Clock */
 #define CONFIG_SYS_CLK_FREQ    33333333
 
 /* Board Clock */
 #define CONFIG_SYS_CLK_FREQ    33333333

diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h
index c4a1f54885a90cbb92c15aec1dd4d0499ceb6f64..acb4d6d32eafb5df71f58959f8d1762c214951b8 100644 (file)
--- a/include/configs/ms7750se.h
+++ b/include/configs/ms7750se.h
@@ -93,9 +93,9 @@
 
 
 #define CONFIG_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)
+#define CONFIG_ENV_SECT_SIZE   0x20000
+#define CONFIG_ENV_SIZE                (CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + CFG_MONITOR_LEN)

 #define CFG_FLASH_ERASE_TOUT   120000
 #define CFG_FLASH_WRITE_TOUT   500
 
 #define CFG_FLASH_ERASE_TOUT   120000
 #define CFG_FLASH_WRITE_TOUT   500
 

diff --git a/include/configs/muas3001.h b/include/configs/muas3001.h
index ded0f4cbedaa7a7fd569cf1827541fa9c1eef320..c661829792319a80f455d60d350b41c60b626ea6 100644 (file)
--- a/include/configs/muas3001.h
+++ b/include/configs/muas3001.h
@@ -230,8 +230,8 @@
 #define CONFIG_ENV_IS_IN_FLASH
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_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)
+#define CONFIG_ENV_SECT_SIZE   0x10000
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + CFG_MONITOR_LEN)

 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*
 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*

diff --git a/include/configs/mucmc52.h b/include/configs/mucmc52.h
index d3546c7470f03db0ac027d9e6c475e7386f4552c..8971f0b6c8df546f0dc3617e166c3140e35f71bc 100644 (file)
--- a/include/configs/mucmc52.h
+++ b/include/configs/mucmc52.h
@@ -160,7 +160,7 @@
 #define        CFG_FLASH_SIZE          0x00800000 /* 8 MByte */
 #define        CFG_MAX_FLASH_SECT      67      /* max num of sects on one chip */
 
 #define        CFG_FLASH_SIZE          0x00800000 /* 8 MByte */
 #define        CFG_MAX_FLASH_SECT      67      /* max num of sects on one chip */
 

-#define        CFG_ENV_ADDR            (TEXT_BASE+0x40000) /* second sector */
+#define        CONFIG_ENV_ADDR         (TEXT_BASE+0x40000) /* second sector */

 #define        CFG_MAX_FLASH_BANKS     1       /* max num of flash banks
                                           (= chip selects) */
 #define        CFG_FLASH_ERASE_TOUT    240000  /* Flash Erase Timeout (in ms)  */
 #define        CFG_MAX_FLASH_BANKS     1       /* max num of flash banks
                                           (= chip selects) */
 #define        CFG_FLASH_ERASE_TOUT    240000  /* Flash Erase Timeout (in ms)  */


@@ -175,10 +175,10 @@
  * Environment settings
  */
 #define        CONFIG_ENV_IS_IN_FLASH  1
  * Environment settings
  */
 #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)
-#define        CFG_ENV_SIZE_REDUND     (CFG_ENV_SIZE)
+#define        CONFIG_ENV_SIZE         0x4000
+#define        CONFIG_ENV_SECT_SIZE    0x20000
+#define        CONFIG_ENV_OFFSET_REDUND   (CONFIG_ENV_OFFSET+CONFIG_ENV_SECT_SIZE)
+#define        CONFIG_ENV_SIZE_REDUND     (CONFIG_ENV_SIZE)

 
 /*
  * Memory map
 
 /*
  * Memory map

diff --git a/include/configs/munices.h b/include/configs/munices.h
index 6d39580b2720d6bf9fd7a8ea7280c179f8002936..8f3071a72da9cdb0ca32d79e82783cf4af6e5ccc 100644 (file)
--- a/include/configs/munices.h
+++ b/include/configs/munices.h
@@ -153,13 +153,13 @@
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
  * Environment settings
  */
 #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
-#define CFG_ENV_SIZE           0x4000
-#define CFG_ENV_OFFSET_REDUND   (CFG_ENV_OFFSET + CFG_ENV_SECT_SIZE)
-#define CFG_ENV_ADDR_REDUND    (TEXT_BASE + CFG_ENV_OFFSET_REDUND)
-#define CFG_ENV_SIZE_REDUND     (CFG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET              0x40000
+#define CONFIG_ENV_ADDR                (TEXT_BASE + CONFIG_ENV_OFFSET)
+#define CONFIG_ENV_SECT_SIZE   0x20000
+#define CONFIG_ENV_SIZE                0x4000
+#define CONFIG_ENV_OFFSET_REDUND   (CONFIG_ENV_OFFSET + CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_ADDR_REDUND (TEXT_BASE + CONFIG_ENV_OFFSET_REDUND)
+#define CONFIG_ENV_SIZE_REDUND     (CONFIG_ENV_SIZE)

 #define CONFIG_ENV_OVERWRITE   1
 
 /*
 #define CONFIG_ENV_OVERWRITE   1
 
 /*

diff --git a/include/configs/mx1ads.h b/include/configs/mx1ads.h
index bf43dad01b59f5dfa92c63455c1a16d7a39fd7c7..2eb43bf73d7004b698747c990badbb80fde3a896 100644 (file)
--- a/include/configs/mx1ads.h
+++ b/include/configs/mx1ads.h
@@ -57,7 +57,7 @@
  * Size of malloc() pool
  */
 
  * Size of malloc() pool
  */
 

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)

 
 
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */


@@ -172,11 +172,11 @@
 #define CONFIG_SYNCFLASH       1
 #define PHYS_FLASH_SIZE                0x01000000
 #define CFG_MAX_FLASH_SECT     (16)
 #define CONFIG_SYNCFLASH       1
 #define PHYS_FLASH_SIZE                0x01000000
 #define CFG_MAX_FLASH_SECT     (16)

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE+0x00ff8000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE+0x00ff8000)

 
 #define CONFIG_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
+#define CONFIG_ENV_SIZE                0x04000 /* Total Size of Environment Sector */
+#define CONFIG_ENV_SECT_SIZE   0x100000

 
 /*-----------------------------------------------------------------------
  * Enable passing ATAGS
 
 /*-----------------------------------------------------------------------
  * Enable passing ATAGS

diff --git a/include/configs/mx1fs2.h b/include/configs/mx1fs2.h
index 8f4b42c757caba5103e6f5d02d7bfae56a123eda..39950dc5411f64f10f9c7b47d2ebb99b0e6152c9 100644 (file)
--- a/include/configs/mx1fs2.h
+++ b/include/configs/mx1fs2.h
@@ -98,7 +98,7 @@
 /*
  * Malloc pool need to host env + 128 Kb reserve for other allocations.
  */
 /*
  * Malloc pool need to host env + 128 Kb reserve for other allocations.
  */

-#define CFG_MALLOC_LEN   (CFG_ENV_SIZE + (128<<10) )
+#define CFG_MALLOC_LEN   (CONFIG_ENV_SIZE + (128<<10) )

 
 
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */


@@ -208,8 +208,8 @@
 #define CFG_MONITOR_BASE       0x10000000
 #define CFG_MONITOR_LEN                0x20000         /* 128b ( 1 flash sector )   */
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_MONITOR_BASE       0x10000000
 #define CFG_MONITOR_LEN                0x20000         /* 128b ( 1 flash sector )   */
 #define CONFIG_ENV_IS_IN_FLASH 1

-#define CFG_ENV_ADDR           0x10020000      /* absolute address for now  */
-#define CFG_ENV_SIZE           0x20000
+#define CONFIG_ENV_ADDR                0x10020000      /* absolute address for now  */
+#define CONFIG_ENV_SIZE                0x20000

 
 #define         CONFIG_ENV_OVERWRITE   1               /* env is not writable now   */
 
 
 #define         CONFIG_ENV_OVERWRITE   1               /* env is not writable now   */
 

diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h
index 0bb0568e424ad3615499ca4439650206b6131b96..314856c4c8f3d8b57f445e56d9128f3a74992060 100644 (file)
--- a/include/configs/mx31ads.h
+++ b/include/configs/mx31ads.h
@@ -50,7 +50,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128 * 1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128 * 1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -168,18 +168,18 @@
 #define CFG_MONITOR_LEN                (256 * 1024)    /* Reserve 256KiB */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_MONITOR_LEN                (256 * 1024)    /* Reserve 256KiB */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1

-#define CFG_ENV_SECT_SIZE      (32 * 1024)
-#define CFG_ENV_SIZE           CFG_ENV_SECT_SIZE
+#define CONFIG_ENV_SECT_SIZE   (32 * 1024)
+#define CONFIG_ENV_SIZE                CONFIG_ENV_SECT_SIZE

 
 /* Address and size of Redundant Environment Sector    */
 
 /* Address and size of Redundant Environment Sector    */

-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET + CFG_ENV_SIZE)
-#define CFG_ENV_SIZE_REDUND    CFG_ENV_SIZE
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE

 
 /* S29WS256N NOR flash has 4 32KiB small sectors at the beginning and at the end.
  * The rest of 32MiB is in 128KiB big sectors. U-Boot occupies the low 4 sectors,
  * if we put environment next to it, we will have to occupy 128KiB for it.
  * Putting it at the top of flash we use only 32KiB. */
 
 /* S29WS256N NOR flash has 4 32KiB small sectors at the beginning and at the end.
  * The rest of 32MiB is in 128KiB big sectors. U-Boot occupies the low 4 sectors,
  * if we put environment next to it, we will have to occupy 128KiB for it.
  * Putting it at the top of flash we use only 32KiB. */

-#define CFG_ENV_ADDR           (CFG_MONITOR_BASE + CFG_ENV_SECT_SIZE)
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + CONFIG_ENV_SECT_SIZE)

 
 /*-----------------------------------------------------------------------
  * CFI FLASH driver setup
 
 /*-----------------------------------------------------------------------
  * CFI FLASH driver setup

diff --git a/include/configs/netstar.h b/include/configs/netstar.h
index 76d025cf6956e1fef546c40ae2a10b8065420fd9..23fd18b8f185785bbcef972e7020bf85cfbedd2e 100644 (file)
--- a/include/configs/netstar.h
+++ b/include/configs/netstar.h
@@ -76,11 +76,11 @@
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_FLASH
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_FLASH

-#define CFG_ENV_ADDR           0x4000
-#define CFG_ENV_SIZE           (8 * 1024)
-#define CFG_ENV_SECT_SIZE      (8 * 1024)
-#define CFG_ENV_ADDR_REDUND    0x6000
-#define CFG_ENV_SIZE_REDUND    CFG_ENV_SIZE
+#define CONFIG_ENV_ADDR                0x4000
+#define CONFIG_ENV_SIZE                (8 * 1024)
+#define CONFIG_ENV_SECT_SIZE   (8 * 1024)
+#define CONFIG_ENV_ADDR_REDUND 0x6000
+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE

 #define CONFIG_ENV_OVERWRITE
 
 /*
 #define CONFIG_ENV_OVERWRITE
 
 /*

diff --git a/include/configs/ns9750dev.h b/include/configs/ns9750dev.h
index f8200f99f2fa220929f7adfb4c1200ef891436c3..5b5c6eb2dc2433b9f3139bf7103e5f76ed9ef360 100644 (file)
--- a/include/configs/ns9750dev.h
+++ b/include/configs/ns9750dev.h
@@ -49,7 +49,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE       128     /* size in bytes reserved for initial
                                         * data */
 
 #define CFG_GBL_DATA_SIZE       128     /* size in bytes reserved for initial
                                         * data */
 


@@ -172,12 +172,12 @@
 #ifdef CONFIG_AMD_LV800
 #define PHYS_FLASH_SIZE                0x00100000 /* 1MB */
 #define CFG_MAX_FLASH_SECT     (19)    /* max number of sectors on one chip */
 #ifdef CONFIG_AMD_LV800
 #define PHYS_FLASH_SIZE                0x00100000 /* 1MB */
 #define CFG_MAX_FLASH_SECT     (19)    /* max number of sectors on one chip */

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x0F0000) /* addr of environment */
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x0F0000) /* addr of environment */

 #endif
 #ifdef CONFIG_AMD_LV400
 #define PHYS_FLASH_SIZE                0x00080000 /* 512KB */
 #define CFG_MAX_FLASH_SECT     (11)    /* max number of sectors on one chip */
 #endif
 #ifdef CONFIG_AMD_LV400
 #define PHYS_FLASH_SIZE                0x00080000 /* 512KB */
 #define CFG_MAX_FLASH_SECT     (11)    /* max number of sectors on one chip */

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x070000) /* addr of environment */
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x070000) /* addr of environment */

 #endif
 
 /* timeout values are in ticks */
 #endif
 
 /* timeout values are in ticks */


@@ -187,7 +187,7 @@
 /* @TODO */
 /*#define      CONFIG_ENV_IS_IN_FLASH  1*/
 #define CONFIG_ENV_IS_NOWHERE
 /* @TODO */
 /*#define      CONFIG_ENV_IS_IN_FLASH  1*/
 #define CONFIG_ENV_IS_NOWHERE

-#define CFG_ENV_SIZE           0x10000 /* Total Size of Environment Sector */
+#define CONFIG_ENV_SIZE                0x10000 /* Total Size of Environment Sector */

 
 #ifdef CONFIG_STATUS_LED
 
 
 #ifdef CONFIG_STATUS_LED
 

diff --git a/include/configs/o2dnt.h b/include/configs/o2dnt.h
index 09995e87be0b45808c48c2bbd67611d0a3a0a59b..b515388b53c1a6a4e064a85e5295910f24cdebdf 100644 (file)
--- a/include/configs/o2dnt.h
+++ b/include/configs/o2dnt.h
@@ -190,7 +190,7 @@
  */
 #define CFG_FLASH_BASE         0xFF000000
 #define CFG_FLASH_SIZE         0x01000000
  */
 #define CFG_FLASH_BASE         0xFF000000
 #define CFG_FLASH_SIZE         0x01000000

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x00040000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x00040000)

 
 #define CFG_MAX_FLASH_BANKS    1       /* max num of memory banks      */
 #define CFG_MAX_FLASH_SECT     128     /* max num of sects on one chip */
 
 #define CFG_MAX_FLASH_BANKS    1       /* max num of memory banks      */
 #define CFG_MAX_FLASH_SECT     128     /* max num of sects on one chip */


@@ -204,8 +204,8 @@
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_FLASH 1

-#define CFG_ENV_SIZE           0x20000
-#define CFG_ENV_SECT_SIZE      0x20000
+#define CONFIG_ENV_SIZE                0x20000
+#define CONFIG_ENV_SECT_SIZE   0x20000

 #define CONFIG_ENV_OVERWRITE   1
 
 /*
 #define CONFIG_ENV_OVERWRITE   1
 
 /*

diff --git a/include/configs/ocotea.h b/include/configs/ocotea.h
index b0a2e5d2071ebbd37fcaea153d87b0e0a27a936b..6a8665e4e25621f9948ea666532654a894bf4e11 100644 (file)
--- a/include/configs/ocotea.h
+++ b/include/configs/ocotea.h
@@ -113,9 +113,9 @@
 #define CONFIG_RTC_DS174x      1                   /* DS1743 RTC               */
 
 #ifdef CONFIG_ENV_IS_IN_NVRAM
 #define CONFIG_RTC_DS174x      1                   /* DS1743 RTC               */
 
 #ifdef CONFIG_ENV_IS_IN_NVRAM

-#define CFG_ENV_SIZE           0x1000      /* Size of Environment vars */
-#define CFG_ENV_ADDR           \
-       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)
+#define CONFIG_ENV_SIZE                0x1000      /* Size of Environment vars */
+#define CONFIG_ENV_ADDR                \
+       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CONFIG_ENV_SIZE)

 #endif /* CONFIG_ENV_IS_IN_NVRAM */
 
 /*-----------------------------------------------------------------------
 #endif /* CONFIG_ENV_IS_IN_NVRAM */
 
 /*-----------------------------------------------------------------------


@@ -133,13 +133,13 @@
 #define CFG_FLASH_WORD_SIZE     unsigned char
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_FLASH_WORD_SIZE     unsigned char
 
 #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     */
+#define CONFIG_ENV_SECT_SIZE   0x10000         /* size of one complete sector  */
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE-CONFIG_ENV_SECT_SIZE)
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*-----------------------------------------------------------------------
 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/omap1510inn.h b/include/configs/omap1510inn.h
index fe6a0db536943d0012746081c436c0d225303f07..d390d856f7f7af946330a5a3708ff40a05d5c0fc 100644 (file)
--- a/include/configs/omap1510inn.h
+++ b/include/configs/omap1510inn.h
@@ -49,7 +49,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -170,7 +170,7 @@
 #define PHYS_FLASH_SIZE                0x01000000 /* 16MB */
 #define PHYS_FLASH_SECT_SIZE   (128*1024)      /* Size of a sector (128kB) */
 #define CFG_MAX_FLASH_SECT     (128)   /* max number of sectors on one chip */
 #define PHYS_FLASH_SIZE                0x01000000 /* 16MB */
 #define PHYS_FLASH_SECT_SIZE   (128*1024)      /* Size of a sector (128kB) */
 #define CFG_MAX_FLASH_SECT     (128)   /* max number of sectors on one chip */

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + PHYS_FLASH_SECT_SIZE)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + PHYS_FLASH_SECT_SIZE)

 #define CFG_MONITOR_BASE       CFG_FLASH_BASE  /* Monitor at beginning of flash */
 #define CFG_MONITOR_LEN                PHYS_FLASH_SECT_SIZE    /* Reserve 1 sector */
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE, CFG_FLASH_BASE + PHYS_FLASH_SIZE }
 #define CFG_MONITOR_BASE       CFG_FLASH_BASE  /* Monitor at beginning of flash */
 #define CFG_MONITOR_LEN                PHYS_FLASH_SECT_SIZE    /* Reserve 1 sector */
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE, CFG_FLASH_BASE + PHYS_FLASH_SIZE }


@@ -188,8 +188,8 @@
 #define CFG_FLASH_WRITE_TOUT   (20*CFG_HZ) /* Timeout for Flash Write */
 
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_FLASH_WRITE_TOUT   (20*CFG_HZ) /* Timeout for Flash Write */
 
 #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 */
+#define CONFIG_ENV_SECT_SIZE   PHYS_FLASH_SECT_SIZE    /* Total Size of Environment Sector */
+#define CONFIG_ENV_SIZE                CONFIG_ENV_SECT_SIZE
+#define CONFIG_ENV_OFFSET              ( CFG_MONITOR_BASE + CFG_MONITOR_LEN )  /* Environment after Monitor */

 
 #endif /* __CONFIG_H */
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/omap1610h2.h b/include/configs/omap1610h2.h
index 9d2051df3a3b5b3436ddc636909e05f718650080..aeb2fec9c20c2e0e900bbe1932080c43e72db1d5 100644 (file)
--- a/include/configs/omap1610h2.h
+++ b/include/configs/omap1610h2.h
@@ -51,7 +51,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -181,14 +181,14 @@ extern unsigned long omap_flash_base;             /* set in flash__init */
 #define PHYS_FLASH_SIZE        0x02000000      /* 32MB */
 #define CFG_MAX_FLASH_SECT     (259)   /* max number of sectors on one chip */
 /* addr of environment */
 #define PHYS_FLASH_SIZE        0x02000000      /* 32MB */
 #define CFG_MAX_FLASH_SECT     (259)   /* max number of sectors on one chip */
 /* addr of environment */

-#define CFG_ENV_ADDR   (CFG_FLASH_BASE + 0x020000)
+#define CONFIG_ENV_ADDR        (CFG_FLASH_BASE + 0x020000)

 
 /* timeout values are in ticks */
 #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 CONFIG_ENV_IS_IN_FLASH 1
 
 /* timeout values are in ticks */
 #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 CONFIG_ENV_IS_IN_FLASH 1

-#define CFG_ENV_SIZE   0x20000 /* Total Size of Environment Sector */
-#define CFG_ENV_OFFSET 0x20000 /* environment starts here */
+#define CONFIG_ENV_SIZE        0x20000 /* Total Size of Environment Sector */
+#define CONFIG_ENV_OFFSET      0x20000 /* environment starts here */

 
 #endif                                                 /* __CONFIG_H */
 
 #endif                                                 /* __CONFIG_H */

diff --git a/include/configs/omap1610inn.h b/include/configs/omap1610inn.h
index edc42e45aeed98e1accceda858fb634585776ba0..68cf91c78af29530be8129c3a9e084e2ac4a4176 100644 (file)
--- a/include/configs/omap1610inn.h
+++ b/include/configs/omap1610inn.h
@@ -50,7 +50,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -186,14 +186,14 @@ extern unsigned long omap_flash_base;             /* set in flash__init */
 #define PHYS_FLASH_SIZE        0x02000000      /* 32MB */
 #define CFG_MAX_FLASH_SECT     (259)   /* max number of sectors on one chip */
 /* addr of environment */
 #define PHYS_FLASH_SIZE        0x02000000      /* 32MB */
 #define CFG_MAX_FLASH_SECT     (259)   /* max number of sectors on one chip */
 /* addr of environment */

-#define CFG_ENV_ADDR   (CFG_FLASH_BASE + 0x020000)
+#define CONFIG_ENV_ADDR        (CFG_FLASH_BASE + 0x020000)

 
 /* timeout values are in ticks */
 #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 CONFIG_ENV_IS_IN_FLASH 1
 
 /* timeout values are in ticks */
 #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 CONFIG_ENV_IS_IN_FLASH 1

-#define CFG_ENV_SIZE   0x20000 /* Total Size of Environment Sector */
-#define CFG_ENV_OFFSET 0x20000 /* environment starts here  */
+#define CONFIG_ENV_SIZE        0x20000 /* Total Size of Environment Sector */
+#define CONFIG_ENV_OFFSET      0x20000 /* environment starts here  */

 
 #endif                                                 /* __CONFIG_H */
 
 #endif                                                 /* __CONFIG_H */

diff --git a/include/configs/omap2420h4.h b/include/configs/omap2420h4.h
index ac98fb5483d7582ede1b2186d043570ae5b13f9e..9018440d1ac11898a3726b785ffefa72141736a5 100644 (file)
--- a/include/configs/omap2420h4.h
+++ b/include/configs/omap2420h4.h
@@ -70,8 +70,8 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_ENV_SIZE             SZ_128K     /* Total Size of Environment Sector */
-#define CFG_MALLOC_LEN           (CFG_ENV_SIZE + SZ_128K)
+#define CONFIG_ENV_SIZE             SZ_128K     /* Total Size of Environment Sector */
+#define CFG_MALLOC_LEN           (CONFIG_ENV_SIZE + SZ_128K)

 #define CFG_GBL_DATA_SIZE        128  /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE        128  /* size in bytes reserved for initial data */
 
 /*


@@ -271,12 +271,12 @@
 
 #ifdef CFG_NAND_BOOT
 #define CONFIG_ENV_IS_IN_NAND  1
 
 #ifdef CFG_NAND_BOOT
 #define CONFIG_ENV_IS_IN_NAND  1

-#define CFG_ENV_OFFSET 0x80000 /* environment starts here  */
+#define CONFIG_ENV_OFFSET      0x80000 /* environment starts here  */

 #else
 #else

-#define CFG_ENV_ADDR             (CFG_FLASH_BASE + SZ_128K)
+#define CONFIG_ENV_ADDR             (CFG_FLASH_BASE + SZ_128K)

 #define        CONFIG_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 */
+#define CONFIG_ENV_SECT_SIZE   PHYS_FLASH_SECT_SIZE
+#define CONFIG_ENV_OFFSET      ( CFG_MONITOR_BASE + CFG_MONITOR_LEN ) /* Environment after Monitor */

 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/omap5912osk.h b/include/configs/omap5912osk.h
index 0f56279e4deac51d31c93659becf09b158c1cebe..dd3f7de4f623925bd3fb109ecbe0ae6515a0dbcd 100644 (file)
--- a/include/configs/omap5912osk.h
+++ b/include/configs/omap5912osk.h
@@ -53,7 +53,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -196,9 +196,9 @@
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
 /* addr of environment */
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
 /* addr of environment */

-#define CFG_ENV_ADDR   (CFG_FLASH_BASE + 0x020000)
+#define CONFIG_ENV_ADDR        (CFG_FLASH_BASE + 0x020000)

 
 

-#define CFG_ENV_SIZE   0x20000 /* Total Size of Environment Sector */
-#define CFG_ENV_OFFSET 0x20000 /* environment starts here  */
+#define CONFIG_ENV_SIZE        0x20000 /* Total Size of Environment Sector */
+#define CONFIG_ENV_OFFSET      0x20000 /* environment starts here  */

 
 #endif                                                 /* __CONFIG_H */
 
 #endif                                                 /* __CONFIG_H */

diff --git a/include/configs/omap730p2.h b/include/configs/omap730p2.h
index b781f7273242893fcf8d9a6e6c6f03c2bdcafde8..b1c4a305783209230516f3057c9670be01bc767b 100644 (file)
--- a/include/configs/omap730p2.h
+++ b/include/configs/omap730p2.h
@@ -58,7 +58,7 @@
  * Size of malloc() pool
  */
 
  * Size of malloc() pool
  */
 

-#define CFG_MALLOC_LEN            (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN            (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE         128       /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE         128       /* size in bytes reserved for initial data */
 
 /*


@@ -193,14 +193,14 @@
 #define PHYS_FLASH_SIZE                   0x02000000     /* 32MB */
 #define CFG_MAX_FLASH_SECT        (259)          /* max number of sectors on one chip */
 /* addr of environment */
 #define PHYS_FLASH_SIZE                   0x02000000     /* 32MB */
 #define CFG_MAX_FLASH_SECT        (259)          /* max number of sectors on one chip */
 /* addr of environment */

-#define CFG_ENV_ADDR              (CFG_FLASH_BASE + 0x020000)
+#define CONFIG_ENV_ADDR                   (CFG_FLASH_BASE + 0x020000)

 
 /* timeout values are in ticks */
 #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 CONFIG_ENV_IS_IN_FLASH    1
 
 /* timeout values are in ticks */
 #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 CONFIG_ENV_IS_IN_FLASH    1

-#define CFG_ENV_SIZE              0x20000        /* Total Size of Environment Sector */
-#define CFG_ENV_OFFSET            0x20000        /* environment starts here  */
+#define CONFIG_ENV_SIZE                   0x20000        /* Total Size of Environment Sector */
+#define CONFIG_ENV_OFFSET                 0x20000        /* environment starts here  */

 
 #endif   /* ! __CONFIG_H */
 
 #endif   /* ! __CONFIG_H */

diff --git a/include/configs/p3mx.h b/include/configs/p3mx.h
index 1128c4ecb4b4406cb9d9ca978d6c3afdbe8020dd..2df1d9d34b6597df08a03a59dab816e0303bd42f 100644 (file)
--- a/include/configs/p3mx.h
+++ b/include/configs/p3mx.h
@@ -139,12 +139,12 @@
 
 #define CONFIG_ENV_IS_IN_FLASH     1   /* use FLASH for environment vars       */
 #if defined (CONFIG_P3M750)
 
 #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)                */
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* one sector (1 device)                */

 #elif defined (CONFIG_P3M7448)
 #elif defined (CONFIG_P3M7448)

-#define CFG_ENV_SECT_SIZE      0x40000 /* two sectors (2 devices parallel      */
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* two sectors (2 devices parallel      */

 #endif
 #endif

-#define        CFG_ENV_SIZE            0x2000  /* Total Size of Environment Sector     */
-#define CFG_ENV_ADDR           (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#define        CONFIG_ENV_SIZE         0x2000  /* Total Size of Environment Sector     */
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + CFG_MONITOR_LEN)

 
 /*-----------------------------------------------------------------------
  * DDR SDRAM
 
 /*-----------------------------------------------------------------------
  * DDR SDRAM

diff --git a/include/configs/p3p440.h b/include/configs/p3p440.h
index 046ec254813081d4fff7911f374ca85967623437..5cef3ea6911cfbb9b121f6e4bf1bf6c2266af923 100644 (file)
--- a/include/configs/p3p440.h
+++ b/include/configs/p3p440.h
@@ -297,13 +297,13 @@
 
 #define CONFIG_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)
-#define        CFG_ENV_SIZE            0x2000  /* Total Size of Environment Sector     */
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* size of one complete sector          */
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE-CONFIG_ENV_SECT_SIZE)
+#define        CONFIG_ENV_SIZE         0x2000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 /*
  * For booting Linux, the board info and command line data
 
 /*
  * For booting Linux, the board info and command line data

diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h
index 4ec520fef386a057135893393e481936935b8c83..480a59f05bbed6d3d17e0cb68f79d946b39626fa 100644 (file)
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -119,8 +119,8 @@
 #define        CONFIG_ENV_IS_NOWHERE   1
 
 /* Address and size of Primary Environment Sector      */
 #define        CONFIG_ENV_IS_NOWHERE   1
 
 /* Address and size of Primary Environment Sector      */

-#define CFG_ENV_ADDR           0xB0030000
-#define CFG_ENV_SIZE           0x10000
+#define CONFIG_ENV_ADDR                0xB0030000
+#define CONFIG_ENV_SIZE                0x10000

 
 #define CONFIG_FLASH_16BIT
 
 
 #define CONFIG_FLASH_16BIT
 

diff --git a/include/configs/pcs440ep.h b/include/configs/pcs440ep.h
index 368a66b95dd40eacad67a1c958865df5018a20b0..62f13f2959aa221baf4208e0ec5064debc543e6d 100644 (file)
--- a/include/configs/pcs440ep.h
+++ b/include/configs/pcs440ep.h
@@ -110,15 +110,15 @@
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 
 #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     */
+#define CONFIG_ENV_SECT_SIZE   0x10000 /* size of one complete sector          */
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE                0x2000  /* Total Size of Environment Sector     */

 
 #define CONFIG_ENV_OVERWRITE   1
 
 /* Address and size of Redundant Environment Sector    */
 
 #define CONFIG_ENV_OVERWRITE   1
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 #define ENV_NAME_REVLEV        "revision_level"
 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 #define ENV_NAME_REVLEV        "revision_level"

diff --git a/include/configs/pcu_e.h b/include/configs/pcu_e.h
index 1a3bf1c6fe8f19aeaf18fc86c7c8f0d0442a7c87..664a885fff60330825bf485c610cf7072530f107 100644 (file)
--- a/include/configs/pcu_e.h
+++ b/include/configs/pcu_e.h
@@ -228,17 +228,17 @@
 #if 0
 /* Start port with environment in flash; switch to SPI EEPROM later */
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #if 0
 /* Start port with environment in flash; switch to SPI EEPROM later */
 #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      */
-#define        CFG_ENV_IS_EMBEDDED     1       /* short-cut compile-time test          */
+#define CONFIG_ENV_SIZE                0x2000  /* Total Size of Environment            */
+#define CONFIG_ENV_ADDR            0xFFFFE000  /* Address    of Environment Sector     */
+#define CONFIG_ENV_SECT_SIZE   0x2000  /* use the top-most 8k boot sector      */
+#define        CONFIG_ENV_IS_EMBEDDED  1       /* short-cut compile-time test          */

 #else
 /* Final version: environment in EEPROM */
 #define CONFIG_ENV_IS_IN_EEPROM        1
 #define CFG_I2C_EEPROM_ADDR    0
 #define CFG_I2C_EEPROM_ADDR_LEN        2
 #else
 /* Final version: environment in EEPROM */
 #define CONFIG_ENV_IS_IN_EEPROM        1
 #define CFG_I2C_EEPROM_ADDR    0
 #define CFG_I2C_EEPROM_ADDR_LEN        2

-#define CFG_ENV_OFFSET         1024
-#define CFG_ENV_SIZE           1024
+#define CONFIG_ENV_OFFSET              1024
+#define CONFIG_ENV_SIZE                1024

 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/pdnb3.h b/include/configs/pdnb3.h
index 0b7b6d4f87c4dd9f3d79566c136bc385ae2112f7..856917e7b1c53cc6d6e64ed4c125fe2175998530 100644 (file)
--- a/include/configs/pdnb3.h
+++ b/include/configs/pdnb3.h
@@ -245,18 +245,18 @@
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + CFG_MONITOR_LEN)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + CFG_MONITOR_LEN)

 #if defined(CONFIG_SCPU)
 /* no redundant environment on SCPU */
 #if defined(CONFIG_SCPU)
 /* no redundant environment on SCPU */

-#define CFG_ENV_SECT_SIZE      0x20000 /* size of one complete sector          */
-#define        CFG_ENV_SIZE            0x4000  /* Total Size of Environment Sector     */
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* size of one complete sector          */
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */

 #else
 #else

-#define CFG_ENV_SECT_SIZE      0x1000  /* size of one complete sector          */
-#define        CFG_ENV_SIZE            0x1000  /* Total Size of Environment Sector     */
+#define CONFIG_ENV_SECT_SIZE   0x1000  /* size of one complete sector          */
+#define        CONFIG_ENV_SIZE         0x1000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 #endif
 
 #if !defined(CONFIG_SCPU)
 #endif
 
 #if !defined(CONFIG_SCPU)

diff --git a/include/configs/pf5200.h b/include/configs/pf5200.h
index 6120f5829045c2a11acb736e025794a66785a4a0..66ad01f7eef1ac2c1baabd1779962ededd5b79bd 100644 (file)
--- a/include/configs/pf5200.h
+++ b/include/configs/pf5200.h
@@ -194,7 +194,7 @@
  */
 #define CFG_FLASH_BASE         0xFE000000
 #define CFG_FLASH_SIZE         0x02000000
  */
 #define CFG_FLASH_BASE         0xFE000000
 #define CFG_FLASH_SIZE         0x02000000

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x00000000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x00000000)

 #define CFG_MAX_FLASH_BANKS    1       /* max num of memory banks      */
 #define CFG_MAX_FLASH_SECT     512
 
 #define CFG_MAX_FLASH_BANKS    1       /* max num of memory banks      */
 #define CFG_MAX_FLASH_SECT     512
 


@@ -206,13 +206,13 @@
  */
 #if 1                          /* test-only */
 #define CONFIG_ENV_IS_IN_FLASH
  */
 #if 1                          /* test-only */
 #define CONFIG_ENV_IS_IN_FLASH

-#define CFG_ENV_SIZE           0x10000
-#define CFG_ENV_SECT_SIZE      0x10000
+#define CONFIG_ENV_SIZE                0x10000
+#define CONFIG_ENV_SECT_SIZE   0x10000

 #define CONFIG_ENV_OVERWRITE   1
 #else
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
 #define CONFIG_ENV_OVERWRITE   1
 #else
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */

-#define CFG_ENV_OFFSET         0x0000  /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE           0x0400  /* 8192 bytes may be used for env vars */
+#define CONFIG_ENV_OFFSET              0x0000  /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE                0x0400  /* 8192 bytes may be used for env vars */

                                   /* total size of a CAT24WC32 is 8192 bytes */
 #define CONFIG_ENV_OVERWRITE   1
 #endif
                                   /* total size of a CAT24WC32 is 8192 bytes */
 #define CONFIG_ENV_OVERWRITE   1
 #endif

diff --git a/include/configs/pleb2.h b/include/configs/pleb2.h
index 799cf76996976bef4cb67e223d9a16e7586e270c..66e76e8aa52f95e432e8545753b530de48b56b26 100644 (file)
--- a/include/configs/pleb2.h
+++ b/include/configs/pleb2.h
@@ -45,7 +45,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN     (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN     (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -247,9 +247,9 @@
 
 /* FIXME */
 #define CONFIG_ENV_IS_IN_FLASH 1
 
 /* FIXME */
 #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
+#define CONFIG_ENV_ADDR                (PHYS_FLASH_1 + 0x3C000)        /* Addr of Environment Sector   */
+#define CONFIG_ENV_SIZE                0x4000  /* Total Size of Environment */
+#define CONFIG_ENV_SECT_SIZE   0x20000

 
 /* Option added to get around byte ordering issues in the flash driver */
 #define CFG_LITTLE_ENDIAN      1
 
 /* Option added to get around byte ordering issues in the flash driver */
 #define CFG_LITTLE_ENDIAN      1

diff --git a/include/configs/ppmc7xx.h b/include/configs/ppmc7xx.h
index cd5ef94579c70140094ad018742b4ac1a3490c72..fd05c7ef292f43476f97c3054d9f5fc4da380040 100644 (file)
--- a/include/configs/ppmc7xx.h
+++ b/include/configs/ppmc7xx.h
@@ -275,17 +275,17 @@
  * Environment config - see memory map details above
  *
  * CONFIG_ENV_IS_IN_FLASH              - The env variables are stored in flash
  * Environment config - see memory map details above
  *
  * 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)
+ * CONFIG_ENV_ADDR                     - Address of the sector containing env vars
+ * CONFIG_ENV_SIZE                     - Ammount of RAM for env vars (used to save RAM, 4KB)
+ * CONFIG_ENV_SECT_SIZE                - Size of sector containing env vars (32KB)

  */
 
 #define CONFIG_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
-#define CFG_ENV_SIZE_REDUND    0x1000
-#define CFG_ENV_SECT_SIZE      0x8000
+#define CONFIG_ENV_ADDR                0xFFFE0000
+#define CONFIG_ENV_SIZE                0x1000
+#define CONFIG_ENV_ADDR_REDUND 0xFFFE8000
+#define CONFIG_ENV_SIZE_REDUND 0x1000
+#define CONFIG_ENV_SECT_SIZE   0x8000

 
 
 /*
 
 
 /*

diff --git a/include/configs/ppmc8260.h b/include/configs/ppmc8260.h
index a045f22410854761dc0f8b931fc95c9becd322eb..dd71862b414a8a0defa85de104ef0590eb9a66a0 100644 (file)
--- a/include/configs/ppmc8260.h
+++ b/include/configs/ppmc8260.h
@@ -137,7 +137,7 @@
  *                    Monitor Stack Buffer (0x80)
  *     0x0FF5 FFB0     Board Info Data
  *     0x0FF6 0000     Malloc Arena
  *                    Monitor Stack Buffer (0x80)
  *     0x0FF5 FFB0     Board Info Data
  *     0x0FF6 0000     Malloc Arena

- *          :              CFG_ENV_SECT_SIZE, 256k
+ *          :              CONFIG_ENV_SECT_SIZE, 256k

  *          :              CFG_MALLOC_LEN,    128k
  *     0x0FFC 0000     RAM Copy of Monitor Code
  *          :              CFG_MONITOR_LEN,   256k
  *          :              CFG_MALLOC_LEN,    128k
  *     0x0FFC 0000     RAM Copy of Monitor Code
  *          :              CFG_MONITOR_LEN,   256k


@@ -200,7 +200,7 @@
  * put in the same sector as U-Boot, and changing variables
  * will erase U-Boot temporarily
  */
  * put in the same sector as U-Boot, and changing variables
  * will erase U-Boot temporarily
  */

-#define CFG_ENV_IN_OWN_SECT    1
+#define CONFIG_ENV_IN_OWN_SECT 1

 
 /* Define to allow the user to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 
 /* Define to allow the user to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE


@@ -334,7 +334,7 @@
 #define CFG_STACK_USAGE                0x10000 /* Reserve 64k for the stack usage */
 #define CFG_MEM_END_USAGE      ( CFG_MONITOR_LEN \
                                + CFG_MALLOC_LEN \
 #define CFG_STACK_USAGE                0x10000 /* Reserve 64k for the stack usage */
 #define CFG_MEM_END_USAGE      ( CFG_MONITOR_LEN \
                                + CFG_MALLOC_LEN \

-                               + CFG_ENV_SECT_SIZE \
+                               + CONFIG_ENV_SECT_SIZE \

                                + CFG_STACK_USAGE )
 
 #define CFG_MEMTEST_END                ( CFG_SDRAM_SIZE * 1024 * 1024 \
                                + CFG_STACK_USAGE )
 
 #define CFG_MEMTEST_END                ( CFG_SDRAM_SIZE * 1024 * 1024 \


@@ -463,20 +463,20 @@
 #ifndef CFG_RAMBOOT
 
 #  define CONFIG_ENV_IS_IN_FLASH       1
 #ifndef CFG_RAMBOOT
 
 #  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
+#  ifdef CONFIG_ENV_IN_OWN_SECT
+#    define CONFIG_ENV_ADDR    (CFG_MONITOR_BASE + 0x40000)
+#    define CONFIG_ENV_SECT_SIZE       0x40000

 #  else
 #  else

-#    define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CFG_ENV_SECT_SIZE)
-#    define CFG_ENV_SIZE       0x1000  /* Total Size of Environment Sector     */
-#    define CFG_ENV_SECT_SIZE  0x40000 /* see README - env sect real size      */
-#  endif /* CFG_ENV_IN_OWN_SECT */
+#    define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CONFIG_ENV_SECT_SIZE)
+#    define CONFIG_ENV_SIZE    0x1000  /* Total Size of Environment Sector     */
+#    define CONFIG_ENV_SECT_SIZE       0x40000 /* see README - env sect real size      */
+#  endif /* CONFIG_ENV_IN_OWN_SECT */

 
 #else
 #  define CONFIG_ENV_IS_IN_FLASH       1
 
 #else
 #  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
+#  define CONFIG_ENV_ADDR              (CFG_FLASH_BASE + 0x40000)
+#define CONFIG_ENV_SIZE                0x1000
+#  define CONFIG_ENV_SECT_SIZE 0x40000

 #endif /* CFG_RAMBOOT */
 
 /*-----------------------------------------------------------------------
 #endif /* CFG_RAMBOOT */
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/purple.h b/include/configs/purple.h
index 59743dfed01940da6832b248b532f753ba91eb32..5cc4fc774a87d3a0c43d16fef5f7353341f69788 100644 (file)
--- a/include/configs/purple.h
+++ b/include/configs/purple.h
@@ -146,8 +146,8 @@
 #define        CONFIG_ENV_IS_IN_FLASH  1
 
 /* Address and size of Primary Environment Sector      */
 #define        CONFIG_ENV_IS_IN_FLASH  1
 
 /* Address and size of Primary Environment Sector      */

-#define CFG_ENV_ADDR           0xB0008000
-#define CFG_ENV_SIZE           0x4000
+#define CONFIG_ENV_ADDR                0xB0008000
+#define CONFIG_ENV_SIZE                0x4000

 
 #define CONFIG_FLASH_32BIT
 #define CONFIG_NR_DRAM_BANKS   1
 
 #define CONFIG_FLASH_32BIT
 #define CONFIG_NR_DRAM_BANKS   1

diff --git a/include/configs/pxa255_idp.h b/include/configs/pxa255_idp.h
index 9f83c7df064dc3b16875f33a9afa9f92d76587ae..1afff5e23d794a96d5280d921a1a314cbf9f958f 100644 (file)
--- a/include/configs/pxa255_idp.h
+++ b/include/configs/pxa255_idp.h
@@ -71,7 +71,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN     (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN     (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -350,8 +350,8 @@
 /* put cfg at end of flash for now */
 #define CONFIG_ENV_IS_IN_FLASH 1
  /* Addr of Environment Sector */
 /* put cfg at end of flash for now */
 #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     */
-#define        CFG_ENV_SECT_SIZE       (PHYS_FLASH_SECT_SIZE / 16)
+#define CONFIG_ENV_ADDR                (PHYS_FLASH_1 + PHYS_FLASH_SIZE - 0x40000)
+#define CONFIG_ENV_SIZE                PHYS_FLASH_SECT_SIZE    /* Total Size of Environment Sector     */
+#define        CONFIG_ENV_SECT_SIZE    (PHYS_FLASH_SECT_SIZE / 16)

 
 #endif /* __CONFIG_H */
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index e03e71026a97a02f4f1b7188a3c73fc72155e5e8..faaa88910bb11776ea34f6e9c3f17165f1ac9473 100644 (file)
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -150,10 +150,10 @@
 #define CFG_FLASH_USE_BUFFER_WRITE     1
 
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_FLASH_USE_BUFFER_WRITE     1
 
 #define CONFIG_ENV_IS_IN_FLASH 1

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x40000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x40000)

 
 /* Address and size of Primary Environment Sector */
 
 /* Address and size of Primary Environment Sector */

-#define CFG_ENV_SIZE           0x8000
+#define CONFIG_ENV_SIZE                0x8000

 
 #define CONFIG_ENV_OVERWRITE   1
 
 
 #define CONFIG_ENV_OVERWRITE   1
 

diff --git a/include/configs/quad100hd.h b/include/configs/quad100hd.h
index ad7f290376b7b50a3b314066e522c4342bb75fb0..3d78ac47acd6e0c5d554062bd0fce1d4914faf0e 100644 (file)
--- a/include/configs/quad100hd.h
+++ b/include/configs/quad100hd.h
@@ -199,18 +199,18 @@
 #define CFG_FLASH_QUIET_TEST   1       /* don't warn upon unknown flash */
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_FLASH_QUIET_TEST   1       /* don't warn upon unknown flash */
 
 #ifdef CONFIG_ENV_IS_IN_FLASH

-#define CFG_ENV_SECT_SIZE      0x10000 /* size of one complete sector  */
+#define CONFIG_ENV_SECT_SIZE   0x10000 /* size of one complete sector  */

 /* the environment is located before u-boot */
 /* the environment is located before u-boot */

-#define CFG_ENV_ADDR           (TEXT_BASE - CFG_ENV_SECT_SIZE)
+#define CONFIG_ENV_ADDR                (TEXT_BASE - CONFIG_ENV_SECT_SIZE)

 
 /* Address and size of Redundant Environment Sector    */
 
 /* 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_SECT_SIZE)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR - CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SECT_SIZE)

 #endif
 
 #ifdef CONFIG_ENV_IS_IN_EEPROM
 #endif
 
 #ifdef CONFIG_ENV_IS_IN_EEPROM

-#define CFG_ENV_SIZE           0x400           /* Size of Environment vars */
-#define CFG_ENV_OFFSET         0x00000000
+#define CONFIG_ENV_SIZE                0x400           /* Size of Environment vars */
+#define CONFIG_ENV_OFFSET              0x00000000

 #define CFG_ENABLE_CRC_16      1       /* Intrinsyc formatting used crc16 */
 #endif
 
 #define CFG_ENABLE_CRC_16      1       /* Intrinsyc formatting used crc16 */
 #endif
 

diff --git a/include/configs/quantum.h b/include/configs/quantum.h
index a35418fa896f630aaa7dd5832cf6ed5f6bd4fc3f..f2646152e2bbd5048c535e7cddc54105c9951de0 100644 (file)
--- a/include/configs/quantum.h
+++ b/include/configs/quantum.h
@@ -209,14 +209,14 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #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
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+#define CONFIG_ENV_OFFSET          0x00F40000  /*   Offset   of Environment Sector     absolute address 0xfff40000*/
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* Total Size of Environment Sector     */
+#define CONFIG_ENV_SIZE                CONFIG_ENV_SECT_SIZE
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 
 /* Address and size of Redundant Environment Sector    */
 
 /* Address and size of Redundant Environment Sector    */

-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET+CFG_ENV_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 /* FPGA */
 #define CONFIG_MISC_INIT_R
 
 /* FPGA */
 #define CONFIG_MISC_INIT_R

diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 666219e3cfc25edabab47d528c070fe010cea303..41a2a15122f22a9241c840fc37548cb2a7aff4aa 100644 (file)
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -72,9 +72,9 @@
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
 
 #define CONFIG_ENV_IS_IN_FLASH
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
 
 #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)
+#define CONFIG_ENV_SECT_SIZE   0x40000
+#define CONFIG_ENV_SIZE        (CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_ADDR        (CFG_MONITOR_BASE + CFG_MONITOR_LEN)

 
 /*
  * SuperH Clock setting
 
 /*
  * SuperH Clock setting

diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h
index 7123a8370948cb8a13d21d6c865c4180dc00fb24..4f3f8e53753af24a681d9b5ececf39fdc75ea0ce 100644 (file)
--- a/include/configs/r7780mp.h
+++ b/include/configs/r7780mp.h
@@ -113,9 +113,9 @@
 #define CFG_FLASH_EMPTY_INFO
 
 #define CONFIG_ENV_IS_IN_FLASH
 #define CFG_FLASH_EMPTY_INFO
 
 #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)
+#define CONFIG_ENV_SECT_SIZE   (256 * 1024)
+#define CONFIG_ENV_SIZE                (CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + CFG_MONITOR_LEN)

 #define CFG_FLASH_ERASE_TOUT   120000
 #define CFG_FLASH_WRITE_TOUT   500
 
 #define CFG_FLASH_ERASE_TOUT   120000
 #define CFG_FLASH_WRITE_TOUT   500
 

diff --git a/include/configs/redwood.h b/include/configs/redwood.h
index c825f13c26e6e672143b19052bd01b3d0bb6ba39..dac323ba7f7ec973fd95ffa4dff0f3786acf22bd 100644 (file)
--- a/include/configs/redwood.h
+++ b/include/configs/redwood.h
@@ -176,9 +176,9 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms) */
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms) */
 
 #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     */
+#define CONFIG_ENV_SECT_SIZE   0x10000 /* size of one complete sector  */
+#define CONFIG_ENV_ADDR                0xfffa0000
+#define CONFIG_ENV_SIZE                0x10000 /* Size of Environment vars     */

 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*---------------------------------------------------------------------------*/
 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*---------------------------------------------------------------------------*/

diff --git a/include/configs/rmu.h b/include/configs/rmu.h
index 46f94dac7013dae827b38a6ae6f55b882abbcc28..0c0b206462852de598cc1abd29b7d5666539981b 100644 (file)
--- a/include/configs/rmu.h
+++ b/include/configs/rmu.h
@@ -189,12 +189,12 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1

-#define CFG_ENV_ADDR           ((TEXT_BASE) + 0x40000)
-#define        CFG_ENV_SIZE            0x40000 /* Total Size of Environment Sector     */
+#define CONFIG_ENV_ADDR                ((TEXT_BASE) + 0x40000)
+#define        CONFIG_ENV_SIZE         0x40000 /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* Address and size of Redundant Environment Sector    */

-#define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR+CFG_ENV_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 /*-----------------------------------------------------------------------
  * Reset address
 
 /*-----------------------------------------------------------------------
  * Reset address

diff --git a/include/configs/rsdproto.h b/include/configs/rsdproto.h
index 89db35b70e128efe21925932585c6a757561dd65..09913a906a66c5a507473027402b1105930058d1 100644 (file)
--- a/include/configs/rsdproto.h
+++ b/include/configs/rsdproto.h
@@ -292,8 +292,8 @@
 #undef CONFIG_NVRAM_ENV
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #undef CONFIG_NVRAM_ENV
 
 #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     */
+#define CONFIG_ENV_ADDR        (PHYS_FLASH + 0x28000)  /* Addr of Environment Sector   */
+#define CONFIG_ENV_SECT_SIZE   0x8000  /* Total Size of Environment Sector     */

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h
index f6b013c364409a8bc13fb0f5c228d47f2fd9c0de..d99e4f3274ce1e33e499ebe16b6937360021e642 100644 (file)
--- a/include/configs/rsk7203.h
+++ b/include/configs/rsk7203.h
@@ -93,9 +93,9 @@
 #define CFG_MAX_FLASH_BANKS    1
 
 #define CONFIG_ENV_IS_IN_FLASH
 #define CFG_MAX_FLASH_BANKS    1
 
 #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)
+#define CONFIG_ENV_SECT_SIZE   (64 * 1024)
+#define CONFIG_ENV_SIZE                CONFIG_ENV_SECT_SIZE
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + CFG_MONITOR_LEN)

 #define CFG_FLASH_ERASE_TOUT   12000
 #define CFG_FLASH_WRITE_TOUT   500
 
 #define CFG_FLASH_ERASE_TOUT   12000
 #define CFG_FLASH_WRITE_TOUT   500
 

diff --git a/include/configs/sacsng.h b/include/configs/sacsng.h
index bce8c9c8fe8ededa875ac9cfbbe4555ae8e63a98..560bf055075b2bb21dfe05d54a1ef409efc25614 100644 (file)
--- a/include/configs/sacsng.h
+++ b/include/configs/sacsng.h
@@ -124,7 +124,7 @@
  *                    Monitor Stack Buffer (0x80)
  *     0x03F5 FFB0     Board Info Data
  *     0x03F6 0000     Malloc Arena
  *                    Monitor Stack Buffer (0x80)
  *     0x03F5 FFB0     Board Info Data
  *     0x03F6 0000     Malloc Arena

- *          :              CFG_ENV_SECT_SIZE, 16k
+ *          :              CONFIG_ENV_SECT_SIZE, 16k

  *          :              CFG_MALLOC_LEN,    128k
  *     0x03FC 0000     RAM Copy of Monitor Code
  *          :              CFG_MONITOR_LEN,   256k
  *          :              CFG_MALLOC_LEN,    128k
  *     0x03FC 0000     RAM Copy of Monitor Code
  *          :              CFG_MONITOR_LEN,   256k


@@ -316,7 +316,7 @@
  * put in the same sector as U-Boot, and changing variables
  * will erase U-Boot temporarily
  */
  * put in the same sector as U-Boot, and changing variables
  * will erase U-Boot temporarily
  */

-#define CFG_ENV_IN_OWN_SECT    1
+#define CONFIG_ENV_IN_OWN_SECT 1

 
 /* Define this to contain any number of null terminated strings that
  * will be part of the default enviroment compiled into the boot image.
 
 /* Define this to contain any number of null terminated strings that
  * will be part of the default enviroment compiled into the boot image.


@@ -610,7 +610,7 @@
 #define CFG_STACK_USAGE                0x10000 /* Reserve 64k for the stack usage */
 #define CFG_MEM_END_USAGE      ( CFG_MONITOR_LEN \
                                + CFG_MALLOC_LEN \
 #define CFG_STACK_USAGE                0x10000 /* Reserve 64k for the stack usage */
 #define CFG_MEM_END_USAGE      ( CFG_MONITOR_LEN \
                                + CFG_MALLOC_LEN \

-                               + CFG_ENV_SECT_SIZE \
+                               + CONFIG_ENV_SECT_SIZE \

                                + CFG_STACK_USAGE )
 
 #define CFG_MEMTEST_END                ( CFG_SDRAM_SIZE * 1024 * 1024 \
                                + CFG_STACK_USAGE )
 
 #define CFG_MEMTEST_END                ( CFG_SDRAM_SIZE * 1024 * 1024 \


@@ -709,19 +709,19 @@
 #ifndef CFG_RAMBOOT
 #  define CONFIG_ENV_IS_IN_FLASH       1
 
 #ifndef CFG_RAMBOOT
 #  define CONFIG_ENV_IS_IN_FLASH       1
 

-#  ifdef CFG_ENV_IN_OWN_SECT
-#    define CFG_ENV_ADDR       (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
-#    define CFG_ENV_SECT_SIZE  0x10000
+#  ifdef CONFIG_ENV_IN_OWN_SECT
+#    define CONFIG_ENV_ADDR    (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#    define CONFIG_ENV_SECT_SIZE       0x10000

 #  else
 #  else

-#    define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CFG_ENV_SECT_SIZE)
-#    define CFG_ENV_SIZE       0x1000  /* Total Size of Environment Sector     */
-#    define CFG_ENV_SECT_SIZE  0x10000 /* see README - env sect real size      */
-#  endif /* CFG_ENV_IN_OWN_SECT */
+#    define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CONFIG_ENV_SECT_SIZE)
+#    define CONFIG_ENV_SIZE    0x1000  /* Total Size of Environment Sector     */
+#    define CONFIG_ENV_SECT_SIZE       0x10000 /* see README - env sect real size      */
+#  endif /* CONFIG_ENV_IN_OWN_SECT */

 
 #else
 #  define CONFIG_ENV_IS_IN_NVRAM       1
 
 #else
 #  define CONFIG_ENV_IS_IN_NVRAM       1

-#  define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
-#  define CFG_ENV_SIZE         0x200
+#  define CONFIG_ENV_ADDR              (CFG_MONITOR_BASE - 0x1000)
+#  define CONFIG_ENV_SIZE              0x200

 #endif /* CFG_RAMBOOT */
 
 /*-----------------------------------------------------------------------
 #endif /* CFG_RAMBOOT */
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/sbc2410x.h b/include/configs/sbc2410x.h
index 8c14e8b62cb77a166198b83a1a509abbc7e044a7..110ab3904dfd9987b1a87af18e7c88b0f067ce45 100644 (file)
--- a/include/configs/sbc2410x.h
+++ b/include/configs/sbc2410x.h
@@ -57,7 +57,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -180,13 +180,13 @@
 #ifdef CONFIG_AMD_LV800
 #define PHYS_FLASH_SIZE                0x00100000 /* 1MB */
 #define CFG_MAX_FLASH_SECT     (19)    /* max number of sectors on one chip */
 #ifdef CONFIG_AMD_LV800
 #define PHYS_FLASH_SIZE                0x00100000 /* 1MB */
 #define CFG_MAX_FLASH_SECT     (19)    /* max number of sectors on one chip */

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x0F0000) /* addr of environment */
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x0F0000) /* addr of environment */

 #endif
 
 #ifdef CONFIG_AMD_LV400
 #define PHYS_FLASH_SIZE                0x00080000 /* 512KB */
 #define CFG_MAX_FLASH_SECT     (11)    /* max number of sectors on one chip */
 #endif
 
 #ifdef CONFIG_AMD_LV400
 #define PHYS_FLASH_SIZE                0x00080000 /* 512KB */
 #define CFG_MAX_FLASH_SECT     (11)    /* max number of sectors on one chip */

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x070000) /* addr of environment */
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x070000) /* addr of environment */

 #endif
 
 /* timeout values are in ticks */
 #endif
 
 /* timeout values are in ticks */


@@ -194,7 +194,7 @@
 #define CFG_FLASH_WRITE_TOUT   (5*CFG_HZ) /* Timeout for Flash Write */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   (5*CFG_HZ) /* Timeout for Flash Write */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1

-#define CFG_ENV_SIZE           0x10000 /* Total Size of Environment Sector */
+#define CONFIG_ENV_SIZE                0x10000 /* Total Size of Environment Sector */

 
 /*-----------------------------------------------------------------------
  * NAND flash settings
 
 /*-----------------------------------------------------------------------
  * NAND flash settings

diff --git a/include/configs/sbc405.h b/include/configs/sbc405.h
index 33eeca220abed1930b83b9241b73384b2c6ac4a7..759e4e2acae5b558a1ea59480298e03729c5831c 100644 (file)
--- a/include/configs/sbc405.h
+++ b/include/configs/sbc405.h
@@ -227,11 +227,11 @@
 /*-----------------------------------------------------------------------
  * Environment Variable setup
  */
 /*-----------------------------------------------------------------------
  * Environment Variable setup
  */

-#define CFG_ENV_ADDR   CFG_FLASH_BASE  /* starting right at the beginning      */
+#define CONFIG_ENV_ADDR        CFG_FLASH_BASE  /* starting right at the beginning      */

 #define CONFIG_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     */
+#define CONFIG_ENV_OFFSET              0       /* starting right at the beginning      */
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* see README - env sector total size   */
+#define CONFIG_ENV_SIZE                0x40000 /* Total Size of Environment Sector     */

 
 /*-----------------------------------------------------------------------
  * External Bus Controller (EBC) Setup
 
 /*-----------------------------------------------------------------------
  * External Bus Controller (EBC) Setup

diff --git a/include/configs/sbc8240.h b/include/configs/sbc8240.h
index 6e3c160ec86b58296f37259a7de214b09df1cfcc..10ff7ab40ed53199c3257b2747a999714f82466f 100644 (file)
--- a/include/configs/sbc8240.h
+++ b/include/configs/sbc8240.h
@@ -340,10 +340,10 @@ typedef unsigned int led_id_t;
         * It's stored in flash separately.
         */
 #define CONFIG_ENV_IS_IN_FLASH 1
         * It's stored in flash separately.
         */
 #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      */
-#define CFG_ENV_SECT_SIZE      0x40000 /* Size of the Environment Sector       */
+#define CONFIG_ENV_ADDR                0xFFF70000
+#define CONFIG_ENV_SIZE                0x4000  /* Size of the Environment              */
+#define CONFIG_ENV_OFFSET              0       /* starting right at the beginning      */
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* Size of the Environment Sector       */

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/sbc8260.h b/include/configs/sbc8260.h
index 3a031de08793f3a8b008c2fa5a67b8c7bfc4090f..e96adb949cc4f718b6a3770fda689f4e8c79ae23 100644 (file)
--- a/include/configs/sbc8260.h
+++ b/include/configs/sbc8260.h
@@ -127,7 +127,7 @@
  *                    Monitor Stack Buffer (0x80)
  *     0x00F5 FFB0     Board Info Data
  *     0x00F6 0000     Malloc Arena
  *                    Monitor Stack Buffer (0x80)
  *     0x00F5 FFB0     Board Info Data
  *     0x00F6 0000     Malloc Arena

- *          :              CFG_ENV_SECT_SIZE, 256k
+ *          :              CONFIG_ENV_SECT_SIZE, 256k

  *          :              CFG_MALLOC_LEN,    128k
  *     0x00FC 0000     RAM Copy of Monitor Code
  *          :              CFG_MONITOR_LEN,   256k
  *          :              CFG_MALLOC_LEN,    128k
  *     0x00FC 0000     RAM Copy of Monitor Code
  *          :              CFG_MONITOR_LEN,   256k


@@ -150,7 +150,7 @@
  *                    Monitor Stack Buffer (0x80)
  *     0x03F5 FFB0     Board Info Data
  *     0x03F6 0000     Malloc Arena
  *                    Monitor Stack Buffer (0x80)
  *     0x03F5 FFB0     Board Info Data
  *     0x03F6 0000     Malloc Arena

- *          :              CFG_ENV_SECT_SIZE, 256k
+ *          :              CONFIG_ENV_SECT_SIZE, 256k

  *          :              CFG_MALLOC_LEN,    128k
  *     0x03FC 0000     RAM Copy of Monitor Code
  *          :              CFG_MONITOR_LEN,   256k
  *          :              CFG_MALLOC_LEN,    128k
  *     0x03FC 0000     RAM Copy of Monitor Code
  *          :              CFG_MONITOR_LEN,   256k


@@ -275,7 +275,7 @@
  * put in the same sector as U-Boot, and changing variables
  * will erase U-Boot temporarily
  */
  * put in the same sector as U-Boot, and changing variables
  * will erase U-Boot temporarily
  */

-#define CFG_ENV_IN_OWN_SECT    1
+#define CONFIG_ENV_IN_OWN_SECT 1

 
 /* Define to allow the user to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 
 /* Define to allow the user to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE


@@ -509,7 +509,7 @@
 #define CFG_STACK_USAGE                0x10000 /* Reserve 64k for the stack usage */
 #define CFG_MEM_END_USAGE      ( CFG_MONITOR_LEN \
                                + CFG_MALLOC_LEN \
 #define CFG_STACK_USAGE                0x10000 /* Reserve 64k for the stack usage */
 #define CFG_MEM_END_USAGE      ( CFG_MONITOR_LEN \
                                + CFG_MALLOC_LEN \

-                               + CFG_ENV_SECT_SIZE \
+                               + CONFIG_ENV_SECT_SIZE \

                                + CFG_STACK_USAGE )
 
 #define CFG_MEMTEST_END                ( CFG_SDRAM_SIZE * 1024 * 1024 \
                                + CFG_STACK_USAGE )
 
 #define CFG_MEMTEST_END                ( CFG_SDRAM_SIZE * 1024 * 1024 \


@@ -605,19 +605,19 @@
 #ifndef CFG_RAMBOOT
 #  define CONFIG_ENV_IS_IN_FLASH       1
 
 #ifndef CFG_RAMBOOT
 #  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
+#  ifdef CONFIG_ENV_IN_OWN_SECT
+#    define CONFIG_ENV_ADDR    (CFG_MONITOR_BASE + 0x40000)
+#    define CONFIG_ENV_SECT_SIZE       0x40000

 #  else
 #  else

-#    define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CFG_ENV_SECT_SIZE)
-#    define CFG_ENV_SIZE       0x1000  /* Total Size of Environment Sector     */
-#    define CFG_ENV_SECT_SIZE  0x10000 /* see README - env sect real size      */
-#  endif /* CFG_ENV_IN_OWN_SECT */
+#    define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CONFIG_ENV_SECT_SIZE)
+#    define CONFIG_ENV_SIZE    0x1000  /* Total Size of Environment Sector     */
+#    define CONFIG_ENV_SECT_SIZE       0x10000 /* see README - env sect real size      */
+#  endif /* CONFIG_ENV_IN_OWN_SECT */

 
 #else
 #  define CONFIG_ENV_IS_IN_NVRAM       1
 
 #else
 #  define CONFIG_ENV_IS_IN_NVRAM       1

-#  define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
-#  define CFG_ENV_SIZE         0x200
+#  define CONFIG_ENV_ADDR              (CFG_MONITOR_BASE - 0x1000)
+#  define CONFIG_ENV_SIZE              0x200

 #endif /* CFG_RAMBOOT */
 
 /*-----------------------------------------------------------------------
 #endif /* CFG_RAMBOOT */
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index fa0ccd813283278765031c6885fea7da95c1d399..dc5a1011d946dfd8212d4d24a5c777429417330c 100644 (file)
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -414,19 +414,19 @@
  */
 #ifndef CFG_RAMBOOT
        #define CONFIG_ENV_IS_IN_FLASH  1
  */
 #ifndef CFG_RAMBOOT
        #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
+       #define CONFIG_ENV_ADDR         (CFG_MONITOR_BASE + 0x40000)
+       #define CONFIG_ENV_SECT_SIZE    0x20000 /* 128K(one sector) for env */
+       #define CONFIG_ENV_SIZE         0x2000

 
 /* Address and size of Redundant Environment Sector    */
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 #else
        #define CFG_NO_FLASH            1       /* Flash is not usable now */
        #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */
 
 #else
        #define CFG_NO_FLASH            1       /* Flash is not usable now */
        #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */

-       #define CFG_ENV_ADDR            (CFG_MONITOR_BASE - 0x1000)
-       #define CFG_ENV_SIZE            0x2000
+       #define CONFIG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
+       #define CONFIG_ENV_SIZE         0x2000

 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */

diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index 1f6dc3fe54cc4f37633c9b20c96fb71ecdea8a2a..9d436c6fbf8e05a4b4b4c0b98521982c9ae9abdb 100644 (file)
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -435,9 +435,9 @@
  * Environment
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
  * Environment
  */
 #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
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + 0x40000)
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* 256K(one sector) for env */
+#define CONFIG_ENV_SIZE                0x2000

 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change */
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change */

diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h
index 72e4791f3011a03787f19427315e7b6ba938d209..38ae1b1adb788fe265c9acfa66e9d0ed47ef391d 100644 (file)
--- a/include/configs/sbc8560.h
+++ b/include/configs/sbc8560.h
@@ -333,19 +333,19 @@
 #if !defined(CFG_RAMBOOT)
   #if defined(CONFIG_RAM_AS_FLASH)
     #define CONFIG_ENV_IS_NOWHERE
 #if !defined(CFG_RAMBOOT)
   #if defined(CONFIG_RAM_AS_FLASH)
     #define CONFIG_ENV_IS_NOWHERE

-    #define CFG_ENV_ADDR       (CFG_FLASH_BASE + 0x100000)
-    #define CFG_ENV_SIZE       0x2000
+    #define CONFIG_ENV_ADDR    (CFG_FLASH_BASE + 0x100000)
+    #define CONFIG_ENV_SIZE    0x2000

   #else
     #define CONFIG_ENV_IS_IN_FLASH     1
   #else
     #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 */
+    #define CONFIG_ENV_SECT_SIZE       0x20000 /* 128K(one sector) for env */
+    #define CONFIG_ENV_ADDR    (CFG_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
+    #define CONFIG_ENV_SIZE    0x2000 /* CONFIG_ENV_SECT_SIZE */

   #endif
 #else
   #define CFG_NO_FLASH         1       /* Flash is not usable now      */
   #define CONFIG_ENV_IS_NOWHERE        1       /* Store ENV in memory only     */
   #endif
 #else
   #define CFG_NO_FLASH         1       /* Flash is not usable now      */
   #define CONFIG_ENV_IS_NOWHERE        1       /* Store ENV in memory only     */

-  #define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
-  #define CFG_ENV_SIZE         0x2000
+  #define CONFIG_ENV_ADDR              (CFG_MONITOR_BASE - 0x1000)
+  #define CONFIG_ENV_SIZE              0x2000

 #endif
 
 #define CONFIG_BOOTARGS "root=/dev/nfs rw ip=dhcp console=ttyS0,9600"
 #endif
 
 #define CONFIG_BOOTARGS "root=/dev/nfs rw ip=dhcp console=ttyS0,9600"

diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
index 40211a0ac9a397d5ded6cdd698fe3f024dc65c9c..01003a396e0d368f2da5b681e53a2c4eee737a16 100644 (file)
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -470,9 +470,9 @@
  * Environment
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
  * Environment
  */
 #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
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + 0x40000)
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* 256K(one sector) for env */
+#define CONFIG_ENV_SIZE                0x2000

 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change */
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change */

diff --git a/include/configs/sc3.h b/include/configs/sc3.h
index 1a614fd6279bd6aa40197748a98f36992ed5677e..88a24b87973728a1ffed1f9c746d4dc8acbea4b3 100644 (file)
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -406,13 +406,13 @@ extern unsigned long offsetOfEnvironment;
 
 #define CONFIG_ENV_IS_IN_FLASH 1
 #ifdef CONFIG_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       */
+#define CONFIG_ENV_OFFSET              0x00000000  /* Offset of Environment Sector in bottom type */
+#define CONFIG_ENV_SIZE                0x4000      /* Total Size of Environment Sector */
+#define CONFIG_ENV_SECT_SIZE   0x4000      /* see README - env sector total size       */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* Address and size of Redundant Environment Sector    */

-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET+CFG_ENV_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 #endif
 /* let us changing anything in our environment */
 
 #endif
 /* let us changing anything in our environment */

diff --git a/include/configs/sc520_cdp.h b/include/configs/sc520_cdp.h
index ecfd7491397311e7716492239acc7c72ac6ecdfd..0042e30057379bfcb6a9fcb8e91e066332ee8dda 100644 (file)
--- a/include/configs/sc520_cdp.h
+++ b/include/configs/sc520_cdp.h
@@ -63,7 +63,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CONFIG_MALLOC_SIZE     (CFG_ENV_SIZE + 128*1024)
+#define CONFIG_MALLOC_SIZE     (CONFIG_ENV_SIZE + 128*1024)

 
 #define CONFIG_BAUDRATE                9600
 
 
 #define CONFIG_BAUDRATE                9600
 


@@ -146,8 +146,8 @@
 /* Environment in EEPROM */
 #define CONFIG_ENV_IS_IN_EEPROM   1
 #define CONFIG_SPI
 /* Environment in EEPROM */
 #define CONFIG_ENV_IS_IN_EEPROM   1
 #define CONFIG_SPI

-#define CFG_ENV_SIZE          0x4000   /* Total Size of Environment EEPROM 16k is SPI is used or 128 bytes if MW is used*/
-#define CFG_ENV_OFFSET         0
+#define CONFIG_ENV_SIZE               0x4000   /* Total Size of Environment EEPROM 16k is SPI is used or 128 bytes if MW is used*/
+#define CONFIG_ENV_OFFSET         0

 #define CONFIG_SC520_CDP_USE_SPI  /* Store configuration in the SPI part */
 #undef CONFIG_SC520_CDP_USE_MW    /* Store configuration in the MicroWire part */
 #define CONFIG_SPI_X 1
 #define CONFIG_SC520_CDP_USE_SPI  /* Store configuration in the SPI part */
 #undef CONFIG_SC520_CDP_USE_MW    /* Store configuration in the MicroWire part */
 #define CONFIG_SPI_X 1

diff --git a/include/configs/sc520_spunk.h b/include/configs/sc520_spunk.h
index a8f520c3c2ebdc5e450622d3cfc0a9d560edf6c8..4e5798c8a6961432fed2faa95caaef112492e07e 100644 (file)
--- a/include/configs/sc520_spunk.h
+++ b/include/configs/sc520_spunk.h
@@ -59,7 +59,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CONFIG_MALLOC_SIZE     (CFG_ENV_SIZE + 128*1024)
+#define CONFIG_MALLOC_SIZE     (CONFIG_ENV_SIZE + 128*1024)

 
 
 #define CONFIG_BAUDRATE                9600
 
 
 #define CONFIG_BAUDRATE                9600


@@ -154,9 +154,9 @@
 #if 0
 /* Environment in flash */
 #define CONFIG_ENV_IS_IN_FLASH     1
 #if 0
 /* Environment in flash */
 #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
+# define CONFIG_ENV_ADDR               (0x387a0000)    /* Addr of Environment Sector   */
+# define CONFIG_ENV_SIZE               0x20000 /* Total Size of Environment Sector (or 0x10000) */
+# define CONFIG_ENV_OFFSET         0

 
 #else
 /* Environment in EEPROM */
 
 #else
 /* Environment in EEPROM */


@@ -164,8 +164,8 @@
 # define CONFIG_ENV_IS_IN_EEPROM   1
 # define CONFIG_SPI
 # define CONFIG_SPI_X 1
 # define CONFIG_ENV_IS_IN_EEPROM   1
 # define CONFIG_SPI
 # define CONFIG_SPI_X 1

-# define CFG_ENV_SIZE          0x2000  /* Total Size of Environment EEPROM     */
-# define CFG_ENV_OFFSET         0x1c00
+# define CONFIG_ENV_SIZE               0x2000  /* Total Size of Environment EEPROM     */
+# define CONFIG_ENV_OFFSET         0x1c00

 
 #endif
 
 
 #endif
 

diff --git a/include/configs/scb9328.h b/include/configs/scb9328.h
index 51826d7356206a762d754eb8f3ef0b41c8edda04..12799559fb8cd25b32a61a05c0685dbe2c961c7b 100644 (file)
--- a/include/configs/scb9328.h
+++ b/include/configs/scb9328.h
@@ -105,7 +105,7 @@
 /*
  * Malloc pool need to host env + 128 Kb reserve for other allocations.
  */
 /*
  * Malloc pool need to host env + 128 Kb reserve for other allocations.
  */

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + (128<<10) )
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + (128<<10) )

 
 
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */


@@ -216,8 +216,8 @@
 #define CFG_MONITOR_BASE       0x10000000
 #define CFG_MONITOR_LEN                0x20000         /* 128b ( 1 flash sector )  */
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_MONITOR_BASE       0x10000000
 #define CFG_MONITOR_LEN                0x20000         /* 128b ( 1 flash sector )  */
 #define CONFIG_ENV_IS_IN_FLASH 1

-#define CFG_ENV_ADDR           0x10020000      /* absolute address for now  */
-#define CFG_ENV_SIZE           0x20000
+#define CONFIG_ENV_ADDR                0x10020000      /* absolute address for now  */
+#define CONFIG_ENV_SIZE                0x20000

 
 #define         CONFIG_ENV_OVERWRITE  1                /* env is not writable now   */
 
 
 #define         CONFIG_ENV_OVERWRITE  1                /* env is not writable now   */
 

diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h
index 3574a6f5f886d91e78812d5c01b0385d1810d09e..d39a894d2a35a821563f976613024309dc0ff9bd 100644 (file)
--- a/include/configs/sequoia.h
+++ b/include/configs/sequoia.h
@@ -116,7 +116,7 @@
 #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 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     */
+#define CONFIG_ENV_IS_EMBEDDED 1       /* use embedded environment     */

 #endif
 
 /*
 #endif
 
 /*


@@ -140,13 +140,13 @@
 #define CFG_FLASH_QUIET_TEST   1       /* don't warn upon unknown flash      */
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_FLASH_QUIET_TEST   1       /* don't warn upon unknown 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   */
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* size of one complete sector        */
+#define CONFIG_ENV_ADDR                ((-CFG_MONITOR_LEN)-CONFIG_ENV_SECT_SIZE)
+#define        CONFIG_ENV_SIZE         0x2000  /* Total Size of Environment Sector   */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 #endif
 
 /*
 #endif
 
 /*


@@ -202,9 +202,9 @@
  * For NAND booting the environment is embedded in the U-Boot image. Please take
  * look at the file board/amcc/sequoia/u-boot-nand.lds for details.
  */
  * For NAND booting the environment is embedded in the U-Boot image. Please take
  * look at the file board/amcc/sequoia/u-boot-nand.lds for details.
  */

-#define CFG_ENV_SIZE           CFG_NAND_BLOCK_SIZE
-#define CFG_ENV_OFFSET         (CFG_NAND_U_BOOT_OFFS + CFG_ENV_SIZE)
-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET + CFG_ENV_SIZE)
+#define CONFIG_ENV_SIZE                CFG_NAND_BLOCK_SIZE
+#define CONFIG_ENV_OFFSET              (CFG_NAND_U_BOOT_OFFS + CONFIG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)

 #endif
 
 /*
 #endif
 
 /*

diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h
index 05e3f962497b47762f1d74ad229fe25caa13a21b..2daaeb0459d3208088ba5236d5bfc4180715985f 100644 (file)
--- a/include/configs/sh7763rdp.h
+++ b/include/configs/sh7763rdp.h
@@ -104,13 +104,13 @@
 #undef  CFG_FLASH_PROTECTION
 #undef  CFG_DIRECT_FLASH_TFTP
 #define CONFIG_ENV_IS_IN_FLASH
 #undef  CFG_FLASH_PROTECTION
 #undef  CFG_DIRECT_FLASH_TFTP
 #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))
+#define CONFIG_ENV_SECT_SIZE   (128 * 1024)
+#define CONFIG_ENV_SIZE                (CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + (1 * CONFIG_ENV_SECT_SIZE))

 /* Offset of env Flash sector relative to CFG_FLASH_BASE */
 /* Offset of env Flash sector relative to CFG_FLASH_BASE */

-#define CFG_ENV_OFFSET         (CFG_ENV_ADDR - CFG_FLASH_BASE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SECT_SIZE)
-#define CFG_ENV_ADDR_REDUND    (CFG_FLASH_BASE + (2 * CFG_ENV_SECT_SIZE))
+#define CONFIG_ENV_OFFSET              (CONFIG_ENV_ADDR - CFG_FLASH_BASE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_ADDR_REDUND (CFG_FLASH_BASE + (2 * CONFIG_ENV_SECT_SIZE))

 
 /* Clock */
 #define CONFIG_SYS_CLK_FREQ    66666666
 
 /* Clock */
 #define CONFIG_SYS_CLK_FREQ    66666666

diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index f9bbb4d0b1041f14a14a750e5530d5a92676ba63..bf06f62ba07a5670629be11c847248698446ab9a 100644 (file)
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -152,11 +152,11 @@
 /* ENV setting */
 #define CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_OVERWRITE   1
 /* ENV setting */
 #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)
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + CFG_MONITOR_LEN)
-#define CFG_ENV_OFFSET         (CFG_ENV_ADDR - CFG_FLASH_BASE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SECT_SIZE   (256 * 1024)
+#define CONFIG_ENV_SIZE                (CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + CFG_MONITOR_LEN)
+#define CONFIG_ENV_OFFSET              (CONFIG_ENV_ADDR - CFG_FLASH_BASE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SECT_SIZE)

 
 /* Board Clock */
 /* The SCIF used external clock. system clock only used timer. */
 
 /* Board Clock */
 /* The SCIF used external clock. system clock only used timer. */

diff --git a/include/configs/shannon.h b/include/configs/shannon.h
index 28fecf1fc92929c5ef6f12e9095631e7551fe9a8..edc9a2ef126f3d754574e7cc84166edf9699506d 100644 (file)
--- a/include/configs/shannon.h
+++ b/include/configs/shannon.h
@@ -48,7 +48,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -161,11 +161,11 @@
 #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        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   */
-#define CFG_ENV_SIZE           0x4000  /* Total Size of Environment Sector     */
+#define CONFIG_ENV_ADDR                (PHYS_FLASH_1 + 0x003E0000)     /* Addr of Environment Sector   */
+#define CONFIG_ENV_SIZE                0x4000  /* Total Size of Environment Sector     */

 #else
 #else

-#define CFG_ENV_ADDR           (PHYS_FLASH_1 + 0x1C000)        /* Addr of Environment Sector   */
-#define CFG_ENV_SIZE           0x4000  /* Total Size of Environment Sector     */
+#define CONFIG_ENV_ADDR                (PHYS_FLASH_1 + 0x1C000)        /* Addr of Environment Sector   */
+#define CONFIG_ENV_SIZE                0x4000  /* Total Size of Environment Sector     */

 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/smdk2400.h b/include/configs/smdk2400.h
index 35eebeb0c6b94873009a8462ed0c32f7d73393fd..15ae3da1265c2e1bee0db8612c9950a108e24ab2 100644 (file)
--- a/include/configs/smdk2400.h
+++ b/include/configs/smdk2400.h
@@ -50,7 +50,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -181,11 +181,11 @@
 #define        CONFIG_ENV_IS_IN_FLASH  1
 
 /* Address and size of Primary Environment Sector      */
 #define        CONFIG_ENV_IS_IN_FLASH  1
 
 /* Address and size of Primary Environment Sector      */

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x40000)
-#define CFG_ENV_SIZE           0x40000
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x40000)
+#define CONFIG_ENV_SIZE                0x40000

 
 /* Address and size of Redundant Environment Sector    */
 
 /* Address and size of Redundant Environment Sector    */

-#define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR + CFG_ENV_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 #endif /* __CONFIG_H */
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index 86ebcbaf014806ed79e52008da3bc8f6e11d0572..cd0093ef7175526518c991563c26538531cb03d3 100644 (file)
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -47,7 +47,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -166,12 +166,12 @@
 #ifdef CONFIG_AMD_LV800
 #define PHYS_FLASH_SIZE                0x00100000 /* 1MB */
 #define CFG_MAX_FLASH_SECT     (19)    /* max number of sectors on one chip */
 #ifdef CONFIG_AMD_LV800
 #define PHYS_FLASH_SIZE                0x00100000 /* 1MB */
 #define CFG_MAX_FLASH_SECT     (19)    /* max number of sectors on one chip */

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x0F0000) /* addr of environment */
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x0F0000) /* addr of environment */

 #endif
 #ifdef CONFIG_AMD_LV400
 #define PHYS_FLASH_SIZE                0x00080000 /* 512KB */
 #define CFG_MAX_FLASH_SECT     (11)    /* max number of sectors on one chip */
 #endif
 #ifdef CONFIG_AMD_LV400
 #define PHYS_FLASH_SIZE                0x00080000 /* 512KB */
 #define CFG_MAX_FLASH_SECT     (11)    /* max number of sectors on one chip */

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x070000) /* addr of environment */
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x070000) /* addr of environment */

 #endif
 
 /* timeout values are in ticks */
 #endif
 
 /* timeout values are in ticks */


@@ -179,6 +179,6 @@
 #define CFG_FLASH_WRITE_TOUT   (5*CFG_HZ) /* Timeout for Flash Write */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_WRITE_TOUT   (5*CFG_HZ) /* Timeout for Flash Write */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1

-#define CFG_ENV_SIZE           0x10000 /* Total Size of Environment Sector */
+#define CONFIG_ENV_SIZE                0x10000 /* Total Size of Environment Sector */

 
 #endif /* __CONFIG_H */
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/smdk6400.h b/include/configs/smdk6400.h
index 4c5602bf8ade9cab2d32d88357c0a1d5244ec0eb..ea65c0ef1e1e3ac78b14a99dd884f80903b36641 100644 (file)
--- a/include/configs/smdk6400.h
+++ b/include/configs/smdk6400.h
@@ -68,7 +68,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 1024 * 1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 1024 * 1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes for initial data */
 
 /*


@@ -196,7 +196,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_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_SIZE           0x4000  /* Total Size of Environment Sector */
+#define CONFIG_ENV_SIZE                0x4000  /* Total Size of Environment Sector */

 
 /*
  * SMDK6400 board specific data
 
 /*
  * SMDK6400 board specific data


@@ -222,7 +222,7 @@
 /* NAND U-Boot load and start address */
 #define CFG_UBOOT_BASE         (CFG_MAPPED_RAM_BASE + 0x07e00000)
 
 /* NAND U-Boot load and start address */
 #define CFG_UBOOT_BASE         (CFG_MAPPED_RAM_BASE + 0x07e00000)
 

-#define CFG_ENV_OFFSET         0x0040000
+#define CONFIG_ENV_OFFSET              0x0040000

 
 /* NAND configuration */
 #define CFG_MAX_NAND_DEVICE    1
 
 /* NAND configuration */
 #define CFG_MAX_NAND_DEVICE    1

diff --git a/include/configs/smmaco4.h b/include/configs/smmaco4.h
index cf92fa77f3a44cec07b34d0ce5fb377b50445408..fd13dcd44555db046122f55e7632774e112c1842 100644 (file)
--- a/include/configs/smmaco4.h
+++ b/include/configs/smmaco4.h
@@ -204,9 +204,9 @@
 #undef CFG_FLASH_USE_BUFFER_WRITE      /* not supported yet for AMD */
 
 #if !defined(CFG_LOWBOOT)
 #undef CFG_FLASH_USE_BUFFER_WRITE      /* not supported yet for AMD */
 
 #if !defined(CFG_LOWBOOT)

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x00760000 + 0x00800000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x00760000 + 0x00800000)

 #else  /* CFG_LOWBOOT */
 #else  /* CFG_LOWBOOT */

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x00060000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x00060000)

 #endif /* CFG_LOWBOOT */
 #define CFG_MAX_FLASH_BANKS    1       /* max num of flash banks
                                           (= chip selects) */
 #endif /* CFG_LOWBOOT */
 #define CFG_MAX_FLASH_BANKS    1       /* max num of flash banks
                                           (= chip selects) */


@@ -227,10 +227,10 @@
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
  * Environment settings
  */
 #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)
-#define        CFG_ENV_SIZE_REDUND     (CFG_ENV_SIZE)
+#define CONFIG_ENV_SIZE                0x10000
+#define CONFIG_ENV_SECT_SIZE   0x20000
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
+#define        CONFIG_ENV_SIZE_REDUND  (CONFIG_ENV_SIZE)

 
 /*
  * Memory map
 
 /*
  * Memory map

diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 09e1c8cfc5f3ded2663fb9555aa5999ce4896999..867eb3513cdd144e27a42e7048aa869a043b31b4 100644 (file)
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -309,11 +309,11 @@
  * Environment
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
  * Environment
  */
 #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
-#define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* 128K(one sector) for env     */
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE                0x4000
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change        */
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change        */

diff --git a/include/configs/sorcery.h b/include/configs/sorcery.h
index fef722be8395d91f848673f2efcc1081b9fae423..4bc4afba5facbfe88c31f47ac0adff3ec8ffe330 100644 (file)
--- a/include/configs/sorcery.h
+++ b/include/configs/sorcery.h
@@ -198,11 +198,11 @@
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
  * Environment settings
  */
 #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
-#define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR + 0x20000)
-#define CFG_ENV_SIZE_REDUND    CFG_ENV_SIZE
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x8000000 - 0x40000)
+#define CONFIG_ENV_SIZE                0x4000                       /* 16K */
+#define CONFIG_ENV_SECT_SIZE   0x20000
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + 0x20000)
+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE

 
 #define CONFIG_ENV_OVERWRITE   1
 
 
 #define CONFIG_ENV_OVERWRITE   1
 

diff --git a/include/configs/spc1920.h b/include/configs/spc1920.h
index 73fa97f14a6575330668e613ab3e014ae2569c25..592cef19f02f0a66f04e9c9ea910bc198dadd5a6 100644 (file)
--- a/include/configs/spc1920.h
+++ b/include/configs/spc1920.h
@@ -186,8 +186,8 @@
 
 /* Environment is in flash */
 #define CONFIG_ENV_IS_IN_FLASH
 
 /* Environment 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)
+#define CONFIG_ENV_SECT_SIZE       0x40000         /* We use one complete sector   */
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + CFG_MONITOR_LEN)

 
 #define CONFIG_ENV_OVERWRITE
 
 
 #define CONFIG_ENV_OVERWRITE
 

diff --git a/include/configs/spieval.h b/include/configs/spieval.h
index 8df56e393a86e32eb15625a2452bd9ddfe2fc2eb..ab1c6f4e75eb54729c4a2e90a841c37d09d4448e 100644 (file)
--- a/include/configs/spieval.h
+++ b/include/configs/spieval.h
@@ -295,9 +295,9 @@
 #undef CFG_FLASH_USE_BUFFER_WRITE      /* not supported yet for AMD */
 
 #if !defined(CFG_LOWBOOT)
 #undef CFG_FLASH_USE_BUFFER_WRITE      /* not supported yet for AMD */
 
 #if !defined(CFG_LOWBOOT)

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x00760000 + 0x00800000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x00760000 + 0x00800000)

 #else  /* CFG_LOWBOOT */
 #else  /* CFG_LOWBOOT */

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x00060000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x00060000)

 #endif /* CFG_LOWBOOT */
 #define CFG_MAX_FLASH_BANKS    1       /* max num of flash banks
                                           (= chip selects) */
 #endif /* CFG_LOWBOOT */
 #define CFG_MAX_FLASH_BANKS    1       /* max num of flash banks
                                           (= chip selects) */


@@ -309,10 +309,10 @@
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
  * Environment settings
  */
 #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)
-#define        CFG_ENV_SIZE_REDUND     (CFG_ENV_SIZE)
+#define CONFIG_ENV_SIZE                0x10000
+#define CONFIG_ENV_SECT_SIZE   0x20000
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
+#define        CONFIG_ENV_SIZE_REDUND  (CONFIG_ENV_SIZE)

 
 /*
  * Memory map
 
 /*
  * Memory map

diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h
index 95230ac17c70a4296fcd6ac8304c05c541589204..e06256d78b7ddc0b26b2da8205e1b2420f8e32c4 100644 (file)
--- a/include/configs/stxgp3.h
+++ b/include/configs/stxgp3.h
@@ -289,14 +289,14 @@
  */
 #ifndef CFG_RAMBOOT
   #define CONFIG_ENV_IS_IN_FLASH       1
  */
 #ifndef CFG_RAMBOOT
   #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
+  #define CONFIG_ENV_ADDR              (CFG_MONITOR_BASE + 0x60000)
+  #define CONFIG_ENV_SECT_SIZE 0x4000  /* 16K (one top sector) for env */
+  #define CONFIG_ENV_SIZE              0x2000

 #else
   #define CFG_NO_FLASH         1       /* Flash is not usable now      */
   #define CONFIG_ENV_IS_NOWHERE        1       /* Store ENV in memory only     */
 #else
   #define CFG_NO_FLASH         1       /* Flash is not usable now      */
   #define CONFIG_ENV_IS_NOWHERE        1       /* Store ENV in memory only     */

-  #define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
-  #define CFG_ENV_SIZE         0x2000
+  #define CONFIG_ENV_ADDR              (CFG_MONITOR_BASE - 0x1000)
+  #define CONFIG_ENV_SIZE              0x2000

 #endif
 
 #define CONFIG_BOOTARGS "root=/dev/nfs rw ip=any console=ttyS1,38400"
 #endif
 
 #define CONFIG_BOOTARGS "root=/dev/nfs rw ip=any console=ttyS1,38400"

diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h
index 21bb2797fc81158ba403c0ecd8435dbc019e87d3..5926943d9ab705dfdedb1736da5bdea91615df8f 100644 (file)
--- a/include/configs/stxssa.h
+++ b/include/configs/stxssa.h
@@ -314,19 +314,19 @@
 /* Environment - default config is in flash, see below */
 #if 0  /* in EEPROM */
 # define CONFIG_ENV_IS_IN_EEPROM       1
 /* Environment - default config is in flash, see below */
 #if 0  /* in EEPROM */
 # define CONFIG_ENV_IS_IN_EEPROM       1

-# define CFG_ENV_OFFSET                0
-# define CFG_ENV_SIZE          2048
+# define CONFIG_ENV_OFFSET             0
+# define CONFIG_ENV_SIZE               2048

 #else  /* in flash */
 # define CONFIG_ENV_IS_IN_FLASH        1
 # ifdef CONFIG_STXSSA_4M
 #else  /* in flash */
 # define CONFIG_ENV_IS_IN_FLASH        1
 # ifdef CONFIG_STXSSA_4M

-#  define CFG_ENV_SECT_SIZE    0x20000
+#  define CONFIG_ENV_SECT_SIZE 0x20000

 # else /* default configuration - 64 MiB flash */
 # else /* default configuration - 64 MiB flash */

-#  define CFG_ENV_SECT_SIZE    0x40000
+#  define CONFIG_ENV_SECT_SIZE 0x40000

 # endif
 # endif

-# define CFG_ENV_ADDR          (CFG_MONITOR_BASE - CFG_ENV_SECT_SIZE)
-# define CFG_ENV_SIZE          0x4000
-# define CFG_ENV_ADDR_REDUND   (CFG_ENV_ADDR - CFG_ENV_SECT_SIZE)
-# define CFG_ENV_SIZE_REDUND   (CFG_ENV_SIZE)
+# define CONFIG_ENV_ADDR               (CFG_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
+# define CONFIG_ENV_SIZE               0x4000
+# define CONFIG_ENV_ADDR_REDUND        (CONFIG_ENV_ADDR - CONFIG_ENV_SECT_SIZE)
+# define CONFIG_ENV_SIZE_REDUND        (CONFIG_ENV_SIZE)

 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */

diff --git a/include/configs/stxxtc.h b/include/configs/stxxtc.h
index c8b54bf48593ce803e42336e637c88272eae35a7..7ba8b770a6c6896f17227ee6512cfd8edf8815e0 100644 (file)
--- a/include/configs/stxxtc.h
+++ b/include/configs/stxxtc.h
@@ -202,15 +202,15 @@
  * FLASH organization
  */
 #define        CONFIG_ENV_IS_IN_FLASH  1
  * FLASH organization
  */
 #define        CONFIG_ENV_IS_IN_FLASH  1

-#define CFG_ENV_SECT_SIZE      0x10000
+#define CONFIG_ENV_SECT_SIZE   0x10000

 
 

-#define        CFG_ENV_ADDR            (CFG_FLASH_BASE + 0x00000000)
-#define CFG_ENV_OFFSET         0
-#define        CFG_ENV_SIZE            0x4000
+#define        CONFIG_ENV_ADDR         (CFG_FLASH_BASE + 0x00000000)
+#define CONFIG_ENV_OFFSET              0
+#define        CONFIG_ENV_SIZE         0x4000

 
 

-#define CFG_ENV_ADDR_REDUND    (CFG_FLASH_BASE + 0x00010000)
-#define CFG_ENV_OFFSET_REDUND  0
-#define CFG_ENV_SIZE_REDUND    CFG_ENV_SIZE
+#define CONFIG_ENV_ADDR_REDUND (CFG_FLASH_BASE + 0x00010000)
+#define CONFIG_ENV_OFFSET_REDUND       0
+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE

 
 #define CFG_FLASH_CFI          1
 #define CONFIG_FLASH_CFI_DRIVER        1
 
 #define CFG_FLASH_CFI          1
 #define CONFIG_FLASH_CFI_DRIVER        1

diff --git a/include/configs/suzaku.h b/include/configs/suzaku.h
index 5299733e07919ff8df163c2dd44cf23129e88e93..cc9f6bd3959ed29e8d874e9481edddc03e4f71d6 100644 (file)
--- a/include/configs/suzaku.h
+++ b/include/configs/suzaku.h
@@ -91,8 +91,8 @@
  * NVRAM organization
  */
 #define CONFIG_ENV_IS_NOWHERE  1
  * NVRAM organization
  */
 #define CONFIG_ENV_IS_NOWHERE  1

-#define        CFG_ENV_SIZE            0x10000 /* Total Size of Environment Sector     */
-#define CFG_ENV_SECT_SIZE      0x10000 /* see README - env sector total size   */
+#define        CONFIG_ENV_SIZE         0x10000 /* Total Size of Environment Sector     */
+#define CONFIG_ENV_SECT_SIZE   0x10000 /* see README - env sector total size   */

 
 /*-----------------------------------------------------------------------
  * Definitions for initial stack pointer and data area (in DPRAM)
 
 /*-----------------------------------------------------------------------
  * Definitions for initial stack pointer and data area (in DPRAM)

diff --git a/include/configs/svm_sc8xx.h b/include/configs/svm_sc8xx.h
index b7831b4473ebd2319b0f011b4562a845260e929c..95078460d892a99d334f811a0fbd944dd64b34ad 100644 (file)
--- a/include/configs/svm_sc8xx.h
+++ b/include/configs/svm_sc8xx.h
@@ -230,19 +230,19 @@
 #define        CONFIG_ENV_IS_IN_FLASH  1
 
 #ifdef CONFIG_BOOT_8B
 #define        CONFIG_ENV_IS_IN_FLASH  1
 
 #ifdef CONFIG_BOOT_8B

-#define        CFG_ENV_OFFSET          0x10000 /*   Offset   of Environment Sector     */
-#define        CFG_ENV_SIZE            0x10000 /* Total Size of Environment Sector     */
+#define        CONFIG_ENV_OFFSET               0x10000 /*   Offset   of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x10000 /* Total Size of Environment Sector     */

 #elif defined (CONFIG_BOOT_16B)
 #elif defined (CONFIG_BOOT_16B)

-#define        CFG_ENV_OFFSET          0x10000 /*   Offset   of Environment Sector     */
-#define        CFG_ENV_SIZE            0x10000 /* Total Size of Environment Sector     */
+#define        CONFIG_ENV_OFFSET               0x10000 /*   Offset   of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x10000 /* Total Size of Environment Sector     */

 #elif defined (CONFIG_BOOT_32B)
 #elif defined (CONFIG_BOOT_32B)

-#define        CFG_ENV_OFFSET          0x8000  /*   Offset   of Environment Sector     */
-#define        CFG_ENV_SIZE            0x4000  /* Total Size of Environment Sector     */
+#define        CONFIG_ENV_OFFSET               0x8000  /*   Offset   of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */

 #endif
 
 /* Address and size of Redundant Environment Sector     */
 #endif
 
 /* Address and size of Redundant Environment Sector     */

-#define CFG_ENV_OFFSET_REDUND   (CFG_ENV_OFFSET+CFG_ENV_SIZE)
-#define CFG_ENV_SIZE_REDUND     (CFG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND   (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE)
+#define CONFIG_ENV_SIZE_REDUND     (CONFIG_ENV_SIZE)

 
 
 /*-----------------------------------------------------------------------
 
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/taihu.h b/include/configs/taihu.h
index ad0f5a944054c8029f77d621acf0a94b6ffdbb3d..bcb8732a65b212422abc7f8f14a59f7e1c05a6ad 100644 (file)
--- a/include/configs/taihu.h
+++ b/include/configs/taihu.h
@@ -206,13 +206,13 @@ unsigned char spi_read(void);
 #define CFG_FLASH_WORD_SIZE     unsigned short
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_FLASH_WORD_SIZE     unsigned short
 
 #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     */
+#define CONFIG_ENV_SECT_SIZE   0x10000 /* size of one complete sector  */
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE                0x4000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*-----------------------------------------------------------------------
 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*-----------------------------------------------------------------------


@@ -222,9 +222,9 @@ unsigned char spi_read(void);
 #define CFG_NVRAM_SIZE         0x1ff8          /* NVRAM size */
 
 #ifdef CONFIG_ENV_IS_IN_NVRAM
 #define CFG_NVRAM_SIZE         0x1ff8          /* NVRAM size */
 
 #ifdef CONFIG_ENV_IS_IN_NVRAM

-#define CFG_ENV_SIZE           0x0ff8          /* Size of Environment vars */
-#define CFG_ENV_ADDR           \
-       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)       /* Env*/
+#define CONFIG_ENV_SIZE                0x0ff8          /* Size of Environment vars */
+#define CONFIG_ENV_ADDR                \
+       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CONFIG_ENV_SIZE)    /* Env*/

 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/taishan.h b/include/configs/taishan.h
index 9bac0e28834038906c968595f43b07461cd8cd0e..08ec14c7fa8c7850498bd2f518adce61f464b73f 100644 (file)
--- a/include/configs/taishan.h
+++ b/include/configs/taishan.h
@@ -101,13 +101,13 @@
 #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_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_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     */
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* size of one complete sector  */
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE-CONFIG_ENV_SECT_SIZE)
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 /*-----------------------------------------------------------------------
  * E2PROM bootstrap configure value
 
 /*-----------------------------------------------------------------------
  * E2PROM bootstrap configure value

diff --git a/include/configs/tb0229.h b/include/configs/tb0229.h
index cf2af93d37891414b6e35475115425cc9c31a8c5..bfb32fbf7556123e358b749930b3a840826a81e8 100644 (file)
--- a/include/configs/tb0229.h
+++ b/include/configs/tb0229.h
@@ -156,8 +156,8 @@
 #define CONFIG_ENV_IS_IN_FLASH 1
 
 /* Address and size of Primary Environment Sector      */
 #define CONFIG_ENV_IS_IN_FLASH 1
 
 /* Address and size of Primary Environment Sector      */

-#define CFG_ENV_ADDR           0xBFC40000
-#define CFG_ENV_SIZE           0x20000
+#define CONFIG_ENV_ADDR                0xBFC40000
+#define CONFIG_ENV_SIZE                0x20000

 
 #define CFG_DIRECT_FLASH_TFTP
 
 
 #define CFG_DIRECT_FLASH_TFTP
 

diff --git a/include/configs/trab.h b/include/configs/trab.h
index 1c8d3cec19470f7ec3f714c9e60daf9b8e814f33..d6d463a27956c0acc50762632bb4241c85c6cf5a 100644 (file)
--- a/include/configs/trab.h
+++ b/include/configs/trab.h
@@ -94,7 +94,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -407,18 +407,18 @@
 
 /* Address and size of Primary Environment Sector      */
 #ifndef CONFIG_FLASH_8MB
 
 /* Address and size of Primary Environment Sector      */
 #ifndef CONFIG_FLASH_8MB

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x60000)
-#define CFG_ENV_SIZE           0x4000
-#define CFG_ENV_SECT_SIZE      0x20000
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x60000)
+#define CONFIG_ENV_SIZE                0x4000
+#define CONFIG_ENV_SECT_SIZE   0x20000

 #else
 #else

-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x4000)
-#define CFG_ENV_SIZE           0x4000
-#define CFG_ENV_SECT_SIZE      0x4000
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x4000)
+#define CONFIG_ENV_SIZE                0x4000
+#define CONFIG_ENV_SECT_SIZE   0x4000

 #endif
 
 /* Address and size of Redundant Environment Sector    */
 #endif
 
 /* Address and size of Redundant Environment Sector    */

-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_ADDR+CFG_ENV_SECT_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 

diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h
index dcfb73c859f9d4385896773f80eb6b7b43149620..b24979b06064dcaa082cea88bb82b8f08bf971f6 100644 (file)
--- a/include/configs/trizepsiv.h
+++ b/include/configs/trizepsiv.h
@@ -54,7 +54,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN     (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN     (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -310,12 +310,12 @@
 
 /* Flash environment locations */
 #define CONFIG_ENV_IS_IN_FLASH 1
 
 /* Flash environment locations */
 #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     */
+#define CONFIG_ENV_ADDR                (PHYS_FLASH_1 + CFG_MONITOR_LEN) /* Addr of Environment Sector  */
+#define CONFIG_ENV_SIZE                0x40000 /* Total Size of Environment            */
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 #endif /* __CONFIG_H */
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/uc100.h b/include/configs/uc100.h
index cdd7bdf75f8f2e737942e3b671caac36c0951786..22ebf0718f457f864b81ab9ed46e0a9f61bbc64d 100644 (file)
--- a/include/configs/uc100.h
+++ b/include/configs/uc100.h
@@ -242,13 +242,13 @@
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 
 #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     */
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE+CFG_MONITOR_LEN)
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* size of one complete sector          */
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/uc101.h b/include/configs/uc101.h
index ac5285a866ff843bc0ebe16d3b362dc834a3a6f0..c709033f49ef025cf008ebb906e7c65da8809884 100644 (file)
--- a/include/configs/uc101.h
+++ b/include/configs/uc101.h
@@ -162,7 +162,7 @@
 #define CFG_FLASH_SIZE         0x00800000 /* 8 MByte */
 #define CFG_MAX_FLASH_SECT     140     /* max num of sects on one chip */
 
 #define CFG_FLASH_SIZE         0x00800000 /* 8 MByte */
 #define CFG_MAX_FLASH_SECT     140     /* max num of sects on one chip */
 

-#define CFG_ENV_ADDR           (TEXT_BASE+0x40000) /* second sector */
+#define CONFIG_ENV_ADDR                (TEXT_BASE+0x40000) /* second sector */

 #define CFG_MAX_FLASH_BANKS    1       /* max num of flash banks
                                           (= chip selects) */
 #define CFG_FLASH_ERASE_TOUT   240000  /* Flash Erase Timeout (in ms)  */
 #define CFG_MAX_FLASH_BANKS    1       /* max num of flash banks
                                           (= chip selects) */
 #define CFG_FLASH_ERASE_TOUT   240000  /* Flash Erase Timeout (in ms)  */


@@ -177,10 +177,10 @@
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
  * Environment settings
  */
 #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)
-#define CFG_ENV_SIZE_REDUND     (CFG_ENV_SIZE)
+#define CONFIG_ENV_SIZE                0x4000
+#define CONFIG_ENV_SECT_SIZE   0x10000
+#define CONFIG_ENV_OFFSET_REDUND   (CONFIG_ENV_OFFSET+CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND     (CONFIG_ENV_SIZE)

 
 /*
  * Memory map
 
 /*
  * Memory map

diff --git a/include/configs/utx8245.h b/include/configs/utx8245.h
index 2844c6354a601e896d321b5b2a77897f25dda495..4355e1c8124ea02a759748e7d5cc14ebe2692061 100644 (file)
--- a/include/configs/utx8245.h
+++ b/include/configs/utx8245.h
@@ -396,16 +396,16 @@ protect on ${u-boot_startaddr} ${u-boot_endaddr}"
 
 #if 1  /* AMD AM29LV033C */
 #define CFG_MAX_FLASH_SECT     64              /* Max number of sectors in one bank */
 
 #if 1  /* AMD AM29LV033C */
 #define CFG_MAX_FLASH_SECT     64              /* Max number of sectors in one bank */

-#define CFG_ENV_ADDR           0xFFBF0000      /* flash sector SA63 */
-#define CFG_ENV_SECT_SIZE      (64*1024)       /* Size of the Environment Sector */
+#define CONFIG_ENV_ADDR                0xFFBF0000      /* flash sector SA63 */
+#define CONFIG_ENV_SECT_SIZE   (64*1024)       /* Size of the Environment Sector */

 #else  /* AMD AM29LV116D */
 #define CFG_MAX_FLASH_SECT     35      /* Max number of sectors in one bank */
 #else  /* AMD AM29LV116D */
 #define CFG_MAX_FLASH_SECT     35      /* Max number of sectors in one bank */

-#define CFG_ENV_ADDR           0xFF9FA000      /* flash sector SA33 */
-#define CFG_ENV_SECT_SIZE      (8*1024)        /* Size of the Environment Sector */
+#define CONFIG_ENV_ADDR                0xFF9FA000      /* flash sector SA33 */
+#define CONFIG_ENV_SECT_SIZE   (8*1024)        /* Size of the Environment Sector */

 #endif /* #if */
 
 #endif /* #if */
 

-#define CFG_ENV_SIZE           CFG_ENV_SECT_SIZE               /* Size of the Environment */
-#define CFG_ENV_OFFSET         0                       /* starting right at the beginning */
+#define CONFIG_ENV_SIZE                CONFIG_ENV_SECT_SIZE            /* Size of the Environment */
+#define CONFIG_ENV_OFFSET              0                       /* starting right at the beginning */

 
 #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_FLASH_ERASE_TOUT   120000  /* Timeout for Flash Erase (in ms)      */
 #define CFG_FLASH_WRITE_TOUT   500             /* Timeout for Flash Write (in ms)      */

diff --git a/include/configs/v37.h b/include/configs/v37.h
index 7e5f804228a896b6bf8e001378dc92479a064d11..7504fa39b29b407ceda0ff2b0e81b81200420298 100644 (file)
--- a/include/configs/v37.h
+++ b/include/configs/v37.h
@@ -196,10 +196,10 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_NVRAM  1
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_NVRAM  1

-#define        CFG_ENV_ADDR            0x80000000/* Address of Environment */
-#define        CFG_ENV_SIZE            0x4000  /* Total Size of Environment Sector     */
+#define        CONFIG_ENV_ADDR         0x80000000/* Address of Environment */
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */

 
 

-#define CFG_ENV_OFFSET         0
+#define CONFIG_ENV_OFFSET              0

 
 /*-----------------------------------------------------------------------
  * Cache Configuration
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/v38b.h b/include/configs/v38b.h
index e0bd8c79764bc514daf68215f7cd6519b7e296f9..0f8d5a91574036a689c18f296533732d646be637 100644 (file)
--- a/include/configs/v38b.h
+++ b/include/configs/v38b.h
@@ -214,9 +214,9 @@
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
  * Environment settings
  */
 #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
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x00040000)
+#define CONFIG_ENV_SIZE                0x10000
+#define CONFIG_ENV_SECT_SIZE   0x10000

 #define CONFIG_ENV_OVERWRITE   1
 
 /*
 #define CONFIG_ENV_OVERWRITE   1
 
 /*

diff --git a/include/configs/v5fx30teval.h b/include/configs/v5fx30teval.h
index 5132293def6677c28f9562d3905e4535b433339a..1636d420d917957d673faff84a71df16ba16733d 100644 (file)
--- a/include/configs/v5fx30teval.h
+++ b/include/configs/v5fx30teval.h
@@ -28,10 +28,10 @@
 
 /*Env*/
 #define        CONFIG_ENV_IS_IN_FLASH  1
 
 /*Env*/
 #define        CONFIG_ENV_IS_IN_FLASH  1

-#define        CFG_ENV_SIZE            0x20000
-#define        CFG_ENV_SECT_SIZE       0x20000
-#define CFG_ENV_OFFSET         0x1A0000
-#define CFG_ENV_ADDR           (XPAR_FLASH_MEM0_BASEADDR+CFG_ENV_OFFSET)
+#define        CONFIG_ENV_SIZE         0x20000
+#define        CONFIG_ENV_SECT_SIZE    0x20000
+#define CONFIG_ENV_OFFSET              0x1A0000
+#define CONFIG_ENV_ADDR                (XPAR_FLASH_MEM0_BASEADDR+CONFIG_ENV_OFFSET)

 
 /*Misc*/
 #define CFG_PROMPT             "v5fx30t:/# "   /* Monitor Command Prompt    */
 
 /*Misc*/
 #define CFG_PROMPT             "v5fx30t:/# "   /* Monitor Command Prompt    */

diff --git a/include/configs/versatile.h b/include/configs/versatile.h
index 4a54b9028d6d7c1aafa43f63e86ef2ec4dbc6247..6034cb7c695768488db7bcc3d1672fe48b5d0601 100644 (file)
--- a/include/configs/versatile.h
+++ b/include/configs/versatile.h
@@ -71,7 +71,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -186,9 +186,9 @@
 #define PHYS_FLASH_1           (CFG_FLASH_BASE)
 
 #define CONFIG_ENV_IS_IN_FLASH     1               /* env in flash instead of CONFIG_ENV_IS_NOWHERE */
 #define PHYS_FLASH_1           (CFG_FLASH_BASE)
 
 #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  */
-#define CFG_ENV_ADDR            (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+#define CONFIG_ENV_SECT_SIZE       0x00020000      /* 256 KB sectors (x2) */
+#define CONFIG_ENV_SIZE            0x10000         /* Total Size of Environment Sector */
+#define CONFIG_ENV_OFFSET          0x01f00000      /* environment starts here  */
+#define CONFIG_ENV_ADDR            (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 
 #endif                                                 /* __CONFIG_H */
 
 #endif                                                 /* __CONFIG_H */

diff --git a/include/configs/virtlab2.h b/include/configs/virtlab2.h
index 6250926281bfbf7532310a7a71191037757df8db..10dbed96ff260bfae06d3215816f698f9069cafe 100644 (file)
--- a/include/configs/virtlab2.h
+++ b/include/configs/virtlab2.h
@@ -210,12 +210,12 @@
 #define CFG_MAX_FLASH_SECT     71      /* max number of sectors on one chip */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_MAX_FLASH_SECT     71      /* max number of sectors on one chip */
 
 #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     */
+#define        CONFIG_ENV_OFFSET               0x8000  /*   Offset   of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* Address and size of Redundant Environment Sector    */

-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET+CFG_ENV_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 

diff --git a/include/configs/voiceblue.h b/include/configs/voiceblue.h
index fee3ab996f881cc7b6485883415e5a341c4976b7..312f720c64f134aaa504bc8063de8f3ddfcb46bb 100644 (file)
--- a/include/configs/voiceblue.h
+++ b/include/configs/voiceblue.h
@@ -75,11 +75,11 @@
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_FLASH
  * Environment settings
  */
 #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)
-#define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE)
-#define CFG_ENV_SIZE_REDUND    CFG_ENV_SIZE
+#define CONFIG_ENV_ADDR                (PHYS_FLASH_1 + CFG_MONITOR_LEN)
+#define CONFIG_ENV_SIZE                (8 * 1024)
+#define CONFIG_ENV_SECT_SIZE   (64 * 1024)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE

 
 #define CONFIG_ENV_OVERWRITE
 
 
 #define CONFIG_ENV_OVERWRITE
 

diff --git a/include/configs/walnut.h b/include/configs/walnut.h
index fc267d114fc9c533212bb80effcee1c9c9f6df3b..9676cd633eaaf5fd2eee7ffa46bd538783b6ccc6 100644 (file)
--- a/include/configs/walnut.h
+++ b/include/configs/walnut.h
@@ -161,13 +161,13 @@
 #define CFG_FLASH_WORD_SIZE    unsigned char
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_FLASH_WORD_SIZE    unsigned char
 
 #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     */
+#define CONFIG_ENV_SECT_SIZE   0x10000         /* size of one complete sector  */
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE                0x4000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*-----------------------------------------------------------------------
 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*-----------------------------------------------------------------------


@@ -177,9 +177,9 @@
 #define CFG_NVRAM_SIZE         0x1ff8          /* NVRAM size   */
 
 #ifdef CONFIG_ENV_IS_IN_NVRAM
 #define CFG_NVRAM_SIZE         0x1ff8          /* NVRAM size   */
 
 #ifdef CONFIG_ENV_IS_IN_NVRAM

-#define CFG_ENV_SIZE           0x1000          /* Size of Environment vars     */
-#define CFG_ENV_ADDR           \
-       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)       /* Env  */
+#define CONFIG_ENV_SIZE                0x1000          /* Size of Environment vars     */
+#define CONFIG_ENV_ADDR                \
+       (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CONFIG_ENV_SIZE)    /* Env  */

 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/wepep250.h b/include/configs/wepep250.h
index 9baf730798ff73e2f3fa9fada30e199cd2bf4f97..2072f6ecfef7a28a4af6a0c3dc74489b7c77724f 100644 (file)
--- a/include/configs/wepep250.h
+++ b/include/configs/wepep250.h
@@ -98,7 +98,7 @@
 /*
  * Malloc pool need to host env + 128 Kb reserve for other allocations.
  */
 /*
  * Malloc pool need to host env + 128 Kb reserve for other allocations.
  */

-#define CFG_MALLOC_LEN   (CFG_ENV_SIZE + (128<<10) )
+#define CFG_MALLOC_LEN   (CONFIG_ENV_SIZE + (128<<10) )

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 #define CONFIG_STACKSIZE        (120<<10)      /* stack size */
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 #define CONFIG_STACKSIZE        (120<<10)      /* stack size */


@@ -179,8 +179,8 @@
 #define CFG_MONITOR_BASE       PHYS_FLASH_1
 #define CFG_MONITOR_LEN                0x20000         /* 128kb ( 1 flash sector )  */
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_MONITOR_BASE       PHYS_FLASH_1
 #define CFG_MONITOR_LEN                0x20000         /* 128kb ( 1 flash sector )  */
 #define CONFIG_ENV_IS_IN_FLASH 1

-#define CFG_ENV_ADDR           0x20000         /* absolute address for now  */
-#define CFG_ENV_SIZE           0x2000
+#define CONFIG_ENV_ADDR                0x20000         /* absolute address for now  */
+#define CONFIG_ENV_SIZE                0x2000

 
 #undef  CONFIG_ENV_OVERWRITE                    /* env is not writable now   */
 
 
 #undef  CONFIG_ENV_OVERWRITE                    /* env is not writable now   */
 

diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h
index 3c32d9f9a30f9790846b2dffcfcdb707f35f1328..ec73224fb1116778f9df8b4a3b65bce235d2787c 100644 (file)
--- a/include/configs/xaeniax.h
+++ b/include/configs/xaeniax.h
@@ -109,7 +109,7 @@
  * Size of malloc() pool; this lives below the uppermost 128 KiB which are
  * used for the RAM copy of the uboot code
  */
  * Size of malloc() pool; this lives below the uppermost 128 KiB which are
  * used for the RAM copy of the uboot code
  */

-#define CFG_MALLOC_LEN     (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN     (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -177,8 +177,8 @@
 
 /* FIXME */
 #define CONFIG_ENV_IS_IN_FLASH 1
 
 /* FIXME */
 #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     */
+#define CONFIG_ENV_ADDR                (PHYS_FLASH_1 + 0x40000)/* Addr of Environment Sector   */
+#define CONFIG_ENV_SIZE                0x40000                 /* Total Size of Environment Sector     */

 
 /*
  * Stack sizes
 
 /*
  * Stack sizes

diff --git a/include/configs/xilinx-ppc440-generic.h b/include/configs/xilinx-ppc440-generic.h
index fdefc4e833d6e5d4a0302ac6c81cbbde4407ae0e..e968651c4c245bcd1048507ff429a99d9d00fce4 100644 (file)
--- a/include/configs/xilinx-ppc440-generic.h
+++ b/include/configs/xilinx-ppc440-generic.h
@@ -28,10 +28,10 @@
 
 /*Env*/
 #define        CONFIG_ENV_IS_IN_FLASH  1
 
 /*Env*/
 #define        CONFIG_ENV_IS_IN_FLASH  1

-#define        CFG_ENV_SIZE            0x20000
-#define        CFG_ENV_SECT_SIZE       0x20000
-#define CFG_ENV_OFFSET         0x340000
-#define CFG_ENV_ADDR           (XPAR_FLASH_MEM0_BASEADDR+CFG_ENV_OFFSET)
+#define        CONFIG_ENV_SIZE         0x20000
+#define        CONFIG_ENV_SECT_SIZE    0x20000
+#define CONFIG_ENV_OFFSET              0x340000
+#define CONFIG_ENV_ADDR                (XPAR_FLASH_MEM0_BASEADDR+CONFIG_ENV_OFFSET)

 
 /*Misc*/
 #define CFG_PROMPT             "board:/# "     /* Monitor Command Prompt    */
 
 /*Misc*/
 #define CFG_PROMPT             "board:/# "     /* Monitor Command Prompt    */

diff --git a/include/configs/xilinx-ppc440.h b/include/configs/xilinx-ppc440.h
index 40293cd84291d98433e9822dd85437738c33200d..6c7abb208992f72daca5fe618d6b6e7606ac79ec 100644 (file)
--- a/include/configs/xilinx-ppc440.h
+++ b/include/configs/xilinx-ppc440.h
@@ -30,7 +30,7 @@
 #define CFG_SDRAM_BASE         0x0
 #define CFG_MONITOR_BASE       TEXT_BASE
 #define CFG_MONITOR_LEN                (192 * 1024)
 #define CFG_SDRAM_BASE         0x0
 #define CFG_MONITOR_BASE       TEXT_BASE
 #define CFG_MONITOR_LEN                (192 * 1024)

-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128 * 1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128 * 1024)

 
 /*Uart*/
 #define CONFIG_XILINX_UARTLITE
 
 /*Uart*/
 #define CONFIG_XILINX_UARTLITE

diff --git a/include/configs/xm250.h b/include/configs/xm250.h
index d01898f2df1c88b72e1bfd01edde6891de9e0d80..aac03a17aa14213d1cd529d84e3289806dc61c85 100644 (file)
--- a/include/configs/xm250.h
+++ b/include/configs/xm250.h
@@ -185,9 +185,9 @@
 #define CFG_FLASH_PROTECTION                   /* "Real" (hardware) sectors protection */
 
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_FLASH_PROTECTION                   /* "Real" (hardware) sectors protection */
 
 #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       */
+#define CONFIG_ENV_ADDR                (PHYS_FLASH_1 + 0x40000)        /* Addr of Environment Sector   */
+#define CONFIG_ENV_SIZE                0x4000
+#define CONFIG_ENV_SECT_SIZE   0x40000                         /* Size of the Environment Sector       */

 #define CFG_MONITOR_LEN                0x20000                         /* 128 KiB */
 
 /******************************************************************************
 #define CFG_MONITOR_LEN                0x20000                         /* 128 KiB */
 
 /******************************************************************************

diff --git a/include/configs/xsengine.h b/include/configs/xsengine.h
index 709423dbe0ad3630547a26546a110cd0aaf120ed..443392f6d9d21a287139fe7381a4f3c43bc86f8f 100644 (file)
--- a/include/configs/xsengine.h
+++ b/include/configs/xsengine.h
@@ -81,16 +81,16 @@
 /* Environment settings */
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_ENV_IS_IN_FLASH             1
 /* Environment settings */
 #define CONFIG_ENV_OVERWRITE
 #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 */
+#define CONFIG_ENV_ADDR                    (PHYS_FLASH_1 + 0x40000)    /* Addr of Environment Sector (after monitor)*/
+#define CONFIG_ENV_SECT_SIZE               PHYS_FLASH_SECT_SIZE                /* Size of the Environment Sector */
+#define CONFIG_ENV_SIZE                    0x4000                              /* 16kB Total Size of Environment Sector */

 
 /* timeout values are in ticks */
 #define CFG_FLASH_ERASE_TOUT           (75*CFG_HZ)     /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT           (50*CFG_HZ)     /* Timeout for Flash Write */
 
 /* Size of malloc() pool */
 
 /* timeout values are in ticks */
 #define CFG_FLASH_ERASE_TOUT           (75*CFG_HZ)     /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT           (50*CFG_HZ)     /* Timeout for Flash Write */
 
 /* Size of malloc() pool */

-#define CFG_MALLOC_LEN                 (CFG_ENV_SIZE + 256*1024)
+#define CFG_MALLOC_LEN                 (CONFIG_ENV_SIZE + 256*1024)

 #define CFG_GBL_DATA_SIZE              128             /* size in bytes reserved for initial data */
 
 /* Hardware drivers */
 #define CFG_GBL_DATA_SIZE              128             /* size in bytes reserved for initial data */
 
 /* Hardware drivers */

diff --git a/include/configs/xupv2p.h b/include/configs/xupv2p.h
index 7bd142469db76459659095e63235bb11bd66b139..0e337146576a0f4b1e1ea9f8c3be55c043e54344 100644 (file)
--- a/include/configs/xupv2p.h
+++ b/include/configs/xupv2p.h
@@ -151,8 +151,8 @@
 
 #define        CFG_NO_FLASH            1
 #define        CONFIG_ENV_IS_NOWHERE   1
 
 #define        CFG_NO_FLASH            1
 #define        CONFIG_ENV_IS_NOWHERE   1

-#define        CFG_ENV_SIZE            0x1000
-#define        CFG_ENV_ADDR            (CFG_MONITOR_BASE - CFG_ENV_SIZE)
+#define        CONFIG_ENV_SIZE         0x1000
+#define        CONFIG_ENV_ADDR         (CFG_MONITOR_BASE - CONFIG_ENV_SIZE)

 
 /*
  * BOOTP options
 
 /*
  * BOOTP options

diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h
index 528776a2432262a16a2461f077c0eaa520f4d7bc..afdce823799224cc12181afae1de06adf7539231 100644 (file)
--- a/include/configs/yosemite.h
+++ b/include/configs/yosemite.h
@@ -119,13 +119,13 @@
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 
 #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     */
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* size of one complete sector          */
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE-CONFIG_ENV_SECT_SIZE)
+#define        CONFIG_ENV_SIZE         0x2000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*-----------------------------------------------------------------------
 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 /*-----------------------------------------------------------------------


@@ -148,8 +148,8 @@
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
 
 #ifdef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
 
 #ifdef CONFIG_ENV_IS_IN_EEPROM

-#define CFG_ENV_SIZE           0x200       /* Size of Environment vars */
-#define CFG_ENV_OFFSET         0x0
+#define CONFIG_ENV_SIZE                0x200       /* Size of Environment vars */
+#define CONFIG_ENV_OFFSET              0x0

 #endif /* CONFIG_ENV_IS_IN_EEPROM */
 
 /* I2C SYSMON (LM75, AD7414 is almost compatible)                      */
 #endif /* CONFIG_ENV_IS_IN_EEPROM */
 
 /* I2C SYSMON (LM75, AD7414 is almost compatible)                      */

diff --git a/include/configs/yucca.h b/include/configs/yucca.h
index d85da94bd987433aa339981408a1f6f2a66a05ed..92d45d0344e2a09791841a9a95636b489ed1b9fb 100644 (file)
--- a/include/configs/yucca.h
+++ b/include/configs/yucca.h
@@ -189,10 +189,10 @@
 #define CFG_FLASH_2ND_ADDR     0xe7c00000 /* evb440SPe has 8 and 16bit device*/
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_FLASH_2ND_ADDR     0xe7c00000 /* evb440SPe has 8 and 16bit device*/
 
 #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     */
+#define CONFIG_ENV_SECT_SIZE   0x10000 /* size of one complete sector  */
+#define CONFIG_ENV_ADDR                0xfffa0000
+/* #define CONFIG_ENV_ADDR             (CFG_MONITOR_BASE-CONFIG_ENV_SECT_SIZE) */
+#define CONFIG_ENV_SIZE                0x10000 /* Size of Environment vars     */

 #endif /* CONFIG_ENV_IS_IN_FLASH */
 /*-----------------------------------------------------------------------
  * PCI stuff
 #endif /* CONFIG_ENV_IS_IN_FLASH */
 /*-----------------------------------------------------------------------
  * PCI stuff

diff --git a/include/configs/zeus.h b/include/configs/zeus.h
index fdb4e3711e560b143eb151ab4d0fdc6e6f2dc06e..ac4f813a9ffd9c34287d5e47b172cc0f00b7fc8f 100644 (file)
--- a/include/configs/zeus.h
+++ b/include/configs/zeus.h
@@ -227,13 +227,13 @@
 #define CFG_FLASH_QUIET_TEST   1       /* don't warn upon unknown flash        */
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_FLASH_QUIET_TEST   1       /* don't warn upon unknown 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     */
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* size of one complete sector          */
+#define CONFIG_ENV_ADDR                ((-CFG_MONITOR_LEN)-CONFIG_ENV_SECT_SIZE)
+#define        CONFIG_ENV_SIZE         0x2000  /* Total Size of Environment Sector     */

 
 /* Address and size of Redundant Environment Sector    */
 
 /* 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)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)

 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/zylonite.h b/include/configs/zylonite.h
index 47ce15d0e01c780517117d74b3bf4683bac3f8d2..148079c000cc5c9d0e2c4710f354891790902832 100644 (file)
--- a/include/configs/zylonite.h
+++ b/include/configs/zylonite.h
@@ -50,7 +50,7 @@
 /*
  * Size of malloc() pool
  */
 /*
  * Size of malloc() pool
  */

-#define CFG_MALLOC_LEN     (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN     (CONFIG_ENV_SIZE + 128*1024)

 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*


@@ -232,9 +232,9 @@
 #define CFG_NO_FLASH           1
 
 #define CONFIG_ENV_IS_IN_NAND  1
 #define CFG_NO_FLASH           1
 
 #define CONFIG_ENV_IS_IN_NAND  1

-#define CFG_ENV_OFFSET         0x40000
-#define CFG_ENV_OFFSET_REDUND  0x44000
-#define CFG_ENV_SIZE           0x4000
+#define CONFIG_ENV_OFFSET              0x40000
+#define CONFIG_ENV_OFFSET_REDUND       0x44000
+#define CONFIG_ENV_SIZE                0x4000

 
 
 #endif /* __CONFIG_H */
 
 
 #endif /* __CONFIG_H */

diff --git a/include/environment.h b/include/environment.h
index 6fcc8ec7d8e97757f5eddb59e89ba4dc27d07d00..1479eb641aae89511ac0d0b05f99cb5dc650518f 100644 (file)
--- a/include/environment.h
+++ b/include/environment.h
@@ -38,48 +38,48 @@
  */
 
 #if defined(CONFIG_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)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR      (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 # endif
 # endif

-# ifndef  CFG_ENV_OFFSET
-#  define CFG_ENV_OFFSET (CFG_ENV_ADDR - CFG_FLASH_BASE)
+# ifndef  CONFIG_ENV_OFFSET
+#  define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR - CFG_FLASH_BASE)

 # endif
 # endif

-# if !defined(CFG_ENV_ADDR_REDUND) && defined(CFG_ENV_OFFSET_REDUND)
-#  define CFG_ENV_ADDR_REDUND  (CFG_FLASH_BASE + CFG_ENV_OFFSET_REDUND)
+# if !defined(CONFIG_ENV_ADDR_REDUND) && defined(CONFIG_ENV_OFFSET_REDUND)
+#  define CONFIG_ENV_ADDR_REDUND       (CFG_FLASH_BASE + CONFIG_ENV_OFFSET_REDUND)

 # endif
 # endif

-# if defined(CFG_ENV_SECT_SIZE) || defined(CFG_ENV_SIZE)
-#  ifndef  CFG_ENV_SECT_SIZE
-#   define CFG_ENV_SECT_SIZE   CFG_ENV_SIZE
+# if defined(CONFIG_ENV_SECT_SIZE) || defined(CONFIG_ENV_SIZE)
+#  ifndef  CONFIG_ENV_SECT_SIZE
+#   define CONFIG_ENV_SECT_SIZE        CONFIG_ENV_SIZE

 #  endif
 #  endif

-#  ifndef  CFG_ENV_SIZE
-#   define CFG_ENV_SIZE        CFG_ENV_SECT_SIZE
+#  ifndef  CONFIG_ENV_SIZE
+#   define CONFIG_ENV_SIZE     CONFIG_ENV_SECT_SIZE

 #  endif
 # else
 #  endif
 # else

-#  error "Both CFG_ENV_SECT_SIZE and CFG_ENV_SIZE undefined"
+#  error "Both CONFIG_ENV_SECT_SIZE and CONFIG_ENV_SIZE undefined"

 # endif
 # endif

-# if defined(CFG_ENV_ADDR_REDUND) && !defined(CFG_ENV_SIZE_REDUND)
-#  define CFG_ENV_SIZE_REDUND  CFG_ENV_SIZE
+# if defined(CONFIG_ENV_ADDR_REDUND) && !defined(CONFIG_ENV_SIZE_REDUND)
+#  define CONFIG_ENV_SIZE_REDUND       CONFIG_ENV_SIZE

 # endif
 # endif

-# if (CFG_ENV_ADDR >= CFG_MONITOR_BASE) && \
-     (CFG_ENV_ADDR+CFG_ENV_SIZE) <= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+# if (CONFIG_ENV_ADDR >= CFG_MONITOR_BASE) && \
+     (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE) <= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)

 #  define ENV_IS_EMBEDDED      1
 # endif
 #  define ENV_IS_EMBEDDED      1
 # endif

-# if defined(CFG_ENV_ADDR_REDUND) || defined(CFG_ENV_OFFSET_REDUND)
+# if defined(CONFIG_ENV_ADDR_REDUND) || defined(CONFIG_ENV_OFFSET_REDUND)

 #  define CFG_REDUNDAND_ENVIRONMENT    1
 # endif
 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 #if defined(CONFIG_ENV_IS_IN_NAND)
 #  define CFG_REDUNDAND_ENVIRONMENT    1
 # endif
 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
 #if defined(CONFIG_ENV_IS_IN_NAND)

-# ifndef CFG_ENV_OFFSET
-#  error "Need to define CFG_ENV_OFFSET when using CONFIG_ENV_IS_IN_NAND"
+# ifndef CONFIG_ENV_OFFSET
+#  error "Need to define CONFIG_ENV_OFFSET when using CONFIG_ENV_IS_IN_NAND"

 # endif
 # endif

-# ifndef CFG_ENV_SIZE
-#  error "Need to define CFG_ENV_SIZE when using CONFIG_ENV_IS_IN_NAND"
+# ifndef CONFIG_ENV_SIZE
+#  error "Need to define CONFIG_ENV_SIZE when using CONFIG_ENV_IS_IN_NAND"

 # endif
 # endif

-# ifdef CFG_ENV_OFFSET_REDUND
+# ifdef CONFIG_ENV_OFFSET_REDUND

 #  define CFG_REDUNDAND_ENVIRONMENT
 # endif
 #  define CFG_REDUNDAND_ENVIRONMENT
 # endif

-# ifdef CFG_ENV_IS_EMBEDDED
+# ifdef CONFIG_ENV_IS_EMBEDDED

 #  define ENV_IS_EMBEDDED      1
 # endif
 #endif /* CONFIG_ENV_IS_IN_NAND */
 #  define ENV_IS_EMBEDDED      1
 # endif
 #endif /* CONFIG_ENV_IS_IN_NAND */


@@ -97,7 +97,7 @@
 #endif
 
 
 #endif
 
 

-#define ENV_SIZE (CFG_ENV_SIZE - ENV_HEADER_SIZE)
+#define ENV_SIZE (CONFIG_ENV_SIZE - ENV_HEADER_SIZE)

 
 typedef        struct environment_s {
        uint32_t        crc;            /* CRC32 over data bytes        */
 
 typedef        struct environment_s {
        uint32_t        crc;            /* CRC32 over data bytes        */

diff --git a/lib_m68k/board.c b/lib_m68k/board.c
index 428a241b73445290944f92c10be0c3f6a76de3a3..fa6ab6bd8e0012ff4d3276ceafa44afa57136333 100644 (file)
--- a/lib_m68k/board.c
+++ b/lib_m68k/board.c
@@ -75,10 +75,10 @@ extern flash_info_t flash_info[];
 
 #include <environment.h>
 
 
 #include <environment.h>
 

-#if ( ((CFG_ENV_ADDR+CFG_ENV_SIZE) < CFG_MONITOR_BASE) || \
-      (CFG_ENV_ADDR >= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)) ) || \
+#if ( ((CONFIG_ENV_ADDR+CONFIG_ENV_SIZE) < CFG_MONITOR_BASE) || \
+      (CONFIG_ENV_ADDR >= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)) ) || \

     defined(CONFIG_ENV_IS_IN_NVRAM)
     defined(CONFIG_ENV_IS_IN_NVRAM)

-#define        TOTAL_MALLOC_LEN        (CFG_MALLOC_LEN + CFG_ENV_SIZE)
+#define        TOTAL_MALLOC_LEN        (CFG_MALLOC_LEN + CONFIG_ENV_SIZE)

 #else
 #define        TOTAL_MALLOC_LEN        CFG_MALLOC_LEN
 #endif
 #else
 #define        TOTAL_MALLOC_LEN        CFG_MALLOC_LEN
 #endif

diff --git a/lib_mips/board.c b/lib_mips/board.c
index fb31e33f38f9c4c8acec7c762a9d44fbb4dc0701..8c1af769c82fddcbbeeda32e6ad2eb544fab457a 100644 (file)
--- a/lib_mips/board.c
+++ b/lib_mips/board.c
@@ -33,10 +33,10 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
 
 DECLARE_GLOBAL_DATA_PTR;
 

-#if ( ((CFG_ENV_ADDR+CFG_ENV_SIZE) < CFG_MONITOR_BASE) || \
-      (CFG_ENV_ADDR >= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)) ) || \
+#if ( ((CONFIG_ENV_ADDR+CONFIG_ENV_SIZE) < CFG_MONITOR_BASE) || \
+      (CONFIG_ENV_ADDR >= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)) ) || \

     defined(CONFIG_ENV_IS_IN_NVRAM)
     defined(CONFIG_ENV_IS_IN_NVRAM)

-#define        TOTAL_MALLOC_LEN        (CFG_MALLOC_LEN + CFG_ENV_SIZE)
+#define        TOTAL_MALLOC_LEN        (CFG_MALLOC_LEN + CONFIG_ENV_SIZE)

 #else
 #define        TOTAL_MALLOC_LEN        CFG_MALLOC_LEN
 #endif
 #else
 #define        TOTAL_MALLOC_LEN        CFG_MALLOC_LEN
 #endif

diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index cf6239f9c01ab1e840be002f8732b2dd97119dcb..c02ac62b37ecc33e2fe99456a7fb0dd46fbb8552 100644 (file)
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -106,12 +106,12 @@ extern int board_start_ide(void);
 
 DECLARE_GLOBAL_DATA_PTR;
 
 
 DECLARE_GLOBAL_DATA_PTR;
 

-#if defined(CFG_ENV_IS_EMBEDDED)
+#if defined(CONFIG_ENV_IS_EMBEDDED)

 #define TOTAL_MALLOC_LEN       CFG_MALLOC_LEN
 #define TOTAL_MALLOC_LEN       CFG_MALLOC_LEN

-#elif ( ((CFG_ENV_ADDR+CFG_ENV_SIZE) < CFG_MONITOR_BASE) || \
-       (CFG_ENV_ADDR >= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)) ) || \
+#elif ( ((CONFIG_ENV_ADDR+CONFIG_ENV_SIZE) < CFG_MONITOR_BASE) || \
+       (CONFIG_ENV_ADDR >= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)) ) || \

       defined(CONFIG_ENV_IS_IN_NVRAM)
       defined(CONFIG_ENV_IS_IN_NVRAM)

-#define        TOTAL_MALLOC_LEN        (CFG_MALLOC_LEN + CFG_ENV_SIZE)
+#define        TOTAL_MALLOC_LEN        (CFG_MALLOC_LEN + CONFIG_ENV_SIZE)

 #else
 #define        TOTAL_MALLOC_LEN        CFG_MALLOC_LEN
 #endif
 #else
 #define        TOTAL_MALLOC_LEN        CFG_MALLOC_LEN
 #endif

diff --git a/lib_sparc/board.c b/lib_sparc/board.c
index 3c57fcb16aba136f7a0167fbbdcb6aa926125770..9780bf26744fb45e4580628b256c879c5bd2b9e0 100644 (file)
--- a/lib_sparc/board.c
+++ b/lib_sparc/board.c
@@ -267,7 +267,7 @@ void board_init_f(ulong bootflag)
         */
 #ifdef DEBUG_MEM_LAYOUT
        printf("CFG_MONITOR_BASE:       0x%lx\n", CFG_MONITOR_BASE);
         */
 #ifdef DEBUG_MEM_LAYOUT
        printf("CFG_MONITOR_BASE:       0x%lx\n", CFG_MONITOR_BASE);

-       printf("CFG_ENV_ADDR:           0x%lx\n", CFG_ENV_ADDR);
+       printf("CONFIG_ENV_ADDR:           0x%lx\n", CONFIG_ENV_ADDR);

        printf("CFG_RELOC_MONITOR_BASE: 0x%lx (%d)\n", CFG_RELOC_MONITOR_BASE,
               CFG_MONITOR_LEN);
        printf("CFG_MALLOC_BASE:        0x%lx (%d)\n", CFG_MALLOC_BASE,
        printf("CFG_RELOC_MONITOR_BASE: 0x%lx (%d)\n", CFG_RELOC_MONITOR_BASE,
               CFG_MONITOR_LEN);
        printf("CFG_MALLOC_BASE:        0x%lx (%d)\n", CFG_MALLOC_BASE,

diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
index b6036c8ae2aedd9ddaf2fbae4e9eedacb588981c..46747d337c547e118ed859095db9cbc48cd4f7ea 100644 (file)
--- a/tools/env/fw_env.c
+++ b/tools/env/fw_env.c
@@ -80,7 +80,7 @@ static int dev_current;
 #define ENVSECTORS(i) envdevices[(i)].env_sectors
 #define DEVTYPE(i)    envdevices[(i)].mtd_type
 
 #define ENVSECTORS(i) envdevices[(i)].env_sectors
 #define DEVTYPE(i)    envdevices[(i)].mtd_type
 

-#define CFG_ENV_SIZE ENVSIZE(dev_current)
+#define CONFIG_ENV_SIZE ENVSIZE(dev_current)

 
 #define ENV_SIZE      getenvsize()
 
 
 #define ENV_SIZE      getenvsize()
 


@@ -212,7 +212,7 @@ static int get_config (char *);
 #endif
 static inline ulong getenvsize (void)
 {
 #endif
 static inline ulong getenvsize (void)
 {

-       ulong rc = CFG_ENV_SIZE - sizeof (long);
+       ulong rc = CONFIG_ENV_SIZE - sizeof (long);

 
        if (HaveRedundEnv)
                rc -= sizeof (char);
 
        if (HaveRedundEnv)
                rc -= sizeof (char);


@@ -401,7 +401,7 @@ int fw_setenv (int argc, char *argv[])
                ++env;
        /*
         * Overflow when:
                ++env;
        /*
         * Overflow when:

-        * "name" + "=" + "val" +"\0\0"  > CFG_ENV_SIZE - (env-environment)
+        * "name" + "=" + "val" +"\0\0"  > CONFIG_ENV_SIZE - (env-environment)

         */
        len = strlen (name) + 2;
        /* add '=' for first arg, ' ' for all others */
         */
        len = strlen (name) + 2;
        /* add '=' for first arg, ' ' for all others */


@@ -753,7 +753,7 @@ static int flash_write (int fd_current, int fd_target, int dev_target)
                DEVOFFSET (dev_target), DEVNAME (dev_target));
 #endif
        rc = flash_write_buf (dev_target, fd_target, environment.image,
                DEVOFFSET (dev_target), DEVNAME (dev_target));
 #endif
        rc = flash_write_buf (dev_target, fd_target, environment.image,

-                             CFG_ENV_SIZE, DEVOFFSET (dev_target),
+                             CONFIG_ENV_SIZE, DEVOFFSET (dev_target),

                              DEVTYPE(dev_target));
        if (rc < 0)
                return rc;
                              DEVTYPE(dev_target));
        if (rc < 0)
                return rc;


@@ -790,10 +790,10 @@ static int flash_read (int fd)
 
        DEVTYPE(dev_current) = mtdinfo.type;
 
 
        DEVTYPE(dev_current) = mtdinfo.type;
 

-       rc = flash_read_buf (dev_current, fd, environment.image, CFG_ENV_SIZE,
+       rc = flash_read_buf (dev_current, fd, environment.image, CONFIG_ENV_SIZE,

                             DEVOFFSET (dev_current), mtdinfo.type);
 
                             DEVOFFSET (dev_current), mtdinfo.type);
 

-       return (rc != CFG_ENV_SIZE) ? -1 : 0;
+       return (rc != CONFIG_ENV_SIZE) ? -1 : 0;

 }
 
 static int flash_io (int mode)
 }
 
 static int flash_io (int mode)


@@ -890,11 +890,11 @@ static int env_init (void)
        if (parse_config ())            /* should fill envdevices */
                return -1;
 
        if (parse_config ())            /* should fill envdevices */
                return -1;
 

-       addr0 = calloc (1, CFG_ENV_SIZE);
+       addr0 = calloc (1, CONFIG_ENV_SIZE);

        if (addr0 == NULL) {
                fprintf (stderr,
                        "Not enough memory for environment (%ld bytes)\n",
        if (addr0 == NULL) {
                fprintf (stderr,
                        "Not enough memory for environment (%ld bytes)\n",

-                       CFG_ENV_SIZE);
+                       CONFIG_ENV_SIZE);

                return -1;
        }
 
                return -1;
        }
 


@@ -929,11 +929,11 @@ static int env_init (void)
                flag0 = *environment.flags;
 
                dev_current = 1;
                flag0 = *environment.flags;
 
                dev_current = 1;

-               addr1 = calloc (1, CFG_ENV_SIZE);
+               addr1 = calloc (1, CONFIG_ENV_SIZE);

                if (addr1 == NULL) {
                        fprintf (stderr,
                                "Not enough memory for environment (%ld bytes)\n",
                if (addr1 == NULL) {
                        fprintf (stderr,
                                "Not enough memory for environment (%ld bytes)\n",

-                               CFG_ENV_SIZE);
+                               CONFIG_ENV_SIZE);

                        return -1;
                }
                redundant = addr1;
                        return -1;
                }
                redundant = addr1;

diff --git a/tools/envcrc.c b/tools/envcrc.c
index 2f40051278c47494e4dd3a49895a848e7d683c1e..ba28fa0d3daaae92be07f1d3c3be2166258869d8 100644 (file)
--- a/tools/envcrc.c
+++ b/tools/envcrc.c
@@ -34,26 +34,26 @@
 #undef __ASSEMBLY__
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 #undef __ASSEMBLY__
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)

-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR      (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)

 # endif
 # endif

-# ifndef  CFG_ENV_OFFSET
-#  define CFG_ENV_OFFSET (CFG_ENV_ADDR - CFG_FLASH_BASE)
+# ifndef  CONFIG_ENV_OFFSET
+#  define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR - CFG_FLASH_BASE)

 # endif
 # endif

-# if !defined(CFG_ENV_ADDR_REDUND) && defined(CFG_ENV_OFFSET_REDUND)
-#  define CFG_ENV_ADDR_REDUND  (CFG_FLASH_BASE + CFG_ENV_OFFSET_REDUND)
+# if !defined(CONFIG_ENV_ADDR_REDUND) && defined(CONFIG_ENV_OFFSET_REDUND)
+#  define CONFIG_ENV_ADDR_REDUND       (CFG_FLASH_BASE + CONFIG_ENV_OFFSET_REDUND)

 # endif
 # endif

-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE

 # endif
 # endif

-# if defined(CFG_ENV_ADDR_REDUND) && !defined(CFG_ENV_SIZE_REDUND)
-#  define CFG_ENV_SIZE_REDUND  CFG_ENV_SIZE
+# if defined(CONFIG_ENV_ADDR_REDUND) && !defined(CONFIG_ENV_SIZE_REDUND)
+#  define CONFIG_ENV_SIZE_REDUND       CONFIG_ENV_SIZE

 # endif
 # endif

-# if (CFG_ENV_ADDR >= CFG_MONITOR_BASE) && \
-     ((CFG_ENV_ADDR + CFG_ENV_SIZE) <= (CFG_MONITOR_BASE + CFG_MONITOR_LEN))
+# if (CONFIG_ENV_ADDR >= CFG_MONITOR_BASE) && \
+     ((CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) <= (CFG_MONITOR_BASE + CFG_MONITOR_LEN))

 #  define ENV_IS_EMBEDDED      1
 # endif
 #  define ENV_IS_EMBEDDED      1
 # endif

-# if defined(CFG_ENV_ADDR_REDUND) || defined(CFG_ENV_OFFSET_REDUND)
+# if defined(CONFIG_ENV_ADDR_REDUND) || defined(CONFIG_ENV_OFFSET_REDUND)

 #  define CFG_REDUNDAND_ENVIRONMENT    1
 # endif
 #endif /* CONFIG_ENV_IS_IN_FLASH */
 #  define CFG_REDUNDAND_ENVIRONMENT    1
 # endif
 #endif /* CONFIG_ENV_IS_IN_FLASH */


@@ -64,7 +64,7 @@
 # define ENV_HEADER_SIZE       (sizeof(uint32_t))
 #endif
 
 # define ENV_HEADER_SIZE       (sizeof(uint32_t))
 #endif
 

-#define ENV_SIZE (CFG_ENV_SIZE - ENV_HEADER_SIZE)
+#define ENV_SIZE (CONFIG_ENV_SIZE - ENV_HEADER_SIZE)

 
 
 extern uint32_t crc32 (uint32_t, const unsigned char *, unsigned int);
 
 
 extern uint32_t crc32 (uint32_t, const unsigned char *, unsigned int);

diff --git a/tools/updater/flash_hw.c b/tools/updater/flash_hw.c
index 50b4df02b894f8ab824a7962dc718079da4b69a9..638844e8737ac08d1e6e05b4fbb71ec7a79c3af8 100644 (file)
--- a/tools/updater/flash_hw.c
+++ b/tools/updater/flash_hw.c
@@ -126,8 +126,8 @@ unsigned long flash_init (void)
 #ifdef CONFIG_ENV_IS_IN_FLASH
                /* ENV protection ON by default */
                flash_protect(FLAG_PROTECT_SET,
 #ifdef CONFIG_ENV_IS_IN_FLASH
                /* ENV protection ON by default */
                flash_protect(FLAG_PROTECT_SET,

-                             CFG_ENV_ADDR,
-                             CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
+                             CONFIG_ENV_ADDR,
+                             CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,

                              &flash_info[0]);
 #endif
 
                              &flash_info[0]);
 #endif