rename CFG_ENV_IS_IN_NVRAM in CONFIG_ENV_IS_IN_NVRAM

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

54 files changed, 80 insertions, 80 deletions

diff --git a/include/configs/ADCIOP.h b/include/configs/ADCIOP.h
index 5d28168fbc..148c905925 100644
--- a/include/configs/ADCIOP.h
+++ b/include/configs/ADCIOP.h
@@ -160,7 +160,7 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
+#define CONFIG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
 #define CFG_NVRAM_BASE_ADDR	0x10000000		/* NVRAM base address	*/
 #define CFG_NVRAM_SIZE		(32*1024)		/* NVRAM size		*/
 #define CFG_ENV_SIZE		0x0400		/* Size of Environment vars	*/
diff --git a/include/configs/AP1000.h b/include/configs/AP1000.h
index baa9741039..f0e0282280 100644
--- a/include/configs/AP1000.h
+++ b/include/configs/AP1000.h
@@ -40,11 +40,11 @@
 #define CFG_ENV_IS_IN_FLASH	1
 #define CFG_FLASH_USE_BUFFER_WRITE
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#ifdef CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #else
 #ifdef CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #endif
 #endif
 
@@ -186,7 +186,7 @@
 #define CFG_NVRAM_BASE_ADDR	0xf0000000	/* NVRAM base address	*/
 #define CFG_NVRAM_SIZE		0x1ff8		/* NVRAM size	*/
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#ifdef CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_SIZE		0x1000		/* Size of Environment vars */
 #define CFG_ENV_ADDR	    \
     (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)	/* Env	*/
diff --git a/include/configs/Alaska8220.h b/include/configs/Alaska8220.h
index 0c2e6aefd3..3d4cd36a49 100644
--- a/include/configs/Alaska8220.h
+++ b/include/configs/Alaska8220.h
@@ -225,13 +225,13 @@
 #define CONFIG_ENV_OVERWRITE	1
 
 #if defined CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #undef CONFIG_ENV_IS_IN_EEPROM
-#elif defined CFG_ENV_IS_IN_NVRAM
+#elif defined CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #undef CONFIG_ENV_IS_IN_EEPROM
 #elif defined CONFIG_ENV_IS_IN_EEPROM
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #endif
 
diff --git a/include/configs/AmigaOneG3SE.h b/include/configs/AmigaOneG3SE.h
index 84efd2fe08..17f5909330 100644
--- a/include/configs/AmigaOneG3SE.h
+++ b/include/configs/AmigaOneG3SE.h
@@ -240,7 +240,7 @@
 /*
  * Environment is stored in NVRAM.
  */
-#define CFG_ENV_IS_IN_NVRAM	1
+#define CONFIG_ENV_IS_IN_NVRAM	1
 #define CFG_ENV_ADDR		0xFD0E0000 /* This should be 0xFD0E0000, but we skip bytes to
 					    * protect softex's settings for now.
 					    * Original 768 bytes where not enough.
diff --git a/include/configs/BAB7xx.h b/include/configs/BAB7xx.h
index 26a1a2d312..c19f1e9f05 100644
--- a/include/configs/BAB7xx.h
+++ b/include/configs/BAB7xx.h
@@ -243,7 +243,7 @@
  * Environment settings
  */
 #define CONFIG_ENV_OVERWRITE
-#define CFG_ENV_IS_IN_NVRAM     1           /* use NVRAM for environment vars */
+#define CONFIG_ENV_IS_IN_NVRAM     1           /* use NVRAM for environment vars */
 #define CFG_NVRAM_SIZE          0x1ff0      /* NVRAM size (8kB), we must protect the clock data (16 bytes) */
 #define CFG_ENV_SIZE            0x400       /* Size of Environment vars (1kB) */
 /*
diff --git a/include/configs/BMW.h b/include/configs/BMW.h
index 11d19c6f7f..5ba3e6d570 100644
--- a/include/configs/BMW.h
+++ b/include/configs/BMW.h
@@ -289,7 +289,7 @@
  * Warining: environment is not EMBEDDED in the U-Boot code.
  * It's stored in flash separately.
  */
-#define CFG_ENV_IS_IN_NVRAM      1
+#define CONFIG_ENV_IS_IN_NVRAM      1
 #define CONFIG_ENV_OVERWRITE     1
 #define CFG_NVRAM_ACCESS_ROUTINE 1
 #define CFG_ENV_ADDR		0x7c004000 /* right at the start of NVRAM  */
diff --git a/include/configs/CPCI405.h b/include/configs/CPCI405.h
index bc514b0383..9a076ba14d 100644
--- a/include/configs/CPCI405.h
+++ b/include/configs/CPCI405.h
@@ -236,7 +236,7 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
+#define CONFIG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
 #define CFG_ENV_SIZE		0x1000		/* Size of Environment vars	*/
 #define CFG_ENV_ADDR		\
 	(CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)	/* Env	*/
diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h
index ef8abf6466..357c213173 100644
--- a/include/configs/CPCI4052.h
+++ b/include/configs/CPCI4052.h
@@ -251,7 +251,7 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
+#define CONFIG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
 #define CFG_ENV_SIZE		0x0ff8		/* Size of Environment vars	*/
 #define CFG_ENV_ADDR		\
 	(CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-(CFG_ENV_SIZE+8))	/* Env	*/
diff --git a/include/configs/CPCI405DT.h b/include/configs/CPCI405DT.h
index 6c5a3fe921..53228c1b46 100644
--- a/include/configs/CPCI405DT.h
+++ b/include/configs/CPCI405DT.h
@@ -254,7 +254,7 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
+#define CONFIG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
 #define CFG_ENV_SIZE		0x0ff8		/* Size of Environment vars	*/
 #define CFG_ENV_ADDR		\
 	(CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-(CFG_ENV_SIZE+8))	/* Env	*/
diff --git a/include/configs/ELPPC.h b/include/configs/ELPPC.h
index c64537fbfa..8c68400115 100644
--- a/include/configs/ELPPC.h
+++ b/include/configs/ELPPC.h
@@ -218,7 +218,7 @@
  * Environment settings
  */
 #define CONFIG_ENV_OVERWRITE
-#define CFG_ENV_IS_IN_NVRAM     1           /* use NVRAM for environment vars */
+#define CONFIG_ENV_IS_IN_NVRAM     1           /* use NVRAM for environment vars */
 #define CFG_NVRAM_SIZE          0x800       /* NVRAM size (2kB) */
 #define CFG_ENV_SIZE            0x400       /* Size of Environment vars (1kB) */
 #define CFG_ENV_ADDR            0x0
diff --git a/include/configs/ELPT860.h b/include/configs/ELPT860.h
index 828dd9fe68..b9178069b8 100644
--- a/include/configs/ELPT860.h
+++ b/include/configs/ELPT860.h
@@ -137,7 +137,7 @@
  */
 #define CONFIG_ENV_OVERWRITE	1  /* Allow Overwrite of serial# & ethaddr */
 
-#undef	  CFG_ENV_IS_IN_NVRAM	       /* Environment is in NVRAM	*/
+#undef	  CONFIG_ENV_IS_IN_NVRAM	       /* Environment is in NVRAM	*/
 #undef	  CONFIG_ENV_IS_IN_EEPROM	       /* Environment is in I2C EEPROM	*/
 #define CFG_ENV_IS_IN_FLASH	1      /* Environment is in FLASH	*/
 
@@ -225,7 +225,7 @@
 #define CFG_NVRAM_SIZE		((128*1024)-8) /* clock regs resident in the */
 					       /*   8 top NVRAM locations    */
 
-#if defined(CFG_ENV_IS_IN_NVRAM)
+#if defined(CONFIG_ENV_IS_IN_NVRAM)
 #  define CFG_ENV_ADDR		CFG_NVRAM_BASE /* Base address of NVRAM area */
 #  define CFG_ENV_SIZE		0x4000	/* Total Size of Environment Sector  */
 #endif
diff --git a/include/configs/ERIC.h b/include/configs/ERIC.h
index dfbbc95ddb..c699855a55 100644
--- a/include/configs/ERIC.h
+++ b/include/configs/ERIC.h
@@ -45,7 +45,7 @@
 #define CFG_ENV_IS_IN_FLASH	1	/* use FLASH for environment vars	*/
 #endif
 #if 0
-#define CFG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
+#define CONFIG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
 #endif
 #if 0
 #define CONFIG_ENV_IS_IN_EEPROM	1	/* use I2C RTC X1240 for environment vars */
@@ -63,15 +63,15 @@
 #define CFG_I2C_RTC_ADDR	0x6F	/*                                and one for RTC */
 
 #ifdef CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #undef CONFIG_ENV_IS_IN_EEPROM
 #else
-#ifdef CFG_ENV_IS_IN_NVRAM
+#ifdef CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #undef CONFIG_ENV_IS_IN_EEPROM
 #else
 #ifdef CONFIG_ENV_IS_IN_EEPROM
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #endif
 #endif
@@ -318,7 +318,7 @@
 #define CFG_NVRAM_BASE_ADDR	CFG_NVRAM_REG_BASE_ADDR	/* NVRAM base address	*/
 #define CFG_NVRAM_SIZE		0x7F8		/* NVRAM size 2kByte - 8 Byte for RTC */
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#ifdef CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_SIZE		0x7F8		/* Size of Environment vars	*/
 #define CFG_ENV_ADDR		\
 	(CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)	/* Env	*/
diff --git a/include/configs/EXBITGEN.h b/include/configs/EXBITGEN.h
index cee0be4976..4193492ff9 100644
--- a/include/configs/EXBITGEN.h
+++ b/include/configs/EXBITGEN.h
@@ -49,7 +49,7 @@
 /* environment is in EEPROM */
 #define CONFIG_ENV_IS_IN_EEPROM    1
 #undef CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 
 #ifdef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_I2C_EEPROM_ADDR		0x56    /* 1010110 */
