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