Skip to content

radxa-zero3 maintenance #8794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 22, 2025
Merged

radxa-zero3 maintenance #8794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e359f73
get rid of vendor uboot, adjust aic8800
EvilOlaf Oct 22, 2025
d73ac88
mainline uboot doesnt work with vendor kernel
EvilOlaf Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions config/boards/radxa-zero3.csc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,14 @@ function post_family_tweaks__enable_aic8800_bluetooth_service() {
fi
}

function post_family_config__use_mainline_uboot_except_vendor() {
# use mainline u-boot for _current_ and _edge_
if [[ "$BRANCH" != "current" && "$BRANCH" != "edge" ]]; then
return 0
fi
function post_family_config__use_mainline_uboot() {
[[ "${BRANCH}" == "vendor" ]] && return 0

unset BOOT_FDT_FILE # boot.scr will use whatever u-boot detects and sets 'fdtfile' to
unset BOOTFS_TYPE # mainline u-boot can boot ext4 directly
BOOTCONFIG="radxa-zero-3-rk3566_defconfig"
BOOTSOURCE="https://github.com/u-boot/u-boot"
BOOTBRANCH="tag:v2025.10-rc2"
BOOTBRANCH="tag:v2025.10"
BOOTPATCHDIR="v2025.10"

UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB ROCKCHIP_TPL=$RKBIN_DIR/$DDR_BLOB;;u-boot-rockchip.bin"
Expand Down Expand Up @@ -95,4 +93,4 @@ function post_family_config_branch_vendor__radxa-zero3_use_vendor_uboot() {
function write_uboot_platform() {
dd if=$1/u-boot-rockchip.bin of=$2 seek=64 conv=notrunc status=none
}
}
}
2 changes: 1 addition & 1 deletion extensions/radxa-aic8800.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.18; then
if linux-version compare "${KERNEL_MAJOR_MINOR}" ge 6.19; then
display_alert "Kernel version is too recent" "skipping aic8800 dkms for kernel v${KERNEL_MAJOR_MINOR}" "warn"
return 0
fi
Expand Down