rename CFG_ENV_IS_NOWHERE in CONFIG_ENV_IS_NOWHERE
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
diff --git a/include/configs/ADNPESC1.h b/include/configs/ADNPESC1.h
index 01ee72b..cc91c8d 100644
--- a/include/configs/ADNPESC1.h
+++ b/include/configs/ADNPESC1.h
@@ -129,7 +129,7 @@
#define CONFIG_ENV_OVERWRITE /* Serial/eth change Ok */
#else
-#define CFG_ENV_IS_NOWHERE 1 /* NO Environment */
+#define CONFIG_ENV_IS_NOWHERE 1 /* NO Environment */
#endif
/*------------------------------------------------------------------------
diff --git a/include/configs/DK1C20.h b/include/configs/DK1C20.h
index fb06689..9658278 100644
--- a/include/configs/DK1C20.h
+++ b/include/configs/DK1C20.h
@@ -117,7 +117,7 @@
#define CONFIG_ENV_OVERWRITE /* Serial/eth change Ok */
#else
-#define CFG_ENV_IS_NOWHERE 1 /* NO Environment */
+#define CONFIG_ENV_IS_NOWHERE 1 /* NO Environment */
#endif
/*------------------------------------------------------------------------
diff --git a/include/configs/DK1S10.h b/include/configs/DK1S10.h
index 7a9ef79..e5bf8c7 100644
--- a/include/configs/DK1S10.h
+++ b/include/configs/DK1S10.h
@@ -133,7 +133,7 @@
#define CONFIG_ENV_OVERWRITE /* Serial/eth change Ok */
#else
-#define CFG_ENV_IS_NOWHERE 1 /* NO Environment */
+#define CONFIG_ENV_IS_NOWHERE 1 /* NO Environment */
#endif
/*------------------------------------------------------------------------
diff --git a/include/configs/JSE.h b/include/configs/JSE.h
index fccf880..ecc344d 100644
--- a/include/configs/JSE.h
+++ b/include/configs/JSE.h
@@ -80,7 +80,7 @@
#undef CONFIG_ENV_IS_IN_NVRAM
#undef CFG_ENV_IS_IN_FLASH
#define CONFIG_ENV_IS_IN_EEPROM 1
-#undef CFG_ENV_IS_NOWHERE
+#undef CONFIG_ENV_IS_NOWHERE
/* This is the 7bit address of the device, not including P. */
#define CFG_I2C_EEPROM_ADDR 0x50
diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index c17a2ea..776fe99 100644
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -400,7 +400,7 @@
/* Address and size of Redundant Environment Sector */
#else
- #define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
+ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index 006b93a..1edd9ce 100644
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -383,7 +383,7 @@
#define CFG_ENV_SIZE 0x2000
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
- #define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
+ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index 94b3d5a..308f102 100644
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -397,7 +397,7 @@
#define CFG_ENV_SIZE 0x2000
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
- #define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
+ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index 401d0af..b98f3ee 100644
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -409,7 +409,7 @@
#define CFG_ENV_SIZE 0x2000
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
- #define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
+ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index c8870b5..e03f5ca 100644
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -476,7 +476,7 @@
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
- #define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
+ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index 45ddd5c..7f5d303 100644
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -420,7 +420,7 @@
#else
#define CFG_NO_FLASH /* Flash is not usable now */
#undef CONFIG_FLASH_CFI_DRIVER
- #define CFG_ENV_IS_NOWHERE /* Store ENV in memory only */
+ #define CONFIG_ENV_IS_NOWHERE /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h
index 43d4118..c532eb1 100644
--- a/include/configs/MPC8360EMDS.h
+++ b/include/configs/MPC8360EMDS.h
@@ -440,7 +440,7 @@
#define CFG_ENV_SIZE 0x2000
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
- #define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
+ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/MPC8360ERDK.h b/include/configs/MPC8360ERDK.h
index 6898495..4701600 100644
--- a/include/configs/MPC8360ERDK.h
+++ b/include/configs/MPC8360ERDK.h
@@ -345,7 +345,7 @@
#define CFG_ENV_SIZE 0x20000
#else /* CFG_RAMBOOT */
#define CFG_NO_FLASH 1 /* Flash is not usable now */
-#define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
+#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000
#endif /* CFG_RAMBOOT */
diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index f9c1b17..220c148 100644
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -427,7 +427,7 @@
#define CFG_ENV_SIZE 0x2000
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
- #define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
+ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 82b3353..289bcfa 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -448,7 +448,7 @@
#define CFG_ENV_SIZE 0x4000
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
- #define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
+ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE-0x1000)
#define CFG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index 74f8605..c23dcf6 100644
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -387,7 +387,7 @@
#define CFG_ENV_SIZE 0x2000
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
- #define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
+ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/MPC8540EVAL.h b/include/configs/MPC8540EVAL.h
index 1073e23..04bec2d 100644
--- a/include/configs/MPC8540EVAL.h
+++ b/include/configs/MPC8540EVAL.h
@@ -256,7 +256,7 @@
/* Environment */
#ifndef CFG_RAMBOOT
#if defined(CONFIG_RAM_AS_FLASH)
-#define CFG_ENV_IS_NOWHERE
+#define CONFIG_ENV_IS_NOWHERE
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x100000)
#define CFG_ENV_SIZE 0x2000
#else
@@ -267,7 +267,7 @@
#define CFG_ENV_SIZE 0x2000
#else
/* #define CFG_NO_FLASH 1 */ /* Flash is not usable now */
-#define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
+#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index a8e7c0a..f661c8e 100644
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -418,7 +418,7 @@
#define CFG_ENV_SIZE 0x2000
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
- #define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
+ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 7c69582..2ee8d57 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -443,7 +443,7 @@
#define CFG_ENV_SECT_SIZE 0x20000 /* 126k (one sector) for env */
#define CFG_ENV_SIZE 0x2000
#else
-#define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
+#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index a57c303..170fbd6 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -509,7 +509,7 @@
#define CFG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */
#define CFG_ENV_SIZE 0x2000
#else
- #define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
+ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/PM854.h b/include/configs/PM854.h
index aa6095f..1212bcd 100644
--- a/include/configs/PM854.h
+++ b/include/configs/PM854.h
@@ -299,7 +299,7 @@
#define CFG_ENV_SIZE 0x2000
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
- #define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
+ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/PM856.h b/include/configs/PM856.h
index 244f09a..75dba3b 100644
--- a/include/configs/PM856.h
+++ b/include/configs/PM856.h
@@ -299,7 +299,7 @@
#define CFG_ENV_SIZE 0x2000
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
- #define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
+ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/PN62.h b/include/configs/PN62.h
index da7d8b8..074e8a1 100644
--- a/include/configs/PN62.h
+++ b/include/configs/PN62.h
@@ -160,7 +160,7 @@
#define CFG_NO_FLASH 1 /* There is no FLASH memory */
-#define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
+#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_OFFSET 0x00004000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x00002000 /* Total Size of Environment Sector */
diff --git a/include/configs/SBC8540.h b/include/configs/SBC8540.h
index 93509ee..6b25d56 100644
--- a/include/configs/SBC8540.h
+++ b/include/configs/SBC8540.h
@@ -333,7 +333,7 @@
/* Environment */
#if !defined(CFG_RAMBOOT)
#if defined(CONFIG_RAM_AS_FLASH)
- #define CFG_ENV_IS_NOWHERE
+ #define CONFIG_ENV_IS_NOWHERE
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x100000)
#define CFG_ENV_SIZE 0x2000
#else
@@ -344,7 +344,7 @@
#endif
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
- #define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
+ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index e8f69f6..2ab6991 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -306,7 +306,7 @@
#define CFG_ENV_SIZE 0x2000
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
- #define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
+ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/cm4008.h b/include/configs/cm4008.h
index ae40b35..85f45b7 100644
--- a/include/configs/cm4008.h
+++ b/include/configs/cm4008.h
@@ -52,7 +52,7 @@
/*
* select serial console configuration
*/
-#define CFG_ENV_IS_NOWHERE
+#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_SERIAL1
#define CONFIG_CONS_INDEX 1
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/cm41xx.h b/include/configs/cm41xx.h
index c1dd33d..f34dc5c 100644
--- a/include/configs/cm41xx.h
+++ b/include/configs/cm41xx.h
@@ -52,7 +52,7 @@
/*
* select serial console configuration
*/
-#define CFG_ENV_IS_NOWHERE
+#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_SERIAL1
#define CONFIG_CONS_INDEX 1
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index 8941c5e..d422cce 100644
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -198,7 +198,7 @@
#define CFG_FLASH_ERASE_TOUT (2 * CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (2 * CFG_HZ) /* Timeout for Flash Write */
-#define CFG_ENV_IS_NOWHERE 1
+#define CONFIG_ENV_IS_NOWHERE 1
/* Address and size of Primary Environment Sector */
#define CFG_ENV_ADDR 0xB0030000
diff --git a/include/configs/evb4510.h b/include/configs/evb4510.h
index 1571477..f2ed0df 100644
--- a/include/configs/evb4510.h
+++ b/include/configs/evb4510.h
@@ -172,7 +172,7 @@
/* environment settings */
#define CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_NOWHERE
+#undef CONFIG_ENV_IS_NOWHERE
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x20000) /* environment start address */
#define CFG_ENV_SECT_SIZE 0x10000 /* Total Size of Environment Sector */
diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h
index 942609f..7fee1d2 100644
--- a/include/configs/gr_cpci_ax2000.h
+++ b/include/configs/gr_cpci_ax2000.h
@@ -218,7 +218,7 @@
/*
* Environment settings
*/
-/*#define CFG_ENV_IS_NOWHERE 1*/
+/*#define CONFIG_ENV_IS_NOWHERE 1*/
#define CFG_ENV_IS_IN_FLASH 1
/* CFG_ENV_ADDR need to be at sector boundary */
#define CFG_ENV_SIZE 0x8000
diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h
index ae25fb2..776fe40 100644
--- a/include/configs/gr_ep2s60.h
+++ b/include/configs/gr_ep2s60.h
@@ -206,7 +206,7 @@
/*
* Environment settings
*/
-/*#define CFG_ENV_IS_NOWHERE 1*/
+/*#define CONFIG_ENV_IS_NOWHERE 1*/
#define CFG_ENV_IS_IN_FLASH 1
/* CFG_ENV_ADDR need to be at sector boundary */
#define CFG_ENV_SIZE 0x8000
diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h
index f019bb4..f0f770c 100644
--- a/include/configs/gr_xc3s_1500.h
+++ b/include/configs/gr_xc3s_1500.h
@@ -182,7 +182,7 @@
/*
* Environment settings
*/
-/*#define CFG_ENV_IS_NOWHERE 1*/
+/*#define CONFIG_ENV_IS_NOWHERE 1*/
#define CFG_ENV_IS_IN_FLASH 1
/* CFG_ENV_ADDR need to be at sector boundary */
#define CFG_ENV_SIZE 0x8000
diff --git a/include/configs/grsim.h b/include/configs/grsim.h
index f880a7b..c6d3666 100644
--- a/include/configs/grsim.h
+++ b/include/configs/grsim.h
@@ -209,7 +209,7 @@
/*
* Environment settings
*/
-#define CFG_ENV_IS_NOWHERE 1
+#define CONFIG_ENV_IS_NOWHERE 1
/*#define CFG_ENV_IS_IN_FLASH 0*/
/*#define CFG_ENV_SIZE 0x8000*/
#define CFG_ENV_SECT_SIZE 0x40000
diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h
index e5af9a6..945a163 100644
--- a/include/configs/grsim_leon2.h
+++ b/include/configs/grsim_leon2.h
@@ -206,7 +206,7 @@
/*
* Environment settings
*/
-#define CFG_ENV_IS_NOWHERE 1
+#define CONFIG_ENV_IS_NOWHERE 1
/*#define CFG_ENV_IS_IN_FLASH 0*/
/*#define CFG_ENV_SIZE 0x8000*/
#define CFG_ENV_SECT_SIZE 0x40000
diff --git a/include/configs/gth2.h b/include/configs/gth2.h
index 7f7190b..ad8bb59 100644
--- a/include/configs/gth2.h
+++ b/include/configs/gth2.h
@@ -153,7 +153,7 @@
#define CFG_FLASH_ERASE_TOUT (2 * CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (2 * CFG_HZ) /* Timeout for Flash Write */
-#define CFG_ENV_IS_NOWHERE 1
+#define CONFIG_ENV_IS_NOWHERE 1
/* Address and size of Primary Environment Sector */
#define CFG_ENV_ADDR 0xB0030000
diff --git a/include/configs/hcu4.h b/include/configs/hcu4.h
index 0dd9787..7f262cb 100644
--- a/include/configs/hcu4.h
+++ b/include/configs/hcu4.h
@@ -123,7 +123,7 @@
#undef CONFIG_ENV_IS_IN_NVRAM
#define CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_NOWHERE
+#undef CONFIG_ENV_IS_NOWHERE
#ifdef CONFIG_ENV_IS_IN_EEPROM
/* Put the environment after the SDRAM configuration */
diff --git a/include/configs/hcu5.h b/include/configs/hcu5.h
index 0796a7d..af0f7f4 100644
--- a/include/configs/hcu5.h
+++ b/include/configs/hcu5.h
@@ -109,7 +109,7 @@
#undef CONFIG_ENV_IS_IN_NVRAM
#define CFG_ENV_IS_IN_FLASH
#undef CONFIG_ENV_IS_IN_EEPROM
-#undef CFG_ENV_IS_NOWHERE
+#undef CONFIG_ENV_IS_NOWHERE
#ifdef CONFIG_ENV_IS_IN_EEPROM
/* Put the environment after the SDRAM and bootstrap configuration */
diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h
index ba3c531..dd070be 100644
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -128,7 +128,7 @@
/*-----------------------------------------------------------------------
* FLASH and environment organization
*/
-#define CFG_ENV_IS_NOWHERE
+#define CONFIG_ENV_IS_NOWHERE
#define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */
#define PHYS_FLASH_SIZE 0x01000000 /* 16MB */
/* timeout values are in ticks */
diff --git a/include/configs/mcu25.h b/include/configs/mcu25.h
index 5c234df..35ecc65 100644
--- a/include/configs/mcu25.h
+++ b/include/configs/mcu25.h
@@ -123,7 +123,7 @@
#undef CONFIG_ENV_IS_IN_NVRAM
#define CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_NOWHERE
+#undef CONFIG_ENV_IS_NOWHERE
#ifdef CONFIG_ENV_IS_IN_EEPROM
/* Put the environment after the SDRAM configuration */
diff --git a/include/configs/ml401.h b/include/configs/ml401.h
index 36a42ba..c626702 100644
--- a/include/configs/ml401.h
+++ b/include/configs/ml401.h
@@ -161,7 +161,7 @@
#define CFG_FLASH_PROTECTION /* hardware flash protection */
#ifdef RAMENV
- #define CFG_ENV_IS_NOWHERE 1
+ #define CONFIG_ENV_IS_NOWHERE 1
#define CFG_ENV_SIZE 0x1000
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - CFG_ENV_SIZE)
@@ -174,7 +174,7 @@
#else /* !FLASH */
/* ENV in RAM */
#define CFG_NO_FLASH 1
- #define CFG_ENV_IS_NOWHERE 1
+ #define CONFIG_ENV_IS_NOWHERE 1
#define CFG_ENV_SIZE 0x1000
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - CFG_ENV_SIZE)
#define CFG_FLASH_PROTECTION /* hardware flash protection */
diff --git a/include/configs/modnet50.h b/include/configs/modnet50.h
index 5159897..84540f5 100644
--- a/include/configs/modnet50.h
+++ b/include/configs/modnet50.h
@@ -171,7 +171,7 @@
/* environment settings */
#define CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_NOWHERE
+#undef CONFIG_ENV_IS_NOWHERE
#define CFG_ENV_ADDR 0x1001C000 /* environment start address */
#define CFG_ENV_SECT_SIZE 0x10000 /* Total Size of Environment Sector */
diff --git a/include/configs/ns9750dev.h b/include/configs/ns9750dev.h
index 746a56e..b9eec62 100644
--- a/include/configs/ns9750dev.h
+++ b/include/configs/ns9750dev.h
@@ -186,7 +186,7 @@
/* @TODO */
/*#define CFG_ENV_IS_IN_FLASH 1*/
-#define CFG_ENV_IS_NOWHERE
+#define CONFIG_ENV_IS_NOWHERE
#define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */
#ifdef CONFIG_STATUS_LED
diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h
index 2caa641..4ec520f 100644
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -116,7 +116,7 @@
#define CFG_FLASH_ERASE_TOUT (2 * CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (2 * CFG_HZ) /* Timeout for Flash Write */
-#define CFG_ENV_IS_NOWHERE 1
+#define CONFIG_ENV_IS_NOWHERE 1
/* Address and size of Primary Environment Sector */
#define CFG_ENV_ADDR 0xB0030000
diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index 261229c..264f5ab 100644
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -424,7 +424,7 @@
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
- #define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
+ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h
index 99d328c..f39867f 100644
--- a/include/configs/sbc8560.h
+++ b/include/configs/sbc8560.h
@@ -332,7 +332,7 @@
/* Environment */
#if !defined(CFG_RAMBOOT)
#if defined(CONFIG_RAM_AS_FLASH)
- #define CFG_ENV_IS_NOWHERE
+ #define CONFIG_ENV_IS_NOWHERE
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x100000)
#define CFG_ENV_SIZE 0x2000
#else
@@ -343,7 +343,7 @@
#endif
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
- #define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
+ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h
index ea79de7..f4a8fa5 100644
--- a/include/configs/stxgp3.h
+++ b/include/configs/stxgp3.h
@@ -294,7 +294,7 @@
#define CFG_ENV_SIZE 0x2000
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
- #define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
+ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/suzaku.h b/include/configs/suzaku.h
index 020ed02..5299733 100644
--- a/include/configs/suzaku.h
+++ b/include/configs/suzaku.h
@@ -90,7 +90,7 @@
/*-----------------------------------------------------------------------
* NVRAM organization
*/
-#define CFG_ENV_IS_NOWHERE 1
+#define CONFIG_ENV_IS_NOWHERE 1
#define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */
#define CFG_ENV_SECT_SIZE 0x10000 /* see README - env sector total size */
diff --git a/include/configs/versatile.h b/include/configs/versatile.h
index c18a248..f563c58 100644
--- a/include/configs/versatile.h
+++ b/include/configs/versatile.h
@@ -185,7 +185,7 @@
#define PHYS_FLASH_1 (CFG_FLASH_BASE)
-#define CFG_ENV_IS_IN_FLASH 1 /* env in flash instead of CFG_ENV_IS_NOWHERE */
+#define CFG_ENV_IS_IN_FLASH 1 /* env in flash instead of CONFIG_ENV_IS_NOWHERE */
#define CFG_ENV_SECT_SIZE 0x00020000 /* 256 KB sectors (x2) */
#define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */
#define CFG_ENV_OFFSET 0x01f00000 /* environment starts here */
diff --git a/include/configs/xupv2p.h b/include/configs/xupv2p.h
index 570d6a8..7bd1424 100644
--- a/include/configs/xupv2p.h
+++ b/include/configs/xupv2p.h
@@ -150,7 +150,7 @@
#define CFG_INIT_SP_OFFSET CFG_MALLOC_BASE
#define CFG_NO_FLASH 1
-#define CFG_ENV_IS_NOWHERE 1
+#define CONFIG_ENV_IS_NOWHERE 1
#define CFG_ENV_SIZE 0x1000
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - CFG_ENV_SIZE)