improve boot config txt

openWB · Oct 9, 2024 · 78ececa · 78ececa
1 parent 24d0d24
commit 78ececa
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 29 deletions.
diff --git a/data/config/boot_config.txt b/data/config/boot_config.txt
@@ -1,9 +1,17 @@
 # openwb - begin
-# openwb-version:3
+# openwb-version:4
 # Do not edit this section! We need begin/end and version for proper updates!
 [all]
+[notcm4]
 gpio=4,5,7,11,17,22,23,24,25,26,27=op,dl
 gpio=6,8,9,10,12,13,16,21=ip,pu
+
+[cm4]
+# GPIO 22 is the buzzer on computemodule4
+gpio=4,5,7,11,17,23,24,25,26,27=op,dl
+gpio=6,8,9,10,12,13,16,21=ip,pu
+
+[all]
 # enable uart for modbus port on older addon hat
 # this also requires to disable Bluetooth
 dtoverlay=disable-bt

diff --git a/data/config/boot_config_enterprise.txt b/data/config/boot_config_enterprise.txt
diff --git a/runs/atreboot.sh b/runs/atreboot.sh
@@ -95,21 +95,6 @@ chmod 666 "$LOGFILE"
 
 	revision=$(grep "Revision" /proc/cpuinfo | awk '{print $3}')
 
-	# Ausgabe zur Erkennung von Compute Module 4 oder Raspberry Pi 4
-	case $revision in
-		a03140 | b03140 | c03140 | d03140)
-			echo "Raspberry Pi 4 Model B erkannt."
-			boot_config_source="${OPENWBBASEDIR}/data/config/boot_config.txt"
-			;;
-		a03111 | b03111 | c03111)
-			echo "Raspberry Pi Compute Module 4 erkannt."
-			boot_config_source="${OPENWBBASEDIR}/data/config/boot_config_enterprise.txt"
-			;;
-		*)
-			echo "Unbekanntes Raspberry Pi-Modell. Nutze Standardkonfiguration für boot/config.txt."
-			boot_config_source="${OPENWBBASEDIR}/data/config/boot_config.txt"
-		;;
-	esac
 	boot_config_target="/boot/config.txt"
 	echo "checking init in $boot_config_target..."
 	if versionMatch "$boot_config_source" "$boot_config_target"; then