rename CFG_ENV_IS_IN_NVRAM in CONFIG_ENV_IS_IN_NVRAM

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

diff --git a/Makefile b/Makefile
index e8bbd7808e33d30dee50005363aea6eb0f05f370..b2a485320177ab0502c8d335a504a7941b87bd48 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1063,7 +1063,7 @@ RPXlite_DW_config:        unconfig
                  $(XECHO) "... with LCD display ..."; \
                }
        @[ -z "$(findstring _NVRAM,$@)" ] || \
-               { echo "#define  CFG_ENV_IS_IN_NVRAM"   >>$(obj)include/config.h ; \
+               { echo "#define  CONFIG_ENV_IS_IN_NVRAM"        >>$(obj)include/config.h ; \
                  $(XECHO) "... with ENV in NVRAM ..."; \
                }
        @$(MKCONFIG) -a RPXlite_DW ppc mpc8xx RPXlite_dw

diff --git a/README b/README
index 648118675c6a2ac418bf3fb020d3f1d6480d59f6..0da641296b38840a08d68b1b2bfb00dd162f9f91 100644 (file)
--- a/README
+++ b/README
@@ -2174,7 +2174,7 @@ source code will make it necessary to adapt <board>/u-boot.lds*
 accordingly!
 
 
-- CFG_ENV_IS_IN_NVRAM:
+- CONFIG_ENV_IS_IN_NVRAM:
 
        Define this if you have some non-volatile memory device
        (NVRAM, battery buffered SRAM) which you want to use for the

diff --git a/board/LEOX/elpt860/README.LEOX b/board/LEOX/elpt860/README.LEOX
index 9052b097b427492454034e921d362d2c1966e4ea..25524af69c2f8015620a6ec879a69bcd60585de0 100644 (file)
--- a/board/LEOX/elpt860/README.LEOX
+++ b/board/LEOX/elpt860/README.LEOX
@@ -106,7 +106,7 @@ version - print monitor version
 ?       - alias for 'help'
 
 ##################################################
-# Environment Variables (CFG_ENV_IS_IN_NVRAM)
+# Environment Variables (CONFIG_ENV_IS_IN_NVRAM)
 ##############################
 
 LEOX_elpt860: printenv

diff --git a/board/RPXlite_dw/README b/board/RPXlite_dw/README
index 28bcb318e8bb650e3ba0807178e02df97b7c30b3..60580c948b7c4662f0e80ca392566731299be454 100644 (file)
--- a/board/RPXlite_dw/README
+++ b/board/RPXlite_dw/README
@@ -21,7 +21,7 @@ make distclean
 make RPXlite_DW_64_config
 make all
 
-2. CFG_ENV_IS_IN_FLASH/CFG_ENV_IS_IN_NVRAM
+2. CFG_ENV_IS_IN_FLASH/CONFIG_ENV_IS_IN_NVRAM
 
 The default environment parameter is stored in FLASH because it is a common choice for
 environment parameter.So I make NVRAM as backup parameter storeage.The reason why I

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index dc6d13af1ce62f1558d00e9bd5660a4fd5722294..08671f271b0fbb653c321351fb38abd59f4093b8 100644 (file)
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -52,7 +52,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if !defined(CFG_ENV_IS_IN_NVRAM)      && \
+#if !defined(CONFIG_ENV_IS_IN_NVRAM)   && \
     !defined(CONFIG_ENV_IS_IN_EEPROM)  && \
     !defined(CFG_ENV_IS_IN_FLASH)      && \
     !defined(CONFIG_ENV_IS_IN_DATAFLASH)       && \
@@ -540,7 +540,7 @@ int getenv_r (char *name, char *buf, unsigned len)
        return (-1);
 }
 
-#if ((defined(CFG_ENV_IS_IN_NVRAM) || defined(CONFIG_ENV_IS_IN_EEPROM) \
+#if ((defined(CONFIG_ENV_IS_IN_NVRAM) || defined(CONFIG_ENV_IS_IN_EEPROM) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND))) \
@@ -596,7 +596,7 @@ U_BOOT_CMD(
        "    - delete environment variable 'name'\n"
 );
 
-#if ((defined(CFG_ENV_IS_IN_NVRAM) || defined(CONFIG_ENV_IS_IN_EEPROM) \
+#if ((defined(CONFIG_ENV_IS_IN_NVRAM) || defined(CONFIG_ENV_IS_IN_EEPROM) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND))) \

diff --git a/common/env_nvram.c b/common/env_nvram.c
index fa77719123db8454b5d0a33567d204e1fa4ec40c..c877f00a6675caf9f62d266355676309d80de4b1 100644 (file)
--- a/common/env_nvram.c
+++ b/common/env_nvram.c
@@ -44,7 +44,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifdef CFG_ENV_IS_IN_NVRAM /* Environment is in NVRAM */
+#ifdef CONFIG_ENV_IS_IN_NVRAM /* Environment is in NVRAM */
 
 #include <command.h>
 #include <environment.h>
@@ -157,4 +157,4 @@ int env_init (void)
        return (0);
 }
 
-#endif /* CFG_ENV_IS_IN_NVRAM */
+#endif /* CONFIG_ENV_IS_IN_NVRAM */

diff --git a/cpu/mpc8xx/cpu_init.c b/cpu/mpc8xx/cpu_init.c
index fb3414aae254514aff01f185ba532306efda8618..5c43ecac50d1b34c71efbf71a3589946c8ae7fa1 100644 (file)
--- a/cpu/mpc8xx/cpu_init.c
+++ b/cpu/mpc8xx/cpu_init.c
@@ -245,7 +245,7 @@ void cpu_init_f (volatile immap_t * immr)
        rpxclassic_init ();
 #endif
 
