From e4d089a6ab18f89c049db4911e11bef7411e7a19 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Tue, 2 Jan 2024 17:10:19 +0100 Subject: [PATCH] optee: update to NXP's lf-6.1.55-2.2.0 release for ccimx93 Signed-off-by: Javier Viguera --- .../conf/machine/include/imx-digi-base.inc | 6 +++--- .../optee-imx/optee-client/tee-supplicant.service | 5 ++--- .../optee-imx/optee-client_3.21.0.imx.bb | 15 --------------- .../optee-imx/optee-client_4.0.0.imx.bb | 13 +++++++++++++ .../0001-core-imx-support-ccimx93-dvk.patch | 12 ++++++------ ...tee-os_3.21.0.imx.bb => optee-os_4.0.0.imx.bb} | 6 +++--- ...test_3.21.0.imx.bb => optee-test_4.0.0.imx.bb} | 6 ++++-- 7 files changed, 31 insertions(+), 32 deletions(-) delete mode 100644 meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-client_3.21.0.imx.bb create mode 100644 meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-client_4.0.0.imx.bb rename meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/{optee-os_3.21.0.imx.bb => optee-os_4.0.0.imx.bb} (80%) rename meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/{optee-test_3.21.0.imx.bb => optee-test_4.0.0.imx.bb} (64%) diff --git a/meta-digi-arm/conf/machine/include/imx-digi-base.inc b/meta-digi-arm/conf/machine/include/imx-digi-base.inc index a887b222a..b3946d897 100644 --- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc +++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc @@ -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.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: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: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 PREFERRED_VERSION_ethos-u-vela:ccimx93 = "3.8.0" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-client/tee-supplicant.service b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-client/tee-supplicant.service index 0e2b4f6ba..c273832d7 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-client/tee-supplicant.service +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-client/tee-supplicant.service @@ -3,9 +3,8 @@ Description=TEE Supplicant [Service] User=root -EnvironmentFile=-/etc/default/tee-supplicant -ExecStart=/usr/bin/tee-supplicant $OPTARGS +EnvironmentFile=-@sysconfdir@/default/tee-supplicant +ExecStart=@sbindir@/tee-supplicant $OPTARGS [Install] WantedBy=basic.target - diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-client_3.21.0.imx.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-client_3.21.0.imx.bb deleted file mode 100644 index 882b390cd..000000000 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-client_3.21.0.imx.bb +++ /dev/null @@ -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)" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-client_4.0.0.imx.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-client_4.0.0.imx.bb new file mode 100644 index 000000000..32d91245c --- /dev/null +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-client_4.0.0.imx.bb @@ -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)" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os/0001-core-imx-support-ccimx93-dvk.patch b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os/0001-core-imx-support-ccimx93-dvk.patch index ed58a2f7b..6a9056b00 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os/0001-core-imx-support-ccimx93-dvk.patch +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os/0001-core-imx-support-ccimx93-dvk.patch @@ -9,7 +9,7 @@ Signed-off-by: Javier Viguera 2 files changed, 7 insertions(+) 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 +++ b/core/arch/arm/plat-imx/conf.mk @@ -88,6 +88,7 @@ mx8ulp-flavorlist = \ @@ -20,7 +20,7 @@ index 1d5081f96afe..5e2d0733dd04 100644 mx93evk \ 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 endif @@ -33,7 +33,7 @@ index 1d5081f96afe..5e2d0733dd04 100644 ifeq ($(filter y, $(CFG_MX6QP) $(CFG_MX6Q) $(CFG_MX6D) $(CFG_MX6DL) $(CFG_MX6S) \ $(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 -index e91607537380..66a6408109c2 100644 +index 21080da82d04..17f4d8f5755e 100644 --- a/core/arch/arm/plat-imx/registers/imx93.h +++ b/core/arch/arm/plat-imx/registers/imx93.h @@ -9,6 +9,7 @@ @@ -41,6 +41,6 @@ index e91607537380..66a6408109c2 100644 #define UART1_BASE 0x44380000 +#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 diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os_3.21.0.imx.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os_4.0.0.imx.bb similarity index 80% rename from meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os_3.21.0.imx.bb rename to meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os_4.0.0.imx.bb index 032a74b5e..75d81e0d0 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os_3.21.0.imx.bb +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os_4.0.0.imx.bb @@ -10,9 +10,9 @@ SRC_URI = " \ file://0007-allow-setting-sysroot-for-clang.patch \ file://0001-core-imx-support-ccimx93-dvk.patch \ " -SRCBRANCH = "lf-6.1.36_2.1.0" -# Tag: lf-6.1.36-2.1.0 -SRCREV = "4e32281904b15af9ddbdf00f73e1c08eae21c695" +SRCBRANCH = "lf-6.1.55_2.2.0" +# Tag: lf-6.1.55-2.2.0 +SRCREV = "a303fc80f7c4bd713315687a1fa1d6ed136e78ee" PLATFORM_FLAVOR:ccimx93 = "ccimx93dvk" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-test_3.21.0.imx.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-test_4.0.0.imx.bb similarity index 64% rename from meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-test_3.21.0.imx.bb rename to meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-test_4.0.0.imx.bb index 916da297c..515dc1743 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-test_3.21.0.imx.bb +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-test_4.0.0.imx.bb @@ -5,7 +5,9 @@ # require recipes-security/optee-imx/optee-test_3.19.0.imx.bb -SRCBRANCH = "lf-6.1.22_2.0.0" -SRCREV = "c2c9f922044d2c8a7ab384812bb124c6da2b7888" +DEPENDS += "openssl" + +SRCBRANCH = "lf-6.1.55_2.2.0" +SRCREV = "38efacef3b14b32a6792ceaebe211b5718536fbb" COMPATIBLE_MACHINE = "(ccimx93)"