1 From d0f226a0f104c7d1da1d215b8013359273e39e18 Mon Sep 17 00:00:00 2001
2 From: Albin Tonnerre <albin.tonnerre@free-electrons.com>
3 Date: Fri, 16 Oct 2009 16:17:22 +0200
4 Subject: [PATCH] Add LZMA decompression on ARM
7 Signed-off-by: Albin Tonnerre <albin.tonnerre@free-electrons.com>
10 arch/arm/boot/compressed/Makefile | 1 +
11 arch/arm/boot/compressed/misc.c | 4 ++++
12 arch/arm/boot/compressed/piggy.lzma.S | 6 ++++++
13 4 files changed, 12 insertions(+), 0 deletions(-)
14 create mode 100644 arch/arm/boot/compressed/piggy.lzma.S
16 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
17 index ea71c0c..f5bf779 100644
18 --- a/arch/arm/Kconfig
19 +++ b/arch/arm/Kconfig
20 @@ -20,6 +20,7 @@ config ARM
21 select HAVE_GENERIC_DMA_COHERENT
22 select HAVE_KERNEL_GZIP
23 select HAVE_KERNEL_LZO
24 + select HAVE_KERNEL_LZMA
26 The ARM series is a line of low-power-consumption RISC chip designs
27 licensed by ARM Ltd and targeted at embedded applications and
28 diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
29 index 5b4629b..dcfcb74 100644
30 --- a/arch/arm/boot/compressed/Makefile
31 +++ b/arch/arm/boot/compressed/Makefile
32 @@ -65,6 +65,7 @@ SEDFLAGS = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/
34 suffix_$(CONFIG_KERNEL_GZIP) = gzip
35 suffix_$(CONFIG_KERNEL_LZO) = lzo
36 +suffix_$(CONFIG_KERNEL_LZMA) = lzma
38 targets := vmlinux vmlinux.lds \
39 piggy.$(suffix_y) piggy.$(suffix_y).o \
40 diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c
41 index 7e0fe4d..4e35a10 100644
42 --- a/arch/arm/boot/compressed/misc.c
43 +++ b/arch/arm/boot/compressed/misc.c
44 @@ -237,6 +237,10 @@ static unsigned long free_mem_end_ptr;
45 #include "../../../../lib/decompress_inflate.c"
48 +#ifdef CONFIG_KERNEL_LZMA
49 +#include "../../../../lib/decompress_unlzma.c"
52 #ifdef CONFIG_KERNEL_LZO
53 #include "../../../../lib/decompress_unlzo.c"
55 diff --git a/arch/arm/boot/compressed/piggy.lzma.S b/arch/arm/boot/compressed/piggy.lzma.S
57 index 0000000..d7e69cf
59 +++ b/arch/arm/boot/compressed/piggy.lzma.S
61 + .section .piggydata,#alloc
64 + .incbin "arch/arm/boot/compressed/piggy.lzma"
65 + .globl input_data_end