diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2020-10-14 18:02:28 +0200 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-10-17 18:43:43 +0200 |
commit | 371c109571c3359742a1206ccb40e732d8f50eff (patch) | |
tree | 59863829981f27d2a38f31a4e00710dbd615e78b /classes | |
parent | d7239e79c6a0f6a364ae57fc0916d0508ace3ed7 (diff) |
image_type_tezi: i.mx 8x fix overlay deployment for b0 silicon
We have separate machines for the now deprecated i.MX 8X B0 silicon
based modules.
Due to the changed machine name the machine specific overlays did
not get deployed into a image. Fix that.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
(cherry picked from commit ec02225f82cbf9054ea1bf301967ebf1b9ea98fa)
Diffstat (limited to 'classes')
-rw-r--r-- | classes/image_type_tezi.bbclass | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/classes/image_type_tezi.bbclass b/classes/image_type_tezi.bbclass index f93cc12..cdb1c48 100644 --- a/classes/image_type_tezi.bbclass +++ b/classes/image_type_tezi.bbclass @@ -347,11 +347,14 @@ tezi_deploy_bootfs_files[dirs] =+ "${WORKDIR}/bootfs" tezi_deploy_bootfs_files[cleandirs] += "${WORKDIR}/bootfs" TAR_IMAGE_ROOTFS_task-image-bootfs = "${WORKDIR}/bootfs" +MACHINE_PREFIX = "${MACHINE}" +MACHINE_PREFIX_colibri-imx8x-v10b = "colibri-imx8x" +MACHINE_PREFIX_apalis-imx8x-v11a = "apalis-imx8x" IMAGE_CMD_bootfs () { 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}_*.dtbo 2>/dev/null || true` + 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 |