diff mbox series

[2/2] arm/scp-firmware: update to v2.15.0

Message ID 20241014165448.46530-2-jon.mason@arm.com
State New
Headers show
Series [1/2] arm/edk2: update to 202408 | expand

Commit Message

Jon Mason Oct. 14, 2024, 4:54 p.m. UTC 
Update SCP to the latest tagged version, and update the related patch to
the new location of the relevant files.

For a comparison of the changes, please go to
https://git.gitlab.arm.com/firmware/SCP-firmware/-/compare/v2.14.0...v2.15.0

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .../files/0001-OPTEE-Private-Includes.patch    | 18 +++++++++---------
 ...rmware_2.14.0.bb => scp-firmware_2.15.0.bb} |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)
 rename meta-arm/recipes-bsp/scp-firmware/{scp-firmware_2.14.0.bb => scp-firmware_2.15.0.bb} (98%)
diff mbox series

Patch

diff --git a/meta-arm/recipes-bsp/scp-firmware/files/0001-OPTEE-Private-Includes.patch b/meta-arm/recipes-bsp/scp-firmware/files/0001-OPTEE-Private-Includes.patch
index f3063a957e1e..84f501567bbc 100644
--- a/meta-arm/recipes-bsp/scp-firmware/files/0001-OPTEE-Private-Includes.patch
+++ b/meta-arm/recipes-bsp/scp-firmware/files/0001-OPTEE-Private-Includes.patch
@@ -1,4 +1,4 @@ 
-From b298400a5783453f64d8bebbd92db2c84c4a49fd Mon Sep 17 00:00:00 2001
+From 8b4b14943de92a2c7f8b328c2de75771493b7d18 Mon Sep 17 00:00:00 2001
 From: Ross Burton <ross.burton@arm.com>
 Date: Mon, 10 Jul 2023 14:09:16 +0100
 Subject: [PATCH] OPTEE Private Includes
@@ -11,14 +11,14 @@  For some reason this behaviour isn't deterministic, a ticket has been filed with
 Upstream-Status: Pending
 Signed-off-by: Ross Burton <ross.burton@arm.com>
 ---
- module/optee/console/CMakeLists.txt | 2 +-
- module/optee/mbx/CMakeLists.txt     | 2 +-
+ product/optee/common/module/console/CMakeLists.txt | 2 +-
+ product/optee/common/module/mbx/CMakeLists.txt     | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/module/optee/console/CMakeLists.txt b/module/optee/console/CMakeLists.txt
+diff --git a/product/optee/common/module/console/CMakeLists.txt b/product/optee/common/module/console/CMakeLists.txt
 index aebb7cc79766..942aa98c85ff 100644
---- a/module/optee/console/CMakeLists.txt
-+++ b/module/optee/console/CMakeLists.txt
+--- a/product/optee/common/module/console/CMakeLists.txt
++++ b/product/optee/common/module/console/CMakeLists.txt
 @@ -14,7 +14,7 @@ target_include_directories(${SCP_MODULE_TARGET}
  # Those includes are needed for mutex definitnion that is used in optee_smt
  # notification
@@ -28,10 +28,10 @@  index aebb7cc79766..942aa98c85ff 100644
                                    "${SCP_OPTEE_DIR}/core/include/"
                                    "${SCP_OPTEE_DIR}/lib/libutils/ext/include/"
                                    "${SCP_OPTEE_DIR}/lib/libutee/include/")
-diff --git a/module/optee/mbx/CMakeLists.txt b/module/optee/mbx/CMakeLists.txt
+diff --git a/product/optee/common/module/mbx/CMakeLists.txt b/product/optee/common/module/mbx/CMakeLists.txt
 index 305fa42b7370..783a7970c2d5 100644
---- a/module/optee/mbx/CMakeLists.txt
-+++ b/module/optee/mbx/CMakeLists.txt
+--- a/product/optee/common/module/mbx/CMakeLists.txt
++++ b/product/optee/common/module/mbx/CMakeLists.txt
 @@ -15,7 +15,7 @@ target_include_directories(${SCP_MODULE_TARGET}
  # Those includes are needed for mutex defifitnion that is used in optee_smt
  # notification
diff --git a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.14.0.bb b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.15.0.bb
similarity index 98%
rename from meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.14.0.bb
rename to meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.15.0.bb
index c0e40d903e12..b305234347f2 100644
--- a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.14.0.bb
+++ b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.15.0.bb
@@ -12,7 +12,7 @@  SRC_URI = "${SRC_URI_SCP_FIRMWARE};branch=${SRCBRANCH} \
           "
 
 SRCBRANCH = "main"
-SRCREV  = "3267f2964114a56faaf46a40704be6ca78240725"
+SRCREV  = "25681b34bdc838b7231e0056e3ef5164e8005382"
 
 PROVIDES += "virtual/control-processor-firmware"