linux-toradex-mainline(-rt): rename to linux-toradex-upstream and only build latest mainline

For OE master we want to build only latest mainline.
For a next BSP we will add a recipe which will build the to be used
stable tree.

Related-to: ELB-5359
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>

15 files changed, 18 insertions, 12 deletions

diff --git a/recipes-kernel/linux/linux-toradex-mainline-rt-git/preempt-rt-less-latency.cfg b/recipes-kernel/linux/linux-toradex-upstream-rt/preempt-rt-less-latency.cfg
index a9c88bd..a9c88bd 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-rt-git/preempt-rt-less-latency.cfg
+++ b/recipes-kernel/linux/linux-toradex-upstream-rt/preempt-rt-less-latency.cfg
diff --git a/recipes-kernel/linux/linux-toradex-mainline-rt-git/preempt-rt-less-latency.scc b/recipes-kernel/linux/linux-toradex-upstream-rt/preempt-rt-less-latency.scc
index edd1519..edd1519 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-rt-git/preempt-rt-less-latency.scc
+++ b/recipes-kernel/linux/linux-toradex-upstream-rt/preempt-rt-less-latency.scc
diff --git a/recipes-kernel/linux/linux-toradex-mainline-rt-git/preempt-rt.cfg b/recipes-kernel/linux/linux-toradex-upstream-rt/preempt-rt.cfg
index 17b06b1..17b06b1 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-rt-git/preempt-rt.cfg
+++ b/recipes-kernel/linux/linux-toradex-upstream-rt/preempt-rt.cfg
diff --git a/recipes-kernel/linux/linux-toradex-mainline-rt-git/preempt-rt.scc b/recipes-kernel/linux/linux-toradex-upstream-rt/preempt-rt.scc
index 82d27dc..82d27dc 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-rt-git/preempt-rt.scc
+++ b/recipes-kernel/linux/linux-toradex-upstream-rt/preempt-rt.scc
diff --git a/recipes-kernel/linux/linux-toradex-mainline-rt_git.bb b/recipes-kernel/linux/linux-toradex-upstream-rt_6.6.bb
index df41c28..bda5bcf 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-rt_git.bb
+++ b/recipes-kernel/linux/linux-toradex-upstream-rt_6.6.bb
@@ -1,6 +1,6 @@
-require linux-toradex-mainline-common.inc
+require linux-toradex-upstream.inc
 
-FILESEXTRAPATHS:prepend := "${THISDIR}/linux-toradex-mainline-rt-git:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux-toradex-upstream-rt:"
 
 SUMMARY = "Toradex mainline real-time Linux kernel"
 # To build the RT kernel we use the RT kernel git repo rather than applying
@@ -18,7 +18,8 @@ SRC_URI:append = " \
     file://preempt-rt-less-latency.scc \
 "
 
-LINUX_VERSION ?= "6.5-rc"
-KBRANCH = "linux-6.5.y-rt"
-SRCREV_machine = "16ae0de52ef9f7e5c2cd7e8443f5195c176353ea"
-SRCREV_machine:use-head-next = "${AUTOREV}"
+# set PV manually, that way PREFERRED_VERSION can be set to a constant value
+PV = "6.6"
+LINUX_VERSION = "6.6-rt"
+KBRANCH = "linux-6.6.y-rt"
+SRCREV_machine = "${AUTOREV}"
diff --git a/recipes-kernel/linux/linux-toradex-mainline-common.inc b/recipes-kernel/linux/linux-toradex-upstream.inc
index 572c733..cc50c70 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-common.inc
+++ b/recipes-kernel/linux/linux-toradex-upstream.inc
@@ -3,7 +3,7 @@ SECTION = "kernel"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM ?= "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
-FILESEXTRAPATHS:prepend := "${THISDIR}/linux-toradex-mainline-git:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux-toradex-upstream:"
 
 DEPENDS += "coreutils-native"
 
diff --git a/recipes-kernel/linux/linux-toradex-mainline-git/0001-thermal-imx-Update-critical-temp-threshold.patch b/recipes-kernel/linux/linux-toradex-upstream/0001-thermal-imx-Update-critical-temp-threshold.patch
index c09abb9..c09abb9 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-git/0001-thermal-imx-Update-critical-temp-threshold.patch
+++ b/recipes-kernel/linux/linux-toradex-upstream/0001-thermal-imx-Update-critical-temp-threshold.patch
diff --git a/recipes-kernel/linux/linux-toradex-mainline-git/0002-Revert-drm-panel-simple-drop-use-of-data-mapping-pro.patch b/recipes-kernel/linux/linux-toradex-upstream/0002-Revert-drm-panel-simple-drop-use-of-data-mapping-pro.patch
index 5067258..5067258 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-git/0002-Revert-drm-panel-simple-drop-use-of-data-mapping-pro.patch
+++ b/recipes-kernel/linux/linux-toradex-upstream/0002-Revert-drm-panel-simple-drop-use-of-data-mapping-pro.patch
diff --git a/recipes-kernel/linux/linux-toradex-mainline-git/0003-drivers-chipidea-disable-runtime-pm-for-imx6ul.patch b/recipes-kernel/linux/linux-toradex-upstream/0003-drivers-chipidea-disable-runtime-pm-for-imx6ul.patch
index 4f5e2c0..4f5e2c0 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-git/0003-drivers-chipidea-disable-runtime-pm-for-imx6ul.patch
+++ b/recipes-kernel/linux/linux-toradex-upstream/0003-drivers-chipidea-disable-runtime-pm-for-imx6ul.patch
diff --git a/recipes-kernel/linux/linux-toradex-mainline-git/0004-media-i2c-ov5640-Implement-get_mbus_config.patch b/recipes-kernel/linux/linux-toradex-upstream/0004-media-i2c-ov5640-Implement-get_mbus_config.patch
index 7205135..7205135 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-git/0004-media-i2c-ov5640-Implement-get_mbus_config.patch
+++ b/recipes-kernel/linux/linux-toradex-upstream/0004-media-i2c-ov5640-Implement-get_mbus_config.patch
diff --git a/recipes-kernel/linux/linux-toradex-mainline-git/aarch64/defconfig b/recipes-kernel/linux/linux-toradex-upstream/aarch64/defconfig
index 03a2624..03a2624 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-git/aarch64/defconfig
+++ b/recipes-kernel/linux/linux-toradex-upstream/aarch64/defconfig
diff --git a/recipes-kernel/linux/linux-toradex-mainline-git/aarch64/toradex_aarch64.config b/recipes-kernel/linux/linux-toradex-upstream/aarch64/toradex_aarch64.config
index d7c699e..d7c699e 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-git/aarch64/toradex_aarch64.config
+++ b/recipes-kernel/linux/linux-toradex-upstream/aarch64/toradex_aarch64.config
diff --git a/recipes-kernel/linux/linux-toradex-mainline-git/defconfig b/recipes-kernel/linux/linux-toradex-upstream/defconfig
index a6e08d2..a6e08d2 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-git/defconfig
+++ b/recipes-kernel/linux/linux-toradex-upstream/defconfig
diff --git a/recipes-kernel/linux/linux-toradex-mainline-git/toradex_imx_v6_v7.config b/recipes-kernel/linux/linux-toradex-upstream/toradex_imx_v6_v7.config
index a83d77d..a83d77d 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-git/toradex_imx_v6_v7.config
+++ b/recipes-kernel/linux/linux-toradex-upstream/toradex_imx_v6_v7.config
diff --git a/recipes-kernel/linux/linux-toradex-mainline_git.bb b/recipes-kernel/linux/linux-toradex-upstream_mainline.bb
index b702e5e..6a962ed 100644
--- a/recipes-kernel/linux/linux-toradex-mainline_git.bb
+++ b/recipes-kernel/linux/linux-toradex-upstream_mainline.bb
@@ -1,4 +1,9 @@
-require linux-toradex-mainline-common.inc
+# This builds latest head of linux master
+# Do not use this recipe for production, it is not reproducible
+# and you don't know what git hash is built from just looking
+# at the metadata
+
+require linux-toradex-upstream.inc
 
 LINUX_REPO = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"
 TDX_PATCHES = " \
@@ -7,8 +12,8 @@ TDX_PATCHES = " \
     file://0003-drivers-chipidea-disable-runtime-pm-for-imx6ul.patch \
     file://0004-media-i2c-ov5640-Implement-get_mbus_config.patch \
 "
-
-LINUX_VERSION ?= "6.6-rc"
+# set PV manually, that way PREFERRED_VERSION can be set to a constant value
+PV = "mainline"
+LINUX_VERSION = "6.6-rc"
 KBRANCH = "master"
-SRCREV_machine = "2dde18cd1d8fac735875f2e4987f11817cc0bc2c"
-SRCREV_machine:use-head-next = "${AUTOREV}"
+SRCREV_machine = "${AUTOREV}"