|
@@ -1,6 +1,6 @@
|
|
|
--- a/drivers/of/fdt.c
|
|
|
+++ b/drivers/of/fdt.c
|
|
|
-@@ -1055,6 +1055,9 @@ int __init early_init_dt_scan_chosen(uns
|
|
|
+@@ -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));
|
|
@@ -8,5 +8,5 @@
|
|
|
+ if (p != NULL && l > 0)
|
|
|
+ strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE));
|
|
|
|
|
|
- /* CONFIG_CMDLINE_OVERRIDE is used to fallback to a different
|
|
|
- * device tree option of chosen/bootargs-override. This is
|
|
|
+ /*
|
|
|
+ * CONFIG_CMDLINE is meant to be a default in case nothing else
|