Skip to contentSkip to conversation

arm/trusted-firmware-a: add v2.14.0 support

PATCH Applied Jon Mason 2 participants 3 messages Jan 12 – Jan 14

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/2 arm/trusted-firmware-a: add v2.14.0 support

Add support for v2.14.0, and update corstone1000 config and patches to use it. TF-A seems to have changed their poetry settings from POETRY to host-poetry (when specifying an alternative location/disabling). So, it is necessary to modify that for all platforms using COT and v2.14.0

NOTE: sbsa-ref is having issues with fip.bin being too large. So, set the version to the LTS until that is resolved.

---
 .../conf/machine/include/corstone1000.inc     |  4 +-
 meta-arm-bsp/conf/machine/sbsa-ref.conf       |  4 ++
 .../parselogs-ignores-corstone1000-fvp.txt    |  1 +
 ...01-Fix-FF-A-version-in-SPMC-manifest.patch |  2 +-
 ...corstone1000-add-Cortex-A320-support.patch | 30 ++++-------
 ...-requirement-tests-for-Corstone-1000.patch | 33 ------------
 ...orstone1000-Add-Cortex-A320-support.patch} | 52 ++++++++-----------
 .../trusted-firmware-a/tf-a-tests_%.bbappend  |  6 +--
 .../trusted-firmware-a-corstone1000.inc       |  2 +-
 .../trusted-firmware-a-fvp-base.inc           |  2 +-
 .../trusted-firmware-a/cot-dt2c_0.1.0.bb      |  6 +--
 ...re-enable-console-by-default-in-BL31.patch | 46 ----------------
 ...quire-the-GICC-frame-to-be-defined-o.patch | 45 ----------------
 ...ive_2.13.0.bb => fiptool-native_2.14.0.bb} |  6 +--
 ...a-tests_2.13.0.bb => tf-a-tests_2.14.0.bb} |  2 +-
 .../trusted-firmware-a/trusted-firmware-a.inc |  2 +-
 .../trusted-firmware-a_2.13.0.bb              | 20 -------
 .../trusted-firmware-a_2.14.0.bb              | 16 ++++++
 .../trusted-firmware-a_git.bb                 | 10 ++--
 19 files changed, 73 insertions(+), 216 deletions(-)
 delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/tf-a-tests/0001-fix-exclude-Boot-requirement-tests-for-Corstone-1000.patch
 rename meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/tf-a-tests/{0002-plat-corstone1000-Add-Cortex-A320-support.patch => 0001-plat-corstone1000-Add-Cortex-A320-support.patch} (79%)
 delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/files/0001-fix-arm-re-enable-console-by-default-in-BL31.patch
 delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/files/0002-fix-css-don-t-require-the-GICC-frame-to-be-defined-o.patch
 rename meta-arm/recipes-bsp/trusted-firmware-a/{fiptool-native_2.13.0.bb => fiptool-native_2.14.0.bb} (85%)
 rename meta-arm/recipes-bsp/trusted-firmware-a/{tf-a-tests_2.13.0.bb => tf-a-tests_2.14.0.bb} (96%)
 delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.13.0.bb
 create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.14.0.bb
meta-arm-bsp/conf/machine/include/corstone1000.inc +2 -2
index 25a330def46e..e3c726e5f15a 100644
@@ -9,8 +9,8 @@ PREFERRED_VERSION_trusted-firmware-m ?= "2.2.%"
 
 # TF-A
 TFA_PLATFORM = "corstone1000"
-PREFERRED_VERSION_trusted-firmware-a ?= "2.13.%"
-PREFERRED_VERSION_tf-a-tests ?= "2.13.%"
+PREFERRED_VERSION_trusted-firmware-a ?= "2.14.%"
+PREFERRED_VERSION_tf-a-tests ?= "2.14.%"
 
 TFA_BL2_BINARY = "bl2-corstone1000.bin"
 TFA_FIP_BINARY = "fip-corstone1000.bin"
meta-arm-bsp/conf/machine/sbsa-ref.conf +4 -0
index 3f93b6929121..eefbb2e9cac2 100644
@@ -25,6 +25,10 @@ EFI_PROVIDER ?= "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd-boo
 
 SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0"
 
+# FIXME - when compiling edk2, we're seeing an error of fip.bin being larger than the region size.
+# Pin the version back until this can be resolved
+PREFERRED_VERSION_trusted-firmware-a ?= "2.12.%"
+
 EXTRA_IMAGEDEPENDS += "edk2-firmware"
 # FIXME - Currently seeing a kernel warning for the CPU topology when bumping
 # the version past this.  The issue is being tracked in
