mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-01-11 15:00:39 +00:00
Code Issues Projects Releases Wiki Activity

arm-bsp/fvp-base: support poky-altcfg

Browse Source 
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 <jon.mason@arm.com>
This commit is contained in:
Jon Mason
2024-09-20 08:57:14 -04:00
parent 45a2b44284
commit a6e74d3926
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ci/fvp-base.yml
View File

@@ -9,5 +9,5 @@ header:
machine: fvp-base machine: fvp-base
target: target:
- core-image-sato - core-image-full-cmdline
- boot-wrapper-aarch64 - boot-wrapper-aarch64

6
meta-arm-bsp/conf/machine/fvp-base.conf
View File

@@ -11,13 +11,15 @@ ARM_SYSTEMREADY_ACS_CONSOLE = "default"
EXTRA_IMAGEDEPENDS = "${ARM_SYSTEMREADY_FIRMWARE}" EXTRA_IMAGEDEPENDS = "${ARM_SYSTEMREADY_FIRMWARE}"
PREFERRED_VERSION_trusted-firmware-a ?= "2.10.%" PREFERRED_VERSION_trusted-firmware-a ?= "2.10.%"
MACHINE_FEATURES = "efi" MACHINE_FEATURES = "efi vfat"
IMAGE_NAME_SUFFIX = "" IMAGE_NAME_SUFFIX = ""
IMAGE_FSTYPES += "wic" IMAGE_FSTYPES += "wic"
WKS_FILE ?= "efi-disk.wks.in" WKS_FILE ?= "efi-disk.wks.in"
SERIAL_CONSOLES = "115200;ttyAMA0" 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" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
KERNEL_DTB_NAME = "fvp-base-revc.dtb" KERNEL_DTB_NAME = "fvp-base-revc.dtb"
@@ -29,7 +31,7 @@ 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" 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 # 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.

2
meta-arm/wic/efi-disk.wks.in
View File

@@ -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 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}"