diff --git a/include/configs/IP860.h b/include/configs/IP860.h
index 67f8833259..63e7e5d452 100644
--- a/include/configs/IP860.h
+++ b/include/configs/IP860.h
@@ -187,15 +187,15 @@
 #define CFG_FLASH_WRITE_TOUT	500	/* Timeout for Flash Write (in ms)	*/
 
 #undef	CFG_ENV_IS_IN_FLASH
-#undef	CFG_ENV_IS_IN_NVRAM
-#undef  CFG_ENV_IS_IN_NVRAM
+#undef	CONFIG_ENV_IS_IN_NVRAM
+#undef  CONFIG_ENV_IS_IN_NVRAM
 #undef	DEBUG_I2C
 #define	CONFIG_ENV_IS_IN_EEPROM
 
-#ifdef	CFG_ENV_IS_IN_NVRAM
+#ifdef	CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_ADDR		0x20000000	/* use SRAM	*/
 #define CFG_ENV_SIZE		(16<<10)	/* use 16 kB	*/
-#endif	/* CFG_ENV_IS_IN_NVRAM */
+#endif	/* CONFIG_ENV_IS_IN_NVRAM */
 
 #ifdef	CONFIG_ENV_IS_IN_EEPROM
 #define CFG_ENV_OFFSET		 512	/* Leave 512 bytes free for other data	*/
diff --git a/include/configs/JSE.h b/include/configs/JSE.h
index b08301e138..fccf880abd 100644
--- a/include/configs/JSE.h
+++ b/include/configs/JSE.h
@@ -77,7 +77,7 @@
 #define CONFIG_MISC_INIT_R 1
 
   /* JSE has EEPROM chips that are good for environment. */
-#undef	CFG_ENV_IS_IN_NVRAM
+#undef	CONFIG_ENV_IS_IN_NVRAM
 #undef	CFG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_IS_IN_EEPROM 1
 #undef	CFG_ENV_IS_NOWHERE
diff --git a/include/configs/KAREF.h b/include/configs/KAREF.h
index 5b21b905ec..7208444bdd 100644
--- a/include/configs/KAREF.h
+++ b/include/configs/KAREF.h
@@ -141,7 +141,7 @@
 /*-----------------------------------------------------------------------
  * Environment
  *----------------------------------------------------------------------*/
-#define CFG_ENV_IS_IN_NVRAM   1		     /* Environment uses NVRAM	*/
+#define CONFIG_ENV_IS_IN_NVRAM   1		     /* Environment uses NVRAM	*/
 #undef	CFG_ENV_IS_IN_FLASH		     /* ... not in flash	*/
 #undef	CONFIG_ENV_IS_IN_EEPROM		     /* ... not in EEPROM	*/
 #define CONFIG_ENV_OVERWRITE  1		     /* allow env overwrite	*/
diff --git a/include/configs/MBX.h b/include/configs/MBX.h
index d9f2addb56..44e1861884 100644
--- a/include/configs/MBX.h
+++ b/include/configs/MBX.h
@@ -193,7 +193,7 @@
  * board: EPPC-Bug from Motorola. To avoid collisions in NVRAM Usage, we
  * access the NVRAM at the offset 0x1000.
  */
-#define CFG_ENV_IS_IN_NVRAM	1	/* turn on NVRAM env feature */
+#define CONFIG_ENV_IS_IN_NVRAM	1	/* turn on NVRAM env feature */
 #define CFG_ENV_ADDR		(CFG_NVRAM_BASE + 0x1000)
 #define CFG_ENV_SIZE		0x1000
 
diff --git a/include/configs/MBX860T.h b/include/configs/MBX860T.h
index 3b88507ded..4a537e8104 100644
--- a/include/configs/MBX860T.h
+++ b/include/configs/MBX860T.h
@@ -143,7 +143,7 @@
  * board: EPPC-Bug from Motorola. To avoid collisions in NVRAM Usage, we
  * access the NVRAM at the offset 0x1000.
  */
-#define CFG_ENV_IS_IN_NVRAM	1	/* turn on NVRAM env feature */
+#define CONFIG_ENV_IS_IN_NVRAM	1	/* turn on NVRAM env feature */
 #define CFG_ENV_ADDR		(CFG_NVRAM_BASE + 0x1000)
 #define CFG_ENV_SIZE		0x1000
 
diff --git a/include/configs/METROBOX.h b/include/configs/METROBOX.h
index 2afb3fffcb..fdb840ec6c 100644
--- a/include/configs/METROBOX.h
+++ b/include/configs/METROBOX.h
@@ -203,7 +203,7 @@
 /*-----------------------------------------------------------------------
  * Environment
  *----------------------------------------------------------------------*/
-#define CFG_ENV_IS_IN_NVRAM   1		     /* Environment uses NVRAM	*/
+#define CONFIG_ENV_IS_IN_NVRAM   1		     /* Environment uses NVRAM	*/
 #undef	CFG_ENV_IS_IN_FLASH		     /* ... not in flash	*/
 #undef	CONFIG_ENV_IS_IN_EEPROM		     /* ... not in EEPROM	*/
 #define CONFIG_ENV_OVERWRITE  1		     /* allow env overwrite	*/
