[kernel] r15213 - in dists/trunk/linux-2.6/debian/patches: features/arm series

[Ben Hutchings]

Author: benh
Date: Fri Feb 19 03:24:44 2010
New Revision: 15213

Log:
Fix up features/arm/compression-add-lzmo.patch for 2.6.33-rc8

And fix the patch name to avoid people (like me) confusing LZMA and LZO.

Added:
   dists/trunk/linux-2.6/debian/patches/features/arm/compression-add-lzma.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/series/base

Added: dists/trunk/linux-2.6/debian/patches/features/arm/compression-add-lzma.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/arm/compression-add-lzma.patch	Fri Feb 19 03:24:44 2010	(r15213)
@@ -0,0 +1,42 @@
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
+@@ -19,6 +19,7 @@ config ARM
+ 	select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
+ 	select HAVE_GENERIC_DMA_COHERENT
+ 	select HAVE_KERNEL_GZIP
++	select HAVE_KERNEL_LZMA
+ 	select HAVE_KERNEL_LZO
+ 	help
+ 	  The ARM series is a line of low-power-consumption RISC chip designs
+--- a/arch/arm/boot/compressed/Makefile
++++ b/arch/arm/boot/compressed/Makefile
+@@ -64,6 +64,7 @@ endif
+ SEDFLAGS	= s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/
+ 
+ suffix_$(CONFIG_KERNEL_GZIP) = gzip
++suffix_$(CONFIG_KERNEL_LZMA) = lzma
+ suffix_$(CONFIG_KERNEL_LZO)  = lzo
+ 
+ targets       := vmlinux vmlinux.lds \
+--- a/arch/arm/boot/compressed/misc.c
++++ b/arch/arm/boot/compressed/misc.c
+@@ -237,6 +237,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:

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Fri Feb 19 03:09:21 2010	(r15212)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Fri Feb 19 03:24:44 2010	(r15213)
@@ -39,6 +39,7 @@
 + features/sparc/video-sunxvr500-intergraph.patch
 + bugfix/all/drivers-scsi-qla1280-request-firmware-unlocked.patch 
 + debian/dfsg/radeon-add-clarifying-comment-to-r600-blit.patch
++ features/arm/compression-add-lzma.patch
 # FIXME: no longer applies
 #+ features/arm/openrd-client.patch
 #+ features/arm/ts41x.patch