rename CFG_ENV_IS_IN_EEPROM in CONFIG_ENV_IS_IN_EEPROM

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

diff --git a/README b/README
index 44b450c6e2379f43c2fc5b5b51eba146e7e868b7..48232553f1d0637899d9bc853d345de9856d9799 100644 (file)
--- a/README
+++ b/README
@@ -2199,7 +2199,7 @@ keep settings there always unmodified except somebody uses "saveenv"
 to save the current settings.
 
 
-- CFG_ENV_IS_IN_EEPROM:
+- CONFIG_ENV_IS_IN_EEPROM:
 
        Use this if you have an EEPROM or similar serial access
        device and a driver for it.

diff --git a/board/Marvell/common/bootseq.txt b/board/Marvell/common/bootseq.txt
index 290aed90a5244a0ea695dd210b2414d48beabaef..e4fefb31dd0a8645efdf1cf32913c4ad2df92571 100644 (file)
--- a/board/Marvell/common/bootseq.txt
+++ b/board/Marvell/common/bootseq.txt
@@ -88,7 +88,7 @@ in_flash:
                    nothing
                mem_malloc_init
                malloc_bin_reloc
-               spi_init (r or f)??? (CFG_ENV_IS_IN_EEPROM)
+               spi_init (r or f)??? (CONFIG_ENV_IS_IN_EEPROM)
                env_relocated
                misc_init_r(bd): (board/evb64260/evb64260.c)
                    mpsc_init2

diff --git a/board/evb64260/bootseq.txt b/board/evb64260/bootseq.txt
index 290aed90a5244a0ea695dd210b2414d48beabaef..e4fefb31dd0a8645efdf1cf32913c4ad2df92571 100644 (file)
--- a/board/evb64260/bootseq.txt
+++ b/board/evb64260/bootseq.txt
@@ -88,7 +88,7 @@ in_flash:
                    nothing
                mem_malloc_init
                malloc_bin_reloc
-               spi_init (r or f)??? (CFG_ENV_IS_IN_EEPROM)
+               spi_init (r or f)??? (CONFIG_ENV_IS_IN_EEPROM)
                env_relocated
                misc_init_r(bd): (board/evb64260/evb64260.c)
                    mpsc_init2

diff --git a/board/netstal/hcu5/README.txt b/board/netstal/hcu5/README.txt
index c205108ff1b739c75a34ea6b16318204f8e274c5..75c0dd7cd3e9974c0c75e0fbe20207123f065d4f 100644 (file)
--- a/board/netstal/hcu5/README.txt
+++ b/board/netstal/hcu5/README.txt
@@ -152,7 +152,7 @@ From now on our copy is in RAM and we will run from there,
            CFG_EBC_PB0A, CFG_EBC_PB0C from hcu5.h
        mem_malloc_init
        malloc_bin_reloc
-       spi_init (r or f)??? (CFG_ENV_IS_IN_EEPROM)
+       spi_init (r or f)??? (CONFIG_ENV_IS_IN_EEPROM)
        env_relocated
        misc_init_r(bd): (board/netstal/hcu5.c)
            ethaddr mit serial number ergänzen

diff --git a/board/xilinx/ml300/ml300.c b/board/xilinx/ml300/ml300.c
index 5d493eeb733dfd0bf23fe43f7c270818ad9112b3..e64beccc1c703682d0f7b35329cd6f8eba52f140 100644 (file)
--- a/board/xilinx/ml300/ml300.c
+++ b/board/xilinx/ml300/ml300.c
@@ -42,7 +42,7 @@
 #include <common.h>
 #include <asm/processor.h>
 
-#ifdef CFG_ENV_IS_IN_EEPROM
+#ifdef CONFIG_ENV_IS_IN_EEPROM
 extern void convert_env(void);
 #endif
 

diff --git a/board/xilinx/xilinx_iic/iic_adapter.c b/board/xilinx/xilinx_iic/iic_adapter.c
index 37dce03916456edcabcc42c16052651dfaa7a800..5d84ca794173ef0034150945cfe6b9fe94bdf1b1 100644 (file)
--- a/board/xilinx/xilinx_iic/iic_adapter.c
+++ b/board/xilinx/xilinx_iic/iic_adapter.c
@@ -42,7 +42,7 @@
 #include <environment.h>
 #include <net.h>
 
-#ifdef CFG_ENV_IS_IN_EEPROM
+#ifdef CONFIG_ENV_IS_IN_EEPROM
 #include <i2c.h>
 #include "xiic_l.h"
 

diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c
index e5000e9ff399f43dc21ab1015592f7f9cacf2aed..5034b5ec6e50d5169c7540c5635249d674aaf4b2 100644 (file)
--- a/common/cmd_eeprom.c
+++ b/common/cmd_eeprom.c
@@ -42,7 +42,7 @@
 #include <command.h>
 #include <i2c.h>
 
-#if defined(CFG_ENV_IS_IN_EEPROM) || defined(CONFIG_CMD_EEPROM)
+#if defined(CONFIG_ENV_IS_IN_EEPROM) || defined(CONFIG_CMD_EEPROM)
 
 extern void eeprom_init  (void);
 extern int  eeprom_read  (unsigned dev_addr, unsigned offset,
@@ -121,7 +121,7 @@ int do_eeprom ( cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
  *   0x00000nxx for EEPROM address selectors and page number at n.
  */
 
-#if defined(CFG_ENV_IS_IN_EEPROM) || defined(CONFIG_CMD_EEPROM)
+#if defined(CONFIG_ENV_IS_IN_EEPROM) || defined(CONFIG_CMD_EEPROM)
 
 #ifndef CONFIG_SPI
 #if !defined(CFG_I2C_EEPROM_ADDR_LEN) || CFG_I2C_EEPROM_ADDR_LEN < 1 || CFG_I2C_EEPROM_ADDR_LEN > 2

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index 70897062a6fb11e03b76f76213d64f0dd16ee320..8b6b46b62c142de68418f09168554c8dbd870d53 100644 (file)
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -53,7 +53,7 @@
 DECLARE_GLOBAL_DATA_PTR;
 
 #if !defined(CFG_ENV_IS_IN_NVRAM)      && \
-    !defined(CFG_ENV_IS_IN_EEPROM)     && \
+    !defined(CONFIG_ENV_IS_IN_EEPROM)  && \
     !defined(CFG_ENV_IS_IN_FLASH)      && \
     !defined(CFG_ENV_IS_IN_DATAFLASH)  && \
     !defined(CFG_ENV_IS_IN_NAND)       && \
@@ -540,7 +540,7 @@ int getenv_r (char *name, char *buf, unsigned len)
        return (-1);
 }
 
-#if ((defined(CFG_ENV_IS_IN_NVRAM) || defined(CFG_ENV_IS_IN_EEPROM) \
+#if ((defined(CFG_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(CFG_ENV_IS_IN_EEPROM) \
+#if ((defined(CFG_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_eeprom.c b/common/env_eeprom.c
index 9e1a20194d7392c38ef05d38b0ac11c8b5339d13..1a03f436d8feadd718f191238ebe4df012f1d07c 100644 (file)
--- a/common/env_eeprom.c
+++ b/common/env_eeprom.c
@@ -26,7 +26,7 @@
 
 #include <common.h>
 
-#if defined(CFG_ENV_IS_IN_EEPROM) /* Environment is in EEPROM */
+#if defined(CONFIG_ENV_IS_IN_EEPROM) /* Environment is in EEPROM */
 
 #include <command.h>
 #include <environment.h>
@@ -107,4 +107,4 @@ int env_init(void)
        return (0);
 }
 
-#endif /* CFG_ENV_IS_IN_EEPROM */
+#endif /* CONFIG_ENV_IS_IN_EEPROM */

diff --git a/include/configs/APC405.h b/include/configs/APC405.h
index 6ee0a3631fb5f36f4f011c0a5b340e543471efe2..882d188e1e4071c000c8764224360f8bb17420e7 100644 (file)
--- a/include/configs/APC405.h
+++ b/include/configs/APC405.h
@@ -291,7 +291,7 @@ extern int flash_banks;
 /*
  * Environment Variable setup
  */
-#define CFG_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         0x000   /* environment starts at the */
                                        /* beginning of the EEPROM */
 #define CFG_ENV_SIZE           0x800   /* 2048 bytes may be used for env vars*/

