Merge pull request #564 from wigyori/cc-cdn2

[15.05/openwrt.git] / target / linux / generic / patches-3.18 / 997-device_tree_cmdline.patch

diff --git a/target/linux/generic/patches-3.18/997-device_tree_cmdline.patch b/target/linux/generic/patches-3.18/997-device_tree_cmdline.patch
index 572e280..61fe71b 100644 (file)
--- a/target/linux/generic/patches-3.18/997-device_tree_cmdline.patch
+++ b/target/linux/generic/patches-3.18/997-device_tree_cmdline.patch
@@ -1,6 +1,6 @@
 --- a/drivers/of/fdt.c
 +++ b/drivers/of/fdt.c
-@@ -903,6 +903,9 @@ int __init early_init_dt_scan_chosen(uns
+@@ -909,6 +909,9 @@ int __init early_init_dt_scan_chosen(uns
        p = of_get_flat_dt_prop(node, "bootargs", &l);
        if (p != NULL && l > 0)
                strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE));
@@ -10,3 +10,15 @@
  
        /*
         * CONFIG_CMDLINE is meant to be a default in case nothing else
+--- a/arch/mips/kernel/prom.c
++++ b/arch/mips/kernel/prom.c
+@@ -49,6 +49,9 @@ void * __init early_init_dt_alloc_memory
+ 
+ void __init __dt_setup_arch(void *bph)
+ {
++      if (boot_command_line[0] == '\0')
++              strcpy(boot_command_line, arcs_cmdline);
++
+       if (!early_init_dt_scan(bph))
+               return;
+