mpc85xx: fix build with kernel 5.4
[openwrt/staging/jogo.git] / target / linux / mpc85xx / patches-5.4 / 900-powerpc-bootwrapper-force-gzip-as-mkimage-s-compress.patch
1 From c9395ad54e2cabb87d408becc37566f3d8248933 Mon Sep 17 00:00:00 2001
2 From: Christian Lamparter <chunkeey@gmail.com>
3 Date: Sun, 1 Dec 2019 02:08:23 +0100
4 Subject: [PATCH] powerpc: bootwrapper: force gzip as mkimage's compression
5 method
6
7 Due to CONFIG_KERNEL_XZ symbol, the bootwrapper code tries to
8 instruct the mkimage to use the xz compression, which isn't
9 supported. This patch forces the gzip compression, which is
10 supported and doesn't matter because the generated uImage for
11 the apm821xx target gets ignored as the OpenWrt toolchain will
12 do separate U-Boot kernel images for each device individually.
13
14 Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
15 [copied to mpc85xx]
16 Signed-off-by: David Bauer <mail@david-bauer.net>
17 ---
18 arch/powerpc/boot/Makefile | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21 --- a/arch/powerpc/boot/Makefile
22 +++ b/arch/powerpc/boot/Makefile
23 @@ -254,7 +254,7 @@ compressor-$(CONFIG_KERNEL_LZO) := lzo
24
25 # args (to if_changed): 1 = (this rule), 2 = platform, 3 = dts 4=dtb 5=initrd
26 quiet_cmd_wrap = WRAP $@
27 - cmd_wrap =$(CONFIG_SHELL) $(wrapper) -Z $(compressor-y) -c -o $@ -p $2 \
28 + cmd_wrap =$(CONFIG_SHELL) $(wrapper) -Z gzip -c -o $@ -p $2 \
29 $(CROSSWRAP) $(if $3, -s $3)$(if $4, -d $4)$(if $5, -i $5) \
30 vmlinux
31