summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2024-03-12 10:26:13 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2024-03-12 10:30:17 +0100
commitb0caf890c275bddf2e0d976c6a22267cf57e56c9 (patch)
treeef9db8acca8f95dd3df69f946bc68ef7ca556a44
parentfbae91a4f6e19022aaf107d6a71297458b11752a (diff)
linux-toradex-upstream-rt: move to rt-stable
Change the the stable RT kernel branch and include the settings from the 6.6 stable kernel recipe do not dublicate the used patches. Related-to: ELB-5616 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r--recipes-kernel/linux/linux-toradex-upstream-rt_6.6.bb19
1 files changed, 7 insertions, 12 deletions
diff --git a/recipes-kernel/linux/linux-toradex-upstream-rt_6.6.bb b/recipes-kernel/linux/linux-toradex-upstream-rt_6.6.bb
index bda5bcf..58f5a0e 100644
--- a/recipes-kernel/linux/linux-toradex-upstream-rt_6.6.bb
+++ b/recipes-kernel/linux/linux-toradex-upstream-rt_6.6.bb
@@ -1,18 +1,13 @@
-require linux-toradex-upstream.inc
+LINUX_VERSION ?= "6.6.20-rt25"
+require recipes-kernel/linux/linux-toradex-upstream_6.6.bb
-FILESEXTRAPATHS:prepend := "${THISDIR}/linux-toradex-upstream-rt:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux-toradex-upstream-6.6:"
SUMMARY = "Toradex mainline real-time Linux kernel"
# To build the RT kernel we use the RT kernel git repo rather than applying
# the RT patch on top of a vanilla kernel.
-LINUX_REPO = "git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel.git"
-TDX_PATCHES = " \
- file://0001-thermal-imx-Update-critical-temp-threshold.patch \
- file://0002-Revert-drm-panel-simple-drop-use-of-data-mapping-pro.patch \
- file://0003-drivers-chipidea-disable-runtime-pm-for-imx6ul.patch \
- file://0004-media-i2c-ov5640-Implement-get_mbus_config.patch \
-"
+LINUX_REPO = "git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-stable-rt.git"
SRC_URI:append = " \
file://preempt-rt.scc \
file://preempt-rt-less-latency.scc \
@@ -20,6 +15,6 @@ SRC_URI:append = " \
# 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}"
+KBRANCH = "v6.6-rt"
+SRCREV_machine = "a27814b8cd8f89ad68e29d3d6f8f3b61c65aebf5"
+SRCREV_machine:use-head-next = "${AUTOREV}"