kernel: remove a hack that was obsoleted upstream
authorDaniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
Sun, 29 May 2016 23:54:54 +0000 (16:54 -0700)
committerJohn Crispin <john@phrozen.org>
Fri, 27 May 2016 14:08:47 +0000 (16:08 +0200)
Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
target/linux/generic/patches-4.4/997-device_tree_cmdline.patch [deleted file]
target/linux/lantiq/dts/DGN3500.dtsi

diff --git a/target/linux/generic/patches-4.4/997-device_tree_cmdline.patch b/target/linux/generic/patches-4.4/997-device_tree_cmdline.patch
deleted file mode 100644 (file)
index 566648f..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/drivers/of/fdt.c
-+++ b/drivers/of/fdt.c
-@@ -956,6 +956,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));
-+      p = of_get_flat_dt_prop(node, "bootargs-append", &l);
-+      if (p != NULL && l > 0)
-+              strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE));
-       /*
-        * CONFIG_CMDLINE is meant to be a default in case nothing else
---- a/arch/mips/kernel/prom.c
-+++ b/arch/mips/kernel/prom.c
-@@ -51,6 +51,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;
index 1390158..569fa9f 100644 (file)
@@ -2,7 +2,7 @@
 
 / {
        chosen {
-               bootargs-append = "root= console=ttyLTQ0,115200";
+               bootargs = "root= console=ttyLTQ0,115200";
 
                leds {
                        boot = &power_green;