mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-06-08 15:30:08 +00:00
Code Issues Projects Releases Wiki Activity

arm-bsp/optee-os: clean up TC patches

Browse Source 
Instead of patching a file we patched, integrate the changes directly
into the first patch.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Ross Burton
2022-01-20 19:12:20 +00:00
committed by Jon Mason
parent 8601ba85f7
commit 92ad824b70
3 changed files with 4 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0001-WIP-Enable-managed-exit.patch
+4 -3
View File
@@ -109,13 +109,14 @@ diff --git a/core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts b/core/a
index 4b8b3681..04847c4d 100644
--- a/core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts
+++ b/core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts
@@ -23,7 +23,7 @@
@@ -23,7 +23,8 @@
entrypoint-offset = <0x1000>;
xlat-granule = <0>; /* 4KiB */
boot-order = <0>;
- messaging-method = <0>; /* Direct messaging only */
+ messaging-method = <3>; /* Direct messaging and managed exit supported */
+ messaging-method = <3>; /* Direct request/response supported */
+ managed-exit; /* Managed exit supported */
device-regions {
compatible = "arm,ffa-manifest-device-regions";
--
meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0001-plat-totalcompute-Specify-managed-exit-in-the-partit.patch
-29
View File
@@ -1,29 +0,0 @@
From c68ac212ec130811662bb60344793b1442be7d34 Mon Sep 17 00:00:00 2001
From: Ben Horgan <ben.horgan@arm.com>
Date: Thu, 16 Dec 2021 14:48:08 +0000
Subject: [PATCH] plat-totalcompute: Specify managed-exit in the partition
manifest
Upstream-Status: Not suitable (Update to 0001-WIP-Enable-managed-exit.patch)
Signed-off-by: Ben Horgan <ben.horgan@arm.com>
---
core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts b/core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts
index 04847c4d..1bb4cea8 100644
--- a/core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts
+++ b/core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts
@@ -23,7 +23,8 @@
entrypoint-offset = <0x1000>;
xlat-granule = <0>; /* 4KiB */
boot-order = <0>;
- messaging-method = <3>; /* Direct messaging and managed exit supported */
+ messaging-method = <3>; /* Direct request/response supported */
+ managed-exit; /* Managed exit supported */
device-regions {
compatible = "arm,ffa-manifest-device-regions";
--
2.17.1
meta-arm-bsp/recipes-security/optee/optee-os-generic-tc.inc
-1
View File
@@ -10,7 +10,6 @@ SRC_URI:append:tc = " \
file://sp_layout.json \
file://0001-WIP-Enable-managed-exit.patch \
file://0003-ffa-Update-function-ID-according-to-FFA-v1.1-spec.patch \
file://0001-plat-totalcompute-Specify-managed-exit-in-the-partit.patch \
file://0001-Fix-optee-UUID.patch \
"