Skip to contentSkip to conversation

arm/trusted-firmware-a: Add support for v2.15.0

PATCH Applied Jon Mason 2 participants 8 messages Jun 18 – Jun 20 Arm/Zynq architecture

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/7 arm/trusted-firmware-a: Add support for v2.15.0

Add support for the newest release of TF-A.
mbedtls was made a git submodule. Given that this is no longer needed for the generic inc file, I've moved the relevant parts to the LTS recipe and others using the older way of building.

Also, seeing some weird behavior with CPUs not coming on line in sbsa-ref and qemuarm-secureboot. So, pinning those back to the LTS until they can be sorted out.

---
 meta-arm-bsp/conf/machine/sbsa-ref.conf       |  2 +
 .../trusted-firmware-a-corstone1000.inc       |  1 +
 .../trusted-firmware-a-fvp-base.inc           |  3 -
 .../trusted-firmware-a-juno.inc               |  1 -
 .../trusted-firmware-a-rdn2.inc               | 26 +++++++++
 .../trusted-firmware-a-rdv2.inc               | 26 +++++++++
 meta-arm/conf/machine/qemuarm-secureboot.conf |  2 +
 .../trusted-firmware-a/cot-dt2c_0.1.0.bb      |  6 +-
 .../fiptool-native_2.15.0.bb                  | 33 +++++++++++
 .../trusted-firmware-a/tf-a-tests_2.15.0.bb   | 56 +++++++++++++++++++
 .../trusted-firmware-a/trusted-firmware-a.inc | 19 -------
 .../trusted-firmware-a_2.10.30.bb             |  2 +
 .../trusted-firmware-a_2.12.10.bb             |  2 +
 .../trusted-firmware-a_2.14.1.bb              | 20 +++++++
 .../trusted-firmware-a_2.15.0.bb              |  8 +++
 15 files changed, 181 insertions(+), 26 deletions(-)
 create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.15.0.bb
 create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.15.0.bb
 create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.15.0.bb
meta-arm-bsp/conf/machine/sbsa-ref.conf +2 -0
index 1f86cdb6e0e7..82d55c9b3d7a 100644
@@ -26,6 +26,8 @@ EFI_PROVIDER ?= "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd-boo
 SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0"
 
 EXTRA_IMAGEDEPENDS += "edk2-firmware"
+#FIXME - in 2.15.0, new logic for pen hold the SMP cores was added, which breaks this platform.  Hold this back until it can be resolved.
+PREFERRED_VERSION_trusted-firmware-a ?= "2.14.%"
 
 QB_SYSTEM_NAME = "qemu-system-aarch64"
 QB_MACHINE = "-machine sbsa-ref"
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone1000.inc +1 -0
index 4979f29477f3..86522d1b88ef 100644
@@ -11,6 +11,7 @@ SRC_URI:append = " \
 
 TFA_DEBUG = "1"
 TFA_UBOOT ?= "1"
+#FIXME - this can be removed after moving to 2.15.0
 TFA_MBEDTLS = "1"
 TFA_BUILD_TARGET = "bl2 bl31 fip"
 
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-fvp-base.inc +0 -3
index c87cbb726ec8..8b06eace2012 100644
@@ -55,9 +55,6 @@ TFA_PLATFORM = "fvp"
 # Disable debug build if measured boot is enabled.
 TFA_DEBUG := "${@bb.utils.contains('MACHINE_FEATURES', 'ts-attestation', '0',\
               d.getVar('TFA_DEBUG'), d)}"
-# Add mbedtls if measured boot is enabled
-TFA_MBEDTLS := "${@bb.utils.contains('MACHINE_FEATURES', 'ts-attestation',\
-               '1', d.getVar('TFA_MBEDTLS'), d)}"
 TFA_UBOOT ?= "1"
 TFA_BUILD_TARGET = "bl1 bl2 bl31 dtbs fip"
 
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-juno.inc +0 -1
index a3a35ab4e501..c69e2ec3662e 100644
@@ -3,7 +3,6 @@
 COMPATIBLE_MACHINE = "juno"
 TFA_PLATFORM = "juno"
 TFA_DEBUG = "1"
-TFA_MBEDTLS = "1"
 TFA_UBOOT ?= "1"
 TFA_BUILD_TARGET = "bl1 bl2 bl31 dtbs fip"
 
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-rdn2.inc +26 -0
index 0c09818c9024..d761a7ae639d 100644
@@ -27,3 +27,29 @@ SRCREV_tfa = "a4b376b128bb5b91771002f7808566f53c8d9f3a"
 SRC_URI:remove = "file://0001-feat-build-add-HOSTLDFLAGS-to-pass-flags-to-host-lin.patch"
 LIC_FILES_CHKSUM:remove = "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e"
 LIC_FILES_CHKSUM += "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
+
+# sub-directory in which mbedtls will be downloaded
+# Only needed for legacy versions, as v2.15.0 added this as a git submodule
+TFA_MBEDTLS_DIR ?= "mbedtls"
+# This should be set to MBEDTLS download URL if MBEDTLS is needed
+SRC_URI_MBEDTLS ??= ""
+# This should be set to MBEDTLS LIC FILES checksum
+LIC_FILES_CHKSUM_MBEDTLS ??= ""
+# add MBEDTLS to our sources if activated
+SRC_URI:append = " ${@bb.utils.contains('TFA_MBEDTLS', '1', '${SRC_URI_MBEDTLS}', '', d)}"
+# Update license variables
+LICENSE:append = "${@bb.utils.contains('TFA_MBEDTLS', '1', ' & Apache-2.0', '', d)}"
+LIC_FILES_CHKSUM:append = "${@bb.utils.contains('TFA_MBEDTLS', '1', ' ${LIC_FILES_CHKSUM_MBEDTLS}', '', d)}"
+# add mbed TLS to version
+SRCREV_FORMAT:append = "${@bb.utils.contains('TFA_MBEDTLS', '1', '_mbedtls', '', d)}"
+
+# Handle MBEDTLS
+EXTRA_OEMAKE += "${@bb.utils.contains('TFA_MBEDTLS', '1', 'MBEDTLS_DIR=${TFA_MBEDTLS_DIR}', '', d)}"
+
+# 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-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-rdv2.inc +26 -0
index 796011576e1d..8010c523e144 100644
@@ -27,3 +27,29 @@ SRCREV_tfa = "a4b376b128bb5b91771002f7808566f53c8d9f3a"
 SRC_URI:remove = "file://0001-feat-build-add-HOSTLDFLAGS-to-pass-flags-to-host-lin.patch"
 LIC_FILES_CHKSUM:remove = "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e"
 LIC_FILES_CHKSUM += "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
