summaryrefslogtreecommitdiffstats
path: root/meta-ti-bsp/recipes-kernel
diff options
context:
space:
mode:
Diffstat (limited to 'meta-ti-bsp/recipes-kernel')
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/files/0001-drivers-gpu-drm-msm-registers-improve-reproducibilit.patch55
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/files/0001-gcc-plugins-Fix-build-for-upcoming-GCC-release.patch46
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/files/0001-perf-python-Fix-compile-for-32bit-platforms.patch32
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/files/0001-vt-conmakehash-improve-reproducibility-for-v6.10.patch60
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/files/0001-vt-conmakehash-improve-reproducibility.patch56
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/files/init_disassemble_info-signature-changes-causes-compile-failures.patch111
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-bb.org/0001-blk-iocost-avoid-64-bit-division-in-ioc_timer_fn.patch56
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-bb.org/0001-block-blk-iocost-gcc13-keep-large-values-in-a-new-en.patch54
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-bb.org/defconfig1
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb35
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb35
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb21
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/defconfig (renamed from meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/defconfig)0
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/k3/defconfig (renamed from meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/k3/defconfig)0
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/omapl138/defconfig (renamed from meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/omapl138/defconfig)0
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/ti33x/defconfig (renamed from meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/defconfig)0
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/ti43x/defconfig2
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/defconfig2
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/k3/defconfig2
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/omapl138/defconfig (renamed from meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/omapl138/defconfig)1
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/ti33x/defconfig2
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/ti43x/defconfig2
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb4
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.12.bb9
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.6.bb6
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/k3/defconfig2
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.1.bb5
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.6.bb7
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb17
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb37
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb21
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/setup-defconfig.inc2
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/ti-extras-rt.inc10
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/ti-extras.inc10
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc14
35 files changed, 317 insertions, 400 deletions
diff --git a/meta-ti-bsp/recipes-kernel/linux/files/0001-drivers-gpu-drm-msm-registers-improve-reproducibilit.patch b/meta-ti-bsp/recipes-kernel/linux/files/0001-drivers-gpu-drm-msm-registers-improve-reproducibilit.patch
new file mode 100644
index 00000000..56a06e01
--- /dev/null
+++ b/meta-ti-bsp/recipes-kernel/linux/files/0001-drivers-gpu-drm-msm-registers-improve-reproducibilit.patch
@@ -0,0 +1,55 @@
1From 2c78d22a78584f2a17eb33b5b5fd6fa602c2af8d Mon Sep 17 00:00:00 2001
2From: Ryan Eatmon <reatmon@ti.com>
3Date: Wed, 17 Jul 2024 16:19:20 -0500
4Subject: [PATCH] drivers: gpu: drm: msm: registers: improve reproducibility
5
6The files generated by gen_header.py capture the source path to the
7input files and the date. While that can be informative, it varies
8based on where and when the kernel was built as the full path is
9captured.
10
11Since all of the files that this tool is run on is under the drivers
12directory, this modifies the application to strip all of the path before
13drivers. Additionally it prints <stripped> instead of the date.
14
15Both changes solve the reproducibility issue.
16
17Upstream-Status: Inappropriate
18
19Signed-off-by: Ryan Eatmon <reatmon@ti.com>
20---
21 drivers/gpu/drm/msm/registers/gen_header.py | 8 +++++---
22 1 file changed, 5 insertions(+), 3 deletions(-)
23
24diff --git a/drivers/gpu/drm/msm/registers/gen_header.py b/drivers/gpu/drm/msm/registers/gen_header.py
25index 3926485bb197..a409404627c7 100644
26--- a/drivers/gpu/drm/msm/registers/gen_header.py
27+++ b/drivers/gpu/drm/msm/registers/gen_header.py
28@@ -11,6 +11,7 @@ import collections
29 import argparse
30 import time
31 import datetime
32+import re
33
34 class Error(Exception):
35 def __init__(self, message):
36@@ -877,13 +878,14 @@ The rules-ng-ng source files this header was generated from are:
37 """)
38 maxlen = 0
39 for filepath in p.xml_files:
40- maxlen = max(maxlen, len(filepath))
41+ new_filepath = re.sub("^.+drivers","drivers",filepath)
42+ maxlen = max(maxlen, len(new_filepath))
43 for filepath in p.xml_files:
44- pad = " " * (maxlen - len(filepath))
45+ pad = " " * (maxlen - len(new_filepath))
46 filesize = str(os.path.getsize(filepath))
47 filesize = " " * (7 - len(filesize)) + filesize
48 filetime = time.ctime(os.path.getmtime(filepath))
49- print("- " + filepath + pad + " (" + filesize + " bytes, from " + filetime + ")")
50+ print("- " + new_filepath + pad + " (" + filesize + " bytes, from <stripped>)")
51 if p.copyright_year:
52 current_year = str(datetime.date.today().year)
53 print()
54--
552.17.1
diff --git a/meta-ti-bsp/recipes-kernel/linux/files/0001-gcc-plugins-Fix-build-for-upcoming-GCC-release.patch b/meta-ti-bsp/recipes-kernel/linux/files/0001-gcc-plugins-Fix-build-for-upcoming-GCC-release.patch
deleted file mode 100644
index 3dfa31a1..00000000
--- a/meta-ti-bsp/recipes-kernel/linux/files/0001-gcc-plugins-Fix-build-for-upcoming-GCC-release.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From 3cd29a3d7c25cca9989e7d8966141f725fa99c68 Mon Sep 17 00:00:00 2001
2From: Palmer Dabbelt <palmer@rivosinc.com>
3Date: Fri, 13 Jan 2023 09:30:33 -0800
4Subject: [PATCH] gcc-plugins: Fix build for upcoming GCC release
5
6The upcoming GCC release has refactored the gimple plugin interface a
7bit and unless gimple-iterator.h is included before gimple-fold.h I end
8up with a bunch of missing declarations when building the stack
9protector plugin.
10
11Upstream-Status: Backport [https://lore.kernel.org/all/20230113173033.4380-1-palmer@rivosinc.com/]
12Reported-by: Palmer Dabbelt <palmer@rivosinc.com>
13Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
14Link: https://lore.kernel.org/all/20230113173033.4380-1-palmer@rivosinc.com/
15Cc: linux-hardening@vger.kernel.org
16Signed-off-by: Kees Cook <keescook@chromium.org>
17---
18 scripts/gcc-plugins/gcc-common.h | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21--- a/scripts/gcc-plugins/gcc-common.h
22+++ b/scripts/gcc-plugins/gcc-common.h
23@@ -108,7 +108,9 @@
24 #include "varasm.h"
25 #include "stor-layout.h"
26 #include "internal-fn.h"
27+#include "gimple.h"
28 #include "gimple-expr.h"
29+#include "gimple-iterator.h"
30 #include "gimple-fold.h"
31 #include "context.h"
32 #include "tree-ssa-alias.h"
33@@ -124,13 +126,10 @@
34 #include "gimplify.h"
35 #endif
36
37-#include "gimple.h"
38-
39 #if BUILDING_GCC_VERSION >= 4009
40 #include "tree-ssa-operands.h"
41 #include "tree-phinodes.h"
42 #include "tree-cfg.h"
43-#include "gimple-iterator.h"
44 #include "gimple-ssa.h"
45 #include "ssa-iterators.h"
46 #endif
diff --git a/meta-ti-bsp/recipes-kernel/linux/files/0001-perf-python-Fix-compile-for-32bit-platforms.patch b/meta-ti-bsp/recipes-kernel/linux/files/0001-perf-python-Fix-compile-for-32bit-platforms.patch
new file mode 100644
index 00000000..12e12c68
--- /dev/null
+++ b/meta-ti-bsp/recipes-kernel/linux/files/0001-perf-python-Fix-compile-for-32bit-platforms.patch
@@ -0,0 +1,32 @@
1From a51ebf08cec81d84ac258da1c0ead139d6ddc94f Mon Sep 17 00:00:00 2001
2From: Ryan Eatmon <reatmon@ti.com>
3Date: Tue, 2 Jul 2024 11:07:14 -0500
4Subject: [master][PATCH] perf python: Fix compile for 32bit platforms
5
6The definition for perf_sample is missing on 32bit compiles:
7
8tools/perf/util/python.c:75:28: error: field 'sample' has incomplete type
9 75 | struct perf_sample sample;
10
11Adding #include "sample.h" fixes it.
12
13Upstream-Status: Inappropriate
14
15Signed-off-by: Ryan Eatmon <reatmon@ti.com>
16---
17 tools/perf/util/python.c | 2 ++
18 1 file changed, 2 insertions(+)
19
20diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c
21index 3be882b2e845..de64ca3cf2d1 100644
22--- a/tools/perf/util/python.c
23+++ b/tools/perf/util/python.c
24@@ -1,3 +1,5 @@
25+#include "sample.h"
26+
27 // SPDX-License-Identifier: GPL-2.0
28 #include <Python.h>
29 #include <structmember.h>
30--
312.17.1
32
diff --git a/meta-ti-bsp/recipes-kernel/linux/files/0001-vt-conmakehash-improve-reproducibility-for-v6.10.patch b/meta-ti-bsp/recipes-kernel/linux/files/0001-vt-conmakehash-improve-reproducibility-for-v6.10.patch
new file mode 100644
index 00000000..f9fdece8
--- /dev/null
+++ b/meta-ti-bsp/recipes-kernel/linux/files/0001-vt-conmakehash-improve-reproducibility-for-v6.10.patch
@@ -0,0 +1,60 @@
1From 4907fa9ff1dbdd72ce9fa7855091fb604a35a62d Mon Sep 17 00:00:00 2001
2From: Ryan Eatmon <reatmon@ti.com>
3Date: Wed, 17 Jul 2024 14:55:10 -0500
4Subject: [PATCH] vt/conmakehash: improve reproducibility for v6.10
5
6The file generated by conmakehash capture the application
7path used to generate the file. While that can be informative,
8it varies based on where the kernel was built, as the full
9path is captured.
10
11We tweak the application to use a second input as the "capture
12name", and then modify the Makefile to pass the basename of
13the source, making it reproducible.
14
15This could be improved by using some sort of path mapping,
16or the application manipualing argv[1] itself, but for now
17this solves the reprodicibility issue.
18
19Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
20
21Upstream-Status: Inappropriate
22
23Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
24
25This is a minior rework of Bruce's original patch for the v6.10 kernel.
26
27Signed-off-by: Ryan Eatmon <reatmon@ti.com>
28---
29 drivers/tty/vt/Makefile | 2 +-
30 drivers/tty/vt/conmakehash.c | 2 ++
31 2 files changed, 3 insertions(+), 1 deletion(-)
32
33diff --git a/drivers/tty/vt/Makefile b/drivers/tty/vt/Makefile
34index 2c8ce8b592ed..8532077ed3bb 100644
35--- a/drivers/tty/vt/Makefile
36+++ b/drivers/tty/vt/Makefile
37@@ -15,7 +15,7 @@ clean-files := consolemap_deftbl.c defkeymap.c
38 hostprogs += conmakehash
39
40 quiet_cmd_conmk = CONMK $@
41- cmd_conmk = $(obj)/conmakehash $< > $@
42+ cmd_conmk = $(obj)/conmakehash $< $(shell basename $<) > $@
43
44 $(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) $(obj)/conmakehash
45 $(call cmd,conmk)
46diff --git a/drivers/tty/vt/conmakehash.c b/drivers/tty/vt/conmakehash.c
47index dc2177fec715..9cd4096a8ffa 100644
48--- a/drivers/tty/vt/conmakehash.c
49+++ b/drivers/tty/vt/conmakehash.c
50@@ -112,6 +112,8 @@ int main(int argc, char *argv[])
51 else
52 rel_tblname = tblname;
53
54+ rel_tblname = argv[2];
55+
56 /* For now we assume the default font is always 256 characters. */
57 fontlen = 256;
58
59--
602.17.1
diff --git a/meta-ti-bsp/recipes-kernel/linux/files/0001-vt-conmakehash-improve-reproducibility.patch b/meta-ti-bsp/recipes-kernel/linux/files/0001-vt-conmakehash-improve-reproducibility.patch
new file mode 100644
index 00000000..211460c1
--- /dev/null
+++ b/meta-ti-bsp/recipes-kernel/linux/files/0001-vt-conmakehash-improve-reproducibility.patch
@@ -0,0 +1,56 @@
1From 0f586f4ee8adacac79b64d1f3d47799a5eb7fbea Mon Sep 17 00:00:00 2001
2From: Bruce Ashfield <bruce.ashfield@gmail.com>
3Date: Sun, 10 Jul 2022 21:37:07 -0400
4Subject: [PATCH] vt/conmakehash: improve reproducibility
5
6The file generated by conmakehash capture the application
7path used to generate the file. While that can be informative,
8it varies based on where the kernel was built, as the full
9path is captured.
10
11We tweak the application to use a second input as the "capture
12name", and then modify the Makefile to pass the basename of
13the source, making it reproducible.
14
15This could be improved by using some sort of path mapping,
16or the application manipualing argv[1] itself, but for now
17this solves the reprodicibility issue.
18
19Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
20
21Upstream-Status: Inappropriate
22
23Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
24---
25 drivers/tty/vt/Makefile | 2 +-
26 drivers/tty/vt/conmakehash.c | 2 +-
27 2 files changed, 2 insertions(+), 2 deletions(-)
28
29diff --git a/drivers/tty/vt/Makefile b/drivers/tty/vt/Makefile
30index fe30ce512819..cb51c21b58f9 100644
31--- a/drivers/tty/vt/Makefile
32+++ b/drivers/tty/vt/Makefile
33@@ -15,7 +15,7 @@ clean-files := consolemap_deftbl.c defkeymap.c
34 hostprogs += conmakehash
35
36 quiet_cmd_conmk = CONMK $@
37- cmd_conmk = $(obj)/conmakehash $< > $@
38+ cmd_conmk = $(obj)/conmakehash $< $(shell basename $<) > $@
39
40 $(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) $(obj)/conmakehash
41 $(call cmd,conmk)
42diff --git a/drivers/tty/vt/conmakehash.c b/drivers/tty/vt/conmakehash.c
43index cddd789fe46e..d62510b280e9 100644
44--- a/drivers/tty/vt/conmakehash.c
45+++ b/drivers/tty/vt/conmakehash.c
46@@ -253,7 +253,7 @@ int main(int argc, char *argv[])
47 #include <linux/types.h>\n\
48 \n\
49 u8 dfont_unicount[%d] = \n\
50-{\n\t", argv[1], fontlen);
51+{\n\t", argv[2], fontlen);
52
53 for ( i = 0 ; i < fontlen ; i++ )
54 {
55--
562.25.1
diff --git a/meta-ti-bsp/recipes-kernel/linux/files/init_disassemble_info-signature-changes-causes-compile-failures.patch b/meta-ti-bsp/recipes-kernel/linux/files/init_disassemble_info-signature-changes-causes-compile-failures.patch
deleted file mode 100644
index e1e04c34..00000000
--- a/meta-ti-bsp/recipes-kernel/linux/files/init_disassemble_info-signature-changes-causes-compile-failures.patch
+++ /dev/null
@@ -1,111 +0,0 @@
1
2Adaption of a patch [A] applied to meta-arm for the kernel. But since TI has it's own
3kernel we have to "adjust" the patch to match our files.
4
5[A] https://patchwork.yoctoproject.org/project/arm/patch/20220824025819.4888-1-jon.mason@arm.com/#5104
6
7Upstream-Status: Pending
8
9Signed-off-by: Ryan Eatmon <reatmon@ti.com>
10
11
12
13From 1b2013986271de39360cf79e62ed9b7d2cc59f9b Mon Sep 17 00:00:00 2001
14From: Andres Freund <andres@anarazel.de>
15Date: Wed, 22 Jun 2022 11:19:18 -0700
16Subject: [PATCH] init_disassemble_info() signature changes causes compile
17 failures
18MIME-Version: 1.0
19Content-Type: text/plain; charset=UTF-8
20Content-Transfer-Encoding: 8bit
21
22Hi,
23
24binutils changed the signature of init_disassemble_info(), which now causes
25perf and bpftool to fail to compile (e.g. on debian unstable).
26
27Relevant binutils commit: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=60a3da00bd5407f07d64dff82a4dae98230dfaac
28
29util/annotate.c: In function ?symbol__disassemble_bpf?:
30util/annotate.c:1765:9: error: too few arguments to function ?init_disassemble_info?
31 1765 | init_disassemble_info(&info, s,
32 | ^~~~~~~~~~~~~~~~~~~~~
33In file included from util/annotate.c:1718:
34/usr/include/dis-asm.h:472:13: note: declared here
35 472 | extern void init_disassemble_info (struct disassemble_info *dinfo, void *stream,
36 | ^~~~~~~~~~~~~~~~~~~~~
37
38with equivalent failures in
39
40tools/bpf/bpf_jit_disasm.c
41tools/bpf/bpftool/jit_disasm.c
42
43The fix is easy enough, add a wrapper around fprintf() that conforms to the
44new signature.
45
46However I assume the necessary feature test and wrapper should only be added
47once? I don't know the kernel stuff well enough to choose the right structure
48here.
49
50Attached is my local fix for perf. Obviously would need work to be a real
51solution.
52
53Greetings,
54
55Andres Freund
56---
57
58binutils 2.39 changed the signature of init_disassemble_info(),
59which now causes perf and bpftool to fail to compile.
60
61Relevant binutils commit: [1]
62
63There is a proper fix in development upstream[2].
64This is a work-around for older kernels.
65
66[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=60a3da00bd5407f07d64dff82a4dae98230dfaac
67[2] https://patchwork.kernel.org/project/netdevbpf/cover/20220801013834.156015-1-andres@anarazel.de/
68
69Upstream-Status: Pending
70Signed-off-by: Anton Antonov <Anton.Antonov@arm.com>
71
72
73 tools/perf/util/annotate.c | 15 ++++++++++++++-
74 1 file changed, 14 insertions(+), 1 deletion(-)
75
76diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
77index 308189454788..6573d2b07548 100644
78--- a/tools/perf/util/annotate.c
79+++ b/tools/perf/util/annotate.c
80@@ -1685,6 +1685,18 @@
81 #include <bfd.h>
82 #include <dis-asm.h>
83
84+static int fprintf_styled(void *, enum disassembler_style, const char* fmt, ...)
85+{
86+ va_list args;
87+ int r;
88+
89+ va_start(args, fmt);
90+ r = vprintf(fmt, args);
91+ va_end(args);
92+
93+ return r;
94+}
95+
96 static int symbol__disassemble_bpf(struct symbol *sym,
97 struct annotate_args *args)
98 {
99@@ -1727,7 +1739,8 @@ static int symbol__disassemble_bpf(struct symbol *sym,
100 goto out;
101 }
102 init_disassemble_info(&info, s,
103- (fprintf_ftype) fprintf);
104+ (fprintf_ftype) fprintf,
105+ fprintf_styled);
106
107 info.arch = bfd_get_arch(bfdf);
108 info.mach = bfd_get_mach(bfdf);
109--
1102.17.1
111
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/0001-blk-iocost-avoid-64-bit-division-in-ioc_timer_fn.patch b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/0001-blk-iocost-avoid-64-bit-division-in-ioc_timer_fn.patch
deleted file mode 100644
index a7806c22..00000000
--- a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/0001-blk-iocost-avoid-64-bit-division-in-ioc_timer_fn.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1From 5f2779dfa7b8cc7dfd4a1b6586d86e0d193266f3 Mon Sep 17 00:00:00 2001
2From: Arnd Bergmann <arnd@arndb.de>
3Date: Wed, 18 Jan 2023 09:07:01 +0100
4Subject: [PATCH] blk-iocost: avoid 64-bit division in ioc_timer_fn
5
6The behavior of 'enum' types has changed in gcc-13, so now the
7UNBUSY_THR_PCT constant is interpreted as a 64-bit number because
8it is defined as part of the same enum definition as some other
9constants that do not fit within a 32-bit integer. This in turn
10leads to some inefficient code on 32-bit architectures as well
11as a link error:
12
13arm-linux-gnueabi/bin/arm-linux-gnueabi-ld: block/blk-iocost.o: in function `ioc_timer_fn':
14blk-iocost.c:(.text+0x68e8): undefined reference to `__aeabi_uldivmod'
15arm-linux-gnueabi-ld: blk-iocost.c:(.text+0x6908): undefined reference to `__aeabi_uldivmod'
16
17Split the enum definition to keep the 64-bit timing constants in
18a separate enum type from those constants that can clearly fit
19within a smaller type.
20
21Signed-off-by: Arnd Bergmann <arnd@arndb.de>
22Acked-by: Tejun Heo <tj@kernel.org>
23Link: https://lore.kernel.org/r/20230118080706.3303186-1-arnd@kernel.org
24Signed-off-by: Jens Axboe <axboe@kernel.dk>
25---
26 block/blk-iocost.c | 8 +++++---
27 1 file changed, 5 insertions(+), 3 deletions(-)
28
29diff --git a/block/blk-iocost.c b/block/blk-iocost.c
30index 6955605629e4..b691b6bb498f 100644
31--- a/block/blk-iocost.c
32+++ b/block/blk-iocost.c
33@@ -258,6 +258,11 @@ enum {
34 VRATE_MIN = VTIME_PER_USEC * VRATE_MIN_PPM / MILLION,
35 VRATE_CLAMP_ADJ_PCT = 4,
36
37+ /* switch iff the conditions are met for longer than this */
38+ AUTOP_CYCLE_NSEC = 10LLU * NSEC_PER_SEC,
39+};
40+
41+enum {
42 /* if IOs end up waiting for requests, issue less */
43 RQ_WAIT_BUSY_PCT = 5,
44
45@@ -296,9 +301,6 @@ enum {
46 /* don't let cmds which take a very long time pin lagging for too long */
47 MAX_LAGGING_PERIODS = 10,
48
49- /* switch iff the conditions are met for longer than this */
50- AUTOP_CYCLE_NSEC = 10LLU * NSEC_PER_SEC,
51-
52 /*
53 * Count IO size in 4k pages. The 12bit shift helps keeping
54 * size-proportional components of cost calculation in closer
55--
562.40.1
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/0001-block-blk-iocost-gcc13-keep-large-values-in-a-new-en.patch b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/0001-block-blk-iocost-gcc13-keep-large-values-in-a-new-en.patch
deleted file mode 100644
index f5d0f476..00000000
--- a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/0001-block-blk-iocost-gcc13-keep-large-values-in-a-new-en.patch
+++ /dev/null
@@ -1,54 +0,0 @@
1From ff1cc97b1f4c10db224f276d9615b22835b8c424 Mon Sep 17 00:00:00 2001
2From: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
3Date: Tue, 13 Dec 2022 13:08:26 +0100
4Subject: [PATCH] block/blk-iocost (gcc13): keep large values in a new enum
5
6Since gcc13, each member of an enum has the same type as the enum [1]. And
7that is inherited from its members. Provided:
8 VTIME_PER_SEC_SHIFT = 37,
9 VTIME_PER_SEC = 1LLU << VTIME_PER_SEC_SHIFT,
10 ...
11 AUTOP_CYCLE_NSEC = 10LLU * NSEC_PER_SEC,
12the named type is unsigned long.
13
14This generates warnings with gcc-13:
15 block/blk-iocost.c: In function 'ioc_weight_prfill':
16 block/blk-iocost.c:3037:37: error: format '%u' expects argument of type 'unsigned int', but argument 4 has type 'long unsigned int'
17
18 block/blk-iocost.c: In function 'ioc_weight_show':
19 block/blk-iocost.c:3047:34: error: format '%u' expects argument of type 'unsigned int', but argument 3 has type 'long unsigned int'
20
21So split the anonymous enum with large values to a separate enum, so
22that they don't affect other members.
23
24[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=36113
25
26Cc: Martin Liska <mliska@suse.cz>
27Cc: Tejun Heo <tj@kernel.org>
28Cc: Josef Bacik <josef@toxicpanda.com>
29Cc: Jens Axboe <axboe@kernel.dk>
30Cc: cgroups@vger.kernel.org
31Cc: linux-block@vger.kernel.org
32Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
33Link: https://lore.kernel.org/r/20221213120826.17446-1-jirislaby@kernel.org
34Signed-off-by: Jens Axboe <axboe@kernel.dk>
35---
36 block/blk-iocost.c | 2 ++
37 1 file changed, 2 insertions(+)
38
39diff --git a/block/blk-iocost.c b/block/blk-iocost.c
40index d1bdc12deaa7..549ddc9e0c6f 100644
41--- a/block/blk-iocost.c
42+++ b/block/blk-iocost.c
43@@ -232,7 +232,9 @@ enum {
44
45 /* 1/64k is granular enough and can easily be handled w/ u32 */
46 WEIGHT_ONE = 1 << 16,
47+};
48
49+enum {
50 /*
51 * As vtime is used to calculate the cost of each IO, it needs to
52 * be fairly high precision. For example, it should be able to
53--
542.40.1
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/defconfig
deleted file mode 100644
index a5de2e24..00000000
--- a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/defconfig
+++ /dev/null
@@ -1 +0,0 @@
1use-kernel-config=bb.org_defconfig
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
deleted file mode 100644
index 144028e5..00000000
--- a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
+++ /dev/null
@@ -1,35 +0,0 @@
1SECTION = "kernel"
2SUMMARY = "BeagleBoard.org Linux kernel"
3LICENSE = "GPL-2.0-only"
4LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
5
6COMPATIBLE_MACHINE = "beagle.*"
7
8inherit kernel
9
10require recipes-kernel/linux/setup-defconfig.inc
11require recipes-kernel/linux/ti-kernel.inc
12
13# BB.org hasn't switched to "vendored" DTB layout by default yet
14KERNEL_DTBVENDORED = "0"
15
16DEPENDS += "gmp-native libmpc-native"
17
18KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"
19
20S = "${WORKDIR}/git"
21
22# 6.1.69 version for 32-bit
23SRCREV:armv7a = "a1f26a19581970f76220c68c438981796ce5b767"
24PV:armv7a = "6.1.69+git"
25BRANCH:armv7a = "v6.1.69-ti-r22"
26
27# 6.1.69 version for 64-bit
28SRCREV:aarch64 = "bc76b5d278271f66a6faeb2d09cb09fc6c57dd3c"
29PV:aarch64 = "6.1.69+git"
30BRANCH:aarch64 = "v6.1.69-ti-arm64-r24"
31
32SRC_URI = " \
33 git://github.com/beagleboard/linux.git;protocol=https;branch=${BRANCH} \
34 file://defconfig \
35"
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb
index 5c495d46..388110ad 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb
@@ -3,40 +3,31 @@ SUMMARY = "Mainline Linux kernel for TI devices"
3LICENSE = "GPL-2.0-only" 3LICENSE = "GPL-2.0-only"
4LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 4LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
5 5
6inherit kernel 6inherit kernel_deprecated
7 7
8require recipes-kernel/linux/ti-kernel.inc 8require recipes-kernel/linux/ti-kernel.inc
9 9
10DEPENDS += "gmp-native libmpc-native" 10DEPENDS += "gmp-native libmpc-native"
11 11
12KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ 12KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"
13 ${EXTRA_DTC_ARGS}"
14 13
15S = "${WORKDIR}/git" 14S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}"
16 15
17# 6.6 Mainline version 16# 6.12 Mainline version
18SRCREV = "ffc253263a1375a65fa6c9f62a893e9767fbebfa" 17SRCREV = "adc218676eef25575469234709c2d87185ca223a"
19PV = "6.6+git" 18PV = "6.12"
20
21# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
22MACHINE_KERNEL_PR:append = "b"
23PR = "${MACHINE_KERNEL_PR}"
24 19
25KERNEL_GIT_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" 20KERNEL_GIT_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"
26KERNEL_GIT_PROTOCOL = "https" 21BRANCH = "master"
27KERNEL_GIT_BRANCH = "master" 22
28SRC_URI += " \ 23KERNEL_DEFCONFIG = ""
29 ${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${KERNEL_GIT_BRANCH} \ 24
25KERNEL_REPRODUCIBILITY_PATCHES = " \
26 file://0001-drivers-gpu-drm-msm-registers-improve-reproducibilit.patch \
27 file://0001-perf-python-Fix-compile-for-32bit-platforms.patch \
30" 28"
31 29
32DEFCONFIG_NAME = "multi_v7_defconfig" 30DEFCONFIG_NAME = "multi_v7_defconfig"
33DEFCONFIG_NAME:omapl138 = "davinci_all_defconfig" 31DEFCONFIG_NAME:omapl138 = "davinci_all_defconfig"
34DEFCONFIG_NAME:k3 = "defconfig" 32DEFCONFIG_NAME:k3 = "defconfig"
35KERNEL_CONFIG_COMMAND = "oe_runmake -C ${S} O=${B} ${DEFCONFIG_NAME}" 33KERNEL_CONFIG_COMMAND = "oe_runmake -C ${S} O=${B} ${DEFCONFIG_NAME}"
36
37do_shared_workdir:prepend() {
38 cd ${B}
39 echo >> Module.symvers
40}
41
42FILES:${KERNEL_PACKAGE_NAME}-devicetree += "/${KERNEL_IMAGEDEST}/*.itb"
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb
index f1a14ab1..1feb7564 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb
@@ -1,26 +1,13 @@
1SECTION = "kernel" 1require linux-ti-mainline_git.bb
2SUMMARY = "Linux-next kernel for TI devices"
3LICENSE = "GPL-2.0-only"
4LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
5 2
6inherit kernel 3SUMMARY = "Linux-next kernel for TI devices"
7 4
8require recipes-kernel/linux/ti-kernel.inc
9include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''} 5include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''}
10 6
11DEPENDS += "gmp-native libmpc-native"
12
13KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"
14
15S = "${WORKDIR}/git"
16
17# 6.6.0-rc3+ version 7# 6.6.0-rc3+ version
18SRCREV = "6465e260f48790807eef06b583b38ca9789b6072" 8SRCREV = "6465e260f48790807eef06b583b38ca9789b6072"
19PV = "6.6.0-rc3+git" 9PV = "6.6.0-rc3+git"
20 10
21SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git;protocol=https;branch=master" 11KERNEL_GIT_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git"
22 12
23DEFCONFIG_NAME = "multi_v7_defconfig" 13KERNEL_REPRODUCIBILITY_PATCHES = ""
24DEFCONFIG_NAME:omapl138 = "davinci_all_defconfig"
25DEFCONFIG_NAME:k3 = "defconfig"
26KERNEL_CONFIG_COMMAND = "oe_runmake -C ${S} O=${B} ${DEFCONFIG_NAME}"
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/defconfig
index 24b53cf7..24b53cf7 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/defconfig
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/k3/defconfig
index ef1d3efd..ef1d3efd 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/k3/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/k3/defconfig
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/omapl138/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/omapl138/defconfig
index 099493af..099493af 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/omapl138/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/omapl138/defconfig
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/ti33x/defconfig
index 24b53cf7..24b53cf7 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/ti33x/defconfig
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/ti43x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/ti43x/defconfig
new file mode 100644
index 00000000..24b53cf7
--- /dev/null
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/ti43x/defconfig
@@ -0,0 +1,2 @@
1use-kernel-config=multi_v7_defconfig
2config-fragment=kernel/configs/ti_multi_v7_prune.config
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/defconfig
new file mode 100644
index 00000000..43089dc8
--- /dev/null
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/defconfig
@@ -0,0 +1,2 @@
1use-kernel-config=multi_v7_defconfig
2config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/ti_rt.config
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/k3/defconfig
new file mode 100644
index 00000000..47d78664
--- /dev/null
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/k3/defconfig
@@ -0,0 +1,2 @@
1use-kernel-config=defconfig
2config-fragment=kernel/configs/ti_arm64_prune.config kernel/configs/ti_rt.config
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/omapl138/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/omapl138/defconfig
index 099493af..3d890b6e 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/omapl138/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/omapl138/defconfig
@@ -1 +1,2 @@
1use-kernel-config=davinci_all_defconfig 1use-kernel-config=davinci_all_defconfig
2config-fragment=
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/ti33x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/ti33x/defconfig
new file mode 100644
index 00000000..43089dc8
--- /dev/null
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/ti33x/defconfig
@@ -0,0 +1,2 @@
1use-kernel-config=multi_v7_defconfig
2config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/ti_rt.config
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/ti43x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/ti43x/defconfig
new file mode 100644
index 00000000..43089dc8
--- /dev/null
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/ti43x/defconfig
@@ -0,0 +1,2 @@
1use-kernel-config=multi_v7_defconfig
2config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/ti_rt.config
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb
index 45461419..9fe0eb02 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb
@@ -8,8 +8,8 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:"
8 8
9BRANCH = "ti-rt-linux-6.1.y" 9BRANCH = "ti-rt-linux-6.1.y"
10 10
11SRCREV = "01dbe4e64bacaa4c891c1997f2724c320698d61f" 11SRCREV = "9e8992fb839c642e3c20ee8ce69a30dbaae7f498"
12 12
13include ${@ 'recipes-kernel/linux/ti-extras-rt.inc' if d.getVar('TI_EXTRAS') else ''} 13include ${@ 'recipes-kernel/linux/ti-extras-rt.inc' if d.getVar('TI_EXTRAS') else ''}
14 14
15PV = "6.1.82+git" 15PV = "6.1.119+git"
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.12.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.12.bb
new file mode 100644
index 00000000..9e5c4ee4
--- /dev/null
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.12.bb
@@ -0,0 +1,9 @@
1require linux-ti-staging_6.12.bb
2
3KERNEL_LOCALVERSION:append = "-rt"
4
5# Look in the generic major.minor directory for files
6# This will have priority over generic non-rt path
7FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.12:"
8
9include ${@ 'recipes-kernel/linux/ti-extras-rt.inc' if d.getVar('TI_EXTRAS') else ''}
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.6.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.6.bb
index e527e070..e817b530 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.6.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.6.bb
@@ -1,7 +1,5 @@
1require linux-ti-staging_6.6.bb 1require linux-ti-staging_6.6.bb
2 2
3DEFAULT_PREFERENCE = "-1"
4
5KERNEL_LOCALVERSION:append = "-rt" 3KERNEL_LOCALVERSION:append = "-rt"
6 4
7# Look in the generic major.minor directory for files 5# Look in the generic major.minor directory for files
@@ -10,8 +8,8 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.6:"
10 8
11BRANCH = "ti-rt-linux-6.6.y" 9BRANCH = "ti-rt-linux-6.6.y"
12 10
13SRCREV = "82fd2ecb48b6bdb66081cb2f24b9bdfce218dea6" 11SRCREV = "c79d7ef3a56ff61dd83d5527520b419a4f0e32e2"
14 12
15include ${@ 'recipes-kernel/linux/ti-extras-rt.inc' if d.getVar('TI_EXTRAS') else ''} 13include ${@ 'recipes-kernel/linux/ti-extras-rt.inc' if d.getVar('TI_EXTRAS') else ''}
16 14
17PV = "6.6.23+git" 15PV = "6.6.58+git"
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/k3/defconfig
deleted file mode 100644
index ef1d3efd..00000000
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/k3/defconfig
+++ /dev/null
@@ -1,2 +0,0 @@
1use-kernel-config=defconfig
2config-fragment=kernel/configs/ti_arm64_prune.config
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.1.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.1.bb
deleted file mode 100644
index 9c170e65..00000000
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
1require linux-ti-staging_6.1.bb
2
3# Look in the generic major.minor directory for files
4# This will have priority over generic non-rt path
5FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:"
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.6.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.6.bb
deleted file mode 100644
index 21090904..00000000
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.6.bb
+++ /dev/null
@@ -1,7 +0,0 @@
1require linux-ti-staging_6.6.bb
2
3DEFAULT_PREFERENCE = "-1"
4
5# Look in the generic major.minor directory for files
6# This will have priority over generic non-rt path
7FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.6:"
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb
index a58494df..97fa6463 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL-2.0-only"
4LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 4LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
5 5
6inherit ti-secdev 6inherit ti-secdev
7inherit kernel 7inherit kernel_deprecated
8 8
9require recipes-kernel/linux/setup-defconfig.inc 9require recipes-kernel/linux/setup-defconfig.inc
10require recipes-kernel/linux/ti-kernel.inc 10require recipes-kernel/linux/ti-kernel.inc
@@ -19,21 +19,12 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:"
19KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ 19KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \
20 ${EXTRA_DTC_ARGS}" 20 ${EXTRA_DTC_ARGS}"
21 21
22S = "${WORKDIR}/git" 22S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}"
23 23
24BRANCH ?= "ti-linux-6.1.y" 24BRANCH ?= "ti-linux-6.1.y"
25 25
26SRCREV ?= "e44f83d2aa4366b3097307c5915d03696cf3e1b8" 26SRCREV ?= "e4e8b16e66f592749984b2d287e0479e93ef35b3"
27PV = "6.1.82+git" 27PV = "6.1.119+git"
28
29# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
30MACHINE_KERNEL_PR:append = "b"
31PR = "${MACHINE_KERNEL_PR}"
32
33KERNEL_GIT_URI ?= "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git"
34KERNEL_GIT_PROTOCOL = "https"
35SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \
36 file://defconfig"
37 28
38# Special configuration for remoteproc/rpmsg IPC modules 29# Special configuration for remoteproc/rpmsg IPC modules
39module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample" 30module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample"
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb
new file mode 100644
index 00000000..15ff3311
--- /dev/null
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb
@@ -0,0 +1,37 @@
1SECTION = "kernel"
2SUMMARY = "Linux kernel for TI devices"
3LICENSE = "GPL-2.0-only"
4LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
5
6inherit ti-secdev
7inherit kernel_deprecated
8
9require recipes-kernel/linux/setup-defconfig.inc
10require recipes-kernel/linux/ti-kernel.inc
11include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''}
12include ${@ 'recipes-kernel/linux/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}
13
14DEPENDS += "gmp-native libmpc-native"
15
16# Look in the generic major.minor directory for files
17FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.12:"
18
19KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \
20 ${EXTRA_DTC_ARGS}"
21
22S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}"
23
24BRANCH ?= "ti-linux-6.12.y"
25
26SRCREV ?= "34d0b070130a8cd2cddd9260389ad974e8cb8468"
27PV = "6.12.33+git"
28
29KERNEL_REPRODUCIBILITY_PATCHES = " \
30 file://0001-drivers-gpu-drm-msm-registers-improve-reproducibilit.patch \
31"
32
33# Special configuration for remoteproc/rpmsg IPC modules
34module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample"
35module_conf_ti_k3_r5_remoteproc = "softdep ti_k3_r5_remoteproc pre: virtio_rpmsg_bus"
36module_conf_ti_k3_dsp_remoteproc = "softdep ti_k3_dsp_remoteproc pre: virtio_rpmsg_bus"
37KERNEL_MODULE_PROBECONF += "rpmsg_client_sample ti_k3_r5_remoteproc ti_k3_dsp_remoteproc"
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb
index 4871f3cf..4714bba1 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb
@@ -4,9 +4,7 @@ LICENSE = "GPL-2.0-only"
4LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 4LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
5 5
6inherit ti-secdev 6inherit ti-secdev
7inherit kernel 7inherit kernel_deprecated
8
9DEFAULT_PREFERENCE = "-1"
10 8
11require recipes-kernel/linux/setup-defconfig.inc 9require recipes-kernel/linux/setup-defconfig.inc
12require recipes-kernel/linux/ti-kernel.inc 10require recipes-kernel/linux/ti-kernel.inc
@@ -21,21 +19,16 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.6:"
21KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ 19KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \
22 ${EXTRA_DTC_ARGS}" 20 ${EXTRA_DTC_ARGS}"
23 21
24S = "${WORKDIR}/git" 22S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}"
25 23
26BRANCH ?= "ti-linux-6.6.y" 24BRANCH ?= "ti-linux-6.6.y"
27 25
28SRCREV ?= "02bfb99615b1c26a06d0af269e97401251a25c40" 26SRCREV ?= "a7758da17c2807e5285d6546b6797aae1d34a7d6"
29PV = "6.6.23+git" 27PV = "6.6.58+git"
30
31# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
32MACHINE_KERNEL_PR:append = "b"
33PR = "${MACHINE_KERNEL_PR}"
34 28
35KERNEL_GIT_URI ?= "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git" 29KERNEL_REPRODUCIBILITY_PATCHES = " \
36KERNEL_GIT_PROTOCOL = "https" 30 file://0001-vt-conmakehash-improve-reproducibility.patch \
37SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \ 31"
38 file://defconfig"
39 32
40# Special configuration for remoteproc/rpmsg IPC modules 33# Special configuration for remoteproc/rpmsg IPC modules
41module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample" 34module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample"
diff --git a/meta-ti-bsp/recipes-kernel/linux/setup-defconfig.inc b/meta-ti-bsp/recipes-kernel/linux/setup-defconfig.inc
index 8da90c79..213f6871 100644
--- a/meta-ti-bsp/recipes-kernel/linux/setup-defconfig.inc
+++ b/meta-ti-bsp/recipes-kernel/linux/setup-defconfig.inc
@@ -9,7 +9,7 @@ do_configure() {
9 # Always copy the defconfig file to .config to keep consistency 9 # Always copy the defconfig file to .config to keep consistency
10 # between the case where there is a real config and the in kernel 10 # between the case where there is a real config and the in kernel
11 # tree config 11 # tree config
12 cp ${WORKDIR}/defconfig ${B}/.config 12 cp ${UNPACKDIR}/defconfig ${B}/.config
13 13
14 scm_version=$(printf '%s%s' -g $(git -C ${S} rev-parse --verify HEAD 2>/dev/null | cut -c1-12)) 14 scm_version=$(printf '%s%s' -g $(git -C ${S} rev-parse --verify HEAD 2>/dev/null | cut -c1-12))
15 15
diff --git a/meta-ti-bsp/recipes-kernel/linux/ti-extras-rt.inc b/meta-ti-bsp/recipes-kernel/linux/ti-extras-rt.inc
index 530a1783..dba9ef38 100644
--- a/meta-ti-bsp/recipes-kernel/linux/ti-extras-rt.inc
+++ b/meta-ti-bsp/recipes-kernel/linux/ti-extras-rt.inc
@@ -2,10 +2,10 @@
2# Use different commit, repo and branch for TI extras build 2# Use different commit, repo and branch for TI extras build
3# This will have priority over generic rt path 3# This will have priority over generic rt path
4 4
5COMPATIBLE_MACHINE = "am62xx|am62pxx" 5COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx"
6 6
7BRANCH = "ti-rt-linux-6.1.y" 7BRANCH = "ti-linux-6.12.y"
8BRANCH:tie-jailhouse = "ti-rt-linux-6.1.y-jailhouse" 8BRANCH:tie-jailhouse = "ti-linux-6.12.y-jailhouse"
9 9
10SRCREV = "685e77152461bd6b791500f717bec62d17c1b36d" 10SRCREV = "c9e21a1ebd757f2b4487035382bbf65299cf8170"
11SRCREV:tie-jailhouse = "a74088b40b4d27478a2af5c20cdc0b4ec8ed9470" 11SRCREV:tie-jailhouse = "229a48602ad1557612a4ffabec6a3cbcdd745f87"
diff --git a/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc b/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc
index 0b22aca9..4b7a9f20 100644
--- a/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc
+++ b/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc
@@ -2,13 +2,13 @@
2# Use different commit, repo and branch for TI extras build 2# Use different commit, repo and branch for TI extras build
3# This will have priority over generic rt path 3# This will have priority over generic rt path
4 4
5COMPATIBLE_MACHINE = "am62xx|am62pxx" 5COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx"
6 6
7BRANCH = "ti-linux-6.1.y" 7BRANCH = "ti-linux-6.12.y"
8BRANCH:tie-jailhouse = "ti-linux-6.1.y-jailhouse" 8BRANCH:tie-jailhouse = "ti-linux-6.12.y-jailhouse"
9 9
10SRCREV = "ec058c3ddc5377c629e988a95ef84826b14a3307" 10SRCREV = "c9e21a1ebd757f2b4487035382bbf65299cf8170"
11SRCREV:tie-jailhouse = "d035e0cc72399f1c087a63c4210d29e79a7a66e4" 11SRCREV:tie-jailhouse = "229a48602ad1557612a4ffabec6a3cbcdd745f87"
12 12
13KERNEL_GIT_URI = "git://git.ti.com/git/processor-sdk/linux.git" 13KERNEL_GIT_URI = "git://git.ti.com/git/processor-sdk/linux.git"
14 14
diff --git a/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc b/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc
index dd5578f5..8c14446a 100644
--- a/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc
+++ b/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc
@@ -12,3 +12,17 @@ EXTRA_DTC_ARGS += "${@get_extra_dtc_args(d)}"
12# the kernel. 12# the kernel.
13KERNEL_DTBDEST = "${KERNEL_IMAGEDEST}/dtb" 13KERNEL_DTBDEST = "${KERNEL_IMAGEDEST}/dtb"
14KERNEL_DTBVENDORED = "1" 14KERNEL_DTBVENDORED = "1"
15
16KERNEL_GIT_URI ?= "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git"
17KERNEL_GIT_PROTOCOL ?= "https"
18KERNEL_GIT_BRANCH ?= "branch=${BRANCH}"
19
20KERNEL_DEFCONFIG ?= "file://defconfig"
21
22KERNEL_REPRODUCIBILITY_PATCHES ?= ""
23
24SRC_URI = " \
25 ${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};${KERNEL_GIT_BRANCH} \
26 ${KERNEL_DEFCONFIG} \
27 ${KERNEL_REPRODUCIBILITY_PATCHES} \
28"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-08 18:57:08 +0000