meta-arm-bsp/lib/oeqa/runtime/cases/parselogs-ignores-corstone1000-fvp.txt +1 -0
index 63cef943e792..5e70422a5ab9 100644
@@ -6,3 +6,4 @@ psci: failed to boot CPU3 (-95)
 CPU3: failed to boot: -95
 ARM FF-A: Notification setup failed -95, not enabled
 ARM FF-A: Failed to register driver sched callback -95
+basic-mmio-gpio: Failed to locate of_node [id: -2]
meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0001-Fix-FF-A-version-in-SPMC-manifest.patch +1 -1
index 6d5114e1c160..367468da0e7b 100644
@@ -1,4 +1,4 @@
-From adaa22bc2f529bb34e9d4fe89ff5c65f0c83ca0c Mon Sep 17 00:00:00 2001
+From efce372dfac4ccef239b67abb4ec1cc450096329 Mon Sep 17 00:00:00 2001
 From: emeara01 <[email protected]>
 Date: Wed, 11 May 2022 14:37:06 +0100
 Subject: [PATCH] Fix FF-A version in SPMC manifest
meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0002-plat-corstone1000-add-Cortex-A320-support.patch +10 -20
index 1a9f24e323c5..a9b6d8322238 100644
@@ -1,4 +1,4 @@
-From 977f06e10e549d01a641a62a1d4850a06d6f0df4 Mon Sep 17 00:00:00 2001
+From 4e23e72e65481fe917d8a0af355b3b7669d5acb6 Mon Sep 17 00:00:00 2001
 From: Harsimran Singh Tungal <[email protected]>
 Date: Thu, 7 Aug 2025 10:05:02 +0000
 Subject: [PATCH] plat: corstone1000: add Cortex-A320 support
@@ -41,12 +41,12 @@ Signed-off-by: Michael Safwat <[email protected]>
  .../common/corstone1000_helpers.S             | 35 ++++++++++++++++++-
  .../corstone1000/common/corstone1000_plat.c   |  4 +++
  .../corstone1000/common/corstone1000_pm.c     |  8 +++++
- .../common/include/platform_def.h             | 28 ++++++++++++++-
+ .../common/include/platform_def.h             | 26 ++++++++++++++
  plat/arm/board/corstone1000/platform.mk       | 11 ++++++
- 5 files changed, 84 insertions(+), 2 deletions(-)
+ 5 files changed, 83 insertions(+), 1 deletion(-)
 
 diff --git a/plat/arm/board/corstone1000/common/corstone1000_helpers.S b/plat/arm/board/corstone1000/common/corstone1000_helpers.S
-index a4ca9fe98..665dbc61a 100644
+index a4ca9fe98223..665dbc61a92e 100644
 --- a/plat/arm/board/corstone1000/common/corstone1000_helpers.S
 +++ b/plat/arm/board/corstone1000/common/corstone1000_helpers.S
 @@ -1,5 +1,5 @@
@@ -97,7 +97,7 @@ index a4ca9fe98..665dbc61a 100644
  	 * void plat_secondary_cold_boot_setup (void);
  	 *
 diff --git a/plat/arm/board/corstone1000/common/corstone1000_plat.c b/plat/arm/board/corstone1000/common/corstone1000_plat.c
-index e388c82f3..d34e80b29 100644
+index e388c82f311b..d34e80b29bb0 100644
 --- a/plat/arm/board/corstone1000/common/corstone1000_plat.c
 +++ b/plat/arm/board/corstone1000/common/corstone1000_plat.c
 @@ -26,6 +26,10 @@ const mmap_region_t plat_arm_mmap[] = {
@@ -112,7 +112,7 @@ index e388c82f3..d34e80b29 100644
  };
  
 diff --git a/plat/arm/board/corstone1000/common/corstone1000_pm.c b/plat/arm/board/corstone1000/common/corstone1000_pm.c
-index ac808873b..a87697e97 100644
+index ac808873b9e7..a87697e97f11 100644
 --- a/plat/arm/board/corstone1000/common/corstone1000_pm.c
 +++ b/plat/arm/board/corstone1000/common/corstone1000_pm.c
 @@ -8,7 +8,11 @@
@@ -140,16 +140,9 @@ index ac808873b..a87697e97 100644
  	/* Flush and invalidate data cache */
  	dcsw_op_all(DCCISW);
 diff --git a/plat/arm/board/corstone1000/common/include/platform_def.h b/plat/arm/board/corstone1000/common/include/platform_def.h
-index caf3d462f..ee0babbf8 100644
+index 200383475c80..ffb1e2dec0e1 100644
 --- a/plat/arm/board/corstone1000/common/include/platform_def.h
 +++ b/plat/arm/board/corstone1000/common/include/platform_def.h
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2021-2024, Arm Limited and Contributors. All rights reserved.
-+ * Copyright (c) 2021-2025, Arm Limited and Contributors. All rights reserved.
-  *
-  * SPDX-License-Identifier: BSD-3-Clause
-  */
 @@ -112,12 +112,19 @@
  #define ARM_SHARED_RAM_SIZE	(SZ_8K)  /* 8 KB */
  #define ARM_SHARED_RAM_BASE	ARM_TRUSTED_SRAM_BASE