+
+# sub-directory in which mbedtls will be downloaded
+# Only needed for legacy versions, as v2.15.0 added this as a git submodule
+TFA_MBEDTLS_DIR ?= "mbedtls"
+# This should be set to MBEDTLS download URL if MBEDTLS is needed
+SRC_URI_MBEDTLS ??= ""
+# This should be set to MBEDTLS LIC FILES checksum
+LIC_FILES_CHKSUM_MBEDTLS ??= ""
+# add MBEDTLS to our sources if activated
+SRC_URI:append = " ${@bb.utils.contains('TFA_MBEDTLS', '1', '${SRC_URI_MBEDTLS}', '', d)}"
+# Update license variables
+LICENSE:append = "${@bb.utils.contains('TFA_MBEDTLS', '1', ' & Apache-2.0', '', d)}"
+LIC_FILES_CHKSUM:append = "${@bb.utils.contains('TFA_MBEDTLS', '1', ' ${LIC_FILES_CHKSUM_MBEDTLS}', '', d)}"
+# add mbed TLS to version
+SRCREV_FORMAT:append = "${@bb.utils.contains('TFA_MBEDTLS', '1', '_mbedtls', '', d)}"
+
+# Handle MBEDTLS
+EXTRA_OEMAKE += "${@bb.utils.contains('TFA_MBEDTLS', '1', 'MBEDTLS_DIR=${TFA_MBEDTLS_DIR}', '', d)}"
+
+# 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/conf/machine/qemuarm-secureboot.conf +2 -0
index f08b84fe5e76..2787472bfdbf 100644
@@ -18,6 +18,8 @@ IMAGE_FSTYPES += "wic wic.qcow2"
 
 WKS_FILE ?= "qemuarm.wks"
 WKS_FILE_DEPENDS = "trusted-firmware-a"
+#FIXME - in 2.15.0, new logic for pen hold the SMP cores was added, which breaks this platform.  Hold this back until it can be resolved.
+PREFERRED_VERSION_trusted-firmware-a ?= "2.14.%"
 IMAGE_BOOT_FILES = "${KERNEL_IMAGETYPE}"
 
 MACHINE_FEATURES += "optee-ftpm"
meta-arm/recipes-bsp/trusted-firmware-a/cot-dt2c_0.1.0.bb +3 -3
index 2cffb46c417d..a4e72b0052f7 100644
@@ -6,9 +6,9 @@ SRC_URI_TRUSTED_FIRMWARE_A ?= "git://review.trustedfirmware.org/TF-A/trusted-fir
 SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};branch=${SRCBRANCH}"
 LIC_FILES_CHKSUM = "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e"
 
-# Use cot-dt2c from TF-A v2.14.1
-SRCREV = "e82c7ced9e76aea35b176e608d67dfe5ebe1c569"
-SRCBRANCH = "lts-v2.14"
+# Use cot-dt2c from TF-A v2.15.0
+SRCREV = "da738d5eae93af342fdc4995dd3c05acb4c9d757"
+SRCBRANCH = "master"
 
 inherit python_poetry_core
 
meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.15.0.bb new file +33 -0
new file mode 100644
index 000000000000..11e54fbf06e6
@@ -0,0 +1,33 @@
+# Firmware Image Package (FIP)
+# It is a packaging format used by TF-A to package the
+# firmware images in a single binary.
+
+DESCRIPTION = "fiptool - Trusted Firmware tool for packaging"
+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=6ed7bace7b0bc63021c6eba7b524039e"
+
+# Use fiptool from TF-A v2.15.0
+SRCREV = "da738d5eae93af342fdc4995dd3c05acb4c9d757"
+SRCBRANCH = "master"
+
+DEPENDS += "openssl-native"
+
+inherit native
+
+EXTRA_OEMAKE = "V=1 HOSTCC='${BUILD_CC}' OPENSSL_DIR=${STAGING_DIR_NATIVE}/${prefix_native}"
+
+do_compile () {
+    # This is still needed to have the native fiptool executing properly by
+    # setting the RPATH
+    sed -i '/^LDOPTS/ s,$, \$\{BUILD_LDFLAGS},' ${S}/tools/fiptool/Makefile
+    sed -i '/^INCLUDE_PATHS/ s,$, \$\{BUILD_CFLAGS},' ${S}/tools/fiptool/Makefile
+
+    oe_runmake fiptool
+}
+
+do_install () {
+    install -D -p -m 0755 tools/fiptool/fiptool ${D}${bindir}/fiptool
+}
meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.15.0.bb new file +56 -0

56 lines not on this page · raw message

meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +0 -19
index 62204042cbab..c8717c3f6e28 100644
@@ -43,22 +43,6 @@ TFA_LTO ?= ""
 
 B = "${WORKDIR}/build"
 
-# mbed TLS support (set TFA_MBEDTLS to 1 to activate)
-TFA_MBEDTLS ?= "0"
-# sub-directory in which mbedtls will be downloaded
-TFA_MBEDTLS_DIR ?= "mbedtls"
-# This should be set to MBEDTLS download URL if MBEDTLS is needed
-SRC_URI_MBEDTLS ??= ""
-# This should be set to MBEDTLS LIC FILES checksum
-LIC_FILES_CHKSUM_MBEDTLS ??= ""
-# add MBEDTLS to our sources if activated
-SRC_URI:append = " ${@bb.utils.contains('TFA_MBEDTLS', '1', '${SRC_URI_MBEDTLS}', '', d)}"
-# Update license variables
-LICENSE:append = "${@bb.utils.contains('TFA_MBEDTLS', '1', ' & Apache-2.0', '', d)}"
-LIC_FILES_CHKSUM:append = "${@bb.utils.contains('TFA_MBEDTLS', '1', ' ${LIC_FILES_CHKSUM_MBEDTLS}', '', d)}"
-# add mbed TLS to version
-SRCREV_FORMAT:append = "${@bb.utils.contains('TFA_MBEDTLS', '1', '_mbedtls', '', d)}"
-
 # U-boot support (set TFA_UBOOT to 1 to activate)
 # When U-Boot support is activated BL33 is activated with u-boot.bin file
 TFA_UBOOT ??= "0"
