From f7dae734e2e9c2aef17d3b0329bdf4e65b215786 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 17 May 2022 11:12:44 -0500 Subject: optee-os: Simplify OPTEE_ARCH assignment for 32-bit For 32-bit ARM the OPTEE_ARCH assignment using the armv7a override is redundant to the default assignment. Replace both with a single assignment using the arm override. Signed-off-by: Tom Hochstein --- recipes-security/optee-imx/optee-os_3.15.0.imx.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes-security/optee-imx/optee-os_3.15.0.imx.bb b/recipes-security/optee-imx/optee-os_3.15.0.imx.bb index 15244c451..6d10b93da 100644 --- a/recipes-security/optee-imx/optee-os_3.15.0.imx.bb +++ b/recipes-security/optee-imx/optee-os_3.15.0.imx.bb @@ -40,8 +40,7 @@ PLATFORM_FLAVOR:mx8dx-nxp-bsp = "mx8dxmek" PLATFORM_FLAVOR:mx8dxl-nxp-bsp = "mx8dxlevk" PLATFORM_FLAVOR:mx8ulp-nxp-bsp = "mx8ulpevk" -OPTEE_ARCH ?= "arm32" -OPTEE_ARCH:armv7a = "arm32" +OPTEE_ARCH:arm = "arm32" OPTEE_ARCH:aarch64 = "arm64" # Optee-os can be built for 32 bits and 64 bits at the same time -- cgit v1.2.3-54-g00ecf From 1d9eb0fc2443414014be964b6353710439be5226 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 17 May 2022 11:50:03 -0500 Subject: optee-test: Rework the OPTEE_ARCH logic For 32-bit ARM the OPTEE_ARCH assignment using the armv7a override is redundant to the default assignment. Replace both with a single assignment using the arm override. Also, rework the TA_DEV_KIT_DIR build variable using OPTEE_ARCH. Signed-off-by: Tom Hochstein --- recipes-security/optee-imx/optee-test_3.15.0.imx.bb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/recipes-security/optee-imx/optee-test_3.15.0.imx.bb b/recipes-security/optee-imx/optee-test_3.15.0.imx.bb index a44454a74..a3649d745 100644 --- a/recipes-security/optee-imx/optee-test_3.15.0.imx.bb +++ b/recipes-security/optee-imx/optee-test_3.15.0.imx.bb @@ -21,18 +21,14 @@ inherit python3native features_check REQUIRED_MACHINE_FEATURES = "optee" -OPTEE_ARCH ?= "arm32" -OPTEE_ARCH:armv7a = "arm32" +OPTEE_ARCH:arm = "arm32" OPTEE_ARCH:aarch64 = "arm64" -TA_DEV_KIT_DIR:arm = "${STAGING_INCDIR}/optee/export-user_ta_arm32/" -TA_DEV_KIT_DIR:aarch64 = "${STAGING_INCDIR}/optee/export-user_ta_arm64/" - CFLAGS += "--sysroot=${STAGING_DIR_HOST}" CXXFLAGS += "--sysroot=${STAGING_DIR_HOST}" EXTRA_OEMAKE = " \ - TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \ + TA_DEV_KIT_DIR=${STAGING_INCDIR}/optee/export-user_ta_${OPTEE_ARCH}/ \ ARCH=${OPTEE_ARCH} \ OPTEE_CLIENT_EXPORT=${STAGING_DIR_HOST}${exec_prefix} \ CROSS_COMPILE_HOST=${HOST_PREFIX} \ -- cgit v1.2.3-54-g00ecf