From 0ea84be0fea3f2456dd0f3bb572ddf071ab1f150 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 7 Aug 2023 09:29:19 +0200 Subject: machines: arch arm: rt: follow change to vendor subdir for dtbs The RT kernel is now available in a 6.5-rc tree. Follow commit ce9a5ef ("machines: arch arm: follow change to vendor subdir for dtbs") accordingly. Related-to: ELB-5263 Signed-off-by: Max Krummenacher --- conf/machine/colibri-imx6ull-emmc.conf | 2 +- conf/machine/include/apalis-imx6.inc | 2 +- conf/machine/include/colibri-imx6.inc | 2 +- conf/machine/include/colibri-imx6ull.inc | 2 +- conf/machine/include/colibri-imx7-emmc.inc | 2 +- conf/machine/include/colibri-imx7.inc | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/machine/colibri-imx6ull-emmc.conf b/conf/machine/colibri-imx6ull-emmc.conf index 8f36953..d84cd02 100644 --- a/conf/machine/colibri-imx6ull-emmc.conf +++ b/conf/machine/colibri-imx6ull-emmc.conf @@ -18,7 +18,7 @@ PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline # 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:preempt-rt = "nxp/imx/" KERNEL_DTB_PREFIX:use-nxp-bsp = "" KERNEL_DEVICETREE = " \ ${KERNEL_DTB_PREFIX}imx6ull-colibri-emmc-aster.dtb \ diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc index 4d1dfaf..3e1b492 100644 --- a/conf/machine/include/apalis-imx6.inc +++ b/conf/machine/include/apalis-imx6.inc @@ -9,7 +9,7 @@ MACHINE_NAME = "Apalis-iMX6" # 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:preempt-rt = "nxp/imx/" KERNEL_DTB_PREFIX:use-nxp-bsp = "" KERNEL_DEVICETREE:apalis-imx6 = " \ ${KERNEL_DTB_PREFIX}imx6q-apalis-eval.dtb \ diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc index 25625e8..b99afdf 100644 --- a/conf/machine/include/colibri-imx6.inc +++ b/conf/machine/include/colibri-imx6.inc @@ -9,7 +9,7 @@ MACHINE_NAME = "Colibri-iMX6" # 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:preempt-rt = "nxp/imx/" KERNEL_DTB_PREFIX:use-nxp-bsp = "" KERNEL_DEVICETREE:colibri-imx6 = " \ ${KERNEL_DTB_PREFIX}imx6dl-colibri-aster.dtb \ diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc index 2022f5c..4e62719 100644 --- a/conf/machine/include/colibri-imx6ull.inc +++ b/conf/machine/include/colibri-imx6ull.inc @@ -13,7 +13,7 @@ MACHINE_NAME = "Colibri-iMX6ULL" # 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:preempt-rt = "nxp/imx/" KERNEL_DTB_PREFIX:use-nxp-bsp = "" KERNEL_DEVICETREE:colibri-imx6ull = " \ ${KERNEL_DTB_PREFIX}imx6ull-colibri-aster.dtb \ diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc index 98397f8..33cf982 100644 --- a/conf/machine/include/colibri-imx7-emmc.inc +++ b/conf/machine/include/colibri-imx7-emmc.inc @@ -9,7 +9,7 @@ MACHINE_NAME = "Colibri-iMX7-eMMC" # 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:preempt-rt = "nxp/imx/" KERNEL_DTB_PREFIX:use-nxp-bsp = "" KERNEL_DEVICETREE:colibri-imx7-emmc = " \ ${KERNEL_DTB_PREFIX}imx7d-colibri-emmc-aster.dtb \ diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc index eb84455..4d46027 100644 --- a/conf/machine/include/colibri-imx7.inc +++ b/conf/machine/include/colibri-imx7.inc @@ -10,7 +10,7 @@ MACHINE_NAME = "Colibri-iMX7" # 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:preempt-rt = "nxp/imx/" KERNEL_DTB_PREFIX:use-nxp-bsp = "" KERNEL_DEVICETREE:colibri-imx7 = " \ ${KERNEL_DTB_PREFIX}imx7d-colibri-aster.dtb \ -- cgit v1.2.3