diff --git a/include/configs/ASH405.h b/include/configs/ASH405.h
index 85c6a992d7bfa64b7542e9dc1d48467bc987acc8..56ae708eb382d78f37ad7cbfdc3d2154ce4777a1 100644 (file)
--- a/include/configs/ASH405.h
+++ b/include/configs/ASH405.h
@@ -233,7 +233,7 @@
 /*-----------------------------------------------------------------------
  * Environment Variable setup
  */
-#define CFG_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         0x100   /* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE           0x700   /* 2048 bytes may be used for env vars*/
                                   /* total size of a CAT24WC16 is 2048 bytes */

diff --git a/include/configs/Alaska8220.h b/include/configs/Alaska8220.h
index 38b962f8232c8c6d61aa5175a84af8e5572103c1..0c2e6aefd3497a3e59a045bceada3df4f9116f67 100644 (file)
--- a/include/configs/Alaska8220.h
+++ b/include/configs/Alaska8220.h
@@ -133,7 +133,7 @@
 #define CFG_EEPROM_PAGE_WRITE_BITS     3
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 70
 /*
-#define CFG_ENV_IS_IN_EEPROM   1
+#define CONFIG_ENV_IS_IN_EEPROM        1
 #define CFG_ENV_OFFSET         0
 #define CFG_ENV_SIZE           256
 */
@@ -226,11 +226,11 @@
 
 #if defined CFG_ENV_IS_IN_FLASH
 #undef CFG_ENV_IS_IN_NVRAM
-#undef CFG_ENV_IS_IN_EEPROM
+#undef CONFIG_ENV_IS_IN_EEPROM
 #elif defined CFG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_EEPROM
-#elif defined CFG_ENV_IS_IN_EEPROM
+#undef CONFIG_ENV_IS_IN_EEPROM
+#elif defined CONFIG_ENV_IS_IN_EEPROM
 #undef CFG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #endif

diff --git a/include/configs/B2.h b/include/configs/B2.h
index d6ab1adeb91cb0b709278e6af62cd74ff6c4ac75..1c4b6fee99e27d4ddad32ab2959c9dd22d9c93e9 100644 (file)
--- a/include/configs/B2.h
+++ b/include/configs/B2.h
@@ -176,7 +176,7 @@
 /*-----------------------------------------------------------------------
  * Environment Variable setup
  */
-#define CFG_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         0x0     /* environment starts at the beginning of the EEPROM */
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/CANBT.h b/include/configs/CANBT.h
index 7029dbddef2c48aa294d3cbdf0cbeadcad63db08..a4afccab9617c3d4b4e06a73d27dbd95d1984edd 100644 (file)
--- a/include/configs/CANBT.h
+++ b/include/configs/CANBT.h
@@ -163,7 +163,7 @@
 
 #else /* Use EEPROM for environment variables */
 
-#define CFG_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         0x000   /* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE           0x400   /* 1024 bytes may be used for env vars */
                                   /* total size of a CAT24WC08 is 1024 bytes */

diff --git a/include/configs/CCM.h b/include/configs/CCM.h
index 6194c5c6e2677d7118fac476f60b7ff1ac20ecf3..57c122395d7efcbfc10e336df5107e6de718bce7 100644 (file)
--- a/include/configs/CCM.h
+++ b/include/configs/CCM.h
@@ -227,7 +227,7 @@
 #define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
 #else
 /* Final version: environment in EEPROM */
-#define CFG_ENV_IS_IN_EEPROM   1
+#define CONFIG_ENV_IS_IN_EEPROM        1
 #define CFG_ENV_OFFSET         2048
 #define CFG_ENV_SIZE           2048
 #endif

diff --git a/include/configs/CMS700.h b/include/configs/CMS700.h
index 285cd5c0e8e90527ce9522eeead20beab91ecb74..f157b5f7542c4961e32c75035f4025b1ca00c075 100644 (file)
--- a/include/configs/CMS700.h
+++ b/include/configs/CMS700.h
@@ -248,7 +248,7 @@
 /*-----------------------------------------------------------------------
  * Environment Variable setup
  */
-#define CFG_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         0x100   /* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE           0x700   /* 2048 bytes may be used for env vars*/
                                   /* total size of a CAT24WC16 is 2048 bytes */

diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h
index 58900c3091d4385941a9f086f67024a07e535c32..8b205c77207686a0b703f731f783a0dddcbe6d56 100644 (file)
--- a/include/configs/CPCI2DP.h
+++ b/include/configs/CPCI2DP.h
@@ -200,7 +200,7 @@
 
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 
-#define CFG_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         0x000   /* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE           0x400   /* 1024 bytes may be used for env vars */
 

diff --git a/include/configs/CPCI405.h b/include/configs/CPCI405.h
index bd43e1dc9aaf02407a402f8e448fb176c385bf60..bc514b0383375b15ce2f57d2dc5775f3e8e640fb 100644 (file)
--- a/include/configs/CPCI405.h
+++ b/include/configs/CPCI405.h
@@ -243,7 +243,7 @@
 
 #else /* Use EEPROM for environment variables */
 
-#define CFG_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          0x000   /* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE            0x400   /* 1024 bytes may be used for env vars */
                                   /* total size of a CAT24WC08 is 1024 bytes */

diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h
index 9ec1721897b44fece3a2a6ff12ef95328f8caafa..ef8abf6466c336c806fb8de663215863b45c9234 100644 (file)
--- a/include/configs/CPCI4052.h
+++ b/include/configs/CPCI4052.h
@@ -258,7 +258,7 @@
 
 #else /* Use EEPROM for environment variables */
 
-#define CFG_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         0x000   /* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE           0x800   /* 2048 bytes may be used for env vars*/
                                   /* total size of a CAT24WC16 is 2048 bytes */

diff --git a/include/configs/CPCI405AB.h b/include/configs/CPCI405AB.h
index 78995984f78fc6d19662920ede1c94e44b0ba0ec..431054d39497dccb9dce98d33cea0ee2433e9f47 100644 (file)
--- a/include/configs/CPCI405AB.h
+++ b/include/configs/CPCI405AB.h
@@ -263,7 +263,7 @@
 
 /* Use EEPROM for environment variables */
 
-#define CFG_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         0x000   /* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE           0x800   /* 2048 bytes may be used for env vars*/
                                   /* total size of a CAT24WC32 is 4096 bytes */

diff --git a/include/configs/CPCI405DT.h b/include/configs/CPCI405DT.h
index c173539202269c6919d4b26a3b5dcc506b45f818..6c5a3fe921d294c84be2a8df532088364dee10b6 100644 (file)
--- a/include/configs/CPCI405DT.h
+++ b/include/configs/CPCI405DT.h
@@ -261,7 +261,7 @@
 
 #else /* Use EEPROM for environment variables */
 
-#define CFG_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         0x000   /* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE           0x800   /* 2048 bytes may be used for env vars*/
                                   /* total size of a CAT24WC16 is 2048 bytes */

diff --git a/include/configs/CPCI750.h b/include/configs/CPCI750.h
index 03756c3b242ca8ca7dde1d3ac1c200c6184ff968..4818aede305940ee4857463f3c7902f83bb699e2 100644 (file)
--- a/include/configs/CPCI750.h
+++ b/include/configs/CPCI750.h
@@ -579,7 +579,7 @@
 /* #define CFG_ENV_ADDR           (CFG_FLASH_BASE+CFG_MONITOR_LEN-CFG_ENV_SECT_SIZE) */
 #endif
 
-#define CFG_ENV_IS_IN_EEPROM   1       /* use EEPROM for environment vars */
+#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

diff --git a/include/configs/CPCIISER4.h b/include/configs/CPCIISER4.h
index 78b754c19df1bcb02b8dd4610268c1f1c29b4603..958b11151e464283d30ed20c67b002d859b8cfdd 100644 (file)
--- a/include/configs/CPCIISER4.h
+++ b/include/configs/CPCIISER4.h
@@ -200,7 +200,7 @@
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10   /* and takes up to 10 msec */
 #define CFG_EEPROM_PAGE_WRITE_ENABLE
 
-#define CFG_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         0x000   /* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE           0x300   /* 768 bytes may be used for env vars */
                                   /* total size of a CAT24WC08 is 1024 bytes */

diff --git a/include/configs/CPU86.h b/include/configs/CPU86.h
index 10cebc99c2a65c2dc5bcb660f9c58c709d337e92..742ea463e59ea63d20761ded0124066331a1ca93 100644 (file)
--- a/include/configs/CPU86.h
+++ b/include/configs/CPU86.h
@@ -332,7 +332,7 @@
 #endif
 #else
 /* environment is in EEPROM */
