optee-client: Upgrade to lf-6.1.22-2.0.0 (3.21)

Upgrade optee-client to be aligned with NXP BSP LF6.1.22_2.0.0. Backport changes from meta-arm/optee-client.inc. Relevant changes: - 8533e0e travis: remove the .travis.yml file - 0fc6ef7 tee-supplicant: fix leak when load plugin failed - dde6306 libteeacl: use realloc() instead of reallocarray() - 462b954 Add -Wunsafe-loop-optimizations only for gcc - 2096542 Makefile: use GNU standards for directory variables - dd2d39b libteeacl: Move uuid-dev checking in libteec makefile - 1056b40 cmake: define boolean switch CFG_WERROR with option() - bbdf665 libteeacl: condition libteeacl with WITH_TEEACL - fba9950 ci: add GitHub Actions script and Docker files - fc67c27 Add pkgconfig file for libteec - d448e8b Allow cross-compile pkg-config - d26d885 libckteec: Add RSA AES key wrap serialization - cb3842c tee-supplicant: Synchronize file operations for secure storage Signed-off-by: Oleksandr Suvorov <[email protected]>
Freescale · Jul 28, 2023 · ab83ab0 · ab83ab0
1 parent 4ae12b5
commit ab83ab0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 67 deletions.
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
@@ -549,8 +549,8 @@ PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.2.182.0.imx"
 # Use i.MX optee Version
 PREFERRED_VERSION_optee-os:mx8-nxp-bsp     ??= "3.21.0.imx"
 PREFERRED_VERSION_optee-os:mx9-nxp-bsp     ??= "3.21.0.imx"
-PREFERRED_VERSION_optee-client:mx8-nxp-bsp ??= "3.19.0.imx"
-PREFERRED_VERSION_optee-client:mx9-nxp-bsp ??= "3.19.0.imx"
+PREFERRED_VERSION_optee-client:mx8-nxp-bsp ??= "3.21.0.imx"
+PREFERRED_VERSION_optee-client:mx9-nxp-bsp ??= "3.21.0.imx"
 PREFERRED_VERSION_optee-test:mx8-nxp-bsp   ??= "3.19.0.imx"
 PREFERRED_VERSION_optee-test:mx9-nxp-bsp   ??= "3.19.0.imx"
 

diff --git a/recipes-security/optee-imx/optee-client_3.19.0.imx.bb b/recipes-security/optee-imx/optee-client_3.19.0.imx.bb
diff --git a/recipes-security/optee-imx/optee-client_3.21.0.imx.bb b/recipes-security/optee-imx/optee-client_3.21.0.imx.bb
@@ -0,0 +1,7 @@
+require optee-client-fslc-imx.inc
+
+SRCBRANCH = "lf-6.1.22_2.0.0"
+SRCREV = "8533e0e6329840ee96cf81b6453f257204227e6c"
+
+DEPENDS += "util-linux"
+EXTRA_OEMAKE += "PKG_CONFIG=pkg-config"
diff --git a/recipes-security/optee-imx/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch b/recipes-security/optee-imx/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch
diff --git a/recipes-security/optee-imx/optee-os/0007-allow-setting-sysroot-for-clang.patch b/recipes-security/optee-imx/optee-os/0007-allow-setting-sysroot-for-clang.patch