optee-imx: Upgrade to 3.10.0

Update all recipes to pull sources from imx_5.4.70_2.3.0 branch in NXP
upstream and update SRCREV to match release tags.

Update PREFERRED_VERSION of optee for mx8 to point to 3.10.0.imx.

Following notes are additions to the version update of recipes:
--------------------------
optee-client:
- Drop CFLAGS patch as it is already applied upstream

optee-os:
- Drop gcc10 patch as it is already applied upstream
- Add dependency on python3-pycryptodomex-native
- Drop NOWERROR flag as package is reworked to disable warnings by default
- Rework mkimage load address since tee-init_load_addr.txt is no longer created

optee-test:
- Drop python3 patch as it is already applied upstream
- Remove unused patch files from layer
- Add dependency on python3-pycryptodomex-native
- Add sysroot to C and C++ flags

Fixes #686, fixes #689.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>

1 files changed, 0 insertions, 101 deletions

diff --git a/recipes-security/optee-imx/optee-os_3.7.0.imx.bb b/recipes-security/optee-imx/optee-os_3.7.0.imx.bb
deleted file mode 100644
index c9cdd39d..00000000
--- a/recipes-security/optee-imx/optee-os_3.7.0.imx.bb
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright (C) 2017-2020 NXP
-
-SUMMARY = "OPTEE OS"
-DESCRIPTION = "OPTEE OS"
-HOMEPAGE = "http://www.optee.org/"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=c1f21c4f72f372ef38a5a4aee55ec173"
-
-inherit deploy python3native autotools
-DEPENDS = "python3-pycrypto-native python3-pyelftools-native u-boot-mkimage-native"
-
-SRCBRANCH = "imx_5.4.24_2.1.0"
-
-SRC_URI = "\
-        git://source.codeaurora.org/external/imx/imx-optee-os.git;protocol=https;branch=${SRCBRANCH} \
-        file://0001-optee-os-fix-gcc10-compilation-issue-and-missing-cc-.patch \
-"
-
-SRCREV = "7a49776de59265500f10a247125429fde1555ac1"
-
-S = "${WORKDIR}/git"
-B = "${WORKDIR}/build.${PLATFORM_FLAVOR}"
-
-# The platform flavor corresponds to the Yocto machine without the leading 'i'.
-PLATFORM_FLAVOR                   = "${@d.getVar('MACHINE')[1:]}"
-PLATFORM_FLAVOR_imx6qpdlsolox     = "mx6qsabresd"
-PLATFORM_FLAVOR_imx6ul7d          = "mx6ulevk"
-PLATFORM_FLAVOR_imx6ull14x14evk   = "mx6ullevk"
-PLATFORM_FLAVOR_imx6ull9x9evk     = "mx6ullevk"
-PLATFORM_FLAVOR_imx6ulz-14x14-evk = "mx6ulzevk"
-PLATFORM_FLAVOR_mx8mq             = "mx8mqevk"
-PLATFORM_FLAVOR_mx8mm             = "mx8mmevk"
-PLATFORM_FLAVOR_mx8mn             = "mx8mnevk"
-PLATFORM_FLAVOR_mx8mp             = "mx8mpevk"
-PLATFORM_FLAVOR_mx8qm             = "mx8qmmek"
-PLATFORM_FLAVOR_mx8qxp            = "mx8qxpmek"
-PLATFORM_FLAVOR_mx8dx             = "mx8dxmek"
-PLATFORM_FLAVOR_mx8dxl            = "mx8dxlevk"
-
-OPTEE_ARCH ?= "arm32"
-OPTEE_ARCH_armv7a = "arm32"
-OPTEE_ARCH_aarch64 = "arm64"
-
-# Optee-os can be built for 32 bits and 64 bits at the same time
-# as long as the compilers are correctly defined.
-# For 64bits, CROSS_COMPILE64 must be set
-# 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} \
-        NOWERROR=1 \
-        LDFLAGS= \
-        O=${B} \
-"
-
-do_compile () {
-    unset LDFLAGS
-    export CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_HOST}"
-    oe_runmake -C ${S} all CFG_TEE_TA_LOG_LEVEL=0 CFG_TEE_CORE_LOG_LEVEL=0
-}
-
-
-do_deploy () {
-    install -d ${DEPLOYDIR}
-    ${TARGET_PREFIX}objcopy -O binary ${B}/core/tee.elf ${DEPLOYDIR}/tee.${PLATFORM_FLAVOR}.bin
-
-    if [ "${OPTEE_ARCH}" != "arm64" ]; then
-        IMX_LOAD_ADDR=`cat ${B}/core/tee-init_load_addr.txt` && \
-        uboot-mkimage -A arm -O linux -C none -a ${IMX_LOAD_ADDR} -e ${IMX_LOAD_ADDR} \
-            -d ${DEPLOYDIR}/tee.${PLATFORM_FLAVOR}.bin ${DEPLOYDIR}/uTee-${OPTEE_BIN_EXT}
-    fi
-
-    cd ${DEPLOYDIR}
-    ln -sf tee.${PLATFORM_FLAVOR}.bin tee.bin
-    cd -
-}
-
-do_install () {
-    install -d ${D}${nonarch_base_libdir}/firmware/
-    install -m 644 ${B}/core/*.bin ${D}${nonarch_base_libdir}/firmware/
-
-    # Install the TA devkit
-    install -d ${D}/usr/include/optee/export-user_ta_${OPTEE_ARCH}/
-
-    for f in ${B}/export-ta_${OPTEE_ARCH}/*; do
-        cp -aR $f ${D}/usr/include/optee/export-user_ta_${OPTEE_ARCH}/
-    done
-}
-
-addtask deploy after do_compile before do_install
-
-
-FILES_${PN} = "${nonarch_base_libdir}/firmware/"
-FILES_${PN}-staticdev = "/usr/include/optee/"
-RDEPENDS_${PN}-dev += "${PN}-staticdev"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(imx)"