diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2014-03-07 11:27:00 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2014-03-07 11:27:00 +0000 |
commit | 2b43bb49dec4546cdca7e627b06e7682ae742591 (patch) | |
tree | 0d58c3ccdefbe53983cda5399612b4727f0ee81d /target/linux/generic/patches-3.14/997-device_tree_cmdline.patch | |
parent | 3be7023c9be4e1381699ce393638ad63565c9ac5 (diff) | |
download | upstream-2b43bb49dec4546cdca7e627b06e7682ae742591.tar.gz upstream-2b43bb49dec4546cdca7e627b06e7682ae742591.tar.bz2 upstream-2b43bb49dec4546cdca7e627b06e7682ae742591.zip |
add preliminary 3.14 support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39789 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.14/997-device_tree_cmdline.patch')
-rw-r--r-- | target/linux/generic/patches-3.14/997-device_tree_cmdline.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.14/997-device_tree_cmdline.patch b/target/linux/generic/patches-3.14/997-device_tree_cmdline.patch new file mode 100644 index 0000000000..8e87b1f03b --- /dev/null +++ b/target/linux/generic/patches-3.14/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 |