diff mbox series

[1/2] arm-bsp/optee-os: clean up TC patches

Message ID 20220120191221.1955545-1-ross.burton@arm.com
State New
Headers show
Series [1/2] arm-bsp/optee-os: clean up TC patches | expand

Commit Message

Ross Burton Jan. 20, 2022, 7:12 p.m. UTC 
Instead of patching a file we patched, integrate the changes directly
into the first patch.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../tc/0001-WIP-Enable-managed-exit.patch     |  7 +++--
 ...e-Specify-managed-exit-in-the-partit.patch | 29 -------------------
 .../optee/optee-os-generic-tc.inc             |  1 -
 3 files changed, 4 insertions(+), 33 deletions(-)
 delete mode 100644 meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0001-plat-totalcompute-Specify-managed-exit-in-the-partit.patch

Comments

Jon Mason Jan. 20, 2022, 9:04 p.m. UTC | #1 
On Thu, 20 Jan 2022 19:12:20 +0000, Ross Burton wrote:
> Instead of patching a file we patched, integrate the changes directly
> into the first patch.

Applied, thanks!

[1/2] arm-bsp/optee-os: clean up TC patches
      commit: 92ad824b703a5489406c66e04222c9c902c44d20
[2/2] arm-bsp/secure-partitions: add missing Signed-off-by tags to patches
      commit: 0c0b88bc56f516a677b82b31df2e823660f2ee3f

Best regards,
diff mbox series

Patch

diff --git a/meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0001-WIP-Enable-managed-exit.patch b/meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0001-WIP-Enable-managed-exit.patch
index c038299e..3a21b39a 100644
--- a/meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0001-WIP-Enable-managed-exit.patch
+++ b/meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0001-WIP-Enable-managed-exit.patch
@@ -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";
 -- 
diff --git a/meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0001-plat-totalcompute-Specify-managed-exit-in-the-partit.patch b/meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0001-plat-totalcompute-Specify-managed-exit-in-the-partit.patch
deleted file mode 100644
index ff16e793..00000000
--- a/meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0001-plat-totalcompute-Specify-managed-exit-in-the-partit.patch
+++ /dev/null
@@ -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
-
diff --git a/meta-arm-bsp/recipes-security/optee/optee-os-generic-tc.inc b/meta-arm-bsp/recipes-security/optee/optee-os-generic-tc.inc
index 5f64f5a6..63abbb10 100644
--- a/meta-arm-bsp/recipes-security/optee/optee-os-generic-tc.inc
+++ b/meta-arm-bsp/recipes-security/optee/optee-os-generic-tc.inc
@@ -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 \
     "