-#if defined(CONFIG_RPXLITE) && defined(CFG_ENV_IS_IN_NVRAM)
+#if defined(CONFIG_RPXLITE) && defined(CONFIG_ENV_IS_IN_NVRAM)
        rpxlite_init ();
 #endif
 

diff --git a/include/configs/ADCIOP.h b/include/configs/ADCIOP.h
index 5d28168fbcbef42301ba7b6f09a09e85d8c87896..148c905925e46b95ac69d65a18ae69a9db2e9af1 100644 (file)
--- a/include/configs/ADCIOP.h
+++ b/include/configs/ADCIOP.h
@@ -160,7 +160,7 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_IN_NVRAM    1       /* use NVRAM for environment vars       */
+#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     */

diff --git a/include/configs/AP1000.h b/include/configs/AP1000.h
index baa97410392748ed7dc2bdd289f328ad6ee72440..f0e0282280a082710e23f11e676b7be3eb07915e 100644 (file)
--- a/include/configs/AP1000.h
+++ b/include/configs/AP1000.h
@@ -40,11 +40,11 @@
 #define CFG_ENV_IS_IN_FLASH    1
 #define CFG_FLASH_USE_BUFFER_WRITE
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#ifdef CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #else
 #ifdef CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #endif
 #endif
 
@@ -186,7 +186,7 @@
 #define CFG_NVRAM_BASE_ADDR    0xf0000000      /* NVRAM base address   */
 #define CFG_NVRAM_SIZE         0x1ff8          /* NVRAM size   */
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#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  */

diff --git a/include/configs/Alaska8220.h b/include/configs/Alaska8220.h
index 0c2e6aefd3497a3e59a045bceada3df4f9116f67..3d4cd36a49652904b1119e22fcd84877d60cc938 100644 (file)
--- a/include/configs/Alaska8220.h
+++ b/include/configs/Alaska8220.h
@@ -225,13 +225,13 @@
 #define CONFIG_ENV_OVERWRITE   1
 
 #if defined CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #undef CONFIG_ENV_IS_IN_EEPROM
-#elif defined CFG_ENV_IS_IN_NVRAM
+#elif defined CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #undef CONFIG_ENV_IS_IN_EEPROM
 #elif defined CONFIG_ENV_IS_IN_EEPROM
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #endif
 

diff --git a/include/configs/AmigaOneG3SE.h b/include/configs/AmigaOneG3SE.h
index 84efd2fe086535f67b0ddfc55ca11fb795c54017..17f5909330a08b0bc680c4ed28131b35f030df68 100644 (file)
--- a/include/configs/AmigaOneG3SE.h
+++ b/include/configs/AmigaOneG3SE.h
@@ -240,7 +240,7 @@
 /*
  * Environment is stored in NVRAM.
  */
-#define CFG_ENV_IS_IN_NVRAM    1
+#define CONFIG_ENV_IS_IN_NVRAM 1
 #define CFG_ENV_ADDR           0xFD0E0000 /* This should be 0xFD0E0000, but we skip bytes to
                                            * protect softex's settings for now.
                                            * Original 768 bytes where not enough.

diff --git a/include/configs/BAB7xx.h b/include/configs/BAB7xx.h
index 26a1a2d31224c1a9cbd369db92ce84480e062443..c19f1e9f05920dd4ba6903214a1cabd65eac385f 100644 (file)
--- a/include/configs/BAB7xx.h
+++ b/include/configs/BAB7xx.h
@@ -243,7 +243,7 @@
  * Environment settings
  */
 #define CONFIG_ENV_OVERWRITE
-#define CFG_ENV_IS_IN_NVRAM     1           /* use NVRAM for environment vars */
+#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) */
 /*

diff --git a/include/configs/BMW.h b/include/configs/BMW.h
index 11d19c6f7f5a8e9fb6201618d1870f9113e164fe..5ba3e6d570af7c1252b48174cc51fdd86bfb4446 100644 (file)
--- a/include/configs/BMW.h
+++ b/include/configs/BMW.h
@@ -289,7 +289,7 @@
  * Warining: environment is not EMBEDDED in the U-Boot code.
  * It's stored in flash separately.
  */
-#define CFG_ENV_IS_IN_NVRAM      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  */

diff --git a/include/configs/CPCI405.h b/include/configs/CPCI405.h
index bc514b0383375b15ce2f57d2dc5775f3e8e640fb..9a076ba14d662144d792496eabf030d107e26a40 100644 (file)
--- a/include/configs/CPCI405.h
+++ b/include/configs/CPCI405.h
@@ -236,7 +236,7 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_IN_NVRAM    1       /* use NVRAM for environment vars       */
+#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  */

diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h
index ef8abf6466c336c806fb8de663215863b45c9234..357c213173eb227aea53348c6658e6d557832898 100644 (file)
--- a/include/configs/CPCI4052.h
+++ b/include/configs/CPCI4052.h
@@ -251,7 +251,7 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_IN_NVRAM    1       /* use NVRAM for environment vars       */
+#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  */

diff --git a/include/configs/CPCI405DT.h b/include/configs/CPCI405DT.h
index 6c5a3fe921d294c84be2a8df532088364dee10b6..53228c1b46dfab8000b8ce752aad4e7dfd6127d6 100644 (file)
--- a/include/configs/CPCI405DT.h
+++ b/include/configs/CPCI405DT.h
@@ -254,7 +254,7 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_IN_NVRAM    1       /* use NVRAM for environment vars       */
+#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  */

