projects / openwrt / staging / jow.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cc2f85e)
kernel: qca-ssdk: drop 5.15 support
authorRobert Marko <robimarko@gmail.com>
Wed, 7 Jun 2023 12:31:58 +0000 (14:31 +0200)
committerChristian Marangi <ansuelsmth@gmail.com>
Sat, 10 Jun 2023 15:51:28 +0000 (17:51 +0200)
There is no need for SSDK to support 5.15 anymore since the only user and
possible future ones are on 6.1.

Signed-off-by: Robert Marko <robimarko@gmail.com>
package/kernel/qca-ssdk/patches/0005-SSDK-config-add-kernel-5.15.patch [deleted file] patch | blob | history
package/kernel/qca-ssdk/patches/0010-QSDK-config-Avoid-Werror-heroics.patch patch | blob | history
package/kernel/qca-ssdk/patches/0015-SSDK-config-add-kernel-6.1.patch patch | blob | history

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
deleted file mode 100644 (file)
index 7b19f5d..0000000
--- a/package/kernel/qca-ssdk/patches/0005-SSDK-config-add-kernel-5.15.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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
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 8eff0a9958ee804ce9609fc4301351801cdddc3f..f9c913fadf143820bfef31a0473974bfeb1b5e7e 100644 (file)
--- 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
@@ -1,7 +1,7 @@
-From ecd1e0c57fdf7f8916fa20f085e08bb4b6ba0396 Mon Sep 17 00:00:00 2001
+From d70d013ac1090565ebb71875f5bdc70840807428 Mon Sep 17 00:00:00 2001
 From: Alexandru Gagniuc <mr.nuke.me@gmail.com>
 Date: Fri, 23 Sep 2022 08:21:13 -0500
-Subject: [PATCH 10/11] QSDK: config: Avoid -Werror heroics
+Subject: [PATCH] QSDK: config: Avoid -Werror heroics
 
 Trying to compile the QSDK with warnings as errors is a very brave
 endeavor. It's also stupid as it doesn't work on ipq60xx:
@@ -19,10 +19,10 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
 
 --- a/config
 +++ b/config
-@@ -137,7 +137,7 @@ endif
+@@ -133,7 +133,7 @@ endif
  
  ifeq ($(ARCH), arm64)
-       ifeq ($(KVER),$(filter 4.1% 4.4% 4.9% 5.4% 5.15%,$(KVER)))
+       ifeq ($(KVER),$(filter 4.1% 4.4% 4.9% 5.4%,$(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
diff --git a/package/kernel/qca-ssdk/patches/0015-SSDK-config-add-kernel-6.1.patch b/package/kernel/qca-ssdk/patches/0015-SSDK-config-add-kernel-6.1.patch
index 77c54979a9cd2cf87b0e8248737b26d6d5c88e99..d0cf143562a2b753608b095fdc6083ed1c2af6d2 100644 (file)
--- a/package/kernel/qca-ssdk/patches/0015-SSDK-config-add-kernel-6.1.patch
+++ b/package/kernel/qca-ssdk/patches/0015-SSDK-config-add-kernel-6.1.patch
@@ -1,4 +1,4 @@
-From 1f9eb43f118b86c0b68e9d82bfae77471d6c3921 Mon Sep 17 00:00:00 2001
+From 05aba6d6dfd49fe10b33cf221b7e81250a67033c Mon Sep 17 00:00:00 2001
 From: Robert Marko <robimarko@gmail.com>
 Date: Thu, 29 Sep 2022 09:59:20 +0200
 Subject: [PATCH] SSDK: config: add kernel 6.1
@@ -13,23 +13,23 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
 
 --- a/config
 +++ b/config
-@@ -28,6 +28,10 @@ ifeq ($(KVER),$(filter 5.15%,$(KVER)))
- OS_VER=5_15
+@@ -24,6 +24,10 @@ ifeq ($(KVER),$(filter 5.4%,$(KVER)))
+       OS_VER=5_4
  endif
  
 +ifeq ($(KVER),$(filter 6.1%,$(KVER)))
-+OS_VER=6_1
++      OS_VER=6_1
 +endif
 +
  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.15%,$(KVER)))
-+      ifeq ($(KVER),$(filter 4.1% 4.4% 4.9% 5.4% 5.15% 6.1%,$(KVER)))
+-      ifeq ($(KVER),$(filter 4.1% 4.4% 4.9% 5.4%,$(KVER)))
++      ifeq ($(KVER),$(filter 4.1% 4.4% 4.9% 5.4% 6.1%,$(KVER)))
                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
  endif
@@ -39,8 +39,8 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
        KASAN_SHADOW_SCALE_SHIFT := 3
    endif
  
--  ifeq (5_4 5_15, $(OS_VER))
-+  ifeq (5_4 5_15 6_1, $(OS_VER))
+-  ifeq (5_4, $(OS_VER))
++  ifeq (5_4 6_1, $(OS_VER))
        ifeq ($(ARCH), arm64)
            KASAN_OPTION += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT)
         endif
@@ -48,8 +48,8 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  
    endif
  
--  ifeq ($(OS_VER),$(filter 4_4 5_4 5_15, $(OS_VER)))
-+  ifeq ($(OS_VER),$(filter 4_4 5_4 5_15 6_1, $(OS_VER)))
+-  ifeq ($(OS_VER),$(filter 4_4 5_4, $(OS_VER)))
++  ifeq ($(OS_VER),$(filter 4_4 5_4 6_1, $(OS_VER)))
                  MODULE_CFLAG += -DKVER34
                  MODULE_CFLAG += -DKVER32
              MODULE_CFLAG += -DLNX26_22
Staging tree of Jo-Philipp Wich