diff --git a/include/configs/ML2.h b/include/configs/ML2.h
index 66dae21924..3ce1807b52 100644
--- a/include/configs/ML2.h
+++ b/include/configs/ML2.h
@@ -33,11 +33,11 @@
 
 #define CFG_ENV_IS_IN_FLASH     1
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#ifdef CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #else
 #ifdef CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #endif
 #endif
 
@@ -196,7 +196,7 @@
 #define CFG_NVRAM_BASE_ADDR	0xf0000000	/* NVRAM base address	*/
 #define CFG_NVRAM_SIZE		0x1ff8		/* NVRAM size	*/
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#ifdef CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_SIZE		0x1000		/* Size of Environment vars	*/
 #define CFG_ENV_ADDR		\
 	(CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)	/* Env	*/
diff --git a/include/configs/MOUSSE.h b/include/configs/MOUSSE.h
index 021729b582..4052e78628 100644
--- a/include/configs/MOUSSE.h
+++ b/include/configs/MOUSSE.h
@@ -302,7 +302,7 @@
 #define CFG_ENV_OFFSET          0x8000  /* Offset of the Environment Sector	*/
 #define CFG_ENV_SIZE            0x4000  /* Size of the Environment Sector    */
 #else
-#define CFG_ENV_IS_IN_NVRAM          1
+#define CONFIG_ENV_IS_IN_NVRAM          1
 #define CFG_ENV_ADDR            NV_OFF_U_BOOT_ADDR /* PortX NVM Free addr*/
 #define CFG_ENV_OFFSET          CFG_ENV_ADDR
 #define CFG_ENV_SIZE            NV_U_BOOT_ENV_SIZE /* 2K */
diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h
index 59d0bdbeb2..735cfaae5b 100644
--- a/include/configs/MPC8260ADS.h
+++ b/include/configs/MPC8260ADS.h
@@ -384,7 +384,7 @@
 #  define CFG_ENV_SECT_SIZE	0x40000
 #  define CFG_ENV_ADDR		(CFG_MONITOR_BASE + CFG_ENV_SECT_SIZE)
 #else
-#  define CFG_ENV_IS_IN_NVRAM	1
+#  define CONFIG_ENV_IS_IN_NVRAM	1
 #  define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
 #  define CFG_ENV_SIZE		0x200
 #endif /* CFG_RAMBOOT */
diff --git a/include/configs/MPC8266ADS.h b/include/configs/MPC8266ADS.h
index 3659002d5e..4429e99571 100644
--- a/include/configs/MPC8266ADS.h
+++ b/include/configs/MPC8266ADS.h
@@ -431,7 +431,7 @@
 #    define CFG_ENV_ADDR	(CFG_MONITOR_BASE + 0x40000)
 #    define CFG_ENV_SECT_SIZE	0x40000
 #else
-#  define CFG_ENV_IS_IN_NVRAM	1
+#  define CONFIG_ENV_IS_IN_NVRAM	1
 #  define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
 #  define CFG_ENV_SIZE		0x200
 #endif /* CFG_RAMBOOT */
diff --git a/include/configs/OCRTC.h b/include/configs/OCRTC.h
index c561e15ac8..f839eadd46 100644
--- a/include/configs/OCRTC.h
+++ b/include/configs/OCRTC.h
@@ -189,7 +189,7 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
+#define CONFIG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
 #define CFG_NVRAM_BASE_ADDR	0xf0200000		/* NVRAM base address	*/
 #define CFG_NVRAM_SIZE		(32*1024)		/* NVRAM size		*/
 #define CFG_ENV_SIZE		0x1000		/* Size of Environment vars	*/
diff --git a/include/configs/ORSG.h b/include/configs/ORSG.h
index fd140884a4..18f14bc8f1 100644
--- a/include/configs/ORSG.h
+++ b/include/configs/ORSG.h
@@ -187,7 +187,7 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
+#define CONFIG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
 #define CFG_NVRAM_BASE_ADDR	0xf0200000		/* NVRAM base address	*/
 #define CFG_NVRAM_SIZE		(32*1024)		/* NVRAM size		*/
 #define CFG_ENV_SIZE		0x1000		/* Size of Environment vars	*/
diff --git a/include/configs/PCI405.h b/include/configs/PCI405.h
index dea59b647d..6c6a4703d9 100644
--- a/include/configs/PCI405.h
+++ b/include/configs/PCI405.h
@@ -218,7 +218,7 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
+#define CONFIG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
 #define CFG_ENV_SIZE		0x0ff8		/* Size of Environment vars	*/
 #define CFG_ENV_ADDR		\
 	(CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-(CFG_ENV_SIZE+8))	/* Env	*/