@@ -170,7 +163,7 @@ index caf3d462f..ee0babbf8 100644
  
  #define PLAT_ARM_MAX_BL2_SIZE	(180 * SZ_1K)  /* 180 KB */
  
-@@ -209,8 +216,13 @@
+@@ -208,8 +215,13 @@
  #define MAX_IO_BLOCK_DEVICES	1
  
  /* GIC related constants */
@@ -184,7 +177,7 @@ index caf3d462f..ee0babbf8 100644
  
  /* MHUv2 Secure Channel receiver and sender */
  #define PLAT_SDK700_MHU0_SEND	0x1B800000
-@@ -335,6 +347,20 @@
+@@ -334,6 +346,20 @@
  					CORSTONE1000_DEVICE_BASE, \
  					CORSTONE1000_DEVICE_SIZE, \
  					MT_DEVICE | MT_RW | MT_SECURE)
@@ -206,7 +199,7 @@ index caf3d462f..ee0babbf8 100644
  #define ARM_IRQ_SEC_PHY_TIMER	29
  
 diff --git a/plat/arm/board/corstone1000/platform.mk b/plat/arm/board/corstone1000/platform.mk
-index 65be9c1f5..fe3e94865 100644
+index 65be9c1f5ad7..fe3e94865fca 100644
 --- a/plat/arm/board/corstone1000/platform.mk
 +++ b/plat/arm/board/corstone1000/platform.mk
 @@ -9,7 +9,14 @@ ifeq ($(filter ${TARGET_PLATFORM}, fpga fvp),)
@@ -236,6 +229,3 @@ index 65be9c1f5..fe3e94865 100644
  
  BL2_SOURCES		+=	plat/arm/board/corstone1000/common/corstone1000_security.c		\
  				plat/arm/board/corstone1000/common/corstone1000_err.c		\
--- 
-2.50.1
-
meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/tf-a-tests/0001-fix-exclude-Boot-requirement-tests-for-Corstone-1000.patch deleted +0 -33
deleted file mode 100644
index 8df0e8cf91af..000000000000
@@ -1,33 +0,0 @@
-From 328bfd8cd95bb0973e4966dcb4e3efa05d62f3f9 Mon Sep 17 00:00:00 2001
-From: Christophe Thiblot <[email protected]>
-Date: Wed, 2 Jul 2025 15:03:55 +0000
-Subject: [PATCH] fix: exclude Boot requirement tests for Corstone-1000
-
-A test compares the value of the Generic Timer register CNTFRQ visible in
-two frames CNTBaseN and CNTCTLBase that are linked in Armv8-A and reflect
-the same value.
-    
-An issue in Corstone-1000 (errata 2142118) makes the CNTFRQ views
-inconsistents and the then test fails. There is no workaround and
-the test is skipped.
-    
-Errata: https://developer.arm.com/documentation/sden2142076/0002/?lang=en
-
-Signed-off-by: Christophe Thiblot <[email protected]>
-Upstream-Status: Submitted [https://review.trustedfirmware.org/c/TF-A/tf-a-tests/+/40810]
----
- plat/arm/corstone1000/tests_to_skip.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/plat/arm/corstone1000/tests_to_skip.txt b/plat/arm/corstone1000/tests_to_skip.txt
-index d937e42..afa3992 100644
---- a/plat/arm/corstone1000/tests_to_skip.txt
-+++ b/plat/arm/corstone1000/tests_to_skip.txt
-@@ -16,3 +16,4 @@ PSCI CPU Suspend in OSI mode
- PSCI STAT/for valid composite state CPU suspend
- FF-A Setup and Discovery/FF-A RXTX remap unmapped region success
- FF-A Memory Sharing/Normal World VM retrieve request into SPMC
-+Boot requirement tests
--- 
-2.43.0
-
meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/tf-a-tests/0001-plat-corstone1000-Add-Cortex-A320-support.patch renamed from meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/tf-a-tests/0002-plat-corstone1000-Add-Cortex-A320-support.patch +23 -29

99 lines not on this page · raw message

meta-arm-bsp/recipes-bsp/trusted-firmware-a/tf-a-tests_%.bbappend +1 -5
index c1490c9f33cd..34644585a6d4 100644
@@ -12,9 +12,5 @@ TFTF_MODE:corstone1000 = "release"
 
 FILESEXTRAPATHS:prepend:corstone1000 := "${THISDIR}/files/corstone1000/tf-a-tests:"
 SRC_URI:append:corstone1000 = " \
-        file://0001-fix-exclude-Boot-requirement-tests-for-Corstone-1000.patch \
-        "
-
-SRC_URI:append:corstone1000 = " \
-        file://0002-plat-corstone1000-Add-Cortex-A320-support.patch \
+        file://0001-plat-corstone1000-Add-Cortex-A320-support.patch \
         "
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone1000.inc +1 -1
index 5e219a282b57..d7c436dc482c 100644
@@ -79,5 +79,5 @@ EXTRA_OEMAKE:append:cortexa320 = " \
 # If GENERATE_COT is set, then TF-A will try to use local poetry install
 # to run the python cot-dt2c command.  Disable the local poetry and use
 # the provided cot-dt2c.
-EXTRA_OEMAKE += "POETRY=''"
+EXTRA_OEMAKE += "host-poetry=''"
 DEPENDS += "cot-dt2c-native"
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-fvp-base.inc +1 -1
index 06a2d22631c3..c87cbb726ec8 100644
@@ -69,5 +69,5 @@ EXTRA_OEMAKE += "ARM_ARCH_MAJOR=${ARM_ISA_MAJOR} ARM_ARCH_MINOR=${ARM_ISA_MINOR}
 # If GENERATE_COT is set, then tf-a will try to use local poetry install
 # to run the python cot-dt2c command.  Disable the local poetry and use
 # the provided cot-dt2c.
-EXTRA_OEMAKE += "POETRY=''"
+EXTRA_OEMAKE += "host-poetry=''"
 DEPENDS += "cot-dt2c-native"
meta-arm/recipes-bsp/trusted-firmware-a/cot-dt2c_0.1.0.bb +3 -3
index 5d7efcc93635..8e9e37a9064b 100644
@@ -4,10 +4,10 @@ LICENSE = "BSD-3-Clause"
 
 SRC_URI_TRUSTED_FIRMWARE_A ?= "git://review.trustedfirmware.org/TF-A/trusted-firmware-a;protocol=https"
 SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};branch=${SRCBRANCH}"
