Skip to contentSkip to conversation

arm-toolchain/gcc-aarch64-none-elf: upgrade to 12.3.rel1

PATCH Applied Jon Mason 2 participants 7 messages Aug 8, 2023 – Aug 9, 2023

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH v2 1/6 arm-toolchain/gcc-aarch64-none-elf: upgrade to 12.3.rel1

Upgrade the 12.2 recipe to 12.3.

---
 ...one-elf_12.2.rel1.bb => gcc-aarch64-none-elf_12.3.rel1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-arm-toolchain/recipes-devtools/external-arm-toolchain/{gcc-aarch64-none-elf_12.2.rel1.bb => gcc-aarch64-none-elf_12.3.rel1.bb} (82%)
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_12.3.rel1.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_12.2.rel1.bb +2 -2
similarity index 82%
rename from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_12.2.rel1.bb
rename to meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_12.3.rel1.bb
index db8851eb..7d06f291 100644
@@ -12,8 +12,8 @@ LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=0aef214b835259
 LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=7ba3bc8ef145b48e2756a844db2029a3"
 
 SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/arm-gnu-toolchain-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gcc-${HOST_ARCH}"
-SRC_URI[gcc-aarch64.sha256sum] = "570a9bd42e2067d79d59b0747891681ebec66f30d989d17a05856563fe38f78b"
-SRC_URI[gcc-x86_64.sha256sum] = "62d66e0ad7bd7f2a183d236ee301a5c73c737c886c7944aa4f39415aab528daf"
+SRC_URI[gcc-aarch64.sha256sum] = "76ba68db4390b50f0a16386c6a011ec611a35a517ae40b7be008ca7920cfa59f"
+SRC_URI[gcc-x86_64.sha256sum] = "382c8c786285e415bc0ff4df463e101f76d6f69a894b03f132368147c37f0ba7"
 
 S = "${WORKDIR}/arm-gnu-toolchain-${PV}-${HOST_ARCH}-${BINNAME}"
 
Signature · 1 line
2.30.2
author
#1 lore raw

PATCH v2 2/6 arm/edk2: move 202211 recipe to meta-arm-bsp

202211 is only used in meta-arm-bsp, and all other users should be using the latest version. Move it there until n1sdp can be updated to the latest.

---
 .../recipes-bsp/uefi/edk2-firmware_202211.bb                    | 2 +-
 meta-arm/recipes-bsp/uefi/edk2-firmware.inc                     | 1 -
 .../{edk2-firmware_%.bbappend => edk2-firmware_2023%.bbappend}  | 0
 meta-arm/recipes-bsp/uefi/edk2-firmware_202302.bb               | 2 ++
 4 files changed, 3 insertions(+), 2 deletions(-)
 rename {meta-arm => meta-arm-bsp}/recipes-bsp/uefi/edk2-firmware_202211.bb (76%)
 rename meta-arm/recipes-bsp/uefi/{edk2-firmware_%.bbappend => edk2-firmware_2023%.bbappend} (100%)
meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202211.bb renamed from meta-arm/recipes-bsp/uefi/edk2-firmware_202211.bb +1 -1
similarity index 76%
rename from meta-arm/recipes-bsp/uefi/edk2-firmware_202211.bb
rename to meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202211.bb
index 386bed4b..378f5854 100644
@@ -1,4 +1,4 @@
 SRCREV_edk2           ?= "fff6d81270b57ee786ea18ad74f43149b9f03494"
 SRCREV_edk2-platforms ?= "982212662c71b6c734b7578526071d6b78da3bcc"
 
-require edk2-firmware.inc
+require recipes-bsp/uefi/edk2-firmware.inc
meta-arm/recipes-bsp/uefi/edk2-firmware.inc +0 -1
index 4b9eda39..20eea36b 100644
@@ -18,7 +18,6 @@ SRCBRANCH_edk2_platforms = "master"
 SRC_URI = "\
     ${SRC_URI_EDK2};branch=${SRCBRANCH_edk2_platforms};name=edk2;destsuffix=edk2 \
     ${SRC_URI_EDK2_PLATFORMS};branch=${SRCBRANCH_edk2};name=edk2-platforms;destsuffix=edk2/edk2-platforms \
-    file://default.patch;patchdir=edk2-platforms \
 "
 
 SRCREV_FORMAT         = "edk2_edk2-platforms"
meta-arm/recipes-bsp/uefi/edk2-firmware_2023%.bbappend renamed from meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend +0 -0
similarity index 100%
rename from meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend
rename to meta-arm/recipes-bsp/uefi/edk2-firmware_2023%.bbappend
meta-arm/recipes-bsp/uefi/edk2-firmware_202302.bb +2 -0
index fa26c3e3..02738d31 100644
@@ -1,4 +1,6 @@
 SRCREV_edk2           ?= "f80f052277c88a67c55e107b550f504eeea947d3"
 SRCREV_edk2-platforms ?= "65e001a7f2abedf7799cfb36b057326c1540bd47"
 
+SRC_URI:append = " file://default.patch;patchdir=edk2-platforms"
+
 require edk2-firmware.inc
Signature · 1 line
2.30.2
author
#2 lore raw

PATCH v2 3/6 arm-bsp: clean-up patch noise

In reply to Jon Mason
---
 .../0002-feat-corstone1000-bl2-loads-fip-based-on-metadata.patch | 1 -
 .../0001-armv7-adding-generic-timer-access-through-MMIO.patch    | 1 -
 .../0003-HACK-disable-instruction-cache-and-data-cache.patch     | 1 -
 .../optee/files/optee-os/n1sdp/0004-Handle-logging-syscall.patch | 1 -
 .../psa-apitest/0001-corstone1000-port-crypto-config.patch       | 1 -
 5 files changed, 5 deletions(-)
meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0002-feat-corstone1000-bl2-loads-fip-based-on-metadata.patch +0 -1
index 3afaa4b0..d834e95b 100644
@@ -16,7 +16,6 @@ image starts at fip partition + fip signature area size.
 Upstream-Status: Pending
 Signed-off-by: Mohamed Omar Asaker <[email protected]>
 
-%% original patch: 0002-feat-corstone1000-bl2-loads-fip-based-on-metadata.patch
 ---
  bl2/bl2_main.c                                |  4 +++
  .../corstone1000/common/corstone1000_plat.c   | 32 ++++++-------------
meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone500/0001-armv7-adding-generic-timer-access-through-MMIO.patch +0 -1
index 3d8545ff..1d28631a 100644
@@ -20,7 +20,6 @@ the u-boot initcall level (timer_init) before u-boot relocation.
 Signed-off-by: Rui Miguel Silva <[email protected]>
 Signed-off-by: Abdellatif El Khlifi <[email protected]>
 
-%% original patch: 0001-armv7-adding-generic-timer-access-through-MMIO.patch
 
 Signed-off-by: Rui Miguel Silva <[email protected]>
 ---
meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0003-HACK-disable-instruction-cache-and-data-cache.patch +0 -1
index e8f4cc44..ebe4d726 100644
@@ -12,7 +12,6 @@ and D cache until a proper fix is found.
 
 Signed-off-by: Vishnu Banavath <[email protected]>
 
-%% original patch: 0003-HACK-disable-instruction-cache-and-data-cache.patch
 
 diff --git a/core/arch/arm/kernel/entry_a64.S b/core/arch/arm/kernel/entry_a64.S
 index 875b6e69..594d6928 100644
meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0004-Handle-logging-syscall.patch +0 -1
index 67d98725..ca4405d8 100644
@@ -9,7 +9,6 @@ Subject: [PATCH] Handle logging syscall
 Signed-off-by: Balint Dobszay <[email protected]>
 Change-Id: Ib8151cc9c66aea8bcc8fe8b1ecdc3f9f9c5f14e4
 
-%% original patch: 0004-Handle-logging-syscall.patch
 
 diff --git a/core/arch/arm/kernel/spmc_sp_handler.c b/core/arch/arm/kernel/spmc_sp_handler.c
 index e0fa0aa6..c7a45387 100644
meta-arm-bsp/recipes-security/trusted-services/corstone1000/psa-apitest/0001-corstone1000-port-crypto-config.patch +0 -1
index c7289562..072b50b4 100644
@@ -9,7 +9,6 @@ Subject: [PATCH] corstone1000: port crypto config
 
 Signed-off-by: Satish Kumar <[email protected]>
 
-%% original patch: 0002-corstone1000-port-crypto-config.patch
 
 Signed-off-by: Rui Miguel Silva <[email protected]>
 ---
Signature · 1 line
2.30.2
author
#3 lore raw

PATCH v2 4/6 arm/optee-test: update musl workaround patch

In reply to Jon Mason

Patch was accepted upstream (see
https://github.com/OP-TEE/optee_test/pull/688). Use the commit that was backported and specify it as so.

---
 ...on_1000-remove-unneeded-stat.h-include.patch} | 16 +++++++++++++---
 .../recipes-security/optee/optee-test_3.22.0.bb  |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)
 rename meta-arm/recipes-security/optee/optee-test/{musl-workaround.patch => 0001-xtest-regression_1000-remove-unneeded-stat.h-include.patch} (60%)
meta-arm/recipes-security/optee/optee-test/0001-xtest-regression_1000-remove-unneeded-stat.h-include.patch renamed from meta-arm/recipes-security/optee/optee-test/musl-workaround.patch +13 -3
similarity index 60%
rename from meta-arm/recipes-security/optee/optee-test/musl-workaround.patch
rename to meta-arm/recipes-security/optee/optee-test/0001-xtest-regression_1000-remove-unneeded-stat.h-include.patch
index eed1bd4b..5e075d6f 100644
@@ -1,3 +1,8 @@
+From ddd5ad19732c9a2a9fe236662a8d264c6b2b1a0a Mon Sep 17 00:00:00 2001
+From: Jon Mason <[email protected]>
+Date: Sat, 15 Jul 2023 15:08:43 -0400
+Subject: [PATCH] xtest: regression_1000: remove unneeded stat.h include
+
 Hack to work around musl compile error:
  In file included from optee-test/3.17.0-r0/recipe-sysroot/usr/include/sys/stat.h:23,
                   from optee-test/3.17.0-r0/git/host/xtest/regression_1000.c:25:
@@ -7,14 +12,19 @@ Hack to work around musl compile error:
 
 stat.h is not needed, since it is not being used in this file.  So removing it.
 
