Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7f464f3 authored by Imre Kaloz's avatar Imre Kaloz Committed by Russell King
Browse files

ARM: 7001/2: Wire up support for the XZ decompressor 



Wire up support for the XZ decompressor

Signed-off-by: default avatarImre Kaloz <kaloz@openwrt.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent f5f51954

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ config ARM 
	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_LZO

	select HAVE_KERNEL_LZMA

	select HAVE_KERNEL_XZ

	select HAVE_IRQ_WORK

	select HAVE_PERF_EVENTS

	select PERF_USE_VMALLOC

arch/arm/boot/compressed/.gitignore

+2 −0
Original line number Diff line number Diff line 
ashldi3.S

font.c

lib1funcs.S

piggy.gzip

piggy.lzo

piggy.lzma

piggy.xzkern

vmlinux

vmlinux.lds

arch/arm/boot/compressed/Makefile

+12 −3
Original line number Diff line number Diff line
@@ -92,6 +92,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

suffix_$(CONFIG_KERNEL_XZ)   = xzkern



# Borrowed libfdt files for the ATAG compatibility mode
@@ -112,10 +113,12 @@ endif 


targets       := vmlinux vmlinux.lds \

		 piggy.$(suffix_y) piggy.$(suffix_y).o \

		 lib1funcs.o lib1funcs.S font.o font.c head.o misc.o $(OBJS)

		 lib1funcs.o lib1funcs.S ashldi3.o ashldi3.S \

		 font.o font.c head.o misc.o $(OBJS)



# Make sure files are removed during clean

extra-y       += piggy.gzip piggy.lzo piggy.lzma lib1funcs.S $(libfdt) $(libfdt_hdrs)

extra-y       += piggy.gzip piggy.lzo piggy.lzma piggy.xzkern \

		 lib1funcs.S ashldi3.S $(libfdt) $(libfdt_hdrs)



ifeq ($(CONFIG_FUNCTION_TRACER),y)

ORIG_CFLAGS := $(KBUILD_CFLAGS)
@@ -151,6 +154,12 @@ lib1funcs = $(obj)/lib1funcs.o 
$(obj)/lib1funcs.S: $(srctree)/arch/$(SRCARCH)/lib/lib1funcs.S

	$(call cmd,shipped)



# For __aeabi_llsl

ashldi3 = $(obj)/ashldi3.o



$(obj)/ashldi3.S: $(srctree)/arch/$(SRCARCH)/lib/ashldi3.S

	$(call cmd,shipped)



# We need to prevent any GOTOFF relocs being used with references

# to symbols in the .bss section since we cannot relocate them

# independently from the rest at run time.  This can be achieved by
@@ -172,7 +181,7 @@ if [ $(words $(ZRELADDR)) -gt 1 -a "$(CONFIG_AUTO_ZRELADDR)" = "" ]; then \ 
fi



$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.$(suffix_y).o \

	 	$(addprefix $(obj)/, $(OBJS)) $(lib1funcs) FORCE

		$(addprefix $(obj)/, $(OBJS)) $(lib1funcs) $(ashldi3) FORCE

	@$(check_for_multiple_zreladdr)

	$(call if_changed,ld)

	@$(check_for_bad_syms)

arch/arm/boot/compressed/decompress.c

+6 −0
Original line number Diff line number Diff line
@@ -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);

arch/arm/boot/compressed/piggy.xzkern.S

0 → 100644
+6 −0
Original line number Diff line number Diff line 
	.section .piggydata,#alloc

	.globl	input_data

input_data:

	.incbin	"arch/arm/boot/compressed/piggy.xzkern"

	.globl	input_data_end

input_data_end: