ramips: rt288x: remove CONFIG_MTD_PARTITION ifdefery from machine files

[openwrt.git] / target / linux / lantiq / patches-2.6.32 / 230-cmdline_hack.patch

diff --git a/target/linux/lantiq/patches-2.6.32/230-cmdline_hack.patch b/target/linux/lantiq/patches-2.6.32/230-cmdline_hack.patch
index df23286..f5a5704 100644 (file)
--- a/target/linux/lantiq/patches-2.6.32/230-cmdline_hack.patch
+++ b/target/linux/lantiq/patches-2.6.32/230-cmdline_hack.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/lantiq/prom.c
 +++ b/arch/mips/lantiq/prom.c
 --- a/arch/mips/lantiq/prom.c
 +++ b/arch/mips/lantiq/prom.c

-@@ -39,6 +39,34 @@
+@@ -39,20 +39,51 @@ void prom_free_prom_memory(void)

  {
  }
  
  {
  }
  


@@ -35,7 +35,18 @@
  static void __init prom_init_cmdline(void)
  {
        int argc = fw_arg0;
  static void __init prom_init_cmdline(void)
  {
        int argc = fw_arg0;

-@@ -53,6 +81,7 @@
+       char **argv = (char **) KSEG1ADDR(fw_arg1);
+       int i;
+ 
++      arcs_cmdline[0] = '\0';
++
+       for (i = 0; i < argc; i++) {
+-              char *p = (char *)  KSEG1ADDR(argv[i]);
++              char *p = (char *) KSEG1ADDR(argv[i]);
+ 
+-              if (p && *p) {
++              if (CPHYSADDR(p) && *p) {
+                       strlcat(arcs_cmdline, p, sizeof(arcs_cmdline));

                        strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
                }
        }
                        strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
                }
        }