diff mbox series

[isar-cip-core] linux-cip-rt: Add 5.10.83-cip1-rt1 recipe

Message ID c434a1e4-5298-ec95-1b8b-b4fdcba52ffb@siemens.com (mailing list archive)
State Handled Elsewhere
Headers show
Series [isar-cip-core] linux-cip-rt: Add 5.10.83-cip1-rt1 recipe | expand

Commit Message

Jan Kiszka Dec. 9, 2021, 11:11 a.m. UTC 
From: Jan Kiszka <jan.kiszka@siemens.com>

With 5.10, we slightly need to tune the config fragment in order to
enable RT. Rather than carrying both, simply merge all switches needed
for 4.4 up to 5.10 into one - the kernel will pick what it knows.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

Pavel, does the resulting preempt-rt.cfg (still) make sense?
https://gitlab.com/cip-project/cip-core/isar-cip-core/-/blob/next/recipes-kernel/linux/files/preempt-rt.cfg

Srinu, please also check. If things are fine, we could re-use
preempt-rt.cfg downstream as is.

 Kconfig                                            |  1 -
 recipes-kernel/linux/files/preempt-rt.cfg          |  4 ++++
 .../linux/linux-cip-rt_5.10.83-cip1-rt1.bb         | 14 ++++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 recipes-kernel/linux/linux-cip-rt_5.10.83-cip1-rt1.bb

Comments

Pavel Machek Dec. 10, 2021, 7:02 p.m. UTC | #1 
Hi!

> Pavel, does the resulting preempt-rt.cfg (still) make sense?

I don't see anything obviously wrong.

Thanks and best regards,
								Pavel
diff mbox series

Patch

diff --git a/Kconfig b/Kconfig
index e03ab50..e69293f 100644
--- a/Kconfig
+++ b/Kconfig
@@ -70,7 +70,6 @@  config KAS_INCLUDE_KERNEL
 
 config KERNEL_RT
 	bool "Real-time CIP kernel"
-	depends on !KERNEL_5_10
 
 config KAS_INCLUDE_KERNEL_RT
 	string
diff --git a/recipes-kernel/linux/files/preempt-rt.cfg b/recipes-kernel/linux/files/preempt-rt.cfg
index 6b52f32..4afe1bf 100644
--- a/recipes-kernel/linux/files/preempt-rt.cfg
+++ b/recipes-kernel/linux/files/preempt-rt.cfg
@@ -1,3 +1,7 @@ 
+# >= 5.10
+CONFIG_EXPERT=y
+CONFIG_PREEMPT_RT=y
+# <= 4.19
 CONFIG_PREEMPT_RT_FULL=y
 
 CONFIG_DEBUG_ATOMIC_SLEEP=y
diff --git a/recipes-kernel/linux/linux-cip-rt_5.10.83-cip1-rt1.bb b/recipes-kernel/linux/linux-cip-rt_5.10.83-cip1-rt1.bb
new file mode 100644
index 0000000..7b38c1e
--- /dev/null
+++ b/recipes-kernel/linux/linux-cip-rt_5.10.83-cip1-rt1.bb
@@ -0,0 +1,14 @@ 
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2021
+#
+# Authors:
+#  Jan Kiszka <jan.kiszka@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+require linux-cip-rt-common.inc
+
+SRC_URI[sha256sum] = "e10b3ab1ad09ed7650883c5357b68660ac1c56f6d71b3b82feb0d69ed182ea54"