From 063e627f3bb2678b648a83971f14f26fab7a5ef8 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 18 Aug 2021 19:11:25 +0200 Subject: colibri-imx6ull-emmc: deploy upstream device tree Related-to: ELB-4070 Signed-off-by: Max Krummenacher (cherry picked from commit f993979f5cb1bd8452e145aaa4ccd093b53b2a1f) --- conf/machine/colibri-imx6ull-emmc.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/conf/machine/colibri-imx6ull-emmc.conf b/conf/machine/colibri-imx6ull-emmc.conf index 796df7c..7833b91 100644 --- a/conf/machine/colibri-imx6ull-emmc.conf +++ b/conf/machine/colibri-imx6ull-emmc.conf @@ -10,7 +10,15 @@ require conf/machine/include/imx-base.inc require conf/machine/include/arm/armv7a/tune-cortexa7.inc PREFERRED_PROVIDER_virtual/kernel_use-nxp-bsp ?= "linux-toradex" +PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex" +PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp = "linux-toradex-mainline" +PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp_preempt-rt = "linux-toradex-mainline" +PREFERRED_PROVIDER_virtual/dtb_use-mainline-bsp = "device-tree-overlays-mainline" + +KERNEL_DEVICETREE:use-mainline-bsp = " \ + imx6ull-colibri-emmc-eval-v3.dtb \ +" KERNEL_DEVICETREE:use-nxp-bsp = " \ imx6ull-colibri-emmc-aster.dtb \ imx6ull-colibri-emmc-eval-v3.dtb \ -- cgit v1.2.3