From patchwork Wed Jul 19 01:22:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 27692 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 3DD67C00528 for ; Wed, 19 Jul 2023 01:22:53 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.4386.1689729766572238324 for ; Tue, 18 Jul 2023 18:22:46 -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 F30D32F4; Tue, 18 Jul 2023 18:23:28 -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 7C8983F67D; Tue, 18 Jul 2023 18:22:45 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Cc: Ross Burton Subject: [PATCH v2 1/8] CI: track master Date: Tue, 18 Jul 2023 20:22:33 -0500 Message-Id: <20230719012240.3567881-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 ; Wed, 19 Jul 2023 01:22:53 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4896 From: Ross Burton Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- 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 Wed Jul 19 01:22:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 27693 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 418B0C04A94 for ; Wed, 19 Jul 2023 01:22:53 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.4284.1689729766428646829 for ; Tue, 18 Jul 2023 18:22:46 -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 3A6C8D75; Tue, 18 Jul 2023 18:23:29 -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 B83A43F67D; Tue, 18 Jul 2023 18:22:45 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Cc: Ross Burton Subject: [PATCH v2 2/8] arm-bsp/u-boot: add temporary 2023.01 recipe Date: Tue, 18 Jul 2023 20:22:34 -0500 Message-Id: <20230719012240.3567881-2-jon.mason@arm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230719012240.3567881-1-jon.mason@arm.com> References: <20230719012240.3567881-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 ; Wed, 19 Jul 2023 01:22:53 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4897 From: Ross Burton Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- 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 Wed Jul 19 01:22:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 27686 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 1EDC7C001DF for ; Wed, 19 Jul 2023 01:22:53 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.4385.1689729766482569076 for ; Tue, 18 Jul 2023 18:22:46 -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 75A3511FB; Tue, 18 Jul 2023 18:23:29 -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 003423F67D; Tue, 18 Jul 2023 18:22:45 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Cc: Ross Burton Subject: [PATCH v2 3/8] toolchain: remove pointless provides Date: Tue, 18 Jul 2023 20:22:35 -0500 Message-Id: <20230719012240.3567881-3-jon.mason@arm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230719012240.3567881-1-jon.mason@arm.com> References: <20230719012240.3567881-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 ; Wed, 19 Jul 2023 01:22:53 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4895 From: Ross Burton Signed-off-by: Jon Mason --- .../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 Wed Jul 19 01:22:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 27691 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 3DE09C04E69 for ; Wed, 19 Jul 2023 01:22:53 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.4387.1689729766883674429 for ; Tue, 18 Jul 2023 18:22:46 -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 B3F7C12FC; Tue, 18 Jul 2023 18:23:29 -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 3E2C73F67D; Tue, 18 Jul 2023 18:22:46 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Cc: Ross Burton Subject: [PATCH v2 4/8] arm-bsp/linux-yocto: fix Upstream-Status Date: Tue, 18 Jul 2023 20:22:36 -0500 Message-Id: <20230719012240.3567881-4-jon.mason@arm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230719012240.3567881-1-jon.mason@arm.com> References: <20230719012240.3567881-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 ; Wed, 19 Jul 2023 01:22:53 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4898 From: Ross Burton Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- .../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 Wed Jul 19 01:22:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 27689 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 2DB07C04A6A for ; Wed, 19 Jul 2023 01:22:53 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.4285.1689729767069627833 for ; Tue, 18 Jul 2023 18:22:47 -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 F1A0F139F; Tue, 18 Jul 2023 18:23:29 -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 7B4D73F67D; Tue, 18 Jul 2023 18:22:46 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Cc: Ziad Elhanafy Subject: [PATCH v2 5/8] arm-bsp/conf: Remove hardcoded .rootfs from image path Date: Tue, 18 Jul 2023 20:22:37 -0500 Message-Id: <20230719012240.3567881-5-jon.mason@arm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230719012240.3567881-1-jon.mason@arm.com> References: <20230719012240.3567881-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 ; Wed, 19 Jul 2023 01:22:53 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4899 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 Signed-off-by: Jon Mason --- 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 449f5658..9636ffe4 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 a688ad2f..978d4edb 100644 --- a/meta-arm-bsp/conf/machine/corstone500.conf +++ b/meta-arm-bsp/conf/machine/corstone500.conf @@ -38,7 +38,7 @@ TEST_SUITES = "fvp_boot" 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 c0ac3d75..b5900b4e 100644 --- a/meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf +++ b/meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf @@ -51,7 +51,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 b76de3c4..36bf9555 100644 --- a/meta-arm-bsp/conf/machine/include/fvp-common.inc +++ b/meta-arm-bsp/conf/machine/include/fvp-common.inc @@ -37,7 +37,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 Wed Jul 19 01:22:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 27688 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 2DAC3C0015E for ; Wed, 19 Jul 2023 01:22:53 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.4388.1689729767263135650 for ; Tue, 18 Jul 2023 18:22:47 -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 36E4313D5; Tue, 18 Jul 2023 18:23:30 -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 B69703F67D; Tue, 18 Jul 2023 18:22:46 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Cc: Ziad Elhanafy Subject: [PATCH v2 6/8] arm/classes: Remove IMAGE_NAME_SUFFIX from image path Date: Tue, 18 Jul 2023 20:22:38 -0500 Message-Id: <20230719012240.3567881-6-jon.mason@arm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230719012240.3567881-1-jon.mason@arm.com> References: <20230719012240.3567881-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 ; Wed, 19 Jul 2023 01:22:53 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4900 From: Ziad Elhanafy Remove IMAGE_NAME_SUFFIX from image path in wic_nopt.bblass Signed-off-by: Ziad Elhanafy Signed-off-by: Jon Mason --- 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 Wed Jul 19 01:22:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 27687 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 1DC6EEB64DD for ; Wed, 19 Jul 2023 01:22:53 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.4389.1689729767482706452 for ; Tue, 18 Jul 2023 18:22:47 -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 66DD41424 for ; Tue, 18 Jul 2023 18:23:30 -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 F06113F67D for ; Tue, 18 Jul 2023 18:22:46 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH v2 7/8] arm-bsp/machine: work around rootfs name issue Date: Tue, 18 Jul 2023 20:22:39 -0500 Message-Id: <20230719012240.3567881-7-jon.mason@arm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230719012240.3567881-1-jon.mason@arm.com> References: <20230719012240.3567881-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 ; Wed, 19 Jul 2023 01:22:53 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4901 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/fvp-base.conf | 1 + meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.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 + 6 files changed, 8 insertions(+) diff --git a/meta-arm-bsp/conf/machine/corstone500.conf b/meta-arm-bsp/conf/machine/corstone500.conf index 978d4edb..6d2294c2 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/fvp-base.conf b/meta-arm-bsp/conf/machine/fvp-base.conf index 39d6e68b..3a923bad 100644 --- a/meta-arm-bsp/conf/machine/fvp-base.conf +++ b/meta-arm-bsp/conf/machine/fvp-base.conf @@ -15,3 +15,4 @@ UBOOT_MACHINE = "vexpress_aemv8a_semi_defconfig" KERNEL_IMAGETYPE = "Image" FVP_CONFIG[bp.virtio_rng.enabled] ?= "1" +IMAGE_NAME_SUFFIX = "" diff --git a/meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf b/meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf index b5900b4e..25ba3c84 100644 --- a/meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf +++ b/meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf @@ -24,6 +24,8 @@ WKS_FILE ?= "efi-disk.wks.in" EFI_PROVIDER ?= "grub-efi" MACHINE_FEATURES:append = " efi" +IMAGE_NAME_SUFFIX = "" + # As this is a virtual target that will not be used in the real world there is # no need for real SSH keys. MACHINE_EXTRA_RRECOMMENDS += "ssh-pregen-hostkeys" 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 Wed Jul 19 01:22:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 27690 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 1C671EB64DC for ; Wed, 19 Jul 2023 01:22:53 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.4286.1689729767641536553 for ; Tue, 18 Jul 2023 18:22:47 -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 93ACA143D for ; Tue, 18 Jul 2023 18:23:30 -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 2C2A53F67D for ; Tue, 18 Jul 2023 18:22:47 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH v2 8/8] ci/clang: add llvm-native from clang README Date: Tue, 18 Jul 2023 20:22:40 -0500 Message-Id: <20230719012240.3567881-8-jon.mason@arm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230719012240.3567881-1-jon.mason@arm.com> References: <20230719012240.3567881-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 ; Wed, 19 Jul 2023 01:22:53 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4902 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"