diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2010-06-20 19:25:43 +0400 |
---|---|---|
committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2010-06-20 19:25:43 +0400 |
commit | 22ff63fa0ea80d5afcddcf442bbf47c90e0468df (patch) | |
tree | 320b1fb85a429c9be6b7b86130232c9ce9600ae7 /recipes/kexecboot/linux-kexecboot/ARM-Add-support-for-LZMA-compressed-kernel-images.patch | |
parent | 982a1168dc24ca1bd36b068d60981a2c5cb2880d (diff) | |
parent | c5955cfe486cb84ba27ad0692ceecdaab779bb99 (diff) |
Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/kexecboot/linux-kexecboot/ARM-Add-support-for-LZMA-compressed-kernel-images.patch')
-rw-r--r-- | recipes/kexecboot/linux-kexecboot/ARM-Add-support-for-LZMA-compressed-kernel-images.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/recipes/kexecboot/linux-kexecboot/ARM-Add-support-for-LZMA-compressed-kernel-images.patch b/recipes/kexecboot/linux-kexecboot/ARM-Add-support-for-LZMA-compressed-kernel-images.patch deleted file mode 100644 index 6f5e00aa8e..0000000000 --- a/recipes/kexecboot/linux-kexecboot/ARM-Add-support-for-LZMA-compressed-kernel-images.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 350921d..34163da 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -21,6 +21,7 @@ - select HAVE_GENERIC_DMA_COHERENT - select HAVE_KERNEL_GZIP - select HAVE_KERNEL_LZO -+ select HAVE_KERNEL_LZMA - select HAVE_PERF_EVENTS - select PERF_USE_VMALLOC - help -diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile -index 2d4d88b..3906432 100644 ---- a/arch/arm/boot/compressed/Makefile -+++ b/arch/arm/boot/compressed/Makefile -@@ -65,6 +65,7 @@ SEDFLAGS = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/ - - suffix_$(CONFIG_KERNEL_GZIP) = gzip - suffix_$(CONFIG_KERNEL_LZO) = lzo -+suffix_$(CONFIG_KERNEL_LZMA) = lzma - - targets := vmlinux vmlinux.lds \ - piggy.$(suffix_y) piggy.$(suffix_y).o \ -diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c -index 7e0fe4d..4e35a10 100644 ---- a/arch/arm/boot/compressed/decompress.c -+++ b/arch/arm/boot/compressed/decompress.c -@@ -40,6 +40,10 @@ - #include "../../../../lib/decompress_unlzo.c" - #endif - -+#ifdef CONFIG_KERNEL_LZMA -+#include "../../../../lib/decompress_unlzma.c" -+#endif -+ - void do_decompress(u8 *input, int len, u8 *output, void (*error)(char *x)) - { - decompress(input, len, NULL, NULL, output, NULL, error); -diff --git a/arch/arm/boot/compressed/piggy.lzma.S b/arch/arm/boot/compressed/piggy.lzma.S -new file mode 100644 -index 0000000..d7e69cf ---- /dev/null -+++ b/arch/arm/boot/compressed/piggy.lzma.S -@@ -0,0 +1,6 @@ -+ .section .piggydata,#alloc -+ .globl input_data -+input_data: -+ .incbin "arch/arm/boot/compressed/piggy.lzma" -+ .globl input_data_end -+input_data_end: |