From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Sun, 22 Aug 2021 00:37:45 +0000 (-0500)
Subject: imx-base.inc: Fix optee boot images
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=0407a9ecbaedd8aae6be96225632dbe534840e44;p=meta-freescale.git

imx-base.inc: Fix optee boot images

For optee support tee.bin is needed in the image.

The optee image uTee is renamed with an SOC qualifier.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 094b17db..e8605749 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -406,8 +406,8 @@ SOC_DEFAULT_IMAGE_FSTYPES:mxs = "uboot-mxsboot-sdcard wic.bmap wic.gz"
 # Do not update fstab file when using wic images
 WIC_CREATE_EXTRA_ARGS ?= "--no-fstab-update"
 
-OPTEE_BOOT_IMAGE         = "uTee"
-OPTEE_BOOT_IMAGE:aarch64 = ""
+OPTEE_BOOT_IMAGE         = "tee.bin uTee-${OPTEE_BIN_EXT}"
+OPTEE_BOOT_IMAGE:aarch64 = "tee.bin"
 
 IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}"