NAND finally working. Two bugs fixed:

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

diff --git a/include/configs/PN62.h b/include/configs/PN62.h
index c58e990a19d2eb9135ee8bb0c11825e254f85764..a717659bb695682418b75f2d030455ce23c9664a 100644 (file)
--- a/include/configs/PN62.h
+++ b/include/configs/PN62.h
@@ -68,8 +68,8 @@
 #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 uImage; bootm" */
 #else
@@ -78,7 +78,7 @@
                        "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
 
@@ -102,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   */
 
 /*