summaryrefslogtreecommitdiffstats
path: root/target/linux/rb532-2.6/patches
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-12-06 18:31:28 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-12-06 18:31:28 +0000
commit440a0b6f4ad94c56cadaf9d45ab79f62ebbe7f3d (patch)
tree90a4c4a25d820e450f23fec4bc08441ffc1ae871 /target/linux/rb532-2.6/patches
parentda4077f1bc0dadf4dfa7633761c53aed8ca0f2c7 (diff)
replace the ugly rb532 cmdline hack with a cleaner one that does not depend on magic offsets
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5699 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/rb532-2.6/patches')
-rw-r--r--target/linux/rb532-2.6/patches/140-cmdline_hack.patch31
1 files changed, 23 insertions, 8 deletions
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 55cf8889f..01daf3132 100644
--- a/target/linux/rb532-2.6/patches/140-cmdline_hack.patch
+++ b/target/linux/rb532-2.6/patches/140-cmdline_hack.patch
@@ -1,18 +1,33 @@
diff -ur linux.old/arch/mips/kernel/head.S linux.dev/arch/mips/kernel/head.S
---- linux.old/arch/mips/kernel/head.S 2006-10-26 00:11:13.000000000 +0200
-+++ linux.dev/arch/mips/kernel/head.S 2006-10-26 02:40:10.000000000 +0200
-@@ -132,6 +132,8 @@
+--- 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
+-
j kernel_entry
nop
+-
+ nop
-+EXPORT(_image_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-10-26 00:11:14.000000000 +0200
-+++ linux.dev/arch/mips/rb500/prom.c 2006-10-26 02:40:46.000000000 +0200
+--- 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 */
}
@@ -26,7 +41,7 @@ diff -ur linux.old/arch/mips/rb500/prom.c linux.dev/arch/mips/rb500/prom.c
cp+=strlen(prom_argv[i]);
}
+ *(cp++) = ' ';
-+ strcpy(cp,&_image_cmdline);
++ strcpy(cp,(&_image_cmdline + 8));
+ cp += strlen(&_image_cmdline);
i=strlen(arcs_cmdline);