Skip to contentSkip to conversation

arm/trusted-firmware-m: drop unreferenced patch

PATCH Applied Jon Mason 2 participants 6 messages Jan 10 – Jan 12

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/5 arm/trusted-firmware-m: drop unreferenced patch

Forgot to remove this patch in the previous commit. Removing now.

---
 ...L2-and-TF-M-binary-address-alignment.patch | 134 ------------------
 1 file changed, 134 deletions(-)
 delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-m/files/0001-Add-checks-for-BL2-and-TF-M-binary-address-alignment.patch
meta-arm/recipes-bsp/trusted-firmware-m/files/0001-Add-checks-for-BL2-and-TF-M-binary-address-alignment.patch deleted +0 -134
deleted file mode 100644
index 4bed335388db..000000000000
@@ -1,134 +0,0 @@
-From 57a1a4cbbc40342c88a6fe2f4eaeadbd15dcbfa6 Mon Sep 17 00:00:00 2001
-From: Harsimran Singh Tungal <[email protected]>
-Date: Fri, 22 Aug 2025 20:34:10 +0000
-Subject: [PATCH 2/2] Add checks for BL2 and TF-M binary address alignment
-
-Add relevant checks in GCC linker scripts to validate if the
-BL2 and TF-M binary addresses are aligned to 0x100 byte boundary
-for Cortex-M0+ based platforms.
-
-Upstream-Status: Backport [069a9b5a3acece140369ff07281b26e25bc50026]
-Signed-off-by: Harsimran Singh Tungal <[email protected]>
----
- platform/ext/common/gcc/tfm_common_bl2.ld           | 12 +++++++++++-
- platform/ext/common/gcc/tfm_common_s.ld.template    | 13 ++++++++++++-
- platform/ext/common/gcc/tfm_isolation_s.ld.template | 13 ++++++++++++-
- platform/ext/common/tfm_s_linker_alignments.h       |  9 ++++++++-
- 4 files changed, 43 insertions(+), 4 deletions(-)
-
-diff --git a/platform/ext/common/gcc/tfm_common_bl2.ld b/platform/ext/common/gcc/tfm_common_bl2.ld
-index eee915210..65d75980b 100644
---- a/platform/ext/common/gcc/tfm_common_bl2.ld
-+++ b/platform/ext/common/gcc/tfm_common_bl2.ld
-@@ -1,5 +1,7 @@
- ;/*
--; * Copyright (c) 2022-2024 Arm Limited. All rights reserved.
-+; * SPDX-FileCopyrightText: Copyright The TrustedFirmware-M Contributors
-+; *
-+; * SPDX-License-Identifier: BSD-3-Clause
- ; *
- ; * Licensed under the Apache License, Version 2.0 (the "License");
- ; * you may not use this file except in compliance with the License.
-@@ -33,6 +35,14 @@ MEMORY
-     RAM   (rwx) : ORIGIN = BL2_DATA_START, LENGTH = BL2_DATA_SIZE
- }
- 
-+/* For Cortex-M0+ VTOR: 256-byte vector table is at the offset 0x00 of the image.
-+ * To keep that table in one block, the image base must be a multiple of 0x100.
-+ * For reference: https://developer.arm.com/documentation/ddi0419/latest/
-+ */
-+#if defined(__ARM_ARCH_6M__)
-+CHECK_ALIGNMENT_256(BL2_CODE_START)
-+#endif
-+
- __heap_size__  = BL2_HEAP_SIZE;
- __msp_stack_size__ = BL2_MSP_STACK_SIZE;
- 
-diff --git a/platform/ext/common/gcc/tfm_common_s.ld.template b/platform/ext/common/gcc/tfm_common_s.ld.template
-index 023f2224e..db6a2d570 100644
---- a/platform/ext/common/gcc/tfm_common_s.ld.template
-+++ b/platform/ext/common/gcc/tfm_common_s.ld.template
-@@ -1,5 +1,8 @@
- ;/*
--; * Copyright (c) 2009-2024 Arm Limited
-+; * SPDX-FileCopyrightText: Copyright The TrustedFirmware-M Contributors
-+; *
-+; * SPDX-License-Identifier: BSD-3-Clause
-+; *
- ; * Copyright (c) 2022-2024 Cypress Semiconductor Corporation (an Infineon company)
- ; * or an affiliate of Cypress Semiconductor Corporation. All rights reserved.
- ; *
-@@ -38,6 +41,14 @@ MEMORY
- #endif
- }
- 
-+/* For Cortex-M0+ VTOR: 256-byte vector table is at the offset 0x00 of the image.
-+ * To keep that table in one block, the image base must be a multiple of 0x100.
-+ * For reference: https://developer.arm.com/documentation/ddi0419/latest/
-+ */
-+#if defined(__ARM_ARCH_6M__)
-+CHECK_ALIGNMENT_256(S_CODE_START)
-+#endif
-+
- #ifndef TFM_LINKER_VENEERS_START
- #define TFM_LINKER_VENEERS_START ALIGN(TFM_LINKER_VENEERS_ALIGNMENT)
- #endif
-diff --git a/platform/ext/common/gcc/tfm_isolation_s.ld.template b/platform/ext/common/gcc/tfm_isolation_s.ld.template
-index 00693a19d..6c4f13efa 100644
---- a/platform/ext/common/gcc/tfm_isolation_s.ld.template
-+++ b/platform/ext/common/gcc/tfm_isolation_s.ld.template
-@@ -1,5 +1,8 @@
- ;/*
--; * Copyright (c) 2009-2024 Arm Limited
-+; * SPDX-FileCopyrightText: Copyright The TrustedFirmware-M Contributors
-+; *
-+; * SPDX-License-Identifier: BSD-3-Clause
-+; *
- ; * Copyright (c) 2022-2024 Cypress Semiconductor Corporation (an Infineon company)
- ; * or an affiliate of Cypress Semiconductor Corporation. All rights reserved.
- ; *
-@@ -47,6 +50,14 @@ MEMORY
- #endif
- }
- 
-+/* For Cortex-M0+ VTOR: 256-byte vector table is at the offset 0x00 of the image.
-+ * To keep that table in one block, the image base must be a multiple of 0x100.
-+ * For reference: https://developer.arm.com/documentation/ddi0419/latest/
-+ */
-+#if defined(__ARM_ARCH_6M__)
-+CHECK_ALIGNMENT_256(S_CODE_START)
-+#endif
-+
- #ifndef TFM_LINKER_VENEERS_START
- #define TFM_LINKER_VENEERS_START ALIGN(TFM_LINKER_VENEERS_ALIGNMENT)
- #endif
-diff --git a/platform/ext/common/tfm_s_linker_alignments.h b/platform/ext/common/tfm_s_linker_alignments.h
-index 0d115575c..fb96938c9 100644
---- a/platform/ext/common/tfm_s_linker_alignments.h
-+++ b/platform/ext/common/tfm_s_linker_alignments.h
-@@ -1,7 +1,8 @@
- /*
-  * Copyright (c) 2022 Cypress Semiconductor Corporation (an Infineon company)
-  * or an affiliate of Cypress Semiconductor Corporation. All rights reserved.
-- * Copyright (c) 2024, Arm Limited. All rights reserved.
-+ *
-+ * SPDX-FileCopyrightText: Copyright The TrustedFirmware-M Contributors
-  *
-  * SPDX-License-Identifier: BSD-3-Clause
-  *
-@@ -21,6 +22,12 @@
- 
- #define CHECK_ALIGNMENT_4(size) ASSERT((size) % 4 == 0, #size)
- 
-+/* For Cortex-M0+ VTOR: 256-byte vector table is at the offset 0x00 of the image.
-+ * To keep that table in one block, the image base must be a multiple of 0x100.
-+ * For reference: https://developer.arm.com/documentation/ddi0419/latest/
-+ */
-+#define CHECK_ALIGNMENT_256(addr) ASSERT((addr % 256) == 0, #addr)
-+
- /* Default alignment for linker file sections is set to 32 because ARM TrustZone
-  * protection units (SAU and MPU) require regions to be 32 bytes aligned. */
- #ifndef TFM_LINKER_DEFAULT_ALIGNMENT
--- 
-2.43.0
-
Signature · 1 line
2.50.1 (Apple Git-155)
author
#1 lore raw

