diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2006-12-06 18:31:28 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2006-12-06 18:31:28 +0000 |
| commit | 63994b8f50ca94e0885ed9a00c29eaeeda7c36fe (patch) | |
| tree | bf0a2663a31ed16a9ae7550e05818f77f6d20177 /target/linux/rb532-2.6/patches/140-cmdline_hack.patch | |
| parent | e1dc2f086daaa231d50a3852afad8642353add0f (diff) | |
| download | master-31e0f0ae-63994b8f50ca94e0885ed9a00c29eaeeda7c36fe.tar.gz master-31e0f0ae-63994b8f50ca94e0885ed9a00c29eaeeda7c36fe.tar.bz2 master-31e0f0ae-63994b8f50ca94e0885ed9a00c29eaeeda7c36fe.zip | |
replace the ugly rb532 cmdline hack with a cleaner one that does not depend on magic offsets
SVN-Revision: 5699
Diffstat (limited to 'target/linux/rb532-2.6/patches/140-cmdline_hack.patch')
| -rw-r--r-- | target/linux/rb532-2.6/patches/140-cmdline_hack.patch | 31 |
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 55cf8889f6..01daf3132c 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); |