From 4e4b77923dfe23db9b091d19aff1bb857e24caf8 Mon Sep 17 00:00:00 2001
From: Nicolas Pereira <41456803+hqnicolas@users.noreply.github.com>
Date: Fri, 2 Aug 2024 20:33:23 -0300
Subject: [PATCH] Update board config h96-max to mainline u-boot

since armbian 24.8.0-trunk.205 this board stop working
find a fix on station-p2 for it
---
 config/boards/h96-tvbox-3566.tvb | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/config/boards/h96-tvbox-3566.tvb b/config/boards/h96-tvbox-3566.tvb
index 8db9d763f6..f74bb45d31 100644
--- a/config/boards/h96-tvbox-3566.tvb
+++ b/config/boards/h96-tvbox-3566.tvb
@@ -1,11 +1,31 @@
 # Rockchip RK3566 quad core SoC WIFI/BT eMMC USB2/3
 BOARD_NAME="h96-tvbox-3566"
-BOARDFAMILY="rk35xx"
+BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER="hqnicolas"
 BOOTCONFIG="rk3568_defconfig"
-KERNEL_TARGET="current,edge"
+KERNEL_TARGET="current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3566-h96-tvbox.dtb"
 IMAGE_PARTITION_TABLE="gpt"
-BOOT_SCENARIO="spl-blobs"
+
+# Mainline U-Boot
+function post_family_config__h96_max_use_mainline_uboot() {
+	display_alert "$BOARD" "Using mainline U-Boot for $BOARD / $BRANCH" "info"
+
+	declare -g BOOTCONFIG="generic-rk3568_defconfig"             # Use generic defconfig which should boot all RK3568 boards
+	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
+	declare -g BOOTBRANCH="tag:v2024.07"
+	declare -g BOOTPATCHDIR="v2024.07/board_${BOARD}"
+	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency
+
+	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"
+
+	# Disable stuff from rockchip64_common; we're using binman here which does all the work already
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
+
+	# 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
+	}
+}