* [PATCH 1/3] optee-os: add optional optee-os-ta package
@ 2023-06-30 11:23 Rouven Czerwinski
2023-06-30 11:23 ` [PATCH 2/3] optee-os: deploy ta elf files Rouven Czerwinski
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Rouven Czerwinski @ 2023-06-30 11:23 UTC (permalink / raw)
To: meta-arm; +Cc: Rouven Czerwinski
The optee-os compilation provides not only the core files, TAs are also
usually build. Create a separate package which contains them, so they
can be installed.
Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
meta-arm/recipes-security/optee/optee-os.inc | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/meta-arm/recipes-security/optee/optee-os.inc b/meta-arm/recipes-security/optee/optee-os.inc
index bb6974b2..6c5f24f6 100644
--- a/meta-arm/recipes-security/optee/optee-os.inc
+++ b/meta-arm/recipes-security/optee/optee-os.inc
@@ -56,6 +56,10 @@ do_install() {
#install core in firmware
install -d ${D}${nonarch_base_libdir}/firmware/
install -m 644 ${B}/core/*.bin ${B}/core/tee.elf ${D}${nonarch_base_libdir}/firmware/
+
+ #install tas in optee_armtz
+ install -d ${D}${nonarch_base_libdir}/optee_armtz/
+ install -m 444 ${B}/ta/*/*.ta ${D}${nonarch_base_libdir}/optee_armtz
}
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -69,7 +73,10 @@ addtask deploy before do_build after do_install
SYSROOT_DIRS += "${nonarch_base_libdir}/firmware"
+PACKAGES += "${PN}-ta"
FILES:${PN} = "${nonarch_base_libdir}/firmware/"
+FILES:${PN}-ta = "${nonarch_base_libdir}/optee_armtz/*"
+
# note: "textrel" is not triggered on all archs
INSANE_SKIP:${PN} = "textrel"
--
2.39.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/3] optee-os: deploy ta elf files
2023-06-30 11:23 [PATCH 1/3] optee-os: add optional optee-os-ta package Rouven Czerwinski
@ 2023-06-30 11:23 ` Rouven Czerwinski
2023-06-30 11:23 ` [PATCH 3/3] optee-test: add TA elfs to deploydir Rouven Czerwinski
2023-07-03 22:23 ` [PATCH 1/3] optee-os: add optional optee-os-ta package Jon Mason
2 siblings, 0 replies; 4+ messages in thread
From: Rouven Czerwinski @ 2023-06-30 11:23 UTC (permalink / raw)
To: meta-arm; +Cc: Rouven Czerwinski
The TA builds always create ELF files, add them to the deploy dir to
ease debugging via the OP-TEE symbolize.py script.
Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
meta-arm/recipes-security/optee/optee-os.inc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta-arm/recipes-security/optee/optee-os.inc b/meta-arm/recipes-security/optee/optee-os.inc
index 6c5f24f6..2e3403da 100644
--- a/meta-arm/recipes-security/optee/optee-os.inc
+++ b/meta-arm/recipes-security/optee/optee-os.inc
@@ -67,6 +67,9 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
do_deploy() {
install -d ${DEPLOYDIR}/${MLPREFIX}optee
install -m 644 ${D}${nonarch_base_libdir}/firmware/* ${DEPLOYDIR}/${MLPREFIX}optee
+
+ install -d ${DEPLOYDIR}/${MLPREFIX}optee/ta
+ install -m 644 ${B}/ta/*/*.elf ${DEPLOYDIR}/${MLPREFIX}optee/ta
}
addtask deploy before do_build after do_install
--
2.39.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 3/3] optee-test: add TA elfs to deploydir
2023-06-30 11:23 [PATCH 1/3] optee-os: add optional optee-os-ta package Rouven Czerwinski
2023-06-30 11:23 ` [PATCH 2/3] optee-os: deploy ta elf files Rouven Czerwinski
@ 2023-06-30 11:23 ` Rouven Czerwinski
2023-07-03 22:23 ` [PATCH 1/3] optee-os: add optional optee-os-ta package Jon Mason
2 siblings, 0 replies; 4+ messages in thread
From: Rouven Czerwinski @ 2023-06-30 11:23 UTC (permalink / raw)
To: meta-arm; +Cc: Rouven Czerwinski
Same as for OP-TEE client, this eases debugging and is required to use
the OP-TEE symbolize.py script.
Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
meta-arm/recipes-security/optee/optee-test.inc | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/meta-arm/recipes-security/optee/optee-test.inc b/meta-arm/recipes-security/optee/optee-test.inc
index 64b41a8e..90b72b9f 100644
--- a/meta-arm/recipes-security/optee/optee-test.inc
+++ b/meta-arm/recipes-security/optee/optee-test.inc
@@ -6,6 +6,7 @@ LICENSE = "BSD-2-Clause & GPL-2.0-only"
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa"
inherit python3native ptest
+inherit deploy
require optee.inc
DEPENDS = "optee-client optee-os-tadevkit python3-cryptography-native"
@@ -43,6 +44,13 @@ do_install () {
install -D -p -m0444 ${B}/supp_plugin/*.plugin ${D}${libdir}/tee-supplicant/plugins/
}
+do_deploy () {
+ install -d ${DEPLOYDIR}/${MLPREFIX}optee/ta
+ install -m 644 ${B}/ta/*/*.elf ${DEPLOYDIR}/${MLPREFIX}optee/ta
+}
+
+addtask deploy before do_build after do_install
+
FILES:${PN} += "${nonarch_base_libdir}/optee_armtz/ \
${libdir}/tee-supplicant/plugins/ \
"
--
2.39.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/3] optee-os: add optional optee-os-ta package
2023-06-30 11:23 [PATCH 1/3] optee-os: add optional optee-os-ta package Rouven Czerwinski
2023-06-30 11:23 ` [PATCH 2/3] optee-os: deploy ta elf files Rouven Czerwinski
2023-06-30 11:23 ` [PATCH 3/3] optee-test: add TA elfs to deploydir Rouven Czerwinski
@ 2023-07-03 22:23 ` Jon Mason
2 siblings, 0 replies; 4+ messages in thread
From: Jon Mason @ 2023-07-03 22:23 UTC (permalink / raw)
To: meta-arm, Rouven Czerwinski
On Fri, 30 Jun 2023 13:23:39 +0200, Rouven Czerwinski wrote:
> The optee-os compilation provides not only the core files, TAs are also
> usually build. Create a separate package which contains them, so they
> can be installed.
Applied, thanks!
[1/3] optee-os: add optional optee-os-ta package
commit: 2b15d78915f46f16171d914ae67f66d5d755144f
[2/3] optee-os: deploy ta elf files
commit: 4d7d11cf240bfbe457165615bd2066118f614b98
[3/3] optee-test: add TA elfs to deploydir
commit: 0dfd5d1f3c6b0d31fe3357ff6dbe24bf9365bb9f
Best regards,
--
Jon Mason <jon.mason@arm.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-07-03 22:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-30 11:23 [PATCH 1/3] optee-os: add optional optee-os-ta package Rouven Czerwinski
2023-06-30 11:23 ` [PATCH 2/3] optee-os: deploy ta elf files Rouven Czerwinski
2023-06-30 11:23 ` [PATCH 3/3] optee-test: add TA elfs to deploydir Rouven Czerwinski
2023-07-03 22:23 ` [PATCH 1/3] optee-os: add optional optee-os-ta package Jon Mason
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.