arm-bsp/machine: work around rootfs name issue

Upstream change 26d97acc71379ab6702fa54a23b6542a3f51779c changed the IMAGE_LINK_NAME to have IMAGE_NAME_SUFFIX and breaks the automatic finding of the image by name. Work around here until upstream fix can be added. Signed-off-by: Jon Mason <jon.mason@arm.com>
2026-06-06 02:40:18 +00:00 · 2023-07-17 14:32:06 -05:00
parent 0731d371cb
commit f12f035093
6 changed files with 8 additions and 0 deletions
@@ -45,3 +45,5 @@ FVP_TERMINALS[css.terminal_1] ?= ""

 # Disable openssl in kmod to shink the initramfs size
 PACKAGECONFIG:remove:pn-kmod = "openssl"
+
+IMAGE_NAME_SUFFIX = ""
@@ -15,3 +15,4 @@ UBOOT_MACHINE = "vexpress_aemv8a_semi_defconfig"
 KERNEL_IMAGETYPE = "Image"

 FVP_CONFIG[bp.virtio_rng.enabled] ?= "1"
+IMAGE_NAME_SUFFIX = ""
@@ -24,6 +24,8 @@ WKS_FILE ?= "efi-disk.wks.in"
 EFI_PROVIDER ?= "grub-efi"
 MACHINE_FEATURES:append = " efi"

+IMAGE_NAME_SUFFIX = ""
+
 # 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"
@@ -57,6 +57,7 @@ INITRAMFS_IMAGE_BUNDLE ?= "1"

 #telling the build system which image is responsible of the generation of the initramfs rootfs
 INITRAMFS_IMAGE = "corstone1000-initramfs-image"
+IMAGE_NAME_SUFFIX = ""

 # add FF-A support in the kernel
 MACHINE_FEATURES += "arm-ffa"
@@ -25,6 +25,7 @@ KERNEL_CLASSES = " kernel-fitimage "

 IMAGE_FSTYPES += "cpio.gz"
 INITRAMFS_IMAGE ?= "core-image-minimal"
+IMAGE_NAME_SUFFIX = ""

 SERIAL_CONSOLES = "115200;ttyAMA0"

@@ -27,3 +27,4 @@ UBOOT_MACHINE = "vexpress_aemv8a_juno_defconfig"

 INITRAMFS_IMAGE_BUNDLE ?= "1"
 INITRAMFS_IMAGE = "core-image-minimal"
+IMAGE_NAME_SUFFIX = ""