diff --git a/include/configs/ELPPC.h b/include/configs/ELPPC.h
index c64537fbfa5242dca81dada66a9f07cbfb1df081..8c6840011560eaff381b336829e262aba13fd3a9 100644 (file)
--- a/include/configs/ELPPC.h
+++ b/include/configs/ELPPC.h
@@ -218,7 +218,7 @@
  * Environment settings
  */
 #define CONFIG_ENV_OVERWRITE
-#define CFG_ENV_IS_IN_NVRAM     1           /* use NVRAM for environment vars */
+#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

diff --git a/include/configs/ELPT860.h b/include/configs/ELPT860.h
index 828dd9fe681155581778367fc9b297487fd144b7..b9178069b8b98a0d8c39a5b8d1b9738f8e2d34ff 100644 (file)
--- a/include/configs/ELPT860.h
+++ b/include/configs/ELPT860.h
@@ -137,7 +137,7 @@
  */
 #define CONFIG_ENV_OVERWRITE   1  /* Allow Overwrite of serial# & ethaddr */
 
-#undef   CFG_ENV_IS_IN_NVRAM          /* Environment is in NVRAM       */
+#undef   CONFIG_ENV_IS_IN_NVRAM               /* Environment is in NVRAM       */
 #undef   CONFIG_ENV_IS_IN_EEPROM              /* Environment is in I2C EEPROM  */
 #define CFG_ENV_IS_IN_FLASH    1      /* Environment is in FLASH       */
 
@@ -225,7 +225,7 @@
 #define CFG_NVRAM_SIZE         ((128*1024)-8) /* clock regs resident in the */
                                               /*   8 top NVRAM locations    */
 
-#if defined(CFG_ENV_IS_IN_NVRAM)
+#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  */
 #endif

diff --git a/include/configs/ERIC.h b/include/configs/ERIC.h
index dfbbc95ddb4812c0f89f1eec58d168c6b3fd167d..c699855a554a2d2367bf7af7f850ad621b1062e5 100644 (file)
--- a/include/configs/ERIC.h
+++ b/include/configs/ERIC.h
@@ -45,7 +45,7 @@
 #define CFG_ENV_IS_IN_FLASH    1       /* use FLASH for environment vars       */
 #endif
 #if 0
-#define CFG_ENV_IS_IN_NVRAM    1       /* use NVRAM for environment vars       */
+#define CONFIG_ENV_IS_IN_NVRAM 1       /* use NVRAM for environment vars       */
 #endif
 #if 0
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use I2C RTC X1240 for environment vars */
@@ -63,15 +63,15 @@
 #define CFG_I2C_RTC_ADDR       0x6F    /*                                and one for RTC */
 
 #ifdef CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #undef CONFIG_ENV_IS_IN_EEPROM
 #else
-#ifdef CFG_ENV_IS_IN_NVRAM
+#ifdef CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #undef CONFIG_ENV_IS_IN_EEPROM
 #else
 #ifdef CONFIG_ENV_IS_IN_EEPROM
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #endif
 #endif
@@ -318,7 +318,7 @@
 #define CFG_NVRAM_BASE_ADDR    CFG_NVRAM_REG_BASE_ADDR /* NVRAM base address   */
 #define CFG_NVRAM_SIZE         0x7F8           /* NVRAM size 2kByte - 8 Byte for RTC */
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#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  */

diff --git a/include/configs/EXBITGEN.h b/include/configs/EXBITGEN.h
index cee0be4976c1d3fa4d370c437e3a7dae31ac0ce3..4193492ff9024d03b9b639159576041b692f51c2 100644 (file)
--- a/include/configs/EXBITGEN.h
+++ b/include/configs/EXBITGEN.h
@@ -49,7 +49,7 @@
 /* environment is in EEPROM */
 #define CONFIG_ENV_IS_IN_EEPROM    1
 #undef CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 
 #ifdef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_I2C_EEPROM_ADDR            0x56    /* 1010110 */

diff --git a/include/configs/IP860.h b/include/configs/IP860.h
index 67f8833259e70d944a835768007c04a6bff55a5d..63e7e5d452de6f4be84695c8b1b626b6f9638557 100644 (file)
--- a/include/configs/IP860.h
+++ b/include/configs/IP860.h
@@ -187,15 +187,15 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #undef CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_NVRAM
-#undef  CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
+#undef  CONFIG_ENV_IS_IN_NVRAM
 #undef DEBUG_I2C
 #define        CONFIG_ENV_IS_IN_EEPROM
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#ifdef CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_ADDR           0x20000000      /* use SRAM     */
 #define CFG_ENV_SIZE           (16<<10)        /* use 16 kB    */
-#endif /* CFG_ENV_IS_IN_NVRAM */
+#endif /* CONFIG_ENV_IS_IN_NVRAM */
 
 #ifdef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_ENV_OFFSET          512    /* Leave 512 bytes free for other data  */

diff --git a/include/configs/JSE.h b/include/configs/JSE.h
index b08301e138ee8c56d8ed6ba36e50a2f2d4df6f50..fccf880abd0d404089face60583965b59a24c3f3 100644 (file)
--- a/include/configs/JSE.h
+++ b/include/configs/JSE.h
@@ -77,7 +77,7 @@
 #define CONFIG_MISC_INIT_R 1
 
   /* JSE has EEPROM chips that are good for environment. */
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_IS_IN_EEPROM 1
 #undef CFG_ENV_IS_NOWHERE

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