-#define CFG_ENV_IS_IN_EEPROM   1
+#define CONFIG_ENV_IS_IN_EEPROM        1
 #define CFG_I2C_EEPROM_ADDR    0x58    /* EEPROM X24C16                */
 #define CFG_I2C_EEPROM_ADDR_LEN        1
 /* mask of address bits that overflow into the "EEPROM chip address"    */

diff --git a/include/configs/CPU87.h b/include/configs/CPU87.h
index d325c4d076ad0700dfce14b65600029803c246de..db423a0ba9477ac7faa863d81c3f45117518f353 100644 (file)
--- a/include/configs/CPU87.h
+++ b/include/configs/CPU87.h
@@ -347,7 +347,7 @@
 #endif
 #else
 /* environment is in EEPROM */
-#define CFG_ENV_IS_IN_EEPROM   1
+#define CONFIG_ENV_IS_IN_EEPROM        1
 #define CFG_I2C_EEPROM_ADDR    0x58    /* EEPROM X24C16                */
 #define CFG_I2C_EEPROM_ADDR_LEN 1
 /* mask of address bits that overflow into the "EEPROM chip address"   */

diff --git a/include/configs/DP405.h b/include/configs/DP405.h
index 912fb2af1c059828259fc64a72795e7454448622..50d44a0326ef37467c0c5a1e73186afd2acda701 100644 (file)
--- a/include/configs/DP405.h
+++ b/include/configs/DP405.h
@@ -216,7 +216,7 @@
 /*-----------------------------------------------------------------------
  * Environment Variable setup
  */
-#define CFG_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         0x100   /* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE           0x700   /* 2048 bytes may be used for env vars*/
                                   /* total size of a CAT24WC16 is 2048 bytes */

diff --git a/include/configs/DU405.h b/include/configs/DU405.h
index c8bf67fe964ddad52cc8944669ac1e60ac7700f0..811b9c3f9b6cbc408b32beda546076282294fe96 100644 (file)
--- a/include/configs/DU405.h
+++ b/include/configs/DU405.h
@@ -227,7 +227,7 @@
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10   /* and takes up to 10 msec */
 #define CFG_EEPROM_PAGE_WRITE_ENABLE
 
-#define CFG_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         0x000   /* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE           0x400   /* 1024 bytes may be used for env vars */
                                   /* total size of a CAT24WC08 is 1024 bytes */

diff --git a/include/configs/DU440.h b/include/configs/DU440.h
index c757523aec2b43bc8141922e8cf77682a35f1fa2..b1d4ff3f6427687dec85b2347f7f7376ceb4eee8 100644 (file)
--- a/include/configs/DU440.h
+++ b/include/configs/DU440.h
@@ -113,7 +113,7 @@
 /*
  * Environment
  */
-#define CFG_ENV_IS_IN_EEPROM    1      /* use FLASH for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM    1   /* use FLASH for environment vars */
 
 /*
  * FLASH related
@@ -146,7 +146,7 @@
 #define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
 #endif
 
-#ifdef CFG_ENV_IS_IN_EEPROM
+#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 */

diff --git a/include/configs/ELPT860.h b/include/configs/ELPT860.h
index f927a2c9cca3c335a76b9ca3e104b121ad4d57f5..828dd9fe681155581778367fc9b297487fd144b7 100644 (file)
--- a/include/configs/ELPT860.h
+++ b/include/configs/ELPT860.h
@@ -138,7 +138,7 @@
 #define CONFIG_ENV_OVERWRITE   1  /* Allow Overwrite of serial# & ethaddr */
 
 #undef   CFG_ENV_IS_IN_NVRAM          /* Environment is in NVRAM       */
-#undef   CFG_ENV_IS_IN_EEPROM         /* Environment is in I2C EEPROM  */
+#undef   CONFIG_ENV_IS_IN_EEPROM              /* Environment is in I2C EEPROM  */
 #define CFG_ENV_IS_IN_FLASH    1      /* Environment is in FLASH       */
 
 #define CONFIG_BAUDRATE                9600   /* console baudrate = 9600 bps   */

diff --git a/include/configs/ERIC.h b/include/configs/ERIC.h
index bfdcf6a5549e902ec29cbc29a3c2f8aa0159a585..dfbbc95ddb4812c0f89f1eec58d168c6b3fd167d 100644 (file)
--- a/include/configs/ERIC.h
+++ b/include/configs/ERIC.h
@@ -48,7 +48,7 @@
 #define CFG_ENV_IS_IN_NVRAM    1       /* use NVRAM for environment vars       */
 #endif
 #if 0
-#define CFG_ENV_IS_IN_EEPROM   1       /* use I2C RTC X1240 for environment vars */
+#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 */
 #endif                                 /* total size of a X1240 is 2048 bytes */
@@ -64,13 +64,13 @@
 
 #ifdef CFG_ENV_IS_IN_FLASH
 #undef CFG_ENV_IS_IN_NVRAM
-#undef CFG_ENV_IS_IN_EEPROM
+#undef CONFIG_ENV_IS_IN_EEPROM
 #else
 #ifdef CFG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_EEPROM
+#undef CONFIG_ENV_IS_IN_EEPROM
 #else
-#ifdef CFG_ENV_IS_IN_EEPROM
+#ifdef CONFIG_ENV_IS_IN_EEPROM
 #undef CFG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #endif

diff --git a/include/configs/EXBITGEN.h b/include/configs/EXBITGEN.h
index 99d1cf255cfd0c89e9d602a11719038c6b5caeed..cee0be4976c1d3fa4d370c437e3a7dae31ac0ce3 100644 (file)
--- a/include/configs/EXBITGEN.h
+++ b/include/configs/EXBITGEN.h
@@ -47,11 +47,11 @@
 #define CFG_I2C_SLAVE          0x7F    /* I2C slave address            */
 
 /* environment is in EEPROM */
-#define CFG_ENV_IS_IN_EEPROM    1
+#define CONFIG_ENV_IS_IN_EEPROM    1
 #undef CFG_ENV_IS_IN_FLASH
 #undef CFG_ENV_IS_IN_NVRAM
 
-#ifdef CFG_ENV_IS_IN_EEPROM
+#ifdef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_I2C_EEPROM_ADDR            0x56    /* 1010110 */
 #define CFG_I2C_EEPROM_ADDR_LEN                1       /* 8-bit internal addressing */
 #define CFG_I2C_EEPROM_ADDR_OVERFLOW   1       /* ... and 1 bit in I2C address */

diff --git a/include/configs/G2000.h b/include/configs/G2000.h
index c12ce48b6f3833160767026c92cc71b56db1aae7..74e6ef70ee54b9c7e070478fc86b89b3e4a0c734 100644 (file)
--- a/include/configs/G2000.h
+++ b/include/configs/G2000.h
@@ -299,7 +299,7 @@
  * Environment Variable setup
  */
 #if 1 /* test-only */
-#define CFG_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         0x100   /* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE           0x700   /* 2048 bytes may be used for env vars*/
                                   /* total size of a CAT24WC16 is 2048 bytes */

diff --git a/include/configs/GEN860T.h b/include/configs/GEN860T.h
index 422ed32aaaac80387914fc426206980dc3e35311..51cf5794b9af66f62d2e6f0aa311804d965598a2 100644 (file)
--- a/include/configs/GEN860T.h
+++ b/include/configs/GEN860T.h
@@ -435,9 +435,9 @@
  * be edited if this is changed!
  */
 #undef CFG_ENV_IS_IN_FLASH
-#define CFG_ENV_IS_IN_EEPROM
+#define CONFIG_ENV_IS_IN_EEPROM
 
-#if defined(CFG_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))
 #else

diff --git a/include/configs/GTH.h b/include/configs/GTH.h
index 461670a1042559dc984b37261861aa14f973ac2c..4a98c40638624ce622020b80b165ce46f2b310b9 100644 (file)
--- a/include/configs/GTH.h
+++ b/include/configs/GTH.h
@@ -195,7 +195,7 @@
 #define CFG_FLASH_WRITE_TOUT   500             /* Timeout for Flash Write (in ms)      */
 
 #define        CFG_ENV_IS_IN_FLASH 1
-#undef CFG_ENV_IS_IN_EEPROM
+#undef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_ENV_OFFSET         0x000E0000
 #define        CFG_ENV_SIZE            0x4000  /* Total Size of Environment Sector     */
 

