Fix merge problems

[platform/kernel/u-boot.git] / include / configs / rmu.h

diff --git a/include/configs/rmu.h b/include/configs/rmu.h
index 2ca60b7..596bf15 100644 (file)
--- a/include/configs/rmu.h
+++ b/include/configs/rmu.h
@@ -51,9 +51,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  */
@@ -111,7 +111,8 @@
 
 
 #define        CONFIG_AUTOBOOT_KEYED           /* Enable password protection */
-#define        CONFIG_AUTOBOOT_PROMPT          "\nEnter password - autoboot in %d sec...\n"
+#define        CONFIG_AUTOBOOT_PROMPT          \
+       "\nEnter password - autoboot in %d sec...\n", bootdelay
 #define        CONFIG_AUTOBOOT_DELAY_STR       "system"
 
 /*
@@ -399,7 +400,7 @@
 #define BCSR3  (CFG_BCSR_BASE + 3)
 
 #define BCSR0_ENMONXCVR        0x01    /* Monitor XVCR Control */
-#define BCSR0_ENNVRAM  0x02    /* CS4# Control */
+#define BCSR0_ENNVRAM  0x02    /* CS4# Control */
 #define BCSR0_LED5     0x04    /* LED5 control 0='on' 1='off' */
 #define BCSR0_LED4     0x08    /* LED4 control 0='on' 1='off' */
 #define BCSR0_FULLDPLX 0x10    /* Ethernet XCVR Control */