From patchwork Fri Feb 11 11:45:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 3529 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 7FCB2C433F5 for ; Fri, 11 Feb 2022 11:45:31 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.6120.1644579930696230315 for ; Fri, 11 Feb 2022 03:45:30 -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 15FCD1042 for ; Fri, 11 Feb 2022 03:45:30 -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 9B0703F73B for ; Fri, 11 Feb 2022 03:45:29 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 1/4] CI: add meta-gem5 to the pending upgrades report Date: Fri, 11 Feb 2022 11:45:24 +0000 Message-Id: <20220211114527.4157075-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 ; Fri, 11 Feb 2022 11:45:31 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2987 The gem5-arm64 machine was missing. Signed-off-by: Ross Burton --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d7a47ad0..bd495cf9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -91,8 +91,9 @@ pending-updates: - update-report script: - rm -fr update-report - - kas shell ci/qemuarm64.yml:ci/meta-openembedded.yml --command \ - "$CI_PROJECT_DIR/scripts/machine-summary.py -t report -o $CI_PROJECT_DIR/update-report $($CI_PROJECT_DIR/ci/listmachines.py meta-arm meta-arm-bsp)" + # This configuration has all of the layers we need enabled + - kas shell ci/gem5-arm64.yml --command \ + "$CI_PROJECT_DIR/scripts/machine-summary.py -t report -o $CI_PROJECT_DIR/update-report $($CI_PROJECT_DIR/ci/listmachines.py meta-arm meta-arm-bsp meta-gem5)" # Do this on x86 whilst the compilers are x86-only tags: - x86_64 From patchwork Fri Feb 11 11:45:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 3531 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 9021CC4332F for ; Fri, 11 Feb 2022 11:45:32 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web09.6229.1644579931191101949 for ; Fri, 11 Feb 2022 03:45:31 -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 CDA8212FC for ; Fri, 11 Feb 2022 03:45:30 -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 5FDE33F73B for ; Fri, 11 Feb 2022 03:45:30 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 2/4] gem5/gem-aarch64-native: remove duplicate --command-line Date: Fri, 11 Feb 2022 11:45:25 +0000 Message-Id: <20220211114527.4157075-2-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220211114527.4157075-1-ross.burton@arm.com> References: <20220211114527.4157075-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 ; Fri, 11 Feb 2022 11:45:32 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2988 The contents of GEM5_RUN_CMDLINE is passed via --command-line, so there is no need to include --command-line in it. Signed-off-by: Ross Burton --- meta-gem5/recipes-devtools/gem5/gem5-aarch64-native.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta-gem5/recipes-devtools/gem5/gem5-aarch64-native.inc b/meta-gem5/recipes-devtools/gem5/gem5-aarch64-native.inc index 0a8e34c1..2fd5206e 100644 --- a/meta-gem5/recipes-devtools/gem5/gem5-aarch64-native.inc +++ b/meta-gem5/recipes-devtools/gem5/gem5-aarch64-native.inc @@ -21,8 +21,7 @@ GEM5_RUN_DISK ?= "*-${MACHINE}.ext4" GEM5_RUN_DTB ?= "${@os.path.basename(d.getVar('KERNEL_DEVICETREE'))}" # Linux command line to pass -GEM5_RUN_CMDLINE ?= "--command-line='earlyprintk=pl011,0x1c090000 \ - console=ttyAMA0 rw mem=512MB root=/dev/sda rootwait'" +GEM5_RUN_CMDLINE ?= "earlyprintk=pl011,0x1c090000 console=ttyAMA0 rw mem=512MB root=/dev/sda rootwait" # Extra arguments to pass to gem5 GEM5_RUN_EXTRA ?= "--mem-size=512MB -n 4 --machine-type=VExpress_GEM5_V2" From patchwork Fri Feb 11 11:45:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 3530 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 8420FC433EF for ; Fri, 11 Feb 2022 11:45:32 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.6239.1644579931893971050 for ; Fri, 11 Feb 2022 03:45:32 -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 917091042 for ; Fri, 11 Feb 2022 03:45:31 -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 1B9AD3F73B for ; Fri, 11 Feb 2022 03:45:30 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 3/4] gem5/linux-yocto: use wildcards in the bbappend Date: Fri, 11 Feb 2022 11:45:26 +0000 Message-Id: <20220211114527.4157075-3-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220211114527.4157075-1-ross.burton@arm.com> References: <20220211114527.4157075-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 ; Fri, 11 Feb 2022 11:45:32 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2989 Don't hard-code 5.4, use wildcards instead. Signed-off-by: Ross Burton --- .../recipes-kernel/linux/linux-yocto_%.bbappend | 11 +++++++++++ .../recipes-kernel/linux/linux-yocto_5.4.bbappend | 12 ------------ 2 files changed, 11 insertions(+), 12 deletions(-) create mode 100644 meta-gem5/recipes-kernel/linux/linux-yocto_%.bbappend diff --git a/meta-gem5/recipes-kernel/linux/linux-yocto_%.bbappend b/meta-gem5/recipes-kernel/linux/linux-yocto_%.bbappend new file mode 100644 index 00000000..b36ea064 --- /dev/null +++ b/meta-gem5/recipes-kernel/linux/linux-yocto_%.bbappend @@ -0,0 +1,11 @@ +FILESEXTRAPATHS:prepend:gem5-arm64 := "${THISDIR}:${THISDIR}/files:" + +COMPATIBLE_MACHINE:gem5-arm64 = "gem5-arm64" +KMACHINE:gem5-arm64 = "gem5-arm64" +SRC_URI:append:gem5-arm64 = " file://gem5-kmeta;type=kmeta;name=gem5-kmeta;destsuffix=gem5-kmeta \ + file://dts/gem5-arm64;subdir=add-files" + +do_patch:append:gem5-arm64() { + tar -C ${WORKDIR}/add-files/dts -cf - gem5-arm64 | \ + tar -C arch/arm64/boot/dts -xf - +} diff --git a/meta-gem5/recipes-kernel/linux/linux-yocto_5.4.bbappend b/meta-gem5/recipes-kernel/linux/linux-yocto_5.4.bbappend index 480c5e23..078b684f 100644 --- a/meta-gem5/recipes-kernel/linux/linux-yocto_5.4.bbappend +++ b/meta-gem5/recipes-kernel/linux/linux-yocto_5.4.bbappend @@ -1,13 +1 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}:${THISDIR}/files:" - require ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'recipes-kernel/linux/linux-yocto_virtualization.inc', '', d)} - -COMPATIBLE_MACHINE:gem5-arm64 = "gem5-arm64" -KMACHINE:gem5-arm64 = "gem5-arm64" -SRC_URI:append:gem5-arm64 = " file://gem5-kmeta;type=kmeta;name=gem5-kmeta;destsuffix=gem5-kmeta \ - file://dts/gem5-arm64;subdir=add-files" - -do_patch:append:gem5-arm64() { - tar -C ${WORKDIR}/add-files/dts -cf - gem5-arm64 | \ - tar -C arch/arm64/boot/dts -xf - -} From patchwork Fri Feb 11 11:45:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 3532 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 80C36C433EF for ; Fri, 11 Feb 2022 11:45:34 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web09.6230.1644579933011022533 for ; Fri, 11 Feb 2022 03:45:33 -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 4D7451042 for ; Fri, 11 Feb 2022 03:45:32 -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 D208B3F73B for ; Fri, 11 Feb 2022 03:45:31 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 4/4] atp/linux-yocto: use wildcards in the bbappend Date: Fri, 11 Feb 2022 11:45:27 +0000 Message-Id: <20220211114527.4157075-4-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220211114527.4157075-1-ross.burton@arm.com> References: <20220211114527.4157075-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 ; Fri, 11 Feb 2022 11:45:34 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2990 Don't hard-code 5.4, use wildcards instead. Signed-off-by: Ross Burton --- .../linux/{linux-yocto-5.4 => files}/no_ftrace.cfg | 0 .../recipes-kernel/linux/{linux-yocto-5.4 => files}/smmuv3.cfg | 0 .../linux/{linux-yocto_5.4.bbappend => linux-yocto_%.bbappend} | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename meta-atp/recipes-kernel/linux/{linux-yocto-5.4 => files}/no_ftrace.cfg (100%) rename meta-atp/recipes-kernel/linux/{linux-yocto-5.4 => files}/smmuv3.cfg (100%) rename meta-atp/recipes-kernel/linux/{linux-yocto_5.4.bbappend => linux-yocto_%.bbappend} (50%) diff --git a/meta-atp/recipes-kernel/linux/linux-yocto-5.4/no_ftrace.cfg b/meta-atp/recipes-kernel/linux/files/no_ftrace.cfg similarity index 100% rename from meta-atp/recipes-kernel/linux/linux-yocto-5.4/no_ftrace.cfg rename to meta-atp/recipes-kernel/linux/files/no_ftrace.cfg diff --git a/meta-atp/recipes-kernel/linux/linux-yocto-5.4/smmuv3.cfg b/meta-atp/recipes-kernel/linux/files/smmuv3.cfg similarity index 100% rename from meta-atp/recipes-kernel/linux/linux-yocto-5.4/smmuv3.cfg rename to meta-atp/recipes-kernel/linux/files/smmuv3.cfg diff --git a/meta-atp/recipes-kernel/linux/linux-yocto_5.4.bbappend b/meta-atp/recipes-kernel/linux/linux-yocto_%.bbappend similarity index 50% rename from meta-atp/recipes-kernel/linux/linux-yocto_5.4.bbappend rename to meta-atp/recipes-kernel/linux/linux-yocto_%.bbappend index c8352206..f59f8d44 100644 --- a/meta-atp/recipes-kernel/linux/linux-yocto_5.4.bbappend +++ b/meta-atp/recipes-kernel/linux/linux-yocto_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}-5.4:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "file://no_ftrace.cfg file://smmuv3.cfg"