summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/configs/APC405.h2
-rw-r--r--include/configs/ASH405.h2
-rw-r--r--include/configs/Alaska8220.h8
-rw-r--r--include/configs/B2.h2
-rw-r--r--include/configs/CANBT.h2
-rw-r--r--include/configs/CCM.h2
-rw-r--r--include/configs/CMS700.h2
-rw-r--r--include/configs/CPCI2DP.h2
-rw-r--r--include/configs/CPCI405.h2
-rw-r--r--include/configs/CPCI4052.h2
-rw-r--r--include/configs/CPCI405AB.h2
-rw-r--r--include/configs/CPCI405DT.h2
-rw-r--r--include/configs/CPCI750.h2
-rw-r--r--include/configs/CPCIISER4.h2
-rw-r--r--include/configs/CPU86.h2
-rw-r--r--include/configs/CPU87.h2
-rw-r--r--include/configs/DP405.h2
-rw-r--r--include/configs/DU405.h2
-rw-r--r--include/configs/DU440.h4
-rw-r--r--include/configs/ELPT860.h2
-rw-r--r--include/configs/ERIC.h8
-rw-r--r--include/configs/EXBITGEN.h4
-rw-r--r--include/configs/G2000.h2
-rw-r--r--include/configs/GEN860T.h4
-rw-r--r--include/configs/GTH.h2
-rw-r--r--include/configs/HH405.h2
-rw-r--r--include/configs/HUB405.h2
-rw-r--r--include/configs/IP860.h6
-rw-r--r--include/configs/JSE.h2
-rw-r--r--include/configs/KAREF.h2
-rw-r--r--include/configs/METROBOX.h2
-rw-r--r--include/configs/MIP405.h2
-rw-r--r--include/configs/OCRTC.h2
-rw-r--r--include/configs/ORSG.h2
-rw-r--r--include/configs/PATI.h4
-rw-r--r--include/configs/PCI405.h2
-rw-r--r--include/configs/PIP405.h2
-rw-r--r--include/configs/PLU405.h2
-rw-r--r--include/configs/PM826.h2
-rw-r--r--include/configs/PM828.h2
-rw-r--r--include/configs/PMC405.h2
-rw-r--r--include/configs/PMC440.h4
-rw-r--r--include/configs/PPChameleonEVB.h2
-rw-r--r--include/configs/SCM.h2
-rw-r--r--include/configs/SXNI855T.h2
-rw-r--r--include/configs/TOP5200.h2
-rw-r--r--include/configs/TOP860.h2
-rw-r--r--include/configs/TQM8260.h2
-rw-r--r--include/configs/VCMA9.h2
-rw-r--r--include/configs/VOH405.h2
-rw-r--r--include/configs/VOM405.h2
-rw-r--r--include/configs/WUH405.h2
-rw-r--r--include/configs/XPEDITE1K.h2
-rw-r--r--include/configs/Yukon8220.h8
-rw-r--r--include/configs/atc.h2
-rw-r--r--include/configs/bamboo.h4
-rw-r--r--include/configs/bf533-stamp.h2
-rw-r--r--include/configs/bf537-stamp.h2
-rw-r--r--include/configs/cpci5200.h2
-rw-r--r--include/configs/csb272.h2
-rw-r--r--include/configs/csb472.h2
-rw-r--r--include/configs/ep82xxm.h6
-rw-r--r--include/configs/hcu4.h2
-rw-r--r--include/configs/hcu5.h4
-rw-r--r--include/configs/imx31_phycore.h2
-rw-r--r--include/configs/innokom.h2
-rw-r--r--include/configs/kb9202.h2
-rw-r--r--include/configs/m501sk.h4
-rw-r--r--include/configs/mcu25.h2
-rw-r--r--include/configs/mecp5200.h2
-rw-r--r--include/configs/ml300.h4
-rw-r--r--include/configs/pcu_e.h2
-rw-r--r--include/configs/pf5200.h2
-rw-r--r--include/configs/quad100hd.h4
-rw-r--r--include/configs/redwood.h2
-rw-r--r--include/configs/sc520_cdp.h2
-rw-r--r--include/configs/sc520_spunk.h2
-rw-r--r--include/configs/sorcery.h6
-rw-r--r--include/configs/stxssa.h6
-rw-r--r--include/configs/yosemite.h6
-rw-r--r--include/configs/yucca.h2
81 files changed, 110 insertions, 110 deletions
diff --git a/include/configs/APC405.h b/include/configs/APC405.h
index 6ee0a3631f..882d188e1e 100644
--- 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 85c6a992d7..56ae708eb3 100644
--- 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 38b962f823..0c2e6aefd3 100644
--- 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 d6ab1adeb9..1c4b6fee99 100644
--- 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 7029dbddef..a4afccab96 100644
--- 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 6194c5c6e2..57c122395d 100644
--- 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 285cd5c0e8..f157b5f754 100644
--- 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 58900c3091..8b205c7720 100644
--- 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 bd43e1dc9a..bc514b0383 100644
--- 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 9ec1721897..ef8abf6466 100644
--- 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 78995984f7..431054d394 100644
--- 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 c173539202..6c5a3fe921 100644
--- 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 03756c3b24..4818aede30 100644
--- 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 78b754c19d..958b11151e 100644
--- 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 10cebc99c2..742ea463e5 100644
--- 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 d325c4d076..db423a0ba9 100644
--- 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 912fb2af1c..50d44a0326 100644
--- 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 c8bf67fe96..811b9c3f9b 100644
--- 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 c757523aec..b1d4ff3f64 100644
--- 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 f927a2c9cc..828dd9fe68 100644
--- 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 bfdcf6a554..dfbbc95ddb 100644
--- 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 99d1cf255c..cee0be4976 100644
--- 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 c12ce48b6f..74e6ef70ee 100644
--- 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 422ed32aaa..51cf5794b9 100644
--- 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 461670a104..4a98c40638 100644
--- 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 9bcbfe3b7d..cf5fcf12cb 100644
--- 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 a389d582df..8992706951 100644
--- 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 e6c7fe656d..67f8833259 100644
--- 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 5b40ef6b42..b08301e138 100644
--- 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 816e63ba2a..5b21b905ec 100644
--- 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 d61b49eeec..2afb3fffcb 100644
--- 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 66235e37b4..e0f938625c 100644
--- 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 94b5bc965e..c561e15ac8 100644
--- 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 4e030885fe..fd140884a4 100644
--- 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 4b37eca7ce..2676c78fa9 100644
--- 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 e70c0d3d4d..dea59b647d 100644
--- 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 86ea6c69b9..7876177f04 100644
--- 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 38c495e026..75cdc2fcfb 100644
--- 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 190e2a4424..de1ecde0d5 100644
--- 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 96c0edf939..cac8f27266 100644
--- 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 966bbf9a31..f627422901 100644
--- 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 9140287c87..071ba10d44 100644
--- 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 cf98324344..a33bc3ba5a 100644
--- 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 febfc39263..2c7e55f287 100644
--- 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 c5d5386860..85b3a9f75d 100644
--- 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 4c447356a4..083686c28d 100644
--- 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 151c407c84..288019fbbb 100644
--- 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 ced87b5076..a77b1199bd 100644
--- 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 02cabb2fb8..50dd7aae9f 100644
--- 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 3ca928ec93..5d36f24c33 100644
--- 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 f235890221..eb8cbc81fe 100644
--- 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 582d8cf864..9c0bd4398e 100644
--- 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 38ea576a6e..c3b0e083f9 100644
--- 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 1b4195a08f..60f2343722 100644
--- 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 285b4e4da0..1e393a2a1f 100644
--- 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 41058f88cf..7caa40393f 100644
--- 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 9f5667bcb5..842207f731 100644
--- 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 a06c1dccfb..6d43839593 100644
--- 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 fffd1fe1fa..7974491aca 100644
--- 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 5145c00423..701d3c8436 100644
--- 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 d3e5ea86b1..4fef2f6613 100644
--- 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 ac68c869a7..4de879abe2 100644
--- 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 d99ac5355e..f03f9b90d3 100644
--- 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 54d6721145..d274223908 100644
--- 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 237f3616af..18ff450f0c 100644
--- 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 2b65052671..1435d049ce 100644
--- 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 e775e60949..8df222b88e 100644
--- 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 bc94cf4a33..7fc460a705 100644
--- 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 6adba9616f..d146537cd6 100644
--- 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 75040fece6..1c2f1a2ec5 100644
--- 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 319923ad6e..67129a55ad 100644
--- 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 7e393f7611..f15ce9906e 100644
--- 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 c065d3328c..4ed8a212b7 100644
--- 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 d464734dad..94bdd8ca7d 100644
--- 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 35e9f8bb5d..ebb2921732 100644
--- 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 dfe7b7d3e4..ecfd749139 100644
--- 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 072675b0bd..aa9dc9755f 100644
--- 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 f4e460800c..0d07560c6a 100644
--- 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 ac349df297..4f1d70c3d5 100644
--- 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 cb2042ce6c..f90e9ecd73 100644
--- 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 026fef67ce..0c09a1d140 100644
--- 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
/*