77c54979a9cd2cf87b0e8248737b26d6d5c88e99
[openwrt/staging/jow.git] / package / kernel / qca-ssdk / patches / 0015-SSDK-config-add-kernel-6.1.patch
1 From 1f9eb43f118b86c0b68e9d82bfae77471d6c3921 Mon Sep 17 00:00:00 2001
2 From: Robert Marko <robimarko@gmail.com>
3 Date: Thu, 29 Sep 2022 09:59:20 +0200
4 Subject: [PATCH] SSDK: config: add kernel 6.1
5
6 Allow kernel 6.1 to be recognized and compiled under it.
7
8 Signed-off-by: Robert Marko <robimarko@gmail.com>
9 ---
10 config | 6 +++++-
11 make/linux_opt.mk | 4 ++--
12 2 files changed, 7 insertions(+), 3 deletions(-)
13
14 --- a/config
15 +++ b/config
16 @@ -28,6 +28,10 @@ ifeq ($(KVER),$(filter 5.15%,$(KVER)))
17 OS_VER=5_15
18 endif
19
20 +ifeq ($(KVER),$(filter 6.1%,$(KVER)))
21 +OS_VER=6_1
22 +endif
23 +
24 ifeq ($(KVER), 3.4.0)
25 OS_VER=3_4
26 endif
27 @@ -136,7 +140,7 @@ ifeq ($(ARCH), arm)
28 endif
29
30 ifeq ($(ARCH), arm64)
31 - ifeq ($(KVER),$(filter 4.1% 4.4% 4.9% 5.4% 5.15%,$(KVER)))
32 + ifeq ($(KVER),$(filter 4.1% 4.4% 4.9% 5.4% 5.15% 6.1%,$(KVER)))
33 CPU_CFLAG= -DMODULE -Os -pipe -march=armv8-a -mcpu=cortex-a53+crypto -fno-caller-saves -fno-strict-aliasing -fno-common -Wno-format-security -Wno-pointer-sign -Wno-unused-but-set-variable -Wno-error=unused-result -mcmodel=large
34 endif
35 endif
36 --- a/make/linux_opt.mk
37 +++ b/make/linux_opt.mk
38 @@ -437,7 +437,7 @@ ifeq (KSLIB, $(MODULE_TYPE))
39 KASAN_SHADOW_SCALE_SHIFT := 3
40 endif
41
42 - ifeq (5_4 5_15, $(OS_VER))
43 + ifeq (5_4 5_15 6_1, $(OS_VER))
44 ifeq ($(ARCH), arm64)
45 KASAN_OPTION += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT)
46 endif
47 @@ -468,7 +468,7 @@ ifeq (KSLIB, $(MODULE_TYPE))
48
49 endif
50
51 - ifeq ($(OS_VER),$(filter 4_4 5_4 5_15, $(OS_VER)))
52 + ifeq ($(OS_VER),$(filter 4_4 5_4 5_15 6_1, $(OS_VER)))
53 MODULE_CFLAG += -DKVER34
54 MODULE_CFLAG += -DKVER32
55 MODULE_CFLAG += -DLNX26_22