Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

optee: update to NXP's lf-6.1.55-2.2.0 release for ccimx93 

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2024-01-02 17:10:19 +01:00
parent 4566b10751
commit e4d089a6ab
7 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta-digi-arm/conf/machine/include/imx-digi-base.inc
View File

@ -272,11 +272,11 @@ PREFERRED_VERSION_vulkan-tools:imxvulkan ??= "1.2.182.0"
# Use i.MX optee Version # Use i.MX optee Version
PREFERRED_VERSION_optee-os:mx8-nxp-bsp ??= "3.19.0.imx" PREFERRED_VERSION_optee-os:mx8-nxp-bsp ??= "3.19.0.imx"
PREFERRED_VERSION_optee-os:mx9-nxp-bsp ??= "3.21.0.imx" PREFERRED_VERSION_optee-os:mx9-nxp-bsp ??= "4.0.0.imx"
PREFERRED_VERSION_optee-client:mx8-nxp-bsp ??= "3.19.0.imx" PREFERRED_VERSION_optee-client:mx8-nxp-bsp ??= "3.19.0.imx"
PREFERRED_VERSION_optee-client:mx9-nxp-bsp ??= "3.21.0.imx" PREFERRED_VERSION_optee-client:mx9-nxp-bsp ??= "4.0.0.imx"
PREFERRED_VERSION_optee-test:mx8-nxp-bsp ??= "3.19.0.imx" PREFERRED_VERSION_optee-test:mx8-nxp-bsp ??= "3.19.0.imx"
PREFERRED_VERSION_optee-test:mx9-nxp-bsp ??= "3.21.0.imx" PREFERRED_VERSION_optee-test:mx9-nxp-bsp ??= "4.0.0.imx"
# Machine learning backports from NXP's lf-6.1.36-2.1.0 release # Machine learning backports from NXP's lf-6.1.36-2.1.0 release
PREFERRED_VERSION_ethos-u-vela:ccimx93 = "3.8.0" PREFERRED_VERSION_ethos-u-vela:ccimx93 = "3.8.0"

5
meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-client/tee-supplicant.service
View File

@ -3,9 +3,8 @@ Description=TEE Supplicant
[Service] [Service]
User=root User=root
EnvironmentFile=-/etc/default/tee-supplicant EnvironmentFile=-@sysconfdir@/default/tee-supplicant
ExecStart=/usr/bin/tee-supplicant $OPTARGS ExecStart=@sbindir@/tee-supplicant $OPTARGS
[Install] [Install]
WantedBy=basic.target WantedBy=basic.target

15
meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-client_3.21.0.imx.bb
View File

@ -1,15 +0,0 @@
# 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)"

13
meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-client_4.0.0.imx.bb Normal file
View File

@ -0,0 +1,13 @@
# 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.55_2.2.0"
SRCREV = "acb0885c117e73cb6c5c9b1dd9054cb3f93507ee"
EXTRA_OEMAKE += "PKG_CONFIG=pkg-config"
COMPATIBLE_MACHINE = "(ccimx93)"

12
meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os/0001-core-imx-support-ccimx93-dvk.patch
View File