PATCH 2/5 arm/hafnium: update to 2.14.0

---
 .../hafnium/{hafnium_2.13.0.bb => hafnium_2.14.0.bb}            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-arm/recipes-bsp/hafnium/{hafnium_2.13.0.bb => hafnium_2.14.0.bb} (97%)
meta-arm/recipes-bsp/hafnium/hafnium_2.14.0.bb renamed from meta-arm/recipes-bsp/hafnium/hafnium_2.13.0.bb +1 -1
similarity index 97%
rename from meta-arm/recipes-bsp/hafnium/hafnium_2.13.0.bb
rename to meta-arm/recipes-bsp/hafnium/hafnium_2.14.0.bb
index d62ea363db23..f8a374b7f05f 100644
@@ -13,7 +13,7 @@ SRC_URI = "gitsm://git.trustedfirmware.org/hafnium/hafnium.git;protocol=https;br
            file://0001-arm-hafnium-fix-kernel-tool-linking.patch  \
            file://0001-work-around-visibility-issue.patch;patchdir=third_party/dtc \
           "
-SRCREV = "92be99ed35cd4eaede402fbb2cea9515fbd2bba5"
+SRCREV = "ce12c6e53838f1cf07d50b616b72db57a81539a4"
 B = "${WORKDIR}/build"
 
 COMPATIBLE_MACHINE ?= "invalid"