diff --git a/include/configs/QS860T.h b/include/configs/QS860T.h
index c980901855..9dfceef3c8 100644
--- a/include/configs/QS860T.h
+++ b/include/configs/QS860T.h
@@ -132,7 +132,7 @@ CONFIG_SPI
 /*
  * Environment variable storage is in NVRAM
  */
-#define CFG_ENV_IS_IN_NVRAM	1
+#define CONFIG_ENV_IS_IN_NVRAM	1
 #define CFG_ENV_SIZE		0x00001000	/* We use only the last 4K for PPCBoot */
 #define CFG_ENV_ADDR		0xD100E000
 
diff --git a/include/configs/RPXClassic.h b/include/configs/RPXClassic.h
index 706e2aadc7..37623910ab 100644
--- a/include/configs/RPXClassic.h
+++ b/include/configs/RPXClassic.h
@@ -224,7 +224,7 @@
 #define CFG_ENV_SECT_SIZE       0x8000
 #define	CFG_ENV_SIZE		0x8000	/* Total Size of Environment Sector  */
 #else
-#define CFG_ENV_IS_IN_NVRAM     1
+#define CONFIG_ENV_IS_IN_NVRAM     1
 #define CFG_ENV_ADDR            0xfa000100
 #define CFG_ENV_SIZE            0x1000
 #endif
diff --git a/include/configs/RPXlite_DW.h b/include/configs/RPXlite_DW.h
index faae407da5..d1358186a6 100644
--- a/include/configs/RPXlite_DW.h
+++ b/include/configs/RPXlite_DW.h
@@ -229,14 +229,14 @@
 #define CFG_FLASH_ERASE_TOUT	120000	/* Timeout for Flash Erase (in ms)	*/
 #define CFG_FLASH_WRITE_TOUT	500	/* Timeout for Flash Write (in ms)	*/
 
-#ifdef	CFG_ENV_IS_IN_NVRAM
+#ifdef	CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_ADDR		0xFA000100
 #define CFG_ENV_SIZE		0x1000
 #else
 #define CFG_ENV_IS_IN_FLASH
 #define CFG_ENV_OFFSET		0x30000 /* Offset of Environment Sector		*/
 #define CFG_ENV_SIZE		0x8000	/* Total Size of Environment Sector	*/
-#endif	/* CFG_ENV_IS_IN_NVRAM */
+#endif	/* CONFIG_ENV_IS_IN_NVRAM */
 
 #define CFG_RESET_ADDRESS	((ulong)((((immap_t *)CFG_IMMR)->im_clkrst.res)))
 
diff --git a/include/configs/RPXsuper.h b/include/configs/RPXsuper.h
index dfadd2a11f..2a9c62709b 100644
--- a/include/configs/RPXsuper.h
+++ b/include/configs/RPXsuper.h
@@ -311,7 +311,7 @@
 #    define CFG_ENV_SECT_SIZE  0x10000 /* see README - env sect real size */
 #  endif /* CFG_ENV_IN_OWN_SECT */
 #else
-#  define CFG_ENV_IS_IN_NVRAM  1
+#  define CONFIG_ENV_IS_IN_NVRAM  1
 #  define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
 #  define CFG_ENV_SIZE         0x200
 #endif /* CFG_RAMBOOT */
diff --git a/include/configs/W7OLMC.h b/include/configs/W7OLMC.h
index bb6b6b9d26..d4ec03e5e8 100644
--- a/include/configs/W7OLMC.h
+++ b/include/configs/W7OLMC.h
@@ -249,7 +249,7 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_IN_NVRAM	1		/* use NVRAM for env vars	*/
+#define CONFIG_ENV_IS_IN_NVRAM	1		/* use NVRAM for env vars	*/
 #define CFG_NVRAM_BASE_ADDR	0xfc000000	/* NVRAM base address		*/
 #define CFG_NVRAM_SIZE		(32*1024)	/* NVRAM size			*/
 #define CFG_ENV_SIZE		0x1000		/* Size of Environment vars	*/
diff --git a/include/configs/W7OLMG.h b/include/configs/W7OLMG.h
index 3050cafa1d..ac52e39fe0 100644
--- a/include/configs/W7OLMG.h
+++ b/include/configs/W7OLMG.h
@@ -256,7 +256,7 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_IN_NVRAM	1		/* use NVRAM for env vars	*/
+#define CONFIG_ENV_IS_IN_NVRAM	1		/* use NVRAM for env vars	*/
 #define CFG_NVRAM_BASE_ADDR	0xfc000000	/* NVRAM base address		*/
 #define CFG_NVRAM_SIZE		(32*1024)	/* NVRAM size			*/
 #define CFG_ENV_SIZE		0x1000		/* Size of Environment vars	*/
diff --git a/include/configs/Yukon8220.h b/include/configs/Yukon8220.h
index 60f2343722..9ace43eff9 100644
--- a/include/configs/Yukon8220.h
+++ b/include/configs/Yukon8220.h
@@ -225,13 +225,13 @@
 #define CONFIG_ENV_OVERWRITE	1
 
 #if defined CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #undef CONFIG_ENV_IS_IN_EEPROM
