diff options
| author | John Crispin <blogic@openwrt.org> | 2015-08-17 10:13:46 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2015-08-17 10:13:46 +0000 |
| commit | b93da45e005a9f42d3ecf6843c5ffaa13de5e8e8 (patch) | |
| tree | 96a73644c5da1846f21221df1f837156e7003506 /target/linux/ramips/patches-3.18/0073-fix_bootargs_handling.patch | |
| parent | 88467c3a94e966ac7fbbeb68bad13626ba99e1a0 (diff) | |
| download | master-187ad058-b93da45e005a9f42d3ecf6843c5ffaa13de5e8e8.tar.gz master-187ad058-b93da45e005a9f42d3ecf6843c5ffaa13de5e8e8.tar.bz2 master-187ad058-b93da45e005a9f42d3ecf6843c5ffaa13de5e8e8.zip | |
ramips: move patches around
0073 needs to applied afert 0102
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46667 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ramips/patches-3.18/0073-fix_bootargs_handling.patch')
| -rw-r--r-- | target/linux/ramips/patches-3.18/0073-fix_bootargs_handling.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/target/linux/ramips/patches-3.18/0073-fix_bootargs_handling.patch b/target/linux/ramips/patches-3.18/0073-fix_bootargs_handling.patch deleted file mode 100644 index 9f76aa1f5b..0000000000 --- a/target/linux/ramips/patches-3.18/0073-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) |