From dc8cc446128776ee69571ff03925e6bd3256c2e0 Mon Sep 17 00:00:00 2001 From: Kabuli Chana Date: Tue, 23 Feb 2021 10:29:49 -0700 Subject: kernel: bump version 5.10 to 5.10.18 update kernel version, refresh current patchset Signed-off-by: Kabuli Chana [rebase/refresh] Signed-off-by: Adrian Schmutzler --- .../mpc85xx/patches-5.10/102-powerpc-add-cmdline-override.patch | 8 ++++---- .../mpc85xx/patches-5.10/103-powerpc-85xx-red-15w-rev1.patch | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'target/linux/mpc85xx') 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 924ce9307e..652e8ee6c3 100644 --- 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)); diff --git a/target/linux/mpc85xx/patches-5.10/103-powerpc-85xx-red-15w-rev1.patch b/target/linux/mpc85xx/patches-5.10/103-powerpc-85xx-red-15w-rev1.patch index b84a56659c..2900a1bea2 100644 --- a/target/linux/mpc85xx/patches-5.10/103-powerpc-85xx-red-15w-rev1.patch +++ b/target/linux/mpc85xx/patches-5.10/103-powerpc-85xx-red-15w-rev1.patch @@ -2,7 +2,7 @@ +++ b/arch/powerpc/platforms/85xx/Kconfig @@ -173,6 +173,16 @@ config XES_MPC85xx Manufacturer: Extreme Engineering Solutions, Inc. - URL: + URL: +config RED_15W_REV1 + bool "Sophos RED 15w Rev.1" -- cgit v1.2.3