openwrt/target/linux/ipq40xx/patches-5.4/997-device_tree_cmdline.patch

--- a/drivers/of/fdt.c
+++ b/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
ipq40xx: 5.4: refresh patches and config This patch just refreshes the 5.4 patches. It seems as if 070-v4.20-soc-qcom-spm-add-SCM-probe-dependency.patch is already applied, so drop it. It also does a quick make kernel_oldconfig to get rid of unneeded symbols. [Looks like USB and Ethernet need some more work]. Signed-off-by: Christian Lamparter <chunkeey@gmail.com> 2020-02-28 20:15:48 +00:00			`--- a/drivers/of/fdt.c`
			`+++ b/drivers/of/fdt.c`
ipq40xx: add v5.4 support Signed-off-by: John Crispin <john@phrozen.org> 2020-01-14 16:15:57 +00:00			`@@ -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`