From 78fe73c29b9559d9eae317ff2c1a468bcf884cb6 Mon Sep 17 00:00:00 2001 From: Joao Marcos Costa Date: Wed, 27 Dec 2023 17:05:45 +0100 Subject: imx-base.inc: fix OPTEE_BOOT_IMAGE's override Using 'aarch64', as if the OPTEE_BOOT_IMAGE was conditioned to the userspace's architecture, will include uTee-${OPTEE_BIN_EXT} in a multilib context (e.g., for a 32-bit userspace). This happens because 'aarch64' will not be listed in OVERRIDES, and the error below will come up during do_image_wic task: output: install: cannot stat '...build/tmp-glibc/deploy/images/microej-imx93/uTee-': No such file or directory Replace 'aarch64' by mx*-generic-bsp, for both imx8 and imx9, as these two are aarch64 platforms. Signed-off-by: Joao Marcos Costa --- conf/machine/include/imx-base.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index daf2ce39..17d3f771 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -617,7 +617,8 @@ WIC_CREATE_EXTRA_ARGS ?= "--no-fstab-update" OPTEE_BIN_EXT ??= "" OPTEE_BOOT_IMAGE = "tee.bin uTee-${OPTEE_BIN_EXT}" -OPTEE_BOOT_IMAGE:aarch64 = "tee.bin" +OPTEE_BOOT_IMAGE:mx8-generic-bsp = "tee.bin" +OPTEE_BOOT_IMAGE:mx9-generic-bsp = "tee.bin" IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}" -- cgit v1.2.3-54-g00ecf