machines: arch arm: follow change to vendor subdir for dtbs

With moving to kernel 6.5 the kernel commit 724ba67515320 ("ARM: dts:
Move .dts files to vendor sub-directories") introduced a regression
with our 32 bit machines.
We have to add the relative path to the dts/dtb files in our list
of device trees to be built per machine if the distro/kernel flavour
is building a 6.5 and later kernel.

Reassign the full list in the <MACHINE.inc> file to KERNEL_DEVICETREE,
so that we can conditionally add the relative path for a 6.5 kernel.

Related-to: ELB-5263
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>

6 files changed, 57 insertions, 33 deletions

diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc
index 6b599fc..4d1dfaf 100644
--- a/conf/machine/include/apalis-imx6.inc
+++ b/conf/machine/include/apalis-imx6.inc
@@ -7,6 +7,16 @@ TORADEX_PRODUCT_IDS = "0027 0028 0029 0035"
 
 MACHINE_NAME = "Apalis-iMX6"
 
+# with kernel 6.5 the device trees were moved to vendor subdirs
+KERNEL_DTB_PREFIX = "nxp/imx/"
+KERNEL_DTB_PREFIX:preempt-rt = ""
+KERNEL_DTB_PREFIX:use-nxp-bsp = ""
+KERNEL_DEVICETREE:apalis-imx6 = " \
+    ${KERNEL_DTB_PREFIX}imx6q-apalis-eval.dtb \
+    ${KERNEL_DTB_PREFIX}imx6q-apalis-ixora.dtb \
+    ${KERNEL_DTB_PREFIX}imx6q-apalis-ixora-v1.1.dtb \
+    ${KERNEL_DTB_PREFIX}imx6q-apalis-ixora-v1.2.dtb \
+"
 TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = " \
     apalis-imx6_hdmi_overlay.dtbo \
     apalis-imx6_spi1_spidev_overlay.dtbo \
@@ -14,10 +24,6 @@ TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = " \
 "
 TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = ""
 
-KERNEL_DEVICETREE:append = " \
-    imx6q-apalis-ixora-v1.2.dtb \
-"
-
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-mainline"
diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc
index c0364a7..25625e8 100644
--- a/conf/machine/include/colibri-imx6.inc
+++ b/conf/machine/include/colibri-imx6.inc
@@ -7,17 +7,21 @@ TORADEX_PRODUCT_IDS = "0014 0015 0016 0017"
 
 MACHINE_NAME = "Colibri-iMX6"
 
+# with kernel 6.5 the device trees were moved to vendor subdirs
+KERNEL_DTB_PREFIX = "nxp/imx/"
+KERNEL_DTB_PREFIX:preempt-rt = ""
+KERNEL_DTB_PREFIX:use-nxp-bsp = ""
+KERNEL_DEVICETREE:colibri-imx6 = " \
+    ${KERNEL_DTB_PREFIX}imx6dl-colibri-aster.dtb \
+    ${KERNEL_DTB_PREFIX}imx6dl-colibri-eval-v3.dtb \
+    ${KERNEL_DTB_PREFIX}imx6dl-colibri-iris.dtb \
+    ${KERNEL_DTB_PREFIX}imx6dl-colibri-iris-v2.dtb \
+"
 TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = " \
     colibri-imx6_vga-640x480_overlay.dtbo \
 "
 TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = ""
 
-KERNEL_DEVICETREE:append = " \
-    imx6dl-colibri-aster.dtb \
-    imx6dl-colibri-iris.dtb \
-    imx6dl-colibri-iris-v2.dtb \
-"
-
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-mainline"
diff --git a/conf/machine/include/colibri-imx6ull-emmc.inc b/conf/machine/include/colibri-imx6ull-emmc.inc
index 3910bf4..9a4bd0d 100644
--- a/conf/machine/include/colibri-imx6ull-emmc.inc
+++ b/conf/machine/include/colibri-imx6ull-emmc.inc
@@ -14,12 +14,6 @@ TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = " \
 "
 TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = ""
 
-KERNEL_DEVICETREE:append = " \
-    imx6ull-colibri-emmc-aster.dtb \
-    imx6ull-colibri-emmc-iris.dtb \
-    imx6ull-colibri-emmc-iris-v2.dtb \
-"
-
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-mainline"
diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc
index 483121c..2022f5c 100644
--- a/conf/machine/include/colibri-imx6ull.inc
+++ b/conf/machine/include/colibri-imx6ull.inc
@@ -11,13 +11,19 @@ WIC_CREATE_EXTRA_ARGS:append = " --no-fstab-update"
 
 MACHINE_NAME = "Colibri-iMX6ULL"
 
-KERNEL_DEVICETREE:append = " \
-    imx6ull-colibri-aster.dtb \
-    imx6ull-colibri-iris.dtb \
-    imx6ull-colibri-iris-v2.dtb \
-    imx6ull-colibri-wifi-aster.dtb \
-    imx6ull-colibri-wifi-iris.dtb \
-    imx6ull-colibri-wifi-iris-v2.dtb \
+# with kernel 6.5 the device trees were moved to vendor subdirs
+KERNEL_DTB_PREFIX = "nxp/imx/"
+KERNEL_DTB_PREFIX:preempt-rt = ""
+KERNEL_DTB_PREFIX:use-nxp-bsp = ""
+KERNEL_DEVICETREE:colibri-imx6ull = " \
+    ${KERNEL_DTB_PREFIX}imx6ull-colibri-aster.dtb \
+    ${KERNEL_DTB_PREFIX}imx6ull-colibri-eval-v3.dtb \
+    ${KERNEL_DTB_PREFIX}imx6ull-colibri-iris.dtb \
+    ${KERNEL_DTB_PREFIX}imx6ull-colibri-iris-v2.dtb \
+    ${KERNEL_DTB_PREFIX}imx6ull-colibri-wifi-aster.dtb \
+    ${KERNEL_DTB_PREFIX}imx6ull-colibri-wifi-eval-v3.dtb \
+    ${KERNEL_DTB_PREFIX}imx6ull-colibri-wifi-iris.dtb \
+    ${KERNEL_DTB_PREFIX}imx6ull-colibri-wifi-iris-v2.dtb \
 "
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc
index 7c525eb..98397f8 100644
--- a/conf/machine/include/colibri-imx7-emmc.inc
+++ b/conf/machine/include/colibri-imx7-emmc.inc
@@ -7,16 +7,22 @@ TORADEX_FLASH_TYPE = "emmc"
 
 MACHINE_NAME = "Colibri-iMX7-eMMC"
 
+# with kernel 6.5 the device trees were moved to vendor subdirs
+KERNEL_DTB_PREFIX = "nxp/imx/"
+KERNEL_DTB_PREFIX:preempt-rt = ""
+KERNEL_DTB_PREFIX:use-nxp-bsp = ""
+KERNEL_DEVICETREE:colibri-imx7-emmc = " \
+    ${KERNEL_DTB_PREFIX}imx7d-colibri-emmc-aster.dtb \
+    ${KERNEL_DTB_PREFIX}imx7d-colibri-emmc-eval-v3.dtb \
+    ${KERNEL_DTB_PREFIX}imx7d-colibri-emmc-iris.dtb \
+    ${KERNEL_DTB_PREFIX}imx7d-colibri-emmc-iris-v2.dtb \
+"
+
 TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = " \
     colibri-imx7_vga-640x480_overlay.dtbo \
 "
 TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = ""
 
-KERNEL_DEVICETREE:append = " \
-    imx7d-colibri-emmc-iris.dtb \
-    imx7d-colibri-emmc-iris-v2.dtb \
-"
-
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-mainline"
diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc
index fc6a4fd..eb84455 100644
--- a/conf/machine/include/colibri-imx7.inc
+++ b/conf/machine/include/colibri-imx7.inc
@@ -8,11 +8,19 @@ TORADEX_FLASH_TYPE = "rawnand"
 
 MACHINE_NAME = "Colibri-iMX7"
 
-KERNEL_DEVICETREE:append = " \
-    imx7d-colibri-iris.dtb \
-    imx7d-colibri-iris-v2.dtb \
-    imx7s-colibri-iris.dtb \
-    imx7s-colibri-iris-v2.dtb \
+# with kernel 6.5 the device trees were moved to vendor subdirs
+KERNEL_DTB_PREFIX = "nxp/imx/"
+KERNEL_DTB_PREFIX:preempt-rt = ""
+KERNEL_DTB_PREFIX:use-nxp-bsp = ""
+KERNEL_DEVICETREE:colibri-imx7 = " \
+    ${KERNEL_DTB_PREFIX}imx7d-colibri-aster.dtb \
+    ${KERNEL_DTB_PREFIX}imx7d-colibri-eval-v3.dtb \
+    ${KERNEL_DTB_PREFIX}imx7d-colibri-iris.dtb \
+    ${KERNEL_DTB_PREFIX}imx7d-colibri-iris-v2.dtb \
+    ${KERNEL_DTB_PREFIX}imx7s-colibri-aster.dtb \
+    ${KERNEL_DTB_PREFIX}imx7s-colibri-eval-v3.dtb \
+    ${KERNEL_DTB_PREFIX}imx7s-colibri-iris.dtb \
+    ${KERNEL_DTB_PREFIX}imx7s-colibri-iris-v2.dtb \
 "
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"