diff --git a/include/configs/HH405.h b/include/configs/HH405.h
index 9bcbfe3b7d9b84712e32e2ad530ece04d76a2f80..cf5fcf12cba062d0a24802c512a349070f2fe583 100644 (file)
--- a/include/configs/HH405.h
+++ b/include/configs/HH405.h
@@ -320,7 +320,7 @@
 /*-----------------------------------------------------------------------
  * Environment Variable setup
  */
-#define CFG_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          0x100   /* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE            0x700   /* 2048 bytes may be used for env vars*/
                                   /* total size of a CAT24WC16 is 2048 bytes */

diff --git a/include/configs/HUB405.h b/include/configs/HUB405.h
index a389d582dfc2f13a257e76b97aeee5d386ca41b4..8992706951938f244f8b462cb068593440b6b8b4 100644 (file)
--- a/include/configs/HUB405.h
+++ b/include/configs/HUB405.h
@@ -232,7 +232,7 @@
 /*-----------------------------------------------------------------------
  * Environment Variable setup
  */
-#define CFG_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         0x100   /* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE           0x700   /* 2048 bytes may be used for env vars*/
                                   /* total size of a CAT24WC16 is 2048 bytes */

diff --git a/include/configs/IP860.h b/include/configs/IP860.h
index e6c7fe656d5230b975d9c041c8737b0d03ef1603..67f8833259e70d944a835768007c04a6bff55a5d 100644 (file)
--- a/include/configs/IP860.h
+++ b/include/configs/IP860.h
@@ -190,17 +190,17 @@
 #undef CFG_ENV_IS_IN_NVRAM
 #undef  CFG_ENV_IS_IN_NVRAM
 #undef DEBUG_I2C
-#define        CFG_ENV_IS_IN_EEPROM
+#define        CONFIG_ENV_IS_IN_EEPROM
 
 #ifdef CFG_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 */
 
-#ifdef CFG_ENV_IS_IN_EEPROM
+#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                  */
-#endif /* CFG_ENV_IS_IN_EEPROM */
+#endif /* CONFIG_ENV_IS_IN_EEPROM */
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/JSE.h b/include/configs/JSE.h
index 5b40ef6b42fb92ef3418a96940349f54b774b606..b08301e138ee8c56d8ed6ba36e50a2f2d4df6f50 100644 (file)
--- a/include/configs/JSE.h
+++ b/include/configs/JSE.h
@@ -79,7 +79,7 @@
   /* JSE has EEPROM chips that are good for environment. */
 #undef CFG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
-#define CFG_ENV_IS_IN_EEPROM 1
+#define CONFIG_ENV_IS_IN_EEPROM 1
 #undef CFG_ENV_IS_NOWHERE
 
   /* This is the 7bit address of the device, not including P. */

diff --git a/include/configs/KAREF.h b/include/configs/KAREF.h
index 816e63ba2abcff504fa55025fd8648fadf51cd73..5b21b905ec556b9b978a376109a6e9d85950e1fb 100644 (file)
--- a/include/configs/KAREF.h
+++ b/include/configs/KAREF.h
@@ -143,7 +143,7 @@
  *----------------------------------------------------------------------*/
 #define CFG_ENV_IS_IN_NVRAM   1                     /* Environment uses NVRAM  */
 #undef CFG_ENV_IS_IN_FLASH                  /* ... not in flash        */
-#undef CFG_ENV_IS_IN_EEPROM                 /* ... not in EEPROM       */
+#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        */

diff --git a/include/configs/METROBOX.h b/include/configs/METROBOX.h
index d61b49eeecd5261ccb1332340b8bbc46b83d0523..2afb3fffcb3310774b516f88aaedc665dede158b 100644 (file)
--- a/include/configs/METROBOX.h
+++ b/include/configs/METROBOX.h
@@ -205,7 +205,7 @@
  *----------------------------------------------------------------------*/
 #define CFG_ENV_IS_IN_NVRAM   1                     /* Environment uses NVRAM  */
 #undef CFG_ENV_IS_IN_FLASH                  /* ... not in flash        */
-#undef CFG_ENV_IS_IN_EEPROM                 /* ... not in EEPROM       */
+#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        */

diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index 66235e37b41bf7fdc5dcf77d024edc9a8ef49cab..e0f938625c85ad03c55222b044751b14265be8cc 100644 (file)
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -114,7 +114,7 @@
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10      /* and takes up to 10 msec */
 
 
-#define CFG_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 */
 

diff --git a/include/configs/OCRTC.h b/include/configs/OCRTC.h
index 94b5bc965e054f9bae954fa6f4c13c7e70e7722a..c561e15ac838809cea3024e37f7655fa5c8539f5 100644 (file)
--- a/include/configs/OCRTC.h
+++ b/include/configs/OCRTC.h
@@ -199,7 +199,7 @@
 
 #else /* Use EEPROM for environment variables */
 
-#define CFG_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         0x000   /* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE           0x300   /* 768 bytes may be used for env vars */
                                   /* total size of a CAT24WC08 is 1024 bytes */

diff --git a/include/configs/ORSG.h b/include/configs/ORSG.h
index 4e030885fea72e1f2c6c656eb3992b5cfed5ca7c..fd140884a40304b08f0b2f5efca65226ee7970c3 100644 (file)
--- a/include/configs/ORSG.h
+++ b/include/configs/ORSG.h
@@ -197,7 +197,7 @@
 
 #else /* Use EEPROM for environment variables */
 
-#define CFG_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         0x000   /* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE           0x300   /* 768 bytes may be used for env vars */
                                   /* total size of a CAT24WC08 is 1024 bytes */

diff --git a/include/configs/PATI.h b/include/configs/PATI.h
index 4b37eca7ceeb33cfa6975634cce8a9c48182b4a6..2676c78fa97f3b0a7df86db53999c7f8185a0938 100644 (file)
--- a/include/configs/PATI.h
+++ b/include/configs/PATI.h
@@ -172,8 +172,8 @@
 #define CFG_FLASH_WRITE_TOUT   600             /* Timeout for Flash Write (in ms)      */
 
 
-#define        CFG_ENV_IS_IN_EEPROM
-#ifdef CFG_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
 #endif

diff --git a/include/configs/PCI405.h b/include/configs/PCI405.h
index e70c0d3d4d62d4610939468f2d6ea2c78f72df12..dea59b647d819ecbbc2d4de6b03a0352aa18ca51 100644 (file)
--- a/include/configs/PCI405.h
+++ b/include/configs/PCI405.h
@@ -225,7 +225,7 @@
 
 #else /* Use EEPROM for environment variables */
 
-#define CFG_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         0x000   /* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE           0x400   /* 1024 bytes may be used for env vars*/
                                   /* total size of a CAT24WC08 is 1024 bytes */

diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index 86ea6c69b937d0dc04396d55baaa34800976ebab..7876177f04aa41a37ebec25db677e6098667ecd8 100644 (file)
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -95,7 +95,7 @@
 
 #define CFG_I2C_EEPROM_ADDR    0x53
 #define CFG_I2C_EEPROM_ADDR_LEN        2
-#define CFG_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          0x000   /* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE            0x800   /* 2 kBytes may be used for env vars */
 

diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h
index 38c495e026cdd87db7d239065a8688864d9a25e2..75cdc2fcfb9bedf79f1ce5e5c79ed75a8630e65e 100644 (file)
--- a/include/configs/PLU405.h
+++ b/include/configs/PLU405.h
@@ -273,7 +273,7 @@
 /*
  * Environment Variable setup
  */
-#define CFG_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         0x100   /* reseve 0x100 bytes for strapping */
 #define CFG_ENV_SIZE           0x700
 

diff --git a/include/configs/PM826.h b/include/configs/PM826.h
index 190e2a44247ecc1ff30293e307893ff5b10e279b..de1ecde0d5fb9d9bf49a88efe85590d366812aec 100644 (file)
--- a/include/configs/PM826.h
+++ b/include/configs/PM826.h
@@ -263,7 +263,7 @@
 #define CFG_ENV_SECT_SIZE      0x40000
 #else
 /* Final version: environment in EEPROM */
-#define CFG_ENV_IS_IN_EEPROM   1
+#define CONFIG_ENV_IS_IN_EEPROM        1
 #define CFG_I2C_EEPROM_ADDR    0x58
 #define CFG_I2C_EEPROM_ADDR_LEN        1
 #define CFG_EEPROM_PAGE_WRITE_BITS     4