@@ -131,9 +115,6 @@ EXTRA_OEMAKE += "${@'SPMD_SPM_AT_SEL2=${TFA_SPMD_SPM_AT_SEL2}' if d.getVar('TFA_
 # Handle TFA_DEBUG parameter
 EXTRA_OEMAKE += "${@bb.utils.contains('TFA_DEBUG', '1', 'DEBUG=${TFA_DEBUG}', '', d)}"
 
-# Handle MBEDTLS
-EXTRA_OEMAKE += "${@bb.utils.contains('TFA_MBEDTLS', '1', 'MBEDTLS_DIR=${TFA_MBEDTLS_DIR}', '', d)}"
-
 # Uboot support
 DEPENDS += " ${@bb.utils.contains('TFA_UBOOT', '1', 'u-boot', '', d)}"
 do_compile[depends] += " ${@bb.utils.contains('TFA_UBOOT', '1', 'u-boot:do_deploy', '', d)}"
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.30.bb +2 -0
index fd19ac911089..72dd4b09cc7c 100644
@@ -11,6 +11,8 @@ LIC_FILES_CHKSUM += "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dd
 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 = "c765c831e5c2a0971410692f92f7a81d6ec65ec2"
+# The default value changed in v2.15.0 and later.  Given this is a legacy version, change it here to keep future versions simplier
+TFA_MBEDTLS_DIR = "mbedtls"
 
 LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d"
 
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.10.bb +2 -0
index 20fc5a7d70bc..737a90a70e15 100644
@@ -11,6 +11,8 @@ LIC_FILES_CHKSUM += "file://docs/license.rst;md5=83b7626b8c7a37263c6a58af8d19bee
 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"
+# The default value changed in v2.15.0 and later.  Given this is a legacy version, change it here to keep future versions simplier
+TFA_MBEDTLS_DIR = "mbedtls"
 
 LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d"
 
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.14.1.bb +20 -0
index 2f69d054a3f8..de29941b2c8d 100644
@@ -7,6 +7,26 @@ SRCBRANCH = "lts-v2.14"
 
 LIC_FILES_CHKSUM += "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e"
 
+# mbed TLS support (set TFA_MBEDTLS to 1 to activate)
+TFA_MBEDTLS ?= "0"
+# sub-directory in which mbedtls will be downloaded
+# Only needed for legacy versions, as v2.15.0 added this as a git submodule
+TFA_MBEDTLS_DIR ?= "mbedtls"
+# This should be set to MBEDTLS download URL if MBEDTLS is needed
+SRC_URI_MBEDTLS ??= ""
+# This should be set to MBEDTLS LIC FILES checksum
+LIC_FILES_CHKSUM_MBEDTLS ??= ""
+# add MBEDTLS to our sources if activated
+SRC_URI:append = " ${@bb.utils.contains('TFA_MBEDTLS', '1', '${SRC_URI_MBEDTLS}', '', d)}"
+# Update license variables
+LICENSE:append = "${@bb.utils.contains('TFA_MBEDTLS', '1', ' & Apache-2.0', '', d)}"
+LIC_FILES_CHKSUM:append = "${@bb.utils.contains('TFA_MBEDTLS', '1', ' ${LIC_FILES_CHKSUM_MBEDTLS}', '', d)}"
+# add mbed TLS to version
+SRCREV_FORMAT:append = "${@bb.utils.contains('TFA_MBEDTLS', '1', '_mbedtls', '', d)}"
+
+# Handle MBEDTLS
+EXTRA_OEMAKE += "${@bb.utils.contains('TFA_MBEDTLS', '1', 'MBEDTLS_DIR=${TFA_MBEDTLS_DIR}', '', d)}"
+
 # in TF-A src, docs/getting_started/prerequisites.rst lists the expected version mbedtls
 # mbedtls-3.6.5
 SRCBRANCH_MBEDTLS = "mbedtls-3.6"
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.15.0.bb new file +8 -0
new file mode 100644
index 000000000000..f780ab59bf5c
@@ -0,0 +1,8 @@
+require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
+
+# TF-A v2.15.0
+SRC_URI_TRUSTED_FIRMWARE_A = "gitsm://review.trustedfirmware.org/TF-A/trusted-firmware-a;protocol=https"
+SRCREV = "da738d5eae93af342fdc4995dd3c05acb4c9d757"
+SRCBRANCH = "master"
+
+LIC_FILES_CHKSUM += "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e"
Signature · 1 line
2.50.1 (Apple Git-155)
author
#1 lore raw

PATCH 2/7 arm/trusted-firmware-a: remove older LTS versions

The policy in meta-arm is to only have the latest version and the latest LTS version. Remove all of the older LTS versions to comply with this policy.

---
 ci/lts-revisions.yml                          |   4 +-
 ...-make-PCIe-tests-default-for-testing.patch | 531 ------------------
 ...-handle-secure-SGI-at-EL1-for-OP-TEE.patch |  33 --
 ...ot.c-ignore-TPM-error-and-continue-w.patch |  33 --
 .../fiptool-native_2.10.30.bb                 |  33 --
 .../fiptool-native_2.12.10.bb                 |  33 --
 .../trusted-firmware-a/tf-a-tests_2.10.24.bb  |  54 --
 .../trusted-firmware-a/tf-a-tests_2.12.3.bb   |  56 --
 .../trusted-firmware-a_2.10.30.bb             |  23 -
 .../trusted-firmware-a_2.12.10.bb             |  22 -
 10 files changed, 2 insertions(+), 820 deletions(-)
 delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/files/0001-fix-realm-make-PCIe-tests-default-for-testing.patch
 delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/files/0001-fix-zynqmp-handle-secure-SGI-at-EL1-for-OP-TEE.patch
 delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/files/0001-qemu_measured_boot.c-ignore-TPM-error-and-continue-w.patch
 delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.30.bb
 delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.10.bb
 delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.24.bb
 delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.12.3.bb
 delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.30.bb
 delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.10.bb
ci/lts-revisions.yml +2 -2
index 2cb7a6bc3411..0cd6ac074d9c 100644
@@ -5,6 +5,6 @@ header:
 
 local_conf_header:
   latest_revisions: |
