rename CFG_ENV_IS_IN_NAND in CONFIG_ENV_IS_IN_NAND

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

diff --git a/README b/README
index baa06e0f272c05a7ab881da3b4b3184229aae2e1..648118675c6a2ac418bf3fb020d3f1d6480d59f6 100644 (file)
--- a/README
+++ b/README
@@ -2255,7 +2255,7 @@ to save the current settings.
          environment area within the total memory of your DataFlash placed
          at the specified address.
 
-- CFG_ENV_IS_IN_NAND:
+- CONFIG_ENV_IS_IN_NAND:
 
        Define this if you have a NAND device which you want to use
        for the environment.

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index f3d84086c57af0980f5422551a5cd76c663da765..dc6d13af1ce62f1558d00e9bd5660a4fd5722294 100644 (file)
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -56,7 +56,7 @@ DECLARE_GLOBAL_DATA_PTR;
     !defined(CONFIG_ENV_IS_IN_EEPROM)  && \
     !defined(CFG_ENV_IS_IN_FLASH)      && \
     !defined(CONFIG_ENV_IS_IN_DATAFLASH)       && \
-    !defined(CFG_ENV_IS_IN_NAND)       && \
+    !defined(CONFIG_ENV_IS_IN_NAND)    && \
     !defined(CFG_ENV_IS_IN_ONENAND)    && \
     !defined(CFG_ENV_IS_IN_SPI_FLASH)  && \
     !defined(CFG_ENV_IS_NOWHERE)

diff --git a/common/env_common.c b/common/env_common.c
index d51c2114de2e29b17944ed8911ae315c8f5d2281..e89f1920d20e3caa1952250e3ca3e867567c6c7a 100644 (file)
--- a/common/env_common.c
+++ b/common/env_common.c
@@ -133,7 +133,7 @@ uchar default_environment[] = {
        "\0"
 };
 
-#if defined(CFG_ENV_IS_IN_NAND)                /* Environment is in Nand Flash */ \
+#if defined(CONFIG_ENV_IS_IN_NAND)             /* Environment is in Nand Flash */ \
        || defined(CFG_ENV_IS_IN_SPI_FLASH)
 int default_environment_size = sizeof(default_environment);
 #endif

diff --git a/common/env_nand.c b/common/env_nand.c
index a8f0de7ae24b29a835771e3fb25fb8c7141a2ebc..53e31834c7a8ad52a9b2fb9051c7e60812aede27 100644 (file)
--- a/common/env_nand.c
+++ b/common/env_nand.c
@@ -34,7 +34,7 @@
 
 #include <common.h>
 
-#if defined(CFG_ENV_IS_IN_NAND) /* Environment is in Nand Flash */
+#if defined(CONFIG_ENV_IS_IN_NAND) /* Environment is in Nand Flash */
 
 #include <command.h>
 #include <environment.h>
@@ -367,4 +367,4 @@ static void use_default()
 }
 #endif
 
-#endif /* CFG_ENV_IS_IN_NAND */
+#endif /* CONFIG_ENV_IS_IN_NAND */

diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index 95ba84029f16ddb67e838a3881329a640b10ac66..c17a2ea3c4ab8a10c09e42e5261caf51f00494bf 100644 (file)
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -385,7 +385,7 @@
  * Environment
  */
 #if defined(CONFIG_NAND_U_BOOT)
-       #define CFG_ENV_IS_IN_NAND      1
+       #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

diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h
index 071ba10d44f9e6a2fc62d6d0d40286000c95bb16..5b253230c15f63642e328f7e6f44f084119a47f2 100644 (file)
--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@@ -107,7 +107,7 @@
 #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* use FLASH for environment vars */
 #else
-#define CFG_ENV_IS_IN_NAND     1       /* use NAND for environment vars */
+#define CONFIG_ENV_IS_IN_NAND  1       /* use NAND for environment vars */
 #define CFG_ENV_IS_EMBEDDED    1       /* use embedded environment */
 #endif
 
@@ -200,7 +200,7 @@
 #define CFG_NAND_ECCPOS                {0, 1, 2, 3, 6, 7}
 #endif
 
-#ifdef CFG_ENV_IS_IN_NAND
+#ifdef CONFIG_ENV_IS_IN_NAND
 /*
  * 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.

diff --git a/include/configs/acadia.h b/include/configs/acadia.h
index ed2754d66a8be39441b4defd5229bd1c61ad37c1..894a62b847c433aaec5db7b700e67e999f8e68c3 100644 (file)
--- a/include/configs/acadia.h
+++ b/include/configs/acadia.h
@@ -98,7 +98,7 @@
 #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
 #define CFG_ENV_IS_IN_FLASH     1      /* use FLASH for environment vars       */
 #else
