From ea4dce68cba7454691b233763adc72e12a8ce4c3 Mon Sep 17 00:00:00 2001 From: Adam Johnston Date: Mon, 5 Jun 2023 19:30:14 +0000 Subject: [PATCH] cassini-bsp: Keep wic.pad image to fix local Corstone-1000 FVP usage The Corstone-1000 FVP config refers to the uncompressed rootfs image (.rootfs.wic.pad) however the build only deploys a compressed image (.rootfs.wic.pad.gz). When following the instructions in the user guide the Corstone-1000 FVP therefore fails to find the Cassini rootfs image and falls back to the Corstone-1000 flash image. Explicitly add wic.pad to IMAGE_FSTYPES for the FVP so that the instructions in the user guide behave as expected. This is not a problem for CI as the compressed image is extracted automatically by LAVA. Changelog: bug Signed-off-by: Adam Johnston --- .../recipes-core/images/cassini-image-base.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-cassini-bsp/meta-arm/meta-arm-bsp/recipes-core/images/cassini-image-base.bbappend b/meta-cassini-bsp/meta-arm/meta-arm-bsp/recipes-core/images/cassini-image-base.bbappend index 7d9485d..c956505 100644 --- a/meta-cassini-bsp/meta-arm/meta-arm-bsp/recipes-core/images/cassini-image-base.bbappend +++ b/meta-cassini-bsp/meta-arm/meta-arm-bsp/recipes-core/images/cassini-image-base.bbappend @@ -11,7 +11,7 @@ CONVERSIONTYPES += "pad" CONVERSION_CMD:pad = "cp ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.pad && dd if=/dev/zero count=1024 bs=512 >> ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.pad" -IMAGE_FSTYPES:append:corstone1000-fvp = " wic.pad.gz" +IMAGE_FSTYPES:append:corstone1000-fvp = " wic.pad wic.pad.gz" # Ensure cassini-image-* also builds the firmware for corstone1000 using a different libc do_image_complete[depends] = "${@bb.utils.contains_any('MACHINE','corstone1000-mps3 corstone1000-fvp', \ -- GitLab