rk3588: edge: Set kernel patch folder name to default

Move kernel patch folder to archive/rockchip-rk3588-${KERNEL_MAJOR_MINOR} which is the default.
Also rename kernel config to linux-rockchip-rk3588-${KERNEL_MAJOR_MINOR}

config/sources/families/rockchip-rk3588.conf

@@ -42,28 +42,28 @@ case $BRANCH in
 	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.8"                                  # Major and minor versions of this kernel.
-		LINUXCONFIG="linux-rockchip-rk3588-${KERNEL_MAJOR_MINOR}" # Attention: not -${BRANCH} (edge/current/legacy), but -${KERNEL_MAJOR_MINOR} thus 6.8 / 6.10 etc
-		# No need to set KERNELPATCHDIR, since default is: KERNELPATCHDIR='archive/rockchip-rk3588-6.8'
+		KERNEL_MAJOR_MINOR="6.8"                                    # Major and minor versions of this kernel.
+		LINUXCONFIG="linux-rockchip-rk3588-${KERNEL_MAJOR_MINOR}"   # Attention: not -${BRANCH} (edge/current/legacy), but -${KERNEL_MAJOR_MINOR} thus 6.6 / 6.12 etc
+		# 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
-		LINUXCONFIG='linux-rockchip-rk3588-'$BRANCH
-		KERNEL_MAJOR_MINOR="6.10" # Major and minor versions of this kernel.
-		KERNELPATCHDIR='rockchip-rk3588-edge'
+		KERNEL_MAJOR_MINOR="6.10"                                   # Major and minor versions of this kernel.
+		LINUXCONFIG="linux-rockchip-rk3588-${KERNEL_MAJOR_MINOR}"   # Attention: not -${BRANCH} (edge/current/legacy), but -${KERNEL_MAJOR_MINOR} thus 6.8 / 6.10 etc
+		# 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
 		LINUXCONFIG='linux-rockchip-rk3588-'$BRANCH
 		KERNEL_MAJOR_MINOR="6.9"				# Major and minor versions of this kernel.
-		KERNELPATCHDIR='rockchip-rk3588-collabora'
-		KERNELSOURCE='https://gitlab.collabora.com/hardware-enablement/rockchip-3588/linux.git'
-		KERNELBRANCH='branch:rk3588-v6.9'		# Rolling kernel branch, will be rebased
-		KERNEL_DRIVERS_SKIP+=(driver_rtw88)		# This is a custom kernel, while the rtw88 driver patching expects pure mainline
+		KERNELPATCHDIR='rockchip-rk3588-collabora'                                              # Try to keep this as empty as possible. We won't work on top of Collabora's branch, they rebase all the time. New DTs are ok.
+		KERNELSOURCE='https://gitlab.collabora.com/hardware-enablement/rockchip-3588/linux.git' # Directly from Collabora...
+		KERNELBRANCH='branch:rk3588-v6.9'                                                       # Rolling kernel branch, will be rebased
+		KERNEL_DRIVERS_SKIP+=(driver_rtw88)                                                     # This is a custom kernel, while the rtw88 driver patching expects pure mainline
 		;;
 esac