From 276f8b6f2c920f27bdcb776accbeab4e763ceb66 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 3 Dec 2024 17:18:15 -0300 Subject: [PATCH] Revert "honor vendor prefix in kernels >= 6.5" --- conf/machine/colibri-imx6.conf | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/conf/machine/colibri-imx6.conf b/conf/machine/colibri-imx6.conf index 60c8d7e..977cd57 100644 --- a/conf/machine/colibri-imx6.conf +++ b/conf/machine/colibri-imx6.conf @@ -11,15 +11,10 @@ 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_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_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_IMAGETYPE = "zImage" # The kernel lives in a seperate FAT partition, don't deploy it in /boot/ RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""