-LIC_FILES_CHKSUM = "file://docs/license.rst;md5=83b7626b8c7a37263c6a58af8d19bee1"
+LIC_FILES_CHKSUM = "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e"
 
-# Use cot-dt2c from TF-A v2.12.0
-SRCREV = "4ec2948fe3f65dba2f19e691e702f7de2949179c"
+# Use cot-dt2c from TF-A v2.14.0
+SRCREV = "1d5aa939bc8d3d892e2ed9945fa50e36a1a924cc"
 SRCBRANCH = "master"
 
 inherit python_poetry_core
meta-arm/recipes-bsp/trusted-firmware-a/files/0001-fix-arm-re-enable-console-by-default-in-BL31.patch deleted +0 -46

46 lines not on this page · raw message

meta-arm/recipes-bsp/trusted-firmware-a/files/0002-fix-css-don-t-require-the-GICC-frame-to-be-defined-o.patch deleted +0 -45

45 lines not on this page · raw message

meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.14.0.bb renamed from meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.13.0.bb +3 -3
similarity index 85%
rename from meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.13.0.bb
rename to meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.14.0.bb
index 1b5334d8bbbc..a96329e1b424 100644
@@ -7,10 +7,10 @@ LICENSE = "BSD-3-Clause"
 
 SRC_URI_TRUSTED_FIRMWARE_A ?= "git://review.trustedfirmware.org/TF-A/trusted-firmware-a;protocol=https"
 SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};destsuffix=fiptool-${PV};branch=${SRCBRANCH}"
-LIC_FILES_CHKSUM = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
+LIC_FILES_CHKSUM = "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e"
 
-# Use fiptool from  TF-A v2.13.0
-SRCREV = "c17351450c8a513ca3f30f936e26a71db693a145"
+# Use fiptool from  TF-A v2.14.0
+SRCREV = "1d5aa939bc8d3d892e2ed9945fa50e36a1a924cc"
 SRCBRANCH = "master"
 
 DEPENDS += "openssl-native"
meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.14.0.bb renamed from meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.13.0.bb +1 -1
similarity index 96%
rename from meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.13.0.bb
rename to meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.14.0.bb
index aa7f49048b4e..dcd97d1a196d 100644
@@ -10,7 +10,7 @@ COMPATIBLE_MACHINE ?= "invalid"
 SRC_URI_TRUSTED_FIRMWARE_A_TESTS ?= "git://review.trustedfirmware.org/TF-A/tf-a-tests;protocol=https"
 SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A_TESTS};branch=${SRCBRANCH}"
 SRCBRANCH = "master"
-SRCREV = "fa267c12f9aa790b43b38d171273cf63892e8d51"
+SRCREV = "3b3d800133081b48482b1205a32671b82bc2b640"
 
 EXTRA_OEMAKE += "USE_NVM=0"
 EXTRA_OEMAKE += "SHELL_COLOR=1"
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +1 -1
index 321a89078a20..28e415e24f0c 100644
@@ -4,7 +4,7 @@ LICENSE = "BSD-2-Clause & BSD-3-Clause & MIT & Apache-2.0"
 
 inherit firmware
 
