From 3df4773ad3256fca27497fdac6a2f8ecb389666f Mon Sep 17 00:00:00 2001
From: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com>
Date: Sun, 9 Jun 2024 19:33:00 +0200
Subject: [PATCH] board: orangepi-5-plus: Add mainline U-Boot for edge kernel

Also improve board specs list
---
 config/boards/orangepi5-plus.conf | 36 ++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/config/boards/orangepi5-plus.conf b/config/boards/orangepi5-plus.conf
index f8372da79..f2d77fd8a 100644
--- a/config/boards/orangepi5-plus.conf
+++ b/config/boards/orangepi5-plus.conf
@@ -1,4 +1,4 @@
-# Rockchip RK3588 octa core 4/8/16GB RAM SoC NVMe USB3 USB-C 2.5GbE eMMC
+# Rockchip RK3588 octa core 4/8/16GB RAM SoC SPI NVMe 2x USB2 2x USB3 1x USB-C 2x 2.5GbE 3x HDMI
 BOARD_NAME="Orange Pi 5 Plus"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="efectn"
@@ -28,9 +28,39 @@ function post_family_tweaks__orangepi5plus_naming_audios() {
 	return 0
 }
 
-# Override uboot family config for this board; let's avoid conditionals in family config.
-function post_family_config__orangepi5plus_use_vendor_uboot() {
+# Use vendor-provided U-Boot for 'legacy' kernel branch; let's avoid conditionals in family config.
+function post_family_config_branch_legacy__orangepi5plus_use_vendor_uboot() {
 	BOOTSOURCE='https://github.com/orangepi-xunlong/u-boot-orangepi.git'
 	BOOTBRANCH='branch:v2017.09-rk3588'
 	BOOTPATCHDIR="legacy/u-boot-orangepi5-rk3588"
 }
+
+# Use vendor-provided U-Boot for 'vendor' kernel branch; let's avoid conditionals in family config.
+function post_family_config_branch_vendor__orangepi5plus_use_vendor_uboot() {
+	BOOTSOURCE='https://github.com/orangepi-xunlong/u-boot-orangepi.git'
+	BOOTBRANCH='branch:v2017.09-rk3588'
+	BOOTPATCHDIR="legacy/u-boot-orangepi5-rk3588"
+}
+
+# Mainline U-Boot for edge kernel
+function post_family_config_branch_edge__nanopct6_use_mainline_uboot() {
+	display_alert "$BOARD" "Mainline U-Boot overrides for $BOARD - $BRANCH" "info"
+
+	declare -g BOOTCONFIG="orangepi-5-plus-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 U-Boot
+	declare -g BOOTBRANCH="tag:v2024.07-rc4"
+	declare -g BOOTPATCHDIR="v2024.07/board_${BOARD}"
+	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
+	}
+}