Some architectures want to link the barebox proper ELF image into the PBL. Allow that and provide a Kconfig option to select the ELF image.
Signed-off-by: Sascha Hauer <[email protected]> --- images/Makefile | 18 ++++++++++++++++-- images/piggy.S | 4 ++++ pbl/Kconfig | 8 ++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/images/Makefile b/images/Makefile index 448479ee8cf355a771ce63314ce64a631544f488..8d4fd1504ab64d4f4d1cc19f2b36cff9939964e3 100644 --- a/images/Makefile +++ b/images/Makefile @@ -138,7 +138,13 @@ $(obj)/%.itb: $(obj)/%.its FORCE $(obj)/%.fit: $(obj)/$$(FILE_$$(@F)) $(dtstree)/dtbs-list FORCE $(call if_changed,fit) -$(obj)/piggy.o: $(obj)/barebox.z FORCE +ifeq ($(CONFIG_PBL_IMAGE_ELF),) +PIGGY_IMAGE := $(obj)/barebox.z +else +PIGGY_IMAGE := $(obj)/barebox.elf.z +endif + +$(obj)/piggy.o: ${PIGGY_IMAGE} FORCE $(obj)/sha_sum.o: $(obj)/barebox.sha.bin FORCE @@ -154,6 +160,14 @@ $(obj)/barebox.sum: $(obj)/barebox.z FORCE $(obj)/barebox.z: $(obj)/../$(BAREBOX_PROPER) FORCE $(call if_changed,$(suffix_y)) +# barebox.elf.z - compressed barebox ELF binary +# ---------------------------------------------------------------- +# Prevent the %.elf pattern rule from building ../barebox.elf +$(obj)/../barebox.elf: ; + +$(obj)/barebox.elf.z: $(obj)/../barebox.elf FORCE + $(call if_changed,$(suffix_y)) + # %.img - create a copy from another file # ---------------------------------------------------------------- @@ -219,7 +233,7 @@ ifneq ($(pblx-y)$(pblx-),) $(error pblx- has been removed. Please use pblb- instead.) endif -targets += $(image-y) pbl.lds barebox.x barebox.z piggy.o sha_sum.o barebox.sha.bin barebox.sum +targets += $(image-y) pbl.lds barebox.x barebox.z barebox.elf.z piggy.o sha_sum.o barebox.sha.bin barebox.sum targets += $(patsubst %,%.pblb,$(pblb-y)) targets += $(patsubst %,%.pbl,$(pblb-y)) targets += $(patsubst %,%.s,$(pblb-y)) diff --git a/images/piggy.S b/images/piggy.S index 654933ea2ffe4aad9bbed44a44971ef67a3fe183..b09fbfd2e215c674548caeab544ef5ada49a40ea 100644 --- a/images/piggy.S +++ b/images/piggy.S @@ -3,6 +3,10 @@ .section .piggydata,"a" .globl input_data input_data: +#ifdef CONFIG_PBL_IMAGE_ELF + .incbin "images/barebox.elf.z" +#else .incbin "images/barebox.z" +#endif .globl input_data_end input_data_end: diff --git a/pbl/Kconfig b/pbl/Kconfig index cab9325d16e8625bcca10125b3281062abffedbc..66bba5a4b21a715f3eb55d39c820977bfb3c459f 100644 --- a/pbl/Kconfig +++ b/pbl/Kconfig @@ -21,6 +21,14 @@ config PBL_IMAGE_NO_PIGGY want to use the piggy mechanism to load barebox proper. It's so far only intended for sandbox. +config PBL_IMAGE_ELF + bool + depends on PBL_IMAGE + help + If yes, link ELF image into the PBL, otherwise a raw binary + is linked into the PBL. This must match the loader code in the + PBL. + config PBL_MULTI_IMAGES bool select PBL_IMAGE -- 2.47.3