diff --git a/include/configs/PM828.h b/include/configs/PM828.h
index 96c0edf93971284a1432b015a672c9d2820b7443..cac8f272665c0b95e41d0ba83a495e1af1dba727 100644 (file)
--- a/include/configs/PM828.h
+++ b/include/configs/PM828.h
@@ -256,7 +256,7 @@
 #define CFG_ENV_SECT_SIZE      0x40000
 #else
 /* Final version: environment in EEPROM */
-#define CFG_ENV_IS_IN_EEPROM   1
+#define CONFIG_ENV_IS_IN_EEPROM        1
 #define CFG_I2C_EEPROM_ADDR    0x58
 #define CFG_I2C_EEPROM_ADDR_LEN 1
 #define CFG_EEPROM_PAGE_WRITE_BITS     4

diff --git a/include/configs/PMC405.h b/include/configs/PMC405.h
index 966bbf9a3188ea6710114bfd5d2dfd86faf3218f..f6274229013f34743e136de409b204bfd845245e 100644 (file)
--- a/include/configs/PMC405.h
+++ b/include/configs/PMC405.h
@@ -244,7 +244,7 @@
 /*-----------------------------------------------------------------------
  * Environment Variable setup
  */
-#define CFG_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         0x000   /* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE           0x800   /* 2048 bytes may be used for env vars*/
                                   /* total size of a CAT24WC16 is 2048 bytes */

diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h
index 9140287c873f59e25efcdbdb934989d52a9e6cf4..071ba10d44f9e6a2fc62d6d0d40286000c95bb16 100644 (file)
--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@@ -105,7 +105,7 @@
  * Environment
  *----------------------------------------------------------------------*/
 #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
-#define CFG_ENV_IS_IN_EEPROM   1       /* use FLASH for environment vars */
+#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 CFG_ENV_IS_EMBEDDED    1       /* use embedded environment */
@@ -146,7 +146,7 @@
 #define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
 #endif
 
-#ifdef CFG_ENV_IS_IN_EEPROM
+#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 */
 #endif

diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h
index cf98324344c06cbed4f27c77cfb0393a5e2d8537..a33bc3ba5a1e3ad0194f2d9722b161b0c9bda3a3 100644 (file)
--- a/include/configs/PPChameleonEVB.h
+++ b/include/configs/PPChameleonEVB.h
@@ -417,7 +417,7 @@
  */
 #ifdef ENVIRONMENT_IN_EEPROM
 
-#define CFG_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         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)*/
 

diff --git a/include/configs/SCM.h b/include/configs/SCM.h
index febfc39263a00fdbfc7ecd59b60750c08161fa21..2c7e55f287dd57c656552f1c3ce113f22ae1c524 100644 (file)
--- a/include/configs/SCM.h
+++ b/include/configs/SCM.h
@@ -276,7 +276,7 @@
 #define CFG_ENV_SECT_SIZE      0x40000
 #else
 /* Final version: environment in EEPROM */
-#define CFG_ENV_IS_IN_EEPROM   1
+#define CONFIG_ENV_IS_IN_EEPROM        1
 #define CFG_ENV_OFFSET         0
 #define CFG_ENV_SIZE           2048
 #endif

diff --git a/include/configs/SXNI855T.h b/include/configs/SXNI855T.h
index c5d538686029f3cbbbbf552555fbb239eb19f3b4..85b3a9f75d841bf273112a49f80787c3f596b34b 100644 (file)
--- a/include/configs/SXNI855T.h
+++ b/include/configs/SXNI855T.h
@@ -458,7 +458,7 @@
   #define CFG_ENV_SIZE         0x00002000
 #else
   /* environment is in EEPROM */
-  #define CFG_ENV_IS_IN_EEPROM         1
+  #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*/
 #endif

diff --git a/include/configs/TOP5200.h b/include/configs/TOP5200.h
index 4c447356a442d7946784e690794229089a48744c..083686c28d2fdf4fffc71a2221ff177da2170ea3 100644 (file)
--- a/include/configs/TOP5200.h
+++ b/include/configs/TOP5200.h
@@ -271,7 +271,7 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_IN_EEPROM   1       /* turn on EEPROM env feature */
+#define CONFIG_ENV_IS_IN_EEPROM        1       /* turn on EEPROM env feature */
 #define CFG_ENV_OFFSET         0x1000
 #define CFG_ENV_SIZE           0x0700
 

diff --git a/include/configs/TOP860.h b/include/configs/TOP860.h
index 151c407c845485f094a176b61768d549b687cf15..288019fbbb770b6849d2fb5109817ca5dc013966 100644 (file)
--- a/include/configs/TOP860.h
+++ b/include/configs/TOP860.h
@@ -160,7 +160,7 @@
  * only the first 6k in EEPROM are available for user. Of that we use 256b
  */
 #define        CONFIG_SOFT_I2C
-#define CFG_ENV_IS_IN_EEPROM   1       /* turn on EEPROM env feature */
+#define CONFIG_ENV_IS_IN_EEPROM        1       /* turn on EEPROM env feature */
 #define CFG_ENV_OFFSET         0x1000
 #define CFG_ENV_SIZE           0x0700
 #define CFG_I2C_EEPROM_ADDR 0x57

diff --git a/include/configs/TQM8260.h b/include/configs/TQM8260.h
index ced87b5076badb2053635fbb2ddcd68ef1bb1032..a77b1199bd8105a36de746c75a6ae6feb33ea064 100644 (file)
--- a/include/configs/TQM8260.h
+++ b/include/configs/TQM8260.h
@@ -312,7 +312,7 @@
 #define CFG_ENV_SECT_SIZE      0x40000
 #else
 /* Final version: environment in EEPROM */
-#define CFG_ENV_IS_IN_EEPROM   1
+#define CONFIG_ENV_IS_IN_EEPROM        1
 #define CFG_ENV_OFFSET         0
 #define CFG_ENV_SIZE           2048
 #endif

diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h
index 02cabb2fb81c43d288159b3c44021b1789964aa2..50dd7aae9f729881ee4f67f1c93b1eedf9496736 100644 (file)
--- a/include/configs/VCMA9.h
+++ b/include/configs/VCMA9.h
@@ -89,7 +89,7 @@
 
 #define CFG_I2C_EEPROM_ADDR    0x50
 #define CFG_I2C_EEPROM_ADDR_LEN        2
-#define CFG_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         0x000   /* environment starts at offset 0 */
 #define CFG_ENV_SIZE           0x800   /* 2KB should be more than enough */
 

diff --git a/include/configs/VOH405.h b/include/configs/VOH405.h
index 3ca928ec93192180a4eef3f9e743b2255794a934..5d36f24c336b58680de6fb16bd6ef054f64804cf 100644 (file)
--- a/include/configs/VOH405.h
+++ b/include/configs/VOH405.h
@@ -266,7 +266,7 @@
 /*-----------------------------------------------------------------------
  * Environment Variable setup
  */
-#define CFG_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         0x100   /* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE           0x700   /* 2048 bytes may be used for env vars*/
                                   /* total size of a CAT24WC16 is 2048 bytes */

diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h
index f235890221b1e2b81d9f0aaf7c2ea6c8bd55e02a..eb8cbc81fe918be8234b71ba29c57573aa770432 100644 (file)
--- a/include/configs/VOM405.h
+++ b/include/configs/VOM405.h
@@ -191,7 +191,7 @@
 /*
  * Environment Variable setup
  */
-#define CFG_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         0x100   /* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE           0x700   /* 2048 bytes may be used for env vars*/
                                   /* total size of a CAT24WC16 is 2048 bytes */

diff --git a/include/configs/WUH405.h b/include/configs/WUH405.h
index 582d8cf8640061e5b7d5b475b6654bc93bd7c3b2..9c0bd4398e463d257ec7ff8cafce82d2b1486855 100644 (file)
--- a/include/configs/WUH405.h
+++ b/include/configs/WUH405.h
@@ -229,7 +229,7 @@
 /*-----------------------------------------------------------------------
  * Environment Variable setup
  */
-#define CFG_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         0x100   /* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE           0x700   /* 2048 bytes may be used for env vars*/
                                   /* total size of a CAT24WC16 is 2048 bytes */

diff --git a/include/configs/XPEDITE1K.h b/include/configs/XPEDITE1K.h
index 38ea576a6e804f4785ca7df0cbdd276c2a41a511..c3b0e083f91edf49786b760f11b4db061366ef18 100644 (file)
--- a/include/configs/XPEDITE1K.h
+++ b/include/configs/XPEDITE1K.h
@@ -151,7 +151,7 @@ extern void out32(unsigned int, unsigned long);
 /*-----------------------------------------------------------------------
  * Environment
  *----------------------------------------------------------------------*/
