fix: update kernel config

* remove dkms supplied modules
* override CONFIG_PREEMPT for mali module

Signed-off-by: ZHANG Yuntian <[email protected]>

Makefile

@@ -8,7 +8,7 @@ KERNEL_FORK ?= sky1
 ARCH ?= arm64
 CROSS_COMPILE ?= aarch64-linux-gnu-
 DPKG_FLAGS ?= -d
-KERNEL_DEFCONFIG ?= defconfig cix.config cix_rs600.config radxa.config
+KERNEL_DEFCONFIG ?= defconfig cix.config cix_rs600.config radxa.config radxa_custom.config
 
 .PHONY: all
 all: build

debian/patches/0001-feat-radxa-custom-kernel-config.patch → debian/patches/0001-feat-radxa-common-kernel-config.patch

@@ -1,20 +1,20 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: ZHANG Yuntian <[email protected]>
 Date: Thu, 26 Dec 2024 11:03:06 +0000
-Subject: [PATCH] feat: Radxa custom kernel config
+Subject: [PATCH] feat: Radxa common kernel config
 
 Signed-off-by: ZHANG Yuntian <[email protected]>
 ---
- src/arch/arm64/configs/radxa.config | 14 ++++++++++
- 1 file changed, 14 insertions(+)
+ src/arch/arm64/configs/radxa.config | 37 ++++++++++++++++++++
+ 1 file changed, 37 insertions(+)
  create mode 100644 src/arch/arm64/configs/radxa.config
 
 diff --git a/src/arch/arm64/configs/radxa.config b/src/arch/arm64/configs/radxa.config
 new file mode 100644
 index 000000000000..c26829dd1cae
 --- /dev/null
 +++ b/src/arch/arm64/configs/radxa.config
-@@ -0,0 +1,14 @@
+@@ -0,0 +1,37 @@
 +# Disable kernel debug info
 +CONFIG_DEBUG_INFO=n
 +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=n
@@ -32,6 +32,29 @@ index 000000000000..c26829dd1cae
 +# zram-tools expect this to be a module
 +# Do not builtin!
 +CONFIG_ZRAM=m
++
++# Prefer r8125-dkms
++CONFIG_R8125=n
++
++# Prefer r8126-dkms
++CONFIG_R8126=n
++
++# Prefer rtkbt-dkms
++CONFIG_BT_HCIBTUSB_RTLBTUSB=n
++
++# Disable pgdrv
++CONFIG_REALTEK_PGTOOL=n
++CONFIG_PG_DRV=n
++
++# Prefer 8852bu-dkms
++CONFIG_RTL8852BU=n
++
++# Prefer 8852be-dkms
++CONFIG_RTL8852BE=n
++
++# Prefer rtw89-dkms
++CONFIG_RTW89=n
++CONFIG_RTW89_8852BE=n
 -- 
 2.47.1
 

debian/patches/0002-feat-radxa-custom-kernel-config.patch

@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: ZHANG Yuntian <[email protected]>
+Date: Thu, 09 Jan 2025 06:22:08 +0000
+Subject: [PATCH] feat: Radxa custom kernel config
+
+Signed-off-by: ZHANG Yuntian <[email protected]>
+---
+ src/arch/arm64/configs/radxa_custom.config | 4 ++++
+ 1 file changed, 4 insertions(+)
+ create mode 100644 src/arch/arm64/configs/radxa_custom.config
+
+diff --git a/src/arch/arm64/configs/radxa_custom.config b/src/arch/arm64/configs/radxa_custom.config
+new file mode 100644
+index 000000000000..c26829dd1cae
+--- /dev/null
++++ b/src/arch/arm64/configs/radxa_custom.config
+@@ -0,0 +1,4 @@
++# Closed source mali kernel module requires CONFIG_PREEMPT_RCU
++CONFIG_PREEMPT_VOLUNTARY=n
++CONFIG_PREEMPT=y
++CONFIG_PREEMPT_RCU=y
+-- 
+2.47.1
+

debian/patches/series

@@ -1 +1,2 @@
-0001-feat-radxa-custom-kernel-config.patch
+0001-feat-radxa-common-kernel-config.patch
+0002-feat-radxa-custom-kernel-config.patch