From 620f5bbe0ca0743e682a69697cb8fb1d39550471 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 28 Nov 2023 15:27:17 +0100 Subject: toradex-devicetree.bbclass: drop deployment of 'common' dtbo We dropped having common device tree overlays, i.e. all dtbo are now machine specific and start with the machine name. Drop searching and deploying dtbos which do not start with a machine name. This fixes deploying verdin-am62*dtbo for non verdin-am62 machines. Related-to: ELB-5479 Signed-off-by: Max Krummenacher --- classes/toradex-devicetree.bbclass | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/classes/toradex-devicetree.bbclass b/classes/toradex-devicetree.bbclass index 1994ad7..9ce5b43 100644 --- a/classes/toradex-devicetree.bbclass +++ b/classes/toradex-devicetree.bbclass @@ -13,8 +13,8 @@ # # The devicetree overlays to be deployed # to ${DEPLOY_DIR_IMAGE}/overlays, if not -# set, all common and machine related -# overlays would be deployed. +# set, all machine related overlays would +# be deployed. # # TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "a-overlay.dtbo" # @@ -48,8 +48,7 @@ MACHINE_PREFIX:colibri-imx7-emmc = "colibri-imx7" do_collect_overlays () { if [ -z "${TEZI_EXTERNAL_KERNEL_DEVICETREE}" ] ; then machine_dts=`cd ${S} && ls ${MACHINE_PREFIX}[_-]*.dts 2>/dev/null || true` - common_dts=`cd ${S} && ls *.dts 2>/dev/null | grep -v -e 'imx[6-8]' | xargs || true` - all_dts="$machine_dts $common_dts" + all_dts="$machine_dts" else for dtbo in ${TEZI_EXTERNAL_KERNEL_DEVICETREE}; do dtbo_ext=${dtbo##*.} -- cgit v1.2.3