From ac5028651745ea2b541dbc0a847ffd737fc5ef76 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 --- conf/machine/colibri-imx8x.conf | 3 --- 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 | 5 +---- conf/machine/include/colibri-imx7.inc | 6 +----- 6 files changed, 5 insertions(+), 15 deletions(-) diff --git a/conf/machine/colibri-imx8x.conf b/conf/machine/colibri-imx8x.conf index 95cbb75..b3f65c0 100644 --- a/conf/machine/colibri-imx8x.conf +++ b/conf/machine/colibri-imx8x.conf @@ -50,9 +50,6 @@ WKS_FILE_DEPENDS_append = " u-boot-distro-boot" PREFERRED_PROVIDER_virtual/kernel = "linux-toradex" PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex-rt" PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp = "linux-toradex-mainline" -# TODO: Add colibri-imx8x to linux-toradex-mainline-rt. -# So far it's not supported yet in linux-toradex-mainline-rt source, spin to -# linux-toradex-mainline temporarily. PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp_preempt-rt = "linux-toradex-mainline" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex" PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils" diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc index aad9004..8fa26ac 100644 --- a/conf/machine/include/apalis-imx6.inc +++ b/conf/machine/include/apalis-imx6.inc @@ -22,7 +22,7 @@ KERNEL_DEVICETREE_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" UBOOT_SUFFIX = "img" diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc index a682071..b39a7e5 100644 --- a/conf/machine/include/colibri-imx6.inc +++ b/conf/machine/include/colibri-imx6.inc @@ -17,7 +17,7 @@ KERNEL_IMAGETYPE_${MACHINE} = "zImage" KERNEL_DEVICETREE += "imx6dl-colibri-iris.dtb imx6dl-colibri-iris-v2.dtb" 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" UBOOT_SUFFIX = "img" diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc index 371c7c8..c6ee117 100644 --- a/conf/machine/include/colibri-imx6ull.inc +++ b/conf/machine/include/colibri-imx6ull.inc @@ -29,4 +29,4 @@ KERNEL_DEVICETREE += " \ KERNEL_DEVICETREE_use-mainline-bsp = "imx6ull-colibri-eval-v3.dtb imx6ull-colibri-wifi-eval-v3.dtb" 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" 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 \ -" diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc index 38c448a..c84c3d8 100644 --- a/conf/machine/include/colibri-imx7.inc +++ b/conf/machine/include/colibri-imx7.inc @@ -24,12 +24,8 @@ KERNEL_DEVICETREE_use-mainline-bsp += " \ imx7d-colibri-eval-v3.dtb imx7s-colibri-eval-v3.dtb \ imx7d-colibri-aster.dtb imx7s-colibri-aster.dtb \ " -KERNEL_DEVICETREE_use-mainline-bsp_preempt-rt = " \ - imx7d-colibri-emmc-eval-v3.dtb \ - imx7s-colibri-eval-v3.dtb \ -" 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" UBOOT_MAKE_TARGET_colibri-imx7 = "u-boot.imx" -- cgit v1.2.3