RK3588: Switch to mainline Linux

Author: MichaIng

.build/images/dietpi-installer

@@ -708,20 +708,15 @@ setenv rootuuid "true"' /boot/boot.cmd
 				# Overlay prefix
 				case $G_HW_MODEL in
 					73) G_CONFIG_INJECT 'overlay_prefix=' 'overlay_prefix=rk3308' /boot/dietpiEnv.txt;;
-					92) G_CONFIG_INJECT 'overlay_prefix=' 'overlay_prefix=nanopi-m6' /boot/dietpiEnv.txt;; # For DSI disploy port overlays
-					78|79|80|82|85|91|93) G_CONFIG_INJECT 'overlay_prefix=' 'overlay_prefix=rk3588' /boot/dietpiEnv.txt;; # ToDo: There are multiple other prefixes used in the kernel package, "rock-5b", "rock-5ab", "rockchip" (for fixup), so the boot.cmd need heavy adjustments (eliminate the prefix entirely) to work with all overlays.
+					93) G_CONFIG_INJECT 'overlay_prefix=' 'overlay_prefix=rk3588' /boot/dietpiEnv.txt;; # ToDo: There are multiple other prefixes used in the kernel package, "rock-5b", "rock-5ab", "rockchip" (for fixup), so the boot.cmd need heavy adjustments (eliminate the prefix entirely) to work with all overlays.
+					78|79|80|82|85|91|92|94) G_CONFIG_INJECT 'overlay_prefix=' 'overlay_prefix=rockchip-rk3588' /boot/dietpiEnv.txt;;
 					*) G_CONFIG_INJECT 'overlay_prefix=' 'overlay_prefix=rockchip' /boot/dietpiEnv.txt;;
 				esac
-				# Overlays
-				case $G_HW_MODEL in
-					92) G_CONFIG_INJECT 'overlays=' 'overlays=display-dsi1-yx35' /boot/dietpiEnv.txt;; # Enable builtin LCD of official case
-					*) :;;
-				esac
 				# Console args
 				case $G_HW_MODEL in
 					73) G_CONFIG_INJECT 'consoleargs=' 'consoleargs=console=ttyS0,1500000' /boot/dietpiEnv.txt;; # headless
 					47|55|56) G_CONFIG_INJECT 'consoleargs=' 'consoleargs=console=ttyS2,1500000' /boot/dietpiEnv.txt;; # headless
-					78|79|80|82|85|91|92|93) G_EXEC sed --follow-symlinks -i 's/ttyAML0,115200/ttyFIQ0,1500000/' /boot/dietpiEnv.txt;; # RK3588
+					93) G_EXEC sed --follow-symlinks -i 's/ttyAML0,115200/ttyFIQ0,1500000/' /boot/dietpiEnv.txt;; # RK3588
 					*) G_EXEC sed --follow-symlinks -i 's/ttyAML0,115200/ttyS2,1500000/' /boot/dietpiEnv.txt;;
 				esac
 
@@ -1135,25 +1130,26 @@ _EOF_
 						*) model='nanopi-r5s';;
 					esac;;
 				77) model='rock-3a' kernel='rockchip64';;
-				78) model='rock-5b' kernel='rk35xx' branch='vendor';;
-				79) kernel='rk35xx' branch='vendor'
+				78) model='rock-5b' kernel='rockchip64';;
+				79) kernel='rockchip64'
 					case $HW_VARIANT in
 						2) model='nanopi-r6c';;
 						3) model='nanopct6';;
 						*) model='nanopi-r6s';;
 					esac;;
-				80) model='orangepi5' kernel='rk35xx' branch='vendor';;
-				82) model='orangepi5-plus' kernel='rk35xx' branch='vendor';;
+				80) model='orangepi5' kernel='rockchip64';;
+				82) model='orangepi5-plus' kernel='rockchip64';;
 				83) model='orangepizero3' kernel='sunxi64';;
-				85) model='rock-5a' kernel='rk35xx' branch='vendor';;
+				85) model='rock-5a' kernel='rockchip64';;
 				86) model='tinkerboard-2' kernel='rockchip64';;
 				87) model='orangepi3b' kernel='rockchip64';;
 				88) model='orangepizero2w' kernel='sunxi64';;
 				89) model='orangepi3-lts' kernel='sunxi64';;
-				90) model='radxa-zero3' kernel='rk35xx' branch='vendor';;
-				91) model='orangepi5-max' kernel='rk35xx' branch='vendor';;
-				92) model='nanopi-m6' kernel='rk35xx' branch='vendor';;
+				90) model='radxa-zero3' kernel='rockchip64';;
+				91) model='orangepi5-max' kernel='rockchip64';;
+				92) model='nanopi-m6' kernel='rockchip64';;
 				93) model='orangepi5pro' kernel='rk35xx' branch='vendor';;
+				94) model='orangepi5-ultra' kernel='rockchip64';;
 				*) :;;
 			esac
 
@@ -2035,12 +2031,12 @@ _EOF_'
 			/boot/dietpi/func/dietpi-set_hardware serialconsole enable ttyS0
 
 		# Rockchip mainline
-		elif [[ $G_HW_MODEL =~ ^(42|43|46|47|49|52|55|56|58|68|72|76|77|86|87)$ ]]
+		elif [[ $kernel == 'rockchip' || $kernel == 'rockchip64' ]]
 		then
 			/boot/dietpi/func/dietpi-set_hardware serialconsole enable ttyS2
 
 		# Rockchip vendor
-		elif [[ $G_HW_MODEL =~ ^(78|79|80|82|85|90|91|92|93|94|95)$ ]]
+		elif [[ $kernel == 'rk35xx' ]]
 		then
 			/boot/dietpi/func/dietpi-set_hardware serialconsole enable ttyFIQ0