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

imx-boot: update input artifacts for ccimx91/93 

Update recipes to NXP's lf-6.6.36-2.1.0 release and refresh patches on
top of that version.

https://onedigi.atlassian.net/browse/DEL-9257
https://onedigi.atlassian.net/browse/DEL-9258

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2024-10-22 15:48:30 +02:00
parent 373f061650
commit 9b43e64332
16 changed files with 69 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-ele-imx_%.bbappend
View File

@ -2,10 +2,10 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
# Forward-port the i.MX93 A0 fw from v0.1.0
SRC_URI:append:ccimx93 = " \
file://mx93a0-ahab-container.img \
"
do_install:prepend:ccimx93() {
# Copy our A0 firmware file to where the other firmware files are
cp ${WORKDIR}/${SECO_FIRMWARE_NAME} ${S}
SRC_URI:append:ccimx93 = " file://mx93a0-ahab-container.img"
UNPACK_POSTFUNC = ""
UNPACK_POSTFUNC:ccimx93 = "copy_ele_a0_fw"
copy_ele_a0_fw() {
cp -f ${WORKDIR}/mx93a0-ahab-container.img ${S}
}
do_unpack[postfuncs] += "${UNPACK_POSTFUNC}"

2
meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0001-ccimx91-use-UART6-for-the-default-console.patch
View File

@ -2,6 +2,8 @@ From: Javier Viguera <javier.viguera@digi.com>
Date: Mon, 19 Aug 2024 16:50:20 +0200
Subject: [PATCH] ccimx91: use UART6 for the default console
Upstream-Status: Inappropriate [DEY specific]
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
plat/imx/imx91/include/platform_def.h | 2 +-

2
meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0001-ccimx93-use-UART6-for-the-default-console.patch
View File

@ -10,7 +10,7 @@ Signed-off-by: Javier Viguera <javier.viguera@digi.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plat/imx/imx93/include/platform_def.h b/plat/imx/imx93/include/platform_def.h
index 2d140400d..cb5b6eba0 100644
index 2d140400d97e..cb5b6eba061c 100644
--- a/plat/imx/imx93/include/platform_def.h
+++ b/plat/imx/imx93/include/platform_def.h
@@ -53,7 +53,7 @@

8
meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0002-imx93-bring-back-ELE-clock-workaround-for-soc-revisi.patch
View File

@ -14,10 +14,10 @@ Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2 files changed, 14 insertions(+)
diff --git a/plat/imx/imx93/imx93_psci.c b/plat/imx/imx93/imx93_psci.c
index 68eb49cc2..cc482a17d 100644
index ccd82d1d2bdc..325fcf75911a 100644
--- a/plat/imx/imx93/imx93_psci.c
+++ b/plat/imx/imx93/imx93_psci.c
@@ -739,6 +739,11 @@ void imx_pwr_domain_suspend(const psci_power_state_t *target_state)
@@ -747,6 +747,11 @@ void imx_pwr_domain_suspend(const psci_power_state_t *target_state)
if (is_local_state_retn(CLUSTER_PWR_STATE(target_state))) {
write_clusterpwrdn(DSU_CLUSTER_PWR_OFF | BIT(1));
}
@ -29,7 +29,7 @@ index 68eb49cc2..cc482a17d 100644
}
if (is_local_state_retn(SYSTEM_PWR_STATE(target_state))) {
@@ -870,6 +875,11 @@ void imx_pwr_domain_suspend_finish(const psci_power_state_t *target_state)
@@ -878,6 +883,11 @@ void imx_pwr_domain_suspend_finish(const psci_power_state_t *target_state)
if (!is_local_state_run(CLUSTER_PWR_STATE(target_state))) {
/* set the cluster's target mode to RUN */
gpc_set_cpu_mode(CPU_A55_PLAT, CM_MODE_RUN);
@ -42,7 +42,7 @@ index 68eb49cc2..cc482a17d 100644
/* do core level */
diff --git a/plat/imx/imx93/platform.mk b/plat/imx/imx93/platform.mk
index a43d3c4f5..d69f7e2de 100644
index a43d3c4f5a9f..d69f7e2de058 100644
--- a/plat/imx/imx93/platform.mk
+++ b/plat/imx/imx93/platform.mk
@@ -61,3 +61,7 @@ BL32_BASE ?= 0x96000000

18
meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/files/0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch
View File

@ -1,4 +1,3 @@
From 3e0f78a4efeac4ea0651ac763099d780447a18b4 Mon Sep 17 00:00:00 2001
From: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
Date: Wed, 19 Jul 2023 18:34:32 +0300
Subject: [PATCH] iMX8M: soc.mak: use native mkimage from sysroot
@ -18,14 +17,13 @@ Reinjected the original patch from Andrey Zhizhikin <andrey.z@gmail.com>
Upstream-Status: Inappropriate [OE-specific]
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
---
iMX8M/soc.mak | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
Index: git/iMX8M/soc.mak
===================================================================
--- git.orig/iMX8M/soc.mak
+++ git/iMX8M/soc.mak
diff --git a/iMX8M/soc.mak b/iMX8M/soc.mak
index e7c762b748a1..f1b37a4f425a 100644
--- a/iMX8M/soc.mak
+++ b/iMX8M/soc.mak
@@ -160,7 +160,7 @@ u-boot.itb: $(dtb) $(supp_dtbs)
./$(PAD_IMAGE) bl31.bin
./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb) $(supp_dtbs)
@ -35,7 +33,7 @@ Index: git/iMX8M/soc.mak
@rm -f u-boot.its $(dtb)
dtb_ddr3l = valddr3l.dtb
@@ -172,7 +172,7 @@ u-boot-ddr3l.itb: $(dtb_ddr3l) $(supp_dt
@@ -172,7 +172,7 @@ u-boot-ddr3l.itb: $(dtb_ddr3l) $(supp_dtbs)
./$(PAD_IMAGE) bl31.bin
./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr3l) $(supp_dtbs)
DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ../$(SOC_DIR)/mkimage_fit_atf.sh $(dtb_ddr3l) $(supp_dtbs) > u-boot-ddr3l.its
@ -44,7 +42,7 @@ Index: git/iMX8M/soc.mak
@rm -f u-boot.its $(dtb_ddr3l)
dtb_ddr3l_evk = evkddr3l.dtb
@@ -184,7 +184,7 @@ u-boot-ddr3l-evk.itb: $(dtb_ddr3l_evk) $
@@ -184,7 +184,7 @@ u-boot-ddr3l-evk.itb: $(dtb_ddr3l_evk) $(supp_dtbs)
./$(PAD_IMAGE) bl31.bin
./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr3l_evk) $(supp_dtbs)
DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ../$(SOC_DIR)/mkimage_fit_atf.sh $(dtb_ddr3l_evk) $(supp_dtbs) > u-boot-ddr3l-evk.its
@ -53,7 +51,7 @@ Index: git/iMX8M/soc.mak
@rm -f u-boot.its $(dtb_ddr3l_evk)
dtb_ddr4 = valddr4.dtb
@@ -196,7 +196,7 @@ u-boot-ddr4.itb: $(dtb_ddr4) $(supp_dtbs
@@ -196,7 +196,7 @@ u-boot-ddr4.itb: $(dtb_ddr4) $(supp_dtbs)
./$(PAD_IMAGE) bl31.bin
./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr4) $(supp_dtbs)
DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ../$(SOC_DIR)/mkimage_fit_atf.sh $(dtb_ddr4) $(supp_dtbs) > u-boot-ddr4.its
@ -62,7 +60,7 @@ Index: git/iMX8M/soc.mak
@rm -f u-boot.its $(dtb_ddr4)
dtb_ddr4_evk = evkddr4.dtb
@@ -208,7 +208,7 @@ u-boot-ddr4-evk.itb: $(dtb_ddr4_evk) $(s
@@ -208,7 +208,7 @@ u-boot-ddr4-evk.itb: $(dtb_ddr4_evk) $(supp_dtbs)
./$(PAD_IMAGE) bl31.bin
./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr4_evk) $(supp_dtbs)
DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ../$(SOC_DIR)/mkimage_fit_atf.sh $(dtb_ddr4_evk) $(supp_dtbs) > u-boot-ddr4-evk.its

