From 0e3d6ed0f52ef004680b5c2c0a270105acd62604 Mon Sep 17 00:00:00 2001 From: Thomas Perrot Date: Wed, 2 Feb 2022 10:35:59 +0100 Subject: optee-client: fix an override syntax Correct a forgotten change when switching to the new syntax. Signed-off-by: Thomas Perrot --- recipes-security/optee/optee-client.nxp.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-security') diff --git a/recipes-security/optee/optee-client.nxp.inc b/recipes-security/optee/optee-client.nxp.inc index de2ba8ae..fa187e84 100644 --- a/recipes-security/optee/optee-client.nxp.inc +++ b/recipes-security/optee/optee-client.nxp.inc @@ -17,7 +17,7 @@ S = "${WORKDIR}/git" B = "${WORKDIR}/build" OPTEE_ARCH ?= "arm32" -OPTEE_ARCH_armv7a = "arm32" +OPTEE_ARCH:armv7a = "arm32" OPTEE_ARCH:aarch64 = "arm64" EXTRA_OEMAKE = "ARCH=${OPTEE_ARCH} O=${B}" -- cgit v1.2.3-54-g00ecf From dce05576561f89e34e1218614852b4597c16f5c6 Mon Sep 17 00:00:00 2001 From: Thomas Perrot Date: Wed, 2 Feb 2022 10:36:25 +0100 Subject: optee-os: fix an override syntax Correct a forgotten change when switching to the new syntax. Signed-off-by: Thomas Perrot --- recipes-security/optee/optee-os.nxp.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'recipes-security') diff --git a/recipes-security/optee/optee-os.nxp.inc b/recipes-security/optee/optee-os.nxp.inc index f376b3ce..72af6ca4 100644 --- a/recipes-security/optee/optee-os.nxp.inc +++ b/recipes-security/optee/optee-os.nxp.inc @@ -18,7 +18,7 @@ B = "${WORKDIR}/build.${PLATFORM_FLAVOR}" PLATFORM_FLAVOR ?= "${MACHINE}" OPTEE_ARCH ?= "arm64" -OPTEE_ARCH_armv7a = "arm32" +OPTEE_ARCH:armv7a = "arm32" OPTEE_ARCH:aarch64 = "arm64" OPTEE_CORE_LOG_LEVEL ?= "1" @@ -73,4 +73,3 @@ FILES:${PN}-staticdev = "/usr/include/optee/" RDEPENDS:${PN}-dev += "${PN}-staticdev" PACKAGE_ARCH = "${MACHINE_ARCH}" - -- cgit v1.2.3-54-g00ecf From 39868190cda524c0cf781bbacb8e894e2e0078a6 Mon Sep 17 00:00:00 2001 From: Thomas Perrot Date: Wed, 2 Feb 2022 12:05:21 +0100 Subject: optee-test: correct TA_DEV_KIT_DIR The value is either ${STAGING_INCDIR}/optee/export-user_ta_arm32/ or ${STAGING_INCDIR}/optee/export-user_ta_arm64/ Signed-off-by: Thomas Perrot --- recipes-security/optee-imx/optee-test_3.10.0.imx.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'recipes-security') diff --git a/recipes-security/optee-imx/optee-test_3.10.0.imx.bb b/recipes-security/optee-imx/optee-test_3.10.0.imx.bb index 76e04f04..a6dea426 100644 --- a/recipes-security/optee-imx/optee-test_3.10.0.imx.bb +++ b/recipes-security/optee-imx/optee-test_3.10.0.imx.bb @@ -23,8 +23,8 @@ OPTEE_ARCH ?= "arm32" OPTEE_ARCH:armv7a = "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/" +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}" -- cgit v1.2.3-54-g00ecf