diff options
| author | Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us> | 2016-05-29 16:54:54 -0700 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2016-05-27 16:08:47 +0200 |
| commit | 2b4e5d478b90960e35719a0262e93b35e0338b3f (patch) | |
| tree | ba6ae8ef85238185f481f0166adc7bd6ef8e3cb5 /target/linux | |
| parent | 492964e741f1e0254b6ed7c0a095551a31d25dc9 (diff) | |
| download | upstream-2b4e5d478b90960e35719a0262e93b35e0338b3f.tar.gz upstream-2b4e5d478b90960e35719a0262e93b35e0338b3f.tar.bz2 upstream-2b4e5d478b90960e35719a0262e93b35e0338b3f.zip | |
kernel: remove a hack that was obsoleted upstream
Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/generic/patches-4.4/997-device_tree_cmdline.patch | 24 | ||||
| -rw-r--r-- | target/linux/lantiq/dts/DGN3500.dtsi | 2 |
2 files changed, 1 insertions, 25 deletions
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 index 566648fcc5..0000000000 --- a/target/linux/generic/patches-4.4/997-device_tree_cmdline.patch +++ /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; - diff --git a/target/linux/lantiq/dts/DGN3500.dtsi b/target/linux/lantiq/dts/DGN3500.dtsi index 1390158fce..569fa9f11c 100644 --- a/target/linux/lantiq/dts/DGN3500.dtsi +++ b/target/linux/lantiq/dts/DGN3500.dtsi @@ -2,7 +2,7 @@ / { chosen { - bootargs-append = "root= console=ttyLTQ0,115200"; + bootargs = "root= console=ttyLTQ0,115200"; leds { boot = &power_green; |