source: trunk/target/linux/generic-2.6/patches-2.6.31/052-lzo_compressed_kernel_for_x86.patch @ 18439

Last change on this file since 18439 was 18439, checked in by kaloz, 6 years ago

replace our arm LZMA loader with the one that goes upstream

File size: 1.8 KB
  • arch/x86/Kconfig

    diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
    index 72ace95..89f7771 100644
    a b config X86 
    4949        select HAVE_KERNEL_GZIP 
    5050        select HAVE_KERNEL_BZIP2 
    5151        select HAVE_KERNEL_LZMA 
     52        select HAVE_KERNEL_LZO 
    5253        select HAVE_ARCH_KMEMCHECK 
    5354 
    5455config OUTPUT_FORMAT 
  • arch/x86/boot/compressed/Makefile

    diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
    index f8ed065..0e835d0 100644
    a b  
    44# create a compressed vmlinux image from the original vmlinux 
    55# 
    66 
    7 targets := vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma head_$(BITS).o misc.o piggy.o 
     7targets := vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma vmlinux.bin.lzo head_$(BITS).o misc.o piggy.o 
    88 
    99KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2 
    1010KBUILD_CFLAGS += -fno-strict-aliasing -fPIC 
    $(obj)/vmlinux.bin.bz2: $(vmlinux.bin.all-y) FORCE 
    4848        $(call if_changed,bzip2) 
    4949$(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) FORCE 
    5050        $(call if_changed,lzma) 
     51$(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE 
     52        $(call if_changed,lzo) 
    5153 
    5254suffix-$(CONFIG_KERNEL_GZIP)    := gz 
    5355suffix-$(CONFIG_KERNEL_BZIP2)   := bz2 
    5456suffix-$(CONFIG_KERNEL_LZMA)    := lzma 
     57suffix-$(CONFIG_KERNEL_LZO)     := lzo 
    5558 
    5659quiet_cmd_mkpiggy = MKPIGGY $@ 
    5760      cmd_mkpiggy = $(obj)/mkpiggy $< > $@ || ( rm -f $@ ; false ) 
  • arch/x86/boot/compressed/misc.c

    diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
    index 842b2a3..3b22fe8 100644
    a b static int lines, cols; 
    162162#include "../../../../lib/decompress_unlzma.c" 
    163163#endif 
    164164 
     165#ifdef CONFIG_KERNEL_LZO 
     166#include "../../../../lib/decompress_unlzo.c" 
     167#endif 
     168 
    165169static void scroll(void) 
    166170{ 
    167171        int i; 
Note: See TracBrowser for help on using the repository browser.