v9.10

- ROCK 5B/NanoPi 6/Orange Pi 5 (Plus)/ROCK 5A | Switch to mainline Linux
MichaIng · Jan 4, 2025 · b6a7729 · b6a7729
1 parent 1bf41db
commit b6a7729
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/.build/images/dietpi-installer b/.build/images/dietpi-installer
@@ -706,14 +706,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;;
-					78|79|80|82|85|91|92|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.
+					91|92|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) G_CONFIG_INJECT 'overlay_prefix=' 'overlay_prefix=rockchip-rk3588' /boot/dietpiEnv.txt;;
 					*) G_CONFIG_INJECT 'overlay_prefix=' 'overlay_prefix=rockchip' /boot/dietpiEnv.txt;;
 				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
+					91|92|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
 
@@ -1130,17 +1131,17 @@ _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';;
@@ -1970,8 +1971,8 @@ _EOF_'
 			/boot/dietpi/func/dietpi-set_hardware serialconsole enable ttySAC0
 			/boot/dietpi/func/dietpi-set_hardware serialconsole enable ttyGS0
 
-		# ROCKPro64, ROCK64, Pinebook Pro, NanoPi R4S, Quartz64, ASUS Tinker Board, NanoPi R2S, NanoPi NEO3, NanoPi M4V2, NanoPi M4/T4/NEO4, ROCK 4, NanoPi R5S/R5C, ROCK 3A, ASUS Tinker Board 2, Orange Pi 3B
-		elif [[ $G_HW_MODEL =~ ^(42|43|46|47|49|52|55|56|58|68|72|76|77|86|87)$ ]]
+		# ROCKPro64, ROCK64, Pinebook Pro, NanoPi R4S, Quartz64, ASUS Tinker Board, NanoPi R2S, NanoPi NEO3, NanoPi M4V2, NanoPi M4/T4/NEO4, ROCK 4, NanoPi R5S/R5C, ROCK 3A, ROCK 5B, NanoPi 6, Orange Pi 5, Orange Pi 5 Plus, ROCK 5A, ASUS Tinker Board 2, Orange Pi 3B
+		elif [[ $G_HW_MODEL =~ ^(42|43|46|47|49|52|55|56|58|68|72|76|77|78|79|80|82|85|86|87)$ ]]
 		then
 			/boot/dietpi/func/dietpi-set_hardware serialconsole enable ttyS2
 
@@ -1985,8 +1986,8 @@ _EOF_'
 		then
 			/boot/dietpi/func/dietpi-set_hardware serialconsole enable ttyS1
 
-		# Rockchip vendor/legacy: ROCK 5B, NanoPi 6, Orange Pi 5, Orange Pi 5 Plus, ROCK 5A, Radxa ZERO 3
-		elif [[ $G_HW_MODEL =~ ^(78|79|80|82|85|90|91|92|93)$ ]]
+		# Rockchip vendor/legacy: Radxa ZERO 3, Orange Pi 5 Max, NanoPi M6, Orange Pi 5 Pro
+		elif [[ $G_HW_MODEL =~ ^(90|91|92|93)$ ]]
 		then
 			/boot/dietpi/func/dietpi-set_hardware serialconsole enable ttyFIQ0