tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[S390] Add support for LZO-compressed kernels.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

authored by Heiko Carstens and committed by Martin Schwidefsky cdf56649 cf9daf4a

+9 -1
unified split
+1
arch/s390/Kconfig
··· 102 102 select HAVE_KERNEL_GZIP 103 103 select HAVE_KERNEL_BZIP2 104 104 select HAVE_KERNEL_LZMA 105 + select HAVE_KERNEL_LZO 105 106 select ARCH_INLINE_SPIN_TRYLOCK 106 107 select ARCH_INLINE_SPIN_TRYLOCK_BH 107 108 select ARCH_INLINE_SPIN_LOCK
+4 -1
arch/s390/boot/compressed/Makefile
··· 7 7 BITS := $(if $(CONFIG_64BIT),64,31) 8 8 9 9 targets := vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 \ 10 - vmlinux.bin.lzma misc.o piggy.o sizes.h head$(BITS).o 10 + vmlinux.bin.lzma vmlinux.bin.lzo misc.o piggy.o sizes.h head$(BITS).o 11 11 12 12 KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2 13 13 KBUILD_CFLAGS += $(cflags-y) ··· 47 47 suffix-$(CONFIG_KERNEL_GZIP) := gz 48 48 suffix-$(CONFIG_KERNEL_BZIP2) := bz2 49 49 suffix-$(CONFIG_KERNEL_LZMA) := lzma 50 + suffix-$(CONFIG_KERNEL_LZO) := lzo 50 51 51 52 $(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y) 52 53 $(call if_changed,gzip) ··· 55 54 $(call if_changed,bzip2) 56 55 $(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) 57 56 $(call if_changed,lzma) 57 + $(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) 58 + $(call if_changed,lzo) 58 59 59 60 LDFLAGS_piggy.o := -r --format binary --oformat $(LD_BFD) -T 60 61 $(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.$(suffix-y)
+4
arch/s390/boot/compressed/misc.c
··· 50 50 #include "../../../../lib/decompress_unlzma.c" 51 51 #endif 52 52 53 + #ifdef CONFIG_KERNEL_LZO 54 + #include "../../../../lib/decompress_unlzo.c" 55 + #endif 56 + 53 57 extern _sclp_print_early(const char *); 54 58 55 59 int puts(const char *s)