apm821xx: refresh 6.18 patches

Refresh patches for 6.18.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/23382
Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>

diff --git a/target/linux/apm821xx/patches-6.18/300-fix-atheros-nics-on-apm82181.patch b/target/linux/apm821xx/patches-6.18/300-fix-atheros-nics-on-apm82181.patch
index 64c07f48d4a221c40522d14c6a6900756a957ca5..060aaa52984889fe604d6ae781ebd094b377691b 100644 (file)
--- a/target/linux/apm821xx/patches-6.18/300-fix-atheros-nics-on-apm82181.patch
+++ b/target/linux/apm821xx/patches-6.18/300-fix-atheros-nics-on-apm82181.patch
@@ -1,6 +1,6 @@
 --- 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
+@@ -1053,15 +1053,24 @@ static int __init apm821xx_pciex_init_po
        u32 val;
  
        /*
@@ -33,7 +33,7 @@
  
        if (port->endpoint)
                val = PTYPE_LEGACY_ENDPOINT << 20;
-@@ -1083,9 +1092,12 @@ static int __init apm821xx_pciex_init_po
+@@ -1078,9 +1087,12 @@ static int __init apm821xx_pciex_init_po
        mtdcri(SDR0, PESDR0_460EX_L0DRV, 0x00000130);
        mtdcri(SDR0, PESDR0_460EX_L0CLK, 0x00000006);
  

diff --git a/target/linux/apm821xx/patches-6.18/301-fix-memory-map-wndr4700.patch b/target/linux/apm821xx/patches-6.18/301-fix-memory-map-wndr4700.patch
index 227d2829547cb8e05c3f60458de65bea916083ab..79a1300ba8f663cd97ad28585c659813920a7532 100644 (file)
--- a/target/linux/apm821xx/patches-6.18/301-fix-memory-map-wndr4700.patch
+++ b/target/linux/apm821xx/patches-6.18/301-fix-memory-map-wndr4700.patch
@@ -1,6 +1,6 @@
 --- a/arch/powerpc/platforms/44x/pci.c
 +++ b/arch/powerpc/platforms/44x/pci.c
-@@ -1800,9 +1800,9 @@ static void __init ppc4xx_configure_pcie
+@@ -1795,9 +1795,9 @@ static void __init ppc4xx_configure_pcie
                 * if it works
                 */
                out_le32(mbase + PECFG_PIM0LAL, 0x00000000);

diff --git a/target/linux/apm821xx/patches-6.18/900-powerpc-bootwrapper-force-gzip-as-mkimage-s-compress.patch b/target/linux/apm821xx/patches-6.18/900-powerpc-bootwrapper-force-gzip-as-mkimage-s-compress.patch
index 6775954e9fce528f48a8dcf2d87d38c5e76fd114..29c5c2db4626d40e3b069098a0ada82364f17e95 100644 (file)
--- a/target/linux/apm821xx/patches-6.18/900-powerpc-bootwrapper-force-gzip-as-mkimage-s-compress.patch
+++ b/target/linux/apm821xx/patches-6.18/900-powerpc-bootwrapper-force-gzip-as-mkimage-s-compress.patch
@@ -18,7 +18,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
 
 --- a/arch/powerpc/boot/Makefile
 +++ b/arch/powerpc/boot/Makefile
-@@ -271,7 +271,7 @@ compressor-$(CONFIG_KERNEL_LZO) := lzo
+@@ -270,7 +270,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    $@