X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=target%2Flinux%2Fgeneric%2Fpatches-3.18%2F997-device_tree_cmdline.patch;h=b3aa1d1966745a87bb82587b8f43b6931d7de174;hp=572e280c74c4237b582916939df352c7746ade26;hb=beae90012e8982ff4c2a7d60788aa8bdaff63af0;hpb=96f49098f262c7578b221cd3f9d35cf1a7deb993

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 572e280c74..b3aa1d1966 100644
--- 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,8 @@
---- a/drivers/of/fdt.c
-+++ b/drivers/of/fdt.c
-@@ -903,6 +903,9 @@ int __init early_init_dt_scan_chosen(uns
+Index: linux-3.18.2/drivers/of/fdt.c
+===================================================================
+--- linux-3.18.2.orig/drivers/of/fdt.c	2015-01-17 20:57:52.419074654 -0800
++++ linux-3.18.2/drivers/of/fdt.c	2015-01-17 20:57:52.367074398 -0800
+@@ -903,6 +903,9 @@
  	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 +12,17 @@
  
  	/*
  	 * CONFIG_CMDLINE is meant to be a default in case nothing else
+Index: linux-3.18.2/arch/mips/kernel/prom.c
+===================================================================
+--- linux-3.18.2.orig/arch/mips/kernel/prom.c	2015-01-17 20:57:52.419074654 -0800
++++ linux-3.18.2/arch/mips/kernel/prom.c	2015-01-17 20:57:52.415074633 -0800
+@@ -49,6 +49,9 @@
+ 
+ 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;
+