mediatek: adapt files and patches for Linux 6.1

[openwrt/staging/hauke.git] / target / linux / mediatek / patches-6.1 / 901-arm-add-cmdline-override.patch

diff --git a/target/linux/mediatek/patches-6.1/901-arm-add-cmdline-override.patch b/target/linux/mediatek/patches-6.1/901-arm-add-cmdline-override.patch
index 6016128bd4a2000c419f4ed51bd1e014192ebfa4..602bac5d3d48cb77f2b148114c40b59d41bc0149 100644 (file)
--- a/target/linux/mediatek/patches-6.1/901-arm-add-cmdline-override.patch
+++ b/target/linux/mediatek/patches-6.1/901-arm-add-cmdline-override.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -1729,6 +1729,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
+@@ -1588,6 +1588,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
  
  endchoice
  
@@ -17,27 +17,27 @@
        default ""
 --- a/drivers/of/fdt.c
 +++ b/drivers/of/fdt.c
-@@ -1162,6 +1162,17 @@ int __init early_init_dt_scan_chosen(uns
+@@ -1187,6 +1187,17 @@ int __init early_init_dt_scan_chosen(cha
        if (p != NULL && l > 0)
-               strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE));
+               strlcat(cmdline, p, min_t(int, strlen(cmdline) + (int)l, COMMAND_LINE_SIZE));
  
-+      /* CONFIG_CMDLINE_OVERRIDE is used to fallback to a different
-+       * device tree option of chosen/bootargs-override. This is
-+       * helpful on boards where u-boot sets bootargs, and is unable
-+       * to be modified.
-+       */
++    /* CONFIG_CMDLINE_OVERRIDE is used to fallback to a different
++     * device tree option of chosen/bootargs-override. This is
++     * helpful on boards where u-boot sets bootargs, and is unable
++     * to be modified.
++     */
 +#ifdef CONFIG_CMDLINE_OVERRIDE
 +      p = of_get_flat_dt_prop(node, "bootargs-override", &l);
 +      if (p != NULL && l > 0)
-+              strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE));
++              strlcpy(cmdline, p, min((int)l, COMMAND_LINE_SIZE));
 +#endif
 +
+ handle_cmdline:
        /*
         * CONFIG_CMDLINE is meant to be a default in case nothing else
-        * managed to set the command line, unless CONFIG_CMDLINE_FORCE
 --- a/arch/arm64/Kconfig
 +++ b/arch/arm64/Kconfig
-@@ -1942,6 +1942,14 @@ config CMDLINE_FORCE
+@@ -2202,6 +2202,14 @@ config CMDLINE_FORCE
  
  endchoice