From 472c0c8132784608312c80c4b02c03ea7c132235 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Wed, 12 May 2021 13:41:12 +0200 Subject: [PATCH] SSDK: config: add kernel 5.10 This is purely to identify it and be able to set flags correctly. Signed-off-by: Robert Marko --- config | 6 +++++- make/linux_opt.mk | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) --- a/config +++ b/config @@ -22,6 +22,14 @@ ifeq ($(KVER),$(filter 5.4%,$(KVER))) OS_VER=5_4 endif +ifeq ($(KVER),$(filter 5.10%,$(KVER))) +OS_VER=5_10 +endif + +ifeq ($(KVER),$(filter 5.15%,$(KVER))) +OS_VER=5_15 +endif + ifeq ($(KVER), 3.4.0) OS_VER=3_4 endif @@ -123,7 +131,7 @@ endif 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.10% 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 @@ -388,7 +388,7 @@ ifeq (KSLIB, $(MODULE_TYPE)) KASAN_SHADOW_SCALE_SHIFT := 3 endif - ifeq (5_4, $(OS_VER)) + ifeq ($(OS_VER),$(filter 5_4 5_10 5_15, $(OS_VER))) ifeq ($(ARCH), arm64) KASAN_OPTION += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) endif @@ -419,7 +419,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_10 5_15, $(OS_VER))) MODULE_CFLAG += -DKVER34 MODULE_CFLAG += -DKVER32 MODULE_CFLAG += -DLNX26_22