diff mbox series

[1/4] arm/optee-ftpm: update to the latest SHA

Message ID 20240411125947.64959-1-jon.mason@arm.com
State New
Headers show
Series [1/4] arm/optee-ftpm: update to the latest SHA | expand

Commit Message

Jon Mason April 11, 2024, 12:59 p.m. UTC 
Update to the latest SHA.  Rebase of patch needed.

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .../optee-ftpm/0001-add-enum-to-ta-flags.patch    | 15 ++++++---------
 .../recipes-security/optee-ftpm/optee-ftpm_git.bb |  2 +-
 2 files changed, 7 insertions(+), 10 deletions(-)

Comments

Jon Mason April 11, 2024, 6:39 p.m. UTC | #1 
On Thu, 11 Apr 2024 08:59:44 -0400, Jon Mason wrote:
> Update to the latest SHA.  Rebase of patch needed.
> 
> 

Applied, thanks!

[1/4] arm/optee-ftpm: update to the latest SHA
      commit: 7df4fb66ab39a53d9eaab3a5b682f715d9f62db9
[2/4] arm/trusted-firmware-a: update to 2.10.3 release
      commit: 46ee22faeb7074c07c9937a877cc4161c01fa165
[3/4] arm/opencsd: update to 1.5.2
      commit: ee8933dff16bf5bbf34fbcc0317b865465aa39b7
[4/4] arm-bsp/corstone1000: reformat u-boot patches
      commit: 17df9c4ebc6614da641dcb9e85246171d940098d

Best regards,
diff mbox series

Patch

diff --git a/meta-arm/recipes-security/optee-ftpm/optee-ftpm/0001-add-enum-to-ta-flags.patch b/meta-arm/recipes-security/optee-ftpm/optee-ftpm/0001-add-enum-to-ta-flags.patch
index 94509ddd1eff..7c61105b7647 100644
--- a/meta-arm/recipes-security/optee-ftpm/optee-ftpm/0001-add-enum-to-ta-flags.patch
+++ b/meta-arm/recipes-security/optee-ftpm/optee-ftpm/0001-add-enum-to-ta-flags.patch
@@ -1,7 +1,7 @@ 
-From 2d00f16058529eb9f4d4d2bcaeed91fd53b43989 Mon Sep 17 00:00:00 2001
+From cd7b41b30cf157338cfd5cda3c0f6f33164ad16d Mon Sep 17 00:00:00 2001
 From: Maxim Uvarov <maxim.uvarov@linaro.org>
 Date: Fri, 17 Apr 2020 12:05:53 +0100
-Subject: [PATCH 2/2] add enum to ta flags
+Subject: [PATCH] add enum to ta flags
 
 If we compile this TA into OPTEE-OS we need to define a flag
 that this TA can be discovered on the optee bus.
@@ -9,22 +9,19 @@  Upstream-Status: Submitted [https://github.com/microsoft/MSRSec/pull/34]
 
 Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
 ---
- TAs/optee_ta/fTPM/user_ta_header_defines.h | 2 +-
+ .../ARM32-FirmwareTPM/optee_ta/fTPM/user_ta_header_defines.h    | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Samples/ARM32-FirmwareTPM/optee_ta/fTPM/user_ta_header_defines.h b/Samples/ARM32-FirmwareTPM/optee_ta/fTPM/user_ta_header_defines.h
-index 72ecbf0cf1c7..e83619d55d3c 100644
+index 92c33c1..e83619d 100644
 --- a/Samples/ARM32-FirmwareTPM/optee_ta/fTPM/user_ta_header_defines.h
 +++ b/Samples/ARM32-FirmwareTPM/optee_ta/fTPM/user_ta_header_defines.h
 @@ -44,7 +44,7 @@
  
  #define TA_UUID                     TA_FTPM_UUID
  
--#define TA_FLAGS                    (TA_FLAG_SINGLE_INSTANCE | TA_FLAG_INSTANCE_KEEP_ALIVE) 
+-#define TA_FLAGS                    (TA_FLAG_SINGLE_INSTANCE | TA_FLAG_INSTANCE_KEEP_ALIVE)
 +#define TA_FLAGS                    (TA_FLAG_SINGLE_INSTANCE | TA_FLAG_INSTANCE_KEEP_ALIVE | TA_FLAG_DEVICE_ENUM_SUPP)
  #define TA_STACK_SIZE               (64 * 1024)
  #define TA_DATA_SIZE                (32 * 1024)
-
--- 
-2.17.1
-
+ 
diff --git a/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb b/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb
index 7996e9b36c3f..1bb76819b09a 100644
--- a/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb
+++ b/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb
@@ -22,7 +22,7 @@  FTPM_UUID="bc50d971-d4c9-42c4-82cb-343fb7f37896"
 
 SRC_URI = "gitsm://github.com/Microsoft/ms-tpm-20-ref;branch=main;protocol=https \
            file://0001-add-enum-to-ta-flags.patch"
-SRCREV = "d638536d0fe01acd5e39ffa1bd100b3da82d92c7"
+SRCREV = "e9fc7b89d865536c46deb63f9c7d0121a3ded49c"
 
 UPSTREAM_CHECK_COMMITS = "1"