From: David Bauer Date: Fri, 9 May 2025 19:49:14 +0000 (+0200) Subject: mpc85xx: refresh kernel 6.12 patches X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=af69ad389895802dca2e7bda536f5ef04cfd37d7;p=openwrt%2Fstaging%2Fblocktrron.git mpc85xx: refresh kernel 6.12 patches Signed-off-by: David Bauer --- diff --git a/target/linux/mpc85xx/patches-6.12/010-powerpc-add-compressed-zImage-for-mpc85xx.patch b/target/linux/mpc85xx/patches-6.12/010-powerpc-add-compressed-zImage-for-mpc85xx.patch index 056dac043d..9e3f57f066 100644 --- a/target/linux/mpc85xx/patches-6.12/010-powerpc-add-compressed-zImage-for-mpc85xx.patch +++ b/target/linux/mpc85xx/patches-6.12/010-powerpc-add-compressed-zImage-for-mpc85xx.patch @@ -16,7 +16,7 @@ Signed-off-by: David Bauer --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile -@@ -178,6 +178,7 @@ src-plat-$(CONFIG_EMBEDDED6xx) += cuboot +@@ -172,6 +172,7 @@ src-plat-$(CONFIG_EMBEDDED6xx) += cuboot src-plat-$(CONFIG_AMIGAONE) += cuboot-amigaone.c src-plat-$(CONFIG_PPC_PS3) += ps3-head.S ps3-hvcall.S ps3.c src-plat-$(CONFIG_EPAPR_BOOT) += epapr.c epapr-wrapper.c @@ -24,7 +24,7 @@ Signed-off-by: David Bauer src-plat-$(CONFIG_PPC_PSERIES) += pseries-head.S src-plat-$(CONFIG_PPC_POWERNV) += pseries-head.S src-plat-$(CONFIG_PPC_IBM_CELL_BLADE) += pseries-head.S -@@ -343,6 +344,7 @@ image-$(CONFIG_MPC834x_ITX) += cuImage. +@@ -332,6 +333,7 @@ image-$(CONFIG_MPC834x_ITX) += cuImage. image-$(CONFIG_ASP834x) += dtbImage.asp834x-redboot # Board ports in arch/powerpc/platform/85xx/Kconfig diff --git a/target/linux/mpc85xx/patches-6.12/100-powerpc-85xx-tl-wdr4900-v1-support.patch b/target/linux/mpc85xx/patches-6.12/100-powerpc-85xx-tl-wdr4900-v1-support.patch index 0dbe4d8494..1ff6a981f0 100644 --- a/target/linux/mpc85xx/patches-6.12/100-powerpc-85xx-tl-wdr4900-v1-support.patch +++ b/target/linux/mpc85xx/patches-6.12/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 -@@ -183,6 +183,7 @@ src-plat-$(CONFIG_PPC_PSERIES) += pserie +@@ -177,6 +177,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 -@@ -354,7 +355,7 @@ image-$(CONFIG_TQM8548) += cuImage.tqm +@@ -343,7 +344,7 @@ image-$(CONFIG_TQM8548) += cuImage.tqm image-$(CONFIG_TQM8555) += cuImage.tqm8555 image-$(CONFIG_TQM8560) += cuImage.tqm8560 image-$(CONFIG_KSI8560) += cuImage.ksi8560 diff --git a/target/linux/mpc85xx/patches-6.12/101-powerpc-85xx-hiveap-330-support.patch b/target/linux/mpc85xx/patches-6.12/101-powerpc-85xx-hiveap-330-support.patch index 1c6f7878a0..79b9da4821 100644 --- a/target/linux/mpc85xx/patches-6.12/101-powerpc-85xx-hiveap-330-support.patch +++ b/target/linux/mpc85xx/patches-6.12/101-powerpc-85xx-hiveap-330-support.patch @@ -30,7 +30,7 @@ obj-$(CONFIG_MPC85xx_DS) += mpc85xx_ds.o $(obj8259-y) --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile -@@ -183,6 +183,7 @@ src-plat-$(CONFIG_PPC_PSERIES) += pserie +@@ -177,6 +177,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 -@@ -355,6 +356,7 @@ image-$(CONFIG_TQM8548) += cuImage.tqm +@@ -344,6 +345,7 @@ image-$(CONFIG_TQM8548) += cuImage.tqm image-$(CONFIG_TQM8555) += cuImage.tqm8555 image-$(CONFIG_TQM8560) += cuImage.tqm8560 image-$(CONFIG_KSI8560) += cuImage.ksi8560 diff --git a/target/linux/mpc85xx/patches-6.12/102-powerpc-add-cmdline-override.patch b/target/linux/mpc85xx/patches-6.12/102-powerpc-add-cmdline-override.patch index 34bb95e4c0..5014bf933e 100644 --- a/target/linux/mpc85xx/patches-6.12/102-powerpc-add-cmdline-override.patch +++ b/target/linux/mpc85xx/patches-6.12/102-powerpc-add-cmdline-override.patch @@ -1,6 +1,6 @@ --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig -@@ -1009,6 +1009,14 @@ config CMDLINE_FORCE +@@ -1001,6 +1001,14 @@ config CMDLINE_FORCE endchoice @@ -17,7 +17,7 @@ help --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c -@@ -1190,6 +1190,17 @@ int __init early_init_dt_scan_chosen(cha +@@ -1053,6 +1053,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.12/106-powerpc-85xx-ws-ap3710i-support.patch b/target/linux/mpc85xx/patches-6.12/106-powerpc-85xx-ws-ap3710i-support.patch index 4276effed2..98c865f37d 100644 --- a/target/linux/mpc85xx/patches-6.12/106-powerpc-85xx-ws-ap3710i-support.patch +++ b/target/linux/mpc85xx/patches-6.12/106-powerpc-85xx-ws-ap3710i-support.patch @@ -30,7 +30,7 @@ obj-$(CONFIG_RED_15W_REV1) += red15w_rev1.o --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile -@@ -185,6 +185,7 @@ src-plat-$(CONFIG_PPC_IBM_CELL_BLADE) += +@@ -179,6 +179,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 @@ -38,7 +38,7 @@ src-plat-$(CONFIG_PPC_MICROWATT) += fixed-head.S microwatt.c -@@ -358,6 +359,7 @@ image-$(CONFIG_TQM8560) += cuImage.tqm +@@ -347,6 +348,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 diff --git a/target/linux/mpc85xx/patches-6.12/107-powerpc-85xx-add-ws-ap3825i-support.patch b/target/linux/mpc85xx/patches-6.12/107-powerpc-85xx-add-ws-ap3825i-support.patch index 9d96081c9d..cd212821b4 100644 --- a/target/linux/mpc85xx/patches-6.12/107-powerpc-85xx-add-ws-ap3825i-support.patch +++ b/target/linux/mpc85xx/patches-6.12/107-powerpc-85xx-add-ws-ap3825i-support.patch @@ -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 -@@ -186,6 +186,7 @@ src-plat-$(CONFIG_MVME7100) += motload-h +@@ -180,6 +180,7 @@ src-plat-$(CONFIG_MVME7100) += motload-h 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_AP3710I) += simpleboot.c fixed-head.S @@ -45,7 +45,7 @@ WS-AP3825i AP. src-plat-$(CONFIG_PPC_MICROWATT) += fixed-head.S microwatt.c -@@ -360,6 +361,7 @@ image-$(CONFIG_KSI8560) += cuImage.ksi +@@ -349,6 +350,7 @@ image-$(CONFIG_KSI8560) += cuImage.ksi image-$(CONFIG_HIVEAP_330) += simpleImage.hiveap-330 image-$(CONFIG_TL_WDR4900_V1) += simpleImage.tl-wdr4900-v1 image-$(CONFIG_WS_AP3710I) += simpleImage.ws-ap3710i diff --git a/target/linux/mpc85xx/patches-6.12/109-powerpc-85xx-add-ws-ap3715i-support.patch b/target/linux/mpc85xx/patches-6.12/109-powerpc-85xx-add-ws-ap3715i-support.patch index 1ebc87081a..37e3e5587a 100644 --- a/target/linux/mpc85xx/patches-6.12/109-powerpc-85xx-add-ws-ap3715i-support.patch +++ b/target/linux/mpc85xx/patches-6.12/109-powerpc-85xx-add-ws-ap3715i-support.patch @@ -30,7 +30,7 @@ obj-$(CONFIG_CORENET_GENERIC) += corenet_generic.o --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile -@@ -186,6 +186,7 @@ src-plat-$(CONFIG_MVME7100) += motload-h +@@ -180,6 +180,7 @@ src-plat-$(CONFIG_MVME7100) += motload-h 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_AP3710I) += simpleboot.c fixed-head.S @@ -38,7 +38,7 @@ src-plat-$(CONFIG_WS_AP3825I) += simpleboot.c fixed-head.S src-plat-$(CONFIG_PPC_MICROWATT) += fixed-head.S microwatt.c -@@ -361,6 +362,7 @@ image-$(CONFIG_KSI8560) += cuImage.ksi +@@ -350,6 +351,7 @@ image-$(CONFIG_KSI8560) += cuImage.ksi image-$(CONFIG_HIVEAP_330) += simpleImage.hiveap-330 image-$(CONFIG_TL_WDR4900_V1) += simpleImage.tl-wdr4900-v1 image-$(CONFIG_WS_AP3710I) += simpleImage.ws-ap3710i diff --git a/target/linux/mpc85xx/patches-6.12/110-powerpc-85xx-br200-wp-support.patch b/target/linux/mpc85xx/patches-6.12/110-powerpc-85xx-br200-wp-support.patch index 5174e938f0..b9a44a4a82 100644 --- a/target/linux/mpc85xx/patches-6.12/110-powerpc-85xx-br200-wp-support.patch +++ b/target/linux/mpc85xx/patches-6.12/110-powerpc-85xx-br200-wp-support.patch @@ -29,7 +29,7 @@ obj8259-$(CONFIG_PPC_I8259) += mpc85xx_8259.o --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile -@@ -183,6 +183,7 @@ src-plat-$(CONFIG_PPC_PSERIES) += pserie +@@ -177,6 +177,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_AP3710I) += simpleboot.c fixed-head.S -@@ -359,6 +360,7 @@ image-$(CONFIG_TQM8548) += cuImage.tqm +@@ -348,6 +349,7 @@ image-$(CONFIG_TQM8548) += cuImage.tqm image-$(CONFIG_TQM8555) += cuImage.tqm8555 image-$(CONFIG_TQM8560) += cuImage.tqm8560 image-$(CONFIG_KSI8560) += cuImage.ksi8560 diff --git a/target/linux/mpc85xx/patches-6.12/900-powerpc-bootwrapper-disable-uImage-generation.patch b/target/linux/mpc85xx/patches-6.12/900-powerpc-bootwrapper-disable-uImage-generation.patch index f24fefa110..dd5b7bb487 100644 --- a/target/linux/mpc85xx/patches-6.12/900-powerpc-bootwrapper-disable-uImage-generation.patch +++ b/target/linux/mpc85xx/patches-6.12/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 -@@ -297,7 +297,6 @@ image-$(CONFIG_PPC_CHRP) += zImage.chrp +@@ -291,7 +291,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 # -@@ -424,15 +423,6 @@ $(obj)/dtbImage.%: vmlinux $(wrapperbits +@@ -413,15 +412,6 @@ $(obj)/dtbImage.%: vmlinux $(wrapperbits $(obj)/vmlinux.strip: vmlinux $(STRIP) -s -R .comment $< -o $@