kernel: bump version 5.10 to 5.10.18

[openwrt/staging/mkresin.git] / target / linux / mpc85xx / patches-5.10 / 102-powerpc-add-cmdline-override.patch

diff --git a/target/linux/mpc85xx/patches-5.10/102-powerpc-add-cmdline-override.patch b/target/linux/mpc85xx/patches-5.10/102-powerpc-add-cmdline-override.patch
index 924ce9307e27111e6a68f69013a138c31ed83cac..652e8ee6c3a028a03ff84f03fc7b4296766c1ad0 100644 (file)
--- a/target/linux/mpc85xx/patches-5.10/102-powerpc-add-cmdline-override.patch
+++ b/target/linux/mpc85xx/patches-5.10/102-powerpc-add-cmdline-override.patch
@@ -1,8 +1,8 @@
 --- a/arch/powerpc/Kconfig
 +++ b/arch/powerpc/Kconfig
-@@ -885,6 +885,14 @@ config CMDLINE_FORCE
-         This is useful if you cannot or don't want to change the
-         command-line options your boot loader passes to the kernel.
+@@ -932,6 +932,14 @@ config CMDLINE_FORCE
+ 
+ endchoice
  
 +config CMDLINE_OVERRIDE
 +    bool "Use alternative cmdline from device tree"
@@ -17,7 +17,7 @@
        help
 --- a/drivers/of/fdt.c
 +++ b/drivers/of/fdt.c
-@@ -1060,6 +1060,17 @@ int __init early_init_dt_scan_chosen(uns
+@@ -1056,6 +1056,17 @@ int __init early_init_dt_scan_chosen(uns
        if (p != NULL && l > 0)
                strlcpy(data, p, min(l, COMMAND_LINE_SIZE));