Merge pull request #313 from Freescale/revert-312-scarthgap

Revert "honor vendor prefix in kernels >= 6.5"
This commit is contained in:
Otavio Salvador 2024-12-03 17:18:29 -03:00 committed by GitHub
commit f3f2a7f632
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -11,15 +11,10 @@ include conf/machine/include/arm/armv7a/tune-cortexa9.inc
PREFERRED_PROVIDER_virtual/kernel:use-nxp-bsp ??= "linux-toradex" PREFERRED_PROVIDER_virtual/kernel:use-nxp-bsp ??= "linux-toradex"
KBUILD_DEFCONFIG:use-nxp-bsp ?= "colibri_imx6_defconfig" KBUILD_DEFCONFIG:use-nxp-bsp ?= "colibri_imx6_defconfig"
KERNEL_DTB_PREFIX = "nxp/imx/" KERNEL_DEVICETREE += "imx6dl-colibri-eval-v3.dtb imx6dl-colibri-cam-eval-v3.dtb \
KERNEL_DEVICETREE += "\ imx6dl-colibri-aster.dtb imx6dl-colibri-iris.dtb \
${KERNEL_DTB_PREFIX}imx6dl-colibri-eval-v3.dtb \ imx6dl-colibri-iris-v2.dtb"
${KERNEL_DTB_PREFIX}imx6dl-colibri-cam-eval-v3.dtb \ KERNEL_DEVICETREE:use-mainline-bsp = "imx6dl-colibri-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" KERNEL_IMAGETYPE = "zImage"
# The kernel lives in a seperate FAT partition, don't deploy it in /boot/ # The kernel lives in a seperate FAT partition, don't deploy it in /boot/
RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""