diff options
| author | John Crispin <john@openwrt.org> | 2015-08-17 10:13:46 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2015-08-17 10:13:46 +0000 |
| commit | 402c2d008bd3905fcda7322b7a6a8516a2803aa7 (patch) | |
| tree | 2fd93d9d87aa99a6b14497136ff4ea4b35c818e6 /target/linux/ramips/patches-3.18/0104-fix_bootargs_handling.patch | |
| parent | cbc2613a5c8676c32060e72e85c59dcfd2e5cbb6 (diff) | |
| download | master-31e0f0ae-402c2d008bd3905fcda7322b7a6a8516a2803aa7.tar.gz master-31e0f0ae-402c2d008bd3905fcda7322b7a6a8516a2803aa7.tar.bz2 master-31e0f0ae-402c2d008bd3905fcda7322b7a6a8516a2803aa7.zip | |
ramips: move patches around
0073 needs to applied afert 0102
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 46667
Diffstat (limited to 'target/linux/ramips/patches-3.18/0104-fix_bootargs_handling.patch')
| -rw-r--r-- | target/linux/ramips/patches-3.18/0104-fix_bootargs_handling.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/target/linux/ramips/patches-3.18/0104-fix_bootargs_handling.patch b/target/linux/ramips/patches-3.18/0104-fix_bootargs_handling.patch new file mode 100644 index 0000000000..9f76aa1f5b --- /dev/null +++ b/target/linux/ramips/patches-3.18/0104-fix_bootargs_handling.patch @@ -0,0 +1,40 @@ +--- 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) |