42905c552eeed465c0253135fecfd96eb46cdac2
[openembedded.git] /
1 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
2 index 350921d..34163da 100644
3 --- a/arch/arm/Kconfig
4 +++ b/arch/arm/Kconfig
5 @@ -20,6 +20,7 @@ config ARM
6         select HAVE_GENERIC_DMA_COHERENT
7         select HAVE_KERNEL_GZIP
8         select HAVE_KERNEL_LZO
9 +       select HAVE_KERNEL_LZMA
10         help
11           The ARM series is a line of low-power-consumption RISC chip designs
12           licensed by ARM Ltd and targeted at embedded applications and
13 diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
14 index 2d4d88b..3906432 100644
15 --- a/arch/arm/boot/compressed/Makefile
16 +++ b/arch/arm/boot/compressed/Makefile
17 @@ -65,6 +65,7 @@ SEDFLAGS      = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/
18  
19  suffix_$(CONFIG_KERNEL_GZIP) = gzip
20  suffix_$(CONFIG_KERNEL_LZO)  = lzo
21 +suffix_$(CONFIG_KERNEL_LZMA)  = lzma
22  
23  targets       := vmlinux vmlinux.lds \
24                  piggy.$(suffix_y) piggy.$(suffix_y).o \
25 diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c
26 index 7e0fe4d..4e35a10 100644
27 --- a/arch/arm/boot/compressed/misc.c
28 +++ b/arch/arm/boot/compressed/misc.c
29 @@ -252,6 +252,10 @@
30  #include "../../../../lib/decompress_unlzo.c"
31  #endif
32  
33 +#ifdef CONFIG_KERNEL_LZMA
34 +#include "../../../../lib/decompress_unlzma.c"
35 +#endif
36 +
37  #ifndef arch_error
38  #define arch_error(x)
39  #endif
40 diff --git a/arch/arm/boot/compressed/piggy.lzma.S b/arch/arm/boot/compressed/piggy.lzma.S
41 new file mode 100644
42 index 0000000..d7e69cf
43 --- /dev/null
44 +++ b/arch/arm/boot/compressed/piggy.lzma.S
45 @@ -0,0 +1,6 @@
46 +       .section .piggydata,#alloc
47 +       .globl  input_data
48 +input_data:
49 +       .incbin "arch/arm/boot/compressed/piggy.lzma"
50 +       .globl  input_data_end
51 +input_data_end: