From 0151b5aebf2ff49684037867f9a92af7a1ca500d Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 26 Sep 2023 09:48:57 -0300 Subject: machines: follow upstream linux recipe changes The upstream Linux recipe in meta-toradex-bsp-common was split into a pinned (currently to 6.5.5) and a mainline recipe building current HEAD of the master branch. For a OE master branch we always use the latest development version. Related-to: ELB-5359 Signed-off-by: Max Krummenacher --- conf/machine/colibri-imx6ull-emmc.conf | 4 ++-- conf/machine/colibri-imx8x.conf | 4 ++-- conf/machine/include/apalis-imx6.inc | 4 ++-- conf/machine/include/colibri-imx6.inc | 4 ++-- conf/machine/include/colibri-imx6ull-emmc.inc | 4 ++-- conf/machine/include/colibri-imx6ull.inc | 4 ++-- conf/machine/include/colibri-imx7-emmc.inc | 4 ++-- conf/machine/include/colibri-imx7.inc | 4 ++-- conf/machine/verdin-imx8mm.conf | 4 ++-- conf/machine/verdin-imx8mp.conf | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/conf/machine/colibri-imx6ull-emmc.conf b/conf/machine/colibri-imx6ull-emmc.conf index d84cd02..a0741a5 100644 --- a/conf/machine/colibri-imx6ull-emmc.conf +++ b/conf/machine/colibri-imx6ull-emmc.conf @@ -12,8 +12,8 @@ require conf/machine/include/arm/armv7a/tune-cortexa7.inc PREFERRED_PROVIDER_virtual/kernel:use-nxp-bsp ?= "linux-toradex" 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-rt" +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" # with kernel 6.5 the device trees were moved to vendor subdirs diff --git a/conf/machine/colibri-imx8x.conf b/conf/machine/colibri-imx8x.conf index 212a5e0..52ae3d4 100644 --- a/conf/machine/colibri-imx8x.conf +++ b/conf/machine/colibri-imx8x.conf @@ -58,8 +58,8 @@ PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" PREFERRED_PROVIDER_virtual/kernel = "linux-toradex" 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-rt" +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" PREFERRED_VERSION_linux-imx-headers = "5.15" diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc index 9572688..7240d04 100644 --- a/conf/machine/include/apalis-imx6.inc +++ b/conf/machine/include/apalis-imx6.inc @@ -26,8 +26,8 @@ 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-mainline" -PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-mainline-rt" +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" IMX_DEFAULT_BOOTLOADER:apalis-imx6 = "u-boot-toradex" diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc index 3ac6513..4952cd8 100644 --- a/conf/machine/include/colibri-imx6.inc +++ b/conf/machine/include/colibri-imx6.inc @@ -24,8 +24,8 @@ 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-mainline" -PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-mainline-rt" +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" IMX_DEFAULT_BOOTLOADER:colibri-imx6 = "u-boot-toradex" diff --git a/conf/machine/include/colibri-imx6ull-emmc.inc b/conf/machine/include/colibri-imx6ull-emmc.inc index e5cdde8..bf56ae8 100644 --- a/conf/machine/include/colibri-imx6ull-emmc.inc +++ b/conf/machine/include/colibri-imx6ull-emmc.inc @@ -16,8 +16,8 @@ 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-mainline" -PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-mainline-rt" +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" IMX_DEFAULT_BOOTLOADER:colibri-imx6ull-emmc = "u-boot-toradex" diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc index d9dc6cc..46fc85c 100644 --- a/conf/machine/include/colibri-imx6ull.inc +++ b/conf/machine/include/colibri-imx6ull.inc @@ -28,8 +28,8 @@ 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-mainline" -PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-mainline-rt" +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" IMX_DEFAULT_BOOTLOADER:colibri-imx6ull = "u-boot-toradex" diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc index ae4bcac..cd37422 100644 --- a/conf/machine/include/colibri-imx7-emmc.inc +++ b/conf/machine/include/colibri-imx7-emmc.inc @@ -25,8 +25,8 @@ 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-mainline" -PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-mainline-rt" +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" IMX_DEFAULT_BOOTLOADER:colibri-imx7-emmc = "u-boot-toradex" diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc index 61e382f..7528416 100644 --- a/conf/machine/include/colibri-imx7.inc +++ b/conf/machine/include/colibri-imx7.inc @@ -25,8 +25,8 @@ 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-mainline" -PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-mainline-rt" +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" IMX_DEFAULT_BOOTLOADER:colibri-imx7 = "u-boot-toradex" diff --git a/conf/machine/verdin-imx8mm.conf b/conf/machine/verdin-imx8mm.conf index 2d144ff..810f522 100644 --- a/conf/machine/verdin-imx8mm.conf +++ b/conf/machine/verdin-imx8mm.conf @@ -75,8 +75,8 @@ MACHINE_FEATURES += "3g bluetooth alsa ext2 pci screen touchscreen usbgadget usb PREFERRED_PROVIDER_virtual/kernel = "linux-toradex" 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-rt" +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" PREFERRED_VERSION_linux-imx-headers = "5.15" diff --git a/conf/machine/verdin-imx8mp.conf b/conf/machine/verdin-imx8mp.conf index c1ad515..12a0444 100644 --- a/conf/machine/verdin-imx8mp.conf +++ b/conf/machine/verdin-imx8mp.conf @@ -77,8 +77,8 @@ MACHINE_FEATURES += "3g bluetooth alsa ext2 pci screen touchscreen usbgadget usb PREFERRED_PROVIDER_virtual/kernel = "linux-toradex" 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-rt" +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" PREFERRED_VERSION_linux-imx-headers = "5.15" -- cgit v1.2.3