2017-09-06 19:19:45 +08:00
|
|
|
--- a/drivers/of/fdt.c
|
|
|
|
|
+++ b/drivers/of/fdt.c
|
2020-07-02 23:30:56 +08:00
|
|
|
@@ -1059,6 +1059,9 @@ int __init early_init_dt_scan_chosen(uns
|
2017-09-06 19:19:45 +08:00
|
|
|
p = of_get_flat_dt_prop(node, "bootargs", &l);
|
|
|
|
|
if (p != NULL && l > 0)
|
2020-07-02 23:30:56 +08:00
|
|
|
strlcpy(data, p, min(l, COMMAND_LINE_SIZE));
|
2017-09-06 19:19:45 +08:00
|
|
|
+ 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));
|
|
|
|
|
|
2022-04-29 23:56:09 +09:00
|
|
|
/* CONFIG_CMDLINE_OVERRIDE is used to fallback to a different
|
|
|
|
|
* device tree option of chosen/bootargs-override. This is
|
