From patchwork Mon Jul 17 19:31:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 27542 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 ADA15EB64DC for ; Mon, 17 Jul 2023 19:32:21 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.4145.1689622334028157038 for ; Mon, 17 Jul 2023 12:32:14 -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 E9327C15; Mon, 17 Jul 2023 12:32:56 -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 4E1083F67D; Mon, 17 Jul 2023 12:32:13 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Cc: Ross Burton Subject: [PATCH 1/9] CI: track master Date: Mon, 17 Jul 2023 14:31:59 -0500 Message-Id: <20230717193207.3562364-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 ; Mon, 17 Jul 2023 19:32:21 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4885 From: Ross Burton Signed-off-by: Ross Burton --- ci/base.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/base.yml b/ci/base.yml index 38d8584f..4296d270 100644 --- a/ci/base.yml +++ b/ci/base.yml @@ -5,7 +5,7 @@ distro: poky defaults: repos: - branch: mickledore + branch: master repos: meta-arm: From patchwork Mon Jul 17 19:32:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 27548 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 D4D28C3DA40 for ; Mon, 17 Jul 2023 19:32:21 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.4083.1689622334199593634 for ; Mon, 17 Jul 2023 12:32:14 -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 2BADBD75; Mon, 17 Jul 2023 12:32:57 -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 8E20C3F67D; Mon, 17 Jul 2023 12:32:13 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Cc: Ross Burton Subject: [PATCH 2/9] arm-bsp/u-boot: add temporary 2023.01 recipe Date: Mon, 17 Jul 2023 14:32:00 -0500 Message-Id: <20230717193207.3562364-2-jon.mason@arm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230717193207.3562364-1-jon.mason@arm.com> References: <20230717193207.3562364-1-jon.mason@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, 17 Jul 2023 19:32:21 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4886 From: Ross Burton Signed-off-by: Ross Burton --- meta-arm-bsp/recipes-bsp/u-boot/u-boot_2023.01.bb | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot_2023.01.bb diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2023.01.bb b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2023.01.bb new file mode 100644 index 00000000..2dd5e04a --- /dev/null +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2023.01.bb @@ -0,0 +1,4 @@ +require recipes-bsp/u-boot/u-boot-common.inc +require recipes-bsp/u-boot/u-boot.inc + +SRCREV = "62e2ad1ceafbfdf2c44d3dc1b6efc81e768a96b9" From patchwork Mon Jul 17 19:32:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 27549 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 CC735C04FDF for ; Mon, 17 Jul 2023 19:32:21 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.4146.1689622334325129333 for ; Mon, 17 Jul 2023 12:32:14 -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 68B8711FB; Mon, 17 Jul 2023 12:32:57 -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 C77833F67D; Mon, 17 Jul 2023 12:32:13 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Cc: Ross Burton Subject: [PATCH 3/9] toolchain: remove pointless provides Date: Mon, 17 Jul 2023 14:32:01 -0500 Message-Id: <20230717193207.3562364-3-jon.mason@arm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230717193207.3562364-1-jon.mason@arm.com> References: <20230717193207.3562364-1-jon.mason@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, 17 Jul 2023 19:32:21 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4887 From: Ross Burton --- .../external-arm-toolchain/gcc-aarch64-none-elf_12.2.rel1.bb | 2 -- .../external-arm-toolchain/gcc-arm-none-eabi_12.2.rel1.bb | 2 -- 2 files changed, 4 deletions(-) diff --git a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_12.2.rel1.bb b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_12.2.rel1.bb index b3b09bae..db8851eb 100644 --- a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_12.2.rel1.bb +++ b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_12.2.rel1.bb @@ -11,8 +11,6 @@ LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=0aef214b835259b64f026f4ad00c703e" LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=7ba3bc8ef145b48e2756a844db2029a3" -PROVIDES = "virtual/aarch64-none-elf-gcc" - SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/arm-gnu-toolchain-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gcc-${HOST_ARCH}" SRC_URI[gcc-aarch64.sha256sum] = "570a9bd42e2067d79d59b0747891681ebec66f30d989d17a05856563fe38f78b" SRC_URI[gcc-x86_64.sha256sum] = "62d66e0ad7bd7f2a183d236ee301a5c73c737c886c7944aa4f39415aab528daf" diff --git a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_12.2.rel1.bb b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_12.2.rel1.bb index 948933b9..48ddd163 100644 --- a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_12.2.rel1.bb +++ b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_12.2.rel1.bb @@ -11,8 +11,6 @@ LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=0aef214b835259b64f026f4ad00c703e" LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=7ba3bc8ef145b48e2756a844db2029a3" -PROVIDES = "virtual/arm-none-eabi-gcc" - SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/arm-gnu-toolchain-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gcc-${HOST_ARCH}" SRC_URI[gcc-aarch64.sha256sum] = "7ee332f7558a984e239e768a13aed86c6c3ac85c90b91d27f4ed38d7ec6b3e8c" SRC_URI[gcc-x86_64.sha256sum] = "84be93d0f9e96a15addd490b6e237f588c641c8afdf90e7610a628007fc96867" From patchwork Mon Jul 17 19:32:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 27547 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 CB5C8C04E69 for ; Mon, 17 Jul 2023 19:32:21 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.4085.1689622334596250244 for ; Mon, 17 Jul 2023 12:32:14 -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 A1C8213D5; Mon, 17 Jul 2023 12:32:57 -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 107633F67D; Mon, 17 Jul 2023 12:32:14 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Cc: Ross Burton Subject: [PATCH 4/9] arm-bsp/linux-yocto: fix Upstream-Status Date: Mon, 17 Jul 2023 14:32:02 -0500 Message-Id: <20230717193207.3562364-4-jon.mason@arm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230717193207.3562364-1-jon.mason@arm.com> References: <20230717193207.3562364-1-jon.mason@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, 17 Jul 2023 19:32:21 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4888 From: Ross Burton Signed-off-by: Ross Burton --- .../files/corstone1000/0002-Add-external-system-driver.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-arm-bsp/recipes-kernel/linux/files/corstone1000/0002-Add-external-system-driver.patch b/meta-arm-bsp/recipes-kernel/linux/files/corstone1000/0002-Add-external-system-driver.patch index b68edbc1..5af041ef 100644 --- a/meta-arm-bsp/recipes-kernel/linux/files/corstone1000/0002-Add-external-system-driver.patch +++ b/meta-arm-bsp/recipes-kernel/linux/files/corstone1000/0002-Add-external-system-driver.patch @@ -7,7 +7,7 @@ Adds external system driver to control it from user-space. It provides run and reset functionality at the moment. -Upstream-Status: Pending[Not submitted to upstream yet] +Upstream-Status: Pending [Not submitted to upstream yet] Signed-off-by: Emekcan Aras Signed-off-by: Rui Miguel Silva --- From patchwork Mon Jul 17 19:32:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 27546 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 C26E5C001DF for ; Mon, 17 Jul 2023 19:32:21 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.4086.1689622334716925400 for ; Mon, 17 Jul 2023 12:32:14 -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 DC3EF1424; Mon, 17 Jul 2023 12:32:57 -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 495393F67D; Mon, 17 Jul 2023 12:32:14 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Cc: Ziad Elhanafy Subject: [PATCH 5/9] arm-bsp/conf: Remove hardcoded .rootfs from image path Date: Mon, 17 Jul 2023 14:32:03 -0500 Message-Id: <20230717193207.3562364-5-jon.mason@arm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230717193207.3562364-1-jon.mason@arm.com> References: <20230717193207.3562364-1-jon.mason@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, 17 Jul 2023 19:32:21 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4889 From: Ziad Elhanafy Remove hardcoded .rootfs from image path in: 1- fvp-common.inc 2- corstone1000-fvp.conf 3- corstone500.conf 4- fvp-baser-aemv8r64.conf Signed-off-by: Ziad Elhanafy --- meta-arm-bsp/conf/machine/corstone1000-fvp.conf | 2 +- meta-arm-bsp/conf/machine/corstone500.conf | 2 +- meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf | 2 +- meta-arm-bsp/conf/machine/include/fvp-common.inc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-arm-bsp/conf/machine/corstone1000-fvp.conf b/meta-arm-bsp/conf/machine/corstone1000-fvp.conf index 66236515..fffefc90 100644 --- a/meta-arm-bsp/conf/machine/corstone1000-fvp.conf +++ b/meta-arm-bsp/conf/machine/corstone1000-fvp.conf @@ -32,7 +32,7 @@ FVP_CONFIG[se.nvm.update_raw_image] ?= "0" FVP_CONFIG[se.cryptocell.USER_OTP_FILTERING_DISABLE] ?= "1" # Boot image -FVP_DATA ?= "board.flash0=${IMAGE_NAME}.rootfs.wic@0x68000000" +FVP_DATA ?= "board.flash0=${IMAGE_NAME}.wic@0x68000000" # External system (cortex-M3) FVP_CONFIG[extsys_harness0.extsys_flashloader.fname] ?= "es_flashfw.bin" diff --git a/meta-arm-bsp/conf/machine/corstone500.conf b/meta-arm-bsp/conf/machine/corstone500.conf index 4794028a..9ded5c4a 100644 --- a/meta-arm-bsp/conf/machine/corstone500.conf +++ b/meta-arm-bsp/conf/machine/corstone500.conf @@ -38,7 +38,7 @@ TEST_SUITES = "linuxboot" FVP_PROVIDER ?= "fvp-corstone500-native" FVP_EXE ?= "FVP_Corstone-500" FVP_CONFIG[board.flashloader0.fname] ?= "bl1.bin" -FVP_DATA ?= "css.cluster.cpu0=${IMAGE_NAME}.rootfs.wic.nopt@0x80000000" +FVP_DATA ?= "css.cluster.cpu0=${IMAGE_NAME}.wic.nopt@0x80000000" FVP_CONSOLE ?= "terminal_0" FVP_TERMINALS[css.terminal_0] ?= "console" FVP_TERMINALS[css.terminal_1] ?= "" diff --git a/meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf b/meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf index 62c9cbd0..2c1391b3 100644 --- a/meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf +++ b/meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf @@ -50,7 +50,7 @@ FVP_CONFIG[bp.virtio_net.hostbridge.userNetworking] ?= "1" FVP_CONFIG[bp.virtio_net.secure_accesses] = "1" FVP_CONFIG[bp.virtio_rng.enabled] ?= "1" FVP_CONFIG[bp.virtio_rng.secure_accesses] = "1" -FVP_CONFIG[bp.virtioblockdevice.image_path] ?= "${IMAGE_NAME}.rootfs.wic" +FVP_CONFIG[bp.virtioblockdevice.image_path] ?= "${IMAGE_NAME}.wic" FVP_CONFIG[bp.virtioblockdevice.secure_accesses] = "1" FVP_CONFIG[cache_state_modelled] ?= "0" FVP_CONFIG[cci400.force_on_from_start] = "1" diff --git a/meta-arm-bsp/conf/machine/include/fvp-common.inc b/meta-arm-bsp/conf/machine/include/fvp-common.inc index 47b7ffce..b9b36a09 100644 --- a/meta-arm-bsp/conf/machine/include/fvp-common.inc +++ b/meta-arm-bsp/conf/machine/include/fvp-common.inc @@ -35,7 +35,7 @@ FVP_CONFIG[bp.virtio_net.hostbridge.userNetPorts] = "8022=22" FVP_CONFIG[cache_state_modelled] ?= "0" FVP_CONFIG[bp.secureflashloader.fname] ?= "bl1-fvp.bin" FVP_CONFIG[bp.flashloader0.fname] ?= "fip-fvp.bin" -FVP_CONFIG[bp.virtioblockdevice.image_path] ?= "${IMAGE_NAME}.rootfs.wic" +FVP_CONFIG[bp.virtioblockdevice.image_path] ?= "${IMAGE_NAME}.wic" # Set the baseline to ARMv8.4, as the default is 8.0. FVP_CONFIG[cluster0.has_arm_v8-4] = "1" FVP_CONFIG[cluster1.has_arm_v8-4] = "1" From patchwork Mon Jul 17 19:32:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 27543 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 BD30CC001B0 for ; Mon, 17 Jul 2023 19:32:21 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.4085.1689622334596250244 for ; Mon, 17 Jul 2023 12:32:15 -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 22611C15; Mon, 17 Jul 2023 12:32:58 -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 835113F67D; Mon, 17 Jul 2023 12:32:14 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Cc: Ziad Elhanafy Subject: [PATCH 6/9] arm/classes: Remove IMAGE_NAME_SUFFIX from image path Date: Mon, 17 Jul 2023 14:32:04 -0500 Message-Id: <20230717193207.3562364-6-jon.mason@arm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230717193207.3562364-1-jon.mason@arm.com> References: <20230717193207.3562364-1-jon.mason@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, 17 Jul 2023 19:32:21 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4890 From: Ziad Elhanafy Remove IMAGE_NAME_SUFFIX from image path in wic_nopt.bblass Signed-off-by: Ziad Elhanafy --- meta-arm/classes/wic_nopt.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-arm/classes/wic_nopt.bbclass b/meta-arm/classes/wic_nopt.bbclass index 9c78fd77..529bf138 100644 --- a/meta-arm/classes/wic_nopt.bbclass +++ b/meta-arm/classes/wic_nopt.bbclass @@ -6,4 +6,4 @@ IMAGE_TYPES:append = " wic.nopt" CONVERSIONTYPES += "nopt" # 1024 bytes are skipped which corresponds to the size of the partition table header to remove -CONVERSION_CMD:nopt = "tail -c +1025 ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.nopt" +CONVERSION_CMD:nopt = "tail -c +1025 ${IMAGE_NAME}.${type} > ${IMAGE_NAME}.${type}.nopt" From patchwork Mon Jul 17 19:32:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 27541 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 BD33DC001E0 for ; Mon, 17 Jul 2023 19:32:21 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.4086.1689622334716925400 for ; Mon, 17 Jul 2023 12:32:15 -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 61127143D; Mon, 17 Jul 2023 12:32:58 -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 C10763F67D; Mon, 17 Jul 2023 12:32:14 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Cc: Ziad Elhanafy Subject: [PATCH 7/9] arm/lib: Modify fvp.py to neglect fstype Date: Mon, 17 Jul 2023 14:32:05 -0500 Message-Id: <20230717193207.3562364-7-jon.mason@arm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230717193207.3562364-1-jon.mason@arm.com> References: <20230717193207.3562364-1-jon.mason@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, 17 Jul 2023 19:32:21 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4891 From: Ziad Elhanafy Signed-off-by: Ziad Elhanafy --- meta-arm/lib/oeqa/controllers/fvp.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/meta-arm/lib/oeqa/controllers/fvp.py b/meta-arm/lib/oeqa/controllers/fvp.py index 38484072..7e95ddf6 100644 --- a/meta-arm/lib/oeqa/controllers/fvp.py +++ b/meta-arm/lib/oeqa/controllers/fvp.py @@ -14,16 +14,20 @@ class OEFVPSSHTarget(OESSHTarget): def __init__(self, logger, target_ip, server_ip, timeout=300, user='root', port=None, dir_image=None, rootfs=None, bootlog=None, **kwargs): super().__init__(logger, target_ip, server_ip, timeout, user, port) - image_dir = pathlib.Path(dir_image) - # rootfs may have multiple extensions so we need to strip *all* suffixes + image_dir = pathlib.Path(dir_image) basename = pathlib.Path(rootfs) - basename = basename.name.replace("".join(basename.suffixes), "") - self.fvpconf = image_dir / (basename + ".fvpconf") + basename = basename.name.replace("".join(basename.suffixes), "") + # All .fvpconf configuration files + configs = image_dir.glob(basename + "*.fvpconf") + # Just the symbolic links + configs = [p for p in configs if p.is_file() and p.is_symlink()] + if not configs: + raise FileNotFoundError(f"Cannot find any .fvpconf in {image_dir}") + # Sorted by modification time + configs = sorted(configs, key=lambda p: p.stat().st_mtime) + self.fvpconf = configs[-1] self.bootlog = bootlog - if not self.fvpconf.exists(): - raise FileNotFoundError(f"Cannot find {self.fvpconf}") - def _after_start(self): pass From patchwork Mon Jul 17 19:32:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 27544 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 B08F7C001DC for ; Mon, 17 Jul 2023 19:32:21 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.4085.1689622334596250244 for ; Mon, 17 Jul 2023 12:32:15 -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 8FBDF11FB for ; Mon, 17 Jul 2023 12:32:58 -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 07B773F67D for ; Mon, 17 Jul 2023 12:32:14 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 8/9] arm-bsp/machine: work around rootfs name issue Date: Mon, 17 Jul 2023 14:32:06 -0500 Message-Id: <20230717193207.3562364-8-jon.mason@arm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230717193207.3562364-1-jon.mason@arm.com> References: <20230717193207.3562364-1-jon.mason@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, 17 Jul 2023 19:32:21 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4892 Upstream change 26d97acc71379ab6702fa54a23b6542a3f51779c changed the IMAGE_LINK_NAME to have IMAGE_NAME_SUFFIX and breaks the automatic finding of the image by name. Work around here until upstream fix can be added. Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/corstone500.conf | 2 ++ meta-arm-bsp/conf/machine/include/corstone1000.inc | 1 + meta-arm-bsp/conf/machine/include/tc.inc | 1 + meta-arm-bsp/conf/machine/juno.conf | 1 + 4 files changed, 5 insertions(+) diff --git a/meta-arm-bsp/conf/machine/corstone500.conf b/meta-arm-bsp/conf/machine/corstone500.conf index 9ded5c4a..405d1f91 100644 --- a/meta-arm-bsp/conf/machine/corstone500.conf +++ b/meta-arm-bsp/conf/machine/corstone500.conf @@ -45,3 +45,5 @@ FVP_TERMINALS[css.terminal_1] ?= "" # Disable openssl in kmod to shink the initramfs size PACKAGECONFIG:remove:pn-kmod = "openssl" + +IMAGE_NAME_SUFFIX = "" diff --git a/meta-arm-bsp/conf/machine/include/corstone1000.inc b/meta-arm-bsp/conf/machine/include/corstone1000.inc index 198c7ec8..8a2e2a02 100644 --- a/meta-arm-bsp/conf/machine/include/corstone1000.inc +++ b/meta-arm-bsp/conf/machine/include/corstone1000.inc @@ -57,6 +57,7 @@ INITRAMFS_IMAGE_BUNDLE ?= "1" #telling the build system which image is responsible of the generation of the initramfs rootfs INITRAMFS_IMAGE = "corstone1000-initramfs-image" +IMAGE_NAME_SUFFIX = "" # add FF-A support in the kernel MACHINE_FEATURES += "arm-ffa" diff --git a/meta-arm-bsp/conf/machine/include/tc.inc b/meta-arm-bsp/conf/machine/include/tc.inc index 14ec7205..f6674ba4 100644 --- a/meta-arm-bsp/conf/machine/include/tc.inc +++ b/meta-arm-bsp/conf/machine/include/tc.inc @@ -25,6 +25,7 @@ KERNEL_CLASSES = " kernel-fitimage " IMAGE_FSTYPES += "cpio.gz" INITRAMFS_IMAGE ?= "core-image-minimal" +IMAGE_NAME_SUFFIX = "" SERIAL_CONSOLES = "115200;ttyAMA0" diff --git a/meta-arm-bsp/conf/machine/juno.conf b/meta-arm-bsp/conf/machine/juno.conf index 43d6b3e3..6c666efc 100644 --- a/meta-arm-bsp/conf/machine/juno.conf +++ b/meta-arm-bsp/conf/machine/juno.conf @@ -27,3 +27,4 @@ UBOOT_MACHINE = "vexpress_aemv8a_juno_defconfig" INITRAMFS_IMAGE_BUNDLE ?= "1" INITRAMFS_IMAGE = "core-image-minimal" +IMAGE_NAME_SUFFIX = "" From patchwork Mon Jul 17 19:32:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 27545 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 B3758C001DE for ; Mon, 17 Jul 2023 19:32:21 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.4088.1689622335600612676 for ; Mon, 17 Jul 2023 12:32:15 -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 C14E0D75 for ; Mon, 17 Jul 2023 12:32:58 -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 3722E3F67D for ; Mon, 17 Jul 2023 12:32:15 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 9/9] ci/clang: add llvm-native from clang README Date: Mon, 17 Jul 2023 14:32:07 -0500 Message-Id: <20230717193207.3562364-9-jon.mason@arm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230717193207.3562364-1-jon.mason@arm.com> References: <20230717193207.3562364-1-jon.mason@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, 17 Jul 2023 19:32:21 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4893 The following error is seen: ERROR: Nothing PROVIDES 'llvm-native' (but virtual:native:/builds/jonmason00/meta-arm/work/build/../poky/meta/recipes-graphics/mesa/mesa_23.1.3.bb DEPENDS on or otherwise requires it). Close matches: ovmf-native rust-llvm-native vim-native Work around this by using the llvm-native from meta-clang Signed-off-by: Jon Mason --- ci/clang.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ci/clang.yml b/ci/clang.yml index ecfd73b2..b9425fa7 100644 --- a/ci/clang.yml +++ b/ci/clang.yml @@ -8,6 +8,12 @@ repos: local_conf_header: toolchain: | TOOLCHAIN = "clang" + PREFERRED_PROVIDER_llvm = "clang" + PREFERRED_PROVIDER_llvm-native = "clang-native" + PREFERRED_PROVIDER_nativesdk-llvm = "nativesdk-clang" + PROVIDES:pn-clang = "llvm" + PROVIDES:pn-clang-native = "llvm-native" + PROVIDES:pn-nativesdk-clang = "nativesdk-llvm" # This is needed to stop bitbake getting confused about what clang/llvm is # being used, see https://github.com/kraj/meta-clang/pull/766 BBMASK += "/meta/recipes-devtools/llvm/llvm.*\.bb"