From: Rosen Penev Date: Mon, 1 Jun 2026 23:28:38 +0000 (-0700) Subject: apm821xx: remove bootwrapper patch X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F24074%2Fhead;p=thirdparty%2Fopenwrt.git apm821xx: remove bootwrapper patch CONFIG_KERNEL_GZIP does the same thing. It's used elsewhere for a similar purpose. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/24074 Signed-off-by: Jonas Jelonek --- diff --git a/target/linux/apm821xx/config-6.18 b/target/linux/apm821xx/config-6.18 index f9f3467f20c..2ba17951567 100644 --- a/target/linux/apm821xx/config-6.18 +++ b/target/linux/apm821xx/config-6.18 @@ -131,7 +131,9 @@ CONFIG_IRQ_WORK=y CONFIG_ISA_DMA_API=y # CONFIG_JFFS2_FS is not set # CONFIG_KATMAI is not set +CONFIG_KERNEL_GZIP=y CONFIG_KERNEL_START=0xc0000000 +# CONFIG_KERNEL_XZ is not set CONFIG_LEDS_TRIGGER_MTD=y CONFIG_LEDS_TRIGGER_PATTERN=y CONFIG_LIBFDT=y 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 deleted file mode 100644 index 29c5c2db462..00000000000 --- a/target/linux/apm821xx/patches-6.18/900-powerpc-bootwrapper-force-gzip-as-mkimage-s-compress.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c9395ad54e2cabb87d408becc37566f3d8248933 Mon Sep 17 00:00:00 2001 -From: Christian Lamparter -Date: Sun, 1 Dec 2019 02:08:23 +0100 -Subject: [PATCH] powerpc: bootwrapper: force gzip as mkimage's compression - method - -Due to CONFIG_KERNEL_XZ symbol, the bootwrapper code tries to -instruct the mkimage to use the xz compression, which isn't -supported. This patch forces the gzip compression, which is -supported and doesn't matter because the generated uImage for -the apm821xx target gets ignored as the OpenWrt toolchain will -do separate U-Boot kernel images for each device individually. - -Signed-off-by: Christian Lamparter ---- - arch/powerpc/boot/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/arch/powerpc/boot/Makefile -+++ b/arch/powerpc/boot/Makefile -@@ -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 $@ -- cmd_wrap =$(CONFIG_SHELL) $(wrapper) -Z $(compressor-y) -c -o $@ -p $2 \ -+ cmd_wrap =$(CONFIG_SHELL) $(wrapper) -Z gzip -c -o $@ -p $2 \ - $(CROSSWRAP) $(if $3, -s $3)$(if $4, -d $4)$(if $5, -i $5) \ - vmlinux -