7 files changed, 22 insertions, 12 deletions

diff --git a/recipes-security/optee-imx/optee-client-fslc.inc b/recipes-security/optee-imx/optee-client-fslc.inc
index ab7c8bc69..a5ac0f3a0 100644
--- a/recipes-security/optee-imx/optee-client-fslc.inc
+++ b/recipes-security/optee-imx/optee-client-fslc.inc
@@ -25,9 +25,9 @@ EXTRA_OECMAKE = " \
 # libts uses /dev/tee devices too. Add a common variable to allow configuring the same group.
 TEE_GROUP_NAME ?= "tee"
 
-EXTRA_OECMAKE += " -DCFG_ENABLE_SYSTEMD=On -DSYSTEMD_UNIT_DIR=${systemd_system_unitdir}/"
-EXTRA_OECMAKE += " -DCFG_ENABLE_UDEV=On -DUDEV_UDEV_DIR=${nonarch_base_libdir}/udev/rules.d/"
-EXTRA_OECMAKE += " -DCFG_TEE_GROUP=${TEE_GROUP_NAME} -DCFG_TEEPRIV_GROUP=teepriv"
+EXTRA_OECMAKE += "-DCFG_ENABLE_SYSTEMD=On -DSYSTEMD_UNIT_DIR=${systemd_system_unitdir}/"
+EXTRA_OECMAKE += "-DCFG_ENABLE_UDEV=On -DUDEV_UDEV_DIR=${nonarch_base_libdir}/udev/rules.d/"
+EXTRA_OECMAKE += "-DCFG_TEE_GROUP=${TEE_GROUP_NAME} -DCFG_TEEPRIV_GROUP=teepriv"
 
 EXTRA_OECMAKE:append:toolchain-clang = " -DCFG_WERROR=0"
 
diff --git a/recipes-security/optee-imx/optee-os-common-fslc-imx.inc b/recipes-security/optee-imx/optee-os-common-fslc-imx.inc
index 16ed8cea7..aaf8973c8 100644
--- a/recipes-security/optee-imx/optee-os-common-fslc-imx.inc
+++ b/recipes-security/optee-imx/optee-os-common-fslc-imx.inc
@@ -2,7 +2,7 @@
 # See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-whinlatter/imx-6.18.2-1.0.0.xml#L39
 require optee-os-fslc.inc
 
-DEPENDS:append:arm = "u-boot-mkimage-native"
+DEPENDS:append:arm = " u-boot-mkimage-native"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os:"
 
diff --git a/recipes-security/optee-imx/optee-os-fslc.inc b/recipes-security/optee-imx/optee-os-fslc.inc
index febdd2c73..e7568c2a3 100644
--- a/recipes-security/optee-imx/optee-os-fslc.inc
+++ b/recipes-security/optee-imx/optee-os-fslc.inc
@@ -21,7 +21,7 @@ SRC_URI = "git://github.com/OP-TEE/optee_os.git;branch=master;protocol=https"
 
 B = "${WORKDIR}/build"
 
-EXTRA_OEMAKE += " \
+EXTRA_OEMAKE += "\
     PLATFORM=${OPTEEMACHINE} \
     CFG_${OPTEE_CORE}_core=y \
     CROSS_COMPILE_core=${HOST_PREFIX} \
@@ -30,8 +30,8 @@ EXTRA_OEMAKE += " \
     ta-targets=ta_${OPTEE_ARCH} \
     O=${B} \
 "
-EXTRA_OEMAKE += " HOST_PREFIX=${HOST_PREFIX}"
-EXTRA_OEMAKE += " CROSS_COMPILE64=${HOST_PREFIX}"
+EXTRA_OEMAKE += "HOST_PREFIX=${HOST_PREFIX}"
+EXTRA_OEMAKE += "CROSS_COMPILE64=${HOST_PREFIX}"
 
 # Enable BTI in optee
 EXTRA_OEMAKE += "${@bb.utils.contains('MACHINE_FEATURES', 'arm-branch-protection', ' CFG_TA_BTI=1 CFG_CORE_PAUTH=y CFG_TA_PAUTH=y', '', d)}"
diff --git a/recipes-security/optee-imx/optee-test-fslc-imx.inc b/recipes-security/optee-imx/optee-test-fslc-imx.inc
index 2c0d278e3..23e22bc9f 100644
--- a/recipes-security/optee-imx/optee-test-fslc-imx.inc
+++ b/recipes-security/optee-imx/optee-test-fslc-imx.inc
@@ -4,6 +4,10 @@ require optee-test-fslc.inc
 
 DEPENDS += "openssl"
 
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "optee"
+
 FILESEXTRAPATHS:prepend := "${THISDIR}/optee-test:"
 
 SRC_URI:remove = "git://github.com/OP-TEE/optee_test.git;branch=master;protocol=https"
@@ -13,6 +17,6 @@ OPTEE_TEST_SRC ?= "git://github.com/nxp-imx/imx-optee-test.git;protocol=https"
 
 EXTRA_OEMAKE:append:libc-musl = " OPTEE_OPENSSL_EXPORT=${STAGING_INCDIR}"
 CFLAGS:append:libc-musl = " -Wno-error=deprecated-declarations"
-CFLAGS += " -Wno-error=unterminated-string-initialization"
+CFLAGS += "-Wno-error=unterminated-string-initialization"
 
 COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-security/optee-imx/optee-test-fslc.inc b/recipes-security/optee-imx/optee-test-fslc.inc
index a5183b7e1..c34ef8789 100644
--- a/recipes-security/optee-imx/optee-test-fslc.inc
+++ b/recipes-security/optee-imx/optee-test-fslc.inc
@@ -43,9 +43,9 @@ do_install () {
 
     # install path should match the value set in optee-client/tee-supplicant
     # default TEEC_LOAD_PATH is /lib
-    mkdir -p ${D}${nonarch_base_libdir}/optee_armtz/
+    install -d ${D}${nonarch_base_libdir}/optee_armtz/
     install -D -p -m0444 ${B}/ta/*/*.ta ${D}${nonarch_base_libdir}/optee_armtz/
-    mkdir -p ${D}${libdir}/tee-supplicant/plugins
+    install -d ${D}${libdir}/tee-supplicant/plugins
     install -D -p -m0444 ${B}/supp_plugin/*.plugin ${D}${libdir}/tee-supplicant/plugins/
 }
 
diff --git a/recipes-security/optee-qoriq/optee-test.nxp.inc b/recipes-security/optee-qoriq/optee-test.nxp.inc
index 6bf158d12..acbc2068d 100644
--- a/recipes-security/optee-qoriq/optee-test.nxp.inc
+++ b/recipes-security/optee-qoriq/optee-test.nxp.inc
@@ -2,7 +2,7 @@
 require recipes-security/optee-imx/optee-test-fslc.inc
 
 DEPENDS:remove = "optee-client optee-os-tadevkit"
-DEPENDS:append = "optee-client-qoriq optee-os-qoriq-tadevkit openssl"
+DEPENDS:append = " optee-client-qoriq optee-os-qoriq-tadevkit openssl"
 
 SRC_URI:remove = "git://github.com/OP-TEE/optee_test.git;branch=master;protocol=https"
 SRC_URI:remove = "file://run-ptest"
@@ -10,4 +10,8 @@ SRC_URI:prepend = "${OPTEE_TEST_SRC};branch=${OPTEE_TEST_BRANCH} "
 
 OPTEE_TEST_SRC ?= "git://github.com/nxp-qoriq/optee_test.git;protocol=https"
 
+REQUIRED_MACHINE_FEATURES = "optee"
+
+inherit features_check
+
 COMPATIBLE_MACHINE = "(qoriq-arm64)"
diff --git a/recipes-security/smw/smw_5.3.bb b/recipes-security/smw/smw_5.3.bb
index d8e07a50f..46155978e 100644
--- a/recipes-security/smw/smw_5.3.bb
+++ b/recipes-security/smw/smw_5.3.bb
@@ -30,7 +30,9 @@ SRCREV_smw = "c643587073584057700f39098ab12f536a21600d"
 SRCREV_psa = "463cb95ada820bc6f758d50066cf8c0ed5cc3a02"
 SRCREV_FORMAT = "smw_psa"
 
-inherit cmake python3native
+inherit cmake features_check python3native
+
+REQUIRED_MACHINE_FEATURES = "optee"
 
 PACKAGECONFIG ??= "${PACKAGECONFIG_DRIVERS} ${PACKAGECONFIG_FEATURES}"
 PACKAGECONFIG_DRIVERS                = ""