replace our arm LZMA loader with the one that goes upstream
[openwrt.git] / target / linux / generic-2.6 / patches-2.6.31 / 052-lzo_compressed_kernel_for_x86.patch
1 diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
2 index 72ace95..89f7771 100644
3 --- a/arch/x86/Kconfig
4 +++ b/arch/x86/Kconfig
5 @@ -49,6 +49,7 @@ config X86
6 select HAVE_KERNEL_GZIP
7 select HAVE_KERNEL_BZIP2
8 select HAVE_KERNEL_LZMA
9 + select HAVE_KERNEL_LZO
10 select HAVE_ARCH_KMEMCHECK
11
12 config OUTPUT_FORMAT
13 diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
14 index f8ed065..0e835d0 100644
15 --- a/arch/x86/boot/compressed/Makefile
16 +++ b/arch/x86/boot/compressed/Makefile
17 @@ -4,7 +4,7 @@
18 # create a compressed vmlinux image from the original vmlinux
19 #
20
21 -targets := vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma head_$(BITS).o misc.o piggy.o
22 +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
23
24 KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2
25 KBUILD_CFLAGS += -fno-strict-aliasing -fPIC
26 @@ -48,10 +48,13 @@ $(obj)/vmlinux.bin.bz2: $(vmlinux.bin.all-y) FORCE
27 $(call if_changed,bzip2)
28 $(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) FORCE
29 $(call if_changed,lzma)
30 +$(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE
31 + $(call if_changed,lzo)
32
33 suffix-$(CONFIG_KERNEL_GZIP) := gz
34 suffix-$(CONFIG_KERNEL_BZIP2) := bz2
35 suffix-$(CONFIG_KERNEL_LZMA) := lzma
36 +suffix-$(CONFIG_KERNEL_LZO) := lzo
37
38 quiet_cmd_mkpiggy = MKPIGGY $@
39 cmd_mkpiggy = $(obj)/mkpiggy $< > $@ || ( rm -f $@ ; false )
40 diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
41 index 842b2a3..3b22fe8 100644
42 --- a/arch/x86/boot/compressed/misc.c
43 +++ b/arch/x86/boot/compressed/misc.c
44 @@ -162,6 +162,10 @@ static int lines, cols;
45 #include "../../../../lib/decompress_unlzma.c"
46 #endif
47
48 +#ifdef CONFIG_KERNEL_LZO
49 +#include "../../../../lib/decompress_unlzo.c"
50 +#endif
51 +
52 static void scroll(void)
53 {
54 int i;
This page took 0.045055 seconds and 5 git commands to generate.