diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2009-09-10 18:30:09 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2009-09-10 18:30:09 +0000 |
| commit | 9040201ef5a65987c3124bc6327dd5586c16e113 (patch) | |
| tree | 73b0b3b29c4be44ac015b611d8ba17bb428c4b9f | |
| parent | 211b8fd286c699d91e3c85488e40429a5d08e907 (diff) | |
| download | master-31e0f0ae-9040201ef5a65987c3124bc6327dd5586c16e113.tar.gz master-31e0f0ae-9040201ef5a65987c3124bc6327dd5586c16e113.tar.bz2 master-31e0f0ae-9040201ef5a65987c3124bc6327dd5586c16e113.zip | |
rb532: use the generic image_cmdline hack
SVN-Revision: 17565
| -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) { |