summaryrefslogtreecommitdiff
path: root/conf/machine/include/colibri-imx6ull.inc
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2023-07-04 17:23:32 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2023-07-07 11:33:28 +0200
commitce9a5efee59836d31403a727ca70d6a081663031 (patch)
treed27a5fd8556f2a13ad6ca252d585e24fe4e4bd00 /conf/machine/include/colibri-imx6ull.inc
parent1ce450548dff262d57132e0f1cd6f295116206ae (diff)
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>
Diffstat (limited to 'conf/machine/include/colibri-imx6ull.inc')
-rw-r--r--conf/machine/include/colibri-imx6ull.inc20
1 files changed, 13 insertions, 7 deletions
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"