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

Commit cdf56649 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[S390] Add support for LZO-compressed kernels. 



Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent cf9daf4a

arch/s390/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -102,6 +102,7 @@ config S390 
	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_LZMA

	select HAVE_KERNEL_LZMA

	select HAVE_KERNEL_LZO

	select ARCH_INLINE_SPIN_TRYLOCK

	select ARCH_INLINE_SPIN_TRYLOCK

	select ARCH_INLINE_SPIN_TRYLOCK_BH

	select ARCH_INLINE_SPIN_TRYLOCK_BH

	select ARCH_INLINE_SPIN_LOCK

	select ARCH_INLINE_SPIN_LOCK

arch/s390/boot/compressed/Makefile

+4 −1
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@ 
BITS := $(if $(CONFIG_64BIT),64,31)

BITS := $(if $(CONFIG_64BIT),64,31)





targets	:= vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 \

targets	:= vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 \

	   vmlinux.bin.lzma misc.o piggy.o sizes.h head$(BITS).o

	   vmlinux.bin.lzma vmlinux.bin.lzo misc.o piggy.o sizes.h head$(BITS).o





KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2

KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2

KBUILD_CFLAGS += $(cflags-y)

KBUILD_CFLAGS += $(cflags-y)
@@ -47,6 +47,7 @@ vmlinux.bin.all-y := $(obj)/vmlinux.bin 
suffix-$(CONFIG_KERNEL_GZIP)  := gz

suffix-$(CONFIG_KERNEL_GZIP)  := gz

suffix-$(CONFIG_KERNEL_BZIP2) := bz2

suffix-$(CONFIG_KERNEL_BZIP2) := bz2

suffix-$(CONFIG_KERNEL_LZMA)  := lzma

suffix-$(CONFIG_KERNEL_LZMA)  := lzma

suffix-$(CONFIG_KERNEL_LZO)  := lzo





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

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

	$(call if_changed,gzip)

	$(call if_changed,gzip)
@@ -54,6 +55,8 @@ $(obj)/vmlinux.bin.bz2: $(vmlinux.bin.all-y) 
	$(call if_changed,bzip2)

	$(call if_changed,bzip2)

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

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

	$(call if_changed,lzma)

	$(call if_changed,lzma)

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

	$(call if_changed,lzo)





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

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

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

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

arch/s390/boot/compressed/misc.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -50,6 +50,10 @@ static unsigned long free_mem_end_ptr; 
#include "../../../../lib/decompress_unlzma.c"

#include "../../../../lib/decompress_unlzma.c"

#endif

#endif





#ifdef CONFIG_KERNEL_LZO

#include "../../../../lib/decompress_unlzo.c"

#endif



extern _sclp_print_early(const char *);

extern _sclp_print_early(const char *);





int puts(const char *s)

int puts(const char *s)