arm/trusted-firmware-a: Update to 2.7.0

Signed-off-by: Jon Mason <jon.mason@arm.com>
2026-05-08 05:09:56 +00:00 · 2022-06-14 13:57:12 -04:00
parent 7aa3997684
commit a355384290
17 changed files with 35 additions and 83 deletions
@@ -1,7 +1,7 @@
-From 923deccc1de17b05826143e476b840253bb2bb7b Mon Sep 17 00:00:00 2001
+From 008cfc6457c239466ca62610d59aaf1a78f6b2f6 Mon Sep 17 00:00:00 2001
 From: Tudor Cretu <tudor.cretu@arm.com>
 Date: Fri, 21 May 2021 14:56:37 +0000
-Subject: [PATCH] plat: tc: Increase maximum BL2 size.
+Subject: [PATCH 1/7] plat: tc: Increase maximum BL2 size.

 BL2 size gets increased due to the firmware update changes.
 Increase the MAX_BL2_SIZE by 8Kb.
@@ -10,11 +10,11 @@ Signed-off-by: Tudor Cretu <tudor.cretu@arm.com>
 Change-Id: I1cb28b0eb7f834426873ff9f4c40bd496413806f
 Upstream-Status: Pending [Not submitted to upstream yet]
 ---
- plat/arm/board/tc/include/platform_def.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ plat/arm/board/tc/include/platform_def.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)

 diff --git a/plat/arm/board/tc/include/platform_def.h b/plat/arm/board/tc/include/platform_def.h
-index ccabced9e..f45457b9f 100644
+index 745d91cab..cd77773aa 100644
 --- a/plat/arm/board/tc/include/platform_def.h
 +++ b/plat/arm/board/tc/include/platform_def.h
@@ -120,9 +120,9 @@
@@ -27,7 +27,7 @@ index ccabced9e..f45457b9f 100644
 -# define PLAT_ARM_MAX_BL2_SIZE		0x14000
 +# define PLAT_ARM_MAX_BL2_SIZE		0x19000
 #endif
-
+ 
 /*
@@ -130,7 +130,7 @@
  * calculated using the current BL31 PROGBITS debug size plus the sizes of
@@ -35,9 +35,9 @@ index ccabced9e..f45457b9f 100644
  */
 -#define PLAT_ARM_MAX_BL31_SIZE		0x3F000
 +#define PLAT_ARM_MAX_BL31_SIZE		0x4F000