-SRC_URI_TRUSTED_FIRMWARE_A ?= "git://review.trustedfirmware.org/TF-A/trusted-firmware-a;protocol=https"
+SRC_URI_TRUSTED_FIRMWARE_A ?= "gitsm://review.trustedfirmware.org/TF-A/trusted-firmware-a;protocol=https"
 SRCBRANCH = "master"
 SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};name=tfa;branch=${SRCBRANCH}"
 
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.13.0.bb deleted +0 -20
deleted file mode 100644
index 0c1566a5654f..000000000000
@@ -1,20 +0,0 @@
-require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
-
-# TF-A v2.13.0
-SRCREV_tfa = "c17351450c8a513ca3f30f936e26a71db693a145"
-SRCBRANCH = "master"
-
-LIC_FILES_CHKSUM += "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
-
-# in TF-A src, docs/getting_started/prerequisites.rst lists the expected version mbedtls
-# mbedtls-3.6.3
-SRCBRANCH_MBEDTLS = "mbedtls-3.6"
-SRC_URI_MBEDTLS = "git://github.com/Mbed-TLS/mbedtls;name=mbedtls;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/mbedtls;branch=${SRCBRANCH_MBEDTLS}"
-SRCREV_mbedtls = "22098d41c6620ce07cf8a0134d37302355e1e5ef"
-
-LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d"
-
-SRC_URI += "\
-    file://0001-fix-arm-re-enable-console-by-default-in-BL31.patch \
-    file://0002-fix-css-don-t-require-the-GICC-frame-to-be-defined-o.patch \
-"
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.14.0.bb new file +16 -0
new file mode 100644
index 000000000000..b84b6ad0cf77
@@ -0,0 +1,16 @@
+require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
+
+# TF-A v2.14.0
+SRC_URI_TRUSTED_FIRMWARE_A = "gitsm://review.trustedfirmware.org/TF-A/trusted-firmware-a;protocol=https"
+SRCREV_tfa = "1d5aa939bc8d3d892e2ed9945fa50e36a1a924cc"
+SRCBRANCH = "master"
+
+LIC_FILES_CHKSUM += "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e"
+
+# in TF-A src, docs/getting_started/prerequisites.rst lists the expected version mbedtls
+# mbedtls-3.6.5
+SRCBRANCH_MBEDTLS = "mbedtls-3.6"
+SRC_URI_MBEDTLS = "gitsm://github.com/Mbed-TLS/mbedtls;name=mbedtls;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/mbedtls;branch=${SRCBRANCH_MBEDTLS}"
+SRCREV_mbedtls = "e185d7fd85499c8ce5ca2a54f5cf8fe7dbe3f8df"
+
+LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d"
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +5 -5
index f5f15c90900d..6d7f7c3e428a 100644
@@ -1,16 +1,16 @@
 require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
 
-# TF-A master, tag: v2.14-rc1
-SRCREV_tfa = "96147cc84b7dd8b4f53c9fed553b0c61af060898"
+# TF-A master, tag: v2.14
+SRCREV_tfa = "1d5aa939bc8d3d892e2ed9945fa50e36a1a924cc"
 SRCBRANCH = "master"
 
 LIC_FILES_CHKSUM += "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e"
 
 # in TF-A src, docs/getting_started/prerequisites.rst lists the expected version mbedtls
-# mbedtls-3.6.3
+# mbedtls-3.6.5
 SRCBRANCH_MBEDTLS = "mbedtls-3.6"
-SRC_URI_MBEDTLS = "git://github.com/Mbed-TLS/mbedtls;name=mbedtls;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/mbedtls;branch=${SRCBRANCH_MBEDTLS}"
-SRCREV_mbedtls = "22098d41c6620ce07cf8a0134d37302355e1e5ef"
+SRC_URI_MBEDTLS = "gitsm://github.com/Mbed-TLS/mbedtls;name=mbedtls;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/mbedtls;branch=${SRCBRANCH_MBEDTLS}"
+SRCREV_mbedtls = "e185d7fd85499c8ce5ca2a54f5cf8fe7dbe3f8df"
 
 LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d"
 
Signature · 1 line
2.50.1 (Apple Git-155)
author
#1 lore raw

PATCH 2/2 arm/edk2-firmware: update to edk2-stable202511

Update edk2-firmware and edk2-basetools to the 202511 stable release.

Patches from upstream were needed to get it compiling with clang.

edk2 dropped support for 32bit arm and x86, see
https://edk2.groups.io/g/devel/topic/rfc_remove_ovmf_ia32_and/114152215
Therefore, we're dropping qemuarm edk2 testing and relevant bits

