aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2010-05-23 17:44:32 +0000
committerHauke Mehrtens <hauke@openwrt.org>2010-05-23 17:44:32 +0000
commitf1f4b36850076c544239b05b4baa2a1980df728b (patch)
tree649410c0ffa3f2aa97a7cd84cb358898ba9b2001
parent0d6ac72c6505a43c5b9cee6ad0eb866a7f8f81f2 (diff)
downloadupstream-f1f4b36850076c544239b05b4baa2a1980df728b.tar.gz
upstream-f1f4b36850076c544239b05b4baa2a1980df728b.tar.bz2
upstream-f1f4b36850076c544239b05b4baa2a1980df728b.zip
kernel: add lzma support for arm cpu.
This patch appears to be lost beetween 2.6.32 and 2.6.33. Thank you Maddes for the patch. This helps making orion work with kernel 2.6.33. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21552 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/generic-2.6/patches-2.6.33/055-lzma_arm_kernel.patch57
1 files changed, 57 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.33/055-lzma_arm_kernel.patch b/target/linux/generic-2.6/patches-2.6.33/055-lzma_arm_kernel.patch
new file mode 100644
index 0000000000..59c31e7f33
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.33/055-lzma_arm_kernel.patch
@@ -0,0 +1,57 @@
+From d0f226a0f104c7d1da1d215b8013359273e39e18 Mon Sep 17 00:00:00 2001
+From: Albin Tonnerre <albin.tonnerre@free-electrons.com>
+Date: Fri, 16 Oct 2009 16:17:22 +0200
+Subject: [PATCH] Add LZMA decompression on ARM
+
+
+Signed-off-by: Albin Tonnerre <albin.tonnerre@free-electrons.com>
+---
+ arch/arm/Kconfig | 1 +
+ arch/arm/boot/compressed/Makefile | 1 +
+ arch/arm/boot/compressed/misc.c | 4 ++++
+ arch/arm/boot/compressed/piggy.lzma.S | 6 ++++++
+ 4 files changed, 12 insertions(+), 0 deletions(-)
+ create mode 100644 arch/arm/boot/compressed/piggy.lzma.S
+
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
+@@ -20,6 +20,7 @@ config ARM
+ select HAVE_GENERIC_DMA_COHERENT
+ select HAVE_KERNEL_GZIP
+ select HAVE_KERNEL_LZO
++ select HAVE_KERNEL_LZMA
+ help
+ The ARM series is a line of low-power-consumption RISC chip designs
+ licensed by ARM Ltd and targeted at embedded applications and
+--- a/arch/arm/boot/compressed/Makefile
++++ b/arch/arm/boot/compressed/Makefile
+@@ -65,6 +65,7 @@ SEDFLAGS = s/TEXT_START/$(ZTEXTADDR)/;s/
+
+ 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 \
+--- a/arch/arm/boot/compressed/misc.c
++++ b/arch/arm/boot/compressed/misc.c
+@@ -248,6 +248,10 @@ static unsigned long free_mem_end_ptr;
+ #include "../../../../lib/decompress_inflate.c"
+ #endif
+
++#ifdef CONFIG_KERNEL_LZMA
++#include "../../../../lib/decompress_unlzma.c"
++#endif
++
+ #ifdef CONFIG_KERNEL_LZO
+ #include "../../../../lib/decompress_unlzo.c"
+ #endif
+--- /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: