From 36db2a0f05f8dab8c8c38e47b5112dbb89a47781 Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Mon, 28 Jan 2013 10:26:10 +0100 Subject: [PATCH 1/3] pbl: move configs to pbl/Kconfig so it more easy to add new entry and to maintain Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Sascha Hauer --- common/Kconfig | 42 +----------------------------------------- pbl/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 41 deletions(-) create mode 100644 pbl/Kconfig diff --git a/common/Kconfig b/common/Kconfig index b60b78bb8..c648f3b87 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -108,47 +108,7 @@ config ENVIRONMENT_VARIABLES menu "memory layout" -config HAVE_PBL_IMAGE - bool - -config HAVE_IMAGE_COMPRESSION - bool - -config PBL_IMAGE - bool "Pre-Bootloader image" - depends on HAVE_PBL_IMAGE - -config PBL_FORCE_PIGGYDATA_COPY - bool - help - In some case we need to copy the PIGGYDATA as the link address - as example we run from SRAM and shutdown the SDRAM/DDR for - reconfiguration but most of the time we just need to copy the - executable code. - -if PBL_IMAGE - -config IMAGE_COMPRESSION - bool - depends on HAVE_IMAGE_COMPRESSION - default y - -if IMAGE_COMPRESSION - -choice - prompt "Compression" - -config IMAGE_COMPRESSION_LZO - bool "lzo" - -config IMAGE_COMPRESSION_GZIP - bool "gzip" - -endchoice - -endif - -endif +source "pbl/Kconfig" config MMU bool "Enable MMU" diff --git a/pbl/Kconfig b/pbl/Kconfig new file mode 100644 index 000000000..fbf0b1b4d --- /dev/null +++ b/pbl/Kconfig @@ -0,0 +1,41 @@ +config HAVE_PBL_IMAGE + bool + +config HAVE_IMAGE_COMPRESSION + bool + +config PBL_IMAGE + bool "Pre-Bootloader image" + depends on HAVE_PBL_IMAGE + +config PBL_FORCE_PIGGYDATA_COPY + bool + help + In some case we need to copy the PIGGYDATA as the link address + as example we run from SRAM and shutdown the SDRAM/DDR for + reconfiguration but most of the time we just need to copy the + executable code. + +if PBL_IMAGE + +config IMAGE_COMPRESSION + bool + depends on HAVE_IMAGE_COMPRESSION + default y + +if IMAGE_COMPRESSION + +choice + prompt "Compression" + +config IMAGE_COMPRESSION_LZO + bool "lzo" + +config IMAGE_COMPRESSION_GZIP + bool "gzip" + +endchoice + +endif + +endif From f73a37aa7845cdf7e2bf7aba0184e065dca78198 Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Mon, 28 Jan 2013 10:26:11 +0100 Subject: [PATCH 2/3] pbl: factorise decompressor Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Sascha Hauer --- arch/arm/cpu/start-pbl.c | 21 ++------------------- arch/mips/boot/main_entry-pbl.c | 24 ++---------------------- include/pbl.h | 15 +++++++++++++++ pbl/Makefile | 1 + pbl/decomp.c | 32 ++++++++++++++++++++++++++++++++ 5 files changed, 52 insertions(+), 41 deletions(-) create mode 100644 include/pbl.h create mode 100644 pbl/decomp.c diff --git a/arch/arm/cpu/start-pbl.c b/arch/arm/cpu/start-pbl.c index c5f970531..f506792f6 100644 --- a/arch/arm/cpu/start-pbl.c +++ b/arch/arm/cpu/start-pbl.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -59,16 +60,6 @@ void __naked __bare_init reset(void) extern void *input_data; extern void *input_data_end; -#define STATIC static - -#ifdef CONFIG_IMAGE_COMPRESSION_LZO -#include "../../../lib/decompress_unlzo.c" -#endif - -#ifdef CONFIG_IMAGE_COMPRESSION_GZIP -#include "../../../lib/decompress_inflate.c" -#endif - static unsigned long *ttb; static void create_sections(unsigned long addr, int size_m, unsigned int flags) @@ -127,11 +118,6 @@ static void mmu_disable(void) __mmu_cache_off(); } -static void noinline errorfn(char *error) -{ - while (1); -} - static void barebox_uncompress(void *compressed_start, unsigned int len) { void (*barebox)(void); @@ -155,10 +141,7 @@ static void barebox_uncompress(void *compressed_start, unsigned int len) else barebox = (void *)TEXT_BASE; - decompress((void *)compressed_start, - len, - NULL, NULL, - (void *)TEXT_BASE, NULL, errorfn); + pbl_barebox_uncompress((void*)TEXT_BASE, compressed_start, len); if (use_mmu) mmu_disable(); diff --git a/arch/mips/boot/main_entry-pbl.c b/arch/mips/boot/main_entry-pbl.c index f39e9360b..820e1d5d1 100644 --- a/arch/mips/boot/main_entry-pbl.c +++ b/arch/mips/boot/main_entry-pbl.c @@ -17,6 +17,7 @@ */ #include +#include #include #include #include @@ -30,28 +31,10 @@ extern void *input_data_end; unsigned long free_mem_ptr; unsigned long free_mem_end_ptr; -#define STATIC static - -#ifdef CONFIG_IMAGE_COMPRESSION_LZO -#include "../../../lib/decompress_unlzo.c" -#endif - -#ifdef CONFIG_IMAGE_COMPRESSION_GZIP -#include "../../../lib/decompress_inflate.c" -#endif - void pbl_main_entry(void); static unsigned long *ttb; -static noinline void errorfn(char *error) -{ - PUTS_LL(error); - PUTC_LL('\n'); - - unreachable(); -} - static void barebox_uncompress(void *compressed_start, unsigned int len) { /* set 128 KiB at the end of the MALLOC_BASE for early malloc */ @@ -60,10 +43,7 @@ static void barebox_uncompress(void *compressed_start, unsigned int len) ttb = (void *)((free_mem_ptr - 0x4000) & ~0x3fff); - decompress((void *)compressed_start, - len, - NULL, NULL, - (void *)TEXT_BASE, NULL, errorfn); + pbl_barebox_uncompress((void*)TEXT_BASE, compressed_start, len); } void __section(.text_entry) pbl_main_entry(void) diff --git a/include/pbl.h b/include/pbl.h new file mode 100644 index 000000000..d041a3fba --- /dev/null +++ b/include/pbl.h @@ -0,0 +1,15 @@ +/* + * Copyright (c) 2012 Jean-Christophe PLAGNIOL-VILLARD + * + * Under GPLv2 + */ + +#ifndef __PBL_H__ +#define __PBL_H__ + +extern unsigned long free_mem_ptr; +extern unsigned long free_mem_end_ptr; + +void pbl_barebox_uncompress(void *dest, void *compressed_start, unsigned int len); + +#endif /* __PBL_H__ */ diff --git a/pbl/Makefile b/pbl/Makefile index 7169c6c72..a2d746868 100644 --- a/pbl/Makefile +++ b/pbl/Makefile @@ -3,3 +3,4 @@ # pbl-y += misc.o pbl-y += string.o +pbl-y += decomp.o diff --git a/pbl/decomp.c b/pbl/decomp.c new file mode 100644 index 000000000..bd67ed81e --- /dev/null +++ b/pbl/decomp.c @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2010-2012 Sascha Hauer , Pengutronix + * Copyright (c) 2012 Jean-Christophe PLAGNIOL-VILLARD + * + * Under GPLv2 only + */ + +#include +#include + +#define STATIC static + +#ifdef CONFIG_IMAGE_COMPRESSION_LZO +#include "../../../lib/decompress_unlzo.c" +#endif + +#ifdef CONFIG_IMAGE_COMPRESSION_GZIP +#include "../../../lib/decompress_inflate.c" +#endif + +static void noinline errorfn(char *error) +{ + while (1); +} + +void pbl_barebox_uncompress(void *dest, void *compressed_start, unsigned int len) +{ + decompress((void *)compressed_start, + len, + NULL, NULL, + dest, NULL, errorfn); +} From 08147d427f9ee4723a6ba8525a2f85b2123f840e Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Mon, 28 Jan 2013 10:26:12 +0100 Subject: [PATCH 3/3] pbl: add none compression support Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Sascha Hauer --- arch/arm/pbl/Makefile | 3 ++- arch/arm/pbl/piggy.shipped.S | 6 ++++++ arch/mips/pbl/Makefile | 3 ++- arch/mips/pbl/piggy.shipped.S | 6 ++++++ pbl/Kconfig | 3 +++ pbl/decomp.c | 12 ++++++++++++ 6 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 arch/arm/pbl/piggy.shipped.S create mode 100644 arch/mips/pbl/piggy.shipped.S diff --git a/arch/arm/pbl/Makefile b/arch/arm/pbl/Makefile index 7faa51a5c..6eeee737c 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_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) diff --git a/arch/arm/pbl/piggy.shipped.S b/arch/arm/pbl/piggy.shipped.S new file mode 100644 index 000000000..dbc2569de --- /dev/null +++ b/arch/arm/pbl/piggy.shipped.S @@ -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: diff --git a/arch/mips/pbl/Makefile b/arch/mips/pbl/Makefile index 7faa51a5c..6eeee737c 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_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) diff --git a/arch/mips/pbl/piggy.shipped.S b/arch/mips/pbl/piggy.shipped.S new file mode 100644 index 000000000..963262dad --- /dev/null +++ b/arch/mips/pbl/piggy.shipped.S @@ -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: diff --git a/pbl/Kconfig b/pbl/Kconfig index fbf0b1b4d..39752cc6f 100644 --- a/pbl/Kconfig +++ b/pbl/Kconfig @@ -34,6 +34,9 @@ config IMAGE_COMPRESSION_LZO config IMAGE_COMPRESSION_GZIP bool "gzip" +config IMAGE_COMPRESSION_NONE + bool "none" + endchoice endif diff --git a/pbl/decomp.c b/pbl/decomp.c index bd67ed81e..aa6a31e9d 100644 --- a/pbl/decomp.c +++ b/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);