From 112a42351c3b16f94e8736d938a153756876dbc4 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 4 May 2020 17:27:41 +0200 Subject: 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 (cherry picked from commit ac5028651745ea2b541dbc0a847ffd737fc5ef76) --- conf/machine/include/colibri-imx7.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf/machine/include/colibri-imx7.inc') 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" -- cgit v1.2.3