From patchwork Fri Oct 20 12:38:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Debbie Martin X-Patchwork-Id: 32645 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 52759CDB474 for ; Fri, 20 Oct 2023 12:39:48 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.53140.1697805582708342364 for ; Fri, 20 Oct 2023 05:39:42 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: debbie.martin@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 402BE2F4 for ; Fri, 20 Oct 2023 05:40:23 -0700 (PDT) Received: from e127725.arm.com (unknown [10.57.36.11]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D6EE23F5A1 for ; Fri, 20 Oct 2023 05:39:41 -0700 (PDT) From: Debbie Martin To: meta-arm@lists.yoctoproject.org Subject: [PATCH 5/5] arm-bsp/fvp-base: Configure grub as the EFI provider Date: Fri, 20 Oct 2023 13:38:27 +0100 Message-Id: <20231020123827.346193-4-Debbie.Martin@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231020123827.346193-1-Debbie.Martin@arm.com> References: <20231020123827.346193-1-Debbie.Martin@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, 20 Oct 2023 12:39:48 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5157 Configure grub as the EFI provider and remove the U-boot boot args. Signed-off-by: Debbie Martin --- meta-arm-bsp/conf/machine/fvp-base.conf | 8 +++++--- meta-arm-bsp/recipes-bsp/u-boot/u-boot-fvp-base.inc | 2 +- .../recipes-bsp/u-boot/u-boot/fvp-base/bootargs.cfg | 2 -- meta-arm-bsp/wic/fvp-base.wks | 3 --- 4 files changed, 6 insertions(+), 9 deletions(-) delete mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/bootargs.cfg delete mode 100644 meta-arm-bsp/wic/fvp-base.wks diff --git a/meta-arm-bsp/conf/machine/fvp-base.conf b/meta-arm-bsp/conf/machine/fvp-base.conf index 940a4330..d202a79f 100644 --- a/meta-arm-bsp/conf/machine/fvp-base.conf +++ b/meta-arm-bsp/conf/machine/fvp-base.conf @@ -8,9 +8,11 @@ require conf/machine/include/arm/arch-armv8a.inc TUNE_FEATURES = "aarch64" +MACHINE_FEATURES = "efi" + IMAGE_NAME_SUFFIX = "" IMAGE_FSTYPES += "wic" -WKS_FILE ?= "fvp-base.wks" +WKS_FILE ?= "efi-disk.wks.in" SERIAL_CONSOLES = "115200;ttyAMA0" @@ -23,6 +25,8 @@ EXTRA_IMAGEDEPENDS += "trusted-firmware-a" # FVP u-boot configuration UBOOT_MACHINE = "vexpress_fvp_defconfig" +EFI_PROVIDER ?= "grub-efi" + # 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" @@ -48,8 +52,6 @@ FVP_CONFIG[bp.virtioblockdevice.image_path] ?= "${IMAGE_NAME}.wic" FVP_CONFIG[cluster0.has_arm_v8-4] = "1" FVP_CONFIG[cluster1.has_arm_v8-4] = "1" FVP_CONSOLE ?= "terminal_0" -FVP_DATA ?= "cluster0.cpu0=${KERNEL_IMAGETYPE}@0x80080000 \ - cluster0.cpu0=fvp-base-revc.dtb@0x8fc00000" FVP_TERMINALS[bp.terminal_0] ?= "Console" FVP_TERMINALS[bp.terminal_1] ?= "" FVP_TERMINALS[bp.terminal_2] ?= "" diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-fvp-base.inc b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-fvp-base.inc index e1fcb1f2..b766181b 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-fvp-base.inc +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-fvp-base.inc @@ -1,6 +1,6 @@ # FVP base specific U-boot support -SRC_URI:append = " file://bootargs.cfg \ +SRC_URI:append = " \ file://0001-virtio-rng-Workaround-for-FVP-returning-zero-size-bu.patch \ file://0002-vexpress64-Set-the-DM_RNG-property.patch \ file://0003-vexpress64-Select-PSCI-RESET-by-default.patch \ diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/bootargs.cfg b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/bootargs.cfg deleted file mode 100644 index 2cf42a53..00000000 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/bootargs.cfg +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_BOOTARGS="console=ttyAMA0 earlycon=pl011,0x1c090000 root=/dev/vda1 rw rootwait" -CONFIG_BOOTCOMMAND="booti $kernel_addr_r - $fdt_addr_r" diff --git a/meta-arm-bsp/wic/fvp-base.wks b/meta-arm-bsp/wic/fvp-base.wks deleted file mode 100644 index 8399d042..00000000 --- a/meta-arm-bsp/wic/fvp-base.wks +++ /dev/null @@ -1,3 +0,0 @@ -# For fvp-base* machines we just need to populate the rootfs partition - -part / --source rootfs --ondisk sda --fstype=ext4 --label root --align 1024 --extra-space 100