From d537a75cfc8341d82ec23155ad0ba2f768c4f129 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 12 May 2022 17:29:02 -0500 Subject: optee-os: Upgrade to NXP 5.15.5-1.0.0 - Drop patch 0001-arm-imx-fix-RPMB-header-include.patch that is now upstream - Update platform list - Fix hard-coded /usr/include with includedir variable Signed-off-by: Tom Hochstein (cherry picked from commit 5956fb99eb99866425f163c7083dc3a28c87e0f8) --- .../0001-arm-imx-fix-RPMB-header-include.patch | 29 ---------------------- recipes-security/optee-imx/optee-os_3.15.0.imx.bb | 14 +++++------ 2 files changed, 7 insertions(+), 36 deletions(-) delete mode 100644 recipes-security/optee-imx/optee-os/0001-arm-imx-fix-RPMB-header-include.patch (limited to 'recipes-security/optee-imx') diff --git a/recipes-security/optee-imx/optee-os/0001-arm-imx-fix-RPMB-header-include.patch b/recipes-security/optee-imx/optee-os/0001-arm-imx-fix-RPMB-header-include.patch deleted file mode 100644 index 469802e8..00000000 --- a/recipes-security/optee-imx/optee-os/0001-arm-imx-fix-RPMB-header-include.patch +++ /dev/null @@ -1,29 +0,0 @@ -From d965393256e32a93dae41765543523598fca5d00 Mon Sep 17 00:00:00 2001 -From: Clement Faure -Date: Mon, 7 Mar 2022 10:21:04 -0600 -Subject: [PATCH] arm: imx: fix RPMB header include - -Replace by - -Upstream-Status: Backport from NXP 5.15.5-1.0.0 -Signed-off-by: Clement Faure ---- - core/arch/arm/plat-imx/imx_rpmb.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/core/arch/arm/plat-imx/imx_rpmb.c b/core/arch/arm/plat-imx/imx_rpmb.c -index 9f0eb384d..2dd41105e 100644 ---- a/core/arch/arm/plat-imx/imx_rpmb.c -+++ b/core/arch/arm/plat-imx/imx_rpmb.c -@@ -2,7 +2,7 @@ - /* - * Copyright 2020 Pengutronix, Rouven Czerwinski - */ --#include -+#include - #include - #include - --- -2.17.1 - diff --git a/recipes-security/optee-imx/optee-os_3.15.0.imx.bb b/recipes-security/optee-imx/optee-os_3.15.0.imx.bb index 3fca3dbf..15244c45 100644 --- a/recipes-security/optee-imx/optee-os_3.15.0.imx.bb +++ b/recipes-security/optee-imx/optee-os_3.15.0.imx.bb @@ -8,13 +8,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c1f21c4f72f372ef38a5a4aee55ec173" DEPENDS = "python3-pycryptodomex-native python3-pyelftools-native u-boot-mkimage-native" -SRCBRANCH = "lf-5.10.72_2.2.0" -SRC_URI = "\ - git://source.codeaurora.org/external/imx/imx-optee-os.git;protocol=https;branch=${SRCBRANCH} \ - file://0001-arm-imx-fix-RPMB-header-include.patch \ -" +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 = "c939619d64dea014ad1b8382356eee4d1cbfbb22" +SRCREV = "807629a0889ad5e888f1fd187932ab7f701ddf8c" S = "${WORKDIR}/git" @@ -34,11 +31,14 @@ PLATFORM_FLAVOR:imx6ulz = "mx6ulzevk" PLATFORM_FLAVOR:mx8mq-nxp-bsp = "mx8mqevk" PLATFORM_FLAVOR:mx8mm-nxp-bsp = "mx8mmevk" PLATFORM_FLAVOR:mx8mn-nxp-bsp = "mx8mnevk" +PLATFORM_FLAVOR:mx8mnul-nxp-bsp = "mx8mnevk" PLATFORM_FLAVOR:mx8mp-nxp-bsp = "mx8mpevk" +PLATFORM_FLAVOR:mx8mpul-nxp-bsp = "mx8mpevk" PLATFORM_FLAVOR:mx8qm-nxp-bsp = "mx8qmmek" PLATFORM_FLAVOR:mx8qxp-nxp-bsp = "mx8qxpmek" PLATFORM_FLAVOR:mx8dx-nxp-bsp = "mx8dxmek" PLATFORM_FLAVOR:mx8dxl-nxp-bsp = "mx8dxlevk" +PLATFORM_FLAVOR:mx8ulp-nxp-bsp = "mx8ulpevk" OPTEE_ARCH ?= "arm32" OPTEE_ARCH:armv7a = "arm32" @@ -97,7 +97,7 @@ addtask deploy after do_compile before do_install FILES:${PN} = "${nonarch_base_libdir}/firmware/ ${nonarch_base_libdir}/optee_armtz/" -FILES:${PN}-staticdev = "/usr/include/optee/" +FILES:${PN}-staticdev = "${includedir}/optee/" RDEPENDS:${PN}-dev += "${PN}-staticdev" PACKAGE_ARCH = "${MACHINE_ARCH}" -- cgit v1.2.3-54-g00ecf