summaryrefslogtreecommitdiff
path: root/conf/machine/colibri-imx6ull-emmc.conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine/colibri-imx6ull-emmc.conf')
-rw-r--r--conf/machine/colibri-imx6ull-emmc.conf17
1 files changed, 9 insertions, 8 deletions
diff --git a/conf/machine/colibri-imx6ull-emmc.conf b/conf/machine/colibri-imx6ull-emmc.conf
index 12b1ddf..8f36953 100644
--- a/conf/machine/colibri-imx6ull-emmc.conf
+++ b/conf/machine/colibri-imx6ull-emmc.conf
@@ -16,14 +16,15 @@ PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-mainline"
PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-mainline-rt"
PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline"
-KERNEL_DEVICETREE:use-mainline-bsp = " \
- imx6ull-colibri-emmc-eval-v3.dtb \
-"
-KERNEL_DEVICETREE:use-nxp-bsp = " \
- imx6ull-colibri-emmc-aster.dtb \
- imx6ull-colibri-emmc-eval-v3.dtb \
- imx6ull-colibri-emmc-iris.dtb \
- imx6ull-colibri-emmc-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 = " \
+ ${KERNEL_DTB_PREFIX}imx6ull-colibri-emmc-aster.dtb \
+ ${KERNEL_DTB_PREFIX}imx6ull-colibri-emmc-eval-v3.dtb \
+ ${KERNEL_DTB_PREFIX}imx6ull-colibri-emmc-iris.dtb \
+ ${KERNEL_DTB_PREFIX}imx6ull-colibri-emmc-iris-v2.dtb \
"
KERNEL_IMAGETYPE = "zImage"