Support for redundant environment in NAND Flash.

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

diff --git a/include/configs/PN62.h b/include/configs/PN62.h
index 07501162463d84d52c0c7371a379a767581cc2d5..a717659bb695682418b75f2d030455ce23c9664a 100644 (file)
--- a/include/configs/PN62.h
+++ b/include/configs/PN62.h
@@ -42,10 +42,11 @@
 #define CONFIG_CONS_INDEX      1
 
 
-#define REMOVE_COMMANDS         ( CFG_CMD_AUTOSCRIPT | \
-                                 CFG_CMD_LOADS | \
-                                 CFG_CMD_ENV | \
-                                 CFG_CMD_FLASH )
+#define REMOVE_COMMANDS         ( CFG_CMD_AUTOSCRIPT   | \
+                                 CFG_CMD_LOADS         | \
+                                 CFG_CMD_ENV           | \
+                                 CFG_CMD_FLASH         | \
+                                 CFG_CMD_IMLS          )
 
 #define CONFIG_COMMANDS                ( (CONFIG_CMD_DFL & ~REMOVE_COMMANDS) |\
                                  CFG_CMD_PCI |\
@@ -67,17 +68,17 @@
 #define CONFIG_BOOTCOMMAND \
                        "setenv verify y;" \
                                "setenv bootargs console=ttyS0,19200 mem=31M quiet " \
-                       "root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) " \
-                       "ip=$(ipaddr):$(serverip)::$(netmask):pn62:eth0:off;" \
+                       "root=/dev/nfs rw nfsroot=${serverip}:${rootpath} " \
+                       "ip=${ipaddr}:${serverip}::${netmask}:pn62:eth0:off;" \
                        "loadp 100000; bootm"
-                       /* "tftpboot 100000 pImage; bootm" */
+                       /* "tftpboot 100000 uImage; bootm" */
 #else
 /* Boot Linux with RAMdisk based filesystem (initrd, BusyBox) */
 #define CONFIG_BOOTCOMMAND \
                        "setenv verify n;" \
                                "setenv bootargs console=ttyS0,19200 mem=31M quiet " \
                        "root=/dev/ram rw " \
-                       "ip=$(ipaddr):$(serverip)::$(netmask):pn62:eth0:off;" \
+                       "ip=${ipaddr}:${serverip}::${netmask}:pn62:eth0:off;" \
                        "loadp 200000; bootm"
 #endif
 
@@ -101,6 +102,8 @@
 
 #define CONFIG_MISC_INIT_R     1               /* call misc_init_r() on init   */
 
+#define CONFIG_HAS_ETH1                1               /* add support for eth1addr     */
+
 #define CONFIG_SHOW_BOOT_PROGRESS 1            /* Show boot progress on LEDs   */
 
 /*