2
meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/files/0001-imx91-soc.mak-capture-commands-output-into-a-log-fil.patch
View File

@ -5,6 +5,8 @@ Subject: [PATCH] imx91: soc.mak: capture commands output into a log file
This is later used to get the needed information for the signing of the
boot artifacts.
Upstream-Status: Inappropriate [DEY specific]
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
iMX91/soc.mak | 7 ++++---

6
meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/files/0001-imx9-soc.mak-capture-commands-output-into-a-log-file.patch → meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/files/0001-imx93-soc.mak-capture-commands-output-into-a-log-fil.patch
View File

@ -1,6 +1,6 @@
From: Javier Viguera <javier.viguera@digi.com>
Date: Thu, 31 Aug 2023 16:33:13 +0200
Subject: [PATCH] imx9: soc.mak: capture commands output into a log file
Subject: [PATCH] imx93: soc.mak: capture commands output into a log file
This is later used to get the needed information for the signing of the
boot artifacts.
@ -13,7 +13,7 @@ Signed-off-by: Javier Viguera <javier.viguera@digi.com>
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/iMX93/soc.mak b/iMX93/soc.mak
index 560d38e..6339d80 100644
index 4ea92e3fa3f4..bb4042c1262f 100644
--- a/iMX93/soc.mak
+++ b/iMX93/soc.mak
@@ -1,4 +1,5 @@
@ -48,4 +48,4 @@ index 560d38e..6339d80 100644
+ ./$(MKIMG) -soc IMX9 -append $(AHAB_IMG) -c -ap $(SPL_A55_IMG) a55 $(SPL_LOAD_ADDR) -out flash.bin | tee -a $(MKIMAGE_LOG)
$(call append_container,u-boot-atf-container.img,1)
flash_singleboot_no_ahabfw: $(MKIMG) $(SPL_A55_IMG) u-boot-atf-container.img
flash_singleboot_gdet: $(MKIMG) $(AHAB_IMG) $(SPL_A55_IMG) u-boot-atf-container.img

8
meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/files/0002-imx9-soc.mak-add-makefile-target-to-build-A0-revisio.patch → meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/files/0002-imx93-soc.mak-add-makefile-target-to-build-A0-revisi.patch
View File

@ -1,6 +1,6 @@
From: Javier Viguera <javier.viguera@digi.com>
Date: Thu, 2 Nov 2023 15:03:13 +0100
Subject: [PATCH] imx9: soc.mak: add makefile target to build A0 revision
Subject: [PATCH] imx93: soc.mak: add makefile target to build A0 revision
Upstream-Status: Inappropriate [DEY specific]
@ -10,7 +10,7 @@ Signed-off-by: Javier Viguera <javier.viguera@digi.com>
1 file changed, 4 insertions(+)
diff --git a/iMX93/soc.mak b/iMX93/soc.mak
index 6339d80..dc739c2 100644
index bb4042c1262f..1a50aa940b98 100644
--- a/iMX93/soc.mak
+++ b/iMX93/soc.mak
@@ -218,6 +218,10 @@ flash_singleboot: $(MKIMG) $(AHAB_IMG) $(SPL_A55_IMG) u-boot-atf-container.img
@ -21,6 +21,6 @@ index 6339d80..dc739c2 100644
+ ./$(MKIMG) -soc IMX9 -append mx93a0-ahab-container.img -c -ap $(SPL_A55_IMG) a55 $(SPL_LOAD_ADDR) -out flash.bin | tee -a $(MKIMAGE_LOG)
+ $(call append_container,u-boot-atf-container.img,1)
+
flash_singleboot_no_ahabfw: $(MKIMG) $(SPL_A55_IMG) u-boot-atf-container.img
./$(MKIMG) -soc IMX9 -c -ap $(SPL_A55_IMG) a55 $(SPL_LOAD_ADDR) -out flash.bin
flash_singleboot_gdet: $(MKIMG) $(AHAB_IMG) $(SPL_A55_IMG) u-boot-atf-container.img
./$(MKIMG) -soc IMX9 -append $(AHAB_IMG) -cntr_flags 0x200010 -c -ap $(SPL_A55_IMG) a55 $(SPL_LOAD_ADDR) -out flash.bin
$(call append_container,u-boot-atf-container.img,1)

