machines: remove duplicated kernel providerHEADmaster

Remove 'preempt-rt' override specific kernel provider since it points
to the same recipe than the default one.

Signed-off-by: Antoine Gouby <antoine.gouby@toradex.com>

16 files changed, 0 insertions, 21 deletions

diff --git a/conf/machine/apalis-imx8.conf b/conf/machine/apalis-imx8.conf
index d82b355..34ee19d 100644
--- a/conf/machine/apalis-imx8.conf
+++ b/conf/machine/apalis-imx8.conf
@@ -72,9 +72,7 @@ WKS_FILE_DEPENDS:append = " u-boot-default-script"
 PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex-imx"
-PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex-imx"
 PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-upstream"
-PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-upstream"
 PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline"
 
 IMX_DEFAULT_BOOTLOADER = "u-boot-toradex-imx"
diff --git a/conf/machine/aquila-imx95.conf b/conf/machine/aquila-imx95.conf
index 6035f8d..0805f21 100644
--- a/conf/machine/aquila-imx95.conf
+++ b/conf/machine/aquila-imx95.conf
@@ -18,7 +18,6 @@ MACHINE_FEATURES += "pci wifi bluetooth optee tpm2"
 IMX_DEFAULT_BSP = "nxp"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex-imx"
-PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex-imx"
 KERNEL_IMAGETYPE:mx95-generic-bsp = "Image.gz"
 
 KERNEL_DTB_PREFIX = "freescale/"
diff --git a/conf/machine/colibri-imx8x.conf b/conf/machine/colibri-imx8x.conf
index fd1c19e..c50157a 100644
--- a/conf/machine/colibri-imx8x.conf
+++ b/conf/machine/colibri-imx8x.conf
@@ -58,9 +58,7 @@ WKS_FILE_DEPENDS:append = " u-boot-default-script"
 PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex-imx"
-PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex-imx"
 PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-upstream"
-PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-upstream"
 PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline"
 
 IMX_DEFAULT_BOOTLOADER = "u-boot-toradex-imx"
diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc
index c17a5ce..ec39acc 100644
--- a/conf/machine/include/apalis-imx6.inc
+++ b/conf/machine/include/apalis-imx6.inc
@@ -33,7 +33,6 @@ TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = " \
 TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = ""
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
-PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-upstream"
 PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-upstream-rt"
 PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline"
diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc
index 4ba3bcb..d34e42b 100644
--- a/conf/machine/include/colibri-imx6.inc
+++ b/conf/machine/include/colibri-imx6.inc
@@ -29,7 +29,6 @@ TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = " \
 TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = ""
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
-PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-upstream"
 PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-upstream-rt"
 PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline"
diff --git a/conf/machine/include/colibri-imx6ull-emmc.inc b/conf/machine/include/colibri-imx6ull-emmc.inc
index e251b7a..cf6ad43 100644
--- a/conf/machine/include/colibri-imx6ull-emmc.inc
+++ b/conf/machine/include/colibri-imx6ull-emmc.inc
@@ -15,7 +15,6 @@ TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = " \
 TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = ""
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
-PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-upstream"
 PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-upstream-rt"
 PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline"
diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc
index 191f133..2be8289 100644
--- a/conf/machine/include/colibri-imx6ull.inc
+++ b/conf/machine/include/colibri-imx6ull.inc
@@ -31,7 +31,6 @@ KERNEL_DEVICETREE:colibri-imx6ull = " \
 "
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
-PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-upstream"
 PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-upstream-rt"
 PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline"
diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc
index da14eb3..91a6134 100644
--- a/conf/machine/include/colibri-imx7-emmc.inc
+++ b/conf/machine/include/colibri-imx7-emmc.inc
@@ -26,7 +26,6 @@ TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = " \
 TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = ""
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
-PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-upstream"
 PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-upstream-rt"
 PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline"
diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc
index 2ae30f5..0680f69 100644
--- a/conf/machine/include/colibri-imx7.inc
+++ b/conf/machine/include/colibri-imx7.inc
@@ -25,7 +25,6 @@ KERNEL_DEVICETREE:colibri-imx7 = " \
 "
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
-PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-upstream"
 PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-upstream-rt"
 PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline"
