Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master

[oweals/u-boot.git] / include / configs / RBC823.h

diff --git a/include/configs/RBC823.h b/include/configs/RBC823.h
index e3c75617eca1ba501f70b4c67918276805571916..aec204b8d51aa3ec27f8c6d9bbc39fd17ea7cf3b 100644 (file)
--- a/include/configs/RBC823.h
+++ b/include/configs/RBC823.h
@@ -65,9 +65,9 @@
 
 #undef CONFIG_BOOTARGS
 #define CONFIG_BOOTCOMMAND                                                     \
-       "bootp; "                                                               \
-       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
-       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "   \
+       "bootp; "                                                               \
+       "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  */
@@ -203,9 +203,9 @@
 #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_FLASH     1
-#define        CFG_ENV_OFFSET          0x10000 /*   Offset   of Environment Sector     */
-#define        CFG_ENV_SIZE            0x10000 /* Total Size of Environment Sector     */
+#define        CONFIG_ENV_IS_IN_FLASH  1
+#define        CONFIG_ENV_OFFSET               0x10000 /*   Offset   of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x10000 /* Total Size of Environment Sector     */
 
 /*-----------------------------------------------------------------------
  * Cache Configuration