diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2015-01-25 15:20:39 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2015-01-25 15:20:39 +0000 |
commit | eac842c52b28a4fd42082f3ca8231f5874a57361 (patch) | |
tree | 514eb8ba16df65dd4b3feeb3c900279596556d09 /target/linux/generic/patches-3.19/997-device_tree_cmdline.patch | |
parent | 10c00d28433d42305ead73480465ce87d047a3d2 (diff) | |
download | upstream-eac842c52b28a4fd42082f3ca8231f5874a57361.tar.gz upstream-eac842c52b28a4fd42082f3ca8231f5874a57361.tar.bz2 upstream-eac842c52b28a4fd42082f3ca8231f5874a57361.zip |
generic: add preliminary 3.19 support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44126 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.19/997-device_tree_cmdline.patch')
-rw-r--r-- | target/linux/generic/patches-3.19/997-device_tree_cmdline.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.19/997-device_tree_cmdline.patch b/target/linux/generic/patches-3.19/997-device_tree_cmdline.patch new file mode 100644 index 0000000000..8063809df1 --- /dev/null +++ b/target/linux/generic/patches-3.19/997-device_tree_cmdline.patch @@ -0,0 +1,24 @@ +--- a/drivers/of/fdt.c ++++ b/drivers/of/fdt.c +@@ -917,6 +917,9 @@ int __init early_init_dt_scan_chosen(uns + p = of_get_flat_dt_prop(node, "bootargs", &l); + if (p != NULL && l > 0) + strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE)); ++ p = of_get_flat_dt_prop(node, "bootargs-append", &l); ++ if (p != NULL && l > 0) ++ strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE)); + + /* + * CONFIG_CMDLINE is meant to be a default in case nothing else +--- a/arch/mips/kernel/prom.c ++++ b/arch/mips/kernel/prom.c +@@ -50,6 +50,9 @@ void * __init early_init_dt_alloc_memory + + void __init __dt_setup_arch(void *bph) + { ++ if (boot_command_line[0] == '\0') ++ strcpy(boot_command_line, arcs_cmdline); ++ + if (!early_init_dt_scan(bph)) + return; + |