From 901c747730d8e5a5798072895f374f3822ddd77c Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Fri, 4 Nov 2022 17:23:39 +0100 Subject: [PATCH] meta-digi-arm: ccmp1: set dey-image-installer bootable-artifacts For platforms with a FIP artifact, ignore U-Boot artifacts and instead add to the installer zip file the FIP artifact and the ATF artifacts. Signed-off-by: Gonzalo Ruiz --- meta-digi-arm/classes/boot-artifacts.bbclass | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/meta-digi-arm/classes/boot-artifacts.bbclass b/meta-digi-arm/classes/boot-artifacts.bbclass index c625f222d..02236d76e 100644 --- a/meta-digi-arm/classes/boot-artifacts.bbclass +++ b/meta-digi-arm/classes/boot-artifacts.bbclass @@ -34,8 +34,22 @@ def get_bootable_artifacts(d): soc_revisions = d.getVar('SOC_REVISIONS', True) or "" uboot_prefix = d.getVar('UBOOT_PREFIX', True) or "" uboot_suffix = d.getVar('UBOOT_SUFFIX', True) or "" + atf_types = d.getVar('TF_A_CONFIG', True) or "" + fip_type = d.getVar('FIP_UBOOT_CONFIG', True) or "" + atf_boot_modes = ['nand', 'usb'] artifacts = [] + # For platforms with a FIP artifact, ignore u-boot artifacts + if fip_type != "": + machine = d.getVar('MACHINE', True) or "" + # Add ATF artifacts + for t in atf_types.split(" "): + if t in atf_boot_modes: + artifacts.append("arm-trusted-firmware/tf-a-%s-%s.stm32" % (machine, t)) + # Add FIP artifact + artifacts.append("fip/fip-%s-%s.bin" % (machine, fip_type)) + return " ".join(artifacts) + # For platforms without RAM_CONFIGS, build the artifacts from UBOOT_CONFIG if ram_configs == "": for t in types.split(" "):