From 78bc8628a8a39d032bd492611ecfe1c225e722a8 Mon Sep 17 00:00:00 2001 From: Shiji Yang Date: Sat, 25 Jul 2026 07:02:23 +0800 Subject: [PATCH] mpc85xx: add missing image relocate hack for 6.18 kernel We also need to refresh the 6.12 kernel patches. Fixes: 87940bfc69f4 ("mpc85xx: relocate simpleImage for WS-AP3710i") Signed-off-by: Shiji Yang --- .../107-powerpc-85xx-add-ws-ap3825i-support.patch | 4 ++-- .../106-powerpc-85xx-ws-ap3710i-support.patch | 14 ++++++++++++++ .../107-powerpc-85xx-add-ws-ap3825i-support.patch | 4 ++-- 3 files changed, 18 insertions(+), 4 deletions(-) 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 4abc4da44c..81aa5d4310 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 @@ -55,8 +55,8 @@ WS-AP3825i AP. --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper -@@ -348,6 +348,11 @@ adder875-redboot) - platformo="$object/fixed-head.o $object/redboot-8xx.o" +@@ -353,6 +353,11 @@ simpleboot-ws-ap3710i) + link_address='0x3000000' binary=y ;; +simpleboot-ws-ap3825i) diff --git a/target/linux/mpc85xx/patches-6.18/106-powerpc-85xx-ws-ap3710i-support.patch b/target/linux/mpc85xx/patches-6.18/106-powerpc-85xx-ws-ap3710i-support.patch index 6148027759..0265fb35a0 100644 --- a/target/linux/mpc85xx/patches-6.18/106-powerpc-85xx-ws-ap3710i-support.patch +++ b/target/linux/mpc85xx/patches-6.18/106-powerpc-85xx-ws-ap3710i-support.patch @@ -46,3 +46,17 @@ # Board ports in arch/powerpc/platform/86xx/Kconfig image-$(CONFIG_MVME7100) += dtbImage.mvme7100 +--- a/arch/powerpc/boot/wrapper ++++ b/arch/powerpc/boot/wrapper +@@ -339,6 +339,11 @@ adder875-redboot) + platformo="$object/fixed-head.o $object/redboot-8xx.o" + binary=y + ;; ++simpleboot-ws-ap3710i) ++ platformo="$object/fixed-head.o $object/simpleboot.o" ++ link_address='0x3000000' ++ binary=y ++ ;; + simpleboot-*) + platformo="$object/fixed-head.o $object/simpleboot.o" + binary=y diff --git a/target/linux/mpc85xx/patches-6.18/107-powerpc-85xx-add-ws-ap3825i-support.patch b/target/linux/mpc85xx/patches-6.18/107-powerpc-85xx-add-ws-ap3825i-support.patch index f4893013fc..58c1350a65 100644 --- a/target/linux/mpc85xx/patches-6.18/107-powerpc-85xx-add-ws-ap3825i-support.patch +++ b/target/linux/mpc85xx/patches-6.18/107-powerpc-85xx-add-ws-ap3825i-support.patch @@ -55,8 +55,8 @@ WS-AP3825i AP. --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper -@@ -339,6 +339,11 @@ adder875-redboot) - platformo="$object/fixed-head.o $object/redboot-8xx.o" +@@ -344,6 +344,11 @@ simpleboot-ws-ap3710i) + link_address='0x3000000' binary=y ;; +simpleboot-ws-ap3825i)