From 025f76a14f6c9474cc273b17033430d47ad12606 Mon Sep 17 00:00:00 2001 From: Drew Reed Date: Wed, 14 Feb 2024 14:03:03 +0000 Subject: [PATCH] bsp: Rename corstone1000-image As we intend to build 2 Corstone-1000 disk images, one for the firmware in flash and an external mass storage image the existing corstone1000-image.bb file has been renamed to corstone1000-flash-firmware-image.bb to make it clear what it's for. The wks file for specifing the image layout has also been renamed to make its purpose clearer. Signed-off-by: Drew Reed --- ci/corstone1000-common.yml | 2 +- meta-arm-bsp/conf/machine/include/corstone1000.inc | 2 +- ...rstone1000-image.bb => corstone1000-flash-firmware-image.bb} | 0 ...corstone1000-flash-firmware-image-capsule-update-image.json} | 0 ...mage.corstone1000.wks => corstone1000-flash-firmware.wks.in} | 0 5 files changed, 2 insertions(+), 2 deletions(-) rename meta-arm-bsp/recipes-bsp/images/{corstone1000-image.bb => corstone1000-flash-firmware-image.bb} (100%) rename meta-arm-bsp/recipes-bsp/images/files/{corstone1000-image-capsule-update-image.json => corstone1000-flash-firmware-image-capsule-update-image.json} (100%) rename meta-arm-bsp/wic/{corstone1000-image.corstone1000.wks => corstone1000-flash-firmware.wks.in} (100%) diff --git a/ci/corstone1000-common.yml b/ci/corstone1000-common.yml index 42cf4c95..5720b783 100644 --- a/ci/corstone1000-common.yml +++ b/ci/corstone1000-common.yml @@ -38,5 +38,5 @@ local_conf_header: IMAGE_INSTALL += "packagegroup-ts-tests-psa" target: - - corstone1000-image + - corstone1000-flash-firmware-image - perf diff --git a/meta-arm-bsp/conf/machine/include/corstone1000.inc b/meta-arm-bsp/conf/machine/include/corstone1000.inc index 4d33b575..373dd04c 100644 --- a/meta-arm-bsp/conf/machine/include/corstone1000.inc +++ b/meta-arm-bsp/conf/machine/include/corstone1000.inc @@ -44,7 +44,7 @@ MACHINE_FEATURES += "arm-ffa" # login terminal serial port settings SERIAL_CONSOLES ?= "115200;ttyAMA0" -WKS_FILE ?= "corstone1000-image.corstone1000.wks" +WKS_FILE ?= "corstone1000-flash-firmware.wks.in" # making sure EXTRA_IMAGEDEPENDS will be used while creating the image WKS_FILE_DEPENDS:append = " ${EXTRA_IMAGEDEPENDS}" diff --git a/meta-arm-bsp/recipes-bsp/images/corstone1000-image.bb b/meta-arm-bsp/recipes-bsp/images/corstone1000-flash-firmware-image.bb similarity index 100% rename from meta-arm-bsp/recipes-bsp/images/corstone1000-image.bb rename to meta-arm-bsp/recipes-bsp/images/corstone1000-flash-firmware-image.bb diff --git a/meta-arm-bsp/recipes-bsp/images/files/corstone1000-image-capsule-update-image.json b/meta-arm-bsp/recipes-bsp/images/files/corstone1000-flash-firmware-image-capsule-update-image.json similarity index 100% rename from meta-arm-bsp/recipes-bsp/images/files/corstone1000-image-capsule-update-image.json rename to meta-arm-bsp/recipes-bsp/images/files/corstone1000-flash-firmware-image-capsule-update-image.json diff --git a/meta-arm-bsp/wic/corstone1000-image.corstone1000.wks b/meta-arm-bsp/wic/corstone1000-flash-firmware.wks.in similarity index 100% rename from meta-arm-bsp/wic/corstone1000-image.corstone1000.wks rename to meta-arm-bsp/wic/corstone1000-flash-firmware.wks.in