diff --git a/include/configs/MBX.h b/include/configs/MBX.h
index d9f2addb56599a60169670f69acea3542986e63c..44e1861884e620ab54dc9e86dff35a383ea2ff08 100644 (file)
--- a/include/configs/MBX.h
+++ b/include/configs/MBX.h
@@ -193,7 +193,7 @@
  * board: EPPC-Bug from Motorola. To avoid collisions in NVRAM Usage, we
  * access the NVRAM at the offset 0x1000.
  */
-#define CFG_ENV_IS_IN_NVRAM    1       /* turn on NVRAM env feature */
+#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
 

diff --git a/include/configs/MBX860T.h b/include/configs/MBX860T.h
index 3b88507ded72b84317cb5fc098f7c0d8118d91ae..4a537e8104e13483487ca3e6ac0730a2a7d3a9f2 100644 (file)
--- a/include/configs/MBX860T.h
+++ b/include/configs/MBX860T.h
@@ -143,7 +143,7 @@
  * board: EPPC-Bug from Motorola. To avoid collisions in NVRAM Usage, we
  * access the NVRAM at the offset 0x1000.
  */
-#define CFG_ENV_IS_IN_NVRAM    1       /* turn on NVRAM env feature */
+#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
 

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

diff --git a/include/configs/ML2.h b/include/configs/ML2.h
index 66dae21924d1047ad79e73f17b62f83eeffb8cfc..3ce1807b52fdd6be714551b181550b6a07b8806c 100644 (file)
--- a/include/configs/ML2.h
+++ b/include/configs/ML2.h
@@ -33,11 +33,11 @@
 
 #define CFG_ENV_IS_IN_FLASH     1
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#ifdef CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #else
 #ifdef CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #endif
 #endif
 
@@ -196,7 +196,7 @@
 #define CFG_NVRAM_BASE_ADDR    0xf0000000      /* NVRAM base address   */
 #define CFG_NVRAM_SIZE         0x1ff8          /* NVRAM size   */
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#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  */

diff --git a/include/configs/MOUSSE.h b/include/configs/MOUSSE.h
index 021729b5827600f205b18b1a43fcf6c661e45fc5..4052e78628059951fb7ebc05f2c68a4e30b1d3b1 100644 (file)
--- a/include/configs/MOUSSE.h
+++ b/include/configs/MOUSSE.h
@@ -302,7 +302,7 @@
 #define CFG_ENV_OFFSET          0x8000  /* Offset of the Environment Sector    */
 #define CFG_ENV_SIZE            0x4000  /* Size of the Environment Sector    */
 #else
-#define CFG_ENV_IS_IN_NVRAM          1
+#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 */

diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h
index 59d0bdbeb2e419f6d9cd79c4dcf071cc6a4a6603..735cfaae5be33f6f0ff3da21442d401e2804842c 100644 (file)
--- a/include/configs/MPC8260ADS.h
+++ b/include/configs/MPC8260ADS.h
@@ -384,7 +384,7 @@
 #  define CFG_ENV_SECT_SIZE    0x40000
 #  define CFG_ENV_ADDR         (CFG_MONITOR_BASE + CFG_ENV_SECT_SIZE)
 #else
-#  define CFG_ENV_IS_IN_NVRAM  1
+#  define CONFIG_ENV_IS_IN_NVRAM       1
 #  define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
 #  define CFG_ENV_SIZE         0x200
 #endif /* CFG_RAMBOOT */

diff --git a/include/configs/MPC8266ADS.h b/include/configs/MPC8266ADS.h
index 3659002d5e8b82cef898487929c83cb424050ed1..4429e99571d5ea769951c308678201dc9b202e37 100644 (file)
--- a/include/configs/MPC8266ADS.h
+++ b/include/configs/MPC8266ADS.h
@@ -431,7 +431,7 @@
 #    define CFG_ENV_ADDR       (CFG_MONITOR_BASE + 0x40000)
 #    define CFG_ENV_SECT_SIZE  0x40000
 #else
-#  define CFG_ENV_IS_IN_NVRAM  1
+#  define CONFIG_ENV_IS_IN_NVRAM       1
 #  define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
 #  define CFG_ENV_SIZE         0x200
 #endif /* CFG_RAMBOOT */

diff --git a/include/configs/OCRTC.h b/include/configs/OCRTC.h
index c561e15ac838809cea3024e37f7655fa5c8539f5..f839eadd46cf61f788603e80357a706fbd9d9949 100644 (file)
--- a/include/configs/OCRTC.h
+++ b/include/configs/OCRTC.h
@@ -189,7 +189,7 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_IN_NVRAM    1       /* use NVRAM for environment vars       */
+#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     */

diff --git a/include/configs/ORSG.h b/include/configs/ORSG.h
index fd140884a40304b08f0b2f5efca65226ee7970c3..18f14bc8f16b94832565690567e71a15c97748aa 100644 (file)
--- a/include/configs/ORSG.h
+++ b/include/configs/ORSG.h
@@ -187,7 +187,7 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_IN_NVRAM    1       /* use NVRAM for environment vars       */
+#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     */

diff --git a/include/configs/PCI405.h b/include/configs/PCI405.h
index dea59b647d819ecbbc2d4de6b03a0352aa18ca51..6c6a4703d92a0cc3402569b0e9bc40233152fb17 100644 (file)
--- a/include/configs/PCI405.h
+++ b/include/configs/PCI405.h
@@ -218,7 +218,7 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_IN_NVRAM    1       /* use NVRAM for environment vars       */
+#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  */

diff --git a/include/configs/QS860T.h b/include/configs/QS860T.h
index c98090185547715b593f611b68a0e18720eb7e3f..9dfceef3c833edb6105d447f540fc65268daa53c 100644 (file)
--- a/include/configs/QS860T.h
+++ b/include/configs/QS860T.h
@@ -132,7 +132,7 @@ CONFIG_SPI
 /*
  * Environment variable storage is in NVRAM
  */
