diff options
author | John Crispin <john@phrozen.org> | 2017-07-05 07:52:36 +0200 |
---|---|---|
committer | John Crispin <john@phrozen.org> | 2017-07-06 06:37:03 +0200 |
commit | fddc78bc116bc043fb5cd92dbc45cfd054c21af8 (patch) | |
tree | bb82a2b964986ddaec87414ab6b7b19b43ebc8b8 /target/linux/ramips/patches-4.4/0104-fix_bootargs_handling.patch | |
parent | 05d6e92594c507dcd1f4be6c1bcb2282fe1abe1f (diff) | |
download | upstream-fddc78bc116bc043fb5cd92dbc45cfd054c21af8.tar.gz upstream-fddc78bc116bc043fb5cd92dbc45cfd054c21af8.tar.bz2 upstream-fddc78bc116bc043fb5cd92dbc45cfd054c21af8.zip |
ramips: bump to v4.9
Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'target/linux/ramips/patches-4.4/0104-fix_bootargs_handling.patch')
-rw-r--r-- | target/linux/ramips/patches-4.4/0104-fix_bootargs_handling.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/target/linux/ramips/patches-4.4/0104-fix_bootargs_handling.patch b/target/linux/ramips/patches-4.4/0104-fix_bootargs_handling.patch deleted file mode 100644 index 9f76aa1f5b..0000000000 --- a/target/linux/ramips/patches-4.4/0104-fix_bootargs_handling.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/arch/mips/ralink/of.c -+++ b/arch/mips/ralink/of.c -@@ -3,7 +3,7 @@ - * under the terms of the GNU General Public License version 2 as published - * by the Free Software Foundation. - * -- * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org> -+ * Copyright (C) 2008-2014 Imre Kaloz <kaloz@openwrt.org> - * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org> - * Copyright (C) 2013 John Crispin <blogic@openwrt.org> - */ -@@ -66,6 +66,17 @@ static int __init early_init_dt_find_mem - return 0; - } - -+static int chosen_dtb; -+ -+static int __init early_init_dt_find_chosen(unsigned long node, const char *uname, -+ int depth, void *data) -+{ -+ if (depth == 1 && !strcmp(uname, "chosen")) -+ chosen_dtb = 1; -+ -+ return 0; -+} -+ - extern struct boot_param_header __image_dtb; - - void __init plat_mem_setup(void) -@@ -78,7 +89,9 @@ void __init plat_mem_setup(void) - */ - __dt_setup_arch(&__image_dtb); - -- strlcpy(arcs_cmdline, boot_command_line, COMMAND_LINE_SIZE); -+ of_scan_flat_dt(early_init_dt_find_chosen, NULL); -+ if (chosen_dtb) -+ strlcpy(arcs_cmdline, boot_command_line, COMMAND_LINE_SIZE); - - of_scan_flat_dt(early_init_dt_find_memory, NULL); - if (memory_dtb) |