From: Sascha Hauer <[email protected]> Until now we compiled in the OP-TEE binary into the AM62l images when it exists. The when-it-exists part makes it hard to add a dependeny on the file, so add a dedicated config option for it.
Link: https://lore.barebox.org/[email protected] Signed-off-by: Sascha Hauer <[email protected]> (cherry picked from commit 2711c4ca4fdce892567391e8f363d277c03505b3) Signed-off-by: Ahmad Fatoum <[email protected]> --- firmware/Kconfig | 4 ++++ images/Makefile.k3 | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/firmware/Kconfig b/firmware/Kconfig index 14a1c3d3a844..1121615fe6d5 100644 --- a/firmware/Kconfig +++ b/firmware/Kconfig @@ -113,6 +113,10 @@ config FIRMWARE_LS1028A_ATF config FIRMWARE_LS1046A_ATF bool +config FIRMWARE_K3_AM62L_OPTEE + bool "install OP-TEE on K3 AM62L boards" + depends on MACH_AM62LX + config HAVE_FIRMWARE_VERIFY_NEXT_IMAGE bool diff --git a/images/Makefile.k3 b/images/Makefile.k3 index 992d1557275c..bb49c0a9548a 100644 --- a/images/Makefile.k3 +++ b/images/Makefile.k3 @@ -87,10 +87,14 @@ quiet_cmd_k3_am62x_image = K3_am62x_IMG $@ $(DMDATA_am625):17:16:0:43c3a800 \ --key "$(KEY_$(@F))" --out $@ +ifdef CONFIG_FIRMWARE_K3_AM62L_OPTEE +AM62L_TIBOOT3_OPTEE = $(FIRMWARE_DIR)/am62lx-bl32.bin +endif + quiet_cmd_k3_am62lx_image = K3_am62lx_IMG $@ cmd_k3_am62lx_image = \ - if [ -e "$(FIRMWARE_DIR)/am62lx-bl32.bin" ]; then \ - optee=$(FIRMWARE_DIR)/am62lx-bl32.bin:17:16:0:80200000; \ + if [ -n "$(AM62L_TIBOOT3_OPTEE)" ]; then \ + optee=$(AM62L_TIBOOT3_OPTEE):17:16:0:80200000; \ fi; \ \ $(srctree)/scripts/k3img \ -- 2.47.3
