From 371c109571c3359742a1206ccb40e732d8f50eff Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 14 Oct 2020 18:02:28 +0200 Subject: 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 (cherry picked from commit ec02225f82cbf9054ea1bf301967ebf1b9ea98fa) --- classes/image_type_tezi.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'classes') 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 -- cgit v1.2.3