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 f20b8f99ac123f9ebb336b869506e993d75f961f..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>
@@ -182,7 +182,7 @@
 #define        CFG_SDRAM_BASE          0x00000000
 #define CFG_FLASH_BASE 0xFF000000
 
-#if defined(DEBUG) || defined (CONFIG_VIDEO_SED13806) || (CONFIG_COMMANDS & CFG_CMD_IDE) 
+#if defined(DEBUG) || defined (CONFIG_VIDEO_SED13806) || (CONFIG_COMMANDS & CFG_CMD_IDE)
 #define        CFG_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor   */
 #else
 #define        CFG_MONITOR_LEN         (128 << 10)     /* Reserve 128 kB for Monitor   */
@@ -331,8 +331,7 @@
  *
  */
 /* #define     CFG_DER 0x2002000F */
-/* #define CFG_DER     0 */
-#define        CFG_DER 0x0082000F
+#define CFG_DER        0
 
 /*
  * Init Memory Controller:
@@ -370,8 +369,8 @@
 
 /* ECCX CS settings                                                          */
 #define SED13806_OR             0xFFC00108     /* - 4 Mo
-                                                   - Burst inhibit
-                                                   - external TA             */
+                                                  - Burst inhibit
+                                                  - external TA             */
 #define SED13806_REG_ADDR       0xa0000000
 #define SED13806_ACCES          0x801           /* 16 bit access             */
 
@@ -391,8 +390,8 @@
 
 /* Definitions for CSR8                                                      */
 #define ECCX_ENEPSON            0x80    /* Bit 0:
-                                           0= disable and reset SED1386
-                                           1= enable SED1386                 */
+                                          0= disable and reset SED1386
+                                          1= enable SED1386                 */
 /* Bit 1:   0= SED1386 in Big Endian mode                                    */
 /*          1= SED1386 in little endian mode                                 */
 #define ECCX_LE                 0x40