qiurui
/
armbian-build
mirror of https://github.com/armbian/build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

get rid of vendor uboot, adjust aic8800

This commit is contained in:
EvilOlaf 2025-10-22 03:42:23 +00:00 committed by Igor
parent b6b21ba2d6
commit 3db41e086b
2 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
config/boards/radxa-zero3.csc
View File

@ -56,16 +56,13 @@ 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() {
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"
@ -80,19 +77,4 @@ function post_family_config__use_mainline_uboot_except_vendor() {
function write_uboot_platform() {
dd if=$1/u-boot-rockchip.bin of=$2 seek=64 conv=notrunc status=none
}
}
# Override family config for this board; let's avoid conditionals in family config.
function post_family_config_branch_vendor__radxa-zero3_use_vendor_uboot() {
BOOTSOURCE='https://github.com/radxa/u-boot.git'
BOOTBRANCH='branch:rk35xx-2024.01'
BOOTPATCHDIR="u-boot-radxa-latest"
UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB ROCKCHIP_TPL=$RKBIN_DIR/$DDR_BLOB;;u-boot-rockchip.bin"
unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
function write_uboot_platform() {
dd if=$1/u-boot-rockchip.bin of=$2 seek=64 conv=notrunc status=none
}
}
}

2
extensions/radxa-aic8800.sh
View File

@ -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