summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorJoao Marcos Costa <joaomarcos.costa@bootlin.com>2023-12-27 17:05:45 +0100
committerJoao Marcos Costa <joaomarcos.costa@bootlin.com>2023-12-29 14:47:22 +0100
commit78fe73c29b9559d9eae317ff2c1a468bcf884cb6 (patch)
treedeb2e9a87013654b7ae4149d066198ac3b72ee4c /conf
parent1652e927cc996be3ab4676792fd67b93ed3576dd (diff)
downloadmeta-freescale-78fe73c29b9559d9eae317ff2c1a468bcf884cb6.tar.gz
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 <joaomarcos.costa@bootlin.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/include/imx-base.inc3
1 files changed, 2 insertions, 1 deletions
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"
617 617
618OPTEE_BIN_EXT ??= "" 618OPTEE_BIN_EXT ??= ""
619OPTEE_BOOT_IMAGE = "tee.bin uTee-${OPTEE_BIN_EXT}" 619OPTEE_BOOT_IMAGE = "tee.bin uTee-${OPTEE_BIN_EXT}"
620OPTEE_BOOT_IMAGE:aarch64 = "tee.bin" 620OPTEE_BOOT_IMAGE:mx8-generic-bsp = "tee.bin"
621OPTEE_BOOT_IMAGE:mx9-generic-bsp = "tee.bin"
621 622
622IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}" 623IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}"
623 624