mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 07:22:33 +00:00
330ad3e98f
We removed 5.10 kernel, so remove also the patch that only affects 5.10 kernels. Manually refresh: - 0005-SSDK-config-add-kernel-5.15.patch - 0010-QSDK-config-Avoid-Werror-heroics.patch Signed-off-by: Nick Hainke <vincent@systemli.org>
57 lines
1.7 KiB
Diff
57 lines
1.7 KiB
Diff
From 0c509f8d8e5a6a03933a112d4487fd1c005442d6 Mon Sep 17 00:00:00 2001
|
|
From: Robert Marko <robimarko@gmail.com>
|
|
Date: Fri, 24 Dec 2021 19:39:02 +0100
|
|
Subject: [PATCH 05/11] SSDK: config: add kernel 5.15
|
|
|
|
This is purely to identify it and be able to set
|
|
flags correctly.
|
|
|
|
Signed-off-by: Robert Marko <robimarko@gmail.com>
|
|
---
|
|
config | 6 +++++-
|
|
make/linux_opt.mk | 4 ++--
|
|
2 files changed, 7 insertions(+), 3 deletions(-)
|
|
|
|
--- a/config
|
|
+++ b/config
|
|
@@ -24,6 +24,10 @@ ifeq ($(KVER),$(filter 5.4%,$(KVER)))
|
|
OS_VER=5_4
|
|
endif
|
|
|
|
+ifeq ($(KVER),$(filter 5.15%,$(KVER)))
|
|
+OS_VER=5_15
|
|
+endif
|
|
+
|
|
ifeq ($(KVER), 3.4.0)
|
|
OS_VER=3_4
|
|
endif
|
|
@@ -132,7 +136,7 @@ ifeq ($(ARCH), arm)
|
|
endif
|
|
|
|
ifeq ($(ARCH), arm64)
|
|
- ifeq ($(KVER),$(filter 4.1% 4.4% 4.9% 5.4%,$(KVER)))
|
|
+ ifeq ($(KVER),$(filter 4.1% 4.4% 4.9% 5.4% 5.15%,$(KVER)))
|
|
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
|
|
endif
|
|
endif
|
|
--- a/make/linux_opt.mk
|
|
+++ b/make/linux_opt.mk
|
|
@@ -437,7 +437,7 @@ ifeq (KSLIB, $(MODULE_TYPE))
|
|
KASAN_SHADOW_SCALE_SHIFT := 3
|
|
endif
|
|
|
|
- ifeq (5_4, $(OS_VER))
|
|
+ ifeq (5_4 5_15, $(OS_VER))
|
|
ifeq ($(ARCH), arm64)
|
|
KASAN_OPTION += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT)
|
|
endif
|
|
@@ -468,7 +468,7 @@ ifeq (KSLIB, $(MODULE_TYPE))
|
|
|
|
endif
|
|
|
|
- ifeq ($(OS_VER),$(filter 4_4 5_4, $(OS_VER)))
|
|
+ ifeq ($(OS_VER),$(filter 4_4 5_4 5_15, $(OS_VER)))
|
|
MODULE_CFLAG += -DKVER34
|
|
MODULE_CFLAG += -DKVER32
|
|
MODULE_CFLAG += -DLNX26_22
|