From c86b090d113edf834161281aa5ad3f6eacf8084b Mon Sep 17 00:00:00 2001
From: root <catalinii@yahoo.com>
Date: Thu, 28 Jul 2022 18:41:35 +0000
Subject: [PATCH] Add separate family for rock 5b - rockchip-rk3588

---
 config/boards/rock-5b.wip                     |  2 +-
 ...ig => linux-rockchip-rk3588-legacy.config} |  0
 config/sources/families/rk35xx.conf           | 27 +++++------------
 config/sources/families/rockchip-rk3588.conf  | 29 +++++++++++++++++++
 ...rock-5b_fix_source_so_boot_scr_works.patch |  0
 5 files changed, 37 insertions(+), 21 deletions(-)
 rename config/kernel/{linux-rk3588-rock5b-legacy.config => linux-rockchip-rk3588-legacy.config} (100%)
 create mode 100644 config/sources/families/rockchip-rk3588.conf
 rename patch/u-boot/{u-boot-rock-5b => u-boot-rockchip-rk3588}/radxa_vendor_uboot_rock-5b_fix_source_so_boot_scr_works.patch (100%)

diff --git a/config/boards/rock-5b.wip b/config/boards/rock-5b.wip
index f8ff0a11ee45..99a72894f742 100644
--- a/config/boards/rock-5b.wip
+++ b/config/boards/rock-5b.wip
@@ -1,6 +1,6 @@
 # Radxa RK3588 SoC
 BOARD_NAME="Rock 5B"
-BOARDFAMILY="rk35xx" # but will have its own LINUXFAMILY. this is a vendor kernel
+BOARDFAMILY="rockchip-rk3588"
 BOOTCONFIG="rock-5b-rk3588_defconfig"
 KERNEL_TARGET="legacy"
 FULL_DESKTOP="yes"
diff --git a/config/kernel/linux-rk3588-rock5b-legacy.config b/config/kernel/linux-rockchip-rk3588-legacy.config
similarity index 100%
rename from config/kernel/linux-rk3588-rock5b-legacy.config
rename to config/kernel/linux-rockchip-rk3588-legacy.config
diff --git a/config/sources/families/rk35xx.conf b/config/sources/families/rk35xx.conf
index 52d23a49549a..a014054ff3a3 100644
--- a/config/sources/families/rk35xx.conf
+++ b/config/sources/families/rk35xx.conf
@@ -1,15 +1,8 @@
 source "${BASH_SOURCE%/*}/include/rockchip64_common.inc"
 
-if [[ $BOARD == rock-3a ]]; then
-	BOOTSOURCE='https://github.com/radxa/u-boot.git'
-	BOOTBRANCH='branch:stable-4.19-rock3'
-	BOOTPATCHDIR="u-boot-rk35xx"
-elif [[ $BOARD == rock-5b ]]; then
-	BOOTSOURCE='https://github.com/radxa/u-boot.git'
-	BOOTBRANCH='branch:stable-5.10-rock5'
-	BOOTPATCHDIR="u-boot-rock-5b" # this is a vendor u-boot, totally separate
-	BOOTDIR="u-boot-rock-5b"      # use separate build dir, vendor u-boot
-fi
+BOOTSOURCE='https://github.com/radxa/u-boot.git'
+BOOTBRANCH='branch:stable-4.19-rock3'
+BOOTPATCHDIR="u-boot-rk35xx"
 OVERLAY_PREFIX='rk35xx'
 
 case $BRANCH in
@@ -18,22 +11,16 @@ case $BRANCH in
 		UBOOT_COMPILER="aarch64-linux-gnu-"
 		UBOOT_USE_GCC='< 8.0'
 		BOOTDIR='u-boot-rockchip64'
+		KERNELSOURCE='https://github.com/radxa/kernel'
+		KERNELBRANCH='branch:stable-4.19-rock3'
 		KERNELDIR='linux-rockchip64'
+		KERNELPATCHDIR='rk35xx-legacy'
 		if [[ $BOARD == rock-3a ]]; then
-			KERNELSOURCE='https://github.com/radxa/kernel'
-			KERNELBRANCH='branch:stable-4.19-rock3'
-			KERNELPATCHDIR='rk35xx-legacy'
 			BOOT_FDT_FILE="rockchip/rk3568-rock-3-a.dtb"
-		elif [[ $BOARD == rock-5b ]]; then
-			KERNELSOURCE='https://github.com/radxa/kernel'
-			KERNELBRANCH='branch:stable-5.10-rock5'
-			KERNELPATCHDIR='rk3588-legacy'
-			LINUXCONFIG=linux-rk3588-rock5b-legacy
-			LINUXFAMILY="rk3588-radxa-rock5b" # added by rpardini -- gotta be its own family to not conflict with rock-3a
 		fi
 
 	;;
-
+        
         # temporary until kernel 5.16 is well supported for rockchip64
         # it has to be its own family too
         edge)
diff --git a/config/sources/families/rockchip-rk3588.conf b/config/sources/families/rockchip-rk3588.conf
new file mode 100644
index 000000000000..d794a5626c43
--- /dev/null
+++ b/config/sources/families/rockchip-rk3588.conf
@@ -0,0 +1,29 @@
+source "${BASH_SOURCE%/*}/include/rockchip64_common.inc"
+
+BOOTSOURCE='https://github.com/radxa/u-boot.git'
+BOOTBRANCH='branch:stable-5.10-rock5'
+BOOTPATCHDIR="u-boot-rockchip-rk3588"
+
+OVERLAY_PREFIX='rockchip-rk3588'
+
+case $BRANCH in
+
+	legacy)
+		UBOOT_COMPILER="aarch64-linux-gnu-"
+		UBOOT_USE_GCC='< 8.0'
+		BOOTDIR='u-boot-rockchip64'
+		KERNELDIR='linux-rockchip64'
+		KERNELSOURCE='https://github.com/radxa/kernel'
+		KERNELBRANCH='branch:stable-5.10-rock5'
+		KERNELPATCHDIR='rockchip-rk3588-legacy'
+
+	;;
+
+esac
+
+prepare_boot_configuration
+
+family_tweaks_bsp()
+{
+	:
+}
diff --git a/patch/u-boot/u-boot-rock-5b/radxa_vendor_uboot_rock-5b_fix_source_so_boot_scr_works.patch b/patch/u-boot/u-boot-rockchip-rk3588/radxa_vendor_uboot_rock-5b_fix_source_so_boot_scr_works.patch
similarity index 100%
rename from patch/u-boot/u-boot-rock-5b/radxa_vendor_uboot_rock-5b_fix_source_so_boot_scr_works.patch
rename to patch/u-boot/u-boot-rockchip-rk3588/radxa_vendor_uboot_rock-5b_fix_source_so_boot_scr_works.patch