@ -9,7 +9,7 @@ Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2 files changed, 7 insertions(+) 2 files changed, 7 insertions(+)
diff --git a/core/arch/arm/plat-imx/conf.mk b/core/arch/arm/plat-imx/conf.mk diff --git a/core/arch/arm/plat-imx/conf.mk b/core/arch/arm/plat-imx/conf.mk
index 1d5081f96afe..5e2d0733dd04 100644 index 0bd9ccd6bef1..4fa61d5c2619 100644
--- a/core/arch/arm/plat-imx/conf.mk --- a/core/arch/arm/plat-imx/conf.mk
+++ b/core/arch/arm/plat-imx/conf.mk +++ b/core/arch/arm/plat-imx/conf.mk
@@ -88,6 +88,7 @@ mx8ulp-flavorlist = \ @@ -88,6 +88,7 @@ mx8ulp-flavorlist = \
@ -20,7 +20,7 @@ index 1d5081f96afe..5e2d0733dd04 100644
mx93evk \ mx93evk \
ifneq (,$(filter $(PLATFORM_FLAVOR),$(mx6ul-flavorlist))) ifneq (,$(filter $(PLATFORM_FLAVOR),$(mx6ul-flavorlist)))
@@ -449,6 +450,11 @@ CFG_DDR_SIZE ?= 0x80000000 @@ -451,6 +452,11 @@ CFG_DDR_SIZE ?= 0x80000000
CFG_UART_BASE ?= UART1_BASE CFG_UART_BASE ?= UART1_BASE
endif endif
@ -33,7 +33,7 @@ index 1d5081f96afe..5e2d0733dd04 100644
ifeq ($(filter y, $(CFG_MX6QP) $(CFG_MX6Q) $(CFG_MX6D) $(CFG_MX6DL) $(CFG_MX6S) \ ifeq ($(filter y, $(CFG_MX6QP) $(CFG_MX6Q) $(CFG_MX6D) $(CFG_MX6DL) $(CFG_MX6S) \
$(CFG_MX6SL) $(CFG_MX6SLL) $(CFG_MX6SX)), y) $(CFG_MX6SL) $(CFG_MX6SLL) $(CFG_MX6SX)), y)
diff --git a/core/arch/arm/plat-imx/registers/imx93.h b/core/arch/arm/plat-imx/registers/imx93.h diff --git a/core/arch/arm/plat-imx/registers/imx93.h b/core/arch/arm/plat-imx/registers/imx93.h
index e91607537380..66a6408109c2 100644 index 21080da82d04..17f4d8f5755e 100644
--- a/core/arch/arm/plat-imx/registers/imx93.h --- a/core/arch/arm/plat-imx/registers/imx93.h
+++ b/core/arch/arm/plat-imx/registers/imx93.h +++ b/core/arch/arm/plat-imx/registers/imx93.h
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
@ -41,6 +41,6 @@ index e91607537380..66a6408109c2 100644
#define UART1_BASE 0x44380000 #define UART1_BASE 0x44380000
+#define UART6_BASE 0x425a0000 +#define UART6_BASE 0x425a0000
#define MU_BASE 0x47520000 /*
#define MU_SIZE 0x10000 * For Normal MU - Use MU_BASE as 0x47520000
* For Trust MU - Use MU_BASE as 0x47530000

6
meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os_3.21.0.imx.bb → meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os_4.0.0.imx.bb
View File

@ -10,9 +10,9 @@ SRC_URI = " \
file://0007-allow-setting-sysroot-for-clang.patch \ file://0007-allow-setting-sysroot-for-clang.patch \
file://0001-core-imx-support-ccimx93-dvk.patch \ file://0001-core-imx-support-ccimx93-dvk.patch \
" "
SRCBRANCH = "lf-6.1.36_2.1.0" SRCBRANCH = "lf-6.1.55_2.2.0"
# Tag: lf-6.1.36-2.1.0 # Tag: lf-6.1.55-2.2.0
SRCREV = "4e32281904b15af9ddbdf00f73e1c08eae21c695" SRCREV = "a303fc80f7c4bd713315687a1fa1d6ed136e78ee"
PLATFORM_FLAVOR:ccimx93 = "ccimx93dvk" PLATFORM_FLAVOR:ccimx93 = "ccimx93dvk"

6
meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-test_3.21.0.imx.bb → meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-test_4.0.0.imx.bb
View File

@ -5,7 +5,9 @@
# #
require recipes-security/optee-imx/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" DEPENDS += "openssl"
SRCREV = "c2c9f922044d2c8a7ab384812bb124c6da2b7888"
SRCBRANCH = "lf-6.1.55_2.2.0"
SRCREV = "38efacef3b14b32a6792ceaebe211b5718536fbb"
COMPATIBLE_MACHINE = "(ccimx93)" COMPATIBLE_MACHINE = "(ccimx93)"