diff --git a/conf/machine/lino-imx93.conf b/conf/machine/lino-imx93.conf
index b17bdb1..f37dacf 100644
--- a/conf/machine/lino-imx93.conf
+++ b/conf/machine/lino-imx93.conf
@@ -61,7 +61,6 @@ SERIAL_CONSOLES = "115200;ttyLP2"
 MACHINE_FEATURES += "wifi bluetooth optee tpm2"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex-imx"
-PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex-imx"
 
 IMX_DEFAULT_BOOTLOADER = "u-boot-toradex-imx"
 
diff --git a/conf/machine/toradex-osm-imx93.conf b/conf/machine/toradex-osm-imx93.conf
index c5bb890..3a894de 100644
--- a/conf/machine/toradex-osm-imx93.conf
+++ b/conf/machine/toradex-osm-imx93.conf
@@ -61,7 +61,6 @@ SERIAL_CONSOLES = "115200;ttyLP0"
 MACHINE_FEATURES += "wifi bluetooth optee tpm2"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex-imx"
-PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex-imx"
 
 IMX_DEFAULT_BOOTLOADER = "u-boot-toradex-imx"
 
diff --git a/conf/machine/toradex-smarc-imx8mp.conf b/conf/machine/toradex-smarc-imx8mp.conf
index ee087c4..10a5557 100644
--- a/conf/machine/toradex-smarc-imx8mp.conf
+++ b/conf/machine/toradex-smarc-imx8mp.conf
@@ -72,9 +72,7 @@ SERIAL_CONSOLES = "115200;ttymxc1"
 MACHINE_FEATURES += "3g bluetooth alsa ext2 pci screen touchscreen tpm2 usbgadget usbhost vfat wifi"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex-imx"
-PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex-imx"
 PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-upstream"
-PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-upstream"
 PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline"
 
 IMX_DEFAULT_BOOTLOADER = "u-boot-toradex"
diff --git a/conf/machine/toradex-smarc-imx95.conf b/conf/machine/toradex-smarc-imx95.conf
index 898b12a..cafc1a2 100644
--- a/conf/machine/toradex-smarc-imx95.conf
+++ b/conf/machine/toradex-smarc-imx95.conf
@@ -21,7 +21,6 @@ MACHINE_FEATURES += "pci wifi bluetooth optee tpm2"
 IMX_DEFAULT_BSP = "nxp"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex-imx"
-PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex-imx"
 KERNEL_IMAGETYPE:mx95-generic-bsp = "Image.gz"
 
 KERNEL_DTB_PREFIX = "freescale/"
diff --git a/conf/machine/verdin-imx8mm.conf b/conf/machine/verdin-imx8mm.conf
index 8727f93..cf1dd5d 100644
--- a/conf/machine/verdin-imx8mm.conf
+++ b/conf/machine/verdin-imx8mm.conf
@@ -79,9 +79,7 @@ SERIAL_CONSOLES = "115200;ttymxc0"
 MACHINE_FEATURES += "3g bluetooth alsa ext2 pci screen touchscreen tpm2 usbgadget usbhost vfat wifi"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex-imx"
-PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex-imx"
 PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-upstream"
-PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-upstream"
 PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline"
 
 IMX_DEFAULT_BOOTLOADER = "u-boot-toradex"
diff --git a/conf/machine/verdin-imx8mp.conf b/conf/machine/verdin-imx8mp.conf
index 1cf6ef5..41ee450 100644
--- a/conf/machine/verdin-imx8mp.conf
+++ b/conf/machine/verdin-imx8mp.conf
@@ -80,9 +80,7 @@ SERIAL_CONSOLES = "115200;ttymxc2"
 MACHINE_FEATURES += "3g bluetooth alsa ext2 pci screen touchscreen tpm2 usbgadget usbhost vfat wifi"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex-imx"
-PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex-imx"
 PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-upstream"
-PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-upstream"
 PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline"
 
 IMX_DEFAULT_BOOTLOADER = "u-boot-toradex"
diff --git a/conf/machine/verdin-imx95.conf b/conf/machine/verdin-imx95.conf
index 5dd6927..29f8096 100644
--- a/conf/machine/verdin-imx95.conf
+++ b/conf/machine/verdin-imx95.conf
@@ -21,7 +21,6 @@ MACHINE_FEATURES += "pci wifi bluetooth optee tpm2"
 IMX_DEFAULT_BSP = "nxp"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex-imx"
-PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex-imx"
 KERNEL_IMAGETYPE:mx95-generic-bsp = "Image.gz"
 
 KERNEL_DTB_PREFIX = "freescale/"