fix rb532 patch error

[openwrt.git] / target / linux / rb532-2.6 / patches / 140-cmdline_hack.patch

diff --git a/target/linux/rb532-2.6/patches/140-cmdline_hack.patch b/target/linux/rb532-2.6/patches/140-cmdline_hack.patch
index 01daf31..4425af7 100644 (file)
--- a/target/linux/rb532-2.6/patches/140-cmdline_hack.patch
+++ b/target/linux/rb532-2.6/patches/140-cmdline_hack.patch
@@ -1,48 +1,14 @@
-diff -ur linux.old/arch/mips/kernel/head.S linux.dev/arch/mips/kernel/head.S
---- linux.old/arch/mips/kernel/head.S  2006-12-06 17:30:27.000000000 +0100
-+++ linux.dev/arch/mips/kernel/head.S  2006-12-06 18:34:43.000000000 +0100
-@@ -129,15 +129,20 @@
- #endif
-       .endm
- 
--
+Index: linux-2.6.21.1/arch/mips/kernel/head.S
+===================================================================
+--- linux-2.6.21.1.orig/arch/mips/kernel/head.S        2007-06-07 01:26:11.862575128 +0200
++++ linux-2.6.21.1/arch/mips/kernel/head.S     2007-06-07 01:31:06.499783464 +0200
+@@ -133,6 +133,9 @@
        j kernel_entry
        nop
--
-+      nop
-+      
+ 
++EXPORT(_image_cmdline)
++      .ascii "CMDLINE:"
++
        /*
         * Reserved space for exception handlers.
         * Necessary for machines which link their kernels at KSEG0.
-+       * Use as temporary storage for the kernel command line, so that it
-+       * can be updated easily without having to relink the kernel.
-        */
--      .fill   0x400
-+       
-+EXPORT(_image_cmdline)
-+      .ascii "CMDLINE:"
-+      .fill   0x3ec
- 
- EXPORT(stext)                                 # used for profiling
- EXPORT(_stext)
-diff -ur linux.old/arch/mips/rb500/prom.c linux.dev/arch/mips/rb500/prom.c
---- linux.old/arch/mips/rb500/prom.c   2006-12-06 17:30:27.000000000 +0100
-+++ linux.dev/arch/mips/rb500/prom.c   2006-12-06 17:41:40.000000000 +0100
-@@ -128,6 +128,7 @@
-       /* FIXME: STUB */
- }
- 
-+extern char _image_cmdline;
- void __init prom_setup_cmdline(void){
-       char cmd_line[CL_SIZE];
-       char *cp;
-@@ -163,6 +164,9 @@
-               strcpy(cp,prom_argv[i]);
-               cp+=strlen(prom_argv[i]);
-       }
-+      *(cp++) = ' ';
-+      strcpy(cp,(&_image_cmdline + 8));
-+      cp += strlen(&_image_cmdline);
-       
-       i=strlen(arcs_cmdline);
-       if (i>0){