-    PREFERRED_VERSION_trusted-firmware-a ?= "2.10.%"
-    PREFERRED_VERSION_tf-a-tests ?= "2.10.%"
+    PREFERRED_VERSION_trusted-firmware-a ?= "2.14.%"
+    PREFERRED_VERSION_tf-a-tests ?= "2.14.%"
     PREFERRED_VERSION_trusted-firmware-m ?= "2.1.%"
meta-arm/recipes-bsp/trusted-firmware-a/files/0001-fix-realm-make-PCIe-tests-default-for-testing.patch deleted +0 -531

531 lines not on this page · raw message

meta-arm/recipes-bsp/trusted-firmware-a/files/0001-fix-zynqmp-handle-secure-SGI-at-EL1-for-OP-TEE.patch deleted +0 -33
deleted file mode 100644
index 3dcc2de81c2f..000000000000
@@ -1,33 +0,0 @@
-From f5b2fa90e0c0324f31e72429e7a7382f49a25912 Mon Sep 17 00:00:00 2001
-From: Shen Jiamin <[email protected]>
-Date: Wed, 24 Jul 2024 18:58:55 +0800
-Subject: [PATCH] fix(zynqmp): handle secure SGI at EL1 for OP-TEE
-
-OP-TEE requires SGIs to be handled at S-EL1. The
-Makefile was not properly setting the flag
-GICV2_G0_FOR_EL3 to 0 when the SPD is OP-TEE.
-
-Change-Id: I256afa37ddf4ad4a154c43d51807de670c3689bb
-Signed-off-by: Shen Jiamin <[email protected]>
----
- plat/xilinx/zynqmp/platform.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Upstream-Status: Backport
-
-diff --git a/plat/xilinx/zynqmp/platform.mk b/plat/xilinx/zynqmp/platform.mk
-index c340009d0..22eceb621 100644
---- a/plat/xilinx/zynqmp/platform.mk
-+++ b/plat/xilinx/zynqmp/platform.mk
-@@ -21,7 +21,7 @@ ENABLE_LTO := 1
- EL3_EXCEPTION_HANDLING := $(SDEI_SUPPORT)
- 
- # pncd SPD requires secure SGI to be handled at EL1
--ifeq (${SPD}, $(filter ${SPD},pncd tspd))
-+ifeq (${SPD}, $(filter ${SPD},pncd tspd opteed))
- ifeq (${ZYNQMP_WDT_RESTART},1)
- $(error "Error: ZYNQMP_WDT_RESTART and SPD=pncd are incompatible")
- endif
--- 
-2.34.1
-
meta-arm/recipes-bsp/trusted-firmware-a/files/0001-qemu_measured_boot.c-ignore-TPM-error-and-continue-w.patch deleted +0 -33
deleted file mode 100644
index 733fa370b944..000000000000
@@ -1,33 +0,0 @@
-From b91c651e6d596cfe27448b19c8fb2f1168493827 Mon Sep 17 00:00:00 2001
-From: Mikko Rapeli <[email protected]>
-Date: Mon, 15 Jan 2024 09:26:56 +0000
-Subject: [PATCH] qemu_measured_boot.c: ignore TPM error and continue with boot
-
-If firmware is configured with TPM support but it's missing
-on HW, e.g. swtpm not started and/or configured with qemu,
-then continue booting. Missing TPM is not a fatal error.
-Enables testing boot without TPM device to see that
-missing TPM is detected further up the SW stack and correct
-fallback actions are taken.
-
-Upstream-Status: Submitted [https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/36514]
-
-Signed-off-by: Mikko Rapeli <[email protected]>
----
- plat/qemu/qemu/qemu_measured_boot.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/plat/qemu/qemu/qemu_measured_boot.c b/plat/qemu/qemu/qemu_measured_boot.c
-index 76a4da17e6a9..ec7f44d3720d 100644
---- a/plat/qemu/qemu/qemu_measured_boot.c
-+++ b/plat/qemu/qemu/qemu_measured_boot.c
-@@ -80,7 +80,8 @@ void bl2_plat_mboot_finish(void)
- 		 * Note: In QEMU platform, OP-TEE uses nt_fw_config to get the
- 		 * secure Event Log buffer address.
- 		 */
--		panic();
-+		ERROR("Ignoring TPM errors, continuing without\n");
-+		return;
- 	}
- 
- 	/* Copy Event Log to Non-secure memory */
meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.30.bb deleted +0 -33
deleted file mode 100644
index deab9ad059bc..000000000000
@@ -1,33 +0,0 @@
-# Firmware Image Package (FIP)
-# It is a packaging format used by TF-A to package the
-# firmware images in a single binary.
-
-DESCRIPTION = "fiptool - Trusted Firmware tool for packaging"
-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=b2c740efedc159745b9b31f88ff03dde"
-
-# Use fiptool from TF-A v2.10.30
-SRCREV = "d57b81079003e1647ed4181057c5784c7e3b1c3e"
-SRCBRANCH = "lts-v2.10"
-
-DEPENDS += "openssl-native"
-
-inherit native
-
-EXTRA_OEMAKE = "V=1 HOSTCC='${BUILD_CC}' OPENSSL_DIR=${STAGING_DIR_NATIVE}/${prefix_native}"
-
-do_compile () {
-    # This is still needed to have the native fiptool executing properly by
-    # setting the RPATH
-    sed -i '/^LDOPTS/ s,$, \$\{BUILD_LDFLAGS},' ${S}/tools/fiptool/Makefile
-    sed -i '/^INCLUDE_PATHS/ s,$, \$\{BUILD_CFLAGS},' ${S}/tools/fiptool/Makefile
-
-    oe_runmake fiptool
-}
-
-do_install () {
-    install -D -p -m 0755 tools/fiptool/fiptool ${D}${bindir}/fiptool
-}
meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.10.bb deleted +0 -33
deleted file mode 100644
index 985fd4c2ca6c..000000000000
@@ -1,33 +0,0 @@
-# Firmware Image Package (FIP)
-# It is a packaging format used by TF-A to package the
-# firmware images in a single binary.
-
-DESCRIPTION = "fiptool - Trusted Firmware tool for packaging"
-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=83b7626b8c7a37263c6a58af8d19bee1"
-
-# Use fiptool from TF-A v2.12.10
-SRCREV = "9487b105dcf18d057c6aeb405f9eaa1079c8fe6e"
-SRCBRANCH = "lts-v2.12"
-
-DEPENDS += "openssl-native"
-
-inherit native
-
-EXTRA_OEMAKE = "V=1 HOSTCC='${BUILD_CC}' OPENSSL_DIR=${STAGING_DIR_NATIVE}/${prefix_native}"
-
-do_compile () {
-    # This is still needed to have the native fiptool executing properly by
-    # setting the RPATH
-    sed -i '/^LDOPTS/ s,$, \$\{BUILD_LDFLAGS},' ${S}/tools/fiptool/Makefile
-    sed -i '/^INCLUDE_PATHS/ s,$, \$\{BUILD_CFLAGS},' ${S}/tools/fiptool/Makefile
-
-    oe_runmake fiptool
-}
-
-do_install () {
-    install -D -p -m 0755 tools/fiptool/fiptool ${D}${bindir}/fiptool
-}
meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.24.bb deleted +0 -54

