Optee os update to 3.20+fio (take 2)

meta-lmp-base/conf/distro/include/non-clangable.inc

@@ -118,6 +118,7 @@ TOOLCHAIN:pn-jailhouse = "gcc"
 TOOLCHAIN:pn-optee-os-fio = "gcc"
 TOOLCHAIN:pn-optee-os-tadevkit = "gcc"
 TOOLCHAIN:pn-optee-test = "gcc"
+TOOLCHAIN:pn-optee-client = "gcc"
 TOOLCHAIN:pn-optee-sks = "gcc"
 
 # qemuarm64

meta-lmp-base/recipes-security/optee/optee-client-fio.inc

@@ -5,7 +5,9 @@ HOMEPAGE = "https://www.op-tee.org/"
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=69663ab153298557a59c67a60a743e5b"
 
-inherit systemd cmake
+inherit systemd cmake pkgconfig
+
+DEPENDS = "util-linux-libuuid"
 
 SRC_URI = " \
     git://github.com/OP-TEE/optee_client.git;protocol=https;branch=master \

meta-lmp-base/recipes-security/optee/optee-client_3.18.0.bb → meta-lmp-base/recipes-security/optee/optee-client_3.20.0.bb

@@ -1,6 +1,6 @@
 require optee-client-fio.inc
 
-SRCREV = "e7cba71cc6e2ecd02f412c7e9ee104f0a5dffc6f"
+SRCREV = "dd2d39b49975d2ada7870fe2b7f5a84d0d3860dc"
 
 SRC_URI += " \
 	file://0001-FIO-extras-pkcs11-change-UUID-to-avoid-conflict-with.patch \

meta-lmp-base/recipes-security/optee/optee-examples_3.18.0.bb → meta-lmp-base/recipes-security/optee/optee-examples_3.20.0.bb

@@ -1,6 +1,6 @@
 require optee-examples-fio.inc
 
-SRCREV = "f301ee9df2129c0db683e726c91dc2cefe4cdb65"
+SRCREV = "a98d01e1b9168eaed96bcd0bac0df67c44a81081"
 
 SRC_URI += "\
 	file://0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch \

meta-lmp-base/recipes-security/optee/optee-os-fio-se05x.inc

@@ -9,7 +9,7 @@ SRC_URI:append = " \
     git://github.com/foundriesio/plug-and-trust.git;protocol=https;branch=optee_lib-v4;name=plug-and-trust;destsuffix=git/plug-and-trust \
     file://se050_applet_version.patch \
 "
-SRCREV_plug-and-trust ?= "c46f7c9b4b42268314c58bae2c42aed0e4c0f640"
+SRCREV_plug-and-trust ?= "6068e921a765fafc876caa0ad066a06d9a635330"
 
 # To be replaced based on the actual board OEFID
 SE05X_OEFID ?= "0xA1F4"
@@ -48,8 +48,10 @@ EXTRA_OEMAKE:append = " \
     CFG_CRYPTO_DRV_ACIPHER=y \
     CFG_NXP_SE05X_SCP03_DRV=y \
     CFG_NXP_SE05X_APDU_DRV=y \
+    CFG_NXP_SE05X_RSA_DRV_FALLBACK=y \
     CFG_NXP_SE05X_RSA_DRV=${SE05X_HW_RSA} \
     CFG_NXP_SE05X_ECC_DRV=y \
+    CFG_NXP_SE05X_ECC_DRV_FALLBACK=y \
     CFG_NXP_SE05X_CTR_DRV=y \
     CFG_NXP_SE05X_DIEID_DRV=y \
     CFG_NXP_SE05X_RNG_DRV=n \

meta-lmp-base/recipes-security/optee/optee-os-fio_3.20.0.bb

@@ -0,0 +1,5 @@
+require optee-os-fio.inc
+
+PV = "3.20.0+git"
+SRCREV = "5096ab732d1184f2f03c26ec0a379ddb30f4b4b2"
+SRCBRANCH = "3.20+fio"

meta-lmp-base/recipes-security/optee/optee-test_3.18.0.bb → meta-lmp-base/recipes-security/optee/optee-test_3.20.0.bb

@@ -1,6 +1,6 @@
 require optee-test-fio.inc
 
-SRCREV = "da5282a011b40621a2cf7a296c11a35c833ed91b"
+SRCREV = "5db8ab4c733d5b2f4afac3e9aef0a26634c4b444"
 
 # Due OpenSSL 3.0 deprecated warnings
 CFLAGS += "-Wno-error=deprecated-declarations"

meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc

@@ -664,9 +664,9 @@ OSTREE_KERNEL_ARGS:sun8i ?= "earlycon console=ttyS0,115200 ${OSTREE_KERNEL_ARGS_
 ## iMX targets should use the u-boot release based on the NXP BSP
 PREFERRED_VERSION_u-boot-fio:imx-nxp-bsp ?= "imx-2022.04"
 ## Prefer OP-TEE releases from our layer instead of using the .imx fork
-PREFERRED_VERSION_optee-client:mx8-nxp-bsp = "3.18.0"
-PREFERRED_VERSION_optee-examples:mx8-nxp-bsp = "3.18.0"
-PREFERRED_VERSION_optee-test:mx8-nxp-bsp = "3.18.0"
+PREFERRED_VERSION_optee-client:mx8-nxp-bsp = "3.20.0"
+PREFERRED_VERSION_optee-examples:mx8-nxp-bsp = "3.20.0"
+PREFERRED_VERSION_optee-test:mx8-nxp-bsp = "3.20.0"
 ## We don't use imx-boot-container just yet
 UBOOT_PROVIDES_BOOT_CONTAINER:mx8-generic-bsp = ""
 ## No need to install u-boot, already a WKS dependency