From 7f03275aca7a92a5e2d5334b94b8fcf4af3309fe Mon Sep 17 00:00:00 2001 From: Simon Vogl Date: Fri, 6 Dec 2024 17:47:17 +0100 Subject: [PATCH] colibri-imx6: honor vendor prefix in kernels >= 6.5 Signed-off-by: Simon Vogl (cherry picked from commit 26ec279fd07648ddad2c81acfc20a15bca0520d7) --- conf/machine/colibri-imx6.conf | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/conf/machine/colibri-imx6.conf b/conf/machine/colibri-imx6.conf index 977cd57a..60c8d7e6 100644 --- a/conf/machine/colibri-imx6.conf +++ b/conf/machine/colibri-imx6.conf @@ -11,10 +11,15 @@ include conf/machine/include/arm/armv7a/tune-cortexa9.inc PREFERRED_PROVIDER_virtual/kernel:use-nxp-bsp ??= "linux-toradex" KBUILD_DEFCONFIG:use-nxp-bsp ?= "colibri_imx6_defconfig" -KERNEL_DEVICETREE += "imx6dl-colibri-eval-v3.dtb imx6dl-colibri-cam-eval-v3.dtb \ - imx6dl-colibri-aster.dtb imx6dl-colibri-iris.dtb \ - imx6dl-colibri-iris-v2.dtb" -KERNEL_DEVICETREE:use-mainline-bsp = "imx6dl-colibri-eval-v3.dtb" +KERNEL_DTB_PREFIX = "nxp/imx/" +KERNEL_DEVICETREE += "\ + ${KERNEL_DTB_PREFIX}imx6dl-colibri-eval-v3.dtb \ + ${KERNEL_DTB_PREFIX}imx6dl-colibri-cam-eval-v3.dtb \ + ${KERNEL_DTB_PREFIX}imx6dl-colibri-aster.dtb \ + ${KERNEL_DTB_PREFIX}imx6dl-colibri-iris.dtb \ + ${KERNEL_DTB_PREFIX}imx6dl-colibri-iris-v2.dtb \ + " +KERNEL_DEVICETREE:use-mainline-bsp = "${KERNEL_DTB_PREFIX}imx6dl-colibri-eval-v3.dtb" KERNEL_IMAGETYPE = "zImage" # The kernel lives in a seperate FAT partition, don't deploy it in /boot/ RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""