MIRRORS/meta-freescale
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-freescale.git synced 2025-10-22 23:02:20 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

optee: Upgrade 3.15.0.imx -> 3.17.0.imx

Browse Source 
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
This commit is contained in:
Tom Hochstein 2022-08-01 14:48:54 -05:00
parent d70a83fbfd
commit d5abe2b1f7
4 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conf/machine/include/imx-base.inc
View File

@ -475,9 +475,9 @@ PREFERRED_VERSION_libdrm:mx7-nxp-bsp ??= "2.4.109.imx"
PREFERRED_VERSION_libdrm:mx8-nxp-bsp ??= "2.4.109.imx"
# Use i.MX optee Version
PREFERRED_VERSION_optee-os:mx8-nxp-bsp ??= "3.15.0.imx"
PREFERRED_VERSION_optee-client:mx8-nxp-bsp ??= "3.15.0.imx"
PREFERRED_VERSION_optee-test:mx8-nxp-bsp ??= "3.15.0.imx"
PREFERRED_VERSION_optee-os:mx8-nxp-bsp ??= "3.17.0.imx"
PREFERRED_VERSION_optee-client:mx8-nxp-bsp ??= "3.17.0.imx"
PREFERRED_VERSION_optee-test:mx8-nxp-bsp ??= "3.17.0.imx"
#Use i.MX opencv Version for mx8
PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.5.2.imx"

0
recipes-security/optee-imx/optee-client_3.15.0.imx.bb → recipes-security/optee-imx/optee-client_3.17.0.imx.bb
View File

21
recipes-security/optee-imx/optee-os_3.15.0.imx.bb → recipes-security/optee-imx/optee-os_3.17.0.imx.bb
View File

@ -6,12 +6,11 @@ HOMEPAGE = "http://www.optee.org/"
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=c1f21c4f72f372ef38a5a4aee55ec173"
DEPENDS = "python3-pycryptodomex-native python3-pyelftools-native u-boot-mkimage-native"
DEPENDS = "python3-cryptography-native python3-pyelftools-native u-boot-mkimage-native"
SRCBRANCH = "lf-5.15.5_1.0.0"
SRC_URI = "git://source.codeaurora.org/external/imx/imx-optee-os.git;protocol=https;branch=${SRCBRANCH}"
SRCREV = "807629a0889ad5e888f1fd187932ab7f701ddf8c"
SRCBRANCH = "lf-5.15.32_2.0.0"
SRCREV = "984996422c25c99ebfc5194c1bb393028605bb0c"
S = "${WORKDIR}/git"
@ -49,13 +48,13 @@ OPTEE_ARCH:aarch64 = "arm64"
# When defining CROSS_COMPILE and CROSS_COMPILE64, we assure that
# any 32 or 64 bits builds will pass
EXTRA_OEMAKE = " \
PLATFORM=imx \
PLATFORM_FLAVOR=${PLATFORM_FLAVOR} \
CROSS_COMPILE=${HOST_PREFIX} \
CROSS_COMPILE64=${HOST_PREFIX} \
CFG_TEE_TA_LOG_LEVEL=0 \
CFG_TEE_CORE_LOG_LEVEL=0 \
-C ${S} O=${B}\
PLATFORM=imx-${PLATFORM_FLAVOR} \
CROSS_COMPILE=${HOST_PREFIX} \
CROSS_COMPILE64=${HOST_PREFIX} \
CFG_TEE_TA_LOG_LEVEL=0 \
CFG_TEE_CORE_LOG_LEVEL=0 \
OPENSSL_MODULES=${STAGING_LIBDIR_NATIVE}/ossl-modules \
-C ${S} O=${B} \
"
LDFLAGS = ""

10
recipes-security/optee-imx/optee-test_3.15.0.imx.bb → recipes-security/optee-imx/optee-test_3.17.0.imx.bb
View File

@ -6,17 +6,15 @@ HOMEPAGE = "http://www.optee.org/"
LICENSE = "BSD-2-Clause & GPL-2.0-only"
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa"
DEPENDS = "python3-pycryptodome-native python3-pycryptodomex-native optee-os optee-client openssl"
SRCBRANCH = "lf-5.15.5_1.0.0"
DEPENDS = "python3-cryptography-native optee-os optee-client openssl"
SRC_URI = "git://source.codeaurora.org/external/imx/imx-optee-test.git;protocol=https;branch=${SRCBRANCH}"
SRCBRANCH = "lf-5.15.32_2.0.0"
SRCREV = "e064126a9769f168d1d0e178b74955e6648683b4"
S = "${WORKDIR}/git"
B = "${WORKDIR}/build"
SRCREV = "e9d8bf6ee121d6686e6e409c727caee76496bb86"
inherit python3native features_check
REQUIRED_MACHINE_FEATURES = "optee"
@ -29,11 +27,11 @@ CXXFLAGS += "--sysroot=${STAGING_DIR_HOST}"
EXTRA_OEMAKE = " \
TA_DEV_KIT_DIR=${STAGING_INCDIR}/optee/export-user_ta_${OPTEE_ARCH}/ \
ARCH=${OPTEE_ARCH} \
OPTEE_CLIENT_EXPORT=${STAGING_DIR_HOST}${exec_prefix} \
CROSS_COMPILE_HOST=${HOST_PREFIX} \
CROSS_COMPILE_TA=${HOST_PREFIX} \
CROSS_COMPILE=${HOST_PREFIX} \
OPENSSL_MODULES=${STAGING_LIBDIR_NATIVE}/ossl-modules \
-C ${S} O=${B} \
"