optee: update to NXP's lf-6.1.22-2.0.0 release for ccimx93
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera
parent
e97e0b9325
commit
afe30b8a2b
|
|
@ -272,11 +272,11 @@ PREFERRED_VERSION_vulkan-tools:imxvulkan ??= "1.2.182.0"
|
|||
|
||||
# Use i.MX optee Version
|
||||
PREFERRED_VERSION_optee-os:mx8-nxp-bsp ??= "3.19.0.imx"
|
||||
PREFERRED_VERSION_optee-os:mx9-nxp-bsp ??= "3.19.0.imx"
|
||||
PREFERRED_VERSION_optee-os:mx9-nxp-bsp ??= "3.21.0.imx"
|
||||
PREFERRED_VERSION_optee-client:mx8-nxp-bsp ??= "3.19.0.imx"
|
||||
PREFERRED_VERSION_optee-client:mx9-nxp-bsp ??= "3.19.0.imx"
|
||||
PREFERRED_VERSION_optee-client:mx9-nxp-bsp ??= "3.21.0.imx"
|
||||
PREFERRED_VERSION_optee-test:mx8-nxp-bsp ??= "3.19.0.imx"
|
||||
PREFERRED_VERSION_optee-test:mx9-nxp-bsp ??= "3.19.0.imx"
|
||||
PREFERRED_VERSION_optee-test:mx9-nxp-bsp ??= "3.21.0.imx"
|
||||
|
||||
# Machine learning backports from NXP's lf-6.1.1_1.0.0 release
|
||||
PREFERRED_VERSION_deepview-rt:ccimx93 = "2.4.46.1-aarch64"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
[Unit]
|
||||
Description=TEE Supplicant
|
||||
|
||||
[Service]
|
||||
User=root
|
||||
EnvironmentFile=-/etc/default/tee-supplicant
|
||||
ExecStart=/usr/bin/tee-supplicant $OPTARGS
|
||||
|
||||
[Install]
|
||||
WantedBy=basic.target
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
# Copyright (C) 2023 Digi International
|
||||
|
||||
# Use NXP's lf-6.1.1_1.0.0 release for ccimx93
|
||||
SRCBRANCH:ccimx93 = "lf-6.1.1_1.0.0"
|
||||
SRCREV:ccimx93 = "01231b7a7ce03cdf9d3f48e7baa0bce17aac28f7"
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
# Copyright 2023 Digi International Inc.
|
||||
|
||||
#
|
||||
# Reuse meta-freescale's optee-client_3.19.0.imx.bb
|
||||
#
|
||||
require recipes-security/optee-imx/optee-client_3.19.0.imx.bb
|
||||
|
||||
SRCBRANCH = "lf-6.1.22_2.0.0"
|
||||
SRCREV = "8533e0e6329840ee96cf81b6453f257204227e6c"
|
||||
|
||||
# Otherwise optee-client's makefile defaults to use $(CROSS_COMPILE)pkg-config
|
||||
# which is not what Yocto provides.
|
||||
export PKG_CONFIG='pkg-config'
|
||||
|
||||
COMPATIBLE_MACHINE = "(ccimx93)"
|
||||
|
|
@ -9,10 +9,10 @@ Signed-off-by: Javier Viguera <javier.viguera@digi.com>
|
|||
2 files changed, 7 insertions(+)
|
||||
|
||||
diff --git a/core/arch/arm/plat-imx/conf.mk b/core/arch/arm/plat-imx/conf.mk
|
||||
index 433313a925b9..9febafb19fbd 100644
|
||||
index 1d5081f96afe..5e2d0733dd04 100644
|
||||
--- a/core/arch/arm/plat-imx/conf.mk
|
||||
+++ b/core/arch/arm/plat-imx/conf.mk
|
||||
@@ -89,6 +89,7 @@ mx8ulp-flavorlist = \
|
||||
@@ -88,6 +88,7 @@ mx8ulp-flavorlist = \
|
||||
mx8ulpevk \
|
||||
|
||||
mx93-flavorlist = \
|
||||
|
|
@ -20,7 +20,7 @@ index 433313a925b9..9febafb19fbd 100644
|
|||
mx93evk \
|
||||
|
||||
ifneq (,$(filter $(PLATFORM_FLAVOR),$(mx6ul-flavorlist)))
|
||||
@@ -457,6 +458,11 @@ CFG_DDR_SIZE ?= 0x80000000
|
||||
@@ -449,6 +450,11 @@ CFG_DDR_SIZE ?= 0x80000000
|
||||
CFG_UART_BASE ?= UART1_BASE
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,30 @@
|
|||
From db9e44af75c7cfd3316cab15aaa387383df3e57e Mon Sep 17 00:00:00 2001
|
||||
From: Brett Warren <brett.warren@arm.com>
|
||||
Date: Wed, 23 Sep 2020 09:27:34 +0100
|
||||
Subject: [PATCH] optee: enable clang support
|
||||
|
||||
When compiling with clang, the LIBGCC_LOCATE_CFLAG variable used
|
||||
to provide a sysroot wasn't included, which results in not locating
|
||||
compiler-rt. This is mitigated by including the variable as ammended.
|
||||
|
||||
Upstream-Status: Pending
|
||||
ChangeId: 8ba69a4b2eb8ebaa047cb266c9aa6c2c3da45701
|
||||
Signed-off-by: Brett Warren <brett.warren@arm.com>
|
||||
|
||||
---
|
||||
mk/clang.mk | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/mk/clang.mk b/mk/clang.mk
|
||||
index c141a3f2..7d067cc0 100644
|
||||
--- a/mk/clang.mk
|
||||
+++ b/mk/clang.mk
|
||||
@@ -27,7 +27,7 @@ comp-cflags-warns-clang := -Wno-language-extension-token \
|
||||
|
||||
# Note, use the compiler runtime library (libclang_rt.builtins.*.a) instead of
|
||||
# libgcc for clang
|
||||
-libgcc$(sm) := $(shell $(CC$(sm)) $(CFLAGS$(arch-bits-$(sm))) \
|
||||
+libgcc$(sm) := $(shell $(CC$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CFLAGS$(arch-bits-$(sm))) \
|
||||
-rtlib=compiler-rt -print-libgcc-file-name 2> /dev/null)
|
||||
|
||||
# Core ASLR relies on the executable being ready to run from its preferred load
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
# Copyright (C) 2023 Digi International
|
||||
|
||||
FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
|
||||
|
||||
# Use NXP's lf-6.1.1_1.0.0 release for ccimx93
|
||||
SRC_URI:append:ccimx93 = " file://0001-core-imx-support-ccimx93-dvk.patch"
|
||||
SRCBRANCH:ccimx93 = "lf-6.1.1_1.0.0"
|
||||
SRCREV:ccimx93 = "ad4e8389bb2c38efe39853925eec571ac778c575"
|
||||
|
||||
PLATFORM_FLAVOR:ccimx93 = "ccimx93dvk"
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
# Copyright 2023 Digi International Inc.
|
||||
|
||||
#
|
||||
# Reuse meta-freescale's optee-os_3.19.0.imx.bb
|
||||
#
|
||||
require recipes-security/optee-imx/optee-os_3.19.0.imx.bb
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/nxp-imx/imx-optee-os.git;protocol=https;branch=${SRCBRANCH} \
|
||||
file://0007-allow-setting-sysroot-for-clang.patch \
|
||||
file://0001-core-imx-support-ccimx93-dvk.patch \
|
||||
"
|
||||
SRCBRANCH = "lf-6.1.22_2.0.0"
|
||||
SRCREV = "1962aec9581760803b1485d455cd62cb11c14870"
|
||||
|
||||
PLATFORM_FLAVOR:ccimx93 = "ccimx93dvk"
|
||||
|
||||
COMPATIBLE_MACHINE = "(ccimx93)"
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
# Copyright (C) 2023 Digi International
|
||||
|
||||
# Use NXP's lf-6.1.1_1.0.0 release for ccimx93
|
||||
SRCBRANCH:ccimx93 = "lf-6.1.1_1.0.0"
|
||||
SRCREV:ccimx93 = "7c314e6a0cec0ba19246eb4f1959859d7a6536d6"
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
# Copyright 2023 Digi International Inc.
|
||||
|
||||
#
|
||||
# Reuse meta-freescale's optee-test_3.19.0.imx.bb
|
||||
#
|
||||
require recipes-security/optee-imx/optee-test_3.19.0.imx.bb
|
||||
|
||||
SRCBRANCH = "lf-6.1.22_2.0.0"
|
||||
SRCREV = "c2c9f922044d2c8a7ab384812bb124c6da2b7888"
|
||||
|
||||
COMPATIBLE_MACHINE = "(ccimx93)"
|
||||
Loading…
Reference in New Issue