diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2013-10-24 13:50:11 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2013-10-24 13:50:11 +0000 |
commit | e72c7e17a475c00134c56f4392578ddc16a47a2e (patch) | |
tree | 842835f958f9c9ed315cb853173d51e43f76bbf5 /target/linux/generic/patches-3.12/997-device_tree_cmdline.patch | |
parent | 4341ea40379ed24c103e37b75661c62bfc3270f6 (diff) | |
download | upstream-e72c7e17a475c00134c56f4392578ddc16a47a2e.tar.gz upstream-e72c7e17a475c00134c56f4392578ddc16a47a2e.tar.bz2 upstream-e72c7e17a475c00134c56f4392578ddc16a47a2e.zip |
preliminary 3.12 support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 38528
Diffstat (limited to 'target/linux/generic/patches-3.12/997-device_tree_cmdline.patch')
-rw-r--r-- | target/linux/generic/patches-3.12/997-device_tree_cmdline.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.12/997-device_tree_cmdline.patch b/target/linux/generic/patches-3.12/997-device_tree_cmdline.patch new file mode 100644 index 0000000000..fdd01d281a --- /dev/null +++ b/target/linux/generic/patches-3.12/997-device_tree_cmdline.patch @@ -0,0 +1,12 @@ +--- a/drivers/of/fdt.c ++++ b/drivers/of/fdt.c +@@ -754,6 +754,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 |