From patchwork Mon May 20 15:37:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 43884 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 6D447C04FFE for ; Mon, 20 May 2024 15:37:57 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.64246.1716219471076963376 for ; Mon, 20 May 2024 08:37:51 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); 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 F18E4DA7 for ; Mon, 20 May 2024 08:38:13 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.oss.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 791DF3F762 for ; Mon, 20 May 2024 08:37:49 -0700 (PDT) From: Ross Burton To: poky@lists.yoctoproject.org Subject: [PATCH][meta-yocto-bsp] genericarm64: depend on u-boot in testimage Date: Mon, 20 May 2024 15:37:45 +0000 Message-Id: <20240520153745.2064739-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, 20 May 2024 15:37:57 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/poky/message/13358 genericarm64 supports runqemu, so testimage should work. However, out of the box it does not: runqemu - ERROR - BIOS .../tmp/deploy/images/genericarm64/u-boot.bin not found That is because we make the user explicitly build the qemu-targetting u-boot to avoid the confusing situation where they have real hardware but the deploy directory contains a u-boot for qemu. In automated testing situations, however, we can be a bit more helpful and make testimage depend on u-boot. This will lead to u-boot binaries being in deploy, but at this point the user is already running the images inside a qemu. Reported-by: James McGregor Signed-off-by: Ross Burton --- meta-yocto-bsp/conf/machine/genericarm64.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-yocto-bsp/conf/machine/genericarm64.conf b/meta-yocto-bsp/conf/machine/genericarm64.conf index 4fa9395b31b..1cb5e46dcf7 100644 --- a/meta-yocto-bsp/conf/machine/genericarm64.conf +++ b/meta-yocto-bsp/conf/machine/genericarm64.conf @@ -58,3 +58,6 @@ QB_SERIAL_OPT = "-device virtio-serial-pci -chardev null,id=virtcon -device virt QB_TCPSERIAL_OPT = "-device virtio-serial-pci -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1,nodelay=on -device virtconsole,chardev=virtcon" # Virtio networking QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" + +# If we're running testimage then we're in a qemu, so ensure u-boot is build +TESTIMAGEDEPENDS:append = " u-boot:do_deploy"