diff options
| author | Christian Marangi <ansuelsmth@gmail.com> | 2022-10-18 22:26:34 +0200 |
|---|---|---|
| committer | Christian Marangi <ansuelsmth@gmail.com> | 2023-05-22 22:28:13 +0200 |
| commit | fa79baf4a6e2306d60ac4968fdd8935e64c358ab (patch) | |
| tree | de53f6e86a88ff7eb4930e574200a0d850efa6a9 /target/linux/generic/hack-6.1/920-device_tree_cmdline.patch | |
| parent | 8fb9bbcf659ac6205554ed1680c57f3c4e0e0f54 (diff) | |
| download | upstream-fa79baf4a6e2306d60ac4968fdd8935e64c358ab.tar.gz upstream-fa79baf4a6e2306d60ac4968fdd8935e64c358ab.tar.bz2 upstream-fa79baf4a6e2306d60ac4968fdd8935e64c358ab.zip | |
generic: copy backport, hack, pending patch and config from 5.15 to 6.1
Copy backport, hack, pending patch and config from 5.15 to 6.1.
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Diffstat (limited to 'target/linux/generic/hack-6.1/920-device_tree_cmdline.patch')
| -rw-r--r-- | target/linux/generic/hack-6.1/920-device_tree_cmdline.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/target/linux/generic/hack-6.1/920-device_tree_cmdline.patch b/target/linux/generic/hack-6.1/920-device_tree_cmdline.patch new file mode 100644 index 00000000000..d1f36e716ed --- /dev/null +++ b/target/linux/generic/hack-6.1/920-device_tree_cmdline.patch @@ -0,0 +1,21 @@ +From e08bcbbaa52fcc41f02743fd2e62a33255ce52da Mon Sep 17 00:00:00 2001 +From: OpenWrt community <openwrt-devel@lists.openwrt.org> +Date: Wed, 13 Jul 2022 13:52:28 +0200 +Subject: [PATCH] of/ftd: add device tree cmdline + +--- + drivers/of/fdt.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/of/fdt.c ++++ b/drivers/of/fdt.c +@@ -1158,6 +1158,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 |