From 9584755e0a10e67e91fceddffb051ced098d051a Mon Sep 17 00:00:00 2001 From: Jiali Chen Date: Fri, 19 Dec 2025 08:43:52 +0000 Subject: [PATCH 1/4] fix: replace qcom_module_defconfig with qcom_module.config Because the qcom_module_defconfig with the deconfig suffix clears the arm64/deconfig configuration [1], causing other manufacturers' SOC to fail to start. [1] https://github.com/radxa/kernel/blob/linux-6.17.1/scripts/kconfig/Makefile#L102 Signed-off-by: Jiali Chen --- .github/local/Makefile.local | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/local/Makefile.local b/.github/local/Makefile.local index cd22b1f..3fdce6d 100644 --- a/.github/local/Makefile.local +++ b/.github/local/Makefile.local @@ -1 +1 @@ -KERNEL_DEFCONFIG := defconfig qcom_module_defconfig radxa.config radxa_custom.config +KERNEL_DEFCONFIG := defconfig qcom_module.config radxa.config radxa_custom.config From 325d3fb5fb6606943e3b30c1d916d032c77e0abe Mon Sep 17 00:00:00 2001 From: Jiali Chen Date: Fri, 19 Dec 2025 10:46:40 +0000 Subject: [PATCH 2/4] fix: disable CONFIG_EFI_ZBOOT Because the Amlogic bootloader overlaps with the GPT partition table, we can only use MBR partitioning, which results in non-standard EFI support [1]. So disable CONFIG_EFI_ZBOOT to support standard boot. [1] https://applink.feishu.cn/client/message/link/open?token=Ami%2F2XW%2Fg4ADaUUq6ElBC9Y%3D Signed-off-by: Jiali Chen Co-authored-by: ZHANG Yuntian --- .../linux/0002-feat-Radxa-custom-kernel-config.patch | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/patches/linux/0002-feat-Radxa-custom-kernel-config.patch b/debian/patches/linux/0002-feat-Radxa-custom-kernel-config.patch index a748989..1fdccf9 100644 --- a/debian/patches/linux/0002-feat-Radxa-custom-kernel-config.patch +++ b/debian/patches/linux/0002-feat-Radxa-custom-kernel-config.patch @@ -5,8 +5,8 @@ Subject: [PATCH] feat: Radxa custom kernel config Signed-off-by: HE Zhengyu --- - arch/arm64/configs/radxa_custom.config | 4 ++++ - 1 file changed, 4 insertions(+) + arch/arm64/configs/radxa_custom.config | 7 ++++ + 1 file changed, 7 insertions(+) create mode 100644 arch/arm64/configs/radxa_custom.config diff --git a/src/arch/arm64/configs/radxa_custom.config b/src/arch/arm64/configs/radxa_custom.config @@ -14,11 +14,14 @@ new file mode 100644 index 000000000000..4e8c56c4c5cd --- /dev/null +++ b/src/arch/arm64/configs/radxa_custom.config -@@ -0,0 +1,4 @@ +@@ -0,0 +1,7 @@ +# Kernel modules build by portage and XZ compressed fail to load with latest kmod tools. +# DKMS: https://bugs.gentoo.org/920837 +CONFIG_MODULE_COMPRESS_XZ=n +CONFIG_MODULE_COMPRESS_ZSTD=y ++ ++# Disable CONFIG_EFI_ZBOOT to support U-Boot stdboot with overlay ++CONFIG_EFI_ZBOOT=n -- 2.50.1 From ba2e0cf2c7c3965622fbec7925d7a5907f948703 Mon Sep 17 00:00:00 2001 From: Jiali Chen Date: Fri, 19 Dec 2025 10:47:27 +0000 Subject: [PATCH 3/4] fix: disable CONFIG_ARCH_ROCKCHIP The rockchip overlays in radxa-pkg/radxa-overlays are not compatible with the mainline kernel(> 6.1). Signed-off-by: Jiali Chen --- .../linux/0002-feat-Radxa-custom-kernel-config.patch | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/patches/linux/0002-feat-Radxa-custom-kernel-config.patch b/debian/patches/linux/0002-feat-Radxa-custom-kernel-config.patch index 1fdccf9..7afc112 100644 --- a/debian/patches/linux/0002-feat-Radxa-custom-kernel-config.patch +++ b/debian/patches/linux/0002-feat-Radxa-custom-kernel-config.patch @@ -5,8 +5,8 @@ Subject: [PATCH] feat: Radxa custom kernel config Signed-off-by: HE Zhengyu --- - arch/arm64/configs/radxa_custom.config | 7 ++++ - 1 file changed, 7 insertions(+) + arch/arm64/configs/radxa_custom.config | 10 ++++ + 1 file changed, 10 insertions(+) create mode 100644 arch/arm64/configs/radxa_custom.config diff --git a/src/arch/arm64/configs/radxa_custom.config b/src/arch/arm64/configs/radxa_custom.config @@ -14,7 +14,7 @@ new file mode 100644 index 000000000000..4e8c56c4c5cd --- /dev/null +++ b/src/arch/arm64/configs/radxa_custom.config -@@ -0,0 +1,7 @@ +@@ -0,0 +1,10 @@ +# Kernel modules build by portage and XZ compressed fail to load with latest kmod tools. +# DKMS: https://bugs.gentoo.org/920837 +CONFIG_MODULE_COMPRESS_XZ=n @@ -22,6 +22,9 @@ index 000000000000..4e8c56c4c5cd + +# Disable CONFIG_EFI_ZBOOT to support U-Boot stdboot with overlay +CONFIG_EFI_ZBOOT=n ++ ++# The rockchip overlays in radxa-pkg/radxa-overlays are not compatible with the mainline kernel(> 6.1). ++CONFIG_ARCH_ROCKCHIP=n -- 2.50.1 From 5aafb4770575e0a3ed54f061efe6f254ad172a4d Mon Sep 17 00:00:00 2001 From: Jiali Chen Date: Tue, 23 Dec 2025 10:02:27 +0000 Subject: [PATCH 4/4] chore: update submodules Signed-off-by: Jiali Chen --- src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src b/src index 996b43f..35ff911 160000 --- a/src +++ b/src @@ -1 +1 @@ -Subproject commit 996b43f72835d22c2f79e1f476dd34f90f9e69bb +Subproject commit 35ff911633010c177fd93f072bfac0e3d125db46