diff --git a/meta-digi-arm/classes/boot-artifacts.bbclass b/meta-digi-arm/classes/boot-artifacts.bbclass deleted file mode 100644 index 1f0a29a97..000000000 --- a/meta-digi-arm/classes/boot-artifacts.bbclass +++ /dev/null @@ -1,70 +0,0 @@ -# Class for the generation of boot artifacts - -# This function returns a list with the RAM_CONFIGS that match the RAM size -# in the list of UBOOT_CONFIG -def get_uboot_ram_combinations(d): - import re - - types = d.getVar('UBOOT_CONFIG', True) or "" - ram_configs = d.getVar('RAM_CONFIGS', True) or "" - - # Convert to arrays - types = types.split(" ") - ram_configs = ram_configs.split(" ") - - # Obtain the list of RAM_CONFIGS for whose RAM size there is a match - # in UBOOT_CONFIG - matches = [] - for type in types: - ramsize = re.search("([0-9]*[G|M]B)", type).group(1) - for ramc in ram_configs: - if ramsize in ramc: - matches.append(ramc) - - return " ".join(matches) - -UBOOT_RAM_COMBINATIONS = "${@get_uboot_ram_combinations(d)}" - -# This function returns a list with the bootable artifacts -def get_bootable_artifacts(d): - import re - - types = d.getVar('UBOOT_CONFIG', True) or "" - ram_configs = d.getVar('RAM_CONFIGS', True) or "" - 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 "" - atf_boot_modes = ['nand'] - artifacts = [] - - # For platforms with a FIP artifact, ignore u-boot artifacts - if d.getVar('FIP_UBOOT_DTB'): - 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.bin" % (machine)) - return " ".join(artifacts) - - # For platforms without RAM_CONFIGS, build the artifacts from UBOOT_CONFIG - if ram_configs == "": - for t in types.split(" "): - artifacts.append("%s-%s.%s" % (uboot_prefix, t.replace("_","-"), uboot_suffix)) - return " ".join(artifacts) - else: - machine = d.getVar('MACHINE', True) or "" - ram_combinations = get_uboot_ram_combinations(d) - if soc_revisions == "": - for ramc in ram_combinations.split(" "): - artifacts.append("%s-%s-%s.%s" % (uboot_prefix, machine, ramc, uboot_suffix)) - else: - for soc_rev in soc_revisions.split(" "): - for ramc in ram_combinations.split(" "): - artifacts.append("%s-%s-%s-%s.%s" % (uboot_prefix, machine, soc_rev, ramc, uboot_suffix)) - - return " ".join(artifacts) - -BOOTABLE_ARTIFACTS = "${@get_bootable_artifacts(d)}" diff --git a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf index c777dfd71..c43460a8e 100644 --- a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf +++ b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf @@ -47,3 +47,9 @@ XBEE_TTY ?= "ttymxc4" IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ "boot.vfat tar.bz2 recovery.vfat squashfs", \ "boot.vfat ext4.gz sdcard.gz tar.bz2 recovery.vfat", d)}' + +# Boot artifacts to be copied from the deploy dir to the installer ZIP +BOOTABLE_ARTIFACTS = " \ + u-boot-ccimx6qpsbc1GB.imx \ + u-boot-ccimx6qpsbc2GB.imx \ +" diff --git a/meta-digi-arm/conf/machine/ccimx6sbc.conf b/meta-digi-arm/conf/machine/ccimx6sbc.conf index d21eb1f9d..b3d6f539b 100644 --- a/meta-digi-arm/conf/machine/ccimx6sbc.conf +++ b/meta-digi-arm/conf/machine/ccimx6sbc.conf @@ -49,3 +49,12 @@ XBEE_TTY ?= "ttymxc4" IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ "boot.vfat tar.bz2 recovery.vfat squashfs", \ "boot.vfat ext4.gz sdcard.gz tar.bz2 recovery.vfat", d)}' + +# Boot artifacts to be copied from the deploy dir to the installer ZIP +BOOTABLE_ARTIFACTS = " \ + u-boot-ccimx6dlsbc512MB.imx \ + u-boot-ccimx6dlsbc.imx \ + u-boot-ccimx6qsbc2GB.imx \ + u-boot-ccimx6qsbc512MB.imx \ + u-boot-ccimx6qsbc.imx \ +" diff --git a/meta-digi-arm/conf/machine/ccimx6ulsbc.conf b/meta-digi-arm/conf/machine/ccimx6ulsbc.conf index 862d0a3c8..e69ad48b8 100644 --- a/meta-digi-arm/conf/machine/ccimx6ulsbc.conf +++ b/meta-digi-arm/conf/machine/ccimx6ulsbc.conf @@ -34,3 +34,10 @@ XBEE_TTY ?= "ttymxc1" IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ "tar.bz2 boot.ubifs recovery.ubifs squashfs", \ "tar.bz2 ubifs boot.ubifs recovery.ubifs", d)}' + +# Boot artifacts to be copied from the deploy dir to the installer ZIP +BOOTABLE_ARTIFACTS = " \ + u-boot-ccimx6ulsbc1GB.imx \ + u-boot-ccimx6ulsbc512MB.imx \ + u-boot-ccimx6ulsbc.imx \ +" diff --git a/meta-digi-arm/conf/machine/ccimx6ulstarter.conf b/meta-digi-arm/conf/machine/ccimx6ulstarter.conf index 92d506f75..da5a6ec23 100644 --- a/meta-digi-arm/conf/machine/ccimx6ulstarter.conf +++ b/meta-digi-arm/conf/machine/ccimx6ulstarter.conf @@ -33,3 +33,10 @@ IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ # Default image for install scripts DEFAULT_IMAGE_NAME ?= "core-image-base" + +# Boot artifacts to be copied from the deploy dir to the installer ZIP +BOOTABLE_ARTIFACTS = " \ + u-boot-ccimx6ulstarter1GB.imx \ + u-boot-ccimx6ulstarter512MB.imx \ + u-boot-ccimx6ulstarter.imx \ +" diff --git a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf index 1f8ee4c24..758abbfb8 100644 --- a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf @@ -50,3 +50,6 @@ XBEE_TTY ?= "ttymxc3" IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ "boot.vfat tar.bz2 recovery.vfat squashfs", \ "boot.vfat ext4.gz sdcard.gz tar.bz2 recovery.vfat", d)}' + +# Boot artifacts to be copied from the deploy dir to the installer ZIP +BOOTABLE_ARTIFACTS = "imx-boot-ccimx8mm-dvk.bin" diff --git a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf index 10c891a27..867da88bb 100644 --- a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf @@ -52,3 +52,6 @@ XBEE_TTY ?= "ttymxc3" IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ "boot.vfat tar.bz2 recovery.vfat squashfs", \ "boot.vfat ext4.gz sdcard.gz tar.bz2 recovery.vfat", d)}' + +# Boot artifacts to be copied from the deploy dir to the installer ZIP +BOOTABLE_ARTIFACTS = "imx-boot-ccimx8mn-dvk.bin" diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf index b39ca65f4..a4b554e66 100644 --- a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf +++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf @@ -33,3 +33,15 @@ XBEE_TTY ?= "ttyLP0" IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ "boot.vfat tar.bz2 recovery.vfat squashfs", \ "boot.vfat ext4.gz sdcard.gz tar.bz2 recovery.vfat", d)}' + +# Boot artifacts to be copied from the deploy dir to the installer ZIP +BOOTABLE_ARTIFACTS = " \ + imx-boot-ccimx8x-sbc-express-B0-1GB_16bit.bin \ + imx-boot-ccimx8x-sbc-express-B0-1GB_32bit.bin \ + imx-boot-ccimx8x-sbc-express-B0-2GB_32bit.bin \ + imx-boot-ccimx8x-sbc-express-B0-512MB_16bit.bin \ + imx-boot-ccimx8x-sbc-express-C0-1GB_16bit.bin \ + imx-boot-ccimx8x-sbc-express-C0-1GB_32bit.bin \ + imx-boot-ccimx8x-sbc-express-C0-2GB_32bit.bin \ + imx-boot-ccimx8x-sbc-express-C0-512MB_16bit.bin \ +" diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf index 1c2c72f29..f853b3178 100644 --- a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf +++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf @@ -46,3 +46,15 @@ XBEE_TTY ?= "ttyMCA0" IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ "boot.vfat tar.bz2 recovery.vfat squashfs", \ "boot.vfat ext4.gz sdcard.gz tar.bz2 recovery.vfat", d)}' + +# Boot artifacts to be copied from the deploy dir to the installer ZIP +BOOTABLE_ARTIFACTS = " \ + imx-boot-ccimx8x-sbc-pro-B0-1GB_16bit.bin \ + imx-boot-ccimx8x-sbc-pro-B0-1GB_32bit.bin \ + imx-boot-ccimx8x-sbc-pro-B0-2GB_32bit.bin \ + imx-boot-ccimx8x-sbc-pro-B0-512MB_16bit.bin \ + imx-boot-ccimx8x-sbc-pro-C0-1GB_16bit.bin \ + imx-boot-ccimx8x-sbc-pro-C0-1GB_32bit.bin \ + imx-boot-ccimx8x-sbc-pro-C0-2GB_32bit.bin \ + imx-boot-ccimx8x-sbc-pro-C0-512MB_16bit.bin \ +" diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf index 354eebdb5..35f914b20 100644 --- a/meta-digi-arm/conf/machine/ccmp13-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp13-dvk.conf @@ -173,3 +173,9 @@ VIRTUAL-RUNTIME_initscripts ?= "initscripts" # Disable use of vendorfs partition ST_VENDORFS = "0" + +# Boot artifacts to be copied from the deploy dir to the installer ZIP +BOOTABLE_ARTIFACTS = " \ + arm-trusted-firmware/tf-a-ccmp13-dvk-nand.stm32 \ + fip/fip-ccmp13-dvk-optee.bin \ +" diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf index 8a76c33a5..6e5a713c4 100644 --- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf @@ -186,6 +186,12 @@ VIRTUAL-RUNTIME_initscripts ?= "initscripts" # Disable use of vendorfs partition ST_VENDORFS = "0" +# Boot artifacts to be copied from the deploy dir to the installer ZIP +BOOTABLE_ARTIFACTS = " \ + arm-trusted-firmware/tf-a-ccmp15-dvk-nand.stm32 \ + fip/fip-ccmp15-dvk-optee.bin \ +" + # SWUpdate sw-description configuration BOOTFS_EXT ?= ".boot.ubifs" ROOTFS_EXT ?= ".ubifs" diff --git a/meta-digi-dey/classes/dey-image-installer.bbclass b/meta-digi-dey/classes/dey-image-installer.bbclass index c060f973b..6231356ce 100644 --- a/meta-digi-dey/classes/dey-image-installer.bbclass +++ b/meta-digi-dey/classes/dey-image-installer.bbclass @@ -3,8 +3,6 @@ # # Copyright 2017-2022, Digi International Inc. # -inherit boot-artifacts - DEPENDS += "zip-native" #