kernel: move bootargs-append patch to generic
[openwrt/staging/nbd.git] / target / linux / mpc85xx / patches-5.10 / 102-powerpc-add-cmdline-override.patch
index 652e8ee6c3a028a03ff84f03fc7b4296766c1ad0..a2fd800ced1aa5526fa1b037f8c1fc858f1abe9f 100644 (file)
@@ -17,9 +17,9 @@
        help
 --- a/drivers/of/fdt.c
 +++ b/drivers/of/fdt.c
-@@ -1056,6 +1056,17 @@ int __init early_init_dt_scan_chosen(uns
+@@ -1059,6 +1059,17 @@ int __init early_init_dt_scan_chosen(uns
        if (p != NULL && l > 0)
-               strlcpy(data, p, min(l, COMMAND_LINE_SIZE));
+               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