7
meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend
View File

@ -10,10 +10,13 @@ SRC_URI:append:ccimx91 = " \
file://0001-imx91-soc.mak-capture-commands-output-into-a-log-fil.patch \
"
SRC_URI:append:ccimx93 = " \
file://0001-imx9-soc.mak-capture-commands-output-into-a-log-file.patch \
file://0002-imx9-soc.mak-add-makefile-target-to-build-A0-revisio.patch \
file://0001-imx93-soc.mak-capture-commands-output-into-a-log-fil.patch \
file://0002-imx93-soc.mak-add-makefile-target-to-build-A0-revisi.patch \
"
SRCBRANCH:ccimx9 = "lf-6.6.36_2.1.0"
SRCREV:ccimx9 = "4622115cbc037f79039c4522faeced4aabea986b"
DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-native', '', d)}"
# Do not tag imx-boot

3
meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-mkimage_git.bb
View File

@ -19,3 +19,6 @@ do_install() {
install -m 0755 iMX8M/print_fit_hab.sh ${D}${bindir}/print_fit_hab.sh
install -m 0755 mkimage_imx8 ${D}${bindir}/mkimage_imx8
}
DEBUG_PREFIX_MAP:remove:class-nativesdk = "-fcanon-prefix-map"
BBCLASSEXTEND = "native nativesdk"

12
meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-mkimage_git.bbappend
View File

@ -1,12 +0,0 @@
# Copyright (C) 2022-2024, Digi International Inc.
FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
SRC_URI:append:ccimx8m = " \
file://0001-imx8m-soc.mak-preserve-dtbs-after-build.patch \
"
# "fmacro-prefix-map" is not supported on old versions of GCC
DEBUG_PREFIX_MAP:remove:class-nativesdk = "-fmacro-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}"
BBCLASSEXTEND = "native nativesdk"

4
meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
View File

@ -5,8 +5,8 @@ DEPENDS = "zlib openssl"
SRC_URI = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH} \
file://0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch \
"
SRCBRANCH = "lf-6.6.23_2.0.0"
SRCREV = "ca5d6b2d3fd9ab15825b97f7ef6f1ce9a8644966"
SRCBRANCH = "lf-6.6.36_2.1.0"
SRCREV = "4622115cbc037f79039c4522faeced4aabea986b"
S = "${WORKDIR}/git"

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

@ -11,7 +11,7 @@ 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 9ab3e1e95133..5128e9ee5e8e 100644
index 33647835f2fb..ca0a718ba6e5 100644
--- a/core/arch/arm/plat-imx/conf.mk
+++ b/core/arch/arm/plat-imx/conf.mk
@@ -95,6 +95,7 @@ mx95-flavorlist = \
@ -22,7 +22,7 @@ index 9ab3e1e95133..5128e9ee5e8e 100644
mx91evk \
ifneq (,$(filter $(PLATFORM_FLAVOR),$(mx6ul-flavorlist)))
@@ -491,6 +492,11 @@ CFG_DDR_SIZE ?= 0x80000000
@@ -493,6 +494,11 @@ CFG_DDR_SIZE ?= 0x80000000
CFG_UART_BASE ?= UART1_BASE
endif

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

