From beb9fd02e6759fc68556d52b971e115900cf6a91 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Tue, 2 May 2023 17:28:32 +0200 Subject: [PATCH] meta-digi-arm: add optee userspace for IMX platforms that support it NXP platforms that have 'optee' in the MACHINE_FEATURES, will install optee userspace packages (ccimx8m and ccimx93 at the moment). Signed-off-by: Javier Viguera --- meta-digi-arm/conf/machine/include/digi-defaults.inc | 1 + meta-digi-arm/conf/machine/include/imx-digi-base.inc | 3 +++ 2 files changed, 4 insertions(+) diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc index cb28faf61..b8a9eb21f 100644 --- a/meta-digi-arm/conf/machine/include/digi-defaults.inc +++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc @@ -66,6 +66,7 @@ MACHINEOVERRIDES .= "${@['', ':${MACHINE_VARIANT}']['${MACHINE_VARIANT}' != '']} # Extra RDEPENDS MACHINE_EXTRA_RDEPENDS += " \ ${@bb.utils.contains("MACHINE_FEATURES", "mca", "mca-tool", "", d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_PKGS}', '', d)} \ " # Extra RRECOMMENDS MACHINE_EXTRA_RRECOMMENDS += " \ diff --git a/meta-digi-arm/conf/machine/include/imx-digi-base.inc b/meta-digi-arm/conf/machine/include/imx-digi-base.inc index 71f58f7bc..856ed6d0f 100644 --- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc +++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc @@ -278,6 +278,9 @@ PREFERRED_VERSION_optee-client:mx9-nxp-bsp ??= "3.19.0.imx" PREFERRED_VERSION_optee-test:mx8-nxp-bsp ??= "3.19.0.imx" PREFERRED_VERSION_optee-test:mx9-nxp-bsp ??= "3.19.0.imx" +# Optee runtime packages to install +OPTEE_PKGS:use-nxp-bsp ??= "optee-client optee-os" + # Use i.MX opencv Version PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.6.0.imx" PREFERRED_VERSION_opencv:mx9-nxp-bsp ??= "4.6.0.imx"