54 lines not on this page · raw message

meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.12.3.bb deleted +0 -56

56 lines not on this page · raw message

meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.30.bb deleted +0 -23
deleted file mode 100644
index 72dd4b09cc7c..000000000000
@@ -1,23 +0,0 @@
-require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
-
-# TF-A v2.10.30
-SRCREV_tfa = "d57b81079003e1647ed4181057c5784c7e3b1c3e"
-SRCBRANCH = "lts-v2.10"
-
-LIC_FILES_CHKSUM += "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde"
-
-# in TF-A src, docs/getting_started/prerequisites.rst lists the expected version mbedtls
-# mbedtls-3.6.4
-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 = "c765c831e5c2a0971410692f92f7a81d6ec65ec2"
-# The default value changed in v2.15.0 and later.  Given this is a legacy version, change it here to keep future versions simplier
-TFA_MBEDTLS_DIR = "mbedtls"
-
-LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d"
-
-# continue to boot also without TPM
-SRC_URI += "\
-    file://0001-qemu_measured_boot.c-ignore-TPM-error-and-continue-w.patch \
-    file://0001-fix-zynqmp-handle-secure-SGI-at-EL1-for-OP-TEE.patch \
-"
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.10.bb deleted +0 -22
deleted file mode 100644
index 737a90a70e15..000000000000
@@ -1,22 +0,0 @@
-require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
-
-# TF-A v2.12.10
-SRCREV_tfa = "9487b105dcf18d057c6aeb405f9eaa1079c8fe6e"
-SRCBRANCH = "lts-v2.12"
-
-LIC_FILES_CHKSUM += "file://docs/license.rst;md5=83b7626b8c7a37263c6a58af8d19bee1"
-
-# 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"
-# The default value changed in v2.15.0 and later.  Given this is a legacy version, change it here to keep future versions simplier
-TFA_MBEDTLS_DIR = "mbedtls"
-
-LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d"
-
-# continue to boot also without TPM
-SRC_URI += "\
-    file://0001-qemu_measured_boot.c-ignore-TPM-error-and-continue-w.patch \
-"
Signature · 1 line
2.50.1 (Apple Git-155)
author
#2 lore raw

PATCH 3/7 arm/trusted-firmware-a: Update LTS to 2.14.2

In reply to Jon Mason
---
 .../{fiptool-native_2.14.1.bb => fiptool-native_2.14.2.bb}    | 4 ++--
 ...sted-firmware-a_2.14.1.bb => trusted-firmware-a_2.14.2.bb} | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename meta-arm/recipes-bsp/trusted-firmware-a/{fiptool-native_2.14.1.bb => fiptool-native_2.14.2.bb} (92%)
 rename meta-arm/recipes-bsp/trusted-firmware-a/{trusted-firmware-a_2.14.1.bb => trusted-firmware-a_2.14.2.bb} (96%)
meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.14.2.bb renamed from meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.14.1.bb +2 -2
similarity index 92%
rename from meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.14.1.bb
rename to meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.14.2.bb
index d70304aa1299..b6d302d47354 100644
@@ -9,8 +9,8 @@ SRC_URI_TRUSTED_FIRMWARE_A ?= "git://review.trustedfirmware.org/TF-A/trusted-fir
 SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};destsuffix=fiptool-${PV};branch=${SRCBRANCH}"
 LIC_FILES_CHKSUM = "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e"
 
-# Use fiptool from TF-A v2.14.1
-SRCREV = "e82c7ced9e76aea35b176e608d67dfe5ebe1c569"
+# Use fiptool from TF-A v2.14.2
+SRCREV = "aa1793fff49a1b5a6a877c278a0df0a188e2b1f2"
 SRCBRANCH = "lts-v2.14"
 
 DEPENDS += "openssl-native"
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.14.2.bb renamed from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.14.1.bb +2 -2
similarity index 96%
rename from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.14.1.bb
rename to meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.14.2.bb
index de29941b2c8d..3d0b80188e9b 100644
@@ -1,8 +1,8 @@
 require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
 
-# TF-A v2.14.1
+# TF-A v2.14.2
 SRC_URI_TRUSTED_FIRMWARE_A = "gitsm://review.trustedfirmware.org/TF-A/trusted-firmware-a;protocol=https"
-SRCREV_tfa = "e82c7ced9e76aea35b176e608d67dfe5ebe1c569"
+SRCREV_tfa = "aa1793fff49a1b5a6a877c278a0df0a188e2b1f2"
 SRCBRANCH = "lts-v2.14"
 
 LIC_FILES_CHKSUM += "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e"
Signature · 1 line
2.50.1 (Apple Git-155)
author
#3 lore raw

PATCH 4/7 arm/trusted-firmware-a: Update git recipe to the latest commit

In reply to Jon Mason
---
 .../trusted-firmware-a/trusted-firmware-a_git.bb    | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +4 -9
index 6d7f7c3e428a..517ca34aa418 100644
@@ -1,17 +1,12 @@
 require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
 
-# TF-A master, tag: v2.14
-SRCREV_tfa = "1d5aa939bc8d3d892e2ed9945fa50e36a1a924cc"
-SRCBRANCH = "master"
+# TF-A integration branch, current commit
+SRC_URI_TRUSTED_FIRMWARE_A = "gitsm://review.trustedfirmware.org/TF-A/trusted-firmware-a;protocol=https"
+SRCREV_tfa = "abead3308de3eb2d89a5ce3fe264ea829f87648c"
+SRCBRANCH = "integration"
 
 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"
 
 # Not a release recipe, try our hardest to not pull this in implicitly