-#define CFG_ENV_IS_IN_EEPROM 1
+#define CONFIG_ENV_IS_IN_EEPROM 1
 #define CFG_ENV_SIZE           0x100       /* Size of Environment vars */
 #define CFG_ENV_OFFSET         0x100
 #define CFG_I2C_EEPROM_ADDR    0x50            /* this is actually the second page of the eeprom */

diff --git a/include/configs/Yukon8220.h b/include/configs/Yukon8220.h
index 1b4195a08fd0e2bb90f5c13308c75973d84ab44f..60f2343722735792bf99e4c30ffefdc8ba7b7d93 100644 (file)
--- a/include/configs/Yukon8220.h
+++ b/include/configs/Yukon8220.h
@@ -133,7 +133,7 @@
 #define CFG_EEPROM_PAGE_WRITE_BITS     3
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 70
 /*
-#define CFG_ENV_IS_IN_EEPROM   1
+#define CONFIG_ENV_IS_IN_EEPROM        1
 #define CFG_ENV_OFFSET         0
 #define CFG_ENV_SIZE           256
 */
@@ -226,11 +226,11 @@
 
 #if defined CFG_ENV_IS_IN_FLASH
 #undef CFG_ENV_IS_IN_NVRAM
-#undef CFG_ENV_IS_IN_EEPROM
+#undef CONFIG_ENV_IS_IN_EEPROM
 #elif defined CFG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_EEPROM
-#elif defined CFG_ENV_IS_IN_EEPROM
+#undef CONFIG_ENV_IS_IN_EEPROM
+#elif defined CONFIG_ENV_IS_IN_EEPROM
 #undef CFG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #endif

diff --git a/include/configs/atc.h b/include/configs/atc.h
index 285b4e4da00970253cc8d3a75e8b5884d9fdf984..1e393a2a1f124ad118ec4bc6771916b57a778879 100644 (file)
--- a/include/configs/atc.h
+++ b/include/configs/atc.h
@@ -275,7 +275,7 @@
 # define CFG_ENV_SIZE          0x10000
 # define CFG_ENV_SECT_SIZE     0x10000
 #else
-#define CFG_ENV_IS_IN_EEPROM   1
+#define CONFIG_ENV_IS_IN_EEPROM        1
 #define CFG_ENV_OFFSET         0
 #define CFG_ENV_SIZE           2048
 #define CFG_EEPROM_PAGE_WRITE_BITS     4       /* 16-byte page size    */

diff --git a/include/configs/bamboo.h b/include/configs/bamboo.h
index 41058f88cf99ef0db75214cafd5d08e51911e750..7caa40393f1d179761661037d928337f54432e69 100644 (file)
--- a/include/configs/bamboo.h
+++ b/include/configs/bamboo.h
@@ -233,10 +233,10 @@
 #define CFG_EEPROM_PAGE_WRITE_BITS 3
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
 
-#ifdef CFG_ENV_IS_IN_EEPROM
+#ifdef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_ENV_SIZE           0x200       /* Size of Environment vars */
 #define CFG_ENV_OFFSET         0x0
-#endif /* CFG_ENV_IS_IN_EEPROM */
+#endif /* CONFIG_ENV_IS_IN_EEPROM */
 
 /*
  * Default environment variables

diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h
index 9f5667bcb5283fea87c1fd927d3cabe5a1e7271c..842207f731175e90931dc75227add7bc247a8619 100644 (file)
--- a/include/configs/bf533-stamp.h
+++ b/include/configs/bf533-stamp.h
@@ -102,7 +102,7 @@
 #define CFG_MAX_FLASH_SECT     67      /* max number of sectors on one chip */
 
 #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_SPI_MASTER)
-#define CFG_ENV_IS_IN_EEPROM   1
+#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 */
 #else

diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h
index a06c1dccfb4dcf03c57472fb89ea14c6f95b0edd..6d438395933266725d69eda9cd9abab3094bd514 100644 (file)
--- a/include/configs/bf537-stamp.h
+++ b/include/configs/bf537-stamp.h
@@ -235,7 +235,7 @@
 #define CONFIG_STACKBASE       (CFG_GBL_DATA_ADDR  - 4)
 
 #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_SPI_MASTER)
-#define CFG_ENV_IS_IN_EEPROM   1
+#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 */
 #else

diff --git a/include/configs/cpci5200.h b/include/configs/cpci5200.h
index fffd1fe1fa7866c0896651ce307786f288ef4309..7974491aca7002d042d1d84aa773248c7c555e2f 100644 (file)
--- a/include/configs/cpci5200.h
+++ b/include/configs/cpci5200.h
@@ -224,7 +224,7 @@
 #define CFG_ENV_SECT_SIZE      0x20000
 #define CONFIG_ENV_OVERWRITE   1
 #else
-#define CFG_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         0x0000  /* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE           0x0400  /* 8192 bytes may be used for env vars */
                                   /* total size of a CAT24WC32 is 8192 bytes */

diff --git a/include/configs/csb272.h b/include/configs/csb272.h
index 5145c004235ed83a915fac9aa42dec3bfc855c05..701d3c8436fb01575518dcdb504030a715115c43 100644 (file)
--- a/include/configs/csb272.h
+++ b/include/configs/csb272.h
@@ -232,7 +232,7 @@
  */
 #define CFG_ENV_IS_IN_FLASH    1       /* environment is in FLASH      */
 #undef CFG_ENV_IS_IN_NVRAM
-#undef CFG_ENV_IS_IN_EEPROM
+#undef CONFIG_ENV_IS_IN_EEPROM
 
 /*
  * General Memory organization

diff --git a/include/configs/csb472.h b/include/configs/csb472.h
index d3e5ea86b1b5d2e7b41548e8ee850e10057bfacc..4fef2f6613ad6075aafe2ecb3fc99c5d7aec1c9b 100644 (file)
--- a/include/configs/csb472.h
+++ b/include/configs/csb472.h
@@ -231,7 +231,7 @@
  */
 #define CFG_ENV_IS_IN_FLASH    1       /* environment is in FLASH      */
 #undef CFG_ENV_IS_IN_NVRAM
-#undef CFG_ENV_IS_IN_EEPROM
+#undef CONFIG_ENV_IS_IN_EEPROM
 
 /*
  * General Memory organization

diff --git a/include/configs/ep82xxm.h b/include/configs/ep82xxm.h
index ac68c869a732efc51259d0ab9fd77c483adf20bb..4de879abe239f87e00424695e05d97ba6715ee5f 100644 (file)
--- a/include/configs/ep82xxm.h
+++ b/include/configs/ep82xxm.h
@@ -194,7 +194,7 @@
 #if 1
 #define CFG_ENV_IS_IN_FLASH     1      /* use FLASH for environment vars       */
 #else
-#define CFG_ENV_IS_IN_EEPROM   1       /* use EEPROM for environment vars      */
+#define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars      */
 #endif
 
 /*-----------------------------------------------------------------------
@@ -223,10 +223,10 @@
 #define CFG_EEPROM_PAGE_WRITE_ENABLE
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
 
-#ifdef CFG_ENV_IS_IN_EEPROM
+#ifdef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_ENV_SIZE           0x200       /* Size of Environment vars */
 #define CFG_ENV_OFFSET         0x0
-#endif /* CFG_ENV_IS_IN_EEPROM */
+#endif /* CONFIG_ENV_IS_IN_EEPROM */
 
 /* RTC Configuration */
 #define CONFIG_RTC_M41T11      1       /* uses a M41T81 */

diff --git a/include/configs/hcu4.h b/include/configs/hcu4.h
index d99ac5355e64d00f0236d3cc51f509c4e6a68aac..f03f9b90d36eabe3f007cfad201bee954d1bf4c6 100644 (file)
--- a/include/configs/hcu4.h
+++ b/include/configs/hcu4.h
@@ -125,7 +125,7 @@
 #define CFG_ENV_IS_IN_FLASH
 #undef  CFG_ENV_IS_NOWHERE
 
-#ifdef  CFG_ENV_IS_IN_EEPROM
+#ifdef  CONFIG_ENV_IS_IN_EEPROM
 /* Put the environment after the SDRAM configuration */
 #define PROM_SIZE      2048
 #define CFG_ENV_OFFSET  512