-
+ 
 /*
  * Size of cacheable stacks
 -- 
-2.17.1
+2.30.2

@@ -1,4 +1,4 @@
-From f602df2563cbae1fce2559430a394180983fbbaf Mon Sep 17 00:00:00 2001
+From 2f8b0cc6be3787717247d1c02a45181a5ac6f125 Mon Sep 17 00:00:00 2001
 From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
 Date: Mon, 11 Apr 2022 14:36:54 +0100
 Subject: [PATCH 2/7] Makefile: add trusty_sp_fw_config build option
@@ -12,10 +12,10 @@ Upstream-Status: Pending [Not submitted to upstream yet]
 2 files changed, 8 insertions(+)

 diff --git a/Makefile b/Makefile
-index f91699c44..f401a0010 100644
+index 3941f8698..a20d647a2 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -533,6 +533,10 @@ ifneq (${SPD},none)
+@@ -531,6 +531,10 @@ ifneq (${SPD},none)
             DTC_CPPFLAGS	+=	-DOPTEE_SP_FW_CONFIG
         endif
 
@@ -1,32 +0,0 @@
-From 1565ac8995f90113b2be5acddc86773bfe0a0ac9 Mon Sep 17 00:00:00 2001
-From: Rupinderjit Singh <rupinderjit.singh@arm.com>
-Date: Tue, 22 Feb 2022 21:50:33 +0000
-Subject: [PATCH 1/7] feat(tc): enable CI-700 PMU for profiling
-
-Change-Id: Iaafdfc440b362022e6103eabf3fb2ebed85b6575
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com>
-Upstream-Status: Submitted [https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/14918]
---
- fdts/tc.dts | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/fdts/tc.dts b/fdts/tc.dts
-index 7c0e84260..20992294b 100644
--- a/fdts/tc.dts
-+++ b/fdts/tc.dts
-@@ -261,6 +261,12 @@
- 		arm,mhuv2-protocols = <0 1>;
- 	};
- 
-+	cmn-pmu {
-+		compatible = "arm,ci-700";
-+		reg = <0x0 0x50000000 0x0 0x10000000>;
-+		interrupts = <0x0 460 0x4>;
-+	};
-+
- 	scmi {
- 		compatible = "arm,scmi";
- 		mbox-names = "tx", "rx";
-- 
-2.30.2
-
@@ -1,4 +1,4 @@
-From d5a8e035de394f7a8924151318abc094d9ae68ae Mon Sep 17 00:00:00 2001
+From 0060b1a4fbe3bc9992f59a2d4cb986821f7bcf13 Mon Sep 17 00:00:00 2001
 From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
 Date: Mon, 11 Apr 2022 18:31:01 +0100
 Subject: [PATCH 3/7] fix(plat/arm): increase sp max image size
@@ -1,4 +1,4 @@
-From f6485e50af73c905faa0777e462ffdfa483d19da Mon Sep 17 00:00:00 2001
+From 000e19d360a5ad9abd7d823af86a364bac2afc58 Mon Sep 17 00:00:00 2001
 From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
 Date: Mon, 11 Apr 2022 17:38:17 +0100
 Subject: [PATCH 4/7] fix(plat/tc): increase tc_tzc_dram1_size
@@ -30,7 +30,7 @@ index 20992294b..af64504a4 100644
 		};
 	};
 diff --git a/plat/arm/board/tc/include/platform_def.h b/plat/arm/board/tc/include/platform_def.h
-index 745d91cab..73b984308 100644
+index cd77773aa..35d8fd24e 100644
 --- a/plat/arm/board/tc/include/platform_def.h
 +++ b/plat/arm/board/tc/include/platform_def.h
@@ -31,7 +31,7 @@
@@ -1,4 +1,4 @@
-From bdf66cf30ed4cb0c16a5335fbb68fa0b2e253f7c Mon Sep 17 00:00:00 2001
+From a04466ceb81a04c5179e8064837c34a89c2b11bd Mon Sep 17 00:00:00 2001
 From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
 Date: Mon, 11 Apr 2022 14:43:15 +0100
 Subject: [PATCH 5/7] feat(plat/tc): add spmc manifest with trusty sp
@@ -1,4 +1,4 @@
-From c2f939891e46e2ef9b54ed5e270e42187fdc57b3 Mon Sep 17 00:00:00 2001
+From 96151af7eed28d63fdaa1ac6de2d14a9c71f1d4a Mon Sep 17 00:00:00 2001
 From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
 Date: Wed, 30 Mar 2022 12:14:49 +0000
 Subject: [PATCH 6/7] feat(plat/tc): update dts with trusty compatible string
@@ -1,4 +1,4 @@
-From d67e1f76be37127b0fe2a84ee631c5a799c426ba Mon Sep 17 00:00:00 2001
+From 1a051bef6c63f6871edd8d87e969460f073820a7 Mon Sep 17 00:00:00 2001
 From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
 Date: Wed, 27 Apr 2022 18:15:47 +0100
 Subject: [PATCH 7/7] fix(plat/tc): disable smmu
@@ -3,17 +3,11 @@
 COMPATIBLE_MACHINE = "(corstone1000)"

 FILESEXTRAPATHS:prepend := "${THISDIR}/files/corstone1000:"
-SRCREV_tfa = "cf89fd57ed3286d7842eef41cd72a3977eb6d317"
-PV = "2.6+git${SRCPV}"

 SRC_URI:append = " \ 
 	file://0001-Fix-FF-A-version-in-SPMC-manifest.patch \
 	"

-SRC_URI:remove = " \
-     file://ssl.patch \
-     "  
-
 TFA_DEBUG = "1"
 TFA_UBOOT ?= "1"
 TFA_MBEDTLS = "1"
@@ -1,28 +1,19 @@
 # TC0 specific TFA configuration

-# Intermediate SHA with 2.6 baseline version
-SRCREV_tfa = "141791088eb846c55291b1664813710ed3b532a1"
-PV = "2.6+git${SRCPV}"
-
 DEPENDS += "scp-firmware util-linux-native gptfdisk-native"

 FILESEXTRAPATHS:prepend := "${THISDIR}/files/tc:"
 SRC_URI:append = " \
    file://0001-plat-tc-Increase-maximum-BL2-size.patch \
-    file://0002-feat-tc-enable-CI-700-PMU-for-profiling.patch \
-    file://0003-Makefile-add-trusty_sp_fw_config-build-option.patch \
-    file://0004-fix-plat-arm-increase-sp-max-image-size.patch \
-    file://0005-fix-plat-tc-increase-tc_tzc_dram1_size.patch \
-    file://0006-feat-plat-tc-add-spmc-manifest-with-trusty-sp.patch \
-    file://0007-feat-plat-tc-update-dts-with-trusty-compatible-strin.patch \
-    file://0008-fix-plat-tc-disable-smmu.patch \
+    file://0002-Makefile-add-trusty_sp_fw_config-build-option.patch \
+    file://0003-fix-plat-arm-increase-sp-max-image-size.patch \
+    file://0004-fix-plat-tc-increase-tc_tzc_dram1_size.patch \
+    file://0005-feat-plat-tc-add-spmc-manifest-with-trusty-sp.patch \
+    file://0006-feat-plat-tc-update-dts-with-trusty-compatible-strin.patch \
+    file://0007-fix-plat-tc-disable-smmu.patch \
    file://generate_metadata.py \
    "

-SRC_URI:remove = " \
-    file://ssl.patch \
-    "
-
 COMPATIBLE_MACHINE = "(tc?)"

 TFA_PLATFORM = "tc"
@@ -8,9 +8,7 @@ inherit deploy
 COMPATIBLE_MACHINE ?= "invalid"

 SRC_URI = "git://git.trustedfirmware.org/TF-A/tf-a-tests.git;protocol=https;branch=master"
-# post v2.6 snapshot
-SRCREV ?= "af5a517ae9f295455122109100fe5d55668e8eaf"
-PV .= "+git${SRCPV}"
+SRCREV ?= "5f591f67738a1bbe6b262c53d9dad46ed8bbcd67"

 DEPENDS += "optee-os"

@@ -5,9 +5,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"

 inherit deploy

-SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master \
-           file://ssl.patch \
-	    file://build-deps-upgrade-to-mbed-TLS-2.28.0.patch"
+SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master"

 UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$"

@@ -2,6 +2,10 @@ COMPATIBLE_MACHINE:qemuarm64-secureboot = "qemuarm64-secureboot"
 COMPATIBLE_MACHINE:qemu-generic-arm64 = "qemu-generic-arm64"
 COMPATIBLE_MACHINE:qemuarm-secureboot = "qemuarm-secureboot"

+#FIXME - clang fails to build tfa for qemuarm-secureboot, and possibly other
+# arm/aarch32.  This is a known testing hole in TF-A.
+TOOLCHAIN:qemuarm-secureboot = "gcc"
+
 TFA_PLATFORM:qemuarm64-secureboot = "qemu"
 TFA_PLATFORM:qemu-generic-arm64 = "qemu_sbsa"
 TFA_PLATFORM:qemuarm-secureboot = "qemu"
@@ -1,7 +1,7 @@
 require trusted-firmware-a.inc

-# TF-A v2.6
-SRCREV_tfa = "a1f02f4f3daae7e21ee58b4c93ec3e46b8f28d15"
+# TF-A v2.7
+SRCREV_tfa = "35f4c7295bafeb32c8bcbdfb6a3f2e74a57e732b"

 LIC_FILES_CHKSUM += "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde"

@@ -5,12 +5,11 @@
 DESCRIPTION = "fiptool - Trusted Firmware tool for packaging"
 LICENSE = "BSD-3-Clause"

-SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;destsuffix=fiptool-${PV};protocol=https;branch=master \
-           file://ssl.patch"
-LIC_FILES_CHKSUM = "file://docs/license.rst;md5=713afe122abbe07f067f939ca3c480c5"
+SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;destsuffix=fiptool-${PV};protocol=https;branch=master"
+LIC_FILES_CHKSUM = "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde"

-# Use fiptool from TF-A v2.5
-SRCREV = "c158878249f1bd930906ebd744b90d3f2a8265f1"
+# Use fiptool from TF-A v2.7
+SRCREV = "35f4c7295bafeb32c8bcbdfb6a3f2e74a57e732b"

 DEPENDS += "openssl-native"