From 1a0dd177931eb22b202c8c5d03388501e88c9a29 Mon Sep 17 00:00:00 2001 From: Ziad Elhanafy Date: Mon, 17 Jul 2023 14:32:03 -0500 Subject: [PATCH] arm-bsp/conf: Remove hardcoded .rootfs from image path Remove hardcoded .rootfs from image path in: 1- fvp-common.inc 2- corstone1000-fvp.conf 3- corstone500.conf 4- fvp-baser-aemv8r64.conf Signed-off-by: Ziad Elhanafy Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/corstone1000-fvp.conf | 2 +- meta-arm-bsp/conf/machine/corstone500.conf | 2 +- meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf | 2 +- meta-arm-bsp/conf/machine/include/fvp-common.inc | 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 449f5658..9636ffe4 100644 --- a/meta-arm-bsp/conf/machine/corstone1000-fvp.conf +++ b/meta-arm-bsp/conf/machine/corstone1000-fvp.conf @@ -32,7 +32,7 @@ FVP_CONFIG[se.nvm.update_raw_image] ?= "0" FVP_CONFIG[se.cryptocell.USER_OTP_FILTERING_DISABLE] ?= "1" # Boot image -FVP_DATA ?= "board.flash0=${IMAGE_NAME}.rootfs.wic@0x68000000" +FVP_DATA ?= "board.flash0=${IMAGE_NAME}.wic@0x68000000" # External system (cortex-M3) FVP_CONFIG[extsys_harness0.extsys_flashloader.fname] ?= "es_flashfw.bin" diff --git a/meta-arm-bsp/conf/machine/corstone500.conf b/meta-arm-bsp/conf/machine/corstone500.conf index a688ad2f..978d4edb 100644 --- a/meta-arm-bsp/conf/machine/corstone500.conf +++ b/meta-arm-bsp/conf/machine/corstone500.conf @@ -38,7 +38,7 @@ TEST_SUITES = "fvp_boot" FVP_PROVIDER ?= "fvp-corstone500-native" FVP_EXE ?= "FVP_Corstone-500" FVP_CONFIG[board.flashloader0.fname] ?= "bl1.bin" -FVP_DATA ?= "css.cluster.cpu0=${IMAGE_NAME}.rootfs.wic.nopt@0x80000000" +FVP_DATA ?= "css.cluster.cpu0=${IMAGE_NAME}.wic.nopt@0x80000000" FVP_CONSOLE ?= "terminal_0" FVP_TERMINALS[css.terminal_0] ?= "console" FVP_TERMINALS[css.terminal_1] ?= "" diff --git a/meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf b/meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf index c0ac3d75..b5900b4e 100644 --- a/meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf +++ b/meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf @@ -51,7 +51,7 @@ FVP_CONFIG[bp.virtio_net.hostbridge.userNetworking] ?= "1" FVP_CONFIG[bp.virtio_net.secure_accesses] = "1" FVP_CONFIG[bp.virtio_rng.enabled] ?= "1" FVP_CONFIG[bp.virtio_rng.secure_accesses] = "1" -FVP_CONFIG[bp.virtioblockdevice.image_path] ?= "${IMAGE_NAME}.rootfs.wic" +FVP_CONFIG[bp.virtioblockdevice.image_path] ?= "${IMAGE_NAME}.wic" FVP_CONFIG[bp.virtioblockdevice.secure_accesses] = "1" FVP_CONFIG[cache_state_modelled] ?= "0" FVP_CONFIG[cci400.force_on_from_start] = "1" diff --git a/meta-arm-bsp/conf/machine/include/fvp-common.inc b/meta-arm-bsp/conf/machine/include/fvp-common.inc index b76de3c4..36bf9555 100644 --- a/meta-arm-bsp/conf/machine/include/fvp-common.inc +++ b/meta-arm-bsp/conf/machine/include/fvp-common.inc @@ -37,7 +37,7 @@ FVP_CONFIG[bp.virtio_net.hostbridge.userNetPorts] = "8022=22" FVP_CONFIG[cache_state_modelled] ?= "0" FVP_CONFIG[bp.secureflashloader.fname] ?= "bl1-fvp.bin" FVP_CONFIG[bp.flashloader0.fname] ?= "fip-fvp.bin" -FVP_CONFIG[bp.virtioblockdevice.image_path] ?= "${IMAGE_NAME}.rootfs.wic" +FVP_CONFIG[bp.virtioblockdevice.image_path] ?= "${IMAGE_NAME}.wic" # Set the baseline to ARMv8.4, as the default is 8.0. FVP_CONFIG[cluster0.has_arm_v8-4] = "1" FVP_CONFIG[cluster1.has_arm_v8-4] = "1"