diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-09-10 18:30:09 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-09-10 18:30:09 +0000 |
| commit | 9362623bea229a90d7e13a5fe34d4b4e793a4995 (patch) | |
| tree | db923ba61f75544a93467fe05df080ca7d66391e /target/linux | |
| parent | f23543c3609cd91efafedc86f8557f4939c4d201 (diff) | |
rb532: use the generic image_cmdline hack
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17565 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/rb532/config-default | 2 | ||||
| -rw-r--r-- | target/linux/rb532/patches/001-cmdline_hack.patch | 20 |
2 files changed, 4 insertions, 18 deletions
diff --git a/target/linux/rb532/config-default b/target/linux/rb532/config-default index 285db249f8..7e6fdd2562 100644 --- a/target/linux/rb532/config-default +++ b/target/linux/rb532/config-default @@ -94,7 +94,7 @@ CONFIG_HZ=250 # CONFIG_HZ_100 is not set CONFIG_HZ_250=y # CONFIG_I2C is not set -# CONFIG_IMAGE_CMDLINE_HACK is not set +CONFIG_IMAGE_CMDLINE_HACK=y CONFIG_INITRAMFS_SOURCE="" CONFIG_IRQ_CPU=y CONFIG_KEXEC=y diff --git a/target/linux/rb532/patches/001-cmdline_hack.patch b/target/linux/rb532/patches/001-cmdline_hack.patch index 99c891ddad..246e502b77 100644 --- a/target/linux/rb532/patches/001-cmdline_hack.patch +++ b/target/linux/rb532/patches/001-cmdline_hack.patch @@ -1,24 +1,10 @@ ---- a/arch/mips/kernel/head.S -+++ b/arch/mips/kernel/head.S -@@ -123,6 +123,11 @@ - - j kernel_entry - nop -+ -+ -+EXPORT(_image_cmdline) -+ .ascii "CMDLINE:" -+ - #ifndef CONFIG_NO_EXCEPT_FILL - /* - * Reserved space for exception handlers. --- a/arch/mips/rb532/prom.c +++ b/arch/mips/rb532/prom.c @@ -67,6 +67,7 @@ static inline unsigned long tag2ul(char return simple_strtoul(num, 0, 10); } -+extern char _image_cmdline; ++extern char __image_cmdline[]; void __init prom_setup_cmdline(void) { char cmd_line[CL_SIZE]; @@ -26,8 +12,8 @@ } *(cp++) = ' '; -+ strcpy(cp,(&_image_cmdline + 8)); -+ cp += strlen(&_image_cmdline); ++ strcpy(cp,(__image_cmdline)); ++ cp += strlen(__image_cmdline); + i = strlen(arcs_cmdline); if (i > 0) { |