v6.15

+ Serial required for RockPro64: https://github.com/Fourdee/DietPi/issues/1812
MichaIng · Sep 8, 2018 · 7f9ff81 · 7f9ff81
1 parent 5cb8daf
commit 7f9ff81
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/PREP_SYSTEM_FOR_DIETPI.sh b/PREP_SYSTEM_FOR_DIETPI.sh
@@ -1174,10 +1174,13 @@ _EOF_
 
 		/DietPi/dietpi/func/dietpi-set_hardware serialconsole enable
 		# - Disable for post-1st run setup:
-		#	Exclude XU4: https://github.com/Fourdee/DietPi/issues/2038#issuecomment-416089875
-		if (( $G_HW_MODEL != 11 )); then
+		sed -i '/^[[:blank:]]*CONFIG_SERIAL_CONSOLE_ENABLE=/c\CONFIG_SERIAL_CONSOLE_ENABLE=0' /DietPi/dietpi.txt
+		# - must be enabled for the following:
+		#	XU4: https://github.com/Fourdee/DietPi/issues/2038#issuecomment-416089875
+		#	RockPro64: Fails to boot into kernel without serial enabled
+		if (( $G_HW_MODEL == 11 || $G_HW_MODEL == 42 )); then
 
-			sed -i '/^[[:blank:]]*CONFIG_SERIAL_CONSOLE_ENABLE=/c\CONFIG_SERIAL_CONSOLE_ENABLE=0' /DietPi/dietpi.txt
+			sed -i '/^[[:blank:]]*CONFIG_SERIAL_CONSOLE_ENABLE=/c\CONFIG_SERIAL_CONSOLE_ENABLE=1' /DietPi/dietpi.txt
 
 		fi
 

diff --git a/dietpi.txt b/dietpi.txt
@@ -190,7 +190,7 @@ CONFIG_WIFI_COUNTRY_CODE=GB
 
 #Serial Console: Set to 1 if you require a serial console.
 #	NB: Serial console is always enabled by default for 1st run setup, then disabled afterwards, unless set below.
-#	NB: must be ENABLED for the following boards: Odroid XU4/HC1/HC2
+#	NB: must be ENABLED for the following boards: Odroid XU4/HC1/HC2, RockPro64
 CONFIG_SERIAL_CONSOLE_ENABLE=0
 
 #Soundcard