From 08637debae3b9453f10e43d6837b6cee6e3ddf0e Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Thu, 4 Dec 2025 16:25:32 +0100 Subject: [PATCH] meta-digi-arm: ccmp25: add USB recovery artifacts to the ZIP installer Distribute all the required bootloader artifacts required for USB recovery as part of the ZIP installer. That way, every pre-compiled set of images is enough for starting development. Signed-off-by: Gonzalo Ruiz --- meta-digi-arm/conf/machine/ccmp25-dvk.conf | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/meta-digi-arm/conf/machine/ccmp25-dvk.conf b/meta-digi-arm/conf/machine/ccmp25-dvk.conf index 8bdf6f5f1..c3aa561af 100644 --- a/meta-digi-arm/conf/machine/ccmp25-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp25-dvk.conf @@ -134,14 +134,23 @@ ST_USERFS = "0" # Boot artifacts to be copied from the deploy dir to the installer ZIP BOOTABLE_ARTIFACTS = " \ ${@oe.utils.ifelse(d.getVar('TRUSTFENCE_SIGN') == '1', \ - oe.utils.ifelse(d.getVar('TRUSTFENCE_ENCRYPT') == '0', 'tf-a-ccmp25-dvk-optee-emmc${SIGN_SUFFIX}.stm32', \ - 'tf-a-ccmp25-dvk-optee-emmc${ENCRYPT_SUFFIX}${SIGN_SUFFIX}.stm32'), \ - 'tf-a-ccmp25-dvk-optee-emmc.stm32')} \ + oe.utils.ifelse(d.getVar('TRUSTFENCE_ENCRYPT') == '0', 'tf-a-ccmp25-dvk-optee-emmc${SIGN_SUFFIX}.stm32 ' \ + 'tf-a-ccmp25-dvk-optee-usb${SIGN_SUFFIX}.stm32 ', \ + 'tf-a-ccmp25-dvk-optee-emmc${ENCRYPT_SUFFIX}${SIGN_SUFFIX}.stm32 ' \ + 'tf-a-ccmp25-dvk-optee-usb${ENCRYPT_SUFFIX}${SIGN_SUFFIX}.stm32 '), \ + 'tf-a-ccmp25-dvk-optee-emmc.stm32 ' \ + 'tf-a-ccmp25-dvk-optee-usb.stm32 ')} \ metadata-ccmp25-dvk.bin \ ${@oe.utils.ifelse(d.getVar('TRUSTFENCE_SIGN') == '1', \ - oe.utils.ifelse(d.getVar('TRUSTFENCE_ENCRYPT') == '0', 'fip-ccmp25-dvk-optee-emmc${SIGN_SUFFIX}.bin', \ - 'fip-ccmp25-dvk-optee-emmc${ENCRYPT_SUFFIX}${SIGN_SUFFIX}.bin'), \ - 'fip-ccmp25-dvk-optee-emmc.bin')} \ + oe.utils.ifelse(d.getVar('TRUSTFENCE_ENCRYPT') == '0', 'fip-ccmp25-dvk-optee-emmc${SIGN_SUFFIX}.bin ' \ + 'fip-ccmp25-dvk-optee-usb${SIGN_SUFFIX}.bin ' \ + 'fip-ccmp25-dvk-ddr-optee-usb${SIGN_SUFFIX}.bin ', \ + 'fip-ccmp25-dvk-optee-emmc${ENCRYPT_SUFFIX}${SIGN_SUFFIX}.bin ' \ + 'fip-ccmp25-dvk-optee-usb${ENCRYPT_SUFFIX}${SIGN_SUFFIX}.bin ' \ + 'fip-ccmp25-dvk-ddr-optee-usb${ENCRYPT_SUFFIX}${SIGN_SUFFIX}.bin '), \ + 'fip-ccmp25-dvk-optee-emmc.bin ' \ + 'fip-ccmp25-dvk-optee-usb.bin ' \ + 'fip-ccmp25-dvk-ddr-optee-usb.bin ')} \ " # Per-machine DISTRO_FEATURES customization