-#define CFG_ENV_IS_IN_NAND     1       /* use NAND for environment vars        */
+#define CONFIG_ENV_IS_IN_NAND  1       /* use NAND for environment vars        */
 #define CFG_ENV_IS_EMBEDDED    1       /* use embedded environment */
 #endif
 
@@ -180,7 +180,7 @@
 #define CFG_NAND_ECCTOTAL      (CFG_NAND_ECCBYTES * CFG_NAND_ECCSTEPS)
 #define CFG_NAND_ECCPOS                {0, 1, 2, 3, 6, 7}
 
-#ifdef CFG_ENV_IS_IN_NAND
+#ifdef CONFIG_ENV_IS_IN_NAND
 /*
  * 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.

diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index f41936319902bf750bb929a228ffdf67a8b26954..0ddc079463d6d930f0aa3408c6088d07299e1ec3 100644 (file)
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -162,7 +162,7 @@
 #else /* CFG_USE_NANDFLASH */
 
 /* bootstrap + u-boot + env + linux in nandflash */
-#define CFG_ENV_IS_IN_NAND     1
+#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 */

diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 29291499814f36e65476ec1b7c6124e881e48956..a4a08315d1195faed1483ee140d0bbf49150c057 100644 (file)
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -162,7 +162,7 @@
 #else /* CFG_USE_NANDFLASH */
 
 /* bootstrap + u-boot + env + linux in nandflash */
-#define CFG_ENV_IS_IN_NAND     1
+#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 */

diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index c91e07629a39d47c9ce5718b634223f5c05e51ed..1d2431196084fc0b949d6b505ea7f4bf5687355a 100644 (file)
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -168,7 +168,7 @@
 #else /* CFG_USE_NANDFLASH */
 
 /* bootstrap + u-boot + env + linux in nandflash */
-#define CFG_ENV_IS_IN_NAND     1
+#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 */

diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index 0bf0ace1160e292c49bcd407603664fb7ed4a3b9..8162475ff38ab20cb7e0f3837298efb62d059741 100644 (file)
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -137,7 +137,7 @@
 #else /* CFG_USE_NANDFLASH */
 
 /* bootstrap + u-boot + env + linux in nandflash */
-#define CFG_ENV_IS_IN_NAND     1
+#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 */

diff --git a/include/configs/bamboo.h b/include/configs/bamboo.h
index 7caa40393f1d179761661037d928337f54432e69..20ebc3fb8f1c9ce2b2004483314b5d78d55ad585 100644 (file)
--- a/include/configs/bamboo.h
+++ b/include/configs/bamboo.h
@@ -105,7 +105,7 @@
 #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
 #define CFG_ENV_IS_IN_FLASH     1      /* use FLASH for environment vars       */
 #else
-#define CFG_ENV_IS_IN_NAND     1       /* use NAND for environment vars        */
+#define CONFIG_ENV_IS_IN_NAND  1       /* use NAND for environment vars        */
 #define CFG_ENV_IS_EMBEDDED    1       /* use embedded environment */
 #endif
 
@@ -183,7 +183,7 @@
 #define CFG_NAND_ECCTOTAL      (CFG_NAND_ECCBYTES * CFG_NAND_ECCSTEPS)
 #define CFG_NAND_ECCPOS                {0, 1, 2, 3, 6, 7}
 
-#ifdef CFG_ENV_IS_IN_NAND
+#ifdef CONFIG_ENV_IS_IN_NAND
 /*
  * 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.

diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h
index 3b5b2809359954d813f526aca1528cade8915d8e..189107448cb78262a53229d6ce1ee790dcfb7a6f 100644 (file)
--- a/include/configs/canyonlands.h
+++ b/include/configs/canyonlands.h
@@ -115,7 +115,7 @@
 #define        CFG_ENV_IS_IN_FLASH     1       /* use FLASH for environment vars */
 #define CFG_NAND_CS            3       /* NAND chip connected to CSx */
 #else
-#define        CFG_ENV_IS_IN_NAND      1       /* use NAND for environment vars  */
+#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 */
 #endif
@@ -174,7 +174,7 @@
                                 48, 49, 50, 51, 52, 53, 54, 55, \
                                 56, 57, 58, 59, 60, 61, 62, 63}
 