@ -13,7 +13,7 @@ Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2 files changed, 18 insertions(+)
diff --git a/core/arch/arm/plat-imx/conf.mk b/core/arch/arm/plat-imx/conf.mk
index 9ab3e1e95..202cceb5c 100644
index 33647835f2fb..8d065a3d3db3 100644
--- a/core/arch/arm/plat-imx/conf.mk
+++ b/core/arch/arm/plat-imx/conf.mk
@@ -89,6 +89,8 @@ mx8ulp-flavorlist = \
@ -25,8 +25,8 @@ index 9ab3e1e95..202cceb5c 100644
mx93evk \
mx95-flavorlist = \
@@ -499,6 +501,17 @@ CFG_NSEC_DDR_1_SIZE ?= 0x380000000UL
CFG_CORE_ARM64_PA_BITS ?= 40
@@ -493,6 +495,17 @@ CFG_DDR_SIZE ?= 0x80000000
CFG_UART_BASE ?= UART1_BASE
endif
+ifneq (,$(filter $(PLATFORM_FLAVOR),ccimx93dvk))
@ -40,11 +40,11 @@ index 9ab3e1e95..202cceb5c 100644
+$(call force,CFG_SOC_REV_A0,y)
+endif
+
# i.MX6 Solo/SL/SoloX/DualLite/Dual/Quad specific config
ifeq ($(filter y, $(CFG_MX6QP) $(CFG_MX6Q) $(CFG_MX6D) $(CFG_MX6DL) $(CFG_MX6S) \
$(CFG_MX6SL) $(CFG_MX6SLL) $(CFG_MX6SX)), y)
ifneq (,$(filter $(PLATFORM_FLAVOR),mx95evk))
CFG_DDR_SIZE ?= 0x80000000
CFG_UART_BASE ?= UART1_BASE
diff --git a/core/arch/arm/plat-imx/registers/imx93.h b/core/arch/arm/plat-imx/registers/imx93.h
index 21080da82..29070eb91 100644
index 21080da82d04..29070eb917ac 100644
--- a/core/arch/arm/plat-imx/registers/imx93.h
+++ b/core/arch/arm/plat-imx/registers/imx93.h
@@ -9,11 +9,16 @@

20
meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os/0002-core-ccimx93-enable-AES_HUK-trusted-application.patch
View File

