summaryrefslogtreecommitdiff
path: root/conf/machine/include/colibri-imx7.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-06-09 18:53:14 +0200
commit112a42351c3b16f94e8736d938a153756876dbc4 (patch)
treee481bb9a9b5cb9f38e2977205aa37e16620be3cd /conf/machine/include/colibri-imx7.inc
parent76875b375db0e816c2b5bb8b0945e0fe47e26a91 (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> (cherry picked from commit ac5028651745ea2b541dbc0a847ffd737fc5ef76)
Diffstat (limited to 'conf/machine/include/colibri-imx7.inc')
-rw-r--r--conf/machine/include/colibri-imx7.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc
index 9da911e..33eecc0 100644
--- a/conf/machine/include/colibri-imx7.inc
+++ b/conf/machine/include/colibri-imx7.inc
@@ -26,7 +26,7 @@ KERNEL_DEVICETREE_append_use-mainline-bsp = " \
"
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"
PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"