-Upstream-Status: Pending [Not submitted to upstream yet]
+Upstream-Status: Backport [https://github.com/OP-TEE/optee_test/pull/688]
 Signed-off-by: Jon Mason <[email protected]>
+Reviewed-by: Jerome Forissier <[email protected]>
+Acked-by: Jens Wiklander <[email protected]>
+---
+ host/xtest/regression_1000.c | 1 -
+ 1 file changed, 1 deletion(-)
 
 diff --git a/host/xtest/regression_1000.c b/host/xtest/regression_1000.c
-index 4264884..7f1baca 100644
+index cd11f933ce43..8e338e59da21 100644
 --- a/host/xtest/regression_1000.c
 +++ b/host/xtest/regression_1000.c
-@@ -22,7 +22,6 @@
+@@ -24,7 +24,6 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
meta-arm/recipes-security/optee/optee-test_3.22.0.bb +1 -1
index 3b9632fa..5d3f5a8a 100644
@@ -1,7 +1,7 @@
 require optee-test.inc
 
 SRC_URI += " \
-    file://musl-workaround.patch \
+    file://0001-xtest-regression_1000-remove-unneeded-stat.h-include.patch \
    "
 SRCREV = "a286b57f1721af215ace318d5807e63f40186df6"
 
Signature · 1 line
2.30.2
author
#4 lore raw

PATCH v2 5/6 arm-bsp/tc1: remove trusted-firmware-m target

In reply to Jon Mason

We aren't testing it and it's not compiling cleanly in v1.8, let's just drop it for now.

---
 ci/tc1.yml                                                     | 1 -
 .../trusted-firmware-m/trusted-firmware-m_1.7.%.bbappend       | 3 ---
 2 files changed, 4 deletions(-)
ci/tc1.yml +0 -1
index 66c5ab99..77d67d2f 100644
@@ -9,4 +9,3 @@ machine: tc1
 
 target:
   - core-image-minimal
-  - trusted-firmware-m
meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.7.%.bbappend +0 -3
index a558cfee..ec0e483b 100644
@@ -4,6 +4,3 @@ MACHINE_TFM_REQUIRE ?= ""
 MACHINE_TFM_REQUIRE:corstone1000 = "trusted-firmware-m-1.7.0-corstone1000.inc"
 
 require ${MACHINE_TFM_REQUIRE}
-
-COMPATIBLE_MACHINE:tc = "(tc1)"
-TFM_PLATFORM:tc = "arm/rss/tc"
Signature · 1 line
2.30.2
author
#5 lore raw

PATCH v2 6/6 arm/trusted-firmware-m: upgrade to v1.8.0

In reply to Jon Mason

Upgrade tf-m to v1.8.0 and update the related components as well

---
 ...1000-Increase-BL2-size-in-flash-lay.patch} |    8 +-
 ...e-sure-to-write-fwu-metadata-to-repl.patch |   43 -
 ...Corstone1000-Increase-BL2_DATA_SIZE.patch} |    8 +-
 ...e1000-get-fwu-and-private-metadata-f.patch |  307 -----
 ...1000-Calculate-the-new-CRC32-value-.patch} |   10 +-
 ...orstone1000-Add-watchdog_reset_timer.patch |   47 -
 ...one1000-Replace-MCUBOOT-BL1-by-TFM-s.patch | 1034 -----------------
 ...d-firmware-m-disable-fatal-warnings.patch} |    5 +-
 ...e1000-Replace-MCUBOOT-BL1-by-TFM-s-B.patch |  202 ----
 ...rm-corstone1000-Reorganize-bl2-files.patch |   61 -
 ...rstone1000-Fix-linker-script-comment.patch |   47 -
 ...e1000-Fix-linkerscripts-copyright-ye.patch |   39 -
 ...e1000-fix-flash-reading-issue-for-fi.patch |   38 -
 ...e1000-Adds-compiler-flags-to-FWU-age.patch |  273 -----
 ...ne1000-adjust-PS-asset-configuration.patch |   29 -
 ...rstone1000-Increase-number-of-assets.patch |   36 -
 ...nc => trusted-firmware-m-corstone1000.inc} |   28 +-
 ...bbappend => trusted-firmware-m_%.bbappend} |    2 +-
 .../trusted-firmware-m/files/rwx.patch        |   24 -
 ...c.inc => trusted-firmware-m-1.8.0-src.inc} |   24 +-
 ...rusted-firmware-m-scripts-native_1.8.0.bb} |    2 +-
 .../trusted-firmware-m/trusted-firmware-m.inc |    2 -
 ...m_1.7.0.bb => trusted-firmware-m_1.8.0.bb} |    2 +-
 23 files changed, 31 insertions(+), 2240 deletions(-)
 rename meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/{0013-Platform-corstone1000-Increase-BL2-size-in-flash-lay.patch => 0001-Platform-corstone1000-Increase-BL2-size-in-flash-lay.patch} (87%)
 delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0001-Platform-corstone1000-make-sure-to-write-fwu-metadata-to-repl.patch
 rename meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/{0014-Platform-Corstone1000-Increase-BL2_DATA_SIZE.patch => 0002-Platform-Corstone1000-Increase-BL2_DATA_SIZE.patch} (90%)
 delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0002-Platform-corstone1000-get-fwu-and-private-metadata-f.patch
 rename meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/{0015-Platform-Corstone1000-Calculate-the-new-CRC32-value-.patch => 0003-Platform-Corstone1000-Calculate-the-new-CRC32-value-.patch} (93%)
 delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0003-Platform-corstone1000-Add-watchdog_reset_timer.patch
 delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0004-Platform-corstone1000-Replace-MCUBOOT-BL1-by-TFM-s.patch
 rename meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/{rwx.patch => 0004-arm-trusted-firmware-m-disable-fatal-warnings.patch} (87%)
 delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0005-Platform-corstone1000-Replace-MCUBOOT-BL1-by-TFM-s-B.patch
 delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0006-Platform-corstone1000-Reorganize-bl2-files.patch
 delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0007-Platform-corstone1000-Fix-linker-script-comment.patch
 delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0008-Platform-corstone1000-Fix-linkerscripts-copyright-ye.patch
 delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0009-Platform-corstone1000-fix-flash-reading-issue-for-fi.patch
 delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0010-Platform-corstone1000-Adds-compiler-flags-to-FWU-age.patch
 delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0011-Platform-corstone1000-adjust-PS-asset-configuration.patch
 delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0012-Platform-corstone1000-Increase-number-of-assets.patch
 rename meta-arm-bsp/recipes-bsp/trusted-firmware-m/{trusted-firmware-m-1.7.0-corstone1000.inc => trusted-firmware-m-corstone1000.inc} (61%)
 rename meta-arm-bsp/recipes-bsp/trusted-firmware-m/{trusted-firmware-m_1.7.%.bbappend => trusted-firmware-m_%.bbappend} (54%)
 delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-m/files/rwx.patch
 rename meta-arm/recipes-bsp/trusted-firmware-m/{trusted-firmware-m-1.7.0-src.inc => trusted-firmware-m-1.8.0-src.inc} (80%)
 rename meta-arm/recipes-bsp/trusted-firmware-m/{trusted-firmware-m-scripts-native_1.7.0.bb => trusted-firmware-m-scripts-native_1.8.0.bb} (57%)
 rename meta-arm/recipes-bsp/trusted-firmware-m/{trusted-firmware-m_1.7.0.bb => trusted-firmware-m_1.8.0.bb} (52%)
meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0001-Platform-corstone1000-Increase-BL2-size-in-flash-lay.patch renamed from meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0013-Platform-corstone1000-Increase-BL2-size-in-flash-lay.patch +3 -5
similarity index 87%
rename from meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0013-Platform-corstone1000-Increase-BL2-size-in-flash-lay.patch
rename to meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0001-Platform-corstone1000-Increase-BL2-size-in-flash-lay.patch
index 92d17cc0..98dabbe9 100644
@@ -1,12 +1,13 @@
-From 77c5a3bd090955e48ffca92bf9535185d26e9017 Mon Sep 17 00:00:00 2001
+From 60598f3b44237bd5038e33400e749ec1e7e8fbda Mon Sep 17 00:00:00 2001
 From: Emekcan Aras <[email protected]>
 Date: Mon, 15 May 2023 10:42:23 +0100
-Subject: [PATCH 2/4] Platform: corstone1000: Increase BL2 size in flash layout
+Subject: [PATCH] Platform: corstone1000: Increase BL2 size in flash layout
 
 Increases BL2 size to align with the flash page size in corstone1000.
 
 Signed-off-by: Emekcan Aras <[email protected]>
 Upstream-Status: Pending [Not submitted to upstream yet]
+
 ---
  platform/ext/target/arm/corstone1000/partition/flash_layout.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
@@ -24,6 +25,3 @@ index 41b4c6323f..bfe8c4fb3c 100644
  #define SE_BL2_BANK_0_OFFSET            (0x9000)  /* 72nd LBA */
  #define SE_BL2_BANK_1_OFFSET            (0x1002000)  /* 32784th LBA */
  
--- 
-2.17.1
-
meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0001-Platform-corstone1000-make-sure-to-write-fwu-metadata-to-repl.patch deleted +0 -43

43 lines not on this page · raw message

meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0002-Platform-Corstone1000-Increase-BL2_DATA_SIZE.patch renamed from meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0014-Platform-Corstone1000-Increase-BL2_DATA_SIZE.patch +3 -5
similarity index 90%
rename from meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0014-Platform-Corstone1000-Increase-BL2_DATA_SIZE.patch
rename to meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0002-Platform-Corstone1000-Increase-BL2_DATA_SIZE.patch
index e2844bac..d348d02d 100644
@@ -1,13 +1,14 @@
-From 17244ac692495c23008ff784611d0ee1d42c83dc Mon Sep 17 00:00:00 2001
+From b05fb661b3afc3ed8e3d4817df2798e9d4877b39 Mon Sep 17 00:00:00 2001
 From: Emekcan Aras <[email protected]>
 Date: Mon, 15 May 2023 10:46:18 +0100
-Subject: [PATCH 3/4] Platform: Corstone1000: Increase BL2_DATA_SIZE
+Subject: [PATCH] Platform: Corstone1000: Increase BL2_DATA_SIZE
 
 Increases BL2_DATA_SIZE to accommodate the changes in
 metadata_write/read.
 
 Signed-off-by: Emekcan Aras <[email protected]>
 Upstream-Status: Pending [Not submitted to upstream yet]
+
 ---
  platform/ext/target/arm/corstone1000/partition/region_defs.h | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
@@ -28,6 +29,3 @@ index abfac39b62..e7f0bad2ba 100644
  #define BL2_DATA_LIMIT    (BL2_DATA_START + BL2_DATA_SIZE - 1)
  
  /* SE BL1 regions */
--- 
-2.17.1
-
meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0002-Platform-corstone1000-get-fwu-and-private-metadata-f.patch deleted +0 -307

307 lines not on this page · raw message

meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0003-Platform-Corstone1000-Calculate-the-new-CRC32-value-.patch renamed from meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0015-Platform-Corstone1000-Calculate-the-new-CRC32-value-.patch +4 -6
similarity index 93%
rename from meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0015-Platform-Corstone1000-Calculate-the-new-CRC32-value-.patch
rename to meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0003-Platform-Corstone1000-Calculate-the-new-CRC32-value-.patch
index fd977ac2..bf7aba8d 100644
@@ -1,8 +1,8 @@
-From 83e423497afecc202a3a50c3e472161390056ebd Mon Sep 17 00:00:00 2001
+From 88cfce2e04913d48ec8636b6a3550d71ebdd49c4 Mon Sep 17 00:00:00 2001
 From: Emekcan Aras <[email protected]>
 Date: Mon, 15 May 2023 10:47:27 +0100
-Subject: [PATCH 4/4] Platform: Corstone1000: Calculate the new CRC32 value
- after changing the metadata
+Subject: [PATCH] Platform: Corstone1000: Calculate the new CRC32 value after
+ changing the metadata
 
 Calculates the new CRC32 value for the metadata struct after chaing a value
 during the capsule update. It also updates the CRC32 field in the metadata
@@ -13,6 +13,7 @@ the boot anymore.
 
 Signed-off-by: Emekcan Aras <[email protected]>
 Upstream-Status: Pending [Not submitted to upstream yet]
+
 ---
  .../arm/corstone1000/fw_update_agent/fwu_agent.c       | 10 +++++++---
  1 file changed, 7 insertions(+), 3 deletions(-)
