diff options
| -rw-r--r-- | arch/arm/pbl/Makefile | 3 | ||||
| -rw-r--r-- | arch/arm/pbl/piggy.lz4.S | 6 | ||||
| -rw-r--r-- | arch/mips/pbl/Makefile | 3 | ||||
| -rw-r--r-- | arch/mips/pbl/piggy.lz4.S | 6 | ||||
| -rw-r--r-- | images/Makefile | 1 | ||||
| -rw-r--r-- | lib/decompress_unlz4.c | 6 | ||||
| -rw-r--r-- | pbl/Kconfig | 4 | ||||
| -rw-r--r-- | pbl/decomp.c | 4 |
8 files changed, 30 insertions, 3 deletions
diff --git a/arch/arm/pbl/Makefile b/arch/arm/pbl/Makefile index 8923a704e1..dd3e94680b 100644 --- a/arch/arm/pbl/Makefile +++ b/arch/arm/pbl/Makefile @@ -1,6 +1,7 @@ suffix_$(CONFIG_IMAGE_COMPRESSION_GZIP) = gzip suffix_$(CONFIG_IMAGE_COMPRESSION_LZO) = lzo +suffix_$(CONFIG_IMAGE_COMPRESSION_LZ4) = lz4 suffix_$(CONFIG_IMAGE_COMPRESSION_NONE) = shipped OBJCOPYFLAGS_zbarebox.bin = -O binary @@ -10,7 +11,7 @@ targets := zbarebox.lds zbarebox zbarebox.bin zbarebox.S \ $(piggy_o) piggy.$(suffix_y) # Make sure files are removed during clean -extra-y += piggy.gzip piggy.lzo piggy.lzma piggy.xzkern piggy.shipped zbarebox.map +extra-y += piggy.gzip piggy.lz4 piggy.lzo piggy.lzma piggy.xzkern piggy.shipped zbarebox.map $(obj)/zbarebox.bin: $(obj)/zbarebox FORCE $(call if_changed,objcopy) diff --git a/arch/arm/pbl/piggy.lz4.S b/arch/arm/pbl/piggy.lz4.S new file mode 100644 index 0000000000..fa9b2469e1 --- /dev/null +++ b/arch/arm/pbl/piggy.lz4.S @@ -0,0 +1,6 @@ + .section .piggydata,#alloc + .globl input_data +input_data: + .incbin "arch/arm/pbl/piggy.lz4" + .globl input_data_end +input_data_end: diff --git a/arch/mips/pbl/Makefile b/arch/mips/pbl/Makefile index 6eeee737c8..fea1f249bb 100644 --- a/arch/mips/pbl/Makefile +++ b/arch/mips/pbl/Makefile @@ -1,6 +1,7 @@ suffix_$(CONFIG_IMAGE_COMPRESSION_GZIP) = gzip suffix_$(CONFIG_IMAGE_COMPRESSION_LZO) = lzo +suffix_$(CONFIG_IMAGE_COMPRESSION_LZ4) = lz4 suffix_$(CONFIG_IMAGE_COMPRESSION_NONE) = shipped OBJCOPYFLAGS_zbarebox.bin = -O binary @@ -10,7 +11,7 @@ targets := zbarebox.lds zbarebox zbarebox.bin zbarebox.S \ $(piggy_o) piggy.$(suffix_y) # Make sure files are removed during clean -extra-y += piggy.gzip piggy.lzo piggy.lzma piggy.xzkern piggy.shipped zbarebox.map +extra-y += piggy.gzip piggy.lz4 piggy.lzo piggy.lzma piggy.xzkern piggy.shipped zbarebox.map $(obj)/zbarebox.bin: $(obj)/zbarebox FORCE $(call if_changed,objcopy) diff --git a/arch/mips/pbl/piggy.lz4.S b/arch/mips/pbl/piggy.lz4.S new file mode 100644 index 0000000000..be9425bf00 --- /dev/null +++ b/arch/mips/pbl/piggy.lz4.S @@ -0,0 +1,6 @@ +#include <asm/asm.h> + + .section .data +EXPORT(input_data) + .incbin "arch/mips/pbl/piggy.lz4" +EXPORT(input_data_end) diff --git a/images/Makefile b/images/Makefile index 925a98793b..65c533ac09 100644 --- a/images/Makefile +++ b/images/Makefile @@ -81,6 +81,7 @@ $(obj)/%.s: $(obj)/% FORCE suffix_$(CONFIG_IMAGE_COMPRESSION_GZIP) = gzip suffix_$(CONFIG_IMAGE_COMPRESSION_LZO) = lzo +suffix_$(CONFIG_IMAGE_COMPRESSION_LZ4) = lz4 suffix_$(CONFIG_IMAGE_COMPRESSION_NONE) = shipped # barebox.z - compressed barebox binary diff --git a/lib/decompress_unlz4.c b/lib/decompress_unlz4.c index 894cc37ab5..0dfb08c7d7 100644 --- a/lib/decompress_unlz4.c +++ b/lib/decompress_unlz4.c @@ -23,6 +23,10 @@ #include <asm/unaligned.h> +#ifndef STATIC +#define STATIC +#endif + /* * Note: Uncompressed chunk size is used in the compressor side * (userspace side for compression). @@ -175,7 +179,7 @@ exit_0: return ret; } -int decompress_unlz4(unsigned char *buf, int in_len, +STATIC int decompress_unlz4(unsigned char *buf, int in_len, int(*fill)(void*, unsigned int), int(*flush)(void*, unsigned int), unsigned char *output, diff --git a/pbl/Kconfig b/pbl/Kconfig index a37c97610a..dc3135734e 100644 --- a/pbl/Kconfig +++ b/pbl/Kconfig @@ -53,6 +53,10 @@ if IMAGE_COMPRESSION choice prompt "Compression" + default IMAGE_COMPRESSION_LZO + +config IMAGE_COMPRESSION_LZ4 + bool "lz4" config IMAGE_COMPRESSION_LZO bool "lzo" diff --git a/pbl/decomp.c b/pbl/decomp.c index aa6a31e9da..ca0df6463e 100644 --- a/pbl/decomp.c +++ b/pbl/decomp.c @@ -10,6 +10,10 @@ #define STATIC static +#ifdef CONFIG_IMAGE_COMPRESSION_LZ4 +#include "../../../lib/decompress_unlz4.c" +#endif + #ifdef CONFIG_IMAGE_COMPRESSION_LZO #include "../../../lib/decompress_unlzo.c" #endif |