Support for redundant environment in NAND Flash.

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

diff --git a/include/configs/RPXClassic.h b/include/configs/RPXClassic.h
index 959ee1a4910db19e56dccf1a6b3ce9f332b5a179..591382cd24d8d3ba1597824156306bba885cf7b8 100644 (file)
--- a/include/configs/RPXClassic.h
+++ b/include/configs/RPXClassic.h
@@ -79,8 +79,8 @@
 #undef CONFIG_BOOTARGS
 #define CONFIG_BOOTCOMMAND                                                     \
        "tftpboot; "                                                            \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; "   \
+       "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  */
@@ -93,7 +93,7 @@
 #define        CONFIG_CLOCKS_IN_MHZ    1       /* clocks passsed to Linux in MHz */
 
 
-#define CONFIG_COMMANDS        (CFG_CMD_ALL & ~CFG_CMD_NONSTD | CFG_CMD_ELF)
+#define CONFIG_COMMANDS        ((CFG_CMD_ALL & ~CFG_CMD_NONSTD) | CFG_CMD_ELF)
 
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>
@@ -331,8 +331,7 @@
  *
  */
 /* #define     CFG_DER 0x2002000F */
-/* #define CFG_DER     0 */
-#define        CFG_DER 0x0082000F
+#define CFG_DER        0
 
 /*
  * Init Memory Controller: