Author: blogic Date: 2015-08-17 12:13:46 +0200 (Mon, 17 Aug 2015) New Revision: 46667
Added: trunk/target/linux/ramips/patches-3.18/0104-fix_bootargs_handling.patch Removed: trunk/target/linux/ramips/patches-3.18/0073-fix_bootargs_handling.patch Log: ramips: move patches around 0073 needs to applied afert 0102 Signed-off-by: John Crispin <[email protected]> Deleted: trunk/target/linux/ramips/patches-3.18/0073-fix_bootargs_handling.patch =================================================================== --- trunk/target/linux/ramips/patches-3.18/0073-fix_bootargs_handling.patch 2015-08-17 10:13:03 UTC (rev 46666) +++ trunk/target/linux/ramips/patches-3.18/0073-fix_bootargs_handling.patch 2015-08-17 10:13:46 UTC (rev 46667) @@ -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 <[email protected]> -+ * Copyright (C) 2008-2014 Imre Kaloz <[email protected]> - * Copyright (C) 2008-2009 Gabor Juhos <[email protected]> - * Copyright (C) 2013 John Crispin <[email protected]> - */ -@@ -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) Copied: trunk/target/linux/ramips/patches-3.18/0104-fix_bootargs_handling.patch (from rev 46666, trunk/target/linux/ramips/patches-3.18/0073-fix_bootargs_handling.patch) =================================================================== --- trunk/target/linux/ramips/patches-3.18/0104-fix_bootargs_handling.patch (rev 0) +++ trunk/target/linux/ramips/patches-3.18/0104-fix_bootargs_handling.patch 2015-08-17 10:13:46 UTC (rev 46667) @@ -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 <[email protected]> ++ * Copyright (C) 2008-2014 Imre Kaloz <[email protected]> + * Copyright (C) 2008-2009 Gabor Juhos <[email protected]> + * Copyright (C) 2013 John Crispin <[email protected]> + */ +@@ -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) _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
