From patchwork Mon Jan 9 17:20:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 17908 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 A239AC677F1 for ; Mon, 9 Jan 2023 17:20:29 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.78498.1673284826524526116 for ; Mon, 09 Jan 2023 09:20:26 -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 015FA1042; Mon, 9 Jan 2023 09:21:08 -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 8EBE93F587; Mon, 9 Jan 2023 09:20:25 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 1/4] arm/fvp-envelope: name the FVP tarballs for checksums Date: Mon, 9 Jan 2023 17:20:19 +0000 Message-Id: <20230109172022.2280271-1-ross.burton@arm.com> X-Mailer: git-send-email 2.34.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, 09 Jan 2023 17:20:29 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4244 We can download both x86-64 and aarch64 binaries, so ensure the SRC_URI entry is named to identify them. Signed-off-by: Ross Burton --- meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.20.15.bb | 2 +- meta-arm/recipes-devtools/fvp/fvp-base-r-aem_11.20.15.bb | 2 +- meta-arm/recipes-devtools/fvp/fvp-envelope.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.20.15.bb b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.20.15.bb index 6545a6ef..85c752bc 100644 --- a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.20.15.bb +++ b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.20.15.bb @@ -5,6 +5,6 @@ LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba file://license_terms/third_party_licenses/third_party_licenses.txt;md5=34a1ba318d745f05e6197def68ea5411 \ file://license_terms/third_party_licenses/arm_license_management_utilities/third_party_licenses.txt;md5=2e53bda6ff2db4c35d69944b93926c9f" -SRC_URI[sha256sum] = "f9db2076e3a63e2f8eb2ea9ed60f30db04e5f81f535bc7e3ed24e270d857ea6f" +SRC_URI[fvp-x86_64.sha256sum] = "f9db2076e3a63e2f8eb2ea9ed60f30db04e5f81f535bc7e3ed24e270d857ea6f" MODEL_CODE = "FVP_Base_RevC-2xAEMvA" diff --git a/meta-arm/recipes-devtools/fvp/fvp-base-r-aem_11.20.15.bb b/meta-arm/recipes-devtools/fvp/fvp-base-r-aem_11.20.15.bb index f5175b2c..3f8139ca 100644 --- a/meta-arm/recipes-devtools/fvp/fvp-base-r-aem_11.20.15.bb +++ b/meta-arm/recipes-devtools/fvp/fvp-base-r-aem_11.20.15.bb @@ -5,6 +5,6 @@ LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba file://license_terms/third_party_licenses/third_party_licenses.txt;md5=34a1ba318d745f05e6197def68ea5411 \ file://license_terms/third_party_licenses/arm_license_management_utilities/third_party_licenses.txt;md5=2e53bda6ff2db4c35d69944b93926c9f" -SRC_URI[sha256sum] = "c252616489b79fffa3bb721255b1c99ff4ee8c38e4beebce4fa05862a3195fe9" +SRC_URI[fvp-x86_64.sha256sum] = "c252616489b79fffa3bb721255b1c99ff4ee8c38e4beebce4fa05862a3195fe9" MODEL_CODE = "FVP_Base_AEMv8R" diff --git a/meta-arm/recipes-devtools/fvp/fvp-envelope.inc b/meta-arm/recipes-devtools/fvp/fvp-envelope.inc index 887d9d27..2884bb56 100644 --- a/meta-arm/recipes-devtools/fvp/fvp-envelope.inc +++ b/meta-arm/recipes-devtools/fvp/fvp-envelope.inc @@ -2,7 +2,7 @@ require fvp-common.inc HOMEPAGE = "https://developer.arm.com/tools-and-software/simulation-models/fixed-virtual-platforms/arm-ecosystem-models" -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/ecosystem-models/${MODEL_CODE}_${PV_URL}_${FVP_ARCH}.tgz;subdir=${BP}" +SRC_URI = "https://developer.arm.com/-/media/Files/downloads/ecosystem-models/${MODEL_CODE}_${PV_URL}_${FVP_ARCH}.tgz;subdir=${BP};name=fvp-${HOST_ARCH}" UPSTREAM_CHECK_URI = "${HOMEPAGE}" UPSTREAM_CHECK_REGEX = "${MODEL_CODE}_(?P(\d+[\.\-_]*)+).tgz" From patchwork Mon Jan 9 17:20:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 17907 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 9DCA1C5479D for ; Mon, 9 Jan 2023 17:20:29 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.78788.1673284827119386367 for ; Mon, 09 Jan 2023 09:20:27 -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 A45DF1596; Mon, 9 Jan 2023 09:21:08 -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 3CA563F587; Mon, 9 Jan 2023 09:20:26 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 2/4] arm/fvp-envelope: update HOMEPAGE Date: Mon, 9 Jan 2023 17:20:20 +0000 Message-Id: <20230109172022.2280271-2-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230109172022.2280271-1-ross.burton@arm.com> References: <20230109172022.2280271-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, 09 Jan 2023 17:20:29 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4245 Signed-off-by: Ross Burton --- meta-arm/recipes-devtools/fvp/fvp-envelope.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-arm/recipes-devtools/fvp/fvp-envelope.inc b/meta-arm/recipes-devtools/fvp/fvp-envelope.inc index 2884bb56..1e8bb407 100644 --- a/meta-arm/recipes-devtools/fvp/fvp-envelope.inc +++ b/meta-arm/recipes-devtools/fvp/fvp-envelope.inc @@ -1,6 +1,6 @@ require fvp-common.inc -HOMEPAGE = "https://developer.arm.com/tools-and-software/simulation-models/fixed-virtual-platforms/arm-ecosystem-models" +HOMEPAGE = "https://developer.arm.com/Tools%20and%20Software/Fixed%20Virtual%20Platforms" SRC_URI = "https://developer.arm.com/-/media/Files/downloads/ecosystem-models/${MODEL_CODE}_${PV_URL}_${FVP_ARCH}.tgz;subdir=${BP};name=fvp-${HOST_ARCH}" From patchwork Mon Jan 9 17:20:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 17906 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 A2345C61DB3 for ; Mon, 9 Jan 2023 17:20:29 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.78789.1673284828170500735 for ; Mon, 09 Jan 2023 09:20:28 -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 50AE31655; Mon, 9 Jan 2023 09:21:09 -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 DE8473F587; Mon, 9 Jan 2023 09:20:26 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 3/4] arm/fvp-base-a-aem: add support for aarch64 binaries Date: Mon, 9 Jan 2023 17:20:21 +0000 Message-Id: <20230109172022.2280271-3-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230109172022.2280271-1-ross.burton@arm.com> References: <20230109172022.2280271-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, 09 Jan 2023 17:20:29 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4246 There is now a beta release of the Base-A AEM FVP for aarch64! Signed-off-by: Ross Burton --- meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.20.15.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.20.15.bb b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.20.15.bb index 85c752bc..4c62822e 100644 --- a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.20.15.bb +++ b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.20.15.bb @@ -5,6 +5,9 @@ LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba file://license_terms/third_party_licenses/third_party_licenses.txt;md5=34a1ba318d745f05e6197def68ea5411 \ file://license_terms/third_party_licenses/arm_license_management_utilities/third_party_licenses.txt;md5=2e53bda6ff2db4c35d69944b93926c9f" +SRC_URI[fvp-aarch64.sha256sum] = "e14e6cbd5c3ec8e1e2e79965e994c9235e136480e102f5c43de31162263b6361" SRC_URI[fvp-x86_64.sha256sum] = "f9db2076e3a63e2f8eb2ea9ed60f30db04e5f81f535bc7e3ed24e270d857ea6f" MODEL_CODE = "FVP_Base_RevC-2xAEMvA" + +COMPATIBLE_HOST = "(aarch64|x86_64).*-linux" From patchwork Mon Jan 9 17:20:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 17909 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 ABD78C54EBD for ; Mon, 9 Jan 2023 17:20:29 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.78790.1673284828390558299 for ; Mon, 09 Jan 2023 09:20:28 -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 F21C51042; Mon, 9 Jan 2023 09:21:09 -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 8B9F53F587; Mon, 9 Jan 2023 09:20:27 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 4/4] CI: don't pin fvp-base jobs to x86-64 Date: Mon, 9 Jan 2023 17:20:22 +0000 Message-Id: <20230109172022.2280271-4-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230109172022.2280271-1-ross.burton@arm.com> References: <20230109172022.2280271-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, 09 Jan 2023 17:20:29 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4247 Now that the FVP is available for both aarch64 and x86-64, don't set a tag so this can run on both architectures. Signed-off-by: Ross Burton --- .gitlab-ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 29254b92..09ca8c41 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -97,8 +97,6 @@ fvp-base: parallel: matrix: - TESTING: testimage - tags: - - x86_64 fvp-base-arm32: extends: .build @@ -106,8 +104,6 @@ fvp-base-arm32: matrix: - TOOLCHAINS: [gcc, external-gccarm] TESTING: testimage - tags: - - x86_64 fvp-baser-aemv8r64: extends: .build