Signature · 1 line
2.50.1 (Apple Git-155)
author
#2 lore raw

PATCH 3/5 arm/opencsd: update to 1.7.1

In reply to Jon Mason
---
 .../opencsd/{opencsd_1.6.1.bb => opencsd_1.7.1.bb}              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-arm/recipes-devtools/opencsd/{opencsd_1.6.1.bb => opencsd_1.7.1.bb} (95%)
meta-arm/recipes-devtools/opencsd/opencsd_1.7.1.bb renamed from meta-arm/recipes-devtools/opencsd/opencsd_1.6.1.bb +1 -1
similarity index 95%
rename from meta-arm/recipes-devtools/opencsd/opencsd_1.6.1.bb
rename to meta-arm/recipes-devtools/opencsd/opencsd_1.7.1.bb
index fb132d73dd8c..f8429dbbadc9 100644
@@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ad8cb685eb324d2fa2530b985a43f3e5"
 
 SRC_URI = "git://github.com/Linaro/OpenCSD;protocol=https;branch=master"
-SRCREV = "78141e2f0ef8fb67284cc1a159cb62737666c965"
+SRCREV = "83e4575459305c054ce43f7d5eb5e468e304645c"
 
 COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
 
Signature · 1 line
2.50.1 (Apple Git-155)
author
#3 lore raw

PATCH 4/5 arm/machine-summary: remove gn

In reply to Jon Mason

gn was moved to oe-core. So, we no longer need to track it as part of the meta-arm CI machine-report

---
 scripts/machine-summary.py | 1 -
 1 file changed, 1 deletion(-)
scripts/machine-summary.py +0 -1
index 325d8a65c469..c9c9242af9dc 100755
@@ -141,7 +141,6 @@ def harvest_data(machines, recipes):
 recipes = ("boot-wrapper-aarch64",
            "edk2-firmware",
            "gator-daemon",
-           "gn",
            "hafnium",
            "opencsd",
            "optee-ftpm",
Signature · 1 line
2.50.1 (Apple Git-155)
author
#4 lore raw

PATCH 5/5 arm/boot-wrapper-aarch64: update to latest commit

In reply to Jon Mason
---
 .../boot-wrapper-aarch64/boot-wrapper-aarch64_git.bb            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-arm/recipes-bsp/boot-wrapper-aarch64/boot-wrapper-aarch64_git.bb +1 -1
index ce31bff43aa4..7bbd0c3c9a51 100644
@@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=bb63326febfb5fb909226c8e7ebcef5c"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git;branch=master;protocol=https"
-SRCREV = "ac6742520ded1da30d500f74e8affe86e27cabd5"
+SRCREV = "b621b157b42f1fe398520cf499db88aa654c78e2"
 
 # boot-wrapper doesn't make releases
 UPSTREAM_CHECK_COMMITS = "1"
Signature · 1 line
2.50.1 (Apple Git-155)
Applied
#5 lore raw
In reply to Jon Mason
Quoted 3 lines · Jon Mason

Forgot to remove this patch in the previous commit. Removing now.

Applied, thanks!

[1/5] arm/trusted-firmware-m: drop unreferenced patch

      commit: a04d71be6ddf5efd21d7b6196313fa4bb199b49e
[2/5] arm/hafnium: update to 2.14.0
      commit: f9a5b72d886109e4cd8a269271e74c482798fa2c
[3/5] arm/opencsd: update to 1.7.1
      commit: cd37ca98eda3ea8bc4fab59cbddbb089a0315b42
[4/5] arm/machine-summary: remove gn
      commit: 2869dcc84baafeec55bac393097e71fd17bd6493
[5/5] arm/boot-wrapper-aarch64: update to latest commit
      commit: 0911c33ccd261795198d76714f759b37b956374a

Best regards,

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