mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-21 03:55:06 +00:00
debf4b56cd
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.10.206 All patches automatically rebased. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
13 lines
462 B
Diff
13 lines
462 B
Diff
--- a/drivers/of/fdt.c
|
|
+++ b/drivers/of/fdt.c
|
|
@@ -1054,6 +1054,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
|