Merge branch 'main' into rockchip-fix-sound-click

armbian · Jan 29, 2025 · ed0ca78 · ed0ca78
2 parents bf0591f + cba2963
commit ed0ca78
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 26 deletions.
diff --git a/config/boards/mba8mpxl-ras314.conf b/config/boards/mba8mpxl-ras314.conf
@@ -1,5 +1,5 @@
-# MBa8MPxL-RAS314 with TQMa8MPxL
-BOARD_NAME="TQ8MP-RAS314"
+# MBa8MP-RAS314 with TQMa8MPxL
+BOARD_NAME="MBa8MP-RAS314"
 BOARDFAMILY="imx8m"
 BOARD_MAINTAINER="schmiedelm"
 HAS_VIDEO_OUTPUT="yes"
@@ -27,20 +27,23 @@ function post_family_tweaks_bsp__mba8mpxl-ras314() {
 		KERNEL=="mlan*", ACTION=="add", RUN+="/sbin/modprobe btnxpuart"
 	EOF
 
-	# Define a function to be run board-side during postinst of the BSP
-	display_alert "Adding to bsp-cli" "${BOARD}: postinst for periferial access" "info"
-	postinst_functions+=("board_side_imx8m_bsp_cli_postinst") # add to the postinst function list
-	function board_side_imx8mpxl_bsp_cli_postinst() {
-		# Peripheral access for specific groups
-		addgroup --system --quiet periphery
-	}
+	if [[ "${BUILD_DESKTOP}" == "yes" ]]; then
+		# fix X11 config
+		mkdir -p "$destination"/etc/X11/xorg.conf.d
+		cat <<- XORG_HDMI_CONF > "$destination"/etc/X11/xorg.conf.d/10-hdmi.conf
+			Section "Device"
+				Identifier "etnaviv"
+				Driver     "modesetting"
+				Option     "kmsdev"      "/dev/dri/card1"
+				Option     "AccelMethod" "none" ### "glamor" to enable 3D acceleration, "none" to disable.
+				Option     "Atomic"      "On"
+			EndSection
+
+			Section "ServerFlags"
+				Option     "AutoAddGPU"  "false"
+				Option     "DRI"         "3"
+			EndSection
+		XORG_HDMI_CONF
+	fi
 
-	mkdir -p "$destination"/etc/X11/xorg.conf.d
-	cat <<- EOF > "$destination"/etc/X11/xorg.conf.d/02-driver.conf
-		Section "Device"
-		Identifier              "main"
-		driver                  "fbdev"
-		Option                  "fbdev" "/dev/fb0"
-		EndSection
-	EOF
 }
diff --git a/config/boards/mba8mpxl.conf b/config/boards/mba8mpxl.conf
@@ -13,12 +13,23 @@ BOOT_FDT_FILE="freescale/imx8mp-tqma8mpql-mba8mpxl.dtb"
 ASOUND_STATE="asound.state.tqma"
 
 function post_family_tweaks_bsp__mba8mpxl() {
-	mkdir -p "$destination"/etc/X11/xorg.conf.d
-	cat <<- EOF > "$destination"/etc/X11/xorg.conf.d/02-driver.conf
-		Section "Device"
-		Identifier              "main"
-		driver                  "fbdev"
-		Option                  "fbdev" "/dev/fb0"
-		EndSection
-	EOF
+
+	if [[ "${BUILD_DESKTOP}" == "yes" ]]; then
+		# fix X11 config
+		mkdir -p "$destination"/etc/X11/xorg.conf.d
+		cat <<- XORG_HDMI_CONF > "$destination"/etc/X11/xorg.conf.d/10-hdmi.conf
+			Section "Device"
+				Identifier "etnaviv"
+				Driver     "modesetting"
+				Option     "kmsdev"      "/dev/dri/card1"
+				Option     "AccelMethod" "none" ### "glamor" to enable 3D acceleration, "none" to disable.
+				Option     "Atomic"      "On"
+			EndSection
+
+			Section "ServerFlags"
+				Option     "AutoAddGPU"  "false"
+				Option     "DRI"         "3"
+			EndSection
+		XORG_HDMI_CONF
+	fi
 }
diff --git a/packages/bsp/common/etc/update-motd.d/10-armbian-header b/packages/bsp/common/etc/update-motd.d/10-armbian-header
@@ -56,7 +56,7 @@ for f in $MOTD_DISABLE; do
 done
 
 function get_wan_address() {
-	curl --connect-timeout 2 -s http://whatismyip.akamai.com/
+	curl --max-time 2 -s http://whatismyip.akamai.com/
 } # get wan ip address
 
 function get_ip_addresses() {