-#define CFG_ENV_IS_IN_NVRAM    1
+#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
 

diff --git a/include/configs/RPXClassic.h b/include/configs/RPXClassic.h
index 706e2aadc7a8b09ef09dd95ea7cd464225907bc5..37623910abee84261a7a0da636fe3ee1494a30ae 100644 (file)
--- a/include/configs/RPXClassic.h
+++ b/include/configs/RPXClassic.h
@@ -224,7 +224,7 @@
 #define CFG_ENV_SECT_SIZE       0x8000
 #define        CFG_ENV_SIZE            0x8000  /* Total Size of Environment Sector  */
 #else
-#define CFG_ENV_IS_IN_NVRAM     1
+#define CONFIG_ENV_IS_IN_NVRAM     1
 #define CFG_ENV_ADDR            0xfa000100
 #define CFG_ENV_SIZE            0x1000
 #endif

diff --git a/include/configs/RPXlite_DW.h b/include/configs/RPXlite_DW.h
index faae407da5d7c0515f0393b68283c43a74382cf5..d1358186a655ccd4be5cd5d4f2b660af2628d086 100644 (file)
--- a/include/configs/RPXlite_DW.h
+++ b/include/configs/RPXlite_DW.h
@@ -229,14 +229,14 @@
 #define CFG_FLASH_ERASE_TOUT   120000  /* Timeout for Flash Erase (in ms)      */
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#ifdef CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_ADDR           0xFA000100
 #define CFG_ENV_SIZE           0x1000
 #else
 #define CFG_ENV_IS_IN_FLASH
 #define CFG_ENV_OFFSET         0x30000 /* Offset of Environment Sector         */
 #define CFG_ENV_SIZE           0x8000  /* Total Size of Environment Sector     */
-#endif /* CFG_ENV_IS_IN_NVRAM */
+#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 dfadd2a11f06e8a4f1a21a4371f532f80d493e42..2a9c62709b765d7575988ede8efbd444c6062403 100644 (file)
--- a/include/configs/RPXsuper.h
+++ b/include/configs/RPXsuper.h
@@ -311,7 +311,7 @@
 #    define CFG_ENV_SECT_SIZE  0x10000 /* see README - env sect real size */
 #  endif /* CFG_ENV_IN_OWN_SECT */
 #else
-#  define CFG_ENV_IS_IN_NVRAM  1
+#  define CONFIG_ENV_IS_IN_NVRAM  1
 #  define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
 #  define CFG_ENV_SIZE         0x200
 #endif /* CFG_RAMBOOT */

diff --git a/include/configs/W7OLMC.h b/include/configs/W7OLMC.h
index bb6b6b9d26c1bce7bbe9bc4ec981f08cbefb729c..d4ec03e5e8cc9a97d820914fcc6c189759b5d754 100644 (file)
--- a/include/configs/W7OLMC.h
+++ b/include/configs/W7OLMC.h
@@ -249,7 +249,7 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_IN_NVRAM    1               /* use NVRAM for env vars       */
+#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     */

diff --git a/include/configs/W7OLMG.h b/include/configs/W7OLMG.h
index 3050cafa1de01015df7531031d30b6ee2ba4ad81..ac52e39fe019d484481d263e86ff8838684f4818 100644 (file)
--- a/include/configs/W7OLMG.h
+++ b/include/configs/W7OLMG.h
@@ -256,7 +256,7 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_IN_NVRAM    1               /* use NVRAM for env vars       */
+#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     */

diff --git a/include/configs/Yukon8220.h b/include/configs/Yukon8220.h
index 60f2343722735792bf99e4c30ffefdc8ba7b7d93..9ace43eff9256c98349fa4df445bbc0742248ace 100644 (file)
--- a/include/configs/Yukon8220.h
+++ b/include/configs/Yukon8220.h
@@ -225,13 +225,13 @@
 #define CONFIG_ENV_OVERWRITE   1
 
 #if defined CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #undef CONFIG_ENV_IS_IN_EEPROM
-#elif defined CFG_ENV_IS_IN_NVRAM
+#elif defined CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #undef CONFIG_ENV_IS_IN_EEPROM
 #elif defined CONFIG_ENV_IS_IN_EEPROM
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #endif
 

diff --git a/include/configs/ZPC1900.h b/include/configs/ZPC1900.h
index 388c74768117e3a07d369007c4f59c5e6f9dcdd8..4217900e604d840987d0ec43928d64cba9b69987 100644 (file)
--- a/include/configs/ZPC1900.h
+++ b/include/configs/ZPC1900.h
@@ -220,8 +220,8 @@
 #define CFG_MALLOC_LEN         (4096 << 10)    /* Reserve 4 MB for malloc()    */
 #define CFG_BOOTMAPSZ          (8 << 20)       /* Initial Memory map for Linux */
 
-#if !defined(CFG_ENV_IS_IN_FLASH) && !defined(CFG_ENV_IS_IN_NVRAM)
-#define CFG_ENV_IS_IN_NVRAM    1
+#if !defined(CFG_ENV_IS_IN_FLASH) && !defined(CONFIG_ENV_IS_IN_NVRAM)
+#define CONFIG_ENV_IS_IN_NVRAM 1
 #endif
 
 #ifdef CFG_ENV_IS_IN_FLASH

