From fcb3b7452d37c189437621440f6aa68393d3e261 Mon Sep 17 00:00:00 2001 From: Andrey Zhizhikin Date: Wed, 15 Apr 2020 08:56:25 +0000 Subject: [PATCH] optee-imx: upgrade to lf-5.4.y Upgrade optee recipes to fetch sources from lf-5.4.y branch, this is aligned with new kernel release from NXP. optee-os and optee-client has build defines dropped, this is originated in NXP fork. Signed-off-by: Andrey Zhizhikin --- recipes-security/optee-imx/optee-client_3.2.0.imx.bb | 4 +--- recipes-security/optee-imx/optee-os_3.2.0.imx.bb | 9 +++------ recipes-security/optee-imx/optee-test_3.2.0.imx.bb | 6 ++---- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/recipes-security/optee-imx/optee-client_3.2.0.imx.bb b/recipes-security/optee-imx/optee-client_3.2.0.imx.bb index f7b22e1a..707e82fd 100644 --- a/recipes-security/optee-imx/optee-client_3.2.0.imx.bb +++ b/recipes-security/optee-imx/optee-client_3.2.0.imx.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=69663ab153298557a59c67a60a743e5b" inherit python3native systemd -SRCBRANCH = "imx_4.19.35_1.1.0" +SRCBRANCH = "lf-5.4.y" OPTEE_CLIENT_SRC ?= "git://source.codeaurora.org/external/imx/imx-optee-client.git;protocol=https" SRC_URI = "${OPTEE_CLIENT_SRC};branch=${SRCBRANCH}" @@ -20,8 +20,6 @@ SRC_URI_append = " file://tee-supplicant.service" S = "${WORKDIR}/git" SYSTEMD_SERVICE_${PN} = "tee-supplicant.service" -EXTRA_OEMAKE = "CFG_SECURE_DATA_PATH=y" - do_compile () { if [ ${DEFAULTTUNE} = "aarch64" ]; then oe_runmake -C ${S} ARCH=arm64 diff --git a/recipes-security/optee-imx/optee-os_3.2.0.imx.bb b/recipes-security/optee-imx/optee-os_3.2.0.imx.bb index be07f0ef..ba903519 100644 --- a/recipes-security/optee-imx/optee-os_3.2.0.imx.bb +++ b/recipes-security/optee-imx/optee-os_3.2.0.imx.bb @@ -9,14 +9,14 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=69663ab153298557a59c67a60a743e5b" inherit deploy python3native autotools DEPENDS = "python3-pycrypto-native u-boot-mkimage-native" -SRCBRANCH = "imx_4.19.35_1.1.0" +SRCBRANCH = "lf-5.4.y" OPTEE_OS_SRC ?= "git://source.codeaurora.org/external/imx/imx-optee-os.git;protocol=https" SRC_URI = "\ ${OPTEE_OS_SRC};branch=${SRCBRANCH} \ file://0001-scripts-update-scripts-to-use-python3.patch \ " -SRCREV = "6a22e6e8a2840b245808527679f3397b7e620b3c" +SRCREV = "6d99b525af752ecdaabdca6098b2564b2665f2b2" S = "${WORKDIR}/git" B = "${WORKDIR}/build.${PLATFORM_FLAVOR}" @@ -30,6 +30,7 @@ PLATFORM_FLAVOR_imx6ull9x9evk = "mx6ullevk" PLATFORM_FLAVOR_imx6ulz14x14evk = "mx6ulzevk" PLATFORM_FLAVOR_mx8mm = "mx8mmevk" PLATFORM_FLAVOR_mx8mn = "mx8mnevk" +PLATFORM_FLAVOR_mx8qxp = "mx8qxpmek" OPTEE_ARCH ?= "arm32" OPTEE_ARCH_armv7a = "arm32" @@ -46,10 +47,6 @@ EXTRA_OEMAKE = "PLATFORM=imx PLATFORM_FLAVOR=${PLATFORM_FLAVOR} \ NOWERROR=1 \ LDFLAGS= \ O=${B} \ - CFG_SECURE_DATA_PATH=y \ - CFG_TEE_SDP_MEM_BASE=0xCC000000 \ - CFG_TEE_SDP_MEM_SIZE=0x02000000 \ - CFG_TEE_SDP_NONCACHE=y \ " diff --git a/recipes-security/optee-imx/optee-test_3.2.0.imx.bb b/recipes-security/optee-imx/optee-test_3.2.0.imx.bb index fa46720d..03cb2b57 100644 --- a/recipes-security/optee-imx/optee-test_3.2.0.imx.bb +++ b/recipes-security/optee-imx/optee-test_3.2.0.imx.bb @@ -11,7 +11,7 @@ inherit python3native FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRCBRANCH = "imx_4.19.35_1.1.0" +SRCBRANCH = "lf-5.4.y" OPTEE_TEST_SRC ?= "git://source.codeaurora.org/external/imx/imx-optee-test.git;protocol=https" SRC_URI = "${OPTEE_TEST_SRC};branch=${SRCBRANCH} \ @@ -25,8 +25,6 @@ S = "${WORKDIR}/git" SRCREV = "b7114b828b82f2c0eec124ed424eff1230cc5319" - - do_compile () { if [ ${DEFAULTTUNE} = "aarch64" ];then export TA_DEV_KIT_DIR=${STAGING_INCDIR}/optee/export-user_ta_arm64/ @@ -40,7 +38,7 @@ do_compile () { export CROSS_COMPILE_TA=${HOST_PREFIX} export CROSS_COMPILE=${HOST_PREFIX} export OPTEE_OPENSSL_EXPORT=${STAGING_INCDIR}/ - oe_runmake V=1 + oe_runmake V=1 --warn-undefined-variables } do_install () { -- 2.40.1