ipq40xx: add v5.4 support

[openwrt/staging/blogic.git] / target / linux / ipq40xx / patches-5.4 / 997-device_tree_cmdline.patch

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 (file)
index 0000000..c183645
--- /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