diff --git a/include/configs/bubinga.h b/include/configs/bubinga.h
index acce82f621159f896143dd8a2bf1444a640c983a..4b42f8b1a85ebefbce6674566776824ea4b842a3 100644 (file)
--- a/include/configs/bubinga.h
+++ b/include/configs/bubinga.h
@@ -83,7 +83,7 @@
 #if 1
 #define CFG_ENV_IS_IN_FLASH     1      /* use FLASH for environment vars       */
 #else
-#define CFG_ENV_IS_IN_NVRAM    1       /* use NVRAM for environment vars       */
+#define CONFIG_ENV_IS_IN_NVRAM 1       /* use NVRAM for environment vars       */
 #endif
 
 /*
@@ -210,7 +210,7 @@
 #define CFG_NVRAM_BASE_ADDR    0xf0000000      /* NVRAM base address   */
 #define CFG_NVRAM_SIZE         0x1ff8          /* NVRAM size   */
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#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  */

diff --git a/include/configs/csb272.h b/include/configs/csb272.h
index 701d3c8436fb01575518dcdb504030a715115c43..880bee8612ce2ffcb47d5d8006b580528b765e9c 100644 (file)
--- a/include/configs/csb272.h
+++ b/include/configs/csb272.h
@@ -231,7 +231,7 @@
  *
  */
 #define CFG_ENV_IS_IN_FLASH    1       /* environment is in FLASH      */
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #undef CONFIG_ENV_IS_IN_EEPROM
 
 /*

diff --git a/include/configs/csb472.h b/include/configs/csb472.h
index 4fef2f6613ad6075aafe2ecb3fc99c5d7aec1c9b..e343632935e14bfe2cca56f42df0d644bccf593b 100644 (file)
--- a/include/configs/csb472.h
+++ b/include/configs/csb472.h
@@ -230,7 +230,7 @@
  *
  */
 #define CFG_ENV_IS_IN_FLASH    1       /* environment is in FLASH      */
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #undef CONFIG_ENV_IS_IN_EEPROM
 
 /*

diff --git a/include/configs/debris.h b/include/configs/debris.h
index 7667e5e60e3c184f5f7db8290bdae7a0b3bbeb69..68c9e549b1196547f3794dd14a1739e531547299 100644 (file)
--- a/include/configs/debris.h
+++ b/include/configs/debris.h
@@ -251,7 +251,7 @@
 #define MTDPARTS_DEFAULT       "mtdparts=debris-0:-(jffs2)"
 */
 
-#define CFG_ENV_IS_IN_NVRAM      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  */

diff --git a/include/configs/ebony.h b/include/configs/ebony.h
index df444d8e9613aa7ecc084e8e3038a51b2cb3ca4e..21c0866f895bdd4e58acc60498278c8629d2b52d 100644 (file)
--- a/include/configs/ebony.h
+++ b/include/configs/ebony.h
@@ -51,7 +51,7 @@
 #if 1
 #define CFG_ENV_IS_IN_FLASH     1      /* use FLASH for environment vars       */
 #else
-#define CFG_ENV_IS_IN_NVRAM    1       /* use NVRAM for environment vars       */
+#define CONFIG_ENV_IS_IN_NVRAM 1       /* use NVRAM for environment vars       */
 #endif
 
 /*-----------------------------------------------------------------------
@@ -97,11 +97,11 @@
 #define CFG_NVRAM_SIZE     (0x2000 - 8)    /* NVRAM size(8k)- RTC regs */
 #define CONFIG_RTC_DS174x      1                   /* DS1743 RTC               */
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#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)
-#endif /* CFG_ENV_IS_IN_NVRAM */
+#endif /* CONFIG_ENV_IS_IN_NVRAM */
 
 /*-----------------------------------------------------------------------
  * FLASH related

diff --git a/include/configs/ep8260.h b/include/configs/ep8260.h
index 0ce6b80b9052281843a97cac3bb0e855b216011e..094a14c24bac7d461d6b9ed48659525691f937cb 100644 (file)
--- a/include/configs/ep8260.h
+++ b/include/configs/ep8260.h
@@ -485,7 +485,7 @@
 #    define CFG_ENV_SECT_SIZE  0x10000 /* see README - env sect real size */
 #  endif /* CFG_ENV_IN_OWN_SECT */
 #else
-#  define CFG_ENV_IS_IN_NVRAM  1
+#  define CONFIG_ENV_IS_IN_NVRAM  1
 #  define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
 #  define CFG_ENV_SIZE         0x200
 #endif /* CFG_RAMBOOT */

diff --git a/include/configs/hcu4.h b/include/configs/hcu4.h
index f03f9b90d36eabe3f007cfad201bee954d1bf4c6..0dd9787822afe1a54317c3fc5825beffe1b1f1a6 100644 (file)
--- a/include/configs/hcu4.h
+++ b/include/configs/hcu4.h
@@ -121,7 +121,7 @@
  * Environment
  *----------------------------------------------------------------------*/
 
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_IS_IN_FLASH
 #undef  CFG_ENV_IS_NOWHERE
 

diff --git a/include/configs/hcu5.h b/include/configs/hcu5.h
index d2742239083bb882b2546dba861d10702961c8e3..0796a7d52676693d6fa19b4c7fc2cd554defc90c 100644 (file)
--- a/include/configs/hcu5.h
+++ b/include/configs/hcu5.h
@@ -106,7 +106,7 @@
  * Environment
  *----------------------------------------------------------------------*/
 
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #define  CFG_ENV_IS_IN_FLASH
 #undef CONFIG_ENV_IS_IN_EEPROM
 #undef  CFG_ENV_IS_NOWHERE

