From patchwork Fri Jun 9 17:14:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 25375 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 5F8D7C7EE29 for ; Fri, 9 Jun 2023 17:14:44 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.361.1686330876588425400 for ; Fri, 09 Jun 2023 10:14:36 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@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 1BBDEAB6 for ; Fri, 9 Jun 2023 10:15:21 -0700 (PDT) Received: from debian.lan?044arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 77A473F6C4 for ; Fri, 9 Jun 2023 10:14:35 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH v2 1/2] trusted-firmware-a: update to the latest TF-A LTS Date: Fri, 9 Jun 2023 12:14:27 -0500 Message-Id: <20230609171428.3319420-1-jon.mason@arm.com> X-Mailer: git-send-email 2.30.2 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 ; Fri, 09 Jun 2023 17:14:44 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4753 Update TF-A and fiptool (which is part of tf-a) to the latest stable version. Also, use the tf-a tests lts branch (which is still at version 2.8.0). Signed-off-by: Jon Mason --- .../{fiptool-native_2.8.bb => fiptool-native_2.8.6.bb} | 6 +++--- meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.8.0.bb | 4 ++-- ...sted-firmware-a_2.8.0.bb => trusted-firmware-a_2.8.6.bb} | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-) rename meta-arm/recipes-bsp/trusted-firmware-a/{fiptool-native_2.8.bb => fiptool-native_2.8.6.bb} (90%) rename meta-arm/recipes-bsp/trusted-firmware-a/{trusted-firmware-a_2.8.0.bb => trusted-firmware-a_2.8.6.bb} (88%) diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.8.bb b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.8.6.bb similarity index 90% rename from meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.8.bb rename to meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.8.6.bb index 578f5a29..02f33873 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.8.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.8.6.bb @@ -7,11 +7,11 @@ LICENSE = "BSD-3-Clause" SRC_URI_TRUSTED_FIRMWARE_A ?= "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https" SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};destsuffix=fiptool-${PV};branch=${SRCBRANCH}" -SRCBRANCH = "master" LIC_FILES_CHKSUM = "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde" -# Use fiptool from TF-A v2.8 -SRCREV = "9881bb93a3bc0a3ea37e9f093e09ab4b360a9e48" +# Use fiptool from TF-A v2.8.6 +SRCREV = "ff0bd5f9bb2ba2f31fb9cec96df917747af9e92d" +SRCBRANCH = "lts-v2.8" DEPENDS += "openssl-native" diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.8.0.bb b/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.8.0.bb index 0c094995..ed3b3499 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.8.0.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.8.0.bb @@ -10,8 +10,8 @@ COMPATIBLE_MACHINE ?= "invalid" SRC_URI_TRUSTED_FIRMWARE_A_TESTS ?= "git://git.trustedfirmware.org/TF-A/tf-a-tests.git;protocol=https" SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A_TESTS};branch=${SRCBRANCH} \ file://tf-a-tests-no-warn-rwx-segments.patch" -SRCBRANCH = "master" -SRCREV = "f7b3be91ab954c495912fc7bc48383cd83bfec2d" +SRCBRANCH = "lts-v2.8" +SRCREV = "85442d2943440718c2c2c9c5c690202b4b4f5725" DEPENDS += "optee-os" diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.8.0.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.8.6.bb similarity index 88% rename from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.8.0.bb rename to meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.8.6.bb index 5830339c..140faf53 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.8.0.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.8.6.bb @@ -1,7 +1,8 @@ require trusted-firmware-a.inc -# TF-A v2.8 -SRCREV_tfa = "9881bb93a3bc0a3ea37e9f093e09ab4b360a9e48" +# TF-A v2.8.6 +SRCREV_tfa = "ff0bd5f9bb2ba2f31fb9cec96df917747af9e92d" +SRCBRANCH = "lts-v2.8" SRC_URI += "file://rwx-segments.patch"