diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2015-01-02 16:48:20 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2015-01-02 16:48:20 +0000 |
| commit | 6bfd210ade2a5d35950f56aeeac2d0ee1b8499e0 (patch) | |
| tree | d8711a77b4a89759413668bd3a8cd8233e14ea48 /target/linux | |
| parent | f12a0f4308334c792d4db73898540b7b735b8c24 (diff) | |
| download | upstream-6bfd210ade2a5d35950f56aeeac2d0ee1b8499e0.tar.gz upstream-6bfd210ade2a5d35950f56aeeac2d0ee1b8499e0.tar.bz2 upstream-6bfd210ade2a5d35950f56aeeac2d0ee1b8499e0.zip | |
honor the bootloader's bootargs
Only overwrite the bootloader's bootargs if "chosen" exists in the dtb
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 43802
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/ramips/patches-3.14/0110-fix_bootargs_handling.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/target/linux/ramips/patches-3.14/0110-fix_bootargs_handling.patch b/target/linux/ramips/patches-3.14/0110-fix_bootargs_handling.patch new file mode 100644 index 0000000000..203d2455d2 --- /dev/null +++ b/target/linux/ramips/patches-3.14/0110-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> + */ +@@ -91,6 +91,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) +@@ -103,7 +114,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) |