diff --git a/include/configs/kvme080.h b/include/configs/kvme080.h
index 819e456e459d14f2cbef8105ac6ac608d7cbcfa4..7d903aa13c710dac640a912cb7fe00407c5f155e 100644 (file)
--- a/include/configs/kvme080.h
+++ b/include/configs/kvme080.h
@@ -157,7 +157,7 @@
 #define CFG_JFFS2_FIRST_BANK   0
 #define CFG_JFFS2_NUM_BANKS    1
 
-#define CFG_ENV_IS_IN_NVRAM    1
+#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

diff --git a/include/configs/mcu25.h b/include/configs/mcu25.h
index d146537cd62ddb0a38ed143a5dce282b4347b4fb..5c234df932d1e9706fcba661f42a4f0f95ab855f 100644 (file)
--- a/include/configs/mcu25.h
+++ b/include/configs/mcu25.h
@@ -121,7 +121,7 @@
  * Environment
  *----------------------------------------------------------------------*/
 
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_IS_IN_FLASH
 #undef  CFG_ENV_IS_NOWHERE
 

diff --git a/include/configs/mpc7448hpc2.h b/include/configs/mpc7448hpc2.h
index d379b1fb05322f58db511c73084ccc2819b1c3c6..7fd06a6ec4f1770c0f6381930849e100b053a7f4 100644 (file)
--- a/include/configs/mpc7448hpc2.h
+++ b/include/configs/mpc7448hpc2.h
@@ -381,7 +381,7 @@
 #define PHYS_FLASH_SIZE                0x01000000
 #define CFG_MAX_FLASH_SECT     (128)
 
-#define CFG_ENV_IS_IN_NVRAM
+#define CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_ADDR           0xFC000000
 
 #define CFG_ENV_OFFSET 0x00000000      /* Offset of Environment Sector */

diff --git a/include/configs/ocotea.h b/include/configs/ocotea.h
index 407aae72102c1db8fd71510a53bd2dbaf32a947e..e8549e938617c09ac29341405df15fbbbafcacc4 100644 (file)
--- a/include/configs/ocotea.h
+++ b/include/configs/ocotea.h
@@ -95,7 +95,7 @@
 #if 1
 #define CFG_ENV_IS_IN_FLASH     1      /* use FLASH for environment vars       */
 #else
-#define CFG_ENV_IS_IN_NVRAM    1       /* use NVRAM for environment vars       */
+#define CONFIG_ENV_IS_IN_NVRAM 1       /* use NVRAM for environment vars       */
 #endif
 
 
@@ -112,11 +112,11 @@
 #define CFG_NVRAM_SIZE     (0x2000 - 8)    /* NVRAM size(8k)- RTC regs */
 #define CONFIG_RTC_DS174x      1                   /* DS1743 RTC               */
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#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)
-#endif /* CFG_ENV_IS_IN_NVRAM */
+#endif /* CONFIG_ENV_IS_IN_NVRAM */
 
 /*-----------------------------------------------------------------------
  * FLASH related

diff --git a/include/configs/redwood.h b/include/configs/redwood.h
index ebb2921732de4d89b6a5f6811e93727758458a66..b791589adf12681a93f507049a04dcd84866819b 100644 (file)
--- a/include/configs/redwood.h
+++ b/include/configs/redwood.h
@@ -119,7 +119,7 @@
 /*-----------------------------------------------------------------------
  * Environment
  *----------------------------------------------------------------------*/
-#undef CFG_ENV_IS_IN_NVRAM             /* ... not in NVRAM             */
+#undef CONFIG_ENV_IS_IN_NVRAM          /* ... not in NVRAM             */
 #define        CFG_ENV_IS_IN_FLASH     1       /* Environment uses flash       */
 #undef CONFIG_ENV_IS_IN_EEPROM         /* ... not in EEPROM            */
 

diff --git a/include/configs/sacsng.h b/include/configs/sacsng.h
index 8427752d78e661ecf5799ac9e79669cea9eda063..5c6ddc6b47509557175c677b0a11a95432d6929c 100644 (file)
--- a/include/configs/sacsng.h
+++ b/include/configs/sacsng.h
@@ -719,7 +719,7 @@
 #  endif /* CFG_ENV_IN_OWN_SECT */
 
 #else
-#  define CFG_ENV_IS_IN_NVRAM  1
+#  define CONFIG_ENV_IS_IN_NVRAM       1
 #  define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
 #  define CFG_ENV_SIZE         0x200
 #endif /* CFG_RAMBOOT */

diff --git a/include/configs/sbc8260.h b/include/configs/sbc8260.h
index b92344ccc18c92bca0264fae472a23499c384728..6068c234ecf1a78f1c4dcee9e5f070886ad4faa8 100644 (file)
--- a/include/configs/sbc8260.h
+++ b/include/configs/sbc8260.h
@@ -615,7 +615,7 @@
 #  endif /* CFG_ENV_IN_OWN_SECT */
 
 #else
-#  define CFG_ENV_IS_IN_NVRAM  1
+#  define CONFIG_ENV_IS_IN_NVRAM       1
 #  define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
 #  define CFG_ENV_SIZE         0x200
 #endif /* CFG_RAMBOOT */

diff --git a/include/configs/sorcery.h b/include/configs/sorcery.h
index 0d07560c6a6f38a8fc8f690baca4d4a80d5c9cf9..b4da4ce9206b565fe4292b0041c56a5b181ca5dc 100644 (file)
--- a/include/configs/sorcery.h
+++ b/include/configs/sorcery.h
@@ -207,13 +207,13 @@
 #define CONFIG_ENV_OVERWRITE   1
 
 #if defined CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #undef CONFIG_ENV_IS_IN_EEPROM
