aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.13/997-device_tree_cmdline.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2014-01-20 13:56:24 +0000
committerImre Kaloz <kaloz@openwrt.org>2014-01-20 13:56:24 +0000
commit11d25cc460a75454a9aa8d3a7c70abb5abcf8d2c (patch)
treeec4fe2ab7f765c6d86d6b321349f296dbc9afb9b /target/linux/generic/patches-3.13/997-device_tree_cmdline.patch
parent54d11602cc5a312834e38e09158ac55cc3429a86 (diff)
downloadupstream-11d25cc460a75454a9aa8d3a7c70abb5abcf8d2c.tar.gz
upstream-11d25cc460a75454a9aa8d3a7c70abb5abcf8d2c.tar.bz2
upstream-11d25cc460a75454a9aa8d3a7c70abb5abcf8d2c.zip
[generic]: add initial 3.13 support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39348 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.13/997-device_tree_cmdline.patch')
-rw-r--r--target/linux/generic/patches-3.13/997-device_tree_cmdline.patch12
1 files changed, 12 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.13/997-device_tree_cmdline.patch b/target/linux/generic/patches-3.13/997-device_tree_cmdline.patch
new file mode 100644
index 0000000000..8e87b1f03b
--- /dev/null
+++ b/target/linux/generic/patches-3.13/997-device_tree_cmdline.patch
@@ -0,0 +1,12 @@
+--- a/drivers/of/fdt.c
++++ b/drivers/of/fdt.c
+@@ -817,6 +817,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(strlen(data) + (int)l, COMMAND_LINE_SIZE));
+
+ /*
+ * CONFIG_CMDLINE is meant to be a default in case nothing else