---
 .gitlab-ci.yml                                |   1 -
 .../cases/parselogs-ignores-sbsa-ref.txt      |   3 -
 ...508.bb => edk2-basetools-native_202511.bb} |   2 +-
 .../recipes-bsp/uefi/edk2-firmware_%.bbappend |  11 --
 .../recipes-bsp/uefi/edk2-firmware_202508.bb  |   9 --
 .../recipes-bsp/uefi/edk2-firmware_202511.bb  |   7 +
 ...s-in-MiscChassisManufacturerFunction.patch | 148 ++++++++++++++++++
 ...def-Use-LLD-to-link-ACPI-table-binar.patch |  42 +++++
 .../uefi/files/edk2_fix_epoch.patch           |  33 ----
 ...02-Enforce-using-good-old-BFD-linker.patch |  10 +-
 meta-arm/recipes-bsp/uefi/sbsa-acs_7.2.2.bb   |   2 +-
 11 files changed, 204 insertions(+), 64 deletions(-)
 rename meta-arm/recipes-bsp/uefi/{edk2-basetools-native_202508.bb => edk2-basetools-native_202511.bb} (93%)
 delete mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_202508.bb
 create mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_202511.bb
 create mode 100644 meta-arm/recipes-bsp/uefi/files/0001-ArmPkg-Fix-errors-in-MiscChassisManufacturerFunction.patch
 create mode 100644 meta-arm/recipes-bsp/uefi/files/0001-BaseTools-tools_def-Use-LLD-to-link-ACPI-table-binar.patch
 delete mode 100644 meta-arm/recipes-bsp/uefi/files/edk2_fix_epoch.patch
.gitlab-ci.yml +0 -1
index 095a1addc21b..ef7cf1904589 100644
@@ -308,7 +308,6 @@ qemuarm:
   parallel:
     matrix:
       - TOOLCHAINS: [gcc, clang]
-        FIRMWARE: edk2
         TESTING: testimage
       - DISTRO: poky-tiny
         TESTING: testimage
meta-arm-bsp/lib/oeqa/runtime/cases/parselogs-ignores-sbsa-ref.txt +0 -3
index fab5cc623354..99e6fee7a452 100644
@@ -1,6 +1,3 @@
-# The release of EDK2 after 202402 should fix this
-NUMA: Failed to initialise from firmware
-
 # TODO: we should be using bochsdrm over efifb?
 efifb: cannot reserve video memory at 0x80000000
 
meta-arm/recipes-bsp/uefi/edk2-basetools-native_202511.bb renamed from meta-arm/recipes-bsp/uefi/edk2-basetools-native_202508.bb +1 -1
similarity index 93%
rename from meta-arm/recipes-bsp/uefi/edk2-basetools-native_202508.bb
rename to meta-arm/recipes-bsp/uefi/edk2-basetools-native_202511.bb
index 3c47b91a9069..7f12b31507a3 100644
@@ -10,7 +10,7 @@ LICENSE = "BSD-2-Clause-Patent"
 SRC_URI = "git://github.com/tianocore/edk2.git;branch=master;protocol=https"
 LIC_FILES_CHKSUM = "file://License.txt;md5=2b415520383f7964e96700ae12b4570a"
 
-SRCREV = "d46aa46c8361194521391aa581593e556c707c6e"
+SRCREV = "46548b1adac82211d8d11da12dd914f41e7aa775"
 
 UPSTREAM_CHECK_GITTAGREGEX = "^edk2-stable(?P<pver>\d+)$"
 
meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend +0 -11
index 64ec53b35791..b806bf8768e8 100644
@@ -5,17 +5,6 @@ EDK2_BIN_NAME:qemuarm64      = "QEMU_EFI.fd"
 # No need for PXE booting in qemu, disable to reduce unnecessary noise
 EDK2_EXTRA_BUILD:qemuarm64 += " -D NETWORK_PXE_BOOT_ENABLE=FALSE "
 
-COMPATIBLE_MACHINE:qemuarm = "qemuarm"
-EDK2_PLATFORM:qemuarm      = "ArmVirtQemu-ARM"
-EDK2_PLATFORM_DSC:qemuarm  = "ArmVirtPkg/ArmVirtQemu.dsc"
-EDK2_BIN_NAME:qemuarm      = "QEMU_EFI.fd"
-# No need for PXE booting in qemu, disable to reduce unnecessary noise
-EDK2_EXTRA_BUILD:qemuarm += " -D NETWORK_PXE_BOOT_ENABLE=FALSE "
-
 do_install:append:qemuarm64() {
     install ${B}/Build/${EDK2_PLATFORM}/${EDK2_BUILD_MODE}_${EDK_COMPILER}/FV/${EDK2_BIN_NAME} ${D}/firmware/
 }
