[openwrt/openwrt] kernel: remove unnecessary qca-sdk patch for 5.10 kernel

LEDE Commits lede-commits at lists.infradead.org
Fri May 12 04:14:08 PDT 2023 

ansuel pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/330ad3e98fc2f33c40dbf6dd3dd08527afbd9f1f

commit 330ad3e98fc2f33c40dbf6dd3dd08527afbd9f1f
Author: Nick Hainke <vincent at systemli.org>
AuthorDate: Thu May 4 21:38:25 2023 +0200

    kernel: remove unnecessary qca-sdk patch for 5.10 kernel
    
    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 at systemli.org>
---
 .../patches/0001-SSDK-config-add-kernel-5.10.patch | 56 ----------------------
 .../patches/0005-SSDK-config-add-kernel-5.15.patch | 18 +++----
 .../0010-QSDK-config-Avoid-Werror-heroics.patch    |  4 +-
 3 files changed, 11 insertions(+), 67 deletions(-)

diff --git a/package/kernel/qca-ssdk/patches/0001-SSDK-config-add-kernel-5.10.patch b/package/kernel/qca-ssdk/patches/0001-SSDK-config-add-kernel-5.10.patch
deleted file mode 100644
index be83d6f1ee..0000000000
--- a/package/kernel/qca-ssdk/patches/0001-SSDK-config-add-kernel-5.10.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 6ee395e1cab32d1d4899d7846ea99e6e2dc0a9e4 Mon Sep 17 00:00:00 2001
-From: Robert Marko <robimarko at gmail.com>
-Date: Wed, 12 May 2021 13:41:12 +0200
-Subject: [PATCH 01/11] SSDK: config: add kernel 5.10
-
-This is purely to identify it and be able to set
-flags correctly.
-
-Signed-off-by: Robert Marko <robimarko at 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.10%,$(KVER)))
-+OS_VER=5_10
-+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.10%,$(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 ($(OS_VER),$(filter 5_4 5_10, $(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_10, $(OS_VER)))
-                 MODULE_CFLAG += -DKVER34
-                 MODULE_CFLAG += -DKVER32
-             MODULE_CFLAG += -DLNX26_22
diff --git a/package/kernel/qca-ssdk/patches/0005-SSDK-config-add-kernel-5.15.patch b/package/kernel/qca-ssdk/patches/0005-SSDK-config-add-kernel-5.15.patch
index 045f7ae40b..7b19f5d12c 100644
--- a/package/kernel/qca-ssdk/patches/0005-SSDK-config-add-kernel-5.15.patch
+++ b/package/kernel/qca-ssdk/patches/0005-SSDK-config-add-kernel-5.15.patch
@@ -14,8 +14,8 @@ Signed-off-by: Robert Marko <robimarko at gmail.com>
 
 --- a/config
 +++ b/config
-@@ -28,6 +28,10 @@ ifeq ($(KVER),$(filter 5.10%,$(KVER)))
- OS_VER=5_10
+@@ -24,6 +24,10 @@ ifeq ($(KVER),$(filter 5.4%,$(KVER)))
+ 	OS_VER=5_4
  endif
  
 +ifeq ($(KVER),$(filter 5.15%,$(KVER)))
@@ -25,12 +25,12 @@ Signed-off-by: Robert Marko <robimarko at gmail.com>
  ifeq ($(KVER), 3.4.0)
  	OS_VER=3_4
  endif
-@@ -136,7 +140,7 @@ ifeq ($(ARCH), arm)
+@@ -132,7 +136,7 @@ ifeq ($(ARCH), arm)
  endif
  
  ifeq ($(ARCH), arm64)
--	ifeq ($(KVER),$(filter 4.1% 4.4% 4.9% 5.4% 5.10%,$(KVER)))
-+	ifeq ($(KVER),$(filter 4.1% 4.4% 4.9% 5.4% 5.10% 5.15%,$(KVER)))
+-	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
@@ -40,8 +40,8 @@ Signed-off-by: Robert Marko <robimarko at gmail.com>
        KASAN_SHADOW_SCALE_SHIFT := 3
    endif
  
--  ifeq ($(OS_VER),$(filter 5_4 5_10, $(OS_VER)))
-+  ifeq ($(OS_VER),$(filter 5_4 5_10 5_15, $(OS_VER)))
+-  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
@@ -49,8 +49,8 @@ Signed-off-by: Robert Marko <robimarko at gmail.com>
  
    endif
  
--  ifeq ($(OS_VER),$(filter 4_4 5_4 5_10, $(OS_VER)))
-+  ifeq ($(OS_VER),$(filter 4_4 5_4 5_10 5_15, $(OS_VER)))
+-  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
diff --git a/package/kernel/qca-ssdk/patches/0010-QSDK-config-Avoid-Werror-heroics.patch b/package/kernel/qca-ssdk/patches/0010-QSDK-config-Avoid-Werror-heroics.patch
index f5884f279b..8eff0a9958 100644
--- a/package/kernel/qca-ssdk/patches/0010-QSDK-config-Avoid-Werror-heroics.patch
+++ b/package/kernel/qca-ssdk/patches/0010-QSDK-config-Avoid-Werror-heroics.patch
@@ -19,10 +19,10 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me at gmail.com>
 
 --- a/config
 +++ b/config
-@@ -141,7 +141,7 @@ endif
+@@ -137,7 +137,7 @@ endif
  
  ifeq ($(ARCH), arm64)
- 	ifeq ($(KVER),$(filter 4.1% 4.4% 4.9% 5.4% 5.10% 5.15%,$(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
 +		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
  	endif

More information about the lede-commits mailing list