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