From patchwork Tue Dec 7 18:19:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 1050 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9DA0EC433EF for ; Tue, 7 Dec 2021 18:20:02 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.860.1638901201301869169 for ; Tue, 07 Dec 2021 10:20:01 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 741A211FB for ; Tue, 7 Dec 2021 10:20:00 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 1DE6B3F73B for ; Tue, 7 Dec 2021 10:20:00 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 1/5] trusted-firmware-a: don't use virtual/trusted-firmware-a Date: Tue, 7 Dec 2021 18:19:52 +0000 Message-Id: <20211207181956.900131-1-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 07 Dec 2021 18:20:02 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2555 There's no need to use virtual/trusted-firmware-a, as there's only one provider of trusted-firmware-a: trusted-firmware-a. Signed-off-by: Ross Burton --- meta-arm-bsp/conf/machine/corstone500.conf | 2 +- meta-arm-bsp/conf/machine/fvp-common.inc | 2 +- meta-arm-bsp/conf/machine/include/corstone1000.inc | 2 +- meta-arm-bsp/conf/machine/include/corstone700.inc | 2 +- meta-arm-bsp/conf/machine/include/tc.inc | 1 - meta-arm-bsp/conf/machine/juno.conf | 2 +- meta-arm-bsp/conf/machine/n1sdp.conf | 2 +- meta-arm-bsp/conf/machine/sgi575.conf | 2 +- meta-arm-bsp/recipes-bsp/boot-firmware/boot-firmware_git.bb | 2 +- meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb | 2 +- meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc | 2 +- .../trusted-firmware-m/trusted-firmware-m-corstone1000.inc | 2 +- meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc | 2 -- meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend | 2 +- 14 files changed, 12 insertions(+), 15 deletions(-) diff --git a/meta-arm-bsp/conf/machine/corstone500.conf b/meta-arm-bsp/conf/machine/corstone500.conf index e87d81d8..c9ab4064 100644 --- a/meta-arm-bsp/conf/machine/corstone500.conf +++ b/meta-arm-bsp/conf/machine/corstone500.conf @@ -16,7 +16,7 @@ PREFERRED_VERSION_linux-yocto ?= "5.3%" PREFERRED_VERSION_trusted-firmware-a ?= "2.5%" -EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot" +EXTRA_IMAGEDEPENDS += "trusted-firmware-a u-boot" SERIAL_CONSOLES = "115200;ttyAMA0" diff --git a/meta-arm-bsp/conf/machine/fvp-common.inc b/meta-arm-bsp/conf/machine/fvp-common.inc index 5a4a5c62..799260ec 100644 --- a/meta-arm-bsp/conf/machine/fvp-common.inc +++ b/meta-arm-bsp/conf/machine/fvp-common.inc @@ -17,7 +17,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_VERSION_u-boot ?= "2021.10" PREFERRED_VERSION_trusted-firmware-a ?= "2.5%" -EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot" +EXTRA_IMAGEDEPENDS += "trusted-firmware-a u-boot" # As this is a virtual target that will not be used in the real world there is # no need for real SSH keys. Disable rng-tools (which takes too long to diff --git a/meta-arm-bsp/conf/machine/include/corstone1000.inc b/meta-arm-bsp/conf/machine/include/corstone1000.inc index 0e1c896c..994fb06d 100644 --- a/meta-arm-bsp/conf/machine/include/corstone1000.inc +++ b/meta-arm-bsp/conf/machine/include/corstone1000.inc @@ -5,7 +5,7 @@ MACHINEOVERRIDES =. "corstone1000:" # TF-A TFA_PLATFORM = "corstone1000" PREFERRED_VERSION_trusted-firmware-a ?= "2.5%" -EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a" +EXTRA_IMAGEDEPENDS += "trusted-firmware-a" TFA_BL2_BINARY = "bl2-corstone1000.bin" TFA_FIP_BINARY = "fip-corstone1000.bin" diff --git a/meta-arm-bsp/conf/machine/include/corstone700.inc b/meta-arm-bsp/conf/machine/include/corstone700.inc index 0ec385ab..8a03c00d 100644 --- a/meta-arm-bsp/conf/machine/include/corstone700.inc +++ b/meta-arm-bsp/conf/machine/include/corstone700.inc @@ -18,7 +18,7 @@ PREFERRED_VERSION_gcc-arm-none-eabi-native ?= "9-2020-q2-update" PREFERRED_PROVIDER_virtual/control-processor-firmware ?= "boot-firmware" EXTRA_IMAGEDEPENDS += " \ - virtual/trusted-firmware-a \ + trusted-firmware-a \ external-system \ u-boot \ virtual/control-processor-firmware \ diff --git a/meta-arm-bsp/conf/machine/include/tc.inc b/meta-arm-bsp/conf/machine/include/tc.inc index dd0b872e..9f0239bb 100644 --- a/meta-arm-bsp/conf/machine/include/tc.inc +++ b/meta-arm-bsp/conf/machine/include/tc.inc @@ -21,7 +21,6 @@ UBOOT_SIGN_KEYNAME = "dev_key" UBOOT_SIGN_KEYDIR = "${DEPLOY_DIR_IMAGE}/keys" FIT_GENERATE_KEYS = "1" -PREFERRED_PROVIDER_virtual/trusted-firmware-a ?= "trusted-firmware-a" PREFERRED_VERSION_trusted-firmware-a ?= "2.5%" PREFERRED_PROVIDER_virtual/kernel ?= "linux-arm64-ack" diff --git a/meta-arm-bsp/conf/machine/juno.conf b/meta-arm-bsp/conf/machine/juno.conf index 1000dadf..4a71d66d 100644 --- a/meta-arm-bsp/conf/machine/juno.conf +++ b/meta-arm-bsp/conf/machine/juno.conf @@ -23,7 +23,7 @@ PREFERRED_VERSION_linux-yocto ?= "5.4%" PREFERRED_VERSION_trusted-firmware-a ?= "2.5%" PREFERRED_VERSION_u-boot ?= "2020.07" -EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot firmware-image-juno" +EXTRA_IMAGEDEPENDS += "trusted-firmware-a u-boot firmware-image-juno" # Juno u-boot configuration UBOOT_MACHINE = "vexpress_aemv8a_juno_defconfig" diff --git a/meta-arm-bsp/conf/machine/n1sdp.conf b/meta-arm-bsp/conf/machine/n1sdp.conf index 643212fb..95a04c05 100644 --- a/meta-arm-bsp/conf/machine/n1sdp.conf +++ b/meta-arm-bsp/conf/machine/n1sdp.conf @@ -27,7 +27,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "linux-firmware-rtl8168" PREFERRED_VERSION_trusted-firmware-a ?= "2.5%" -EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a" +EXTRA_IMAGEDEPENDS += "trusted-firmware-a" EXTRA_IMAGEDEPENDS += "virtual/control-processor-firmware" #UEFI EDK2 firmware diff --git a/meta-arm-bsp/conf/machine/sgi575.conf b/meta-arm-bsp/conf/machine/sgi575.conf index 4f917105..7e1e6036 100644 --- a/meta-arm-bsp/conf/machine/sgi575.conf +++ b/meta-arm-bsp/conf/machine/sgi575.conf @@ -10,7 +10,7 @@ EXTRA_IMAGEDEPENDS += "virtual/control-processor-firmware" PREFERRED_VERSION_trusted-firmware-a ?= "2.5%" -EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a" +EXTRA_IMAGEDEPENDS += "trusted-firmware-a" KERNEL_IMAGETYPE ?= "Image" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" diff --git a/meta-arm-bsp/recipes-bsp/boot-firmware/boot-firmware_git.bb b/meta-arm-bsp/recipes-bsp/boot-firmware/boot-firmware_git.bb index 0a8e2df6..abd4e328 100644 --- a/meta-arm-bsp/recipes-bsp/boot-firmware/boot-firmware_git.bb +++ b/meta-arm-bsp/recipes-bsp/boot-firmware/boot-firmware_git.bb @@ -12,7 +12,7 @@ PV = "2020.02.10+git${SRCPV}" PROVIDES += "virtual/control-processor-firmware" -DEPENDS = "virtual/arm-none-eabi-gcc-native virtual/trusted-firmware-a" +DEPENDS = "virtual/arm-none-eabi-gcc-native trusted-firmware-a" inherit deploy diff --git a/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb b/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb index a79bab50..d65c074f 100644 --- a/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb +++ b/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb @@ -5,7 +5,7 @@ LICENSE = "BSD-3-Clause" SECTION = "firmware" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" -DEPENDS = "virtual/trusted-firmware-a virtual/kernel virtual/control-processor-firmware" +DEPENDS = "trusted-firmware-a virtual/kernel virtual/control-processor-firmware" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc index 1af68dde..a1e2af61 100644 --- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc +++ b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc @@ -6,7 +6,7 @@ SCP_LOG_LEVEL = "INFO" COMPATIBLE_MACHINE:n1sdp = "n1sdp" DEPENDS += "fiptool-native" -DEPENDS += "virtual/trusted-firmware-a" +DEPENDS += "trusted-firmware-a" do_install:append() { fiptool \ diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc index 68abc967..42648eaa 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc @@ -34,7 +34,7 @@ SRCREV_mcuboot = "29099e1d17f93ae1d09fe945ad191b703aacd3d8" # The install task signs the TF-A BL2 and FIP binaries. # So they need to be copied to the sysroot. Hence the dependencies below: -do_prepare_recipe_sysroot[depends]+= "virtual/trusted-firmware-a:do_populate_sysroot" +do_prepare_recipe_sysroot[depends]+= "trusted-firmware-a:do_populate_sysroot" # adding host images signing support require trusted-firmware-m-sign-host-images.inc diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc index 243e641c..40c9e9e3 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc @@ -1,8 +1,6 @@ DESCRIPTION = "Trusted Firmware-A" LICENSE = "BSD-3-Clause & MIT" -PROVIDES = "virtual/trusted-firmware-a" - PACKAGE_ARCH = "${MACHINE_ARCH}" inherit deploy diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend b/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend index 50777dcd..f65cb094 100644 --- a/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend +++ b/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend @@ -5,7 +5,7 @@ EDK2_BIN_NAME:qemuarm64-secureboot = "QEMU_EFI.fd" COMPATIBLE_MACHINE:qemu-generic-arm64 = "qemu-generic-arm64" -DEPENDS:append:qemu-generic-arm64 = " virtual/trusted-firmware-a coreutils-native" +DEPENDS:append:qemu-generic-arm64 = " trusted-firmware-a coreutils-native" EDK2_PLATFORM:qemu-generic-arm64 = "SbsaQemu" EDK2_PLATFORM_DSC:qemu-generic-arm64 = "Platform/Qemu/SbsaQemu/SbsaQemu.dsc" EDK2_BIN_NAME:qemu-generic-arm64 = "SBSA_FLASH0.fd" From patchwork Tue Dec 7 18:19:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 1054 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A15AC433F5 for ; Tue, 7 Dec 2021 18:20:03 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.863.1638901202630082570 for ; Tue, 07 Dec 2021 10:20:02 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 067FF13A1 for ; Tue, 7 Dec 2021 10:20:01 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id A60F53F73B for ; Tue, 7 Dec 2021 10:20:00 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 2/5] arm/trusted-firmware-a: move SRCREV_FORMAT to common include Date: Tue, 7 Dec 2021 18:19:53 +0000 Message-Id: <20211207181956.900131-2-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211207181956.900131-1-ross.burton@arm.com> References: <20211207181956.900131-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 07 Dec 2021 18:20:03 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2557 Instead of every versioned recipe setting this, move it to the common include. Signed-off-by: Ross Burton --- meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc | 2 ++ .../recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.5.bb | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc index 40c9e9e3..b1a75229 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc @@ -9,6 +9,8 @@ SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=ht file://ssl.patch" UPSTREAM_CHECK_GITTAGREGEX = "^v(?P\d+(\.\d+)+)$" +SRCREV_FORMAT = "tfa" + COMPATIBLE_MACHINE ?= "invalid" # Platform must be set for each machine diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.5.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.5.bb index 15e689a8..15c4e5df 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.5.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.5.bb @@ -1,8 +1,5 @@ require trusted-firmware-a.inc -# Use TF-A for version -SRCREV_FORMAT = "tfa" - # TF-A v2.5 SRCREV_tfa = "1e13c500a0351ac4b55d09a63f7008e2438550f8" From patchwork Tue Dec 7 18:19:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 1052 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC7CDC4332F for ; Tue, 7 Dec 2021 18:20:03 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.862.1638901202252364977 for ; Tue, 07 Dec 2021 10:20:02 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8DB6C143B for ; Tue, 7 Dec 2021 10:20:01 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 3952E3F73B for ; Tue, 7 Dec 2021 10:20:01 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 3/5] arm-bsp/trusted-firmware-a: explicitly set the full PV for corstone1000 Date: Tue, 7 Dec 2021 18:19:54 +0000 Message-Id: <20211207181956.900131-3-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211207181956.900131-1-ross.burton@arm.com> References: <20211207181956.900131-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 07 Dec 2021 18:20:03 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2556 The bbappend is fetching a specific SHA, so explicitly set the PV to match. Signed-off-by: Ross Burton --- .../trusted-firmware-a/trusted-firmware-a-corstone1000.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone1000.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone1000.inc index 970a1cee..1a5bdd0c 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone1000.inc +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone1000.inc @@ -4,9 +4,9 @@ COMPATIBLE_MACHINE = "(corstone1000)" SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master" -# TF-A master branch with all Corstone1000 patches merged +# TF-A master branch post 2.5 with all Corstone1000 patches merged SRCREV_tfa = "459b24451a0829460783ce8dfa15561e36d901d8" -PV .= "+git${SRCREV_tfa}" +PV = "2.5+git${SRCPV}" LIC_FILES_CHKSUM="file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde file://mbedtls/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" From patchwork Tue Dec 7 18:19:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 1051 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6DE35C433FE for ; Tue, 7 Dec 2021 18:20:03 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web09.870.1638901202509536771 for ; Tue, 07 Dec 2021 10:20:02 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 230DA11FB for ; Tue, 7 Dec 2021 10:20:02 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C0AE73F73B for ; Tue, 7 Dec 2021 10:20:01 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 4/5] arm/trusted-firmware-a: add new recipe for 2.6 Date: Tue, 7 Dec 2021 18:19:55 +0000 Message-Id: <20211207181956.900131-4-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211207181956.900131-1-ross.burton@arm.com> References: <20211207181956.900131-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 07 Dec 2021 18:20:03 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2558 Keeping 2.5 around temporarily until all of the machines are ported. Signed-off-by: Ross Burton --- .../trusted-firmware-a/trusted-firmware-a_2.6.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.6.bb diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.6.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.6.bb new file mode 100644 index 00000000..ec1bec95 --- /dev/null +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.6.bb @@ -0,0 +1,12 @@ +require trusted-firmware-a.inc + +# TF-A v2.6 +SRCREV_tfa = "a1f02f4f3daae7e21ee58b4c93ec3e46b8f28d15" + +LIC_FILES_CHKSUM += "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde" + +# mbed TLS v2.26.0 +SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=master" +SRCREV_mbedtls = "e483a77c85e1f9c1dd2eb1c5a8f552d2617fe400" + +LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" From patchwork Tue Dec 7 18:19:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 1053 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 72A97C43219 for ; Tue, 7 Dec 2021 18:20:04 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web09.871.1638901203003084792 for ; Tue, 07 Dec 2021 10:20:03 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id AD6331476 for ; Tue, 7 Dec 2021 10:20:02 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 581EE3F73B for ; Tue, 7 Dec 2021 10:20:02 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 5/5] arm-bsp/trusted-firmware-a: move most BSPs to TF-A 2.6 Date: Tue, 7 Dec 2021 18:19:56 +0000 Message-Id: <20211207181956.900131-5-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211207181956.900131-1-ross.burton@arm.com> References: <20211207181956.900131-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 07 Dec 2021 18:20:04 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2559 Most BSPs don't need a specific release of TF-A, so add a bbappend for TF-A 2.6 and remove the preferred version assignments. Notable exceptions are TC0/TC1 and Corstone1000, which both are currently using intermediate SHAs pre-2.6: - TC0/TC1 fails to build with TF-A 2.6 as the binary doesn't fit in the specific space. - Corstone1000 patches need to be rebased on top of 2.6 Signed-off-by: Ross Burton --- meta-arm-bsp/conf/machine/corstone500.conf | 2 -- meta-arm-bsp/conf/machine/fvp-common.inc | 1 - meta-arm-bsp/conf/machine/include/corstone700.inc | 2 -- meta-arm-bsp/conf/machine/juno.conf | 1 - meta-arm-bsp/conf/machine/n1sdp.conf | 2 -- meta-arm-bsp/conf/machine/sgi575.conf | 2 -- .../trusted-firmware-a_2.6.bbappend | 14 ++++++++++++++ 7 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.6.bbappend diff --git a/meta-arm-bsp/conf/machine/corstone500.conf b/meta-arm-bsp/conf/machine/corstone500.conf index c9ab4064..384a8dcf 100644 --- a/meta-arm-bsp/conf/machine/corstone500.conf +++ b/meta-arm-bsp/conf/machine/corstone500.conf @@ -14,8 +14,6 @@ require conf/machine/include/arm/armv7a/tune-cortexa5.inc PREFERRED_PROVIDER_virtual/kernel:forcevariable = "linux-yocto" PREFERRED_VERSION_linux-yocto ?= "5.3%" -PREFERRED_VERSION_trusted-firmware-a ?= "2.5%" - EXTRA_IMAGEDEPENDS += "trusted-firmware-a u-boot" SERIAL_CONSOLES = "115200;ttyAMA0" diff --git a/meta-arm-bsp/conf/machine/fvp-common.inc b/meta-arm-bsp/conf/machine/fvp-common.inc index 799260ec..a8fd60d9 100644 --- a/meta-arm-bsp/conf/machine/fvp-common.inc +++ b/meta-arm-bsp/conf/machine/fvp-common.inc @@ -15,7 +15,6 @@ SERIAL_CONSOLES = "115200;ttyAMA0" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_VERSION_u-boot ?= "2021.10" -PREFERRED_VERSION_trusted-firmware-a ?= "2.5%" EXTRA_IMAGEDEPENDS += "trusted-firmware-a u-boot" diff --git a/meta-arm-bsp/conf/machine/include/corstone700.inc b/meta-arm-bsp/conf/machine/include/corstone700.inc index 8a03c00d..fbb52776 100644 --- a/meta-arm-bsp/conf/machine/include/corstone700.inc +++ b/meta-arm-bsp/conf/machine/include/corstone700.inc @@ -11,8 +11,6 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0" PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" PREFERRED_VERSION_linux-yocto ?= "5.6%" -PREFERRED_VERSION_trusted-firmware-a ?= "2.5%" - PREFERRED_VERSION_gcc-arm-none-eabi-native ?= "9-2020-q2-update" PREFERRED_PROVIDER_virtual/control-processor-firmware ?= "boot-firmware" diff --git a/meta-arm-bsp/conf/machine/juno.conf b/meta-arm-bsp/conf/machine/juno.conf index 4a71d66d..86253adf 100644 --- a/meta-arm-bsp/conf/machine/juno.conf +++ b/meta-arm-bsp/conf/machine/juno.conf @@ -20,7 +20,6 @@ SERIAL_CONSOLES = "115200;ttyAMA0" # Use kernel provided by yocto PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_VERSION_linux-yocto ?= "5.4%" -PREFERRED_VERSION_trusted-firmware-a ?= "2.5%" PREFERRED_VERSION_u-boot ?= "2020.07" EXTRA_IMAGEDEPENDS += "trusted-firmware-a u-boot firmware-image-juno" diff --git a/meta-arm-bsp/conf/machine/n1sdp.conf b/meta-arm-bsp/conf/machine/n1sdp.conf index 95a04c05..1fadbc10 100644 --- a/meta-arm-bsp/conf/machine/n1sdp.conf +++ b/meta-arm-bsp/conf/machine/n1sdp.conf @@ -25,8 +25,6 @@ PREFERRED_VERSION_linux-yocto-rt ?= "5.10%" # RTL8168E Gigabit Ethernet Controller is attached to the PCIe interface MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "linux-firmware-rtl8168" -PREFERRED_VERSION_trusted-firmware-a ?= "2.5%" - EXTRA_IMAGEDEPENDS += "trusted-firmware-a" EXTRA_IMAGEDEPENDS += "virtual/control-processor-firmware" diff --git a/meta-arm-bsp/conf/machine/sgi575.conf b/meta-arm-bsp/conf/machine/sgi575.conf index 7e1e6036..a384caa5 100644 --- a/meta-arm-bsp/conf/machine/sgi575.conf +++ b/meta-arm-bsp/conf/machine/sgi575.conf @@ -8,8 +8,6 @@ require conf/machine/include/arm/armv8-2a/tune-cortexa75.inc EXTRA_IMAGEDEPENDS += "virtual/control-processor-firmware" -PREFERRED_VERSION_trusted-firmware-a ?= "2.5%" - EXTRA_IMAGEDEPENDS += "trusted-firmware-a" KERNEL_IMAGETYPE ?= "Image" diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.6.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.6.bbappend new file mode 100644 index 00000000..659ba352 --- /dev/null +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.6.bbappend @@ -0,0 +1,14 @@ +# Machine specific TFAs + +MACHINE_TFA_REQUIRE ?= "" +MACHINE_TFA_REQUIRE:corstone500 = "trusted-firmware-a-corstone500.inc" +MACHINE_TFA_REQUIRE:corstone700 = "trusted-firmware-a-corstone700.inc" +MACHINE_TFA_REQUIRE:corstone1000 = "trusted-firmware-a-corstone1000.inc" +MACHINE_TFA_REQUIRE:fvp-base = "trusted-firmware-a-fvp.inc" +MACHINE_TFA_REQUIRE:fvp-base-arm32 = "trusted-firmware-a-fvp-arm32.inc" +MACHINE_TFA_REQUIRE:juno = "trusted-firmware-a-juno.inc" +MACHINE_TFA_REQUIRE:n1sdp = "trusted-firmware-a-n1sdp.inc" +MACHINE_TFA_REQUIRE:sgi575 = "trusted-firmware-a-sgi575.inc" +MACHINE_TFA_REQUIRE:tc = "trusted-firmware-a-tc.inc" + +require ${MACHINE_TFA_REQUIRE}