v8.24

- RPi | Add detection support for RPi 5, including the new dtb path, and CM 4S (not publicly sold, but does not hurt)
MichaIng · Nov 16, 2023 · 6e848a1 · 6e848a1
1 parent 9402171
commit 6e848a1
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/dietpi/func/dietpi-obtain_hw_model b/dietpi/func/dietpi-obtain_hw_model
@@ -69,6 +69,7 @@
 	# G_HW_MODEL 12 Odroid C2
 	# G_HW_MODEL 11 Odroid XU3/XU4/MC1/HC1/HC2
 	# G_HW_MODEL 10 Odroid C1
+	# G_HW_MODEL 5 Raspberry Pi 5
 	# G_HW_MODEL 4 Raspberry Pi 4/400
 	# G_HW_MODEL 3 Raspberry Pi 3/3+/Zero 2
 	# G_HW_MODEL 2 Raspberry Pi 2
@@ -166,6 +167,8 @@
 				12) G_HW_MODEL_NAME='RPi Zero 2 W'  G_HW_MODEL=3 G_HW_ONBOARD_WIFI=1;;
 				13) G_HW_MODEL_NAME='RPi 400' G_HW_MODEL=4 G_HW_ONBOARD_WIFI=1;;
 				14) G_HW_MODEL_NAME='RPi CM 4' G_HW_MODEL=4;;
+				15) G_HW_MODEL_NAME='RPi CM 4S' G_HW_MODEL=4;;
+				17) G_HW_MODEL_NAME='RPi 5 Model B' G_HW_MODEL=5;;
 			esac
 			# Manufacturer
 			# shellcheck disable=SC2249
@@ -587,7 +590,7 @@
 			fi
 
 		# RPi? Detect via ondisk device tree file instead of /proc content, for chroot/systemd-nspawn support
-		elif for i in /boot/bcm*-rpi-*\.dtb; do [[ -f $i ]] && break; done; then
+		elif for i in /boot/{,firmware/}bcm*-rpi-*\.dtb; do [[ -f $i ]] && break; done; then
 
 			# Detect exact RPi model
 			RPi_BoardInfo