-#elif defined CFG_ENV_IS_IN_NVRAM
+#elif defined CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #undef CONFIG_ENV_IS_IN_EEPROM
 #elif defined CONFIG_ENV_IS_IN_EEPROM
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #endif
 
diff --git a/include/configs/ZPC1900.h b/include/configs/ZPC1900.h
index 388c747681..4217900e60 100644
--- a/include/configs/ZPC1900.h
+++ b/include/configs/ZPC1900.h
@@ -220,8 +220,8 @@
 #define CFG_MALLOC_LEN		(4096 << 10)	/* Reserve 4 MB for malloc()	*/
 #define CFG_BOOTMAPSZ		(8 << 20)	/* Initial Memory map for Linux */
 
-#if !defined(CFG_ENV_IS_IN_FLASH) && !defined(CFG_ENV_IS_IN_NVRAM)
-#define CFG_ENV_IS_IN_NVRAM	1
+#if !defined(CFG_ENV_IS_IN_FLASH) && !defined(CONFIG_ENV_IS_IN_NVRAM)
+#define CONFIG_ENV_IS_IN_NVRAM	1
 #endif
 
 #ifdef CFG_ENV_IS_IN_FLASH
diff --git a/include/configs/bubinga.h b/include/configs/bubinga.h
index acce82f621..4b42f8b1a8 100644
--- a/include/configs/bubinga.h
+++ b/include/configs/bubinga.h
@@ -83,7 +83,7 @@
 #if 1
 #define CFG_ENV_IS_IN_FLASH     1	/* use FLASH for environment vars	*/
 #else
-#define CFG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
+#define CONFIG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
 #endif
 
 /*
@@ -210,7 +210,7 @@
 #define CFG_NVRAM_BASE_ADDR	0xf0000000	/* NVRAM base address	*/
 #define CFG_NVRAM_SIZE		0x1ff8		/* NVRAM size	*/
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#ifdef CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_SIZE		0x0ff8		/* Size of Environment vars	*/
 #define CFG_ENV_ADDR		\
 	(CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)	/* Env	*/
diff --git a/include/configs/csb272.h b/include/configs/csb272.h
index 701d3c8436..880bee8612 100644
--- a/include/configs/csb272.h
+++ b/include/configs/csb272.h
@@ -231,7 +231,7 @@
  *
  */
 #define CFG_ENV_IS_IN_FLASH	1	/* environment is in FLASH	*/
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #undef CONFIG_ENV_IS_IN_EEPROM
 
 /*
diff --git a/include/configs/csb472.h b/include/configs/csb472.h
index 4fef2f6613..e343632935 100644
--- a/include/configs/csb472.h
+++ b/include/configs/csb472.h
@@ -230,7 +230,7 @@
  *
  */
 #define CFG_ENV_IS_IN_FLASH	1	/* environment is in FLASH	*/
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #undef CONFIG_ENV_IS_IN_EEPROM
 
 /*
diff --git a/include/configs/debris.h b/include/configs/debris.h
index 7667e5e60e..68c9e549b1 100644
--- a/include/configs/debris.h
+++ b/include/configs/debris.h
@@ -251,7 +251,7 @@
 #define MTDPARTS_DEFAULT	"mtdparts=debris-0:-(jffs2)"
 */
 
-#define CFG_ENV_IS_IN_NVRAM      1
+#define CONFIG_ENV_IS_IN_NVRAM      1
 #define CONFIG_ENV_OVERWRITE     1
 #define CFG_NVRAM_ACCESS_ROUTINE 1
 #define CFG_ENV_ADDR		0xFF000000 /* right at the start of NVRAM  */
diff --git a/include/configs/ebony.h b/include/configs/ebony.h
index df444d8e96..21c0866f89 100644
--- a/include/configs/ebony.h
+++ b/include/configs/ebony.h
@@ -51,7 +51,7 @@
 #if 1
 #define CFG_ENV_IS_IN_FLASH     1	/* use FLASH for environment vars	*/
 #else
-#define CFG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
+#define CONFIG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
 #endif
 
 /*-----------------------------------------------------------------------
@@ -97,11 +97,11 @@
 #define CFG_NVRAM_SIZE	    (0x2000 - 8)    /* NVRAM size(8k)- RTC regs */
 #define CONFIG_RTC_DS174x	1		    /* DS1743 RTC		*/
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#ifdef CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_SIZE		0x1000	    /* Size of Environment vars */
 #define CFG_ENV_ADDR		\
 	(CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)
-#endif /* CFG_ENV_IS_IN_NVRAM */
+#endif /* CONFIG_ENV_IS_IN_NVRAM */
 
 /*-----------------------------------------------------------------------
  * FLASH related
diff --git a/include/configs/ep8260.h b/include/configs/ep8260.h
index 0ce6b80b90..094a14c24b 100644
--- a/include/configs/ep8260.h
+++ b/include/configs/ep8260.h
@@ -485,7 +485,7 @@
 #    define CFG_ENV_SECT_SIZE  0x10000 /* see README - env sect real size */
 #  endif /* CFG_ENV_IN_OWN_SECT */
 #else
