Merging Stelian Pop AT91 patches

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

diff --git a/include/configs/sc520_spunk.h b/include/configs/sc520_spunk.h
index c6f7f1526c63170b209069be62bd0bfacbfafad3..051b2e0f583e785c3726e7976d2319999072180a 100644 (file)
--- a/include/configs/sc520_spunk.h
+++ b/include/configs/sc520_spunk.h
@@ -88,8 +88,12 @@
 
 
 #define CONFIG_BOOTDELAY       15
-#define CONFIG_BOOTARGS        "root=/dev/mtdblock1 console=ttyS0,9600 mtdparts=phys:7936k(root),256k(uboot) "
-#define CONFIG_BOOTCOMMAND     "setenv bootargs root=/dev/nfs ip=autoconf console=ttyS0,9600 mtdparts=phys:7808k(root),128k(env),256k(uboot); bootp; bootm"
+#define CONFIG_BOOTARGS                "root=/dev/mtdblock1 console=ttyS0,9600 " \
+                                       "mtdparts=phys:7936k(root),256k(uboot) "
+#define CONFIG_BOOTCOMMAND     "setenv bootargs root=/dev/nfs ip=autoconf " \
+                                       "console=ttyS0,9600 " \
+                                       "mtdparts=phys:7808k(root),128k(env),256k(uboot);" \
+                                       "bootp;bootm"
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE   115200          /* speed to run kgdb serial port */