openwrt/target/linux/ipq806x/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
kernel: bump 5.4 to 5.4.66 All modifications made by update_kernel.sh/no manual intervention needed Run-tested: ipq806x (R7800), ath79 (Archer C7v5), x86/64 No dmesg regressions, everything appears functional Signed-off-by: John Audia <graysky@archlinux.us> [add run test from PR] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> 2020-09-17 13:51:25 +00:00			`--- a/drivers/of/fdt.c`
			`+++ b/drivers/of/fdt.c`
ipq806x: import bootargs-append from IPQ40xx This imports the patch that adds bootargs-append support from IPQ40xx. This way we can append additional boot arguments from DTS instead of only being able to overwrite them. This way dual firmware devices can use the rootfs number that bootloader passes to decide from what to boot. But we still need to append console info and ubi root info. This is used by Edgecore ECW5410. Signed-off-by: Robert Marko <robert.marko@sartura.hr> 2020-05-18 10:35:15 +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`