MBa8MPxL: cleanup fix X11 settings

- post_family_tweaks_bsp_ is called during the build of armbian-bsp-cli-xxx
- the cli package is built separately on the build server
- comparisons to build parameters such as DESKTOP_ENVIRONMENT do not work

Signed-off-by: Martin Schmiedel <Martin.Schmiedel@tq-group.com>
This commit is contained in:
Martin Schmiedel 2025-01-28 13:01:55 +01:00 committed by Igor
parent f3ad742fa3
commit 62e7bfcdf8
2 changed files with 35 additions and 36 deletions

View File

@ -22,28 +22,27 @@ function post_family_tweaks_bsp__mba8mpxl-ras314() {
run_host_command_logged cp -Pv "pcieuart8997_combo_v4.bin" "$destination/lib/firmware/mrvl/" || exit_with_error "Unable to copy mrvl firmware"
# Add udev rule to delay btnxpuart loading
cat <<- EOF > "${destination}"/etc/udev/rules.d/10-nxp-bluetooth-delay.rules
cat <<- NXP_UDEV_RULE > "${destination}"/etc/udev/rules.d/10-nxp-bluetooth-delay.rules
# wait until combo FW is loaded by wifi driver
KERNEL=="mlan*", ACTION=="add", RUN+="/sbin/modprobe btnxpuart"
EOF
NXP_UDEV_RULE
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
# fix X11 config
mkdir -p "$destination"/etc/X11/xorg.conf.d
Section "ServerFlags"
Option "AutoAddGPU" "false"
Option "DRI" "3"
EndSection
XORG_HDMI_CONF
fi
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
}

View File

@ -14,22 +14,22 @@ ASOUND_STATE="asound.state.tqma"
function post_family_tweaks_bsp__mba8mpxl() {
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
# 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
Section "ServerFlags"
Option "AutoAddGPU" "false"
Option "DRI" "3"
EndSection
XORG_HDMI_CONF
fi
}