Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c98b6c67 authored by Vasily Gorbik's avatar Vasily Gorbik Committed by Martin Schwidefsky
Browse files

s390/decompressor: allow to pack uncompressed vmlinux.bin into piggy.o 



If none of compression methods defined, leave suffix-y empty, so that
plain uncompressed vmlinux.bin could be reused instead.

Reviewed-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent b8326bf5

arch/s390/boot/compressed/Makefile

+7 −7
Original line number Diff line number Diff line
@@ -51,12 +51,12 @@ $(obj)/vmlinux.bin: $(obj)/vmlinux.bin.full 


vmlinux.bin.all-y := $(obj)/vmlinux.bin



suffix-$(CONFIG_KERNEL_GZIP)  := gz

suffix-$(CONFIG_KERNEL_BZIP2) := bz2

suffix-$(CONFIG_KERNEL_LZ4)  := lz4

suffix-$(CONFIG_KERNEL_LZMA)  := lzma

suffix-$(CONFIG_KERNEL_LZO)  := lzo

suffix-$(CONFIG_KERNEL_XZ)  := xz

suffix-$(CONFIG_KERNEL_GZIP)  := .gz

suffix-$(CONFIG_KERNEL_BZIP2) := .bz2

suffix-$(CONFIG_KERNEL_LZ4)  := .lz4

suffix-$(CONFIG_KERNEL_LZMA)  := .lzma

suffix-$(CONFIG_KERNEL_LZO)  := .lzo

suffix-$(CONFIG_KERNEL_XZ)  := .xz



$(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y)

	$(call if_changed,gzip)
@@ -72,7 +72,7 @@ $(obj)/vmlinux.bin.xz: $(vmlinux.bin.all-y) 
	$(call if_changed,xzkern)



LDFLAGS_piggy.o := -r --format binary --oformat $(LD_BFD) -T

$(obj)/piggy.o: $(obj)/vmlinux.scr.lds $(obj)/vmlinux.bin.$(suffix-y)

$(obj)/piggy.o: $(obj)/vmlinux.scr.lds $(obj)/vmlinux.bin$(suffix-y)

	$(call if_changed,ld)



chkbss := $(filter-out $(obj)/misc.o $(obj)/piggy.o,$(OBJECTS))