From af0894ce5e365e88f51e52306c64b9614d69276a Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 18 Aug 2020 16:40:47 +0200 Subject: linux-toradex-rt: update to downstream 5.4-2.1.x This drops the linux-toradex-rt recipe in favour of combining its functionality into the linux-toradex_5.4-2.1.x.bb recipe. The override preempt-rt applies the RT patch and changes the kernel config to use PREEMPT_RT. Related-to: ELB-2758 Signed-off-by: Max Krummenacher --- conf/machine/apalis-imx8.conf | 2 +- conf/machine/apalis-imx8x.conf | 2 +- conf/machine/colibri-imx8x.conf | 2 +- 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 | 2 +- conf/machine/include/colibri-imx7.inc | 2 +- conf/machine/verdin-imx8mm.conf | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'conf') diff --git a/conf/machine/apalis-imx8.conf b/conf/machine/apalis-imx8.conf index e8c7c48..924c224 100644 --- a/conf/machine/apalis-imx8.conf +++ b/conf/machine/apalis-imx8.conf @@ -50,7 +50,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" -PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex-rt" +PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex" # Currently we use the nxp 2020.04 downstream for mx8 as some features are # not yet available in 2020.07. diff --git a/conf/machine/apalis-imx8x.conf b/conf/machine/apalis-imx8x.conf index bf14192..6128609 100644 --- a/conf/machine/apalis-imx8x.conf +++ b/conf/machine/apalis-imx8x.conf @@ -45,7 +45,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" -PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex-rt" +PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex" # Currently we use the nxp 2020.04 downstream for mx8 as some features are # not yet available in 2020.07. diff --git a/conf/machine/colibri-imx8x.conf b/conf/machine/colibri-imx8x.conf index d171c60..7298232 100644 --- a/conf/machine/colibri-imx8x.conf +++ b/conf/machine/colibri-imx8x.conf @@ -48,7 +48,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" -PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex-rt" +PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex" PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp = "linux-toradex-mainline" PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp_preempt-rt = "linux-toradex-mainline" PREFERRED_PROVIDER_virtual/dtb_use-mainline-bsp = "device-tree-overlays-mainline" diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc index fad8f3f..ad29d4f 100644 --- a/conf/machine/include/apalis-imx6.inc +++ b/conf/machine/include/apalis-imx6.inc @@ -17,7 +17,7 @@ KERNEL_DEVICETREE_use-mainline-bsp += " \ " PREFERRED_PROVIDER_virtual/kernel = "linux-toradex" -PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex-rt" +PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex" PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp = "linux-toradex-mainline" PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp_preempt-rt = "linux-toradex-mainline" 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 753f78c..d58a5ef 100644 --- a/conf/machine/include/colibri-imx6.inc +++ b/conf/machine/include/colibri-imx6.inc @@ -12,7 +12,7 @@ WKS_FILE_DEPENDS_append = " u-boot-distro-boot" KERNEL_DEVICETREE += "imx6dl-colibri-iris.dtb imx6dl-colibri-iris-v2.dtb" PREFERRED_PROVIDER_virtual/kernel = "linux-toradex" -PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex-rt" +PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex" PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp = "linux-toradex-mainline" PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp_preempt-rt = "linux-toradex-mainline" 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 f401305..7cf834a 100644 --- a/conf/machine/include/colibri-imx6ull.inc +++ b/conf/machine/include/colibri-imx6ull.inc @@ -29,7 +29,7 @@ KERNEL_DEVICETREE_append_use_nxp_bsp = " \ imx6ull-colibri-iris-v2.dtb imx6ull-colibri-wifi-iris-v2.dtb \ " PREFERRED_PROVIDER_virtual/kernel = "linux-toradex" -PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex-rt" +PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex" PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp = "linux-toradex-mainline" PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp_preempt-rt = "linux-toradex-mainline" 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 f366b16..d0beb9c 100644 --- a/conf/machine/include/colibri-imx7-emmc.inc +++ b/conf/machine/include/colibri-imx7-emmc.inc @@ -15,7 +15,7 @@ WKS_FILE_DEPENDS_append = " u-boot-distro-boot" MACHINE_FIRMWARE_remove = "firmware-imx-epdc" PREFERRED_PROVIDER_virtual/kernel = "linux-toradex" -PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex-rt" +PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex" PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp = "linux-toradex-mainline" PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp_preempt-rt = "linux-toradex-mainline" 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 961f3ac..5aedadf 100644 --- a/conf/machine/include/colibri-imx7.inc +++ b/conf/machine/include/colibri-imx7.inc @@ -24,7 +24,7 @@ KERNEL_DEVICETREE_append_use-mainline-bsp = " \ imx7s-colibri-aster.dtb \ " PREFERRED_PROVIDER_virtual/kernel = "linux-toradex" -PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex-rt" +PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex" PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp = "linux-toradex-mainline" PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp_preempt-rt = "linux-toradex-mainline" PREFERRED_PROVIDER_virtual/dtb_use-mainline-bsp = "device-tree-overlays-mainline" diff --git a/conf/machine/verdin-imx8mm.conf b/conf/machine/verdin-imx8mm.conf index 9404627..be02577 100644 --- a/conf/machine/verdin-imx8mm.conf +++ b/conf/machine/verdin-imx8mm.conf @@ -62,7 +62,7 @@ MACHINE_FEATURES += "3g bluetooth alsa ext2 pci screen touchscreen usbgadget usb MACHINE_FIRMWARE_append = " linux-firmware-ath10k linux-firmware-imx-sdma-imx7d" PREFERRED_PROVIDER_virtual/kernel = "linux-toradex" -PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex-rt" +PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex" # Currently we use the nxp 2020.04 downstream for mx8 as some features are # not yet available in 2020.07. -- cgit v1.2.3