pbl: add none compression support
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
f73a37aa78
commit
08147d427f
|
@ -1,6 +1,7 @@
|
|||
|
||||
suffix_$(CONFIG_IMAGE_COMPRESSION_GZIP) = gzip
|
||||
suffix_$(CONFIG_IMAGE_COMPRESSION_LZO) = lzo
|
||||
suffix_$(CONFIG_IMAGE_COMPRESSION_NONE) = shipped
|
||||
|
||||
OBJCOPYFLAGS_zbarebox.bin = -O binary
|
||||
piggy_o := piggy.$(suffix_y).o
|
||||
|
@ -9,7 +10,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 zbarebox.map
|
||||
extra-y += piggy.gzip piggy.lzo piggy.lzma piggy.xzkern piggy.shipped zbarebox.map
|
||||
|
||||
$(obj)/zbarebox.bin: $(obj)/zbarebox FORCE
|
||||
$(call if_changed,objcopy)
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
.section .piggydata,#alloc
|
||||
.globl input_data
|
||||
input_data:
|
||||
.incbin "arch/arm/pbl/piggy.shipped"
|
||||
.globl input_data_end
|
||||
input_data_end:
|
|
@ -1,6 +1,7 @@
|
|||
|
||||
suffix_$(CONFIG_IMAGE_COMPRESSION_GZIP) = gzip
|
||||
suffix_$(CONFIG_IMAGE_COMPRESSION_LZO) = lzo
|
||||
suffix_$(CONFIG_IMAGE_COMPRESSION_NONE) = shipped
|
||||
|
||||
OBJCOPYFLAGS_zbarebox.bin = -O binary
|
||||
piggy_o := piggy.$(suffix_y).o
|
||||
|
@ -9,7 +10,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 zbarebox.map
|
||||
extra-y += piggy.gzip piggy.lzo piggy.lzma piggy.xzkern piggy.shipped zbarebox.map
|
||||
|
||||
$(obj)/zbarebox.bin: $(obj)/zbarebox FORCE
|
||||
$(call if_changed,objcopy)
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
.section .piggydata,#alloc
|
||||
.globl input_data
|
||||
input_data:
|
||||
.incbin "arch/mips/pbl/piggy.shipped"
|
||||
.globl input_data_end
|
||||
input_data_end:
|
|
@ -34,6 +34,9 @@ config IMAGE_COMPRESSION_LZO
|
|||
config IMAGE_COMPRESSION_GZIP
|
||||
bool "gzip"
|
||||
|
||||
config IMAGE_COMPRESSION_NONE
|
||||
bool "none"
|
||||
|
||||
endchoice
|
||||
|
||||
endif
|
||||
|
|
12
pbl/decomp.c
12
pbl/decomp.c
|
@ -18,6 +18,18 @@
|
|||
#include "../../../lib/decompress_inflate.c"
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_IMAGE_COMPRESSION_NONE
|
||||
STATIC int decompress(u8 *input, int in_len,
|
||||
int (*fill) (void *, unsigned int),
|
||||
int (*flush) (void *, unsigned int),
|
||||
u8 *output, int *posp,
|
||||
void (*error) (char *x))
|
||||
{
|
||||
memcpy(output, input, in_len);
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
static void noinline errorfn(char *error)
|
||||
{
|
||||
while (1);
|
||||
|
|
Loading…
Reference in New Issue