-#  define CFG_ENV_IS_IN_NVRAM  1
+#  define CONFIG_ENV_IS_IN_NVRAM  1
 #  define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
 #  define CFG_ENV_SIZE         0x200
 #endif /* CFG_RAMBOOT */
diff --git a/include/configs/hcu4.h b/include/configs/hcu4.h
index f03f9b90d3..0dd9787822 100644
--- a/include/configs/hcu4.h
+++ b/include/configs/hcu4.h
@@ -121,7 +121,7 @@
  * Environment
  *----------------------------------------------------------------------*/
 
-#undef	CFG_ENV_IS_IN_NVRAM
+#undef	CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_IS_IN_FLASH
 #undef  CFG_ENV_IS_NOWHERE
 
diff --git a/include/configs/hcu5.h b/include/configs/hcu5.h
index d274223908..0796a7d526 100644
--- a/include/configs/hcu5.h
+++ b/include/configs/hcu5.h
@@ -106,7 +106,7 @@
  * Environment
  *----------------------------------------------------------------------*/
 
-#undef	CFG_ENV_IS_IN_NVRAM
+#undef	CONFIG_ENV_IS_IN_NVRAM
 #define  CFG_ENV_IS_IN_FLASH
 #undef	CONFIG_ENV_IS_IN_EEPROM
 #undef  CFG_ENV_IS_NOWHERE
diff --git a/include/configs/kvme080.h b/include/configs/kvme080.h
index 819e456e45..7d903aa13c 100644
--- a/include/configs/kvme080.h
+++ b/include/configs/kvme080.h
@@ -157,7 +157,7 @@
 #define CFG_JFFS2_FIRST_BANK	0
 #define CFG_JFFS2_NUM_BANKS	1
 
-#define CFG_ENV_IS_IN_NVRAM	1
+#define CONFIG_ENV_IS_IN_NVRAM	1
 #define CONFIG_ENV_OVERWRITE	1
 #define CFG_NVRAM_ACCESS_ROUTINE
 #define CFG_ENV_ADDR		CFG_NVRAM_BASE_ADDR
diff --git a/include/configs/mcu25.h b/include/configs/mcu25.h
index d146537cd6..5c234df932 100644
--- a/include/configs/mcu25.h
+++ b/include/configs/mcu25.h
@@ -121,7 +121,7 @@
  * Environment
  *----------------------------------------------------------------------*/
 
-#undef	CFG_ENV_IS_IN_NVRAM
+#undef	CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_IS_IN_FLASH
 #undef  CFG_ENV_IS_NOWHERE
 
diff --git a/include/configs/mpc7448hpc2.h b/include/configs/mpc7448hpc2.h
index d379b1fb05..7fd06a6ec4 100644
--- a/include/configs/mpc7448hpc2.h
+++ b/include/configs/mpc7448hpc2.h
@@ -381,7 +381,7 @@
 #define PHYS_FLASH_SIZE		0x01000000
 #define CFG_MAX_FLASH_SECT	(128)
 
-#define CFG_ENV_IS_IN_NVRAM
+#define CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_ADDR		0xFC000000
 
 #define CFG_ENV_OFFSET	0x00000000	/* Offset of Environment Sector */
diff --git a/include/configs/ocotea.h b/include/configs/ocotea.h
index 407aae7210..e8549e9386 100644
--- a/include/configs/ocotea.h
+++ b/include/configs/ocotea.h
@@ -95,7 +95,7 @@
 #if 1
 #define CFG_ENV_IS_IN_FLASH     1	/* use FLASH for environment vars	*/
 #else
-#define CFG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
+#define CONFIG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
 #endif
 
 
@@ -112,11 +112,11 @@
 #define CFG_NVRAM_SIZE	    (0x2000 - 8)    /* NVRAM size(8k)- RTC regs */
 #define CONFIG_RTC_DS174x	1		    /* DS1743 RTC		*/
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#ifdef CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_SIZE		0x1000	    /* Size of Environment vars */
 #define CFG_ENV_ADDR		\
 	(CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)
-#endif /* CFG_ENV_IS_IN_NVRAM */
+#endif /* CONFIG_ENV_IS_IN_NVRAM */
 
 /*-----------------------------------------------------------------------
  * FLASH related
diff --git a/include/configs/redwood.h b/include/configs/redwood.h
index ebb2921732..b791589adf 100644
--- a/include/configs/redwood.h
+++ b/include/configs/redwood.h
@@ -119,7 +119,7 @@
 /*-----------------------------------------------------------------------
  * Environment
  *----------------------------------------------------------------------*/
-#undef	CFG_ENV_IS_IN_NVRAM		/* ... not in NVRAM		*/
+#undef	CONFIG_ENV_IS_IN_NVRAM		/* ... not in NVRAM		*/
 #define	CFG_ENV_IS_IN_FLASH	1	/* Environment uses flash	*/
 #undef	CONFIG_ENV_IS_IN_EEPROM		/* ... not in EEPROM		*/
 
