JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Radxa Zero 3: Switch to U-Boot v2025.10-rc2

Browse Source 
Switch to newer U-Boot since it works reliably and provides upstream
improvements.

Add patch/u-boot/v2025.10 and the generic patch, as BOOTPATCHDIR cannot
be unset (fallback to legacy fails).

BOOT_SCENARIO="binman-atf-mainline" cannot be set here since it applies
globally to the CSC file and would break branch=vendor. Users who want
it can enable it manually.
This commit is contained in:
Andreas Reis
2025-08-16 20:18:42 +02:00
committed by Rolf Leggewie
parent 79fd84f812
commit a841c8da09
2 changed files with 107 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,20 +56,24 @@ 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
return 0
fi
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.04"
BOOTPATCHDIR="v2025.04"
BOOTBRANCH="tag:v2025.10-rc2"
BOOTPATCHDIR="v2025.10"
UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB ROCKCHIP_TPL=$RKBIN_DIR/$DDR_BLOB;;u-boot-rockchip.bin"
## For binman-atf-mainline: setting BOOT_SCENARIO at the top would break branch=vendor, so we don't enable it globally.
# We cannot set BOOT_SOC=rk3566 due to side effects in Armbian scripts; ATF_TARGET_MAP is the safer override.
# ATF does not currently separate rk3566 from rk3568.
#ATF_TARGET_MAP="M0_CROSS_COMPILE=arm-linux-gnueabi- PLAT=rk3568 bl31;;build/rk3568/release/bl31/bl31.elf:bl31.elf"
#UBOOT_TARGET_MAP="BL31=bl31.elf ROCKCHIP_TPL=$RKBIN_DIR/$DDR_BLOB;;u-boot-rockchip.bin"
unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd