8 files changed, 44 insertions, 42 deletions

diff --git a/recipes-security/optee-imx/optee-client-fslc.inc b/recipes-security/optee-imx/optee-client-fslc.inc
index ab7c8bc69..61629209d 100644
--- a/recipes-security/optee-imx/optee-client-fslc.inc
+++ b/recipes-security/optee-imx/optee-client-fslc.inc
@@ -10,14 +10,14 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=69663ab153298557a59c67a60a743e5b"
 
 inherit systemd update-rc.d cmake useradd
 
-SRC_URI = " \
+SRC_URI = "\
     git://github.com/OP-TEE/optee_client.git;branch=master;protocol=https \
     file://tee-supplicant.sh \
 "
 
 UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$"
 
-EXTRA_OECMAKE = " \
+EXTRA_OECMAKE = "\
     -DBUILD_SHARED_LIBS=ON \
     -DCFG_USE_PKGCONFIG=ON \
 "
@@ -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-fslc.inc b/recipes-security/optee-imx/optee-fslc.inc
index dadbfa802..906001d24 100644
--- a/recipes-security/optee-imx/optee-fslc.inc
+++ b/recipes-security/optee-imx/optee-fslc.inc
@@ -28,7 +28,7 @@ EXTRA_OEMAKE += "V=1 \
                  COMPILER=${TOOLCHAIN} \
                  OPTEE_CLIENT_EXPORT=${STAGING_DIR_HOST}${prefix} \
                  TEEC_EXPORT=${STAGING_DIR_HOST}${prefix} \
-                "
+                 "
 # python3-cryptography needs the legacy provider, so set OPENSSL_MODULES to the
 # right path until this is relocated automatically.
 export OPENSSL_MODULES = "${STAGING_LIBDIR_NATIVE}/ossl-modules"
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..ed11d0ca6 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:"
 
@@ -18,26 +18,26 @@ inherit features_check
 
 REQUIRED_MACHINE_FEATURES = "optee"
 
-OPTEEMACHINE                   = "imx-${@d.getVar('MACHINE')[1:]}"
-OPTEEMACHINE:imx6qpdlsolox     = "imx-mx6qsabresd"
-OPTEEMACHINE:mx6ul-nxp-bsp     = "imx-mx6ulevk"
-OPTEEMACHINE:mx6ull-nxp-bsp    = "imx-mx6ullevk"
-OPTEEMACHINE:mx6ulz-nxp-bsp    = "imx-mx6ulzevk"
-OPTEEMACHINE:mx8mq-nxp-bsp     = "imx-mx8mqevk"
-OPTEEMACHINE:mx8mm-nxp-bsp     = "imx-mx8mmevk"
-OPTEEMACHINE:mx8mn-nxp-bsp     = "imx-mx8mnevk"
-OPTEEMACHINE:mx8mp-nxp-bsp     = "imx-mx8mpevk"
-OPTEEMACHINE:mx8mpul-nxp-bsp   = "imx-mx8mpevk"
-OPTEEMACHINE:mx8qm-nxp-bsp     = "imx-mx8qmmek"
-OPTEEMACHINE:mx8qxp-nxp-bsp    = "imx-mx8qxpmek"
-OPTEEMACHINE:mx8dx-nxp-bsp     = "imx-mx8dxmek"
-OPTEEMACHINE:mx8dxl-nxp-bsp    = "imx-mx8dxlevk"
-OPTEEMACHINE:mx8mnul-nxp-bsp   = "imx-mx8mnevk"
-OPTEEMACHINE:mx8ulp-nxp-bsp    = "imx-mx8ulpevk"
-OPTEEMACHINE:mx91-nxp-bsp      = "imx-mx91evk"
-OPTEEMACHINE:mx93-nxp-bsp      = "imx-mx93evk"
-OPTEEMACHINE:mx943-nxp-bsp     = "imx-mx943evk"
-OPTEEMACHINE:mx95-nxp-bsp      = "imx-mx95evk"
+OPTEEMACHINE = "imx-${@d.getVar('MACHINE')[1:]}"
+OPTEEMACHINE:imx6qpdlsolox = "imx-mx6qsabresd"
+OPTEEMACHINE:mx6ul-nxp-bsp = "imx-mx6ulevk"
+OPTEEMACHINE:mx6ull-nxp-bsp = "imx-mx6ullevk"
+OPTEEMACHINE:mx6ulz-nxp-bsp = "imx-mx6ulzevk"
+OPTEEMACHINE:mx8mq-nxp-bsp = "imx-mx8mqevk"
+OPTEEMACHINE:mx8mm-nxp-bsp = "imx-mx8mmevk"
+OPTEEMACHINE:mx8mn-nxp-bsp = "imx-mx8mnevk"
+OPTEEMACHINE:mx8mp-nxp-bsp = "imx-mx8mpevk"
+OPTEEMACHINE:mx8mpul-nxp-bsp = "imx-mx8mpevk"
+OPTEEMACHINE:mx8qm-nxp-bsp = "imx-mx8qmmek"
+OPTEEMACHINE:mx8qxp-nxp-bsp = "imx-mx8qxpmek"
+OPTEEMACHINE:mx8dx-nxp-bsp = "imx-mx8dxmek"
+OPTEEMACHINE:mx8dxl-nxp-bsp = "imx-mx8dxlevk"
+OPTEEMACHINE:mx8mnul-nxp-bsp = "imx-mx8mnevk"
+OPTEEMACHINE:mx8ulp-nxp-bsp = "imx-mx8ulpevk"
+OPTEEMACHINE:mx91-nxp-bsp = "imx-mx91evk"
+OPTEEMACHINE:mx93-nxp-bsp = "imx-mx93evk"
+OPTEEMACHINE:mx943-nxp-bsp = "imx-mx943evk"
+OPTEEMACHINE:mx95-nxp-bsp = "imx-mx95evk"
 
 # Strip the leading imx-
 PLATFORM_FLAVOR = "${@d.getVar('OPTEEMACHINE')[4:]}"
diff --git a/recipes-security/optee-imx/optee-os-fslc.inc b/recipes-security/optee-imx/optee-os-fslc.inc
index febdd2c73..b36810c60 100644
--- a/recipes-security/optee-imx/optee-os-fslc.inc
+++ b/recipes-security/optee-imx/optee-os-fslc.inc
@@ -13,7 +13,7 @@ require optee-fslc.inc
 
 CVE_PRODUCT = "linaro:op-tee op-tee:op-tee_os"
 
-DEPENDS = "python3-pyelftools-native python3-cryptography-native"
+DEPENDS = "python3-cryptography-native python3-pyelftools-native"
 
 DEPENDS:append:toolchain-clang = " lld-native compiler-rt"
 
@@ -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)}"
@@ -74,7 +74,6 @@ PACKAGES += "${PN}-ta"
 FILES:${PN} = "${nonarch_base_libdir}/firmware/"
 FILES:${PN}-ta = "${nonarch_base_libdir}/optee_armtz/*"
 
-
 # note: "textrel" is not triggered on all archs
 INSANE_SKIP:${PN} = "textrel"
 INSANE_SKIP:${PN}-dev = "staticdev"
diff --git a/recipes-security/optee-imx/optee-os-tadevkit-fslc-imx.inc b/recipes-security/optee-imx/optee-os-tadevkit-fslc-imx.inc
index 68918414c..0fac7771f 100644
--- a/recipes-security/optee-imx/optee-os-tadevkit-fslc-imx.inc
+++ b/recipes-security/optee-imx/optee-os-tadevkit-fslc-imx.inc
@@ -18,7 +18,7 @@ do_install() {
 }
 
 do_deploy() {
-        echo "Do not inherit do_deploy from optee-os."
+    echo "Do not inherit do_deploy from optee-os."
 }
 
 FILES:${PN} = "${includedir}/optee/"
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..e0870a3a3 100644
--- a/recipes-security/optee-imx/optee-test-fslc.inc
+++ b/recipes-security/optee-imx/optee-test-fslc.inc
@@ -5,18 +5,18 @@ SUMMARY = "OP-TEE sanity testsuite"
 DESCRIPTION = "Open Portable Trusted Execution Environment - Test suite"
 HOMEPAGE = "https://www.op-tee.org/"
 
-LICENSE = "BSD-2-Clause & GPL-2.0-only"
+LICENSE = "BSD-2-Clause AND GPL-2.0-only"
 
 inherit python3native ptest
 inherit deploy
 require optee-fslc.inc
 
-DEPENDS = "optee-client optee-os-tadevkit python3-cryptography-native openssl"
+DEPENDS = "openssl optee-client optee-os-tadevkit python3-cryptography-native"
 DEPENDS:append:toolchain-clang = " lld-native"
 
 SRC_URI = "git://github.com/OP-TEE/optee_test.git;branch=master;protocol=https \
            file://run-ptest \
-          "
+           "
 
 B = "${WORKDIR}/build"
 
@@ -25,7 +25,7 @@ EXTRA_OEMAKE += "TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \
                  CROSS_COMPILE_HOST=${HOST_PREFIX} \
                  CROSS_COMPILE_TA=${HOST_PREFIX} \
                  O=${B} \
-               "
+                 "
 
 CFLAGS += "-Wno-error=deprecated-declarations"
 
@@ -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/
 }
 
@@ -58,7 +58,7 @@ addtask deploy before do_build after do_install
 
 FILES:${PN} += "${nonarch_base_libdir}/optee_armtz/ \
                 ${libdir}/tee-supplicant/plugins/ \
-               "
+                "
 
 # Imports machine specific configs from staging to build
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-security/optee-imx/optee-test_4.8.0.imx.bb b/recipes-security/optee-imx/optee-test_4.8.0.imx.bb
index 2f2b40e09..42d525855 100644
--- a/recipes-security/optee-imx/optee-test_4.8.0.imx.bb
+++ b/recipes-security/optee-imx/optee-test_4.8.0.imx.bb
@@ -8,6 +8,5 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a8fa504109e4cd7ea575bc49ea4be560 \
                     file://LICENSE-BSD;md5=dca16d6efa93b55d0fd662ae5cd6feeb \
                     file://LICENSE-GPL;md5=10e86b5d2a6cb0e2b9dcfdd26a9ac58d"
 
-
 SRCBRANCH = "lf-6.18.2_1.0.0"
 SRCREV = "3383a744a5997fdb3457b3cbe95aea3ce27879b3"