From affdd9eee873e5c406290316b376be2794bee94b Mon Sep 17 00:00:00 2001 From: Pawel Dembicki Date: Wed, 13 Mar 2024 11:01:01 +0100 Subject: [PATCH] mpc85xx: kernel: 6.6: refresh patches Manualy refreshed: 101-powerpc-85xx-hiveap-330-support.patch 105-powerpc-85xx-panda-support.patch Rest done by 'make target/linux/refresh' Signed-off-by: Pawel Dembicki --- ...owerpc-85xx-add-gpio-keys-to-of-match-table.patch | 2 +- .../100-powerpc-85xx-tl-wdr4900-v1-support.patch | 10 +++++----- .../101-powerpc-85xx-hiveap-330-support.patch | 12 ++++++------ .../102-powerpc-add-cmdline-override.patch | 4 ++-- .../patches-6.6/103-powerpc-85xx-red-15w-rev1.patch | 4 ++-- .../patches-6.6/105-powerpc-85xx-panda-support.patch | 4 ++-- .../106-powerpc-85xx-ws-ap3710i-support.patch | 4 ++-- .../107-powerpc-85xx-add-ws-ap3825i-support.patch | 10 +++++----- .../108-powerpc-85xx-firebox-t10-support.patch.patch | 2 +- .../109-powerpc-85xx-add-ws-ap3715i-support.patch | 8 ++++---- .../110-powerpc-85xx-br200-wp-support.patch | 10 +++++----- ...werpc-bootwrapper-disable-uImage-generation.patch | 4 ++-- 12 files changed, 37 insertions(+), 37 deletions(-) diff --git a/target/linux/mpc85xx/patches-6.6/001-powerpc-85xx-add-gpio-keys-to-of-match-table.patch b/target/linux/mpc85xx/patches-6.6/001-powerpc-85xx-add-gpio-keys-to-of-match-table.patch index 5e5ab10daf1..42ab234d90d 100644 --- a/target/linux/mpc85xx/patches-6.6/001-powerpc-85xx-add-gpio-keys-to-of-match-table.patch +++ b/target/linux/mpc85xx/patches-6.6/001-powerpc-85xx-add-gpio-keys-to-of-match-table.patch @@ -1,6 +1,6 @@ --- a/arch/powerpc/platforms/85xx/common.c +++ b/arch/powerpc/platforms/85xx/common.c -@@ -30,6 +30,7 @@ static const struct of_device_id mpc85xx +@@ -31,6 +31,7 @@ static const struct of_device_id mpc85xx { .compatible = "fsl,mpc8548-guts", }, /* Probably unnecessary? */ { .compatible = "gpio-leds", }, diff --git a/target/linux/mpc85xx/patches-6.6/100-powerpc-85xx-tl-wdr4900-v1-support.patch b/target/linux/mpc85xx/patches-6.6/100-powerpc-85xx-tl-wdr4900-v1-support.patch index a7253a97946..800341c6e11 100644 --- a/target/linux/mpc85xx/patches-6.6/100-powerpc-85xx-tl-wdr4900-v1-support.patch +++ b/target/linux/mpc85xx/patches-6.6/100-powerpc-85xx-tl-wdr4900-v1-support.patch @@ -19,7 +19,7 @@ Signed-off-by: Pawel Dembicki --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile -@@ -179,6 +179,7 @@ src-plat-$(CONFIG_PPC_PSERIES) += pserie +@@ -181,6 +181,7 @@ src-plat-$(CONFIG_PPC_PSERIES) += pserie src-plat-$(CONFIG_PPC_POWERNV) += pseries-head.S src-plat-$(CONFIG_PPC_IBM_CELL_BLADE) += pseries-head.S src-plat-$(CONFIG_MVME7100) += motload-head.S mvme7100.c @@ -27,7 +27,7 @@ Signed-off-by: Pawel Dembicki src-plat-$(CONFIG_PPC_MICROWATT) += fixed-head.S microwatt.c -@@ -359,7 +360,7 @@ image-$(CONFIG_TQM8548) += cuImage.tqm +@@ -351,7 +352,7 @@ image-$(CONFIG_TQM8548) += cuImage.tqm image-$(CONFIG_TQM8555) += cuImage.tqm8555 image-$(CONFIG_TQM8560) += cuImage.tqm8560 image-$(CONFIG_KSI8560) += cuImage.ksi8560 @@ -38,7 +38,7 @@ Signed-off-by: Pawel Dembicki --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper -@@ -341,6 +341,11 @@ adder875-redboot) +@@ -345,6 +345,11 @@ adder875-redboot) platformo="$object/fixed-head.o $object/redboot-8xx.o" binary=y ;; @@ -52,7 +52,7 @@ Signed-off-by: Pawel Dembicki binary=y --- a/arch/powerpc/platforms/85xx/Kconfig +++ b/arch/powerpc/platforms/85xx/Kconfig -@@ -163,6 +163,18 @@ config STX_GP3 +@@ -176,6 +176,18 @@ config STX_GP3 select CPM2 select DEFAULT_UIMAGE @@ -73,7 +73,7 @@ Signed-off-by: Pawel Dembicki help --- a/arch/powerpc/platforms/85xx/Makefile +++ b/arch/powerpc/platforms/85xx/Makefile -@@ -27,6 +27,7 @@ obj-$(CONFIG_TWR_P102x) += twr_p102x.o +@@ -26,6 +26,7 @@ obj-$(CONFIG_TWR_P102x) += twr_p102x.o obj-$(CONFIG_CORENET_GENERIC) += corenet_generic.o obj-$(CONFIG_FB_FSL_DIU) += t1042rdb_diu.o obj-$(CONFIG_STX_GP3) += stx_gp3.o diff --git a/target/linux/mpc85xx/patches-6.6/101-powerpc-85xx-hiveap-330-support.patch b/target/linux/mpc85xx/patches-6.6/101-powerpc-85xx-hiveap-330-support.patch index e8b6632f2b0..952df5e8a6b 100644 --- a/target/linux/mpc85xx/patches-6.6/101-powerpc-85xx-hiveap-330-support.patch +++ b/target/linux/mpc85xx/patches-6.6/101-powerpc-85xx-hiveap-330-support.patch @@ -25,12 +25,12 @@ obj-$(CONFIG_BSC9132_QDS) += bsc913x_qds.o obj-$(CONFIG_C293_PCIE) += c293pcie.o +obj-$(CONFIG_HIVEAP_330) += hiveap-330.o - obj-$(CONFIG_MPC8540_ADS) += mpc85xx_ads.o - obj-$(CONFIG_MPC8560_ADS) += mpc85xx_ads.o - obj-$(CONFIG_MPC85xx_CDS) += mpc85xx_cds.o + obj-$(CONFIG_MPC8536_DS) += mpc8536_ds.o + obj8259-$(CONFIG_PPC_I8259) += mpc85xx_8259.o + obj-$(CONFIG_MPC85xx_DS) += mpc85xx_ds.o $(obj8259-y) --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile -@@ -179,6 +179,7 @@ src-plat-$(CONFIG_PPC_PSERIES) += pserie +@@ -181,6 +181,7 @@ src-plat-$(CONFIG_PPC_PSERIES) += pserie src-plat-$(CONFIG_PPC_POWERNV) += pseries-head.S src-plat-$(CONFIG_PPC_IBM_CELL_BLADE) += pseries-head.S src-plat-$(CONFIG_MVME7100) += motload-head.S mvme7100.c @@ -38,7 +38,7 @@ src-plat-$(CONFIG_TL_WDR4900_V1) += simpleboot.c fixed-head.S src-plat-$(CONFIG_PPC_MICROWATT) += fixed-head.S microwatt.c -@@ -360,6 +361,7 @@ image-$(CONFIG_TQM8548) += cuImage.tqm +@@ -352,6 +353,7 @@ image-$(CONFIG_TQM8548) += cuImage.tqm image-$(CONFIG_TQM8555) += cuImage.tqm8555 image-$(CONFIG_TQM8560) += cuImage.tqm8560 image-$(CONFIG_KSI8560) += cuImage.ksi8560 @@ -48,7 +48,7 @@ image-$(CONFIG_MVME7100) += dtbImage.mvme7100 --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper -@@ -341,6 +341,7 @@ adder875-redboot) +@@ -345,6 +345,7 @@ adder875-redboot) platformo="$object/fixed-head.o $object/redboot-8xx.o" binary=y ;; diff --git a/target/linux/mpc85xx/patches-6.6/102-powerpc-add-cmdline-override.patch b/target/linux/mpc85xx/patches-6.6/102-powerpc-add-cmdline-override.patch index b83e5f86d2e..17aee6dafe6 100644 --- a/target/linux/mpc85xx/patches-6.6/102-powerpc-add-cmdline-override.patch +++ b/target/linux/mpc85xx/patches-6.6/102-powerpc-add-cmdline-override.patch @@ -1,6 +1,6 @@ --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig -@@ -954,6 +954,14 @@ config CMDLINE_FORCE +@@ -1005,6 +1005,14 @@ config CMDLINE_FORCE endchoice @@ -17,7 +17,7 @@ help --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c -@@ -1187,6 +1187,17 @@ int __init early_init_dt_scan_chosen(cha +@@ -1189,6 +1189,17 @@ int __init early_init_dt_scan_chosen(cha if (p != NULL && l > 0) strlcat(cmdline, p, min_t(int, strlen(cmdline) + (int)l, COMMAND_LINE_SIZE)); diff --git a/target/linux/mpc85xx/patches-6.6/103-powerpc-85xx-red-15w-rev1.patch b/target/linux/mpc85xx/patches-6.6/103-powerpc-85xx-red-15w-rev1.patch index 711d98abe75..551f306e562 100644 --- a/target/linux/mpc85xx/patches-6.6/103-powerpc-85xx-red-15w-rev1.patch +++ b/target/linux/mpc85xx/patches-6.6/103-powerpc-85xx-red-15w-rev1.patch @@ -1,6 +1,6 @@ --- a/arch/powerpc/platforms/85xx/Kconfig +++ b/arch/powerpc/platforms/85xx/Kconfig -@@ -166,6 +166,16 @@ config XES_MPC85xx +@@ -179,6 +179,16 @@ config XES_MPC85xx Manufacturer: Extreme Engineering Solutions, Inc. URL: @@ -19,7 +19,7 @@ help --- a/arch/powerpc/platforms/85xx/Makefile +++ b/arch/powerpc/platforms/85xx/Makefile -@@ -27,6 +27,7 @@ obj-$(CONFIG_P1023_RDB) += p1023_rdb.o +@@ -26,6 +26,7 @@ obj-$(CONFIG_PPC_P2020) += p2020.o $(o obj-$(CONFIG_TWR_P102x) += twr_p102x.o obj-$(CONFIG_CORENET_GENERIC) += corenet_generic.o obj-$(CONFIG_FB_FSL_DIU) += t1042rdb_diu.o diff --git a/target/linux/mpc85xx/patches-6.6/105-powerpc-85xx-panda-support.patch b/target/linux/mpc85xx/patches-6.6/105-powerpc-85xx-panda-support.patch index 3c24a373aba..e463c495399 100644 --- a/target/linux/mpc85xx/patches-6.6/105-powerpc-85xx-panda-support.patch +++ b/target/linux/mpc85xx/patches-6.6/105-powerpc-85xx-panda-support.patch @@ -20,11 +20,11 @@ select DEFAULT_UIMAGE --- a/arch/powerpc/platforms/85xx/Makefile +++ b/arch/powerpc/platforms/85xx/Makefile -@@ -24,6 +24,7 @@ obj-$(CONFIG_P1010_RDB) += p1010rdb.o +@@ -22,6 +22,7 @@ obj-$(CONFIG_P1010_RDB) += p1010rdb.o obj-$(CONFIG_P1022_DS) += p1022_ds.o obj-$(CONFIG_P1022_RDK) += p1022_rdk.o obj-$(CONFIG_P1023_RDB) += p1023_rdb.o +obj-$(CONFIG_PANDA) += panda.o + obj-$(CONFIG_PPC_P2020) += p2020.o $(obj8259-y) obj-$(CONFIG_TWR_P102x) += twr_p102x.o obj-$(CONFIG_CORENET_GENERIC) += corenet_generic.o - obj-$(CONFIG_FB_FSL_DIU) += t1042rdb_diu.o diff --git a/target/linux/mpc85xx/patches-6.6/106-powerpc-85xx-ws-ap3710i-support.patch b/target/linux/mpc85xx/patches-6.6/106-powerpc-85xx-ws-ap3710i-support.patch index 5ac3f2f2d94..469b6968330 100644 --- a/target/linux/mpc85xx/patches-6.6/106-powerpc-85xx-ws-ap3710i-support.patch +++ b/target/linux/mpc85xx/patches-6.6/106-powerpc-85xx-ws-ap3710i-support.patch @@ -20,9 +20,9 @@ select DEFAULT_UIMAGE --- a/arch/powerpc/platforms/85xx/Makefile +++ b/arch/powerpc/platforms/85xx/Makefile -@@ -26,6 +26,7 @@ obj-$(CONFIG_P1022_RDK) += p1022_rdk.o - obj-$(CONFIG_P1023_RDB) += p1023_rdb.o +@@ -25,6 +25,7 @@ obj-$(CONFIG_P1023_RDB) += p1023_rdb.o obj-$(CONFIG_PANDA) += panda.o + obj-$(CONFIG_PPC_P2020) += p2020.o $(obj8259-y) obj-$(CONFIG_TWR_P102x) += twr_p102x.o +obj-$(CONFIG_WS_AP3710I) += ws-ap3710i.o obj-$(CONFIG_CORENET_GENERIC) += corenet_generic.o diff --git a/target/linux/mpc85xx/patches-6.6/107-powerpc-85xx-add-ws-ap3825i-support.patch b/target/linux/mpc85xx/patches-6.6/107-powerpc-85xx-add-ws-ap3825i-support.patch index 63e7e46bbc5..8a42064570c 100644 --- a/target/linux/mpc85xx/patches-6.6/107-powerpc-85xx-add-ws-ap3825i-support.patch +++ b/target/linux/mpc85xx/patches-6.6/107-powerpc-85xx-add-ws-ap3825i-support.patch @@ -27,8 +27,8 @@ WS-AP3825i AP. select DEFAULT_UIMAGE --- a/arch/powerpc/platforms/85xx/Makefile +++ b/arch/powerpc/platforms/85xx/Makefile -@@ -27,6 +27,7 @@ obj-$(CONFIG_P1023_RDB) += p1023_rdb.o - obj-$(CONFIG_PANDA) += panda.o +@@ -26,6 +26,7 @@ obj-$(CONFIG_PANDA) += panda.o + obj-$(CONFIG_PPC_P2020) += p2020.o $(obj8259-y) obj-$(CONFIG_TWR_P102x) += twr_p102x.o obj-$(CONFIG_WS_AP3710I) += ws-ap3710i.o +obj-$(CONFIG_WS_AP3825I) += ws-ap3825i.o @@ -37,7 +37,7 @@ WS-AP3825i AP. obj-$(CONFIG_RED_15W_REV1) += red15w_rev1.o --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile -@@ -181,6 +181,7 @@ src-plat-$(CONFIG_PPC_IBM_CELL_BLADE) += +@@ -183,6 +183,7 @@ src-plat-$(CONFIG_PPC_IBM_CELL_BLADE) += src-plat-$(CONFIG_MVME7100) += motload-head.S mvme7100.c src-plat-$(CONFIG_HIVEAP_330) += simpleboot.c fixed-head.S src-plat-$(CONFIG_TL_WDR4900_V1) += simpleboot.c fixed-head.S @@ -45,7 +45,7 @@ WS-AP3825i AP. src-plat-$(CONFIG_PPC_MICROWATT) += fixed-head.S microwatt.c -@@ -363,6 +364,7 @@ image-$(CONFIG_TQM8560) += cuImage.tqm +@@ -355,6 +356,7 @@ image-$(CONFIG_TQM8560) += cuImage.tqm image-$(CONFIG_KSI8560) += cuImage.ksi8560 image-$(CONFIG_HIVEAP_330) += simpleImage.hiveap-330 image-$(CONFIG_TL_WDR4900_V1) += simpleImage.tl-wdr4900-v1 @@ -55,7 +55,7 @@ WS-AP3825i AP. --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper -@@ -342,6 +342,7 @@ adder875-redboot) +@@ -346,6 +346,7 @@ adder875-redboot) binary=y ;; simpleboot-hiveap-330|\ diff --git a/target/linux/mpc85xx/patches-6.6/108-powerpc-85xx-firebox-t10-support.patch.patch b/target/linux/mpc85xx/patches-6.6/108-powerpc-85xx-firebox-t10-support.patch.patch index 0b3a93b8486..2c722e4d9bf 100644 --- a/target/linux/mpc85xx/patches-6.6/108-powerpc-85xx-firebox-t10-support.patch.patch +++ b/target/linux/mpc85xx/patches-6.6/108-powerpc-85xx-firebox-t10-support.patch.patch @@ -19,7 +19,7 @@ select DEFAULT_UIMAGE --- a/arch/powerpc/platforms/85xx/Makefile +++ b/arch/powerpc/platforms/85xx/Makefile -@@ -28,6 +28,7 @@ obj-$(CONFIG_PANDA) += panda.o +@@ -27,6 +27,7 @@ obj-$(CONFIG_PPC_P2020) += p2020.o $(o obj-$(CONFIG_TWR_P102x) += twr_p102x.o obj-$(CONFIG_WS_AP3710I) += ws-ap3710i.o obj-$(CONFIG_WS_AP3825I) += ws-ap3825i.o diff --git a/target/linux/mpc85xx/patches-6.6/109-powerpc-85xx-add-ws-ap3715i-support.patch b/target/linux/mpc85xx/patches-6.6/109-powerpc-85xx-add-ws-ap3715i-support.patch index f8e33ae6379..d6c59e8f72c 100644 --- a/target/linux/mpc85xx/patches-6.6/109-powerpc-85xx-add-ws-ap3715i-support.patch +++ b/target/linux/mpc85xx/patches-6.6/109-powerpc-85xx-add-ws-ap3715i-support.patch @@ -20,8 +20,8 @@ select DEFAULT_UIMAGE --- a/arch/powerpc/platforms/85xx/Makefile +++ b/arch/powerpc/platforms/85xx/Makefile -@@ -27,6 +27,7 @@ obj-$(CONFIG_P1023_RDB) += p1023_rdb.o - obj-$(CONFIG_PANDA) += panda.o +@@ -26,6 +26,7 @@ obj-$(CONFIG_PANDA) += panda.o + obj-$(CONFIG_PPC_P2020) += p2020.o $(obj8259-y) obj-$(CONFIG_TWR_P102x) += twr_p102x.o obj-$(CONFIG_WS_AP3710I) += ws-ap3710i.o +obj-$(CONFIG_WS_AP3715I) += ws-ap3715i.o @@ -30,7 +30,7 @@ obj-$(CONFIG_CORENET_GENERIC) += corenet_generic.o --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile -@@ -364,6 +364,7 @@ image-$(CONFIG_TQM8560) += cuImage.tqm +@@ -356,6 +356,7 @@ image-$(CONFIG_TQM8560) += cuImage.tqm image-$(CONFIG_KSI8560) += cuImage.ksi8560 image-$(CONFIG_HIVEAP_330) += simpleImage.hiveap-330 image-$(CONFIG_TL_WDR4900_V1) += simpleImage.tl-wdr4900-v1 @@ -40,7 +40,7 @@ image-$(CONFIG_MVME7100) += dtbImage.mvme7100 --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper -@@ -342,6 +342,7 @@ adder875-redboot) +@@ -346,6 +346,7 @@ adder875-redboot) binary=y ;; simpleboot-hiveap-330|\ diff --git a/target/linux/mpc85xx/patches-6.6/110-powerpc-85xx-br200-wp-support.patch b/target/linux/mpc85xx/patches-6.6/110-powerpc-85xx-br200-wp-support.patch index b063b3dab74..f3ec26ec99f 100644 --- a/target/linux/mpc85xx/patches-6.6/110-powerpc-85xx-br200-wp-support.patch +++ b/target/linux/mpc85xx/patches-6.6/110-powerpc-85xx-br200-wp-support.patch @@ -25,11 +25,11 @@ obj-$(CONFIG_C293_PCIE) += c293pcie.o +obj-$(CONFIG_BR200_WP) += br200-wp.o obj-$(CONFIG_HIVEAP_330) += hiveap-330.o - obj-$(CONFIG_MPC8540_ADS) += mpc85xx_ads.o - obj-$(CONFIG_MPC8560_ADS) += mpc85xx_ads.o + obj-$(CONFIG_MPC8536_DS) += mpc8536_ds.o + obj8259-$(CONFIG_PPC_I8259) += mpc85xx_8259.o --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile -@@ -179,6 +179,7 @@ src-plat-$(CONFIG_PPC_PSERIES) += pserie +@@ -181,6 +181,7 @@ src-plat-$(CONFIG_PPC_PSERIES) += pserie src-plat-$(CONFIG_PPC_POWERNV) += pseries-head.S src-plat-$(CONFIG_PPC_IBM_CELL_BLADE) += pseries-head.S src-plat-$(CONFIG_MVME7100) += motload-head.S mvme7100.c @@ -37,7 +37,7 @@ src-plat-$(CONFIG_HIVEAP_330) += simpleboot.c fixed-head.S src-plat-$(CONFIG_TL_WDR4900_V1) += simpleboot.c fixed-head.S src-plat-$(CONFIG_WS_AP3825I) += simpleboot.c fixed-head.S -@@ -362,6 +363,7 @@ image-$(CONFIG_TQM8548) += cuImage.tqm +@@ -354,6 +355,7 @@ image-$(CONFIG_TQM8548) += cuImage.tqm image-$(CONFIG_TQM8555) += cuImage.tqm8555 image-$(CONFIG_TQM8560) += cuImage.tqm8560 image-$(CONFIG_KSI8560) += cuImage.ksi8560 @@ -47,7 +47,7 @@ image-$(CONFIG_WS_AP3715I) += simpleImage.ws-ap3715i --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper -@@ -341,6 +341,7 @@ adder875-redboot) +@@ -345,6 +345,7 @@ adder875-redboot) platformo="$object/fixed-head.o $object/redboot-8xx.o" binary=y ;; diff --git a/target/linux/mpc85xx/patches-6.6/900-powerpc-bootwrapper-disable-uImage-generation.patch b/target/linux/mpc85xx/patches-6.6/900-powerpc-bootwrapper-disable-uImage-generation.patch index 648aa0421d6..d5bef033876 100644 --- a/target/linux/mpc85xx/patches-6.6/900-powerpc-bootwrapper-disable-uImage-generation.patch +++ b/target/linux/mpc85xx/patches-6.6/900-powerpc-bootwrapper-disable-uImage-generation.patch @@ -16,7 +16,7 @@ Signed-off-by: David Bauer --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile -@@ -291,7 +291,6 @@ image-$(CONFIG_PPC_CHRP) += zImage.chrp +@@ -293,7 +293,6 @@ image-$(CONFIG_PPC_CHRP) += zImage.chrp image-$(CONFIG_PPC_EFIKA) += zImage.chrp image-$(CONFIG_PPC_PMAC) += zImage.pmac image-$(CONFIG_PPC_HOLLY) += dtbImage.holly @@ -24,7 +24,7 @@ Signed-off-by: David Bauer image-$(CONFIG_EPAPR_BOOT) += zImage.epapr # -@@ -427,15 +426,6 @@ $(obj)/dtbImage.%: vmlinux $(wrapperbits +@@ -418,15 +417,6 @@ $(obj)/dtbImage.%: vmlinux $(wrapperbits $(obj)/vmlinux.strip: vmlinux $(STRIP) -s -R .comment $< -o $@