rename CFG_ENV macros to CONFIG_ENV

[platform/kernel/u-boot.git] / include / configs / RPXClassic.h

diff --git a/include/configs/RPXClassic.h b/include/configs/RPXClassic.h
index 793b1db..4fa21b8 100644 (file)
--- a/include/configs/RPXClassic.h
+++ b/include/configs/RPXClassic.h
@@ -78,9 +78,9 @@
 
 #undef CONFIG_BOOTARGS
 #define CONFIG_BOOTCOMMAND                                                     \
-       "tftpboot; "                                                            \
-       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
-       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "   \
+       "tftpboot; "                                                            \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "   \
        "bootm"
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
@@ -219,14 +219,14 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 #if 0
-#define        CFG_ENV_IS_IN_FLASH     1
-#define        CFG_ENV_OFFSET          0x20000 /*   Offset   of Environment Sector  */
-#define CFG_ENV_SECT_SIZE       0x8000
-#define        CFG_ENV_SIZE            0x8000  /* Total Size of Environment Sector  */
+#define        CONFIG_ENV_IS_IN_FLASH  1
+#define        CONFIG_ENV_OFFSET               0x20000 /*   Offset   of Environment Sector  */
+#define CONFIG_ENV_SECT_SIZE       0x8000
+#define        CONFIG_ENV_SIZE         0x8000  /* Total Size of Environment Sector  */
 #else
-#define CFG_ENV_IS_IN_NVRAM     1
-#define CFG_ENV_ADDR            0xfa000100
-#define CFG_ENV_SIZE            0x1000
+#define CONFIG_ENV_IS_IN_NVRAM     1
+#define CONFIG_ENV_ADDR            0xfa000100
+#define CONFIG_ENV_SIZE            0x1000
 #endif
 
 /*-----------------------------------------------------------------------
@@ -467,7 +467,7 @@
 #define BCSR3 0xFA400003
 
 #define BCSR0_ENMONXCVR        0x01    /* Monitor XVCR Control */
-#define BCSR0_ENNVRAM  0x02    /* CS4# Control */
+#define BCSR0_ENNVRAM  0x02    /* CS4# Control */
 #define BCSR0_LED5             0x04    /* LED5 control 0='on' 1='off' */
 #define BCSR0_LED4             0x08    /* LED4 control 0='on' 1='off' */
 #define BCSR0_FULLDPLX 0x10    /* Ethernet XCVR Control */