Signature · 1 line
2.50.1 (Apple Git-155)
author
#4 lore raw

PATCH 5/7 arm/uefi: update edk2-firmware to 202605

In reply to Jon Mason

Update edk2-firmware to the latest release.
Of note, GCC5 make variable has been removed. Use the GCC make variable instead. Also, these changes caused the need to modify the sbsa-acs patches.

---
 ...602.bb => edk2-basetools-native_202605.bb} |  2 +-
 meta-arm/recipes-bsp/uefi/edk2-firmware.inc   |  6 +--
 .../recipes-bsp/uefi/edk2-firmware_202602.bb  |  6 ---
 .../recipes-bsp/uefi/edk2-firmware_202605.bb  |  4 ++
 ...-C-VfrCompile-Fix-parallel-make-fail.patch | 46 -------------------
 ...02-Enforce-using-good-old-BFD-linker.patch | 22 ++++-----
 meta-arm/recipes-bsp/uefi/sbsa-acs_7.2.2.bb   |  2 +-
 7 files changed, 20 insertions(+), 68 deletions(-)
 rename meta-arm/recipes-bsp/uefi/{edk2-basetools-native_202602.bb => edk2-basetools-native_202605.bb} (97%)
 delete mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_202602.bb
 create mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_202605.bb
 delete mode 100644 meta-arm/recipes-bsp/uefi/files/0001-BaseTools-Source-C-VfrCompile-Fix-parallel-make-fail.patch
meta-arm/recipes-bsp/uefi/edk2-basetools-native_202605.bb renamed from meta-arm/recipes-bsp/uefi/edk2-basetools-native_202602.bb +1 -1
similarity index 97%
rename from meta-arm/recipes-bsp/uefi/edk2-basetools-native_202602.bb
rename to meta-arm/recipes-bsp/uefi/edk2-basetools-native_202605.bb
index 28bd0dbade71..e10b85cbcb84 100644
@@ -17,7 +17,7 @@ SRC_URI = " \
 "
 LIC_FILES_CHKSUM = "file://License.txt;md5=2b415520383f7964e96700ae12b4570a"
 
-SRCREV = "b7a715f7c03c45c6b4575bf88596bfd79658b8ce"
+SRCREV = "b03a21a63e3bd001f52c527e5a57feddb53a690b"
 SRCREV_brotli = "e230f474b87134e8c6c85b630084c612057f253e"
 SRCREV_FORMAT = "default_brotli"
 
meta-arm/recipes-bsp/uefi/edk2-firmware.inc +3 -3
index 8b6f153a836c..e12a490fa018 100644
@@ -74,9 +74,9 @@ export CONF_PATH           = "${S}/Conf"
 
 export BTOOLS_PATH = "${EDK_TOOLS_PATH}/BinWrappers/PosixLike"
 
-EDK_COMPILER ?= "GCC5"
-export GCC5_AARCH64_PREFIX = "${TARGET_PREFIX}"
-export GCC5_ARM_PREFIX = "${TARGET_PREFIX}"
+EDK_COMPILER ?= "GCC"
+export GCC_AARCH64_PREFIX = "${TARGET_PREFIX}"
+export GCC_ARM_PREFIX = "${TARGET_PREFIX}"
 
 EDK_COMPILER:toolchain-clang = "CLANGDWARF"
 export CLANG38_AARCH64_PREFIX = "${TARGET_PREFIX}"
meta-arm/recipes-bsp/uefi/edk2-firmware_202602.bb deleted +0 -6
deleted file mode 100644
index de739f37b12b..000000000000
@@ -1,6 +0,0 @@
-require recipes-bsp/uefi/edk2-firmware.inc
-
-SRCREV_edk2           ?= "b7a715f7c03c45c6b4575bf88596bfd79658b8ce"
-SRCREV_edk2-platforms ?= "75024f5aa54cf4d975d024768604b28c754db338"
-
-SRC_URI += "file://0001-BaseTools-Source-C-VfrCompile-Fix-parallel-make-fail.patch"
meta-arm/recipes-bsp/uefi/edk2-firmware_202605.bb new file +4 -0
new file mode 100644
index 000000000000..8f1afe133a4e
@@ -0,0 +1,4 @@
+require recipes-bsp/uefi/edk2-firmware.inc
+
+SRCREV_edk2           ?= "b03a21a63e3bd001f52c527e5a57feddb53a690b"
+SRCREV_edk2-platforms ?= "04470160f67192c53ec9192e0e8460d183fe49ec"
meta-arm/recipes-bsp/uefi/files/0001-BaseTools-Source-C-VfrCompile-Fix-parallel-make-fail.patch deleted +0 -46

46 lines not on this page · raw message

meta-arm/recipes-bsp/uefi/sbsa-acs/0002-Enforce-using-good-old-BFD-linker.patch +11 -11
index 42523d0e9a1c..7c02100d7218 100644
@@ -1,4 +1,4 @@
-From af134611c744322e1d159794c426fbdd02e151cc Mon Sep 17 00:00:00 2001
+From 8509abdab8ad75d59d6bc2478bba78b50c59ad82 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 90a389bdff07..93f7b5cde437 100755
+index eca4cb82d059..ec4e30f3df84 100644
 --- a/BaseTools/Conf/tools_def.template
 +++ b/BaseTools/Conf/tools_def.template
-@@ -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_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_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
+@@ -931,7 +931,7 @@ DEFINE GCC_LOONGARCH64_CC_FLAGS        = DEF(GCC_ALL_CC_COMMON) -mabi=lp64d -fno
+ DEFINE GCC_AARCH64_CC_COMMON           = DEF(GCC_ALL_CC_COMMON) -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_XIPCOMMON        = -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_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 -z common-page-size=0x20
+ DEFINE GCC_AARCH64_ASLDLINK_COMMON     = DEF(GCC_AARCH64_DLINK_COMMON) -Wl,--entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT) -Wl,--defsym=PECOFF_HEADER_SIZE=0 DEF(GCC_DLINK2_FLAGS_COMMON) -z common-page-size=0x20
meta-arm/recipes-bsp/uefi/sbsa-acs_7.2.2.bb +1 -1
index bc8187ebeb10..6d4422f99a99 100644
@@ -1,4 +1,4 @@
-require recipes-bsp/uefi/edk2-firmware_202602.bb
+require recipes-bsp/uefi/edk2-firmware_202605.bb
 PROVIDES:remove = "virtual/bootloader"
 
 LICENSE += "& Apache-2.0"
