9
0
Fork 0

compressed image: add gzip support

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2012-07-22 18:12:01 +08:00
parent 8d29296240
commit 104c39fe82
5 changed files with 16 additions and 0 deletions

View File

@ -46,6 +46,10 @@ extern void *input_data_end;
#include "../../../lib/decompress_unlzo.c"
#endif
#ifdef CONFIG_IMAGE_COMPRESSION_GZIP
#include "../../../../lib/decompress_inflate.c"
#endif
static void barebox_uncompress(void *compressed_start, unsigned int len)
{
void (*barebox)(void);

View File

@ -1,4 +1,5 @@
suffix_$(CONFIG_IMAGE_COMPRESSION_GZIP) = gzip
suffix_$(CONFIG_IMAGE_COMPRESSION_LZO) = lzo
OBJCOPYFLAGS_zbarebox.bin = -O binary

View File

@ -0,0 +1,6 @@
.section .piggydata,#alloc
.globl input_data
input_data:
.incbin "arch/arm/pbl/piggy.gzip"
.globl input_data_end
input_data_end:

View File

@ -134,6 +134,9 @@ choice
config IMAGE_COMPRESSION_LZO
bool "lzo"
config IMAGE_COMPRESSION_GZIP
bool "gzip"
endchoice
endif
@ -521,6 +524,7 @@ config DEFAULT_ENVIRONMENT_COMPRESSED
bool
depends on DEFAULT_ENVIRONMENT
depends on !IMAGE_COMPRESSION_LZO
depends on !IMAGE_COMPRESSION_GZIP
default y if ZLIB
default y if BZLIB
default y if LZO_DECOMPRESS

View File

@ -4,6 +4,7 @@
/* prevent inclusion of _LINUX_KERNEL_H in pre-boot environment: lots
* errors about console_printk etc... on ARM */
#define _LINUX_KERNEL_H
#include <linux/decompress/mm.h>
#include "zlib_inflate/inftrees.c"
#include "zlib_inflate/inffast.c"