From e04ac672d52e1c4175c50a327af405d8a5be6e91 Mon Sep 17 00:00:00 2001 From: Marek Bykowski Date: Tue, 19 May 2026 15:58:35 +0000 Subject: [PATCH] arm-bsp: use IMAGE_LINK_NAME for FVP disk image path ${IMAGE_NAME} expands to a timestamped filename which gets written into the .fvpconf. A mismatch occurs when do_image reruns (regenerating the .fvpconf with a new timestamp) but do_image_wic hits sstate (leaving the old .wic on disk), causing the FVP to fail at startup with: Can't stat -.wic! (error 2) Use IMAGE_LINK_NAME instead, which is the stable symlink that always points to the most recently built .wic. Signed-off-by: Marek Bykowski Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/corstone1000-fvp.conf | 2 +- meta-arm-bsp/conf/machine/fvp-base.conf | 2 +- meta-arm-bsp/conf/machine/rdn2.conf | 2 +- meta-arm-bsp/conf/machine/rdv2.conf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-arm-bsp/conf/machine/corstone1000-fvp.conf b/meta-arm-bsp/conf/machine/corstone1000-fvp.conf index d541782a..e883b9a1 100644 --- a/meta-arm-bsp/conf/machine/corstone1000-fvp.conf +++ b/meta-arm-bsp/conf/machine/corstone1000-fvp.conf @@ -60,7 +60,7 @@ FVP_CONFIG[board.msd_mmc.diagnostics] ?= "0" FVP_CONFIG[board.msd_mmc.p_max_block_count] ?= "0xFFFF" FVP_CONFIG[board.msd_config.pl180_fifo_depth] ?= "16" FVP_CONFIG[board.msd_mmc.support_unpadded_images] ?= "true" -FVP_CONFIG[board.msd_mmc.p_mmc_file] ?= "${IMAGE_NAME}.wic" +FVP_CONFIG[board.msd_mmc.p_mmc_file] ?= "${IMAGE_LINK_NAME}.wic" # MMC2 card configuration FVP_CONFIG[board.msd_mmc_2.card_type] ?= "SDHC" diff --git a/meta-arm-bsp/conf/machine/fvp-base.conf b/meta-arm-bsp/conf/machine/fvp-base.conf index 83506c7e..cbfa90ab 100644 --- a/meta-arm-bsp/conf/machine/fvp-base.conf +++ b/meta-arm-bsp/conf/machine/fvp-base.conf @@ -60,7 +60,7 @@ FVP_CONFIG[cluster0.stage12_tlb_size] ?= "1024" FVP_CONFIG[cluster1.stage12_tlb_size] ?= "1024" FVP_CONFIG[bp.secureflashloader.fname] ?= "trusted-firmware-a/bl1.bin" FVP_CONFIG[bp.flashloader0.fname] ?= "trusted-firmware-a/fip.bin" -FVP_CONFIG[bp.virtioblockdevice.image_path] ?= "${IMAGE_NAME}.wic" +FVP_CONFIG[bp.virtioblockdevice.image_path] ?= "${IMAGE_LINK_NAME}.wic" # FVP Base default is 8.0, so there is no has_arm_v8-0 for it. However, this is needed for every version after. So set this accordingly FVP_EXTRA_ARGS = "--parameter cluster0.has_arm_v${ARM_ISA_MAJOR}-${ARM_ISA_MINOR}=1 --parameter cluster1.has_arm_v${ARM_ISA_MAJOR}-${ARM_ISA_MINOR}=1" diff --git a/meta-arm-bsp/conf/machine/rdn2.conf b/meta-arm-bsp/conf/machine/rdn2.conf index cc9ba06c..2349f1b7 100644 --- a/meta-arm-bsp/conf/machine/rdn2.conf +++ b/meta-arm-bsp/conf/machine/rdn2.conf @@ -49,7 +49,7 @@ FVP_CONFIG[board.dram_size] ?= "0x200000000" FVP_CONFIG[board.virtio_net.enabled] ?= "1" FVP_CONFIG[board.virtio_net.hostbridge.userNetworking] ?= "1" FVP_CONFIG[board.virtio_net.hostbridge.userNetPorts] = "2222=22" -FVP_CONFIG[board.virtioblockdevice.image_path] ?= "${IMAGE_NAME}.wic" +FVP_CONFIG[board.virtioblockdevice.image_path] ?= "${IMAGE_LINK_NAME}.wic" FVP_CONSOLES[default] = "terminal_ns_uart_ap" FVP_TERMINALS[css.scp.terminal_uart_scp] ?= "SCP Console" diff --git a/meta-arm-bsp/conf/machine/rdv2.conf b/meta-arm-bsp/conf/machine/rdv2.conf index 2c306f26..bb83ffce 100644 --- a/meta-arm-bsp/conf/machine/rdv2.conf +++ b/meta-arm-bsp/conf/machine/rdv2.conf @@ -51,7 +51,7 @@ FVP_CONFIG[board.dram_size] ?= "0x200000000" FVP_CONFIG[board.virtio_net.enabled] ?= "1" FVP_CONFIG[board.virtio_net.hostbridge.userNetworking] ?= "1" FVP_CONFIG[board.virtio_net.hostbridge.userNetPorts] = "2222=22" -FVP_CONFIG[board.virtioblockdevice.image_path] ?= "${IMAGE_NAME}.wic" +FVP_CONFIG[board.virtioblockdevice.image_path] ?= "${IMAGE_LINK_NAME}.wic" FVP_CONSOLES[default] = "terminal_ns_uart_ap" FVP_TERMINALS[css.scp.terminal_uart_scp] ?= "SCP Console"