commit 0e8d158664a913392cb01fb11a948d83f72e105e
author Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Wed Sep 10 22:48:06 2008 +0200
committer Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Wed Sep 10 22:48:06 2008 +0200
tree 9e0a45c86828b4549b77c7867320e867401d9c86
parent 1ede78710c3bf9ad6f4a53aaddc3bcc86fedd9df

rename CFG_ENV macros to CONFIG_ENV

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

include/configs/ppmc8260.h

diff --git a/include/configs/ppmc8260.h b/include/configs/ppmc8260.h
index a045f22..dd71862 100644
--- a/include/configs/ppmc8260.h
+++ b/include/configs/ppmc8260.h
@@ -137,7 +137,7 @@
  *		       Monitor Stack Buffer (0x80)
  *     0x0FF5 FFB0     Board Info Data
  *     0x0FF6 0000     Malloc Arena
- *	     :		    CFG_ENV_SECT_SIZE, 256k
+ *	     :		    CONFIG_ENV_SECT_SIZE, 256k
  *	     :		    CFG_MALLOC_LEN,    128k
  *     0x0FFC 0000     RAM Copy of Monitor Code
  *	     :		    CFG_MONITOR_LEN,   256k
@@ -200,7 +200,7 @@
  * put in the same sector as U-Boot, and changing variables
  * will erase U-Boot temporarily
  */
-#define CFG_ENV_IN_OWN_SECT	1
+#define CONFIG_ENV_IN_OWN_SECT	1
 
 /* Define to allow the user to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
@@ -334,7 +334,7 @@
 #define CFG_STACK_USAGE		0x10000 /* Reserve 64k for the stack usage */
 #define CFG_MEM_END_USAGE	( CFG_MONITOR_LEN \
 				+ CFG_MALLOC_LEN \
-				+ CFG_ENV_SECT_SIZE \
+				+ CONFIG_ENV_SECT_SIZE \
 				+ CFG_STACK_USAGE )
 
 #define CFG_MEMTEST_END		( CFG_SDRAM_SIZE * 1024 * 1024 \
@@ -463,20 +463,20 @@
 #ifndef CFG_RAMBOOT
 
 #  define CONFIG_ENV_IS_IN_FLASH	1
-#  ifdef CFG_ENV_IN_OWN_SECT
-#    define CFG_ENV_ADDR	(CFG_MONITOR_BASE + 0x40000)
-#    define CFG_ENV_SECT_SIZE	0x40000
+#  ifdef CONFIG_ENV_IN_OWN_SECT
+#    define CONFIG_ENV_ADDR	(CFG_MONITOR_BASE + 0x40000)
+#    define CONFIG_ENV_SECT_SIZE	0x40000
 #  else
-#    define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CFG_ENV_SECT_SIZE)
-#    define CFG_ENV_SIZE	0x1000	/* Total Size of Environment Sector	*/
-#    define CFG_ENV_SECT_SIZE	0x40000 /* see README - env sect real size	*/
-#  endif /* CFG_ENV_IN_OWN_SECT */
+#    define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CONFIG_ENV_SECT_SIZE)
+#    define CONFIG_ENV_SIZE	0x1000	/* Total Size of Environment Sector	*/
+#    define CONFIG_ENV_SECT_SIZE	0x40000 /* see README - env sect real size	*/
+#  endif /* CONFIG_ENV_IN_OWN_SECT */
 
 #else
 #  define CONFIG_ENV_IS_IN_FLASH	1
-#  define CFG_ENV_ADDR		(CFG_FLASH_BASE + 0x40000)
-#define CFG_ENV_SIZE		0x1000
-#  define CFG_ENV_SECT_SIZE	0x40000
+#  define CONFIG_ENV_ADDR		(CFG_FLASH_BASE + 0x40000)
+#define CONFIG_ENV_SIZE		0x1000
+#  define CONFIG_ENV_SECT_SIZE	0x40000
 #endif /* CFG_RAMBOOT */
 
 /*-----------------------------------------------------------------------