-
-do_install:append:qemuarm() {
-    install ${B}/Build/${EDK2_PLATFORM}/${EDK2_BUILD_MODE}_${EDK_COMPILER}/FV/${EDK2_BIN_NAME} ${D}/firmware/
-}
meta-arm/recipes-bsp/uefi/edk2-firmware_202508.bb deleted +0 -9
deleted file mode 100644
index 7d766d594d85..000000000000
@@ -1,9 +0,0 @@
-require recipes-bsp/uefi/edk2-firmware.inc
-
-SRCREV_edk2           ?= "d46aa46c8361194521391aa581593e556c707c6e"
-SRCREV_edk2-platforms ?= "d82aa92c1d360c1b53ccad4dc45bdd8164a560d5"
-
-SRC_URI += "file://edk2_fix_epoch.patch"
-
-#FIXME - arm32 doesn't work with clang due to a linker issue
-TOOLCHAIN:arm = "gcc"
meta-arm/recipes-bsp/uefi/edk2-firmware_202511.bb new file +7 -0
new file mode 100644
index 000000000000..c9871e10d557
@@ -0,0 +1,7 @@
+require recipes-bsp/uefi/edk2-firmware.inc
+
+SRCREV_edk2           ?= "46548b1adac82211d8d11da12dd914f41e7aa775"
+SRCREV_edk2-platforms ?= "675f692ace4ae501c7f6f700cff364b13960e74e"
+
+SRC_URI += "file://0001-BaseTools-tools_def-Use-LLD-to-link-ACPI-table-binar.patch \
+            file://0001-ArmPkg-Fix-errors-in-MiscChassisManufacturerFunction.patch"
meta-arm/recipes-bsp/uefi/files/0001-ArmPkg-Fix-errors-in-MiscChassisManufacturerFunction.patch new file +148 -0

148 lines not on this page · raw message

meta-arm/recipes-bsp/uefi/files/0001-BaseTools-tools_def-Use-LLD-to-link-ACPI-table-binar.patch new file +42 -0

42 lines not on this page · raw message

