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.
Reviewed-by: Ahmad Fatoum <[email protected]> Signed-off-by: Sascha Hauer <[email protected]> --- Makefile | 4 ++++ pbl/Kconfig | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/Makefile b/Makefile index 2350592cde..25b548712c 100644 --- a/Makefile +++ b/Makefile @@ -831,7 +831,11 @@ export KBUILD_BINARY ?= barebox.bin # Also any assignments in arch/$(SRCARCH)/Makefile take precedence over # the default value. +ifeq ($(CONFIG_PBL_IMAGE_ELF),y) +export BAREBOX_PROPER ?= vmbarebox +else export BAREBOX_PROPER ?= barebox.bin +endif barebox-flash-images: $(KBUILD_IMAGE) @echo $^ > $@ diff --git a/pbl/Kconfig b/pbl/Kconfig index cab9325d16..63f29cd613 100644 --- a/pbl/Kconfig +++ b/pbl/Kconfig @@ -21,6 +21,15 @@ 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 + select ELF + 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
