Rock5B+: Use upstream u-boot for vendor branch too

Author: HeyMeco

config/boards/rock-5b-plus.conf

@@ -28,7 +28,30 @@ function post_family_tweaks__rock5b_naming_audios() {
 }
 
 # Mainline u-boot tree
-# see rock-5b.conf and https://github.com/armbian/build/pull/7135
+# Vendor:
+function post_family_config_branch_vendor__rock-5b_use_mainline_uboot() {
+	display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"
+
+	declare -g BOOTCONFIG="rock5b-rk3588_defconfig"              # override the default for the board/family
+	declare -g BOOTDELAY=1                                       # Wait for UART interrupt to enter UMS/RockUSB mode etc
+	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline tree
+	declare -g BOOTBRANCH="branch:master"                         #
+	declare -g BOOTPATCHDIR="master"                           # empty; defconfig changes are done in hook below
+	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
+
+	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
+	function write_uboot_platform() {
+		dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
+	}
+
+	function write_uboot_platform_mtd() {
+		flashcp -v -p "$1/u-boot-rockchip-spi.bin" /dev/mtd0
+	}
+}
+
+# Edge:
 function post_family_config_branch_edge__rock-5b_use_mainline_uboot() {
 	display_alert "$BOARD" "mainline (next branch) u-boot overrides for $BOARD / $BRANCH" "info"
 
@@ -38,8 +61,8 @@ function post_family_config_branch_edge__rock-5b_use_mainline_uboot() {
 	declare -g BOOTCONFIG="rock5b-rk3588_defconfig"              # override the default for the board/family
 	declare -g BOOTDELAY=1                                       # Wait for UART interrupt to enter UMS/RockUSB mode etc
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline tree
-	declare -g BOOTBRANCH="tag:v2025.04"                         #
-	declare -g BOOTPATCHDIR="v2025.04"                           # empty; defconfig changes are done in hook below
+	declare -g BOOTBRANCH="branch:master"                         #
+	declare -g BOOTPATCHDIR="master"                           # empty; defconfig changes are done in hook below
 	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
@@ -55,8 +78,6 @@ function post_family_config_branch_edge__rock-5b_use_mainline_uboot() {
 }
 
 function post_config_uboot_target__extra_configs_for_rock5b_mainline_environment_in_spi() {
-	[[ "${BRANCH}" != "edge" ]] && return 0
-
 	display_alert "$BOARD" "u-boot configs for ${BOOTBRANCH} u-boot config BRANCH=${BRANCH}" "info"
 	run_host_command_logged scripts/config --set-val CONFIG_ENV_IS_NOWHERE "n"
 	run_host_command_logged scripts/config --set-val CONFIG_ENV_IS_IN_SPI_FLASH "y"