meta-arm/recipes-bsp/uefi/files/edk2_fix_epoch.patch deleted +0 -33
deleted file mode 100644
index d128df46bf12..000000000000
@@ -1,33 +0,0 @@
-From ef9dfeb6e96bf7f71162691a78d6b82c9516c0c0 Mon Sep 17 00:00:00 2001
-From: Mikko Rapeli <[email protected]>
-Date: Tue, 1 Apr 2025 10:34:31 -0400
-Subject: [PATCH] edk2-firmware: fix SOURCE_DATE_EPOCH use
-
-printenv host tool is not exposed to recipes so
-just set epoch using SOURCE_DATE_EPOCH which is always
-set. Fixes compile error:
-
-Building ... ../build/tmp_zynqmp-kria-starter-psa/work/zynqmp_kria_starter_psa-poky-linux/edk2-firmware/202411/edk2/MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf [AARCH64]
-../build/tmp_zynqmp-kria-starter-psa/work/zynqmp_kria_starter_psa-poky-linux/edk2-firmware/202411/edk2/EmbeddedPkg/Library/VirtualRealTimeClockLib/VirtualRealTimeClockLib.c: In function 'LibGetTime':
-<command-line>: error: stray '`' in program
-../build/tmp_zynqmp-kria-starter-psa/work/zynqmp_kria_starter_psa-poky-linux/edk2-firmware/202411/edk2/EmbeddedPkg/Library/VirtualRealTimeClockLib/VirtualRealTimeClockLib.c:89:20: note: in expansion of macro 'BUILD_EPOCH'
-   89 |     EpochSeconds = BUILD_EPOCH;
-      |                    ^~~~~~~~~~~
-
-Signed-off-by: Mikko Rapeli <[email protected]>
-
-Upstream-Status: Inappropriate [OE specific build config fix, though filed as https://github.com/tianocore/edk2/issues/10910]
----
- .../Library/VirtualRealTimeClockLib/VirtualRealTimeClockLib.inf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/EmbeddedPkg/Library/VirtualRealTimeClockLib/VirtualRealTimeClockLib.inf b/EmbeddedPkg/Library/VirtualRealTimeClockLib/VirtualRealTimeClockLib.inf
-index 285e880daab8..e1c986a6532d 100644
---- a/EmbeddedPkg/Library/VirtualRealTimeClockLib/VirtualRealTimeClockLib.inf
-+++ b/EmbeddedPkg/Library/VirtualRealTimeClockLib/VirtualRealTimeClockLib.inf
-@@ -34,4 +34,4 @@
- 
- # Current usage of this library expects GCC in a UNIX-like shell environment with the date command
- [BuildOptions]
--  GCC:*_*_*_CC_FLAGS = -DBUILD_EPOCH=`printenv SOURCE_DATE_EPOCH || date +%s`
-+  GCC:*_*_*_CC_FLAGS = -DBUILD_EPOCH=${SOURCE_DATE_EPOCH}
meta-arm/recipes-bsp/uefi/sbsa-acs/0002-Enforce-using-good-old-BFD-linker.patch +5 -5
index c05ef32479f3..42523d0e9a1c 100644
@@ -1,4 +1,4 @@
-From da0d96f0dc5fceafa34a7cc7d4d05f6f89336a87 Mon Sep 17 00:00:00 2001
+From af134611c744322e1d159794c426fbdd02e151cc Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Wed, 7 Apr 2021 00:16:07 -0400
 Subject: [PATCH] Enforce using good old BFD linker
@@ -25,15 +25,15 @@ Signed-off-by: Khem Raj <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
-index 0caa1c90018f..0b62fdc9ee72 100755
+index 90a389bdff07..93f7b5cde437 100755
 --- a/BaseTools/Conf/tools_def.template
 +++ b/BaseTools/Conf/tools_def.template
-@@ -928,7 +928,7 @@ DEFINE GCC_ARM_CC_XIPFLAGS         = -mno-unaligned-access
+@@ -839,7 +839,7 @@ DEFINE GCC_LOONGARCH64_CC_FLAGS    = DEF(GCC_ALL_CC_FLAGS) -mabi=lp64d -fno-asyn
  DEFINE GCC_AARCH64_CC_FLAGS        = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -fno-short-enums -fverbose-asm -funsigned-char  -ffunction-sections -fdata-sections -Wno-address -fno-asynchronous-unwind-tables -fno-unwind-tables -fno-pic -fno-pie -ffixed-x18 -mstack-protector-guard=global
  DEFINE GCC_AARCH64_CC_XIPFLAGS     = -mstrict-align -mgeneral-regs-only
  DEFINE GCC_RISCV64_CC_XIPFLAGS     = -mstrict-align -mgeneral-regs-only
 -DEFINE GCC_DLINK2_FLAGS_COMMON     = -Wl,--script=$(EDK_TOOLS_PATH)/Scripts/GccBase.lds
 +DEFINE GCC_DLINK2_FLAGS_COMMON     = -fuse-ld=bfd -Wl,--script=$(EDK_TOOLS_PATH)/Scripts/GccBase.lds
- DEFINE GCC_ARM_AARCH64_DLINK_COMMON= -Wl,--emit-relocs -nostdlib -Wl,--gc-sections -u $(IMAGE_ENTRY_POINT) -Wl,-e,$(IMAGE_ENTRY_POINT),-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map
  DEFINE GCC_LOONGARCH64_DLINK_COMMON= -Wl,--emit-relocs -nostdlib -Wl,--gc-sections -u $(IMAGE_ENTRY_POINT) -Wl,-e,$(IMAGE_ENTRY_POINT),-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map
- DEFINE GCC_ARM_DLINK_FLAGS         = DEF(GCC_ARM_AARCH64_DLINK_COMMON) -z common-page-size=0x20 -Wl,--pic-veneer
+ DEFINE GCC_AARCH64_DLINK_FLAGS     = -Wl,--emit-relocs -nostdlib -Wl,--gc-sections -u $(IMAGE_ENTRY_POINT) -Wl,-e,$(IMAGE_ENTRY_POINT),-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map -z common-page-size=0x20
+ DEFINE GCC_LOONGARCH64_DLINK_FLAGS = DEF(GCC_LOONGARCH64_DLINK_COMMON) -z common-page-size=0x20
meta-arm/recipes-bsp/uefi/sbsa-acs_7.2.2.bb +1 -1
index c037725ac66f..5952c25a438e 100644
@@ -1,4 +1,4 @@
-require recipes-bsp/uefi/edk2-firmware_202508.bb
+require recipes-bsp/uefi/edk2-firmware_202511.bb
 PROVIDES:remove = "virtual/bootloader"
 
 LICENSE += "& Apache-2.0"
Signature · 1 line
2.50.1 (Apple Git-155)
Applied
#2 lore raw
In reply to Jon Mason
Quoted 9 lines · Jon Mason

Add support for v2.14.0, and update corstone1000 config and patches to use it. TF-A seems to have changed their poetry settings from POETRY to host-poetry (when specifying an alternative location/disabling). So, it is necessary to modify that for all platforms using COT and v2.14.0

NOTE: sbsa-ref is having issues with fip.bin being too large. So, set the version to the LTS until that is resolved.

[...]

Applied, thanks!

[1/2] arm/trusted-firmware-a: add v2.14.0 support

      commit: a95040828cf077e83c48b8c2dc4b3698fc8227cd
[2/2] arm/edk2-firmware: update to edk2-stable202511
      commit: f6c78d277083b3a8498742530f86d392e33c8d09

Best regards,

Signature · 1 line
Jon Mason <[email protected]>