summaryrefslogtreecommitdiff
path: root/arch/arm/boot/compressed/decompress.c
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2012-01-26 16:08:57 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-03-24 13:38:52 +0400
commita7f464f3db93ae5492bee6f6e48939fd8a45fa99 (patch)
treee9ac49cedb1da56631b0e5b172cc39cdde06235c /arch/arm/boot/compressed/decompress.c
parentf5f5195487affe53f90d99cba4aee73a20cae565 (diff)
downloadlinux-a7f464f3db93ae5492bee6f6e48939fd8a45fa99.tar.xz
ARM: 7001/2: Wire up support for the XZ decompressor
Wire up support for the XZ decompressor Signed-off-by: Imre Kaloz <kaloz@openwrt.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/boot/compressed/decompress.c')
-rw-r--r--arch/arm/boot/compressed/decompress.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/compressed/decompress.c b/arch/arm/boot/compressed/decompress.c
index 07be5a2f8302..f41b38cafce8 100644
--- a/arch/arm/boot/compressed/decompress.c
+++ b/arch/arm/boot/compressed/decompress.c
@@ -44,6 +44,12 @@ extern void error(char *);
#include "../../../../lib/decompress_unlzma.c"
#endif
+#ifdef CONFIG_KERNEL_XZ
+#define memmove memmove
+#define memcpy memcpy
+#include "../../../../lib/decompress_unxz.c"
+#endif
+
int do_decompress(u8 *input, int len, u8 *output, void (*error)(char *x))
{
return decompress(input, len, NULL, NULL, output, NULL, error);