Merge branch 'main' into BPI-M4ZERO-007

armbian · Oct 9, 2024 · 3a09c1f · 3a09c1f
2 parents 5b0a9a5 + 067dd99
commit 3a09c1f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -52,7 +52,7 @@ jobs:
  # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
  # format to the repository Actions tab.
  - name: "Upload artifact"
- uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
+ uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4.4.1
  with:
  name: SARIF file
  path: results.sarif

diff --git a/config/boards/nanopi-m6.wip b/config/boards/nanopi-m6.wip
@@ -11,6 +11,8 @@ IMAGE_PARTITION_TABLE="gpt"
 BOOT_FDT_FILE="rockchip/rk3588s-nanopi-m6.dtb"
 BOOT_SCENARIO="spl-blobs"
 
+DEFAULT_OVERLAYS="nanopi-m6-display-dsi1-yx35" # Enable YX35 LCD
+
 function post_family_tweaks__nanopim6_naming_udev_audios() {
  display_alert "$BOARD" "Renaming NanoPi M6 HDMI audio" "info"
 

diff --git a/extensions/mesa-vpu.sh b/extensions/mesa-vpu.sh
@@ -29,7 +29,11 @@ function extension_prepare_config__3d() {
 
  # This should be enabled on all for rk3588 distributions where mesa and vendor kernel is present
  if [[ "${LINUXFAMILY}" =~ ^(rockchip-rk3588|rk35xx)$ && "$BRANCH" == vendor ]]; then
- declare -g DEFAULT_OVERLAYS="panthor-gpu"
+ if [[ -n $DEFAULT_OVERLAYS ]]; then
+ DEFAULT_OVERLAYS+=" panthor-gpu"
+ else
+ declare -g DEFAULT_OVERLAYS="panthor-gpu"
+ fi
  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
@@ -85,6 +85,10 @@ KERNELID=$(uname -r)
 # Get other variables
 ip_address=$(get_ip_addresses &)
 wan_ip_address=$(get_wan_address &)
+# Get access point info
+if systemctl is-active --quiet service hostapd && [ -f /etc/hostapd/hostapd.conf ]; then
+. /etc/hostapd/hostapd.conf
+fi
 
 # Display software vendor logo
 echo -e "\e[1;91m$(figlet -f small " $VENDOR")\e[0m";
@@ -151,8 +155,15 @@ if [[ -n $HARDWARE_STATUS ]]; then
 fi
 
 IFS='|' read -r ipv4s ipv6s <<< "$ip_address"
-echo -en " IP addresses: \x1B[93m(LAN)\x1B[0m IPv4: \x1B[92m${ipv4s// /, }\x1B[0m IPv6: \x1B[96m${ipv6s// /, }\x1B[0m"
+echo -en " IP addresses: \x1B[93m(LAN)\x1B[0m IPv4: \x1B[92m${ipv4s// /, }\x1B[0m IPv6: \x1B[96m${ipv6s// /, }\x1B[0m "
 if [[ -n $wan_ip_address ]]; then
 echo -e "\x1B[93m(WAN)\x1B[0m $wan_ip_address"
 fi
+
+# Display hostapd
+if [[ -n $ssid ]]; then
+ echo -e " WiFi AP: SSID: (\x1B[91m$ssid\x1B[0m), $(iw $interface info | grep channel | xargs)"
+fi
+
+
 echo ""