summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2024-08-07 16:47:25 -0600
committerTom Rini <trini@konsulko.com>2024-08-09 16:03:19 -0600
commit5b33660c54e56aaee4485a9d283d4d33fb77001c (patch)
tree7ca9d07624d2bb753f9f611e20c2710fd0ea7ae8
parentb254a8359ecdc8ec85cd93e055c6bbeee259df1d (diff)
sandbox: Add ELF file to VPL u-boot.img
At present sandbox builds package up u-boot.bin in the .img file. This cannot actually be executed, since it is not an ELF file. For sandbox_vpl we want to be able to run the full boot flow. Adjust the build rule for sandbox_vpl to package the ELF file and thereby allow full testing of the sandbox transition from SPL to U-Boot proper. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 2861b4d1402..b35a472d9be 100644
--- a/Makefile
+++ b/Makefile
@@ -1473,8 +1473,10 @@ u-boot.bin.lzma: u-boot.bin FORCE
u-boot-lzma.img: u-boot.bin.lzma FORCE
$(call if_changed,mkimage)
+fit_image := $(if $(CONFIG_SANDBOX_VPL),u-boot,u-boot-nodtb.bin)
+
u-boot-dtb.img u-boot.img u-boot.kwb u-boot.pbl u-boot-ivt.img: \
- $(if $(CONFIG_SPL_LOAD_FIT),u-boot-nodtb.bin \
+ $(if $(CONFIG_SPL_LOAD_FIT),$(fit_image) \
$(if $(CONFIG_OF_SEPARATE)$(CONFIG_OF_EMBED)$(CONFIG_SANDBOX),dts/dt.dtb) \
,$(UBOOT_BIN)) FORCE
$(call if_changed,mkimage)