lkml.org 
[lkml]   [2009]   [Aug]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/6] Add support for LZO-compressed kernels on x86
    Date
    This is the third and last part of the patch, which contains the
    necessary changes to the x86 Kconfig and boot/compressed to allow the
    use of this new compression method

    Signed-off-by: Albin Tonnerre <albin.tonnerre@free-electrons.com>
    ---
    arch/x86/Kconfig | 1 +
    arch/x86/boot/compressed/Makefile | 5 ++++-
    arch/x86/boot/compressed/misc.c | 4 ++++
    3 files changed, 9 insertions(+), 1 deletions(-)

    diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
    index 738bdc6..49974d3 100644
    --- a/arch/x86/Kconfig
    +++ b/arch/x86/Kconfig
    @@ -48,6 +48,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
    diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
    index e2ff504..95bfe0e 100644
    --- 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 vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma head_$(BITS).o misc.o piggy.o
    +targets := 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.all-y) FORCE
    $(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 )
    diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
    index 842b2a3..3b22fe8 100644
    --- 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;
    --
    1.6.3.3


    \
     
     \ /
      Last update: 2009-08-03 17:03    [W:0.022 / U:1.800 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site