Signature · 1 line
2.50.1 (Apple Git-155)
author
#5 lore raw

PATCH 6/7 arm/opencsd: upgrade to v1.8.2

In reply to Jon Mason
---
 .../opencsd/{opencsd_1.7.1.bb => opencsd_1.8.2.bb}              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-arm/recipes-devtools/opencsd/{opencsd_1.7.1.bb => opencsd_1.8.2.bb} (95%)
meta-arm/recipes-devtools/opencsd/opencsd_1.8.2.bb renamed from meta-arm/recipes-devtools/opencsd/opencsd_1.7.1.bb +1 -1
similarity index 95%
rename from meta-arm/recipes-devtools/opencsd/opencsd_1.7.1.bb
rename to meta-arm/recipes-devtools/opencsd/opencsd_1.8.2.bb
index f8429dbbadc9..0a0c7cd62ebf 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 = "83e4575459305c054ce43f7d5eb5e468e304645c"
+SRCREV = "9b462f77a4e1c6ab363fafe8f1f5d7374f5782b5"
 
 COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
 
Signature · 1 line
2.50.1 (Apple Git-155)
author
#6 lore raw

PATCH 7/7 arm/optee: update to 4.10.0

In reply to Jon Mason

Update the recipes to 4.10.0 and update the git recipes to 4.10.0 Since corstone1000 is still using 4.9.0, move that to meta-arm-bsp

---
 .../optee/optee-client_4.9.0.bb               |  0
 .../optee/optee-examples_4.9.0.bb             |  0
 .../optee/optee-os-tadevkit_4.9.0.bb          |  0
 .../recipes-security/optee/optee-os_4.9.0.bb  |  0
 .../optee/optee-test_4.9.0.bb                 |  0
 .../optee/optee-client_4.10.0.bb              |  4 +++
 .../optee/optee-client_git.bb                 |  2 +-
 .../optee/optee-examples_4.10.0.bb            |  4 +++
 .../optee/optee-examples_git.bb               |  4 +--
 .../optee/optee-os-tadevkit_4.10.0.bb         | 30 +++++++++++++++++++
 .../recipes-security/optee/optee-os_4.10.0.bb |  6 ++++
 .../recipes-security/optee/optee-os_git.bb    |  4 +--
 .../optee/optee-test_4.10.0.bb                | 17 +++++++++++
 .../recipes-security/optee/optee-test_git.bb  |  4 +--
 14 files changed, 68 insertions(+), 7 deletions(-)
 rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-client_4.9.0.bb (100%)
 rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-examples_4.9.0.bb (100%)
 rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-os-tadevkit_4.9.0.bb (100%)
 rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-os_4.9.0.bb (100%)
 rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-test_4.9.0.bb (100%)
 create mode 100644 meta-arm/recipes-security/optee/optee-client_4.10.0.bb
 create mode 100644 meta-arm/recipes-security/optee/optee-examples_4.10.0.bb
 create mode 100644 meta-arm/recipes-security/optee/optee-os-tadevkit_4.10.0.bb
 create mode 100644 meta-arm/recipes-security/optee/optee-os_4.10.0.bb
 create mode 100644 meta-arm/recipes-security/optee/optee-test_4.10.0.bb
meta-arm-bsp/recipes-security/optee/optee-client_4.9.0.bb renamed from meta-arm/recipes-security/optee/optee-client_4.9.0.bb +0 -0
similarity index 100%
rename from meta-arm/recipes-security/optee/optee-client_4.9.0.bb
rename to meta-arm-bsp/recipes-security/optee/optee-client_4.9.0.bb
meta-arm-bsp/recipes-security/optee/optee-examples_4.9.0.bb renamed from meta-arm/recipes-security/optee/optee-examples_4.9.0.bb +0 -0
similarity index 100%
rename from meta-arm/recipes-security/optee/optee-examples_4.9.0.bb
rename to meta-arm-bsp/recipes-security/optee/optee-examples_4.9.0.bb
meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_4.9.0.bb renamed from meta-arm/recipes-security/optee/optee-os-tadevkit_4.9.0.bb +0 -0
similarity index 100%
rename from meta-arm/recipes-security/optee/optee-os-tadevkit_4.9.0.bb
rename to meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_4.9.0.bb
meta-arm-bsp/recipes-security/optee/optee-os_4.9.0.bb renamed from meta-arm/recipes-security/optee/optee-os_4.9.0.bb +0 -0
similarity index 100%
rename from meta-arm/recipes-security/optee/optee-os_4.9.0.bb
rename to meta-arm-bsp/recipes-security/optee/optee-os_4.9.0.bb
meta-arm-bsp/recipes-security/optee/optee-test_4.9.0.bb renamed from meta-arm/recipes-security/optee/optee-test_4.9.0.bb +0 -0
similarity index 100%
rename from meta-arm/recipes-security/optee/optee-test_4.9.0.bb
rename to meta-arm-bsp/recipes-security/optee/optee-test_4.9.0.bb
meta-arm/recipes-security/optee/optee-client_4.10.0.bb new file +4 -0
new file mode 100644
index 000000000000..8897529ed004
@@ -0,0 +1,4 @@
+require recipes-security/optee/optee-client.inc
+
+# 4.9.0 and 4.10.0 share the same tag
+SRCREV = "9f5e90918093c1d1cd264d8149081b64ab7ba672"
meta-arm/recipes-security/optee/optee-client_git.bb +1 -1
index 24e2d1941299..884f3b5934c5 100644
@@ -1,6 +1,6 @@
 require recipes-security/optee/optee-client.inc
 
-# v4.9.0
+# v4.10.0
 SRCREV = "9f5e90918093c1d1cd264d8149081b64ab7ba672"
 PV .= "+git"
 UPSTREAM_CHECK_COMMITS = "1"
