From 38fd269993ce0cee498518eaf281b18c9372db68 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 12 May 2025 17:34:35 -0700 Subject: [PATCH] apm821xx: refresh 6.12 patches pci driver went to a different directory and thus manually edited. All else done with kernel_oldconfig. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/18798 Signed-off-by: Hauke Mehrtens --- .../patches-6.12/300-fix-atheros-nics-on-apm82181.patch | 4 ++-- .../apm821xx/patches-6.12/301-fix-memory-map-wndr4700.patch | 6 +++--- ...werpc-bootwrapper-force-gzip-as-mkimage-s-compress.patch | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/target/linux/apm821xx/patches-6.12/300-fix-atheros-nics-on-apm82181.patch b/target/linux/apm821xx/patches-6.12/300-fix-atheros-nics-on-apm82181.patch index 48c57acde8a..64c07f48d4a 100644 --- a/target/linux/apm821xx/patches-6.12/300-fix-atheros-nics-on-apm82181.patch +++ b/target/linux/apm821xx/patches-6.12/300-fix-atheros-nics-on-apm82181.patch @@ -1,5 +1,5 @@ ---- a/arch/powerpc/platforms/4xx/pci.c -+++ b/arch/powerpc/platforms/4xx/pci.c +--- a/arch/powerpc/platforms/44x/pci.c ++++ b/arch/powerpc/platforms/44x/pci.c @@ -1058,15 +1058,24 @@ static int __init apm821xx_pciex_init_po u32 val; diff --git a/target/linux/apm821xx/patches-6.12/301-fix-memory-map-wndr4700.patch b/target/linux/apm821xx/patches-6.12/301-fix-memory-map-wndr4700.patch index bd022ca220d..227d2829547 100644 --- a/target/linux/apm821xx/patches-6.12/301-fix-memory-map-wndr4700.patch +++ b/target/linux/apm821xx/patches-6.12/301-fix-memory-map-wndr4700.patch @@ -1,6 +1,6 @@ ---- a/arch/powerpc/platforms/4xx/pci.c -+++ b/arch/powerpc/platforms/4xx/pci.c -@@ -1900,9 +1900,9 @@ static void __init ppc4xx_configure_pcie +--- a/arch/powerpc/platforms/44x/pci.c ++++ b/arch/powerpc/platforms/44x/pci.c +@@ -1800,9 +1800,9 @@ static void __init ppc4xx_configure_pcie * if it works */ out_le32(mbase + PECFG_PIM0LAL, 0x00000000); diff --git a/target/linux/apm821xx/patches-6.12/900-powerpc-bootwrapper-force-gzip-as-mkimage-s-compress.patch b/target/linux/apm821xx/patches-6.12/900-powerpc-bootwrapper-force-gzip-as-mkimage-s-compress.patch index dcc82546a29..6775954e9fc 100644 --- a/target/linux/apm821xx/patches-6.12/900-powerpc-bootwrapper-force-gzip-as-mkimage-s-compress.patch +++ b/target/linux/apm821xx/patches-6.12/900-powerpc-bootwrapper-force-gzip-as-mkimage-s-compress.patch @@ -18,7 +18,7 @@ Signed-off-by: Christian Lamparter --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile -@@ -277,7 +277,7 @@ compressor-$(CONFIG_KERNEL_LZO) := lzo +@@ -271,7 +271,7 @@ compressor-$(CONFIG_KERNEL_LZO) := lzo # args (to if_changed): 1 = (this rule), 2 = platform, 3 = dts 4=dtb 5=initrd quiet_cmd_wrap = WRAP $@