@ -26,10 +26,10 @@ Signed-off-by: Javier Viguera <javier.viguera@digi.com>
create mode 100644 ta/aes_huk/user_ta_header_defines.h
diff --git a/core/arch/arm/plat-imx/conf.mk b/core/arch/arm/plat-imx/conf.mk
index 202cceb5c..42297508c 100644
index 8d065a3d3db3..de1cf45ca9b6 100644
--- a/core/arch/arm/plat-imx/conf.mk
+++ b/core/arch/arm/plat-imx/conf.mk
@@ -504,12 +504,14 @@ endif
@@ -498,12 +498,14 @@ endif
ifneq (,$(filter $(PLATFORM_FLAVOR),ccimx93dvk))
CFG_DDR_SIZE ?= 0x40000000
CFG_UART_BASE ?= UART6_BASE
@ -43,10 +43,10 @@ index 202cceb5c..42297508c 100644
+CFG_IN_TREE_EARLY_TAS += aes_huk/c2fad363-5d9f-4fc4-a417-555841e05745
endif
# i.MX6 Solo/SL/SoloX/DualLite/Dual/Quad specific config
ifneq (,$(filter $(PLATFORM_FLAVOR),mx95evk))
diff --git a/ta/aes_huk/Android.mk b/ta/aes_huk/Android.mk
new file mode 100644
index 000000000..931f8e406
index 000000000000..931f8e4065c9
--- /dev/null
+++ b/ta/aes_huk/Android.mk
@@ -0,0 +1,4 @@
@ -56,7 +56,7 @@ index 000000000..931f8e406
+include $(BUILD_OPTEE_MK)
diff --git a/ta/aes_huk/Makefile b/ta/aes_huk/Makefile
new file mode 100644
index 000000000..e41d9913e
index 000000000000..e41d9913e6ae
--- /dev/null
+++ b/ta/aes_huk/Makefile
@@ -0,0 +1,13 @@
@ -75,7 +75,7 @@ index 000000000..e41d9913e
+endif
diff --git a/ta/aes_huk/aes_ta.c b/ta/aes_huk/aes_ta.c
new file mode 100644
index 000000000..036d64b83
index 000000000000..036d64b83478
--- /dev/null
+++ b/ta/aes_huk/aes_ta.c
@@ -0,0 +1,477 @@
@ -558,7 +558,7 @@ index 000000000..036d64b83
+}
diff --git a/ta/aes_huk/include/aes_ta.h b/ta/aes_huk/include/aes_ta.h
new file mode 100644
index 000000000..c07b4bc47
index 000000000000..c07b4bc479ee
--- /dev/null
+++ b/ta/aes_huk/include/aes_ta.h
@@ -0,0 +1,82 @@
@ -646,7 +646,7 @@ index 000000000..c07b4bc47
+#endif /* __AES_TA_H */
diff --git a/ta/aes_huk/sub.mk b/ta/aes_huk/sub.mk
new file mode 100644
index 000000000..cfce14e6c
index 000000000000..cfce14e6c119
--- /dev/null
+++ b/ta/aes_huk/sub.mk
@@ -0,0 +1,3 @@
@ -655,14 +655,14 @@ index 000000000..cfce14e6c
+srcs-y += aes_ta.c
diff --git a/ta/aes_huk/user_ta.mk b/ta/aes_huk/user_ta.mk
new file mode 100644
index 000000000..d49d30955
index 000000000000..d49d309558ba
--- /dev/null
+++ b/ta/aes_huk/user_ta.mk
@@ -0,0 +1 @@
+user-ta-uuid := c2fad363-5d9f-4fc4-a417-555841e05745
diff --git a/ta/aes_huk/user_ta_header_defines.h b/ta/aes_huk/user_ta_header_defines.h
new file mode 100644
index 000000000..9f944b8b9
index 000000000000..9f944b8b9ab3
--- /dev/null
+++ b/ta/aes_huk/user_ta_header_defines.h
@@ -0,0 +1,48 @@

18
meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os_4.2.0.imx.bbappend
View File

@ -1,9 +1,10 @@
# Copyright (C) 2024, Digi International Inc.
FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
SRC_URI += "file://environment.d-optee-sdk.sh"
SRC_URI:append:ccimx91 = " \
file://0001-core-imx-support-ccimx91-dvk.patch \
file://environment.d-optee-sdk.sh \
"
SRC_URI:append:ccimx93 = " \
@ -14,13 +15,6 @@ SRC_URI:append:ccimx93 = " \
PLATFORM_FLAVOR:ccimx91 = "ccimx91dvk"
PLATFORM_FLAVOR:ccimx93 = "ccimx93dvk"
do_install:append:ccimx91 () {
mkdir -p ${D}/environment-setup.d
sed -e "s,#OPTEE_ARCH#,${OPTEE_ARCH},g" ${WORKDIR}/environment.d-optee-sdk.sh > ${D}/environment-setup.d/optee-sdk.sh
}
FILES:${PN}-staticdev:append:ccimx91 = " /environment-setup.d/"
do_compile:append:ccimx93 () {
oe_runmake PLATFORM=imx-${PLATFORM_FLAVOR}_a0 O=${B}-A0 all
}
@ -29,3 +23,11 @@ do_compile:ccimx93[cleandirs] += "${B}-A0"
do_deploy:append:ccimx93 () {
cp ${B}-A0/core/tee-raw.bin ${DEPLOYDIR}/tee.${PLATFORM_FLAVOR}_a0.bin
}
do_install:append () {
mkdir -p ${D}/environment-setup.d
sed -e "s,#OPTEE_ARCH#,${OPTEE_ARCH},g" ${WORKDIR}/environment.d-optee-sdk.sh > ${D}/environment-setup.d/optee-sdk.sh
}
FILES:${PN}-staticdev += " /environment-setup.d/"
INSANE_SKIP:${PN}-staticdev += "buildpaths"