merge rockchip64 and rockchip-rk3588

config/sources/families/include/rockchip64_common.inc

@@ -27,7 +27,7 @@ RKBIN_DIR="$SRC/cache/sources/rkbin-tools"
 case $BRANCH in
 
 	current)
-		declare -g KERNEL_MAJOR_MINOR="6.6"
+		declare -g KERNEL_MAJOR_MINOR="6.12"
 		declare -g LINUXFAMILY=rockchip64
 		declare -g LINUXCONFIG='linux-rockchip64-'$BRANCH
 		;;
@@ -122,7 +122,7 @@ case "$BOOT_SOC" in
 		# ROCKUSB_BLOB is used to flash a board with rkdeveloptool (Linux, can use 'rkdevflash' extension) or RKDevTool (Windows) in MASKROM mode
 		ROCKUSB_BLOB="rk35/rk356x_spl_loader_v1.21.113.bin"
 		BOOT_SOC_MKIMAGE="rk3568" # mkimage does not know about rk3566, and rk3568 works.
-		BOOTENV_FILE='rk356x.txt'
+		BOOTENV_FILE='rk35xx.txt'
 		;;
 
 	rk3568)
@@ -132,7 +132,7 @@ case "$BOOT_SOC" in
 		BL31_BLOB="${BL31_BLOB:-"rk35/rk3568_bl31_v1.44.elf"}"
 		# ROCKUSB_BLOB is used to flash a board with rkdeveloptool (Linux, can use 'rkdevflash' extension) or RKDevTool (Windows) in MASKROM mode
 		ROCKUSB_BLOB="rk35/rk356x_spl_loader_v1.21.113.bin"
-		BOOTENV_FILE='rk356x.txt'
+		BOOTENV_FILE='rk35xx.txt'
 		;;
 
 	rk3576)
@@ -148,6 +148,7 @@ case "$BOOT_SOC" in
 		BL31_BLOB="${BL31_BLOB:-"rk35/rk3588_bl31_v1.45.elf"}"
 		# ROCKUSB_BLOB is used to flash a board with rkdeveloptool (Linux, can use 'rkdevflash' extension) or RKDevTool (Windows) in MASKROM mode
 		ROCKUSB_BLOB="rk35/rk3588_spl_loader_v1.16.113.bin"
+		BOOTENV_FILE='rk35xx.txt'
 		;;
 esac
 

config/sources/families/rockchip-rk3588.conf

@@ -39,22 +39,6 @@ case $BRANCH in
 		LINUXFAMILY=rk35xx
 		;;
 
-	current)
-		# Branch based on a stable kernel release (will stay on the next LTS kernel release once released, 6.12? LTS)
-		LINUXFAMILY=rockchip-rk3588
-		KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel.
-		LINUXCONFIG="linux-rockchip-rk3588-${BRANCH}"
-		# No need to set KERNELPATCHDIR, since default is: KERNELPATCHDIR='archive/rockchip-rk3588-${KERNEL_MAJOR_MINOR}'
-		;;
-
-	edge)
-		# Branch based on the latest kernel release including RC releases, to benefit from the latest RK3588 mainline advancements. Might be unstable!
-		LINUXFAMILY=rockchip-rk3588
-		KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel.
-		LINUXCONFIG="linux-rockchip-rk3588-${BRANCH}"
-		# No need to set KERNELPATCHDIR, since default is: KERNELPATCHDIR='archive/rockchip-rk3588-${KERNEL_MAJOR_MINOR}'
-		;;
-
 	collabora)
 		# Collabora's rk3588, where the action is these days
 		LINUXFAMILY=rockchip-rk3588