From 2cbca9a255674649730b3f440a6142cf16030267 Mon Sep 17 00:00:00 2001 From: Peter Griffin Date: Fri, 25 Oct 2019 11:04:01 +0200 Subject: optee: Add support for optee imx fork to imx8mqevk optee imx fork like most other imx forked components is more fully featured for imx devices and supports things like CAAM accleration. Signed-off-by: Peter Griffin --- conf/machine/include/imx-base.inc | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'conf') diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 7e5437d3d..459b98d4c 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -266,6 +266,11 @@ PREFERRED_VERSION_libdrm_mx6 ?= "2.4.91.imx" PREFERRED_VERSION_libdrm_mx7 ?= "2.4.91.imx" PREFERRED_VERSION_libdrm_mx8 ?= "2.4.91.imx" +# Use i.MX optee Version +PREFERRED_VERSION_optee-os_mx8 ?= "3.2.0.imx" +PREFERRED_VERSION_optee-client_mx8 ?= "3.2.0.imx" +PREFERRED_VERSION_optee-test_mx8 ?= "3.2.0.imx" + # Handle default kernel IMX_DEFAULT_KERNEL = "linux-imx" IMX_DEFAULT_KERNEL_mxs = "linux-fslc" @@ -287,19 +292,29 @@ SOC_DEFAULT_IMAGE_FSTYPES_mxs = "uboot-mxsboot-sdcard 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 = "" + +SDCARD_ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext4" + IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}" IMAGE_BOOT_FILES ?= " \ ${KERNEL_IMAGETYPE} \ ${@make_dtb_boot_files(d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_BOOT_IMAGE}', '', d)} \ " ### wic default support +OPTEE_WKS_FILE_DEPENDS = "optee-os" +OPTEE_WKS_FILE_DEPENDS_aarch64 = "" + WKS_FILE_DEPENDS ?= " \ virtual/bootloader \ \ e2fsprogs-native \ bmap-tools-native \ + ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_WKS_FILE_DEPENDS}', '', d)} \ " WKS_FILE_DEPENDS_mx8 += "imx-boot" -- cgit v1.2.3-54-g00ecf