diff --git a/include/configs/hcu5.h b/include/configs/hcu5.h
index 54d6721145d5260e565de08fb80f2fc7ca1ee011..d2742239083bb882b2546dba861d10702961c8e3 100644 (file)
--- a/include/configs/hcu5.h
+++ b/include/configs/hcu5.h
@@ -108,10 +108,10 @@
 
 #undef CFG_ENV_IS_IN_NVRAM
 #define  CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_EEPROM
+#undef CONFIG_ENV_IS_IN_EEPROM
 #undef  CFG_ENV_IS_NOWHERE
 
-#ifdef  CFG_ENV_IS_IN_EEPROM
+#ifdef  CONFIG_ENV_IS_IN_EEPROM
 /* Put the environment after the SDRAM and bootstrap configuration */
 #define PROM_SIZE      2048
 #define CFG_BOOSTRAP_OPTION_OFFSET      512

diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index 237f3616af44401d52b9a1cbc85806ff98adc375..18ff450f0c96404483b33b8030c8e16d8139f014 100644 (file)
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -152,7 +152,7 @@
 #define CFG_MAX_FLASH_SECT     259          /* max number of sectors on one chip */
 #define CFG_MONITOR_BASE       CFG_FLASH_BASE /* Monitor at beginning of flash */
 
-#define        CFG_ENV_IS_IN_EEPROM            1
+#define        CONFIG_ENV_IS_IN_EEPROM         1
 #define CFG_ENV_OFFSET                 0x00    /* environment starts here     */
 #define CFG_ENV_SIZE                   4096
 #define CFG_I2C_EEPROM_ADDR            0x52

diff --git a/include/configs/innokom.h b/include/configs/innokom.h
index 2b65052671e361e37afd934ac7516d6487cfffeb..1435d049cef043cb5f63d8c6c8b4f7017f0f3ddb 100644 (file)
--- a/include/configs/innokom.h
+++ b/include/configs/innokom.h
@@ -140,7 +140,7 @@
 #define CFG_I2C_SPEED                  50000
 #define CFG_I2C_SLAVE                  0xfe
 
-#define CFG_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                    */

diff --git a/include/configs/kb9202.h b/include/configs/kb9202.h
index e775e60949b505eac3af6a98b67fb7866f1c4810..8df222b88ef1fe08dd3c3d7a8771abad9537284f 100644 (file)
--- a/include/configs/kb9202.h
+++ b/include/configs/kb9202.h
@@ -128,7 +128,7 @@
 
 #define        CONFIG_HARD_I2C
 
-#define        CFG_ENV_IS_IN_EEPROM
+#define        CONFIG_ENV_IS_IN_EEPROM
 
 #ifdef CONFIG_KB9202
 #define CFG_ENV_OFFSET                 0x3E00

diff --git a/include/configs/m501sk.h b/include/configs/m501sk.h
index bc94cf4a33253732f689ac4adbcec65165260a6e..7fc460a705df2f6cee64c6cb4f002a7c2ca5ebb8 100644 (file)
--- a/include/configs/m501sk.h
+++ b/include/configs/m501sk.h
@@ -65,7 +65,7 @@
 #define CFG_I2C_SPEED          100
 #define CFG_I2C_SLAVE          0
 #define CFG_CONSOLE_INFO_QUIET
-#undef CFG_ENV_IS_IN_EEPROM
+#undef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_I2C_EEPROM_ADDR    0x50
 #define CFG_I2C_EEPROM_ADDR_LEN        1
 #define CFG_EEPROM_AT24C16
@@ -164,7 +164,7 @@
 #define CFG_ENV_SIZE           2048
 #endif
 
-#ifdef CFG_ENV_IS_IN_EEPROM
+#ifdef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_ENV_OFFSET         1024
 #define CFG_ENV_SIZE           1024
 #endif

diff --git a/include/configs/mcu25.h b/include/configs/mcu25.h
index 6adba9616fc8441a7adda4abc46cc3f370141563..d146537cd62ddb0a38ed143a5dce282b4347b4fb 100644 (file)
--- a/include/configs/mcu25.h
+++ b/include/configs/mcu25.h
@@ -125,7 +125,7 @@
 #define CFG_ENV_IS_IN_FLASH
 #undef  CFG_ENV_IS_NOWHERE
 
-#ifdef  CFG_ENV_IS_IN_EEPROM
+#ifdef  CONFIG_ENV_IS_IN_EEPROM
 /* Put the environment after the SDRAM configuration */
 #define PROM_SIZE      2048
 #define CFG_ENV_OFFSET  512

diff --git a/include/configs/mecp5200.h b/include/configs/mecp5200.h
index 75040fece6e8361eacd3085a60a105b2fd3e0d57..1c2f1a2ec5fb34aa19e07bc397aa7e34dce3a5e7 100644 (file)
--- a/include/configs/mecp5200.h
+++ b/include/configs/mecp5200.h
@@ -196,7 +196,7 @@
 #define CFG_ENV_SECT_SIZE      0x10000
 #define CONFIG_ENV_OVERWRITE   1
 #else
-#define CFG_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         0x0000  /* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE           0x0400  /* 8192 bytes may be used for env vars*/
                                   /* total size of a CAT24WC32 is 8192 bytes */

diff --git a/include/configs/ml300.h b/include/configs/ml300.h
index 319923ad6efe9d6444440932c840303de8b1dd05..67129a55addf07c429d1cfc8bbeda26597ca260d 100644 (file)
--- a/include/configs/ml300.h
+++ b/include/configs/ml300.h
@@ -62,10 +62,10 @@
 #define CFG_SYSTEMACE_BASE     XPAR_OPB_SYSACE_0_BASEADDR
 #define CFG_SYSTEMACE_WIDTH    XPAR_XSYSACE_MEM_WIDTH
 
-#define CFG_ENV_IS_IN_EEPROM   1       /* environment is in EEPROM */
+#define CONFIG_ENV_IS_IN_EEPROM        1       /* environment is in EEPROM */
 
 /* following are used only if env is in EEPROM */
-#ifdef CFG_ENV_IS_IN_EEPROM
+#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

diff --git a/include/configs/pcu_e.h b/include/configs/pcu_e.h
index 7e393f7611973c35dabb74585b95d65343a4d447..f15ce9906e9138576033ca42c9cc0d55df569314 100644 (file)
--- a/include/configs/pcu_e.h
+++ b/include/configs/pcu_e.h
@@ -234,7 +234,7 @@
 #define        CFG_ENV_IS_EMBEDDED     1       /* short-cut compile-time test          */
 #else
 /* Final version: environment in EEPROM */
-#define CFG_ENV_IS_IN_EEPROM   1
+#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

diff --git a/include/configs/pf5200.h b/include/configs/pf5200.h
index c065d3328c97be28156e6d2e38ef6e9114a03cde..4ed8a212b7c025f63a3cadd3a58484bb285062bd 100644 (file)
--- a/include/configs/pf5200.h
+++ b/include/configs/pf5200.h
@@ -210,7 +210,7 @@
 #define CFG_ENV_SECT_SIZE      0x10000
 #define CONFIG_ENV_OVERWRITE   1
 #else
-#define CFG_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         0x0000  /* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE           0x0400  /* 8192 bytes may be used for env vars */
                                   /* total size of a CAT24WC32 is 8192 bytes */

diff --git a/include/configs/quad100hd.h b/include/configs/quad100hd.h
index d464734dadccd35c53d6f17cdfa11876b29d6d80..94bdd8ca7d2c6f31ed42bbfaa9c686f71c158975 100644 (file)
--- a/include/configs/quad100hd.h
+++ b/include/configs/quad100hd.h
@@ -42,7 +42,7 @@
 #define PLLMR1_DEFAULT         PLLMR1_266_133_66 /* no PCI */
 
 /* the environment is in the EEPROM by default */
-#define CFG_ENV_IS_IN_EEPROM
+#define CONFIG_ENV_IS_IN_EEPROM
 #undef CFG_ENV_IS_IN_FLASH
 
 #define CONFIG_NET_MULTI       1
@@ -208,7 +208,7 @@
 #define CFG_ENV_SIZE_REDUND    (CFG_ENV_SECT_SIZE)
 #endif
 
-#ifdef CFG_ENV_IS_IN_EEPROM
+#ifdef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_ENV_SIZE           0x400           /* Size of Environment vars */
 #define CFG_ENV_OFFSET         0x00000000
 #define CFG_ENABLE_CRC_16      1       /* Intrinsyc formatting used crc16 */

