From patchwork Mon Jan 24 16:29:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 2854 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 CB90FC433F5 for ; Mon, 24 Jan 2022 16:30:03 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.5977.1643041803177176175 for ; Mon, 24 Jan 2022 08:30: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 BCEA6D6E for ; Mon, 24 Jan 2022 08:30: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 68D2F3F793 for ; Mon, 24 Jan 2022 08:30:02 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 1/4] arm/trusted-firmware-m: use relative paths for SRC_URI destsuffix Date: Mon, 24 Jan 2022 16:29:44 +0000 Message-Id: <20220124162947.3796440-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 ; Mon, 24 Jan 2022 16:30:03 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2894 It's not recommended to use ${S} in SRC_URI as S contains references to the version which results in a circular list of variable lookups. destsuffix is relative to WORKDIR and defaults to git/, so use relative paths with the same result. Signed-off-by: Ross Burton --- .../trusted-firmware-m/trusted-firmware-m_1.5.0.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.5.0.bb b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.5.0.bb index fe3f729c..302fd2cd 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.5.0.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.5.0.bb @@ -15,11 +15,11 @@ LIC_FILES_CHKSUM = "file://license.rst;md5=07f368487da347f3c7bd0fc3085f3afa \ file://../mbedtls/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://../mcuboot/LICENSE;md5=b6ee33f1d12a5e6ee3de1e82fb51eeb8" -SRC_URI = "git://git.trustedfirmware.org/TF-M/trusted-firmware-m.git;protocol=https;branch=${SRCBRANCH_tfm};name=tfm;destsuffix=${S} \ - git://git.trustedfirmware.org/TF-M/tf-m-tests.git;protocol=https;branch=release/1.5.x;name=tfm-tests;destsuffix=${S}/../tf-m-tests \ - git://github.com/ARMmbed/mbedtls.git;protocol=https;branch=master;name=mbedtls;destsuffix=${S}/../mbedtls \ - git://github.com/mcu-tools/mcuboot.git;protocol=https;branch=main;name=mcuboot;destsuffix=${S}/../mcuboot \ - file://cbor2.patch;patchdir=${S}/../mcuboot \ +SRC_URI = "git://git.trustedfirmware.org/TF-M/trusted-firmware-m.git;protocol=https;branch=${SRCBRANCH_tfm};name=tfm;destsuffix=git/tfm \ + git://git.trustedfirmware.org/TF-M/tf-m-tests.git;protocol=https;branch=release/1.5.x;name=tfm-tests;destsuffix=git/tf-m-tests \ + git://github.com/ARMmbed/mbedtls.git;protocol=https;branch=master;name=mbedtls;destsuffix=git/mbedtls \ + git://github.com/mcu-tools/mcuboot.git;protocol=https;branch=main;name=mcuboot;destsuffix=git/mcuboot \ + file://cbor2.patch;patchdir=../mcuboot \ " # The required dependencies are documented in tf-m/config/config_default.cmake From patchwork Mon Jan 24 16:29:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 2857 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 B80C1C4332F for ; Mon, 24 Jan 2022 16:30:04 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.5879.1643041803844580050 for ; Mon, 24 Jan 2022 08:30:04 -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 4F45B101E for ; Mon, 24 Jan 2022 08:30:03 -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 EF4463F793 for ; Mon, 24 Jan 2022 08:30:02 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 2/4] arm-bsp/trusted-firmware-m: use SRCPV in the corstone1000 overrides Date: Mon, 24 Jan 2022 16:29:45 +0000 Message-Id: <20220124162947.3796440-2-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220124162947.3796440-1-ross.burton@arm.com> References: <20220124162947.3796440-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 ; Mon, 24 Jan 2022 16:30:04 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2895 corstone1000 currently has a git snapshot of TF-M, so that the version number is managable use SRCPV instead of SRCREV. Signed-off-by: Ross Burton --- .../trusted-firmware-m/trusted-firmware-m-corstone1000.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 c0bce148..0e25fbe7 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 @@ -13,8 +13,8 @@ SRCREV_tfm = "49a28600f9dd640638f667273ef15acb6d1a8e1c" SRCREV_mbedtls = "d65aeb37349ad1a50e0f6c9b694d4b5290d60e49" SRCREV_mcuboot = "29099e1d17f93ae1d09fe945ad191b703aacd3d8" -PV = "1.5.0+git${SRCREV_tfm}" -SRCREV_FORMAT = "tfm_mcuboot_tfm-tests_mbedtls" +PV = "1.5.0+git${SRCPV}" +SRCREV_FORMAT = "tfm" # The install task signs the TF-A BL2 and FIP binaries. # So they need to be copied to the sysroot. Hence the dependencies below: From patchwork Mon Jan 24 16:29:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 2855 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 AB7E4C433EF for ; Mon, 24 Jan 2022 16:30:04 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.5880.1643041804278533142 for ; Mon, 24 Jan 2022 08:30:04 -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 D5D97D6E for ; Mon, 24 Jan 2022 08:30:03 -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 8190C3F793 for ; Mon, 24 Jan 2022 08:30:03 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 3/4] arm-bsp/optee-os: use SRCPV in the corstone1000 overrides Date: Mon, 24 Jan 2022 16:29:46 +0000 Message-Id: <20220124162947.3796440-3-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220124162947.3796440-1-ross.burton@arm.com> References: <20220124162947.3796440-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 ; Mon, 24 Jan 2022 16:30:04 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2896 corstone1000 currently has a git snapshot of optee-os, so that the version number is managable use SRCPV instead of SRCREV. Also fix whitespace in SRC_URI. Signed-off-by: Ross Burton --- .../recipes-security/optee/optee-os_corstone1000_common.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-arm-bsp/recipes-security/optee/optee-os_corstone1000_common.inc b/meta-arm-bsp/recipes-security/optee/optee-os_corstone1000_common.inc index 6e81316b..e17467fe 100644 --- a/meta-arm-bsp/recipes-security/optee/optee-os_corstone1000_common.inc +++ b/meta-arm-bsp/recipes-security/optee/optee-os_corstone1000_common.inc @@ -1,6 +1,6 @@ SRC_URI = "git://git.trustedfirmware.org/OP-TEE/optee_os.git;protocol=https;branch=psa-development" SRCREV = "f9de2c9520ed97b89760cc4c99424aae440b63f4" -PV .= "+git${SRCREV}" +PV .= "+git${SRCPV}" DEPENDS += "python3-pycryptodomex-native dtc-native" @@ -10,7 +10,7 @@ SRC_URI:append = " \ file://0001-plat-corstone1000-add-corstone1000-platform.patch \ file://0002-plat-corstone1000-reserve-3MB-CVM-memory-for-optee.patch \ file://0003-plat-corstone1000-add-a-rule-in-Makefile-to-SP_MAKEF.patch \ - file://0004-plat-corstone1000-increase-OPTEE-core-heap-size.patch \ + file://0004-plat-corstone1000-increase-OPTEE-core-heap-size.patch \ file://0005-Fix-add-missing-error-check-during-SP-init.patch \ " From patchwork Mon Jan 24 16:29:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 2856 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 AC9F6C43217 for ; Mon, 24 Jan 2022 16:30:05 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.5880.1643041804278533142 for ; Mon, 24 Jan 2022 08:30:05 -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 67E5D101E for ; Mon, 24 Jan 2022 08:30:04 -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 13C733F793 for ; Mon, 24 Jan 2022 08:30:03 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 4/4] arm/psa-arch-tests: set PV correctly Date: Mon, 24 Jan 2022 16:29:47 +0000 Message-Id: <20220124162947.3796440-4-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220124162947.3796440-1-ross.burton@arm.com> References: <20220124162947.3796440-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 ; Mon, 24 Jan 2022 16:30:05 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2897 Don't use SRCREV in the PV, but use SRCPV as this truncates the SHA. Also bump to 1.2+git, as the psa-arch-tests project does tag releases. Signed-off-by: Ross Burton --- .../recipes-security/trusted-services/psa-arch-tests_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-arm/recipes-security/trusted-services/psa-arch-tests_git.bb b/meta-arm/recipes-security/trusted-services/psa-arch-tests_git.bb index ff38f7d0..0e7213a1 100644 --- a/meta-arm/recipes-security/trusted-services/psa-arch-tests_git.bb +++ b/meta-arm/recipes-security/trusted-services/psa-arch-tests_git.bb @@ -8,7 +8,7 @@ SRC_URI:append = " ${SRC_URI_PSA}" SRCREV_FORMAT="ts_psa" SRCREV_psa = "6e1549dde62d12c92fc2df90ebbbe2d2d77cc76a" -PV = "0.0+git${SRCREV_psa}" +PV = "1.2+git${SRCPV}" PSA_APPLICATION_NAME = "psa-api-test" TS_ENVIRONMENT_LINUX = "arm-linux"