From patchwork Fri Sep 20 12:57:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 49353 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 C5CA4C78838 for ; Fri, 20 Sep 2024 12:57:19 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.17582.1726837038698958698 for ; Fri, 20 Sep 2024 05:57:18 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); 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 9E70E1007 for ; Fri, 20 Sep 2024 05:57:47 -0700 (PDT) Received: from H24V3P4C17.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 F285E3F66E for ; Fri, 20 Sep 2024 05:57:17 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 1/3] arm-bsp/fvp-base: support poky-altcfg Date: Fri, 20 Sep 2024 08:57:14 -0400 Message-Id: <20240920125716.13293-1-jon.mason@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) 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, 20 Sep 2024 12:57:19 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6092 Add the bits to enable poky-altcfg to boot to prompt on fvp-base. Unfortunately, ssh takes a very long time to come up, which causes the ssh test to timeout. So, don't enable this by default in CI. Also, switch to building full-cmdline instead of sato, since we're never actually testing the graphics on this platform. Signed-off-by: Jon Mason --- ci/fvp-base.yml | 2 +- meta-arm-bsp/conf/machine/fvp-base.conf | 6 ++++-- meta-arm/wic/efi-disk.wks.in | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ci/fvp-base.yml b/ci/fvp-base.yml index bbc6c44db3be..5719ea8066aa 100644 --- a/ci/fvp-base.yml +++ b/ci/fvp-base.yml @@ -9,5 +9,5 @@ header: machine: fvp-base target: - - core-image-sato + - core-image-full-cmdline - boot-wrapper-aarch64 diff --git a/meta-arm-bsp/conf/machine/fvp-base.conf b/meta-arm-bsp/conf/machine/fvp-base.conf index 353024e26b72..cbfd79d25828 100644 --- a/meta-arm-bsp/conf/machine/fvp-base.conf +++ b/meta-arm-bsp/conf/machine/fvp-base.conf @@ -11,13 +11,15 @@ ARM_SYSTEMREADY_ACS_CONSOLE = "default" EXTRA_IMAGEDEPENDS = "${ARM_SYSTEMREADY_FIRMWARE}" PREFERRED_VERSION_trusted-firmware-a ?= "2.10.%" -MACHINE_FEATURES = "efi" +MACHINE_FEATURES = "efi vfat" IMAGE_NAME_SUFFIX = "" IMAGE_FSTYPES += "wic" WKS_FILE ?= "efi-disk.wks.in" SERIAL_CONSOLES = "115200;ttyAMA0" +# FIXME - This is being upstreamed. Remove once that has occurred. +KERNEL_CONSOLE ?= "${@','.join(d.getVar('SERIAL_CONSOLES').split(' ')[0].split(';')[::-1]) or 'ttyS0'}" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" KERNEL_DTB_NAME = "fvp-base-revc.dtb" @@ -29,7 +31,7 @@ EXTRA_IMAGEDEPENDS += "trusted-firmware-a" # FVP u-boot configuration UBOOT_MACHINE = "vexpress_fvp_defconfig" -EFI_PROVIDER ?= "grub-efi" +EFI_PROVIDER ?= "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd-boot", "grub-efi", d)}" # As this is a virtual target that will not be used in the real world there is # no need for real SSH keys. diff --git a/meta-arm/wic/efi-disk.wks.in b/meta-arm/wic/efi-disk.wks.in index 198ae2a6d0b8..e1120da056cd 100644 --- a/meta-arm/wic/efi-disk.wks.in +++ b/meta-arm/wic/efi-disk.wks.in @@ -8,4 +8,4 @@ part / --source rootfs --fstype=ext4 --label root --align 1024 --use-uuid part swap --size 44 --label swap --fstype=swap --use-uuid -bootloader --ptable gpt --timeout=5 --append="rootwait rootfstype=ext4" +bootloader --ptable gpt --timeout=5 --append="rootwait rootfstype=ext4 console=${KERNEL_CONSOLE}"