meta-arm/recipes-security/optee/optee-examples_4.10.0.bb new file +4 -0
new file mode 100644
index 000000000000..15fddb79206d
@@ -0,0 +1,4 @@
+require recipes-security/optee/optee-examples.inc
+
+# v4.10.0
+SRCREV = "934c7edb74a26e90f68024cf441073528444177f"
meta-arm/recipes-security/optee/optee-examples_git.bb +2 -2
index 4fda635b72eb..d8d6d04308f1 100644
@@ -1,7 +1,7 @@
 require recipes-security/optee/optee-examples.inc
 
-# v4.8.0
-SRCREV = "3ef17eb1f309def91113637f95f67613b1d89119"
+# v4.10.0
+SRCREV = "934c7edb74a26e90f68024cf441073528444177f"
 PV .= "+git"
 UPSTREAM_CHECK_COMMITS = "1"
 
meta-arm/recipes-security/optee/optee-os-tadevkit_4.10.0.bb new file +30 -0
new file mode 100644
index 000000000000..cca9f62abccf
@@ -0,0 +1,30 @@
+require recipes-security/optee/optee-os_${PV}.bb
+
+SUMMARY = "OP-TEE Trusted OS TA devkit"
+DESCRIPTION = "OP-TEE TA devkit for build TAs"
+HOMEPAGE = "https://www.op-tee.org/"
+
+DEPENDS += "python3-pycryptodome-native"
+DEPENDS:append:toolchain-clang = " lld-native"
+
+do_install() {
+    #install TA devkit
+    install -d ${D}${includedir}/optee/export-user_ta/
+    for f in ${B}/export-ta_${OPTEE_ARCH}/* ; do
+        cp -aR $f ${D}${includedir}/optee/export-user_ta/
+    done
+}
+
+do_deploy() {
+	echo "Do not inherit do_deploy from optee-os."
+}
+
+FILES:${PN} = "${includedir}/optee/"
+
+# Build paths are currently embedded
+INSANE_SKIP:${PN}-dev += "buildpaths"
+
+# Include extra headers needed by SPMC tests to TA DEVKIT.
+# Supported after op-tee v3.20
+EXTRA_OEMAKE:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee-spmc-test', \
+                                        ' CFG_SPMC_TESTS=y', '' , d)}"
meta-arm/recipes-security/optee/optee-os_4.10.0.bb new file +6 -0
new file mode 100644
index 000000000000..b4c6cccaa210
@@ -0,0 +1,6 @@
+require recipes-security/optee/optee-os.inc
+
+DEPENDS += "dtc-native"
+
+# 4.10.0
+SRCREV = "753afbbee1682f5d16fd30e87b31058a4fd4f4b8"
meta-arm/recipes-security/optee/optee-os_git.bb +2 -2
index 03b0f1cc74fd..f2ae0d46d4dd 100644
@@ -2,8 +2,8 @@ require recipes-security/optee/optee-os.inc
 
 DEPENDS += "dtc-native"
 
-# v4.8.0
-SRCREV = "86660925433a8d4d1b19cfa5fe940081d77b34b4"
+# v4.10.0
+SRCREV = "753afbbee1682f5d16fd30e87b31058a4fd4f4b8"
 PV .= "+git"
 UPSTREAM_CHECK_COMMITS = "1"
 
meta-arm/recipes-security/optee/optee-test_4.10.0.bb new file +17 -0
new file mode 100644
index 000000000000..f392a43e475c
@@ -0,0 +1,17 @@
+require recipes-security/optee/optee-test.inc
+
+# v4.10.0
+SRCREV = "88c93e87a5c172363ee986ded036a25cafcc9d2c"
+
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a8fa504109e4cd7ea575bc49ea4be560 \
+                    file://LICENSE-BSD;md5=dca16d6efa93b55d0fd662ae5cd6feeb \
+                    file://LICENSE-GPL;md5=10e86b5d2a6cb0e2b9dcfdd26a9ac58d \
+                   "
+
+# Include ffa_spmc test group if the SPMC test is enabled.
+# Supported after op-tee v3.20
+EXTRA_OEMAKE:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee-spmc-test', \
+                                        ' CFG_SPMC_TESTS=y CFG_SECURE_PARTITION=y', '' , d)}"
+
+RDEPENDS:${PN} += "${@bb.utils.contains('MACHINE_FEATURES', 'optee-spmc-test', \
+                                              ' arm-ffa-user', '' , d)}"
meta-arm/recipes-security/optee/optee-test_git.bb +2 -2
index 1d4ee44ea77d..a06c76c159e1 100644
@@ -1,7 +1,7 @@
 require recipes-security/optee/optee-test.inc
 
-# v4.8.0
-SRCREV = "6569cd7b13e1b37b37069e090d592adca7d3926d"
+# v4.10.0
+SRCREV = "88c93e87a5c172363ee986ded036a25cafcc9d2c"
 PV .= "+git"
 UPSTREAM_CHECK_COMMITS = "1"
 
Signature · 1 line
2.50.1 (Apple Git-155)
Applied
#7 lore raw
In reply to Jon Mason
Quoted 10 lines · Jon Mason

Add support for the newest release of TF-A.
mbedtls was made a git submodule. Given that this is no longer needed for the generic inc file, I've moved the relevant parts to the LTS recipe and others using the older way of building.

Also, seeing some weird behavior with CPUs not coming on line in sbsa-ref and qemuarm-secureboot. So, pinning those back to the LTS until they can be sorted out.

[...]

Applied, thanks!

[1/7] arm/trusted-firmware-a: Add support for v2.15.0

      commit: f1098681f4476c8de1b6a74c0b3c021eb8563582
[2/7] arm/trusted-firmware-a: remove older LTS versions
      commit: 66c46946f5050c12deeaa0909b9fe75ae2c9f799
[3/7] arm/trusted-firmware-a: Update LTS to 2.14.2
      commit: dd460eb29d03ff1a25ae5d97ad49bde834dcb614
[4/7] arm/trusted-firmware-a: Update git recipe to the latest commit
      commit: cef3e3a22c4d8b63e26377fad60e67bc61545f78
[5/7] arm/uefi: update edk2-firmware to 202605
      commit: 200ccaa637316cd66e85015685b84776961c7275
[6/7] arm/opencsd: upgrade to v1.8.2
      commit: 9014a4e935c29ff3e8bc1d1ed707c85957e0257f
[7/7] arm/optee: update to 4.10.0
      commit: 3681201897f164408194e4cc823e1e3650607dab

Best regards,

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