-#elif defined CFG_ENV_IS_IN_NVRAM
+#elif defined CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #undef CONFIG_ENV_IS_IN_EEPROM
 #elif defined CONFIG_ENV_IS_IN_EEPROM
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #endif
 

diff --git a/include/configs/taihu.h b/include/configs/taihu.h
index 86f776df20e193e9b2d8a61826297cd9eb5e335e..2ef454532f833ecbb6b750dab1a3465a521cd1bb 100644 (file)
--- a/include/configs/taihu.h
+++ b/include/configs/taihu.h
@@ -221,7 +221,7 @@ unsigned char spi_read(void);
 #define CFG_NVRAM_BASE_ADDR    0xf0000000      /* NVRAM base address */
 #define CFG_NVRAM_SIZE         0x1ff8          /* NVRAM size */
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#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*/

diff --git a/include/configs/v37.h b/include/configs/v37.h
index 751d702135b25f9b1aa873a069e7d79f530cca88..7e5f804228a896b6bf8e001378dc92479a064d11 100644 (file)
--- a/include/configs/v37.h
+++ b/include/configs/v37.h
@@ -195,7 +195,7 @@
 #define CFG_FLASH_ERASE_TOUT   120000  /* Timeout for Flash Erase (in ms)      */
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
-#define        CFG_ENV_IS_IN_NVRAM     1
+#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     */
 

diff --git a/include/configs/walnut.h b/include/configs/walnut.h
index e19c5f34825a5ead1926d8195f9387400edb1c7b..4eecf770867c91b1c644b7f19e5efd89d6abe6dc 100644 (file)
--- a/include/configs/walnut.h
+++ b/include/configs/walnut.h
@@ -139,7 +139,7 @@
 #if 1
 #define CFG_ENV_IS_IN_FLASH    1       /* use FLASH for environment vars       */
 #else
-#define CFG_ENV_IS_IN_NVRAM    1       /* use NVRAM for environment vars       */
+#define CONFIG_ENV_IS_IN_NVRAM 1       /* use NVRAM for environment vars       */
 #endif
 
 /*-----------------------------------------------------------------------
@@ -176,7 +176,7 @@
 #define CFG_NVRAM_BASE_ADDR    0xf0000000      /* NVRAM base address   */
 #define CFG_NVRAM_SIZE         0x1ff8          /* NVRAM size   */
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#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  */

diff --git a/include/configs/yucca.h b/include/configs/yucca.h
index 0c09a1d140d06b0597727e2acd693301a7762e15..9ccd308087639245ee03aa3dcb7b4bb0542cb19c 100644 (file)
--- a/include/configs/yucca.h
+++ b/include/configs/yucca.h
@@ -139,7 +139,7 @@
  *----------------------------------------------------------------------*/
 /* #define CFG_NVRAM_SIZE      (0x2000 - 8) */ /* NVRAM size(8k)- RTC regs */
 
-#undef  CFG_ENV_IS_IN_NVRAM            /* ... not in NVRAM             */
+#undef  CONFIG_ENV_IS_IN_NVRAM         /* ... not in NVRAM             */
 #define        CFG_ENV_IS_IN_FLASH     1       /* Environment uses flash       */
 #undef CONFIG_ENV_IS_IN_EEPROM         /* ... not in EEPROM            */
 #define CONFIG_ENV_OVERWRITE   1

diff --git a/lib_m68k/board.c b/lib_m68k/board.c
index a80ec2d198d6fefcbe1c3ce76be18cca239f5e63..3aadfaffb2e53f6cc43ddd5ace1549e53380aad4 100644 (file)
--- a/lib_m68k/board.c
+++ b/lib_m68k/board.c
@@ -77,7 +77,7 @@ extern flash_info_t flash_info[];
 
 #if ( ((CFG_ENV_ADDR+CFG_ENV_SIZE) < CFG_MONITOR_BASE) || \
       (CFG_ENV_ADDR >= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)) ) || \
-    defined(CFG_ENV_IS_IN_NVRAM)
+    defined(CONFIG_ENV_IS_IN_NVRAM)
 #define        TOTAL_MALLOC_LEN        (CFG_MALLOC_LEN + CFG_ENV_SIZE)
 #else
 #define        TOTAL_MALLOC_LEN        CFG_MALLOC_LEN

diff --git a/lib_mips/board.c b/lib_mips/board.c
index 09b8b3bb3cacd9833f6ddf76da4ab384abea0702..64ca2003f332028d6d7f266c5ad81b529da7fb0a 100644 (file)
--- a/lib_mips/board.c
+++ b/lib_mips/board.c
@@ -35,7 +35,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 #if ( ((CFG_ENV_ADDR+CFG_ENV_SIZE) < CFG_MONITOR_BASE) || \
       (CFG_ENV_ADDR >= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)) ) || \
-    defined(CFG_ENV_IS_IN_NVRAM)
+    defined(CONFIG_ENV_IS_IN_NVRAM)
 #define        TOTAL_MALLOC_LEN        (CFG_MALLOC_LEN + CFG_ENV_SIZE)
 #else
 #define        TOTAL_MALLOC_LEN        CFG_MALLOC_LEN

diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index 1e004048090bdea95433efc695fe1f7214b26d3f..a757ffd247a48553bb48fd984fa91225cbcf3271 100644 (file)
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -110,7 +110,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #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)) ) || \
-      defined(CFG_ENV_IS_IN_NVRAM)
+      defined(CONFIG_ENV_IS_IN_NVRAM)
 #define        TOTAL_MALLOC_LEN        (CFG_MALLOC_LEN + CFG_ENV_SIZE)
 #else
 #define        TOTAL_MALLOC_LEN        CFG_MALLOC_LEN