diff --git a/include/configs/sacsng.h b/include/configs/sacsng.h
index 8427752d78..5c6ddc6b47 100644
--- a/include/configs/sacsng.h
+++ b/include/configs/sacsng.h
@@ -719,7 +719,7 @@
 #  endif /* CFG_ENV_IN_OWN_SECT */
 
 #else
-#  define CFG_ENV_IS_IN_NVRAM	1
+#  define CONFIG_ENV_IS_IN_NVRAM	1
 #  define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
 #  define CFG_ENV_SIZE		0x200
 #endif /* CFG_RAMBOOT */
diff --git a/include/configs/sbc8260.h b/include/configs/sbc8260.h
index b92344ccc1..6068c234ec 100644
--- a/include/configs/sbc8260.h
+++ b/include/configs/sbc8260.h
@@ -615,7 +615,7 @@
 #  endif /* CFG_ENV_IN_OWN_SECT */
 
 #else
-#  define CFG_ENV_IS_IN_NVRAM	1
+#  define CONFIG_ENV_IS_IN_NVRAM	1
 #  define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
 #  define CFG_ENV_SIZE		0x200
 #endif /* CFG_RAMBOOT */
diff --git a/include/configs/sorcery.h b/include/configs/sorcery.h
index 0d07560c6a..b4da4ce920 100644
--- a/include/configs/sorcery.h
+++ b/include/configs/sorcery.h
@@ -207,13 +207,13 @@
 #define CONFIG_ENV_OVERWRITE	1
 
 #if defined CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #undef CONFIG_ENV_IS_IN_EEPROM
-#elif defined CFG_ENV_IS_IN_NVRAM
+#elif defined CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #undef CONFIG_ENV_IS_IN_EEPROM
 #elif defined CONFIG_ENV_IS_IN_EEPROM
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #endif
 
diff --git a/include/configs/taihu.h b/include/configs/taihu.h
index 86f776df20..2ef454532f 100644
--- a/include/configs/taihu.h
+++ b/include/configs/taihu.h
@@ -221,7 +221,7 @@ unsigned char spi_read(void);
 #define CFG_NVRAM_BASE_ADDR	0xf0000000	/* NVRAM base address */
 #define CFG_NVRAM_SIZE		0x1ff8		/* NVRAM size */
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#ifdef CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_SIZE		0x0ff8		/* Size of Environment vars */
 #define CFG_ENV_ADDR		\
 	(CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)	/* Env*/
diff --git a/include/configs/v37.h b/include/configs/v37.h
index 751d702135..7e5f804228 100644
--- a/include/configs/v37.h
+++ b/include/configs/v37.h
@@ -195,7 +195,7 @@
 #define CFG_FLASH_ERASE_TOUT	120000	/* Timeout for Flash Erase (in ms)	*/
 #define CFG_FLASH_WRITE_TOUT	500	/* Timeout for Flash Write (in ms)	*/
 
-#define	CFG_ENV_IS_IN_NVRAM	1
+#define	CONFIG_ENV_IS_IN_NVRAM	1
 #define	CFG_ENV_ADDR		0x80000000/* Address of Environment */
 #define	CFG_ENV_SIZE		0x4000	/* Total Size of Environment Sector	*/
 
diff --git a/include/configs/walnut.h b/include/configs/walnut.h
index e19c5f3482..4eecf77086 100644
--- a/include/configs/walnut.h
+++ b/include/configs/walnut.h
@@ -139,7 +139,7 @@
 #if 1
 #define CFG_ENV_IS_IN_FLASH	1	/* use FLASH for environment vars	*/
 #else
-#define CFG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
+#define CONFIG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
 #endif
 
 /*-----------------------------------------------------------------------
@@ -176,7 +176,7 @@
 #define CFG_NVRAM_BASE_ADDR	0xf0000000	/* NVRAM base address	*/
 #define CFG_NVRAM_SIZE		0x1ff8		/* NVRAM size	*/
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#ifdef CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_SIZE		0x1000		/* Size of Environment vars	*/
 #define CFG_ENV_ADDR		\
 	(CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)	/* Env	*/
diff --git a/include/configs/yucca.h b/include/configs/yucca.h
index 0c09a1d140..9ccd308087 100644
--- a/include/configs/yucca.h
+++ b/include/configs/yucca.h
@@ -139,7 +139,7 @@
  *----------------------------------------------------------------------*/
 /* #define CFG_NVRAM_SIZE	(0x2000 - 8) */	/* NVRAM size(8k)- RTC regs */
 
-#undef  CFG_ENV_IS_IN_NVRAM		/* ... not in NVRAM		*/
+#undef  CONFIG_ENV_IS_IN_NVRAM		/* ... not in NVRAM		*/
 #define	CFG_ENV_IS_IN_FLASH	1	/* Environment uses flash	*/
 #undef	CONFIG_ENV_IS_IN_EEPROM		/* ... not in EEPROM		*/
 #define CONFIG_ENV_OVERWRITE	1