RepoMirrors/openwrt
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2024-12-15 03:14:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

kernel: remove a hack that was obsoleted upstream

Browse Source 
Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
This commit is contained in:
Daniel Gimpelevich 2016-05-29 16:54:54 -07:00 committed by John Crispin
parent 492964e741
commit 2b4e5d478b
2 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
target/linux/generic/patches-4.4/997-device_tree_cmdline.patch
View File

@ -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;

2
target/linux/lantiq/dts/DGN3500.dtsi
View File

@ -2,7 +2,7 @@
/ {
chosen {
bootargs-append = "root= console=ttyLTQ0,115200";
bootargs = "root= console=ttyLTQ0,115200";
leds {
boot = &power_green;