diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2021-01-26 20:57:26 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2021-01-28 10:26:30 +0100 |
| commit | 6d8f8337ff1bf0200dead6adbc2615556b6495de (patch) | |
| tree | 54f37770dab72b8d36743b87ff0d4fb42619d694 | |
| parent | 80534650f210472afbfd6f5d6d80559c708eb72e (diff) | |
image_type_tezi: use device-tree-overlay-filter
Replace tezi_deploy_dt_overlays() with a depend on device-tree-overlay-filter.
This allows to append the device tree overlays to IMAGE_BOOT_FILES and thus
they do get installed to TEZI and WIC images. Before they were missing in the
WIC images.
Related-to: ELB-3197
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
| -rw-r--r-- | classes/image_type_tezi.bbclass | 40 |
1 files changed, 3 insertions, 37 deletions
diff --git a/classes/image_type_tezi.bbclass b/classes/image_type_tezi.bbclass index 454bdd2..dac3d80 100644 --- a/classes/image_type_tezi.bbclass +++ b/classes/image_type_tezi.bbclass @@ -5,8 +5,9 @@ # Since it also generates the image.json description file it is rather # interwind with the boot flow which is U-Boot target specific. -WKS_FILE_DEPENDS_append = " tezi-metadata virtual/dtb " +WKS_FILE_DEPENDS_append = " tezi-metadata device-tree-overlay-filter" DEPENDS += "${WKS_FILE_DEPENDS}" +IMAGE_BOOT_FILES_append = " overlays.txt overlays/*;overlays/ " RM_WORK_EXCLUDE += "${PN}" @@ -27,8 +28,6 @@ TEZI_BOOT_SUFFIX ??= "${@'bootfs.tar.xz' if oe.types.boolean('${TEZI_USE_BOOTFIL TEZI_CONFIG_FORMAT ??= "2" # Require newer Tezi for mx8 Socs with the u-boot environment bugfix TEZI_CONFIG_FORMAT_mx8 ??= "4" -TEZI_EXTERNAL_KERNEL_DEVICETREE ??= "" -TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT ??= "" TORADEX_FLASH_TYPE ??= "emmc" UBOOT_BINARY_TEZI_EMMC ?= "${UBOOT_BINARY}" UBOOT_BINARY_TEZI_RAWNAND ?= "${UBOOT_BINARY}" @@ -346,44 +345,11 @@ python tezi_deploy_bootfs_files() { tezi_deploy_bootfs_files[dirs] =+ "${WORKDIR}/bootfs" tezi_deploy_bootfs_files[cleandirs] += "${WORKDIR}/bootfs" -MACHINE_PREFIX = "${MACHINE}" -MACHINE_PREFIX_apalis-imx8x-v11a = "apalis-imx8x" -MACHINE_PREFIX_colibri-imx8x-v10b = "colibri-imx8x" -MACHINE_PREFIX_colibri-imx7-emmc = "colibri-imx7" -tezi_deploy_dt_overlays() { - deploy_dt_dir=${DEPLOY_DIR_IMAGE}/devicetree/ - dtbos= - if [ -z "${TEZI_EXTERNAL_KERNEL_DEVICETREE}" -a -d "$deploy_dt_dir" ] ; then - machine_dtbos=`cd $deploy_dt_dir && ls ${MACHINE_PREFIX}[_-]*.dtbo 2>/dev/null || true` - common_dtbos=`cd $deploy_dt_dir && ls *.dtbo 2>/dev/null | grep -v -e 'imx[6-8]' -e 'tk1' | xargs || true` - dtbos="$machine_dtbos $common_dtbos" - else - dtbos="${TEZI_EXTERNAL_KERNEL_DEVICETREE}" - fi - - # overlays to copy to bootfs/overlays - mkdir -p ${WORKDIR}/bootfs/overlays/ - for dtbo in $dtbos; do - cp $deploy_dt_dir/$dtbo ${WORKDIR}/bootfs/overlays/ - done - - # overlays that we want to be applied during boot time - overlays= - for dtbo in ${TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT}; do - if [ ! -e ${WORKDIR}/bootfs/overlays/$dtbo ]; then - bbfatal "$dtbo is not installed in your boot filesystem, please make sure it's in TEZI_EXTERNAL_KERNEL_DEVICETREE or being provided by virtual/dtb." - fi - overlays="$overlays $dtbo" - done - - echo "fdt_overlays=$(echo $overlays)" > ${WORKDIR}/bootfs/overlays.txt -} - TAR_IMAGE_ROOTFS_task-image-bootfs = "${WORKDIR}/bootfs" IMAGE_CMD_bootfs () { : } -TEZI_IMAGE_BOOTFS_PREFUNCS ??= "tezi_deploy_bootfs_files tezi_deploy_dt_overlays" +TEZI_IMAGE_BOOTFS_PREFUNCS ??= "tezi_deploy_bootfs_files" do_image_bootfs[prefuncs] += "${TEZI_IMAGE_BOOTFS_PREFUNCS}" TEZI_IMAGE_TEZIIMG_PREFUNCS ??= "rootfs_tezi_run_json" |