orangepi5-plus: u-boot: restore vendor uboot with blobs

- mainline AT-F only for non-vendor BRANCH
- vendor branch uses vendor u-boot with rkbin blobs
- sorry for the confusion; I overlooked the conditional here
- Fixes: f45765e

Author: rpardini

config/boards/orangepi5-plus.conf

@@ -10,7 +10,9 @@ KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-orangepi-5-plus.dtb"
-BOOT_SCENARIO="tpl-blob-atf-mainline"
+BOOT_SCENARIO="spl-blobs"
+BOOT_SUPPORT_SPI="yes"
+BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
 declare -g UEFI_EDK2_BOARD_ID="orangepi-5plus" # This _only_ used for uefi-edk2-rk3588 extension
 
@@ -32,6 +34,10 @@ function post_family_config__orangepi5plus_use_mainline_uboot() {
 
 	display_alert "$BOARD" "Mainline U-Boot overrides for $BOARD - $BRANCH" "info"
 
+	# To reuse ATF code in rockchip64_common, let's change the BOOT_SCENARIO and call prepare_boot_configuration() again
+	declare -g BOOT_SCENARIO="tpl-blob-atf-mainline"
+	prepare_boot_configuration
+
 	declare -g BOOTCONFIG="orangepi-5-plus-rk3588_defconfig"
 	declare -g BOOTDELAY=1
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"