diff --git a/config/boards/rock-3a.conf b/config/boards/rock-3a.conf index 9eba21ef9d..b7e8e6a93a 100644 --- a/config/boards/rock-3a.conf +++ b/config/boards/rock-3a.conf @@ -22,17 +22,15 @@ function post_family_config__rock-3a_use_mainline_uboot_except_vendor_and_add_sa BL31=$RKBIN_DIR/$BL31_BLOB $BOOTCONFIG_SATA spl/u-boot-spl.bin u-boot.dtb u-boot.itb;; rkspi_loader_sata.img" # use mainline uboot for _current_ and _edge_ - if [[ "$BRANCH" != "current" && "$BRANCH" != "edge" ]]; then - return 0 - fi + [[ "$BRANCH" =="vendor" ]] && return 0 display_alert "$BOARD" "Mainline U-Boot overrides for $BOARD - $BRANCH" "info" unset BOOTFS_TYPE # fixes armbian-install and unneeded for modern uboot anyway declare -g BOOTCONFIG="rock-3a-rk3568_defconfig" declare -g BOOTDELAY=1 declare -g BOOTSOURCE="https://github.com/u-boot/u-boot" - declare -g BOOTBRANCH="tag:v2025.04" - declare -g BOOTPATCHDIR="v2025.04" + declare -g BOOTBRANCH="tag:v2025.10" + declare -g BOOTPATCHDIR="v2025.10" declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin" unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already