mpc85xx: remove bootwrapper patch

CONFIG_KERNEL_GZIP does the same thing. It's used elsewhere for a
similar purpose.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/23658
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/mpc85xx/config-6.12 b/target/linux/mpc85xx/config-6.12
index aaba6397fcdbba0a40eaef1ced0db6ec7b11f4b9..7d7c469dc5f9293aab242ec7ea2f6f27066cd0a2 100644 (file)
--- a/target/linux/mpc85xx/config-6.12
+++ b/target/linux/mpc85xx/config-6.12
@@ -129,7 +129,9 @@ CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_IRQ_WORK=y
 CONFIG_ISA_DMA_API=y
+CONFIG_KERNEL_GZIP=y
 CONFIG_KERNEL_START=0xc0000000
+# CONFIG_KERNEL_XZ is not set
 # CONFIG_KSI8560 is not set
 CONFIG_LIBFDT=y
 CONFIG_LOCK_DEBUGGING_SUPPORT=y

diff --git a/target/linux/mpc85xx/config-6.18 b/target/linux/mpc85xx/config-6.18
index 23edd52c248c3bd4ab0720cf987dde6bade06e88..ce0fccd29d8409c4beae2330c5497db9fc7b7dde 100644 (file)
--- a/target/linux/mpc85xx/config-6.18
+++ b/target/linux/mpc85xx/config-6.18
@@ -129,7 +129,9 @@ CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_IRQ_WORK=y
 CONFIG_ISA_DMA_API=y
+CONFIG_KERNEL_GZIP=y
 CONFIG_KERNEL_START=0xc0000000
+# CONFIG_KERNEL_XZ is not set
 # CONFIG_KSI8560 is not set
 CONFIG_LIBFDT=y
 CONFIG_LOCK_DEBUGGING_SUPPORT=y

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
deleted file mode 100644 (file)
index dd5b7bb..0000000
--- a/target/linux/mpc85xx/patches-6.12/900-powerpc-bootwrapper-disable-uImage-generation.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From d43ab14605510d9d2bd257a8cd70f24ada4621b0 Mon Sep 17 00:00:00 2001
-From: David Bauer <mail@david-bauer.net>
-Date: Sat, 29 Feb 2020 14:27:04 +0100
-Subject: [PATCH] powerpc: bootwrapper: disable uImage generation
-
-Due to CONFIG_KERNEL_XZ symbol, the bootwrapper code tries to
-instruct the mkimage to use the xz compression, which isn't
-supported. This disables the uImage generation, as OpenWrt
-generates individual uImages for each board using it's own
-toolchain.
-
-Signed-off-by: David Bauer <mail@david-bauer.net>
----
- arch/powerpc/boot/Makefile | 9 ---------
- 1 file changed, 9 deletions(-)
-
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -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
--image-$(CONFIG_DEFAULT_UIMAGE)                += uImage
- image-$(CONFIG_EPAPR_BOOT)            += zImage.epapr
- 
- #
-@@ -413,15 +412,6 @@ $(obj)/dtbImage.%: vmlinux $(wrapperbits
- $(obj)/vmlinux.strip: vmlinux
-       $(STRIP) -s -R .comment $< -o $@
- 
--$(obj)/uImage: vmlinux $(wrapperbits) FORCE
--      $(call if_changed,wrap,uboot)
--
--$(obj)/uImage.initrd.%: vmlinux $(obj)/dts/%.dtb $(wrapperbits) FORCE
--      $(call if_changed,wrap,uboot-$*,,$(obj)/dts/$*.dtb,$(obj)/ramdisk.image.gz)
--
--$(obj)/uImage.%: vmlinux $(obj)/dts/%.dtb $(wrapperbits) FORCE
--      $(call if_changed,wrap,uboot-$*,,$(obj)/dts/$*.dtb)
--
- $(obj)/cuImage.initrd.%: vmlinux $(obj)/dts/%.dtb $(wrapperbits) FORCE
-       $(call if_changed,wrap,cuboot-$*,,$(obj)/dts/$*.dtb,$(obj)/ramdisk.image.gz)
- 

diff --git a/target/linux/mpc85xx/patches-6.18/900-powerpc-bootwrapper-disable-uImage-generation.patch b/target/linux/mpc85xx/patches-6.18/900-powerpc-bootwrapper-disable-uImage-generation.patch
deleted file mode 100644 (file)
index 5f9fb1f..0000000
--- a/target/linux/mpc85xx/patches-6.18/900-powerpc-bootwrapper-disable-uImage-generation.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From d43ab14605510d9d2bd257a8cd70f24ada4621b0 Mon Sep 17 00:00:00 2001
-From: David Bauer <mail@david-bauer.net>
-Date: Sat, 29 Feb 2020 14:27:04 +0100
-Subject: [PATCH] powerpc: bootwrapper: disable uImage generation
-
-Due to CONFIG_KERNEL_XZ symbol, the bootwrapper code tries to
-instruct the mkimage to use the xz compression, which isn't
-supported. This disables the uImage generation, as OpenWrt
-generates individual uImages for each board using it's own
-toolchain.
-
-Signed-off-by: David Bauer <mail@david-bauer.net>
----
- arch/powerpc/boot/Makefile | 9 ---------
- 1 file changed, 9 deletions(-)
-
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -288,7 +288,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
--image-$(CONFIG_DEFAULT_UIMAGE)                += uImage
- image-$(CONFIG_EPAPR_BOOT)            += zImage.epapr
- 
- #
-@@ -410,15 +409,6 @@ $(obj)/dtbImage.%: vmlinux $(wrapperbits
- $(obj)/vmlinux.strip: vmlinux
-       $(STRIP) -s -R .comment $< -o $@
- 
--$(obj)/uImage: vmlinux $(wrapperbits) FORCE
--      $(call if_changed,wrap,uboot)
--
--$(obj)/uImage.initrd.%: vmlinux $(obj)/dts/%.dtb $(wrapperbits) FORCE
--      $(call if_changed,wrap,uboot-$*,,$(obj)/dts/$*.dtb,$(obj)/ramdisk.image.gz)
--
--$(obj)/uImage.%: vmlinux $(obj)/dts/%.dtb $(wrapperbits) FORCE
--      $(call if_changed,wrap,uboot-$*,,$(obj)/dts/$*.dtb)
--
- $(obj)/cuImage.initrd.%: vmlinux $(obj)/dts/%.dtb $(wrapperbits) FORCE
-       $(call if_changed,wrap,cuboot-$*,,$(obj)/dts/$*.dtb,$(obj)/ramdisk.image.gz)
-