aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq40xx/patches-5.4/997-device_tree_cmdline.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@phrozen.org>2020-01-14 17:15:57 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2020-02-28 17:50:46 +0100
commit272e0a702a2bcfb383c59051f37c87dcdbe844f5 (patch)
tree1f8b47032764ae85be26374e8de4df2de724df1c /target/linux/ipq40xx/patches-5.4/997-device_tree_cmdline.patch
parent25d9df670b850a4e3702e084ff249baa1670ae3f (diff)
downloadupstream-272e0a702a2bcfb383c59051f37c87dcdbe844f5.tar.gz
upstream-272e0a702a2bcfb383c59051f37c87dcdbe844f5.tar.bz2
upstream-272e0a702a2bcfb383c59051f37c87dcdbe844f5.zip
ipq40xx: add v5.4 support
Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'target/linux/ipq40xx/patches-5.4/997-device_tree_cmdline.patch')
-rw-r--r--target/linux/ipq40xx/patches-5.4/997-device_tree_cmdline.patch14
1 files changed, 14 insertions, 0 deletions
diff --git a/target/linux/ipq40xx/patches-5.4/997-device_tree_cmdline.patch b/target/linux/ipq40xx/patches-5.4/997-device_tree_cmdline.patch
new file mode 100644
index 0000000000..c1836453bc
--- /dev/null
+++ b/target/linux/ipq40xx/patches-5.4/997-device_tree_cmdline.patch
@@ -0,0 +1,14 @@
+Index: linux-5.4.5/drivers/of/fdt.c
+===================================================================
+--- linux-5.4.5.orig/drivers/of/fdt.c
++++ linux-5.4.5/drivers/of/fdt.c
+@@ -1059,6 +1059,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(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