-#ifdef CFG_ENV_IS_IN_NAND
+#ifdef CONFIG_ENV_IS_IN_NAND
 /*
  * 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.

diff --git a/include/configs/davinci_dvevm.h b/include/configs/davinci_dvevm.h
index c27ce18ff2b6e516b2892663070765d67befa80b..9d79e3cf741d2ab183c5ea01a7d29e09ed9e6d91 100644 (file)
--- a/include/configs/davinci_dvevm.h
+++ b/include/configs/davinci_dvevm.h
@@ -114,7 +114,7 @@
 #ifdef CFG_USE_NAND
 #undef CFG_ENV_IS_IN_FLASH
 #define CFG_NO_FLASH
-#define CFG_ENV_IS_IN_NAND             /* U-Boot env in NAND 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

diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h
index 10166a147764421608b97ab062e4e5b618937fe5..4aed8439d5a7a0b4d9f1948dbb5d42ae59f73ba5 100644 (file)
--- a/include/configs/davinci_schmoogie.h
+++ b/include/configs/davinci_schmoogie.h
@@ -81,7 +81,7 @@
 /*=====================*/
 #undef CFG_ENV_IS_IN_FLASH
 #define CFG_NO_FLASH
-#define CFG_ENV_IS_IN_NAND             /* U-Boot env in NAND 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_SKIP_LOWLEVEL_INIT      /* U-Boot is loaded by a bootloader */

diff --git a/include/configs/davinci_sffsdr.h b/include/configs/davinci_sffsdr.h
index 7c860e5f008eff46e2f2e31b62d16edd94a90e69..c46a4305a83b39e740e96da963b18786d23a4457 100644 (file)
--- a/include/configs/davinci_sffsdr.h
+++ b/include/configs/davinci_sffsdr.h
@@ -77,7 +77,7 @@
 /* Flash & Environment */
 #undef CFG_ENV_IS_IN_FLASH
 #define CFG_NO_FLASH
-#define CFG_ENV_IS_IN_NAND             /* U-Boot env in NAND 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_SKIP_LOWLEVEL_INIT      /* U-Boot is loaded by a bootloader */

diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h
index c55766ce34f2d40018277ad6873c00fad001c3e7..9c54f084d4849497796c6d8bdd22adea8be579e2 100644 (file)
--- a/include/configs/davinci_sonata.h
+++ b/include/configs/davinci_sonata.h
@@ -114,7 +114,7 @@
 #ifdef CFG_USE_NAND
 #undef CFG_ENV_IS_IN_FLASH
 #define CFG_NO_FLASH
-#define CFG_ENV_IS_IN_NAND             /* U-Boot env in NAND 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_SKIP_LOWLEVEL_INIT      /* U-Boot is loaded by a bootloader */

diff --git a/include/configs/delta.h b/include/configs/delta.h
index 1db962aaf5066c1ee16672a72f362d960657d5f1..5a5240eb6310e656ca26c5d754fdc587b00c6d8f 100644 (file)
--- a/include/configs/delta.h
+++ b/include/configs/delta.h
@@ -262,7 +262,7 @@
 
 #define CFG_NO_FLASH           1
 
-#define CFG_ENV_IS_IN_NAND     1
+#define CONFIG_ENV_IS_IN_NAND  1
 #define CFG_ENV_OFFSET         0x40000
 #define CFG_ENV_OFFSET_REDUND  0x44000
 #define CFG_ENV_SIZE           0x4000

diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h
index f9eaa777725a627f93b5e6b1f719d6a8646b5076..01d861b2ed8a6768e59a302d324d2a28484b34f9 100644 (file)
--- a/include/configs/kilauea.h
+++ b/include/configs/kilauea.h
@@ -123,7 +123,7 @@
 #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
 #define CFG_ENV_IS_IN_FLASH     1      /* use FLASH for environment vars       */
 #else
-#define CFG_ENV_IS_IN_NAND     1       /* use NAND for environment vars        */
+#define CONFIG_ENV_IS_IN_NAND  1       /* use NAND for environment vars        */
 #define CFG_ENV_IS_EMBEDDED    1       /* use embedded environment */
 #endif
 
@@ -200,7 +200,7 @@
 #define CFG_NAND_ECCTOTAL      (CFG_NAND_ECCBYTES * CFG_NAND_ECCSTEPS)
 #define CFG_NAND_ECCPOS                {0, 1, 2, 3, 6, 7}
 
