From ddcd68d0f79b1aefb2bcfe71b7cf1111dc8bf81a Mon Sep 17 00:00:00 2001
From: Ricardo Pardini <ricardo@pardini.net>
Date: Tue, 5 Mar 2024 22:25:37 +0100
Subject: [PATCH] rk35xx/rockchip-rk3588: vendor: the unthinkable! add `vendor`
 branch for new 6.1-rkr1 BSP vendor kernel, and keep `legacy` for the
 5.10-rkr6 BSP vendor kernel

- pointing to amazingfate's repo, for now
---
 config/sources/families/rk35xx.conf          | 15 +++++++++++----
 config/sources/families/rockchip-rk3588.conf | 15 ++++++++++++---
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/config/sources/families/rk35xx.conf b/config/sources/families/rk35xx.conf
index 81d2cfd43f..696f6d068a 100644
--- a/config/sources/families/rk35xx.conf
+++ b/config/sources/families/rk35xx.conf
@@ -16,17 +16,24 @@ OVERLAY_PREFIX='rk35xx'
 case $BRANCH in
 
 	legacy)
-		UBOOT_COMPILER="aarch64-linux-gnu-"
-		UBOOT_USE_GCC='< 8.0'
 		BOOTDIR='u-boot-rockchip64'
+		declare -g KERNEL_MAJOR_MINOR="5.10"   # Major and minor versions of this kernel.
+		declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo
 		KERNELSOURCE='https://github.com/armbian/linux-rockchip.git'
 		KERNELBRANCH='branch:rk-5.10-rkr6'
-		declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo
-		declare -g KERNEL_MAJOR_MINOR="5.10"   # Major and minor versions of this kernel.
 		KERNELPATCHDIR='rk35xx-legacy'
 
 		;;
 
+	vendor)
+		BOOTDIR='u-boot-rockchip64'
+		declare -g KERNEL_MAJOR_MINOR="6.1"    # Major and minor versions of this kernel.
+		declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo
+		KERNELSOURCE='https://github.com/amazingfate/linux-rockchip.git'
+		KERNELBRANCH='branch:rk-6.1-rkr1'
+		KERNELPATCHDIR='rk35xx-vendor-6.1'
+		;;
+
 esac
 
 prepare_boot_configuration
diff --git a/config/sources/families/rockchip-rk3588.conf b/config/sources/families/rockchip-rk3588.conf
index f922c85c05..4ab29237f4 100644
--- a/config/sources/families/rockchip-rk3588.conf
+++ b/config/sources/families/rockchip-rk3588.conf
@@ -18,17 +18,26 @@ case $BRANCH in
 
 	legacy)
 		BOOTSCRIPT='boot-rk3588-legacy.cmd:boot.cmd'
-		UBOOT_COMPILER="aarch64-linux-gnu-"
-		UBOOT_USE_GCC='< 8.0'
 		BOOTDIR='u-boot-rockchip64'
-		KERNELSOURCE='https://github.com/armbian/linux-rockchip.git'
 		declare -g KERNEL_MAJOR_MINOR="5.10"   # Major and minor versions of this kernel.
 		declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo
+		KERNELSOURCE='https://github.com/armbian/linux-rockchip.git'
 		KERNELBRANCH='branch:rk-5.10-rkr6'
 		KERNELPATCHDIR='rk35xx-legacy'
 		LINUXFAMILY=rk35xx
 		;;
 
+	vendor)
+		BOOTSCRIPT='boot-rk3588-legacy.cmd:boot.cmd'
+		BOOTDIR='u-boot-rockchip64'
+		declare -g KERNEL_MAJOR_MINOR="6.1"    # Major and minor versions of this kernel.
+		declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo
+		KERNELSOURCE='https://github.com/amazingfate/linux-rockchip.git'
+		KERNELBRANCH='branch:rk-6.1-rkr1'
+		KERNELPATCHDIR='rk35xx-vendor-6.1'
+		LINUXFAMILY=rk35xx
+		;;
+
 	edge)
 		LINUXFAMILY=rockchip-rk3588
 		LINUXCONFIG='linux-rockchip-rk3588-'$BRANCH