diff --git a/include/configs/redwood.h b/include/configs/redwood.h
index 35e9f8bb5d920d8b53d06aeb8c09d354c578c21c..ebb2921732de4d89b6a5f6811e93727758458a66 100644 (file)
--- a/include/configs/redwood.h
+++ b/include/configs/redwood.h
@@ -121,7 +121,7 @@
  *----------------------------------------------------------------------*/
 #undef CFG_ENV_IS_IN_NVRAM             /* ... not in NVRAM             */
 #define        CFG_ENV_IS_IN_FLASH     1       /* Environment uses flash       */
-#undef CFG_ENV_IS_IN_EEPROM            /* ... not in EEPROM            */
+#undef CONFIG_ENV_IS_IN_EEPROM         /* ... not in EEPROM            */
 
 #define CONFIG_PREBOOT "echo;" \
        "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \

diff --git a/include/configs/sc520_cdp.h b/include/configs/sc520_cdp.h
index dfe7b7d3e498e83d55536017546a3af8465c1041..ecfd7491397311e7716492239acc7c72ac6ecdfd 100644 (file)
--- a/include/configs/sc520_cdp.h
+++ b/include/configs/sc520_cdp.h
@@ -144,7 +144,7 @@
 #define CONFIG_ENV_OVERWRITE
 
 /* Environment in EEPROM */
-#define CFG_ENV_IS_IN_EEPROM   1
+#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

diff --git a/include/configs/sc520_spunk.h b/include/configs/sc520_spunk.h
index 072675b0bd3f744683e2de285ea361bfe78d0f57..aa9dc9755f69909b4bca93216f33c28ec29db4b1 100644 (file)
--- a/include/configs/sc520_spunk.h
+++ b/include/configs/sc520_spunk.h
@@ -161,7 +161,7 @@
 #else
 /* Environment in EEPROM */
 
-# define CFG_ENV_IS_IN_EEPROM   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     */

diff --git a/include/configs/sorcery.h b/include/configs/sorcery.h
index f4e460800cfe5f1a7a025e33d7dc82755d598d7e..0d07560c6a6f38a8fc8f690baca4d4a80d5c9cf9 100644 (file)
--- a/include/configs/sorcery.h
+++ b/include/configs/sorcery.h
@@ -208,11 +208,11 @@
 
 #if defined CFG_ENV_IS_IN_FLASH
 #undef CFG_ENV_IS_IN_NVRAM
-#undef CFG_ENV_IS_IN_EEPROM
+#undef CONFIG_ENV_IS_IN_EEPROM
 #elif defined CFG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_EEPROM
-#elif defined CFG_ENV_IS_IN_EEPROM
+#undef CONFIG_ENV_IS_IN_EEPROM
+#elif defined CONFIG_ENV_IS_IN_EEPROM
 #undef CFG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #endif

diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h
index ac349df297f4e6d34a3cd055229c03bbbc1a23d5..4f1d70c3d5daf450a18779bb1de638ab739aa9d7 100644 (file)
--- a/include/configs/stxssa.h
+++ b/include/configs/stxssa.h
@@ -313,7 +313,7 @@
 
 /* Environment - default config is in flash, see below */
 #if 0  /* in EEPROM */
-# define CFG_ENV_IS_IN_EEPROM  1
+# define CONFIG_ENV_IS_IN_EEPROM       1
 # define CFG_ENV_OFFSET                0
 # define CFG_ENV_SIZE          2048
 #else  /* in flash */
@@ -426,7 +426,7 @@
  * but only little space is available, so we use a very simple setup.
  * With environment in flash, we use a more powerful default configuration.
  */
-#ifdef CFG_ENV_IS_IN_EEPROM            /* use restricted "standard" environment */
+#ifdef CONFIG_ENV_IS_IN_EEPROM         /* use restricted "standard" environment */
 
 #define CONFIG_BAUDRATE                38400
 
@@ -480,6 +480,6 @@
        ""
 #define CONFIG_BOOTCOMMAND     "run flash_self"
 
-#endif /* CFG_ENV_IS_IN_EEPROM */
+#endif /* CONFIG_ENV_IS_IN_EEPROM */
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h
index cb2042ce6ce0fb9f5113cce4e1e4235ed43c0898..f90e9ecd735c31d6ce9d9d2935ce9f8592599ae6 100644 (file)
--- a/include/configs/yosemite.h
+++ b/include/configs/yosemite.h
@@ -98,7 +98,7 @@
 #if 1
 #define CFG_ENV_IS_IN_FLASH     1      /* use FLASH for environment vars       */
 #else
-#define CFG_ENV_IS_IN_EEPROM   1       /* use EEPROM for environment vars      */
+#define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars      */
 #endif
 
 /*-----------------------------------------------------------------------
@@ -147,10 +147,10 @@
 #define CFG_EEPROM_PAGE_WRITE_BITS 3
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
 
-#ifdef CFG_ENV_IS_IN_EEPROM
+#ifdef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_ENV_SIZE           0x200       /* Size of Environment vars */
 #define CFG_ENV_OFFSET         0x0
-#endif /* CFG_ENV_IS_IN_EEPROM */
+#endif /* CONFIG_ENV_IS_IN_EEPROM */
 
 /* I2C SYSMON (LM75, AD7414 is almost compatible)                      */
 #define CONFIG_DTT_LM75                1               /* ON Semi's LM75       */

diff --git a/include/configs/yucca.h b/include/configs/yucca.h
index 026fef67ce4ce01774aab82cbff0438a0f254c18..0c09a1d140d06b0597727e2acd693301a7762e15 100644 (file)
--- a/include/configs/yucca.h
+++ b/include/configs/yucca.h
@@ -141,7 +141,7 @@
 
 #undef  CFG_ENV_IS_IN_NVRAM            /* ... not in NVRAM             */
 #define        CFG_ENV_IS_IN_FLASH     1       /* Environment uses flash       */
-#undef CFG_ENV_IS_IN_EEPROM            /* ... not in EEPROM            */
+#undef CONFIG_ENV_IS_IN_EEPROM         /* ... not in EEPROM            */
 #define CONFIG_ENV_OVERWRITE   1
 
 /*

diff --git a/lib_blackfin/board.c b/lib_blackfin/board.c
index 43d8be8e21f25e37e7ade0eea86549b125775152..0b8e664141a6e8e8639232e752238c4784905698 100644 (file)
--- a/lib_blackfin/board.c
+++ b/lib_blackfin/board.c
@@ -378,7 +378,7 @@ void board_init_r(gd_t * id, ulong dest_addr)
        malloc_bin_reloc();
 
 #ifdef CONFIG_SPI
-# if ! defined(CFG_ENV_IS_IN_EEPROM)
+# if ! defined(CONFIG_ENV_IS_IN_EEPROM)
        spi_init_f();
 # endif
        spi_init_r();

diff --git a/lib_m68k/board.c b/lib_m68k/board.c
index 4fee35aeabff926dc3dfcd2934416f1b45ff3d3b..a80ec2d198d6fefcbe1c3ce76be18cca239f5e63 100644 (file)
--- a/lib_m68k/board.c
+++ b/lib_m68k/board.c
@@ -568,7 +568,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
        malloc_bin_reloc ();
 
 #ifdef CONFIG_SPI
-# if !defined(CFG_ENV_IS_IN_EEPROM)
+# if !defined(CONFIG_ENV_IS_IN_EEPROM)
        spi_init_f ();
 # endif
        spi_init_r ();

diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index 4d02eb2850db5ca6f56a7f57384936117247bcc0..1e004048090bdea95433efc695fe1f7214b26d3f 100644 (file)
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -822,7 +822,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
        malloc_bin_reloc ();
 
 #ifdef CONFIG_SPI
-# if !defined(CFG_ENV_IS_IN_EEPROM)
+# if !defined(CONFIG_ENV_IS_IN_EEPROM)
        spi_init_f ();
 # endif
        spi_init_r ();

diff --git a/lib_sparc/board.c b/lib_sparc/board.c
index 15d69355ea3c65c617f540c5150c26c2e199aa14..3c57fcb16aba136f7a0167fbbdcb6aa926125770 100644 (file)
--- a/lib_sparc/board.c
+++ b/lib_sparc/board.c
@@ -377,7 +377,7 @@ void board_init_f(ulong bootflag)
        malloc_bin_reloc();
 
 #ifdef CONFIG_SPI
-# if !defined(CFG_ENV_IS_IN_EEPROM)
+# if !defined(CONFIG_ENV_IS_IN_EEPROM)
        spi_init_f();
 # endif
        spi_init_r();