-#ifdef CFG_ENV_IS_IN_NAND
+#ifdef CONFIG_ENV_IS_IN_NAND
 /*
  * 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.

diff --git a/include/configs/omap2420h4.h b/include/configs/omap2420h4.h
index afdcba41150dfc53e6a719f4678eb70870097c3f..461362f91a3c5f5f338d65f26da5458105c9409d 100644 (file)
--- a/include/configs/omap2420h4.h
+++ b/include/configs/omap2420h4.h
@@ -270,7 +270,7 @@
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE, CFG_FLASH_BASE + PHYS_FLASH_SIZE_1 }
 
 #ifdef CFG_NAND_BOOT
-#define CFG_ENV_IS_IN_NAND     1
+#define CONFIG_ENV_IS_IN_NAND  1
 #define CFG_ENV_OFFSET 0x80000 /* environment starts here  */
 #else
 #define CFG_ENV_ADDR             (CFG_FLASH_BASE + SZ_128K)

diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h
index 74f6e3a89bbdce3b0c447a236aad83b052c8bf33..0e28555bfe50cbcde62d66c48c51f46dd1db95bc 100644 (file)
--- a/include/configs/sequoia.h
+++ b/include/configs/sequoia.h
@@ -115,7 +115,7 @@
 #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
 #define CFG_ENV_IS_IN_FLASH    1       /* use FLASH for environ vars   */
 #else
-#define CFG_ENV_IS_IN_NAND     1       /* use NAND for environ vars    */
+#define CONFIG_ENV_IS_IN_NAND  1       /* use NAND for environ vars    */
 #define CFG_ENV_IS_EMBEDDED    1       /* use embedded environment     */
 #endif
 
@@ -197,7 +197,7 @@
 #define CFG_NAND_ECCTOTAL      (CFG_NAND_ECCBYTES * CFG_NAND_ECCSTEPS)
 #define CFG_NAND_ECCPOS                {0, 1, 2, 3, 6, 7}
 
-#ifdef CFG_ENV_IS_IN_NAND
+#ifdef CONFIG_ENV_IS_IN_NAND
 /*
  * 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.

diff --git a/include/configs/smdk6400.h b/include/configs/smdk6400.h
index f0c146e3ef684529a60b9936c4ba2f06d0e91996..4c5602bf8ade9cab2d32d88357c0a1d5244ec0eb 100644 (file)
--- a/include/configs/smdk6400.h
+++ b/include/configs/smdk6400.h
@@ -284,7 +284,7 @@
 */
 
 /* Settings as above boot configuration */
-#define CFG_ENV_IS_IN_NAND
+#define CONFIG_ENV_IS_IN_NAND
 #define CONFIG_BOOTARGS                "console=ttySAC,115200"
 
 #if !defined(CONFIG_ENABLE_MMU)

diff --git a/include/configs/zylonite.h b/include/configs/zylonite.h
index 517ecb13b7f963cc3856beb9834cb5e300b43345..47ce15d0e01c780517117d74b3bf4683bac3f8d2 100644 (file)
--- a/include/configs/zylonite.h
+++ b/include/configs/zylonite.h
@@ -231,7 +231,7 @@
 
 #define CFG_NO_FLASH           1
 
-#define CFG_ENV_IS_IN_NAND     1
+#define CONFIG_ENV_IS_IN_NAND  1
 #define CFG_ENV_OFFSET         0x40000
 #define CFG_ENV_OFFSET_REDUND  0x44000
 #define CFG_ENV_SIZE           0x4000

diff --git a/include/environment.h b/include/environment.h
index 481ea733dba772dd08739f1222af6628601d59e0..047f5f059fda869dd6df095b83a3cda1c02aad25 100644 (file)
--- a/include/environment.h
+++ b/include/environment.h
@@ -69,12 +69,12 @@
 # endif
 #endif /* CFG_ENV_IS_IN_FLASH */
 
-#if defined(CFG_ENV_IS_IN_NAND)
+#if defined(CONFIG_ENV_IS_IN_NAND)
 # ifndef CFG_ENV_OFFSET
-#  error "Need to define CFG_ENV_OFFSET when using CFG_ENV_IS_IN_NAND"
+#  error "Need to define CFG_ENV_OFFSET when using CONFIG_ENV_IS_IN_NAND"
 # endif
 # ifndef CFG_ENV_SIZE
-#  error "Need to define CFG_ENV_SIZE when using CFG_ENV_IS_IN_NAND"
+#  error "Need to define CFG_ENV_SIZE when using CONFIG_ENV_IS_IN_NAND"
 # endif
 # ifdef CFG_ENV_OFFSET_REDUND
 #  define CFG_REDUNDAND_ENVIRONMENT
@@ -82,7 +82,7 @@
 # ifdef CFG_ENV_IS_EMBEDDED
 #  define ENV_IS_EMBEDDED      1
 # endif
-#endif /* CFG_ENV_IS_IN_NAND */
+#endif /* CONFIG_ENV_IS_IN_NAND */
 
 #ifdef USE_HOSTCC
 # include <stdint.h>