diff options
| author | Wojciech Dubowik <Wojciech.Dubowik@westermo.com> | 2022-09-14 12:12:06 +0200 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2022-09-14 16:45:06 +0200 |
| commit | 00643b4584e73949de05ca8c3276a05657ba0d45 (patch) | |
| tree | d531da4006fa7cb2b4c73290edcb4e7696bbee8d /target/linux/mpc85xx/patches-5.15/900-powerpc-bootwrapper-disable-uImage-generation.patch | |
| parent | df59c07fe9e32bd5124871daa400a8c5e2e8d96f (diff) | |
| download | upstream-00643b4584e73949de05ca8c3276a05657ba0d45.tar.gz upstream-00643b4584e73949de05ca8c3276a05657ba0d45.tar.bz2 upstream-00643b4584e73949de05ca8c3276a05657ba0d45.zip | |
mpc85xx: Copy over kernel 5.10 patches and config to 5.15
Split patches for better change visibility.
Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik@westermo.com>
Signed-off-by: Petr Štetiar <ynezz@true.cz> [un-dmarc, commit description]
Diffstat (limited to 'target/linux/mpc85xx/patches-5.15/900-powerpc-bootwrapper-disable-uImage-generation.patch')
| -rw-r--r-- | target/linux/mpc85xx/patches-5.15/900-powerpc-bootwrapper-disable-uImage-generation.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/target/linux/mpc85xx/patches-5.15/900-powerpc-bootwrapper-disable-uImage-generation.patch b/target/linux/mpc85xx/patches-5.15/900-powerpc-bootwrapper-disable-uImage-generation.patch new file mode 100644 index 0000000000..a021db000d --- /dev/null +++ b/target/linux/mpc85xx/patches-5.15/900-powerpc-bootwrapper-disable-uImage-generation.patch @@ -0,0 +1,44 @@ +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(-) + +Index: linux-5.15.67/arch/powerpc/boot/Makefile +=================================================================== +--- linux-5.15.67.orig/arch/powerpc/boot/Makefile ++++ linux-5.15.67/arch/powerpc/boot/Makefile +@@ -271,7 +271,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 + + # +@@ -403,15 +402,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) + |