deleted file mode 100644
@@ -1,81 +0,0 @@
-From 5c75ba6cdbc1746438a748841a5327fa29840a4e Mon Sep 17 00:00:00 2001
-From: Gyorgy Szing <gyorgy.szing@arm.com>
-Date: Fri, 18 Jul 2025 12:23:25 +0200
-Subject: [PATCH 1/1] cpputest: fix cmake 4.0 compatibility
-
-Add a new patch to solve the mentioned issue. For details, see the
-header of the patch file.
-
-Also update the component to use git am instead of apply.
-
-Upstream-Status: Submitted [https://review.trustedfirmware.org/c/TS/trusted-services/+/40925]
-Signed-off-by: Gyorgy Szing <gyorgy.szing@arm.com>
-Change-Id: I68291f4573fee3c64dd19c348bd8a30aa99b0c35
----
- ...ix.patch => 0001-cpputest-cmake-fix.patch} | 0
- .../0002-Fix-cmake-4.0-compatibility.patch | 29 +++++++++++++++++++
- external/CppUTest/CppUTest.cmake | 8 +++--
- 3 files changed, 35 insertions(+), 2 deletions(-)
- rename external/CppUTest/{cpputest-cmake-fix.patch => 0001-cpputest-cmake-fix.patch} (100%)
- create mode 100644 external/CppUTest/0002-Fix-cmake-4.0-compatibility.patch
-
-diff --git a/external/CppUTest/cpputest-cmake-fix.patch b/external/CppUTest/0001-cpputest-cmake-fix.patch
-similarity index 100%
-rename from external/CppUTest/cpputest-cmake-fix.patch
-rename to external/CppUTest/0001-cpputest-cmake-fix.patch
-diff --git a/external/CppUTest/0002-Fix-cmake-4.0-compatibility.patch b/external/CppUTest/0002-Fix-cmake-4.0-compatibility.patch
-new file mode 100644
-index 00000000..8aa9ff2c
---- /dev/null
-+++ b/external/CppUTest/0002-Fix-cmake-4.0-compatibility.patch
-@@ -0,0 +1,29 @@
-+From 1147a71cfa5657b13c13d10194d8a5b4c28e1709 Mon Sep 17 00:00:00 2001
-+From: Gyorgy Szing <gyorgy.szing@arm.com>
-+Date: Fri, 18 Jul 2025 12:17:46 +0200
-+Subject: [PATCH 1/1] Fix cmake 4.0 compatibility
-+
-+Cmake 4.0 dropped compatibility to cmake versions below 3.5. Update the
-+required version on the cmake file as a workaround.
-+
-+Signed-off-by: Gyorgy Szing <gyorgy.szing@arm.com>
-+---
-+ CMakeLists.txt | 2 +-
-+ 1 file changed, 1 insertion(+), 1 deletion(-)
-+
-+diff --git a/CMakeLists.txt b/CMakeLists.txt
-+index d9ca865f..b30e7d77 100644
-+--- a/CMakeLists.txt
-++++ b/CMakeLists.txt
-+@@ -4,7 +4,7 @@ set(CppUTest_version_major 3)
-+ set(CppUTest_version_minor 8)
-+
-+ # 2.6.3 is needed for ctest support
-+-cmake_minimum_required(VERSION 2.8.7)
-++cmake_minimum_required(VERSION 3.8...3.31)
-+
-+ # Check for functions before setting a lot of stuff
-+ include(CheckFunctionExists)
-+--
-+2.34.1
-+
-diff --git a/external/CppUTest/CppUTest.cmake b/external/CppUTest/CppUTest.cmake
-index 7b916d52..f323ad8e 100644
---- a/external/CppUTest/CppUTest.cmake
-+++ b/external/CppUTest/CppUTest.cmake
-@@ -16,8 +16,12 @@ set(GIT_OPTIONS
- GIT_REPOSITORY ${CPPUTEST_URL}
- GIT_TAG ${CPPUTEST_REFSPEC}
- GIT_SHALLOW FALSE
-- PATCH_COMMAND git stash
-- COMMAND git apply ${CMAKE_CURRENT_LIST_DIR}/cpputest-cmake-fix.patch
-+ PATCH_COMMAND
-+ git stash
-+ COMMAND git branch -f bf-am
-+ COMMAND git am ${CMAKE_CURRENT_LIST_DIR}/0001-cpputest-cmake-fix.patch
-+ COMMAND git am ${CMAKE_CURRENT_LIST_DIR}/0002-Fix-cmake-4.0-compatibility.patch
-+ COMMAND git reset bf-am
- )
-
- include(${TS_ROOT}/tools/cmake/common/LazyFetch.cmake REQUIRED)
-2.34.1
\ No newline at end of file
@@ -4,8 +4,9 @@ LICENSE = "Apache-2.0 & BSD-3-Clause & BSD-2-Clause & Zlib"
FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-# v1.2.0
-SRCREV_trusted-services = "0d55b4c7a8e53958271feb7341e928853b7914cf"
+
+# v1.3.0
+SRCREV_trusted-services = "a5db25bc3f2892781a07620af5d6625900988281"
LIC_FILES_CHKSUM = "file://${S}/license.rst;md5=ea160bac7f690a069c608516b17997f4"
PV ?= "0.0+git"
@@ -16,9 +17,9 @@ SRC_URI_TRUSTED_SERVICES_DTC = "git://github.com/dgibson/dtc;protocol=https;bran
SRCREV_dtc = "b6910bec11614980a21e46fbccc35934b671bd81"
LIC_FILES_CHKSUM += "file://ts-external/dtc/README.license;md5=a1eb22e37f09df5b5511b8a278992d0e"
-# MbedTLS, tag "v3.6.0"
+# MbedTLS, tag "v3.6.5"
SRC_URI_TRUSTED_SERVICES_MBEDTLS = "gitsm://github.com/Mbed-TLS/mbedtls;protocol=https;branch=master"
-SRCREV_mbedtls = "2ca6c285a0dd3f33982dd57299012dacab1ff206"
+SRCREV_mbedtls = "e185d7fd85499c8ce5ca2a54f5cf8fe7dbe3f8df"
LIC_FILES_CHKSUM += "file://ts-external/mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d"
# Nanopb, tag "nanopb-0.4.8" plus some further fixes
@@ -51,7 +52,6 @@ SRC_URI = "git://git.trustedfirmware.org/TS/trusted-services.git;protocol=https;
file://0001-Allow-configuring-flash-image-files-compile-time.patch \
file://0002-Fix-MbedTLS-3.6-and-GCC-14-compatibility.patch \
file://0001-Relax-pyelftools-dependency.patch \
- file://0005-cpputest-fix-cmake-4.0-compatibility.patch \
"
S = "${UNPACKDIR}/ts"
@@ -31,10 +31,6 @@ INSANE_SKIP:${PN}-dev += "ldflags"
# Trusted Services SPs do not compile with clang
TOOLCHAIN = "gcc"
-# FIXME - there is an issue with mbedtls unions and gcc15. It has been
-# fixed in commit 4c26d7d54cf5f5dc1e63e0dd0b902fda05e7063f but that has
-# not been released yet. Work around this issue here until that is out
-TARGET_CFLAGS += "-fzero-init-padding-bits=unions"
# FORTIFY_SOURCE is a glibc feature. Disable it for all SPs as these do not use glibc.
TARGET_CFLAGS:remove = "-D_FORTIFY_SOURCE=2"
Update to latest TS release. Signed-off-by: Gyorgy Szing <gyorgy.szing@arm.com> --- ...cpputest-fix-cmake-4.0-compatibility.patch | 81 ------------------- .../trusted-services/trusted-services-src.inc | 10 +-- .../trusted-services/ts-sp-common.inc | 4 - 3 files changed, 5 insertions(+), 90 deletions(-) delete mode 100644 meta-arm/recipes-security/trusted-services/files/0005-cpputest-fix-cmake-4.0-compatibility.patch