From 094f39655cbda25486d69b852f04100d2720aeae Mon Sep 17 00:00:00 2001
From: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com>
Date: Wed, 6 Mar 2024 16:59:49 +0100
Subject: [PATCH] NanoPi R5C/R5S: Bump U-Boot to mainline 2024.4-rc3 -
 Previously, Kwiboo's U-Boot was used due to his RK3568 patches
 (https://github.com/Kwiboo/u-boot-rockchip.git) - Mainline U-Boot 2024.1 has
 sufficient support for RK3568 merged - Mainline U-Boot 2024.4 received some
 improvements for RK3568

---
 config/boards/nanopi-r5c.csc | 6 ++----
 config/boards/nanopi-r5s.csc | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/config/boards/nanopi-r5c.csc b/config/boards/nanopi-r5c.csc
index f31bd045f114..7294466767eb 100644
--- a/config/boards/nanopi-r5c.csc
+++ b/config/boards/nanopi-r5c.csc
@@ -11,11 +11,9 @@ IMAGE_PARTITION_TABLE="gpt"
 FULL_DESKTOP="no"
 BOOT_LOGO="desktop"
 
-BOOTSOURCE="https://github.com/Kwiboo/u-boot-rockchip.git" # also following kwiboo's uboot due to his rk3568 work
-BOOTBRANCH_BOARD="commit:a6e84f9f5b90ff0fa3ac4e6b7e0d6e2c3ac9bb1b" # specific commit, from "branch:rk3568-2023.10" which is v2023.10-rc2 + kwiboo's patches (including GMAC)
-BOOTPATCHDIR="v2023.10"
+BOOTBRANCH_BOARD="tag:v2024.04-rc3"
+BOOTPATCHDIR="v2024.04"
 BOOTCONFIG="nanopi-r5c-rk3568_defconfig"
-BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
 
 OVERLAY_PREFIX="rockchip-rk3568"
 DEFAULT_OVERLAYS="nanopi-r5c-leds"
diff --git a/config/boards/nanopi-r5s.csc b/config/boards/nanopi-r5s.csc
index a0400bbe5069..63aa5e284aa9 100644
--- a/config/boards/nanopi-r5s.csc
+++ b/config/boards/nanopi-r5s.csc
@@ -11,11 +11,9 @@ IMAGE_PARTITION_TABLE="gpt"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 
-BOOTSOURCE="https://github.com/Kwiboo/u-boot-rockchip.git" # also following kwiboo's u-boot due to his rk3568 work
-BOOTBRANCH_BOARD="commit:a6e84f9f5b90ff0fa3ac4e6b7e0d6e2c3ac9bb1b" # specific commit, from "branch:rk3568-2023.10" which is v2023.10-rc2 + kwiboo's patches (including GMAC)
-BOOTPATCHDIR="v2023.10"
+BOOTBRANCH_BOARD="tag:v2024.04-rc3"
+BOOTPATCHDIR="v2024.04"
 BOOTCONFIG="nanopi-r5s-rk3568_defconfig"
-BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
 
 OVERLAY_PREFIX="rockchip-rk3568"
 DEFAULT_OVERLAYS="nanopi-r5s-leds"