rb532: use the generic image_cmdline hack

SVN-Revision: 17565

diff --git a/target/linux/rb532/config-default b/target/linux/rb532/config-default
index 285db249f85cf243076067a6c23baf0c8d235ed8..7e6fdd256204deb56615f837ee91f3c0215eb6f4 100644 (file)
--- 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_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
 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 99c891ddad107ec94adc5f83c8b429c1adcdd072..246e502b7702413a52ee735fb45174ec03a95130 100644 (file)
--- 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);
  }
  
 --- 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];
  void __init prom_setup_cmdline(void)
  {
        char cmd_line[CL_SIZE];


@@ -26,8 +12,8 @@
        }
        *(cp++) = ' ';
  
        }
        *(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) {
 +
        i = strlen(arcs_cmdline);
        if (i > 0) {