Merge branch 'armbian:main' into main

config/boards/armsom-w3.csc

@@ -28,3 +28,12 @@ function post_family_tweaks__armsom-w3_naming_audios() {
 
 	return 0
 }
+
+function post_family_tweaks__armsom-w3_fix_m2_bluetooth() {
+	display_alert "$BOARD" "Fixing armsom-w3 m.2 usb bluetooth" "info"
+
+	mkdir -p $SDCARD/etc/udev/rules.d/
+	echo 'ACTION=="add", SUBSYSTEM=="usb",ATTR{bConfigurationValue}=="", ATTR{bConfigurationValue}="1"' > $SDCARD/etc/udev/rules.d/91-m2-usb-bluetooth.rules
+
+	return 0
+}

config/boards/nanopct6-lts.conf

@@ -0,0 +1,9 @@
+# Rockchip RK3588S octa core 8GB RAM SoC eMMC USB3 USB2 1x GbE 2x 2.5GbE
+source "${SRC}/config/boards/nanopct6.conf"
+BOARD_NAME="NanoPC T6 LTS"
+# Important: despite sourcing the nanopct6 file above, this file still has to contain some variables, due the way Armbian's JSON matrix generator works.
+BOARDFAMILY="rockchip-rk3588"
+BOARD_MAINTAINER=""
+BOOT_FDT_FILE="rockchip/rk3588-nanopc-t6-lts.dtb" # As opposed to "rockchip/rk3588-nanopc-t6.dtb" for the non-LTS version
+KERNEL_TARGET="edge,current,vendor"
+KERNEL_TEST_TARGET="vendor,current"

config/boards/orangepi5-max.csc

@@ -0,0 +1,48 @@
+# Rockchip RK3588 octa core 4/8/16GB RAM SoC SPI NVMe 2x USB2 2x USB3 2x HDMI
+BOARD_NAME="Orange Pi 5 Max"
+BOARDFAMILY="rockchip-rk3588"
+BOARD_MAINTAINER=""
+BOOTCONFIG="orangepi-5-max-rk3588_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
+BOOT_SOC="rk3588"
+KERNEL_TARGET="vendor"
+KERNEL_TEST_TARGET="vendor"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3588-orangepi-5-max.dtb"
+BOOT_SCENARIO="spl-blobs"
+BOOT_SUPPORT_SPI="yes"
+BOOT_SPI_RKSPI_LOADER="yes"
+IMAGE_PARTITION_TABLE="gpt"
+enable_extension "bcmdhd"
+BCMDHD_TYPE="sdio"
+
+function post_family_tweaks__orangepi5max_naming_audios() {
+	display_alert "$BOARD" "Renaming orangepi5max audios" "info"
+
+	mkdir -p $SDCARD/etc/udev/rules.d/
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi0-sound", ENV{SOUND_DESCRIPTION}="HDMI0 Audio"' > $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi1-sound", ENV{SOUND_DESCRIPTION}="HDMI1 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-es8388-sound", ENV{SOUND_DESCRIPTION}="ES8388 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+
+	return 0
+}
+
+function post_family_tweaks_bsp__orangepi5max_bluetooth() {
+	display_alert "$BOARD" "Installing ap6611s-bluetooth.service" "info"
+
+	# Bluetooth on this board is handled by a Broadcom (AP6611S) chip and requires
+	# a custom brcm_patchram_plus binary, plus a systemd service to run it at boot time
+	install -m 755 $SRC/packages/bsp/rk3399/brcm_patchram_plus_rk3399 $destination/usr/bin
+	cp $SRC/packages/bsp/rk3399/rk3399-bluetooth.service $destination/lib/systemd/system/ap6611s-bluetooth.service
+
+	# Reuse the service file, ttyS0 -> ttyS7; BCM4345C5.hcd -> SYN43711A0.hcd
+	sed -i 's/ttyS0/ttyS7/g' $destination/lib/systemd/system/ap6611s-bluetooth.service
+	sed -i 's/BCM4345C5.hcd/SYN43711A0.hcd/g' $destination/lib/systemd/system/ap6611s-bluetooth.service
+	return 0
+}
+
+function post_family_tweaks__orangepi5max_enable_bluetooth_service() {
+	display_alert "$BOARD" "Enabling ap6611s-bluetooth.service" "info"
+	chroot_sdcard systemctl enable ap6611s-bluetooth.service
+	return 0
+}