mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-05-31 12:50:02 +00:00
Code Issues Projects Releases Wiki Activity

arm-bsp/fvp-base: Configure grub as the EFI provider

Browse Source 
Configure grub as the EFI provider and remove the U-boot boot
args.

Signed-off-by: Debbie Martin <Debbie.Martin@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Debbie Martin
2023-10-20 13:38:27 +01:00
committed by Jon Mason
parent e4fcfa534d
commit 0262fee5aa
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-arm-bsp/conf/machine/fvp-base.conf
+5 -3
View File
@@ -8,9 +8,11 @@ require conf/machine/include/arm/arch-armv8a.inc
TUNE_FEATURES = "aarch64" TUNE_FEATURES = "aarch64"
MACHINE_FEATURES = "efi"
IMAGE_NAME_SUFFIX = "" IMAGE_NAME_SUFFIX = ""
IMAGE_FSTYPES += "wic" IMAGE_FSTYPES += "wic"
WKS_FILE ?= "fvp-base.wks" WKS_FILE ?= "efi-disk.wks.in"
SERIAL_CONSOLES = "115200;ttyAMA0" SERIAL_CONSOLES = "115200;ttyAMA0"
@@ -23,6 +25,8 @@ EXTRA_IMAGEDEPENDS += "trusted-firmware-a"
# FVP u-boot configuration # FVP u-boot configuration
UBOOT_MACHINE = "vexpress_fvp_defconfig" 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 # As this is a virtual target that will not be used in the real world there is
# no need for real SSH keys. # no need for real SSH keys.
MACHINE_EXTRA_RRECOMMENDS += "ssh-pregen-hostkeys" 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[cluster0.has_arm_v8-4] = "1"
FVP_CONFIG[cluster1.has_arm_v8-4] = "1" FVP_CONFIG[cluster1.has_arm_v8-4] = "1"
FVP_CONSOLE ?= "terminal_0" 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_0] ?= "Console"
FVP_TERMINALS[bp.terminal_1] ?= "" FVP_TERMINALS[bp.terminal_1] ?= ""
FVP_TERMINALS[bp.terminal_2] ?= "" FVP_TERMINALS[bp.terminal_2] ?= ""
meta-arm-bsp/recipes-bsp/u-boot/u-boot-fvp-base.inc
+1 -1
View File
@@ -1,6 +1,6 @@
# FVP base specific U-boot support # 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://0001-virtio-rng-Workaround-for-FVP-returning-zero-size-bu.patch \
file://0002-vexpress64-Set-the-DM_RNG-property.patch \ file://0002-vexpress64-Set-the-DM_RNG-property.patch \
file://0003-vexpress64-Select-PSCI-RESET-by-default.patch \ file://0003-vexpress64-Select-PSCI-RESET-by-default.patch \
meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/bootargs.cfg
-2
View File
@@ -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"
meta-arm-bsp/wic/fvp-base.wks
-3
View File
@@ -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