summaryrefslogtreecommitdiff
path: root/conf/machine/include/colibri-imx7-emmc.inc
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2020-05-04 17:27:41 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2020-05-07 11:29:37 +0200
commitac5028651745ea2b541dbc0a847ffd737fc5ef76 (patch)
treea569fcaab082c60c06d5038f776c9d8b3788a4b5 /conf/machine/include/colibri-imx7-emmc.inc
parent418f948282e5fec815f9b1b46337a1d8de431f1c (diff)
machines: rt mainline kernel: use the common linux-toradex-mainline
linux-toradex-mainline with prempt-rt in overrides now builds a kernel with the RT patch applied. Change PREFERRED_PROVIDER to use linux-toradex-mainline when use-mainline-bsp and prempt-rt are in overrides. Related-to: ELB-2631 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'conf/machine/include/colibri-imx7-emmc.inc')
-rw-r--r--conf/machine/include/colibri-imx7-emmc.inc5
1 files changed, 1 insertions, 4 deletions
diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc
index 817f9f3..daa7c53 100644
--- a/conf/machine/include/colibri-imx7-emmc.inc
+++ b/conf/machine/include/colibri-imx7-emmc.inc
@@ -17,11 +17,8 @@ MACHINE_FIRMWARE_remove = "firmware-imx-epdc"
PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex-rt"
PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp = "linux-toradex-mainline"
-PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp_preempt-rt = "linux-toradex-mainline-rt"
+PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp_preempt-rt = "linux-toradex-mainline"
KERNEL_DEVICETREE_use-mainline-bsp = " \
imx7d-colibri-emmc-aster.dtb imx7d-colibri-emmc-eval-v3.dtb \
"
-KERNEL_DEVICETREE_use-mainline-bsp_preempt-rt = " \
- imx7d-colibri-emmc-eval-v3.dtb \
-"