diff options
4 files changed, 12 insertions, 45 deletions
diff --git a/recipes-security/optee-imx/optee-client_3.15.0.imx.bb b/recipes-security/optee-imx/optee-client_3.15.0.imx.bb index 6e8f1e54..53ee5bc4 100644 --- a/recipes-security/optee-imx/optee-client_3.15.0.imx.bb +++ b/recipes-security/optee-imx/optee-client_3.15.0.imx.bb | |||
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.optee.org/" | |||
5 | LICENSE = "BSD-2-Clause" | 5 | LICENSE = "BSD-2-Clause" |
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=69663ab153298557a59c67a60a743e5b" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=69663ab153298557a59c67a60a743e5b" |
7 | 7 | ||
8 | SRCBRANCH = "lf-5.10.72_2.2.0" | 8 | SRCBRANCH = "lf-5.15.5_1.0.0" |
9 | SRC_URI = " \ | 9 | SRC_URI = " \ |
10 | git://source.codeaurora.org/external/imx/imx-optee-client.git;protocol=https;branch=${SRCBRANCH} \ | 10 | git://source.codeaurora.org/external/imx/imx-optee-client.git;protocol=https;branch=${SRCBRANCH} \ |
11 | file://tee-supplicant.service \ | 11 | file://tee-supplicant.service \ |
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 @@ | |||
1 | From d965393256e32a93dae41765543523598fca5d00 Mon Sep 17 00:00:00 2001 | ||
2 | From: Clement Faure <clement.faure@nxp.com> | ||
3 | Date: Mon, 7 Mar 2022 10:21:04 -0600 | ||
4 | Subject: [PATCH] arm: imx: fix RPMB header include | ||
5 | |||
6 | Replace <drivers/imx_snvs.h> by <drivers/nxp_snvs.h> | ||
7 | |||
8 | Upstream-Status: Backport from NXP 5.15.5-1.0.0 | ||
9 | Signed-off-by: Clement Faure <clement.faure@nxp.com> | ||
10 | --- | ||
11 | core/arch/arm/plat-imx/imx_rpmb.c | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/core/arch/arm/plat-imx/imx_rpmb.c b/core/arch/arm/plat-imx/imx_rpmb.c | ||
15 | index 9f0eb384d..2dd41105e 100644 | ||
16 | --- a/core/arch/arm/plat-imx/imx_rpmb.c | ||
17 | +++ b/core/arch/arm/plat-imx/imx_rpmb.c | ||
18 | @@ -2,7 +2,7 @@ | ||
19 | /* | ||
20 | * Copyright 2020 Pengutronix, Rouven Czerwinski <entwicklung@pengutronix.de> | ||
21 | */ | ||
22 | -#include <drivers/imx_snvs.h> | ||
23 | +#include <drivers/nxp_snvs.h> | ||
24 | #include <imx.h> | ||
25 | #include <tee/tee_fs.h> | ||
26 | |||
27 | -- | ||
28 | 2.17.1 | ||
29 | |||
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" | |||
8 | 8 | ||
9 | DEPENDS = "python3-pycryptodomex-native python3-pyelftools-native u-boot-mkimage-native" | 9 | DEPENDS = "python3-pycryptodomex-native python3-pyelftools-native u-boot-mkimage-native" |
10 | 10 | ||
11 | SRCBRANCH = "lf-5.10.72_2.2.0" | 11 | SRCBRANCH = "lf-5.15.5_1.0.0" |
12 | SRC_URI = "\ | 12 | SRC_URI = "git://source.codeaurora.org/external/imx/imx-optee-os.git;protocol=https;branch=${SRCBRANCH}" |
13 | git://source.codeaurora.org/external/imx/imx-optee-os.git;protocol=https;branch=${SRCBRANCH} \ | ||
14 | file://0001-arm-imx-fix-RPMB-header-include.patch \ | ||
15 | " | ||
16 | 13 | ||
17 | SRCREV = "c939619d64dea014ad1b8382356eee4d1cbfbb22" | 14 | SRCREV = "807629a0889ad5e888f1fd187932ab7f701ddf8c" |
18 | 15 | ||
19 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
20 | 17 | ||
@@ -34,11 +31,14 @@ PLATFORM_FLAVOR:imx6ulz = "mx6ulzevk" | |||
34 | PLATFORM_FLAVOR:mx8mq-nxp-bsp = "mx8mqevk" | 31 | PLATFORM_FLAVOR:mx8mq-nxp-bsp = "mx8mqevk" |
35 | PLATFORM_FLAVOR:mx8mm-nxp-bsp = "mx8mmevk" | 32 | PLATFORM_FLAVOR:mx8mm-nxp-bsp = "mx8mmevk" |
36 | PLATFORM_FLAVOR:mx8mn-nxp-bsp = "mx8mnevk" | 33 | PLATFORM_FLAVOR:mx8mn-nxp-bsp = "mx8mnevk" |
34 | PLATFORM_FLAVOR:mx8mnul-nxp-bsp = "mx8mnevk" | ||
37 | PLATFORM_FLAVOR:mx8mp-nxp-bsp = "mx8mpevk" | 35 | PLATFORM_FLAVOR:mx8mp-nxp-bsp = "mx8mpevk" |
36 | PLATFORM_FLAVOR:mx8mpul-nxp-bsp = "mx8mpevk" | ||
38 | PLATFORM_FLAVOR:mx8qm-nxp-bsp = "mx8qmmek" | 37 | PLATFORM_FLAVOR:mx8qm-nxp-bsp = "mx8qmmek" |
39 | PLATFORM_FLAVOR:mx8qxp-nxp-bsp = "mx8qxpmek" | 38 | PLATFORM_FLAVOR:mx8qxp-nxp-bsp = "mx8qxpmek" |
40 | PLATFORM_FLAVOR:mx8dx-nxp-bsp = "mx8dxmek" | 39 | PLATFORM_FLAVOR:mx8dx-nxp-bsp = "mx8dxmek" |
41 | PLATFORM_FLAVOR:mx8dxl-nxp-bsp = "mx8dxlevk" | 40 | PLATFORM_FLAVOR:mx8dxl-nxp-bsp = "mx8dxlevk" |
41 | PLATFORM_FLAVOR:mx8ulp-nxp-bsp = "mx8ulpevk" | ||
42 | 42 | ||
43 | OPTEE_ARCH ?= "arm32" | 43 | OPTEE_ARCH ?= "arm32" |
44 | OPTEE_ARCH:armv7a = "arm32" | 44 | OPTEE_ARCH:armv7a = "arm32" |
@@ -97,7 +97,7 @@ addtask deploy after do_compile before do_install | |||
97 | 97 | ||
98 | 98 | ||
99 | FILES:${PN} = "${nonarch_base_libdir}/firmware/ ${nonarch_base_libdir}/optee_armtz/" | 99 | FILES:${PN} = "${nonarch_base_libdir}/firmware/ ${nonarch_base_libdir}/optee_armtz/" |
100 | FILES:${PN}-staticdev = "/usr/include/optee/" | 100 | FILES:${PN}-staticdev = "${includedir}/optee/" |
101 | RDEPENDS:${PN}-dev += "${PN}-staticdev" | 101 | RDEPENDS:${PN}-dev += "${PN}-staticdev" |
102 | 102 | ||
103 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 103 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
diff --git a/recipes-security/optee-imx/optee-test_3.15.0.imx.bb b/recipes-security/optee-imx/optee-test_3.15.0.imx.bb index 1d6de243..a44454a7 100644 --- a/recipes-security/optee-imx/optee-test_3.15.0.imx.bb +++ b/recipes-security/optee-imx/optee-test_3.15.0.imx.bb | |||
@@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa" | |||
8 | 8 | ||
9 | DEPENDS = "python3-pycryptodome-native python3-pycryptodomex-native optee-os optee-client openssl" | 9 | DEPENDS = "python3-pycryptodome-native python3-pycryptodomex-native optee-os optee-client openssl" |
10 | 10 | ||
11 | SRCBRANCH = "lf-5.10.72_2.2.0" | 11 | SRCBRANCH = "lf-5.15.5_1.0.0" |
12 | 12 | ||
13 | SRC_URI = "git://source.codeaurora.org/external/imx/imx-optee-test.git;protocol=https;branch=${SRCBRANCH}" | 13 | SRC_URI = "git://source.codeaurora.org/external/imx/imx-optee-test.git;protocol=https;branch=${SRCBRANCH}" |
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | B = "${WORKDIR}/build" | 16 | B = "${WORKDIR}/build" |
17 | 17 | ||
18 | SRCREV = "4d81b964a72e89a62d04187b3f055d8346b383c9" | 18 | SRCREV = "e9d8bf6ee121d6686e6e409c727caee76496bb86" |
19 | 19 | ||
20 | inherit python3native features_check | 20 | inherit python3native features_check |
21 | 21 | ||
@@ -34,7 +34,7 @@ CXXFLAGS += "--sysroot=${STAGING_DIR_HOST}" | |||
34 | EXTRA_OEMAKE = " \ | 34 | EXTRA_OEMAKE = " \ |
35 | TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \ | 35 | TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \ |
36 | ARCH=${OPTEE_ARCH} \ | 36 | ARCH=${OPTEE_ARCH} \ |
37 | OPTEE_CLIENT_EXPORT=${STAGING_DIR_HOST}/usr \ | 37 | OPTEE_CLIENT_EXPORT=${STAGING_DIR_HOST}${exec_prefix} \ |
38 | CROSS_COMPILE_HOST=${HOST_PREFIX} \ | 38 | CROSS_COMPILE_HOST=${HOST_PREFIX} \ |
39 | CROSS_COMPILE_TA=${HOST_PREFIX} \ | 39 | CROSS_COMPILE_TA=${HOST_PREFIX} \ |
40 | CROSS_COMPILE=${HOST_PREFIX} \ | 40 | CROSS_COMPILE=${HOST_PREFIX} \ |
@@ -42,11 +42,7 @@ EXTRA_OEMAKE = " \ | |||
42 | " | 42 | " |
43 | 43 | ||
44 | do_compile() { | 44 | do_compile() { |
45 | cd ${S} | 45 | oe_runmake all |
46 | # Top level makefile doesn't seem to handle parallel make gracefully | ||
47 | oe_runmake xtest | ||
48 | oe_runmake ta | ||
49 | oe_runmake test_plugin | ||
50 | } | 46 | } |
51 | do_compile[cleandirs] = "${B}" | 47 | do_compile[cleandirs] = "${B}" |
52 | 48 | ||