You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
49 lines
1.5 KiB
Diff
49 lines
1.5 KiB
Diff
--- a/arch/x86/Kconfig
|
|
+++ b/arch/x86/Kconfig
|
|
@@ -49,6 +49,7 @@ config X86
|
|
select HAVE_KERNEL_GZIP
|
|
select HAVE_KERNEL_BZIP2
|
|
select HAVE_KERNEL_LZMA
|
|
+ select HAVE_KERNEL_LZO
|
|
select HAVE_ARCH_KMEMCHECK
|
|
|
|
config OUTPUT_FORMAT
|
|
--- a/arch/x86/boot/compressed/Makefile
|
|
+++ b/arch/x86/boot/compressed/Makefile
|
|
@@ -4,7 +4,7 @@
|
|
# create a compressed vmlinux image from the original vmlinux
|
|
#
|
|
|
|
-targets := vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma head_$(BITS).o misc.o piggy.o
|
|
+targets := vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma vmlinux.bin.lzo head_$(BITS).o misc.o piggy.o
|
|
|
|
KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2
|
|
KBUILD_CFLAGS += -fno-strict-aliasing -fPIC
|
|
@@ -48,10 +48,13 @@ $(obj)/vmlinux.bin.bz2: $(vmlinux.bin.al
|
|
$(call if_changed,bzip2)
|
|
$(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) FORCE
|
|
$(call if_changed,lzma)
|
|
+$(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE
|
|
+ $(call if_changed,lzo)
|
|
|
|
suffix-$(CONFIG_KERNEL_GZIP) := gz
|
|
suffix-$(CONFIG_KERNEL_BZIP2) := bz2
|
|
suffix-$(CONFIG_KERNEL_LZMA) := lzma
|
|
+suffix-$(CONFIG_KERNEL_LZO) := lzo
|
|
|
|
quiet_cmd_mkpiggy = MKPIGGY $@
|
|
cmd_mkpiggy = $(obj)/mkpiggy $< > $@ || ( rm -f $@ ; false )
|
|
--- a/arch/x86/boot/compressed/misc.c
|
|
+++ b/arch/x86/boot/compressed/misc.c
|
|
@@ -162,6 +162,10 @@ static int lines, cols;
|
|
#include "../../../../lib/decompress_unlzma.c"
|
|
#endif
|
|
|
|
+#ifdef CONFIG_KERNEL_LZO
|
|
+#include "../../../../lib/decompress_unlzo.c"
|
|
+#endif
|
|
+
|
|
static void scroll(void)
|
|
{
|
|
int i;
|