From cefdde835a9f580a7317b237e2e196dc5e04efa6 Mon Sep 17 00:00:00 2001 From: EvilOlaf Date: Sat, 5 Apr 2025 16:10:49 +0200 Subject: [PATCH] radxa-zero3: enable wifi extension by default. allow newer kernels --- config/boards/radxa-zero3.csc | 6 +++++- extensions/radxa-aic8800.sh | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/config/boards/radxa-zero3.csc b/config/boards/radxa-zero3.csc index d1d18ad559..2ee8a0eddd 100644 --- a/config/boards/radxa-zero3.csc +++ b/config/boards/radxa-zero3.csc @@ -3,7 +3,7 @@ BOARD_NAME="Radxa ZERO 3" BOARDFAMILY="rk35xx" BOARD_MAINTAINER="" BOOTCONFIG="radxa-zero3-rk3566_defconfig" -KERNEL_TARGET="vendor,edge" +KERNEL_TARGET="vendor,current,edge" KERNEL_TEST_TARGET="vendor" FULL_DESKTOP="yes" BOOT_LOGO="desktop" @@ -12,6 +12,10 @@ IMAGE_PARTITION_TABLE="gpt" BOOT_SCENARIO="spl-blobs" BOOTFS_TYPE="fat" # Only for vendor/legacy + +AIC8800_TYPE="sdio" +enable_extension "radxa-aic8800" + function post_family_config__use_mainline_uboot_except_vendor() { # use mainline u-boot for _current_ and _edge_ if [[ "$BRANCH" != "current" && "$BRANCH" != "edge" ]]; then diff --git a/extensions/radxa-aic8800.sh b/extensions/radxa-aic8800.sh index ec52c3424b..3589066d96 100644 --- a/extensions/radxa-aic8800.sh +++ b/extensions/radxa-aic8800.sh @@ -10,7 +10,7 @@ function extension_finish_config__install_kernel_headers_for_aic8800_dkms() { function post_install_kernel_debs__install_aic8800_dkms_package() { - if linux-version compare "${KERNEL_MAJOR_MINOR}" ge 6.12; then + if linux-version compare "${KERNEL_MAJOR_MINOR}" ge 6.15; then display_alert "Kernel version is too recent" "skipping aic8800 dkms for kernel v${KERNEL_MAJOR_MINOR}" "warn" return 0 fi