@@ -66,6 +67,3 @@ index afd8d66e42..f564f2902c 100644
          if (priv_metadata->nv_counter[i] < security_cnt) {
              return FWU_AGENT_ERROR;
          } else if (priv_metadata->nv_counter[i] > security_cnt) {
--- 
-2.17.1
-
meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0003-Platform-corstone1000-Add-watchdog_reset_timer.patch deleted +0 -47

47 lines not on this page · raw message

meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0004-Platform-corstone1000-Replace-MCUBOOT-BL1-by-TFM-s.patch deleted +0 -1034

1,034 lines not on this page · raw message

meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0004-arm-trusted-firmware-m-disable-fatal-warnings.patch renamed from meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/rwx.patch +2 -3
similarity index 87%
rename from meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/rwx.patch
rename to meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0004-arm-trusted-firmware-m-disable-fatal-warnings.patch
index 1efd6618..07db4f6d 100644
@@ -1,4 +1,4 @@
-From 1d548c77d07fc9a83e3e9aa28a23aa19a0177e3b Mon Sep 17 00:00:00 2001
+From 04ce07d289e8cec75223349e9ebf7e69126fc04d Mon Sep 17 00:00:00 2001
 From: Jon Mason <[email protected]>
 Date: Wed, 18 Jan 2023 15:13:37 -0500
 Subject: [PATCH] arm/trusted-firmware-m: disable fatal warnings
@@ -11,7 +11,7 @@ Upstream-Status: Inappropriate
  1 file changed, 1 deletion(-)
 
 diff --git a/toolchain_GNUARM.cmake b/toolchain_GNUARM.cmake
-index 7978eaca68..88395f922a 100644
+index 7989718515..a5939323d6 100644
 --- a/toolchain_GNUARM.cmake
 +++ b/toolchain_GNUARM.cmake
 @@ -71,7 +71,6 @@ macro(tfm_toolchain_reset_linker_flags)
@@ -22,4 +22,3 @@ index 7978eaca68..88395f922a 100644
          LINKER:--gc-sections
          LINKER:--no-wchar-size-warning
          ${MEMORY_USAGE_FLAG}
-
meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0005-Platform-corstone1000-Replace-MCUBOOT-BL1-by-TFM-s-B.patch deleted +0 -202

202 lines not on this page · raw message

meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0006-Platform-corstone1000-Reorganize-bl2-files.patch deleted +0 -61

61 lines not on this page · raw message

meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0007-Platform-corstone1000-Fix-linker-script-comment.patch deleted +0 -47

47 lines not on this page · raw message

meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0008-Platform-corstone1000-Fix-linkerscripts-copyright-ye.patch deleted +0 -39
deleted file mode 100644
index 7f7f6ed0..00000000
@@ -1,39 +0,0 @@
-From 7db7b197ec3f01163422450947540060d3cb0c17 Mon Sep 17 00:00:00 2001
-From: Mohamed Omar Asaker <[email protected]>
-Date: Mon, 13 Mar 2023 00:21:44 +0000
-Subject: [PATCH 6/6] Platform: corstone1000: Fix linkerscripts copyright year
-
-set the copyright year to 2023 as these files are introduced in
-2023.
-
-Upstream-Status: Submitted [https://review.trustedfirmware.org/c/TF-M/trusted-firmware-m/+/20557]
-Signed-off-by: Mohamed Omar Asaker <[email protected]>
-Change-Id: I293a4a380d5d1d59aba1e2ab17e0e5924664dbb4
----
- .../arm/corstone1000/Device/Source/gcc/corstone1000_bl1_1.ld    | 2 +-
- .../arm/corstone1000/Device/Source/gcc/corstone1000_bl1_2.ld    | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/platform/ext/target/arm/corstone1000/Device/Source/gcc/corstone1000_bl1_1.ld b/platform/ext/target/arm/corstone1000/Device/Source/gcc/corstone1000_bl1_1.ld
-index 8ee334c6b..cb6797f27 100644
---- a/platform/ext/target/arm/corstone1000/Device/Source/gcc/corstone1000_bl1_1.ld
-+++ b/platform/ext/target/arm/corstone1000/Device/Source/gcc/corstone1000_bl1_1.ld
-@@ -1,5 +1,5 @@
- ;/*
--; * Copyright (c) 2009-2022, Arm Limited. All rights reserved.
-+; * Copyright (c) 2023, Arm Limited. All rights reserved.
- ; *
- ; * Licensed under the Apache License, Version 2.0 (the "License");
- ; * you may not use this file except in compliance with the License.
-diff --git a/platform/ext/target/arm/corstone1000/Device/Source/gcc/corstone1000_bl1_2.ld b/platform/ext/target/arm/corstone1000/Device/Source/gcc/corstone1000_bl1_2.ld
-index e1e4f2966..e66e54aa6 100644
---- a/platform/ext/target/arm/corstone1000/Device/Source/gcc/corstone1000_bl1_2.ld
-+++ b/platform/ext/target/arm/corstone1000/Device/Source/gcc/corstone1000_bl1_2.ld
-@@ -1,5 +1,5 @@
- ;/*
--; * Copyright (c) 2009-2022, Arm Limited. All rights reserved.
-+; * Copyright (c) 2023, Arm Limited. All rights reserved.
- ; *
- ; * Licensed under the Apache License, Version 2.0 (the "License");
- ; * you may not use this file except in compliance with the License.
--- 
meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0009-Platform-corstone1000-fix-flash-reading-issue-for-fi.patch deleted +0 -38
deleted file mode 100644
index 5c0024b2..00000000
@@ -1,38 +0,0 @@
-From 7914ec3f96dbb8228e791d9492cfc3651cf9deca Mon Sep 17 00:00:00 2001
-From: Emekcan Aras <[email protected]>
-Date: Wed, 5 Apr 2023 10:28:57 +0100
-Subject: [PATCH] Platform: corstone1000: Fix Flash reading issue for FIP data
-
-Fixes the flash reading issue since bl2 needs to read the data from
-flash in XIP mode on FPGA (mps3).
-
-Upstream-Status: Submitted [https://review.trustedfirmware.org/c/TF-M/trusted-firmware-m/+/20558]
-Signed-off-by: Emekcan Aras <[email protected]>
----
- platform/ext/target/arm/corstone1000/bl2/boot_hal_bl2.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/platform/ext/target/arm/corstone1000/bl2/boot_hal_bl2.c b/platform/ext/target/arm/corstone1000/bl2/boot_hal_bl2.c
-index cf6340c5a9..e4183c7a57 100644
---- a/platform/ext/target/arm/corstone1000/bl2/boot_hal_bl2.c
-+++ b/platform/ext/target/arm/corstone1000/bl2/boot_hal_bl2.c
-@@ -89,6 +89,7 @@ static bool fill_flash_map_with_fip_data(uint8_t boot_index) {
- 
-     /* parse directly from flash using XIP mode */
-     /* FIP is large so its not a good idea to load it in memory */
-+    Select_XIP_Mode_For_Shared_Flash();
-     result = parse_fip_and_extract_tfa_info(
-         FLASH_BASE_ADDRESS + fip_offset + FIP_SIGNATURE_AREA_SIZE, fip_size,
-         &tfa_offset, &tfa_size);
-@@ -96,7 +97,7 @@ static bool fill_flash_map_with_fip_data(uint8_t boot_index) {
-         BOOT_LOG_ERR("parse_fip_and_extract_tfa_info failed");
-         return false;
-     }
--
-+    Select_Write_Mode_For_Shared_Flash();
-     flash_map[2].fa_off = fip_offset + FIP_SIGNATURE_AREA_SIZE + tfa_offset;
-     flash_map[2].fa_size = tfa_size;
-     flash_map[3].fa_off = flash_map[2].fa_off + flash_map[2].fa_size;
--- 
-2.17.1
-
meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0010-Platform-corstone1000-Adds-compiler-flags-to-FWU-age.patch deleted +0 -273

273 lines not on this page · raw message

meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0011-Platform-corstone1000-adjust-PS-asset-configuration.patch deleted +0 -29
deleted file mode 100644
index 19a37731..00000000
@@ -1,29 +0,0 @@
-From 148d82d0984273b30d8b148f0c4e0ad0d3f23062 Mon Sep 17 00:00:00 2001
-From: Emekcan Aras <[email protected]>
-Date: Mon, 17 Apr 2023 12:07:55 +0100
-Subject: [PATCH 1/3] Platform: corstone1000: adjust PS asset configuration
-
-Adjust protected storage asset configuration to be more inline
-with the one in trusted service side, that would make thinks
-work when testing and using more than the default variables.
-
-Upstream-Status: Submitted [https://review.trustedfirmware.org/c/TF-M/trusted-firmware-m/+/20560]
-Signed-off-by: Rui Miguel Silva <[email protected]>
-Signed-off-by: Emekcan Aras <[email protected]>
-Change-Id: I181f9c72a816c727c2170c609100aec1d233fea7
----
- platform/ext/target/arm/corstone1000/config.cmake | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/platform/ext/target/arm/corstone1000/config.cmake b/platform/ext/target/arm/corstone1000/config.cmake
-index bec6b84f0..0c91fa59f 100644
---- a/platform/ext/target/arm/corstone1000/config.cmake
-+++ b/platform/ext/target/arm/corstone1000/config.cmake
-@@ -76,3 +76,4 @@ endif()
- # Platform-specific configurations
- set(CONFIG_TFM_USE_TRUSTZONE            OFF)
- set(TFM_MULTI_CORE_TOPOLOGY             ON)
-+set(PS_NUM_ASSETS                       "40"        CACHE STRING    "The maximum number of assets to be stored in the Protected Storage area")
--- 
-2.17.1
-
meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0012-Platform-corstone1000-Increase-number-of-assets.patch deleted +0 -36
deleted file mode 100644
index d2fc332d..00000000
@@ -1,36 +0,0 @@
-From 34263d1ea99da7b8a680a80601a73149bc9530e5 Mon Sep 17 00:00:00 2001
-From: Emekcan Aras <[email protected]>
-Date: Fri, 21 Apr 2023 15:17:21 +0100
-Subject: [PATCH] Platform: corstone1000: Increase number of assets
-
-As Corstone1000 stores at boot time few efi variables.
-Therefore, number of assets is increased to compansate this early usage.
-
-Upstream-Status: Submitted [https://review.trustedfirmware.org/c/TF-M/trusted-firmware-m/+/20656]
-Signed-off-by: Mohamed Omar Asaker <[email protected]>
-Signed-off-by: Emekcan Aras <[email protected]>
-Change-Id: Id8555a09335ce13b80c07a33c4d913f5cb0f9084
----
- platform/ext/target/arm/corstone1000/config_tfm_target.h | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/platform/ext/target/arm/corstone1000/config_tfm_target.h b/platform/ext/target/arm/corstone1000/config_tfm_target.h
-index bf8d2f95f..e96836663 100644
---- a/platform/ext/target/arm/corstone1000/config_tfm_target.h
-+++ b/platform/ext/target/arm/corstone1000/config_tfm_target.h
-@@ -16,4 +16,12 @@
- #undef PLATFORM_SERVICE_OUTPUT_BUFFER_SIZE
- #define PLATFORM_SERVICE_OUTPUT_BUFFER_SIZE    256
-
-+/* The maximum number of assets to be stored in the Internal Trusted Storage. */
-+#undef ITS_NUM_ASSETS
-+#define ITS_NUM_ASSETS       20
-+
-+/* The maximum number of assets to be stored in the Protected Storage area. */
-+#undef PS_NUM_ASSETS
-+#define PS_NUM_ASSETS        20
-+
- #endif /* __CONFIG_TFM_TARGET_H__ */
---
-2.17.1
-
meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc renamed from meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-1.7.0-corstone1000.inc +4 -24
similarity index 61%
rename from meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-1.7.0-corstone1000.inc
rename to meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc
index 23c8c127..0831ed0e 100644
@@ -11,10 +11,6 @@ TFM_PLATFORM_IS_FVP ?= "FALSE"
 EXTRA_OECMAKE += "-DPLATFORM_IS_FVP=${TFM_PLATFORM_IS_FVP}"
 EXTRA_OECMAKE += "-DCC312_LEGACY_DRIVER_API_ENABLED=ON"
 
-SRCREV_tfm = "94c55967cbd1832681f07074a0945605b02ec8d0"
-SRCREV_mcuboot = "9e8eddcecba931f99297765779f8b130d808a9a3"
-SRCREV_mbedtls = "8c89224991adff88d53cd380f42a2baa36f91454"
-
 # libmetal
 LICENSE += "& BSD-3-Clause"
 LIC_FILES_CHKSUM += "file://../libmetal/LICENSE.md;md5=fe0b8a4beea8f0813b606d15a3df3d3c"
@@ -30,28 +26,12 @@ SRCREV_openamp = "347397decaa43372fc4d00f965640ebde042966d"
 EXTRA_OECMAKE += "-DLIBOPENAMP_SRC_PATH=${S}/../openamp -DLIBOPENAMP_BIN_PATH=${B}/libopenamp-build"
 
 
-SRC_URI:remove:corstone1000 =" \
-    file://rwx.patch    \
-"
-
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 SRC_URI:append:corstone1000 = " \
-    file://0001-Platform-corstone1000-make-sure-to-write-fwu-metadata-to-repl.patch      \
-    file://0002-Platform-corstone1000-get-fwu-and-private-metadata-f.patch      \
-    file://0003-Platform-corstone1000-Add-watchdog_reset_timer.patch            \
-    file://0004-Platform-corstone1000-Replace-MCUBOOT-BL1-by-TFM-s.patch        \
-    file://0005-Platform-corstone1000-Replace-MCUBOOT-BL1-by-TFM-s-B.patch      \
-    file://0006-Platform-corstone1000-Reorganize-bl2-files.patch                \
-    file://0007-Platform-corstone1000-Fix-linker-script-comment.patch           \
-    file://0008-Platform-corstone1000-Fix-linkerscripts-copyright-ye.patch      \
-    file://0009-Platform-corstone1000-fix-flash-reading-issue-for-fi.patch      \
-    file://0010-Platform-corstone1000-Adds-compiler-flags-to-FWU-age.patch      \
-    file://0011-Platform-corstone1000-adjust-PS-asset-configuration.patch       \
-    file://0012-Platform-corstone1000-Increase-number-of-assets.patch           \
-    file://0013-Platform-corstone1000-Increase-BL2-size-in-flash-lay.patch      \
-    file://0014-Platform-Corstone1000-Increase-BL2_DATA_SIZE.patch              \
-    file://0015-Platform-Corstone1000-Calculate-the-new-CRC32-value-.patch      \
-    file://corstone1000/rwx.patch                                               \
+    file://0001-Platform-corstone1000-Increase-BL2-size-in-flash-lay.patch \
+    file://0002-Platform-Corstone1000-Increase-BL2_DATA_SIZE.patch \
+    file://0003-Platform-Corstone1000-Calculate-the-new-CRC32-value-.patch \
+    file://0004-arm-trusted-firmware-m-disable-fatal-warnings.patch \
     "
 
 # TF-M ships patches for external dependencies that needs to be applied
meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_%.bbappend renamed from meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.7.%.bbappend +1 -1
similarity index 54%
rename from meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.7.%.bbappend
rename to meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_%.bbappend
index ec0e483b..da70bc78 100644
@@ -1,6 +1,6 @@
 # Machine specific configurations
 
 MACHINE_TFM_REQUIRE ?= ""
-MACHINE_TFM_REQUIRE:corstone1000 = "trusted-firmware-m-1.7.0-corstone1000.inc"
+MACHINE_TFM_REQUIRE:corstone1000 = "trusted-firmware-m-corstone1000.inc"
 
 require ${MACHINE_TFM_REQUIRE}
meta-arm/recipes-bsp/trusted-firmware-m/files/rwx.patch deleted +0 -24
deleted file mode 100644
index b279cfea..00000000
@@ -1,24 +0,0 @@
-From 1d548c77d07fc9a83e3e9aa28a23aa19a0177e3b Mon Sep 17 00:00:00 2001
-From: Jon Mason <[email protected]>
-Date: Wed, 18 Jan 2023 15:13:37 -0500
-Subject: [PATCH] arm/trusted-firmware-m: disable fatal warnings
-
-Signed-off-by: Jon Mason <[email protected]>
-Upstream-Status: Inappropriate
-
----
- toolchain_GNUARM.cmake | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/toolchain_GNUARM.cmake b/toolchain_GNUARM.cmake
-index 7978eaca68..88395f922a 100644
---- a/toolchain_GNUARM.cmake
-+++ b/toolchain_GNUARM.cmake
-@@ -66,7 +66,6 @@ macro(tfm_toolchain_reset_linker_flags)
-         --entry=Reset_Handler
-         --specs=nano.specs
-         LINKER:-check-sections
--        LINKER:-fatal-warnings
-         LINKER:--gc-sections
-         LINKER:--no-wchar-size-warning
-         ${MEMORY_USAGE_FLAG}
meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-1.8.0-src.inc renamed from meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-1.7.0-src.inc +12 -12
similarity index 80%
rename from meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-1.7.0-src.inc
rename to meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-1.8.0-src.inc
index 6a209c37..393ce439 100644
@@ -3,7 +3,7 @@
 LICENSE = "BSD-2-Clause & BSD-3-Clause & Apache-2.0"
 
 LIC_FILES_CHKSUM = "file://license.rst;md5=07f368487da347f3c7bd0fc3085f3afa \
-                    file://../tf-m-tests/license.rst;md5=02d06ffb8d9f099ff4961c0cb0183a18 \
+                    file://../tf-m-tests/license.rst;md5=4481bae2221b0cfca76a69fb3411f390 \
                     file://../mbedtls/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
                     file://../mcuboot/LICENSE;md5=b6ee33f1d12a5e6ee3de1e82fb51eeb8"
 
@@ -22,24 +22,24 @@ SRC_URI  = "${SRC_URI_TRUSTED_FIRMWARE_M};branch=${SRCBRANCH_tfm};name=tfm;dests
             "
 
 # The required dependencies are documented in tf-m/config/config_default.cmake
-# TF-Mv1.7.0
+# TF-Mv1.8.0
 SRCBRANCH_tfm ?= "master"
-SRCREV_tfm = "b725a1346cdb9ec75b1adcdc4c84705881e8fd4e"
-# TF-Mv1.7.0
+SRCREV_tfm = "35ac80c8581d483da7d18cb8bcd20aaed096550c"
+# TF-Mv1.8.0
 SRCBRANCH_tfm-tests ?= "master"
-SRCREV_tfm-tests = "4c4b58041c6c01670266690538a780b4a23d08b8"
-# mbedtls-3.2.1
+SRCREV_tfm-tests = "1273c5bcd3d8ade60d51524797e0b22b6fd7eea1"
+# mbedtls-3.4.0
 SRCBRANCH_mbedtls ?= "master"
-SRCREV_mbedtls = "869298bffeea13b205343361b7a7daf2b210e33d"
-# v1.9.0
+SRCREV_mbedtls = "1873d3bfc2da771672bd8e7e8f41f57e0af77f33"
+# mcuboot v1.10.0
 SRCBRANCH_mcuboot ?= "main"
-SRCREV_mcuboot = "c657cbea75f2bb1faf1fceacf972a0537a8d26dd"
-# qcbor
+SRCREV_mcuboot = "23d28832f02dcdc18687782c6cd8ba99e9b274d2"
+# QCBOR v1.2
 SRCBRANCH_qcbor ?= "master"
 SRCREV_qcbor = "b0e7033268e88c9f27146fa9a1415ef4c19ebaff"
-# TF-Mv1.7.0
+# TF-Mv1.8.0
 SRCBRANCH_tfm-extras ?= "master"
-SRCREV_tfm-extras = "daacaa6df3881e205bc03d75fc8fb688afe9f0f1"
+SRCREV_tfm-extras = "504ae9a9a50981e9dd4d8accec8261a1dba9e965"
 
 SRCREV_FORMAT = "tfm"
 
meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_1.8.0.bb renamed from meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_1.7.0.bb +1 -1
similarity index 57%
rename from meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_1.7.0.bb
rename to meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_1.8.0.bb
index 504846e0..10b141d7 100644
@@ -1,2 +1,2 @@
-require recipes-bsp/trusted-firmware-m/trusted-firmware-m-1.7.0-src.inc
+require recipes-bsp/trusted-firmware-m/trusted-firmware-m-1.8.0-src.inc
 require recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native.inc
meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc +0 -2
index eeb6135a..1747c654 100644
@@ -8,8 +8,6 @@ DESCRIPTION = "Trusted Firmware-M"
 HOMEPAGE = "https://git.trustedfirmware.org/trusted-firmware-m.git"
 PROVIDES = "virtual/trusted-firmware-m"
 
-SRC_URI += "file://rwx.patch"
-
 UPSTREAM_CHECK_GITTAGREGEX = "^TF-Mv(?P<pver>\d+(\.\d+)+)$"
 
 # Note to future readers of this recipe: until the CMakeLists don't abuse
meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.8.0.bb renamed from meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.7.0.bb +1 -1
similarity index 52%
rename from meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.7.0.bb
rename to meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.8.0.bb
index 32e6ed34..5794c1ee 100644
@@ -1,2 +1,2 @@
-require recipes-bsp/trusted-firmware-m/trusted-firmware-m-1.7.0-src.inc
+require recipes-bsp/trusted-firmware-m/trusted-firmware-m-1.8.0-src.inc
 require recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc
Signature · 1 line
2.30.2
Applied
#6 lore raw
In reply to Jon Mason
Quoted 3 lines · Jon Mason

Upgrade the 12.2 recipe to 12.3.

Applied, thanks!

[1/6] arm-toolchain/gcc-aarch64-none-elf: upgrade to 12.3.rel1

      commit: 9fa8d0d0d013eb4dcc796e3e2acf82fbb641e0c8
[2/6] arm/edk2: move 202211 recipe to meta-arm-bsp
      commit: 299cb9e0b3ed9fc5add6645b365ba67b7f06e211
[3/6] arm-bsp: clean-up patch noise
      commit: ea797536dadeb0088a8fd57ecf934d776c3b231f
[4/6] arm/optee-test: update musl workaround patch
      commit: 07ec4baadf5a1c99d4c9945750f4a073d16fd675
[5/6] arm-bsp/tc1: remove trusted-firmware-m target
      commit: 8c42263eb3c7af5f498fc59689f908ac61249b9f
[6/6] arm/trusted-firmware-m: upgrade to v1.8.0
      commit: c92ac97d79a7eb9a00d6dd1b93473943493b3732

Best regards,

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