Copy instand of move the boot files for symbolic-unsupported /boot filesystem

Just for keeping them

.github/ISSUE_TEMPLATE/bugreport.yml

@@ -56,17 +56,15 @@ body:
         - Other
     validations:
       required: true
-  - type: textarea
+  - type: input
     id: logs
     attributes:
-      label: Relevant log output
-      description: "
-      Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
-      <h3>
-      You can find logs in output/debug folder
-      </h3>
-      "
-      render: shell
+      label: Relevant log URL
+      description: |
+        Run with `SHARE_LOG=yes`, at the end of log you will get something like this
+        ```[🌿] Log uploaded, share URL: [ https://paste.armbian.com/xxx ]```
+        Paste the URL on here.
+      placeholder: https://paste.armbian.com/xxx
   - type: checkboxes
     id: terms
     attributes:

.github/workflows/build-board-list.yml

@@ -0,0 +1,20 @@
+name: Rebuild board list in GHA menu
+on:
+  push:
+    paths:
+      - 'config/boards/*.*'
+    branches: [ main ]
+
+jobs:
+
+  Run:
+    name: "Execute workflow"
+    if: ${{ github.repository_owner == 'Armbian' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Repository Dispatch
+        uses: peter-evans/repository-dispatch@v2
+        with:
+          token: ${{ secrets.ACCESS_TOKEN }}
+          repository: armbian/os
+          event-type: "Refresh board list"

.github/workflows/build-train.yml

@@ -0,0 +1,21 @@
+name: Run build train on config changes
+on:
+  push:
+    branches:
+      - 'main'
+    paths:
+      - 'config/*.config'
+
+jobs:
+
+  Run:
+    name: "Execute workflow"
+    if: ${{ github.repository_owner == 'Armbian' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Repository Dispatch
+        uses: peter-evans/repository-dispatch@v2
+        with:
+          token: ${{ secrets.ACCESS_TOKEN }}
+          repository: armbian/os
+          event-type: "Repository update"

.github/workflows/scorecard.yml

@@ -31,7 +31,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@v2.1.2
+        uses: ossf/scorecard-action@v2.1.3
         with:
           results_file: results.sarif
           results_format: sarif

.gitignore

@@ -22,6 +22,7 @@ ubuntu-*-cloudimg-console.log
 .DS_Store
 *~
 *.swp
+/__pycache__/*
 
 # Mainly generated by merge tools like 'meld'
 *.orig

README.md

@@ -2,17 +2,10 @@
   <a href="#build-framework">
   <img src=".github/armbian-logo.png" alt="Armbian logo" width="144">
   </a><br>
-  <strong>Armbian Linux Build Framework</strong><br>
-  <h1 align=center>NEXT GENERATION</h1>
-<p align="center">
-<a href=https://github.com/armbian/os/releases/latest><img alt="Armbian OS" src="https://img.shields.io/github/actions/workflow/status/armbian/os/build-images.yml?logo=githubactions&label=Build%20Nighlty%20Images&style=for-the-badge&branch=main"></a><br>
-( Classic build framework remains on master branch, frozen and unmaintained )<br> <br>
-</p>
-
-- in case of troubles, keep using master/v23.02 branch
-- PR's are going to <b>main</b> branch, optional to master/v23.02
-- do not use master and main in the same folder
-
+  <strong>Armbian Linux Build Framework</strong><br><h3>
+ $${\color{black}NEXT\space \color{red}gen}$$
+ </h3> 
+ 
 ## Table of contents
 
 - [What this project does?](#what-this-project-does)
@@ -24,7 +17,7 @@
 - [Support](#support)
 - [Contact](#contact)
 - [Contributors](#contributors)
-- [Sponsors](#sponsors)
+- [Partners](#armbian-partners)
 - [License](#license)
 
 ## What this project does?

VERSION

@@ -1 +1 @@
-23.05.0-trunk
+23.08.0-trunk

compile.sh

@@ -44,7 +44,7 @@ logging_init
 traps_init
 
 # make sure git considers our build system dir as a safe dir (only if actually building)
-[[ "${CONFIG_DEFS_ONLY}" != "yes" ]] && git_ensure_safe_directory "${SRC}"
+[[ "${CONFIG_DEFS_ONLY}" != "yes" && "${PRE_PREPARED_HOST}" != "yes" ]] && git_ensure_safe_directory "${SRC}"
 
 # Execute the main CLI entrypoint.
 cli_entrypoint "$@"

config/boards/aml-s9xx-box.tvb

@@ -10,3 +10,13 @@ FULL_DESKTOP="yes"
 ASOUND_STATE="asound.state.mesongx"
 BOOT_LOGO="desktop"
 SRC_CMDLINE='rootflags=data=writeback console=ttyAML0,115200n8 console=tty0'
+
+
+function post_family_tweaks__config_aml-s9xx-box_bsp() {
+
+    display_alert "$BOARD" "Installing bsp files" "info"
+
+    cp -r $SRC/packages/bsp/aml-s9xx-box/boot $SDCARD
+    install -m 755 $SRC/packages/bsp/aml-s9xx-box/root/install-aml.sh $SDCARD/root
+    install -m 644 $SRC/packages/bsp/aml-s9xx-box/root/fstab.template $SDCARD/root
+}

config/boards/bananapicm4io.conf

@@ -2,7 +2,7 @@
 BOARD_NAME="Banana Pi CM4IO"
 BOARDFAMILY="meson-g12b"
 BOOTCONFIG="bananapi-cm4-cm4io_defconfig"
-KERNEL_TARGET="edge"
+KERNEL_TARGET="current,edge"
 FULL_DESKTOP="yes"
 SERIALCON="ttyAML0"
 BOOT_LOGO="desktop"

config/boards/bananapim2s.wip

@@ -8,6 +8,6 @@ SERIALCON="ttyAML0"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="amlogic/meson-g12b-a311d-bananapi-m2s.dtb"
 
-# Newer u-boot; new DT, Makefile and defconfig in patch/u-boot/v2022.10/board_bananapi-m2s
+# Newer u-boot; new DT, Makefile and defconfig in patch/u-boot/v2022.10/board_bananapim2s
 BOOTBRANCH_BOARD="tag:v2022.10"
-BOOTPATCHDIR="v2022.10"
+BOOTPATCHDIR="v2022.10/board_bananapim2s" # this avoid the "USB first" patch in the v2022.10 folder

config/boards/bananapim5.conf

@@ -8,4 +8,4 @@ FULL_DESKTOP="yes"
 SERIALCON="ttyAML0"
 BOOT_LOGO="desktop"
 BOOTBRANCH_BOARD="tag:v2022.10"
-BOOTPATCHDIR="v2022.10"
+BOOTPATCHDIR="v2022.10/board_bananapim5" # this avoid the "USB first" patch in the v2022.10 folder

config/boards/clockworkpi-a06.conf

@@ -1,9 +0,0 @@
-# Rockchip RK3399 hexa core 4GB RAM SoC WiFi/BT
-BOARD_NAME="Clockworkpi A06"
-BOARDFAMILY="rockchip64"
-BOOTCONFIG="clockworkpi-a06-rk3399_defconfig"
-KERNEL_TARGET="legacy,current,edge"
-FULL_DESKTOP="yes"
-BOOT_LOGO="no"
-BOOTBRANCH_BOARD="tag:v2022.04"
-BOOTPATCHDIR="u-boot-rockchip64-v2022.04"

config/boards/clockworkpi-a06.csc

@@ -0,0 +1,45 @@
+# Rockchip RK3399 hexa core 4GB RAM SoC WiFi/BT
+BOARD_NAME="Clockworkpi A06"
+BOARDFAMILY="rockchip64"
+BOOTCONFIG="clockworkpi-a06-rk3399_defconfig"
+KERNEL_TARGET="legacy,current,edge"
+FULL_DESKTOP="yes"
+BOOT_LOGO="no"
+BOOTBRANCH_BOARD="tag:v2022.04"
+BOOTPATCHDIR="u-boot-rockchip64-v2022.04"
+
+function post_family_tweaks_bsp__clockworkpi-a06() {
+    display_alert "Installing BSP firmware and fixups"
+
+	# rotate screen & disable dpms
+	mkdir -p "$destination"/etc/X11/xorg.conf.d
+	cat <<- EOF > "$destination"/etc/X11/xorg.conf.d/10-monitor.conf
+		# set monitor
+		Section "Monitor"
+		        Identifier "DSI-1"
+		        Option "Rotate" "right"
+		        Option "DPMS" "false"
+		EndSection
+
+		Section "ServerLayout"
+		        Identifier "ServerLayout0"
+		        Option "BlankTime"  "0"
+		        Option "StandbyTime" "0"
+		        Option "SuspendTime" "0"
+		        Option "OffTime" "0"
+		EndSection
+	EOF
+	# fan support
+	install -Dm644 $SRC/packages/bsp/clockworkpi-a06/temp_fan_daemon_a06.py $destination/usr/share/clockworkpi-a06-fan-daemon/bin/temp_fan_daemon_a06.py
+	cp $SRC/packages/bsp/clockworkpi-a06/clockworkpi-a06-fan-daemon.service $destination/lib/systemd/system/
+
+	# alsa-ucm-conf profile for DevTerm A06
+	mkdir -p $destination/usr/share/alsa/ucm2/Rockchip/es8388
+	install -Dm644 $SRC/packages/bsp/clockworkpi-a06/es8388.conf $destination/usr/share/alsa/ucm2/Rockchip/es8388/es8388.conf
+	install -Dm644 $SRC/packages/bsp/clockworkpi-a06/HiFi.conf $destination/usr/share/alsa/ucm2/Rockchip/es8388/HiFi.conf
+	mkdir -p $destination/usr/share/alsa/ucm2/conf.d/simple-card
+	ln -sfv /usr/share/alsa/ucm2/Rockchip/es8388/es8388.conf \
+		$destination/usr/share/alsa/ucm2/conf.d/simple-card/rockchip,es8388-codec.conf
+
+	return 0
+}

config/boards/firefly-rk3399.conf

@@ -9,3 +9,20 @@ BOOT_FDT_FILE="rockchip/rk3399-firefly.dtb"
 SRC_EXTLINUX="yes"
 SRC_CMDLINE="console=ttyS2,1500000 console=tty0"
 #ASOUND_STATE="asound.state.station-p1"
+
+function post_family_tweaks_bsp__firefly-rk3399_BSP() {
+    display_alert "Installing BSP firmware and fixups"
+
+	if [[ $BRANCH == legacy ]]; then
+
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+
+		# need to swap chips in the service
+		sed -i s%BCM4345C5%BCM4356A2%g $destination/lib/systemd/system/rk3399-bluetooth.service
+
+	fi
+
+	return 0
+}

config/boards/helios64.csc

@@ -10,3 +10,49 @@ FULL_DESKTOP="yes"
 PACKAGE_LIST_BOARD="mdadm i2c-tools fancontrol"
 PACKAGE_LIST_BOARD_REMOVE="fake-hwclock"
 CPUMAX="1800000"
+
+function post_family_tweaks__helios64_enable_heartbeat() {
+    display_alert "$BOARD" "Installing board tweaks" "info"
+
+	chroot $SDCARD /bin/bash -c "systemctl --no-reload enable helios64-heartbeat-led.service >/dev/null 2>&1"
+
+	return 0
+}
+
+function post_family_tweaks_bsp__helios64() {
+    display_alert "Installing BSP firmware and fixups"
+
+	mkdir -p $destination/etc/udev/rules.d/
+	mkdir -p $destination/etc/systemd/system/fancontrol.service.d/
+	mkdir -p $destination/lib/systemd/system/
+	mkdir -p $destination/lib/systemd/system-shutdown/
+	cp $SRC/packages/bsp/helios64/50-usb-realtek-net.rules $destination/etc/udev/rules.d/
+	cp $SRC/packages/bsp/helios64/70-keep-usb-lan-as-eth1.rules $destination/etc/udev/rules.d/
+	cp $SRC/packages/bsp/helios64/90-helios64-ups.rules $destination/etc/udev/rules.d/
+	cp $SRC/packages/bsp/helios64/asound.conf $destination/etc/
+	install -m 755 $SRC/packages/bsp/helios64/disable_auto_poweron $destination/lib/systemd/system-shutdown/
+
+	### Fancontrol tweaks
+	# copy hwmon rules to fix device mapping
+	# changed to only use one file regardless of branch
+	install -m 644 $SRC/packages/bsp/helios64/90-helios64-hwmon.rules $destination/etc/udev/rules.d/
+
+	install -m 644 $SRC/packages/bsp/helios64/fancontrol.service.pid-override $destination/etc/systemd/system/fancontrol.service.d/pid.conf
+
+	# copy fancontrol config
+	install -m 644 $SRC/packages/bsp/helios64/fancontrol.conf $destination/etc/fancontrol
+
+	# LED tweak
+	if [[ $BRANCH == legacy ]]; then
+		install -m 644 $SRC/packages/bsp/helios64/helios64-heartbeat-led-legacy.service $destination/etc/systemd/system/helios64-heartbeat-led.service
+	else
+		install -m 644 $SRC/packages/bsp/helios64/helios64-heartbeat-led.service $destination/etc/systemd/system/
+	fi
+
+	# UPS service
+	cp $SRC/packages/bsp/helios64/helios64-ups.service $destination/lib/systemd/system/
+	cp $SRC/packages/bsp/helios64/helios64-ups.timer $destination/lib/systemd/system/
+	install -m 755 $SRC/packages/bsp/helios64/helios64-ups.sh $destination/usr/bin/helios64-ups.sh
+
+	return 0
+}

config/boards/hinlink-h88k.csc

@@ -0,0 +1,25 @@
+# Rockchip RK3588 SoC octa core 4-16GB eMMC USB3 NVMe SATA 4G WiFi/BT HDMI DP HDMI-In
+BOARD_NAME="Hinlink H88K"
+BOARDFAMILY="rockchip-rk3588"
+BOOTCONFIG="rock-5b-rk3588_defconfig"
+KERNEL_TARGET="legacy"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3588-hinlink-h88k.dtb"
+BOOT_SCENARIO="spl-blobs"
+WIREGUARD="no"
+IMAGE_PARTITION_TABLE="gpt"
+SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes
+
+function post_family_tweaks__hinlink_h88k_naming_audios() {
+	display_alert "$BOARD" "Renaming hinlink-h88k 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-hdmiin-sound", ENV{SOUND_DESCRIPTION}="HDMI-In Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-dp0-sound", ENV{SOUND_DESCRIPTION}="DP0 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
+}

config/boards/jetson-nano.conf

@@ -2,10 +2,30 @@
 BOARD_NAME="Jetson Nano"
 BOARDFAMILY="media"
 BOOTCONFIG="none"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="nvidia/tegra210-p3450-0000.dtb"
 SRC_EXTLINUX="yes"
 SRC_CMDLINE="console=ttyS0,115200n8 console=tty0"
 
+function post_family_tweaks__Jetson-nano() {
+    display_alert "$BOARD" "Installing bsp firmware and fixups" "info"
+
+    install -m 755 $SRC/packages/blobs/jetson/jetson.sh $SDCARD/etc/initramfs-tools/hooks/jetson.sh
+	if [[ $BRANCH == legacy ]]; then
+		install -m 755 $SRC/packages/blobs/jetson/tegra21x_xusb_firmware $SDCARD/lib/firmware/tegra21x_xusb_firmware
+		install -m 755 $SRC/packages/blobs/jetson/asound.conf.tegrahda $SDCARD/etc/asound.conf.tegrahda
+		install -m 755 $SRC/packages/blobs/jetson/asound.conf.tegrahda $SDCARD/etc/asound.conf
+		install -m 755 $SRC/packages/blobs/jetson/asound.conf.tegrasndt210ref $SDCARD/etc/asound.conf.tegrasndt210ref
+		install -m 755 $SRC/packages/blobs/jetson/tegra-hda.conf $SDCARD/usr/share/alsa/cards/tegra-hda.conf
+		install -m 755 $SRC/packages/blobs/jetson/tegra-snd-t210r.conf $SDCARD/usr/share/alsa/cards/tegra-snd-t210r.conf
+		sed -e 's/exit 0//g' -i $SDCARD/etc/rc.local
+		echo "su -c 'echo 255 > /sys/devices/pwm-fan/target_pwm'" >> $SDCARD/etc/rc.local
+		echo "exit 0" >> $SDCARD/etc/rc.local
+	else
+		cp -R $SRC/packages/blobs/jetson/firmware/* $SDCARD/lib/firmware/
+	fi
+
+	return 0
+}

config/boards/khadas-edge.csc

@@ -6,4 +6,5 @@ KERNEL_TARGET="current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_SUPPORT_SPI=yes
+BOOT_SCENARIO="tpl-spl-blob"
 ASOUND_STATE="asound.state.rk3399"

config/boards/khadas-edge2.conf

@@ -0,0 +1,18 @@
+# Rockchip RK3588s 2GB-16GB GBE eMMC NVMe SATA USB3 WiFi
+declare -g BOARD_NAME="Khadas Edge2"
+declare -g BOARDFAMILY="rockchip-rk3588"
+declare -g BOOT_SOC="rk3588" # Just to avoid errors in rockchip64_commmon
+declare -g KERNEL_TARGET="legacy"
+declare -g IMAGE_PARTITION_TABLE="gpt"
+declare -g BOOT_FDT_FILE="rockchip/rk3588s-khadas-edge2.dtb" # Specific to this board
+
+declare -g BLUETOOTH_HCIATTACH_PARAMS="-s 115200 /dev/ttyS9 bcm43xx 1500000" # For the bluetooth-hciattach extension
+enable_extension "bluetooth-hciattach"                                       # Enable the bluetooth-hciattach extension
+
+# for the kedge2, we're counting on the blobs+u-boot in SPI working, as it comes from factory. It does not support bootscripts.
+function post_family_config_branch_legacy__uboot_kedge2() {
+	display_alert "$BOARD" "Configuring ($BOARD) non-u-boot" "info"
+	unset BOOTSOURCE
+	declare -g BOOTCONFIG='none'
+	declare -g SRC_EXTLINUX="yes" # For now, use extlinux. Thanks Monka
+}

config/boards/khadas-edge2.wip

@@ -1,12 +0,0 @@
-# Rockchip RK3588s 2GB-16GB GBE eMMC NVMe SATA USB3 WiFi
-BOARD_NAME="Khadas EDGE2"
-BOARDFAMILY="media"
-BOOT_SOC="rk3588"
-BOOTCONFIG="khadas-edge2-rk3588s_defconfig"
-KERNEL_TARGET="legacy"
-FULL_DESKTOP="yes"
-BOOT_LOGO="desktop"
-BOOT_FDT_FILE="rockchip/rk3588s-khadas-edge2.dtb"
-SRC_EXTLINUX="yes"
-SRC_CMDLINE="console=ttyS02,1500000 console=tty0"
-IMAGE_PARTITION_TABLE="gpt"

config/boards/mekotronics-r58-minipc.wip

@@ -0,0 +1,21 @@
+# Rockchip RK3588 SoC octa core 4-16GB SoC 1GBe eMMC USB3 SATA WiFi/BT
+declare -g BOARD_NAME="Mekotronics R58 MiniPC"
+declare -g BOARDFAMILY="rockchip-rk3588"
+declare -g KERNEL_TARGET="legacy"
+declare -g IMAGE_PARTITION_TABLE="gpt"
+declare -g BOOT_FDT_FILE="rockchip/rk3588-blueberry-minipc-linux.dtb" # Specific to this board
+declare -g BOOT_SCENARIO="spl-blobs"                                  # so we don't depend on defconfig naming convention
+declare -g BOOTCONFIG="mekotronics-r58-rk3588_defconfig"              # patched-in in BOOTPATCHDIR, set below.
+
+declare -g BLUETOOTH_HCIATTACH_PARAMS="-s 115200 /dev/ttyS6 bcm43xx 1500000" # For the bluetooth-hciattach extension
+enable_extension "bluetooth-hciattach"                                       # Enable the bluetooth-hciattach extension
+
+# post_family_config which only runs when branch is legacy. a shortcut, to avoid if's. you're welcome.
+function post_family_config_branch_legacy__uboot_mekotronics() {
+	display_alert "$BOARD" "Configuring Mekotronics R58 ($BOARD) u-boot" "info"
+	declare -g BOOTSOURCE='https://github.com/radxa/u-boot.git'
+	declare -g BOOTBRANCH='branch:stable-5.10-rock5'
+	declare -g OVERLAY_PREFIX='rockchip-rk3588'
+	declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
+	declare -g BOOTDELAY=1               # build injects this into u-boot config. we can then get into UMS mode and avoid the whole rockusb/rkdeveloptool thing
+}

config/boards/mekotronics-r58x-4g.wip

@@ -0,0 +1,21 @@
+# Rockchip RK3588 SoC octa core 4-16GB SoC 2x1GBe eMMC USB3 NVMe SATA 4G WiFi/BT HDMI DP HDMI-In RS232 RS485
+declare -g BOARD_NAME="Mekotronics R58X-4G"
+declare -g BOARDFAMILY="rockchip-rk3588"
+declare -g KERNEL_TARGET="legacy"
+declare -g IMAGE_PARTITION_TABLE="gpt"
+declare -g BOOT_FDT_FILE="rockchip/rk3588-blueberry-edge-v12-linux.dtb" # Specific to this board
+declare -g BOOT_SCENARIO="spl-blobs"                                    # so we don't depend on defconfig naming convention
+declare -g BOOTCONFIG="mekotronics-r58-rk3588_defconfig"                # patched-in in BOOTPATCHDIR, set below.
+
+declare -g BLUETOOTH_HCIATTACH_PARAMS="-s 115200 /dev/ttyS6 bcm43xx 1500000" # For the bluetooth-hciattach extension
+enable_extension "bluetooth-hciattach"                                       # Enable the bluetooth-hciattach extension
+
+# post_family_config which only runs when branch is legacy. a shortcut, to avoid if's. you're welcome.
+function post_family_config_branch_legacy__uboot_mekotronics() {
+	display_alert "$BOARD" "Configuring Mekotronics R58 ($BOARD) u-boot" "info"
+	declare -g BOOTSOURCE='https://github.com/radxa/u-boot.git'
+	declare -g BOOTBRANCH='branch:stable-5.10-rock5'
+	declare -g OVERLAY_PREFIX='rockchip-rk3588'
+	declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
+	declare -g BOOTDELAY=1               # build injects this into u-boot config. we can then get into UMS mode and avoid the whole rockusb/rkdeveloptool thing
+}

config/boards/mekotronics-r58x.wip

@@ -0,0 +1,21 @@
+# Rockchip RK3588 SoC octa core 4-16GB SoC 2x1GBe eMMC USB3 NVMe SATA WiFi/BT HDMI DP HDMI-In RS232 RS485
+declare -g BOARD_NAME="Mekotronics R58X-4G"
+declare -g BOARDFAMILY="rockchip-rk3588"
+declare -g KERNEL_TARGET="legacy"
+declare -g IMAGE_PARTITION_TABLE="gpt"
+declare -g BOOT_FDT_FILE="rockchip/rk3588-blueberry-edge-v10-linux.dtb" # Specific to this board
+declare -g BOOT_SCENARIO="spl-blobs"                                    # so we don't depend on defconfig naming convention
+declare -g BOOTCONFIG="mekotronics-r58-rk3588_defconfig"                # patched-in in BOOTPATCHDIR, set below.
+
+declare -g BLUETOOTH_HCIATTACH_PARAMS="-s 115200 /dev/ttyS6 bcm43xx 1500000" # For the bluetooth-hciattach extension
+enable_extension "bluetooth-hciattach"                                       # Enable the bluetooth-hciattach extension
+
+# post_family_config which only runs when branch is legacy. a shortcut, to avoid if's. you're welcome.
+function post_family_config_branch_legacy__uboot_mekotronics() {
+	display_alert "$BOARD" "Configuring Mekotronics R58 ($BOARD) u-boot" "info"
+	declare -g BOOTSOURCE='https://github.com/radxa/u-boot.git'
+	declare -g BOOTBRANCH='branch:stable-5.10-rock5'
+	declare -g OVERLAY_PREFIX='rockchip-rk3588'
+	declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
+	declare -g BOOTDELAY=1               # build injects this into u-boot config. we can then get into UMS mode and avoid the whole rockusb/rkdeveloptool thing
+}

config/boards/miqi.eos

@@ -2,5 +2,5 @@
 BOARD_NAME="MiQi"
 BOARDFAMILY="rockchip"
 BOOTCONFIG="miqi-rk3288_defconfig"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge"
 

config/boards/nanopct4.conf

@@ -9,3 +9,20 @@ BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3399-nanopc-t4.dtb"
 SRC_EXTLINUX="yes"
 SRC_CMDLINE="console=ttyS2,1500000 console=tty0"
+
+function post_family_tweaks_bsp__nanopc-t4_BSP() {
+    display_alert "Installing BSP firmware and fixups"
+
+	if [[ $BRANCH == legacy ]]; then
+
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+
+		# need to swap chips in the service
+		sed -i s%BCM4345C5%BCM4356A2%g $destination/lib/systemd/system/rk3399-bluetooth.service
+
+	fi
+
+	return 0
+}

config/boards/nanopct6.wip

@@ -0,0 +1,23 @@
+# Rockchip RK3588S octa core 8GB RAM SoC eMMC USB3 USB2 1x GbE 2x 2.5GbE
+BOARD_NAME="NanoPC T6"
+BOARDFAMILY="rockchip-rk3588"
+BOOTCONFIG="nanopi-r6s-rk3588s_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
+BOOT_SOC="rk3588"
+KERNEL_TARGET="legacy"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3588-nanopc-t6.dtb"
+BOOT_SCENARIO="spl-blobs"
+WIREGUARD="no"
+IMAGE_PARTITION_TABLE="gpt"
+SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes
+BOOTFS_TYPE="fat"
+
+function post_family_tweaks__nanopct6_naming_audios() {
+	display_alert "$BOARD" "Renaming nanopct6 audio" "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
+
+	return 0
+}

config/boards/nanopi-r2c.conf

@@ -9,3 +9,13 @@ MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima ha
 SERIALCON="ttyS2:1500000,ttyGS0"
 HAS_VIDEO_OUTPUT="no"
 BOOT_FDT_FILE="rockchip/rk3328-nanopi-r2-rev06.dtb"
+
+function post_family_tweaks__nanopi-r2c_rename_USB_LAN() {
+    display_alert "$BOARD" "Installing board tweaks" "info"
+
+	# rename USB based network to lan0
+	mkdir -p $SDCARD/etc/udev/rules.d/
+	echo 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="r8152", KERNEL=="eth1", NAME="lan0"' > $SDCARD/etc/udev/rules.d/70-rename-lan.rules
+
+	return 0
+}

config/boards/nanopi-r2s.conf

@@ -9,3 +9,13 @@ MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima ha
 SERIALCON="ttyS2:1500000,ttyGS0"
 HAS_VIDEO_OUTPUT="no"
 BOOT_FDT_FILE="rockchip/rk3328-nanopi-r2-rev00.dtb"
+
+function post_family_tweaks__nanopi-r2s_rename_USB_LAN() {
+    display_alert "$BOARD" "Installing board tweaks" "info"
+
+	# rename USB based network to lan0
+	mkdir -p $SDCARD/etc/udev/rules.d/
+	echo 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="r8152", KERNEL=="eth1", NAME="lan0"' > $SDCARD/etc/udev/rules.d/70-rename-lan.rules
+
+	return 0
+}

config/boards/nanopi-r4s.conf

@@ -8,3 +8,20 @@ MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima ha
 HAS_VIDEO_OUTPUT="no"
 BOOTBRANCH_BOARD="tag:v2022.04"
 BOOTPATCHDIR="u-boot-rockchip64-v2022.04"
+
+function post_family_tweaks_bsp__nanopi-r4s_BSP() {
+    display_alert "Installing BSP firmware and fixups"
+
+	if [[ $BRANCH == legacy ]]; then
+
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+
+		# need to swap chips in the service
+		sed -i s%BCM4345C5%BCM4356A2%g $destination/lib/systemd/system/rk3399-bluetooth.service
+
+	fi
+
+	return 0
+}

config/boards/nanopi-r4se.conf

@@ -0,0 +1,10 @@
+# Rockchip RK3399 hexa core 4GB RAM SoC 2 x GBE 32GB eMMC USB3 USB-C
+BOARD_NAME="NanoPi R4SE"
+BOARDFAMILY="rk3399"
+BOOTCONFIG="nanopi-r4se-rk3399_defconfig"
+KERNEL_TARGET="current,edge"
+DEFAULT_CONSOLE="serial"
+MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu panfrost"
+HAS_VIDEO_OUTPUT="no"
+BOOTBRANCH_BOARD="tag:v2022.04"
+BOOTPATCHDIR="u-boot-rockchip64-v2022.04"

config/boards/nanopi-r6s.wip

@@ -0,0 +1,23 @@
+# Rockchip RK3588S octa core 8GB RAM SoC eMMC USB3 USB2 1x GbE 2x 2.5GbE
+BOARD_NAME="NanoPi R6S"
+BOARDFAMILY="rockchip-rk3588"
+BOOTCONFIG="nanopi-r6s-rk3588s_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
+BOOT_SOC="rk3588"
+KERNEL_TARGET="legacy"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3588s-nanopi-r6s.dtb"
+BOOT_SCENARIO="spl-blobs"
+WIREGUARD="no"
+IMAGE_PARTITION_TABLE="gpt"
+SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes
+BOOTFS_TYPE="fat"
+
+function post_family_tweaks__nanopir6s_naming_audios() {
+	display_alert "$BOARD" "Renaming nanopir6s audio" "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
+
+	return 0
+}

config/boards/nanopim4.conf

@@ -8,3 +8,29 @@ ASOUND_STATE="asound.state.rt5651"
 BOOT_LOGO="desktop"
 BOOTBRANCH_BOARD="tag:v2022.04"
 BOOTPATCHDIR="u-boot-rockchip64-v2022.04"
+
+function post_family_tweaks__m4() {
+    display_alert "$BOARD" "Installing board tweaks" "info"
+
+	# enable fan support
+	chroot $SDCARD /bin/bash -c "systemctl --no-reload enable nanopim4-pwm-fan.service >/dev/null 2>&1"
+
+	return 0
+}
+
+function post_family_tweaks_bsp__M4() {
+    display_alert "Installing BSP firmware and fixups"
+
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+
+		# Swap out the chip for some boards
+		sed -i s%BCM4345C5%BCM4356A2%g $destination/lib/systemd/system/rk3399-bluetooth.service
+
+	# Fan support
+	cp $SRC/packages/bsp/nanopim4/nanopim4-pwm-fan.service $destination/lib/systemd/system/
+	install -m 755 $SRC/packages/bsp/nanopim4/nanopim4-pwm-fan.sh $destination/usr/bin/nanopim4-pwm-fan.sh
+
+	return 0
+}

config/boards/nanopim4v2.conf

@@ -1,8 +0,0 @@
-# Rockchip RK3399 hexa core 4GB RAM SoC GBE eMMC USB3 USB-C WiFi/BT
-BOARD_NAME="NanoPi M4V2"
-BOARDFAMILY="rk3399"
-BOOTCONFIG="nanopi-m4v2-rk3399_defconfig"
-KERNEL_TARGET="legacy,current,edge"
-FULL_DESKTOP="yes"
-ASOUND_STATE="asound.state.rt5651"
-BOOT_LOGO="desktop"

config/boards/nanopim4v2.csc

@@ -0,0 +1,34 @@
+# Rockchip RK3399 hexa core 4GB RAM SoC GBE eMMC USB3 USB-C WiFi/BT
+BOARD_NAME="NanoPi M4V2"
+BOARDFAMILY="rk3399"
+BOOTCONFIG="nanopi-m4v2-rk3399_defconfig"
+KERNEL_TARGET="legacy,current,edge"
+FULL_DESKTOP="yes"
+ASOUND_STATE="asound.state.rt5651"
+BOOT_LOGO="desktop"
+
+function post_family_tweaks__m4v2() {
+    display_alert "$BOARD" "Installing board tweaks" "info"
+
+	# enable fan support
+	chroot $SDCARD /bin/bash -c "systemctl --no-reload enable nanopim4-pwm-fan.service >/dev/null 2>&1"
+
+	return 0
+}
+function post_family_tweaks_bsp__M4V2() {
+    display_alert "Installing BSP firmware and fixups"
+
+	# Bluetooth for most of others (custom patchram is needed only in legacy)
+	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/
+
+	# Swap out the chip for some boards
+	sed -i s%BCM4345C5%BCM4356A2%g $destination/lib/systemd/system/rk3399-bluetooth.service
+
+	# Fan support
+	cp $SRC/packages/bsp/nanopim4/nanopim4-pwm-fan.service $destination/lib/systemd/system/
+	install -m 755 $SRC/packages/bsp/nanopim4/nanopim4-pwm-fan.sh $destination/usr/bin/nanopim4-pwm-fan.sh
+
+	return 0
+}
+

config/boards/nanopineo4.csc

@@ -5,3 +5,20 @@ BOOTCONFIG="nanopi-neo4-rk3399_defconfig"
 KERNEL_TARGET="legacy,current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
+
+function post_family_tweaks_bsp__nanopineo4_BSP() {
+    display_alert "Installing BSP firmware and fixups"
+
+	if [[ $BRANCH == legacy ]]; then
+
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+
+		# need to swap chips in the service
+		sed -i s%BCM4345C5%BCM4356A2%g $destination/lib/systemd/system/rk3399-bluetooth.service
+
+	fi
+
+	return 0
+}

config/boards/odroidn2.conf

@@ -5,15 +5,14 @@ KERNEL_TARGET="current,edge"
 FULL_DESKTOP="yes"
 FORCE_BOOTSCRIPT_UPDATE="yes"
 BOOT_LOGO="desktop"
-
-# Odroid N2 requires Odroid's u-boot for legacy kernel booting.
-# These vars will be handled by the family (meson-g12b.conf)
-USE_ODROID_UBOOT="legacy"
 BOOTCONFIG="odroid-n2_defconfig" # For mainline uboot
-BOOTCONFIG_ODROID="odroidn2_config" # For odroid uboot
-BOOTSCRIPT_ODROID="boot-odroid-n2.ini:boot.ini" # For odroid uboot, default BOOTSCRIPT is boot-meson64.cmd for mainline (in meson64_common.inc)
+
+# Newer u-boot for the N2/N2+, less patches: a single boot order patch
+BOOTBRANCH_BOARD="tag:v2022.10"
+BOOTPATCHDIR="v2022.10"
 
 # Enable writing u-boot to SPI on the N2(+) for current and edge
+# @TODO: replace this with an overlay, after meson64 overlay revamp
 # To enable the SPI NOR the -spi .dtb is required, because eMMC shares a pin with SPI on the N2(+). To use it:
 # fdtfile=amlogic/meson-g12b-odroid-n2-plus-spi.dtb # in armbianEnv.txt and reboot, then run nand-sata-install
 UBOOT_TARGET_MAP="u-boot-dtb.img;;u-boot.bin.sd.bin:u-boot.bin u-boot-dtb.img u-boot.bin:u-boot-spi.bin"
@@ -22,6 +21,7 @@ write_uboot_platform_mtd() {
 }
 
 # MAX might be different for N2/N2+, for now use N2+'s
+# @TODO: remove? cpufreq is not used anymore, instead DT should be patched
 CPUMIN=1000000
 CPUMAX=2400000
 GOVERNOR=performance # some people recommend performance to avoid random hangs after 24+ hours running.
@@ -30,3 +30,5 @@ GOVERNOR=performance # some people recommend performance to avoid random hangs a
 #    https://github.com/u-boot/u-boot/blob/v2021.04/board/amlogic/odroid-n2/odroid-n2.c#L35-L106
 # Unfortunately it uses n2_plus instead of n2-plus as the Kernel expects it.
 #    So there is a hack at and around config/bootscripts/boot-meson64.cmd L90
+# If needed (eg for extlinux) you can specify the N2/N2+/ DTB in BOOT_FDT_FILE, example for the N2+:
+# BOOT_FDT_FILE="amlogic/meson-g12b-odroid-n2-plus.dtb"

config/boards/orangepi-r1.conf

@@ -9,3 +9,17 @@ HAS_VIDEO_OUTPUT="no"
 DEFAULT_CONSOLE="serial"
 SERIALCON="ttyS0,ttyGS0"
 KERNEL_TARGET="current,edge"
+
+function post_family_tweaks_bsp__orangepi-r1_BSP() {
+    display_alert "Installing BSP firmware and fixups"
+
+	if [[ $BRANCH == legacy ]]; then
+
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+
+	fi
+
+	return 0
+}

config/boards/orangepi-r1plus-lts.conf

@@ -48,15 +48,26 @@ cat <<- EOF > "${destination}"/etc/armbian-leds.conf
 	invert=0
 EOF
 
+if [[ $BRANCH == legacy ]]; then
+
+	# Bluetooth for most of others (custom patchram is needed only in legacy)
+	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/
+
+fi
+
 # add a network rule to work-around Debian issues with two NICs on one network.
+display_alert "Creating board support network rename rule to work-around Debian issues for orangepi-r1-plus-lts"
 mkdir -p "${destination}"/etc/udev/rules.d/
 cat <<- EOF > "${destination}"/etc/udev/rules.d/70-rename-lan.rules
-	SUBSYSTEM=="net", ACTION=="add", DRIVERS=="r8152", KERNEL=="eth*", NAME="lan0", \
+    SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", KERNEL=="end*", NAME="eth0"
+	SUBSYSTEM=="net", ACTION=="add", DRIVERS=="r8152", KERNEL=="e*", NAME="lan0", \
 	RUN+="/usr/sbin/ip link set lan0 down", \
 	RUN+="/usr/sbin/ip link set eth0 down", \
-	RUN+="/usr/bin/sleep 5s ", \
+	RUN+="/usr/bin/sleep 3s ", \
 	RUN+="/usr/sbin/ip link set eth0 up", \
 	RUN+="/usr/bin/sleep 10s ", \
 	RUN+="/usr/sbin/ip link set lan0 up"
 EOF
 }
+

config/boards/orangepi-r1plus.conf

@@ -9,3 +9,27 @@ MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima ha
 SERIALCON="ttyS2:1500000,ttyGS0"
 HAS_VIDEO_OUTPUT="no"
 BOOT_FDT_FILE="rockchip/rk3328-orangepi-r1-plus.dtb"
+
+function post_family_tweaks__opi-r1plus_rename_USB_LAN() {
+    display_alert "$BOARD" "Installing board tweaks" "info"
+
+	# rename USB based network to lan0
+	mkdir -p $SDCARD/etc/udev/rules.d/
+	echo 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="r8152", KERNEL=="eth1", NAME="lan0"' > $SDCARD/etc/udev/rules.d/70-rename-lan.rules
+
+	return 0
+}
+
+function post_family_tweaks_bsp__orangepi-r1plus_BSP() {
+    display_alert "Installing BSP firmware and fixups"
+
+	if [[ $BRANCH == legacy ]]; then
+
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+
+	fi
+
+	return 0
+}

config/boards/orangepi-rk3399.csc

@@ -5,3 +5,20 @@ BOOTCONFIG="orangepi-rk3399_defconfig"
 KERNEL_TARGET="legacy,current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
+
+function post_family_tweaks_bsp__orangepi-rk3399_BSP() {
+    display_alert "Installing BSP firmware and fixups"
+
+	if [[ $BRANCH == legacy ]]; then
+
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+
+		# need to swap chips in the service
+		sed -i s%BCM4345C5%BCM4356A2%g $destination/lib/systemd/system/rk3399-bluetooth.service
+
+	fi
+
+	return 0
+}

config/boards/orangepi.eos

@@ -3,3 +3,17 @@ BOARD_NAME="Orange Pi"
 BOARDFAMILY="sun7i"
 BOOTCONFIG="Orangepi_defconfig"
 KERNEL_TARGET="legacy,current,edge"
+
+function post_family_tweaks_bsp__orangepi_BSP() {
+    display_alert "Installing BSP firmware and fixups"
+
+	if [[ $BRANCH == legacy ]]; then
+
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+
+	fi
+
+	return 0
+}

config/boards/orangepi2.csc

@@ -3,3 +3,17 @@ BOARD_NAME="Orange Pi 2"
 BOARDFAMILY="sun8i"
 BOOTCONFIG="orangepi_2_defconfig"
 KERNEL_TARGET="legacy,current,edge"
+
+function post_family_tweaks_bsp__orangepi2_BSP() {
+    display_alert "Installing BSP firmware and fixups"
+
+	if [[ $BRANCH == legacy ]]; then
+
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+
+	fi
+
+	return 0
+}

config/boards/orangepi3-lts.conf

@@ -1,8 +0,0 @@
-# Allwinner H6 quad core 2GB RAM SoC GBE USB3
-BOARD_NAME="Orange Pi 3 LTS"
-BOARDFAMILY="sun50iw6"
-BOOTCONFIG="orangepi_3_lts_defconfig"
-KERNEL_TARGET="current,edge"
-MODULES="sprdbt_tty sprdwl_ng"
-MODULES_BLACKLIST_LEGACY="bcmdhd"
-ATFBRANCH="tag:v2.2"

config/boards/orangepi3-lts.csc

@@ -0,0 +1,22 @@
+# Allwinner H6 quad core 2GB RAM SoC GBE USB3
+BOARD_NAME="Orange Pi 3 LTS"
+BOARDFAMILY="sun50iw6"
+BOOTCONFIG="orangepi_3_lts_defconfig"
+KERNEL_TARGET="current,edge"
+MODULES="sprdbt_tty sprdwl_ng"
+MODULES_BLACKLIST_LEGACY="bcmdhd"
+ATFBRANCH="tag:v2.2"
+
+function post_family_tweaks_bsp__orangepi3-lts_BSP() {
+    display_alert "Installing BSP firmware and fixups"
+
+	if [[ $BRANCH == legacy ]]; then
+
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+
+	fi
+
+	return 0
+}

config/boards/orangepi3.conf

@@ -1,7 +0,0 @@
-# Allwinner H6 quad core 2GB RAM SoC GBE USB3
-BOARD_NAME="Orange Pi 3"
-BOARDFAMILY="sun50iw6"
-BOOTCONFIG="orangepi_3_defconfig"
-KERNEL_TARGET="legacy,current,edge"
-FULL_DESKTOP="yes"
-ATFBRANCH="tag:v2.2"

config/boards/orangepi3.csc

@@ -0,0 +1,21 @@
+# Allwinner H6 quad core 2GB RAM SoC GBE USB3
+BOARD_NAME="Orange Pi 3"
+BOARDFAMILY="sun50iw6"
+BOOTCONFIG="orangepi_3_defconfig"
+KERNEL_TARGET="legacy,current,edge"
+FULL_DESKTOP="yes"
+ATFBRANCH="tag:v2.2"
+
+function post_family_tweaks_bsp__orangepi3_BSP() {
+    display_alert "Installing BSP firmware and fixups"
+
+	if [[ $BRANCH == legacy ]]; then
+
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+
+	fi
+
+	return 0
+}

config/boards/orangepi4-lts.conf

@@ -13,3 +13,23 @@ ASOUND_STATE="asound.state.rk3399"
 BOOT_LOGO="desktop"
 BOOTBRANCH_BOARD="tag:v2022.04"
 BOOTPATCHDIR="u-boot-rockchip64-v2022.04"
+
+function post_family_tweaks_bsp__OPi4lts() {
+    display_alert "Installing BSP firmware and fixups"
+
+	if [[ $BRANCH == legacy ]]; then
+
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+
+	fi
+
+	# Bluetooth on orangepi 4 LTS board is handled by a Spreadtrum (sprd) chip and requires
+	# a custom hciattach_opi binary, plus a systemd service to run it at boot time
+	install -m 755 $SRC/packages/bsp/rk3399/hciattach_opi $destination/usr/bin
+	cp $SRC/packages/bsp/rk3399/sprd-bluetooth.service $destination/lib/systemd/system/
+
+	return 0
+}
+

config/boards/orangepi4.conf

@@ -8,3 +8,17 @@ ASOUND_STATE="asound.state.rt5651"
 BOOT_LOGO="desktop"
 BOOTBRANCH_BOARD="tag:v2022.04"
 BOOTPATCHDIR="u-boot-rockchip64-v2022.04"
+
+function post_family_tweaks_bsp__orangepi4_BSP() {
+    display_alert "Installing BSP firmware and fixups"
+
+	if [[ $BRANCH == legacy ]]; then
+
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+
+	fi
+
+	return 0
+}

config/boards/orangepi5.conf

@@ -10,13 +10,44 @@ BOOT_FDT_FILE="rockchip/rk3588s-orangepi-5.dtb"
 BOOT_SCENARIO="spl-blobs"
 WIREGUARD="no"
 BOOT_SUPPORT_SPI="yes"
+BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
 SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes
 BOOTFS_TYPE="fat"
 
+function post_family_tweaks_bsp__orangepi5_copy_usb2_service() {
+    display_alert "Installing BSP firmware and fixups"
+
+	# Add USB2 init service. Otherwise, USB2 and TYPE-C won't work by default
+	cp $SRC/packages/bsp/orangepi5/orangepi5-usb2-init.service $destination/lib/systemd/system/
+
+	return 0
+}
+
+function post_family_tweaks__orangepi5_enable_usb2_service() {
+    display_alert "$BOARD" "Installing board tweaks" "info"
+
+	# enable usb2 init service
+	chroot $SDCARD /bin/bash -c "systemctl --no-reload enable orangepi5-usb2-init.service >/dev/null 2>&1"
+
+	return 0
+}
+
+function post_family_tweaks__orangepi5_naming_audios() {
+	display_alert "$BOARD" "Renaming orangepi5 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-dp0-sound", ENV{SOUND_DESCRIPTION}="DP0 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
+}
+
 # Override family config for this board; let's avoid conditionals in family config.
 function post_family_config__orangepi5_use_vendor_uboot() {
 	BOOTSOURCE='https://github.com/orangepi-xunlong/u-boot-orangepi.git'
 	BOOTBRANCH='branch:v2017.09-rk3588'
 	BOOTPATCHDIR="legacy"
 }
+

config/boards/orangepilite.conf

@@ -1,8 +0,0 @@
-# Allwinner H3 quad core 512MB RAM WiFi
-BOARD_NAME="Orange Pi Lite"
-BOARDFAMILY="sun8i"
-BOOTCONFIG="orangepi_lite_defconfig"
-MODULES_LEGACY="g_serial"
-MODULES_CURRENT="g_serial"
-KERNEL_TARGET="legacy,current,edge"
-

config/boards/orangepilite.csc

@@ -0,0 +1,21 @@
+# Allwinner H3 quad core 512MB RAM WiFi
+BOARD_NAME="Orange Pi Lite"
+BOARDFAMILY="sun8i"
+BOOTCONFIG="orangepi_lite_defconfig"
+MODULES_LEGACY="g_serial"
+MODULES_CURRENT="g_serial"
+KERNEL_TARGET="legacy,current,edge"
+
+function post_family_tweaks_bsp__orangepilite_BSP() {
+    display_alert "Installing BSP firmware and fixups"
+
+	if [[ $BRANCH == legacy ]]; then
+
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+
+	fi
+
+	return 0
+}

config/boards/orangepilite2.conf

@@ -3,3 +3,17 @@ BOARD_NAME="Orange Pi Lite 2"
 BOARDFAMILY="sun50iw6"
 BOOTCONFIG="orangepi_lite2_defconfig"
 KERNEL_TARGET="legacy,current,edge"
+
+function post_family_tweaks_bsp__orangepilite2_BSP() {
+    display_alert "Installing BSP firmware and fixups"
+
+	if [[ $BRANCH == legacy ]]; then
+
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+
+	fi
+
+	return 0
+}

config/boards/orangepimini.eos

@@ -3,3 +3,17 @@ BOARD_NAME="Orange Pi Mini"
 BOARDFAMILY="sun7i"
 BOOTCONFIG="Orangepi_mini_defconfig"
 KERNEL_TARGET="legacy,current,edge"
+
+function post_family_tweaks_bsp__orangepimini_BSP() {
+    display_alert "Installing BSP firmware and fixups"
+
+	if [[ $BRANCH == legacy ]]; then
+
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+
+	fi
+
+	return 0
+}

config/boards/orangepione.conf

@@ -1,5 +0,0 @@
-# Allwinner H3 quad core 512MB RAM SoC
-BOARD_NAME="Orange Pi One"
-BOARDFAMILY="sun8i"
-BOOTCONFIG="orangepi_one_defconfig"
-KERNEL_TARGET="legacy,current,edge"

config/boards/orangepione.csc

@@ -0,0 +1,19 @@
+# Allwinner H3 quad core 512MB RAM SoC
+BOARD_NAME="Orange Pi One"
+BOARDFAMILY="sun8i"
+BOOTCONFIG="orangepi_one_defconfig"
+KERNEL_TARGET="legacy,current,edge"
+
+function post_family_tweaks_bsp__orangepione_BSP() {
+    display_alert "Installing BSP firmware and fixups"
+
+	if [[ $BRANCH == legacy ]]; then
+
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+
+	fi
+
+	return 0
+}

config/boards/orangepioneplus.conf

@@ -4,3 +4,17 @@ BOARDFAMILY="sun50iw6"
 BOOTCONFIG="orangepi_one_plus_defconfig"
 KERNEL_TARGET="legacy,current,edge"
 ATFBRANCH="tag:v2.2"
+
+function post_family_tweaks_bsp__orangepioneplus_BSP() {
+    display_alert "Installing BSP firmware and fixups"
+
+	if [[ $BRANCH == legacy ]]; then
+
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+
+	fi
+
+	return 0
+}

config/boards/orangepipc.conf

@@ -3,3 +3,17 @@ BOARD_NAME="Orange Pi PC"
 BOARDFAMILY="sun8i"
 BOOTCONFIG="orangepi_pc_defconfig"
 KERNEL_TARGET="legacy,current,edge"
+
+function post_family_tweaks_bsp__orangepipc_BSP() {
+    display_alert "Installing BSP firmware and fixups"
+
+	if [[ $BRANCH == legacy ]]; then
+
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+
+	fi
+
+	return 0
+}

config/boards/orangepipc2.conf

@@ -1,6 +0,0 @@
-# Allwinner H5 quad core 1GB RAM SoC GBE SPI
-BOARD_NAME="Orange Pi PC2"
-BOARDFAMILY="sun50iw2"
-BOOTCONFIG="orangepi_pc2_defconfig"
-KERNEL_TARGET="legacy,current,edge"
-FULL_DESKTOP="yes"

config/boards/orangepipc2.csc

@@ -0,0 +1,20 @@
+# Allwinner H5 quad core 1GB RAM SoC GBE SPI
+BOARD_NAME="Orange Pi PC2"
+BOARDFAMILY="sun50iw2"
+BOOTCONFIG="orangepi_pc2_defconfig"
+KERNEL_TARGET="legacy,current,edge"
+FULL_DESKTOP="yes"
+
+function post_family_tweaks_bsp__orangepipc2_BSP() {
+    display_alert "Installing BSP firmware and fixups"
+
+	if [[ $BRANCH == legacy ]]; then
+
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+
+	fi
+
+	return 0
+}

config/boards/orangepipcplus.conf

@@ -3,3 +3,17 @@ BOARD_NAME="Orange Pi PC +"
 BOARDFAMILY="sun8i"
 BOOTCONFIG="orangepi_pc_plus_defconfig"
 KERNEL_TARGET="legacy,current,edge"
+
+function post_family_tweaks_bsp__orangepipcplus_BSP() {
+    display_alert "Installing BSP firmware and fixups"
+
+	if [[ $BRANCH == legacy ]]; then
+
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+
+	fi
+
+	return 0
+}

config/boards/orangepiplus.csc

@@ -3,3 +3,17 @@ BOARD_NAME="Orange Pi+"
 BOARDFAMILY="sun8i"
 BOOTCONFIG="orangepi_plus_defconfig"
 KERNEL_TARGET="legacy,current,edge"
+
+function post_family_tweaks_bsp__orangepiplus_BSP() {
+    display_alert "Installing BSP firmware and fixups"
+
+	if [[ $BRANCH == legacy ]]; then
+
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+
+	fi
+
+	return 0
+}

config/boards/orangepiplus2e.conf

@@ -2,5 +2,20 @@
 BOARD_NAME="Orange Pi+ 2E"
 BOARDFAMILY="sun8i"
 BOOTCONFIG="orangepi_plus2e_defconfig"
+BOOTBRANCH_BOARD="tag:v2023.04"
 KERNEL_TARGET="legacy,current,edge"
 FULL_DESKTOP="yes"
+
+function post_family_tweaks_bsp__orangepiplus2e_BSP() {
+    display_alert "Installing BSP firmware and fixups"
+
+	if [[ $BRANCH == legacy ]]; then
+
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+
+	fi
+
+	return 0
+}

config/boards/orangepiprime.conf

@@ -1,7 +0,0 @@
-# Allwinner H5 quad core 2GB RAM Wi-Fi/BT
-BOARD_NAME="Orange Pi Prime"
-BOARDFAMILY="sun50iw2"
-BOOTCONFIG="orangepi_prime_defconfig"
-DEFAULT_OVERLAYS="analog-codec"
-KERNEL_TARGET="legacy,current,edge"
-FULL_DESKTOP="yes"

config/boards/orangepiprime.csc

@@ -0,0 +1,21 @@
+# Allwinner H5 quad core 2GB RAM Wi-Fi/BT
+BOARD_NAME="Orange Pi Prime"
+BOARDFAMILY="sun50iw2"
+BOOTCONFIG="orangepi_prime_defconfig"
+DEFAULT_OVERLAYS="analog-codec"
+KERNEL_TARGET="legacy,current,edge"
+FULL_DESKTOP="yes"
+
+function post_family_tweaks_bsp__orangepiprime_BSP() {
+    display_alert "Installing BSP firmware and fixups"
+
+	if [[ $BRANCH == legacy ]]; then
+
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+
+	fi
+
+	return 0
+}

config/boards/orangepiwin.csc

@@ -3,3 +3,17 @@ BOARD_NAME="Orange Pi Win"
 BOARDFAMILY="sun50iw1"
 BOOTCONFIG="orangepi_win_defconfig"
 KERNEL_TARGET="legacy,current,edge"
+
+function post_family_tweaks_bsp__orangepiwin_BSP() {
+    display_alert "Installing BSP firmware and fixups"
+
+	if [[ $BRANCH == legacy ]]; then
+
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+
+	fi
+
+	return 0
+}

config/boards/orangepizero.conf

@@ -3,9 +3,23 @@ BOARD_NAME="Orange Pi Zero"
 BOARDFAMILY="sun8i"
 BOOTCONFIG="orangepi_zero_defconfig"
 MODULES_CURRENT="g_serial"
-MODULES_BLACKLIST="lima sunxi_cedrus"
-DEFAULT_OVERLAYS="usbhost2 usbhost3"
-DEFAULT_CONSOLE="serial"
-HAS_VIDEO_OUTPUT="no"
+MODULES_BLACKLIST="sunxi_cedrus"
+DEFAULT_OVERLAYS="usbhost2 usbhost3 tve"
+DEFAULT_CONSOLE="both"
+HAS_VIDEO_OUTPUT="yes"
 SERIALCON="ttyS0,ttyGS0"
 KERNEL_TARGET="legacy,current,edge"
+
+function post_family_tweaks_bsp__orangepizero_BSP() {
+    display_alert "Installing BSP firmware and fixups"
+
+	if [[ $BRANCH == legacy ]]; then
+
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+
+	fi
+
+	return 0
+}

config/boards/orangepizero2.conf

@@ -10,3 +10,16 @@ SERIALCON="ttyS0"
 KERNEL_TARGET="legacy,current,edge"
 PACKAGE_LIST_BOARD="rfkill bluetooth bluez bluez-tools"
 FORCE_BOOTSCRIPT_UPDATE="yes"
+
+function post_family_tweaks_bsp__orangepizero2_BSP() {
+	display_alert "Installing BSP firmware and fixups"
+	: "${destination:?}"
+
+	if [[ $BRANCH == legacy ]]; then
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+	fi
+
+	return 0
+}

config/boards/orangepizeroplus.conf

@@ -9,3 +9,17 @@ SERIALCON="ttyS0,ttyGS0"
 DEFAULT_OVERLAYS="usbhost2 usbhost3"
 HAS_VIDEO_OUTPUT="no"
 KERNEL_TARGET="legacy,current,edge"
+
+function post_family_tweaks_bsp__orangepizeroplus_BSP() {
+    display_alert "Installing BSP firmware and fixups"
+
+	if [[ $BRANCH == legacy ]]; then
+
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+
+	fi
+
+	return 0
+}

config/boards/orangepizeroplus2-h3.conf

@@ -1,9 +0,0 @@
-# Allwinner H3 quad core 512MB RAM SoC Wi-Fi/BT
-BOARD_NAME="Orange Pi Zero Plus 2"
-BOARDFAMILY="sun8i"
-BOOTCONFIG="orangepi_zero_plus2_h3_defconfig"
-MODULES_LEGACY="g_serial"
-MODULES_CURRENT="g_serial"
-DEFAULT_OVERLAYS="usbhost2 usbhost3"
-SERIALCON="ttyS0,ttyGS0"
-KERNEL_TARGET="legacy,current,edge"

config/boards/orangepizeroplus2-h3.csc

@@ -0,0 +1,23 @@
+# Allwinner H3 quad core 512MB RAM SoC Wi-Fi/BT
+BOARD_NAME="Orange Pi Zero Plus 2"
+BOARDFAMILY="sun8i"
+BOOTCONFIG="orangepi_zero_plus2_h3_defconfig"
+MODULES_LEGACY="g_serial"
+MODULES_CURRENT="g_serial"
+DEFAULT_OVERLAYS="usbhost2 usbhost3"
+SERIALCON="ttyS0,ttyGS0"
+KERNEL_TARGET="legacy,current,edge"
+
+function post_family_tweaks_bsp__orangepizeroplus2_BSP() {
+    display_alert "Installing BSP firmware and fixups"
+
+	if [[ $BRANCH == legacy ]]; then
+
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+
+	fi
+
+	return 0
+}

config/boards/orangepizeroplus2-h5.csc

@@ -8,3 +8,17 @@ DEFAULT_OVERLAYS="gpio-regulator-1.3v usbhost2 usbhost3"
 HAS_VIDEO_OUTPUT="no"
 SERIALCON="ttyS0,ttyGS0"
 KERNEL_TARGET="legacy,current,edge"
+
+function post_family_tweaks_bsp__orangepizeroplus2-h5_BSP() {
+    display_alert "Installing BSP firmware and fixups"
+
+	if [[ $BRANCH == legacy ]]; then
+
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+
+	fi
+
+	return 0
+}

config/boards/panther-x2.csc

@@ -0,0 +1,12 @@
+# Rockchip RK3566 quad core 4GB RAM SoC WIFI/BT eMMC USB2
+BOARD_NAME="panther-x2"
+BOARDFAMILY="rk35xx"
+BOOTCONFIG="rock-3c-rk3566_defconfig"
+KERNEL_TARGET="current,edge"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3566-panther-x2.dtb"
+IMAGE_PARTITION_TABLE="gpt"
+BOOT_SCENARIO="spl-blobs"
+WIREGUARD="no"
+BOOTFS_TYPE="fat"

config/boards/pinebook-pro.conf

@@ -10,3 +10,31 @@ BOOT_SCENARIO="blobless"
 ASOUND_STATE="asound.state.pinebook-pro"
 BOOTBRANCH_BOARD="tag:v2022.04"
 BOOTPATCHDIR="u-boot-rockchip64-v2022.04"
+
+function post_family_tweaks__PBP() {
+    display_alert "$BOARD" "Installing board tweaks" "info"
+
+	chroot $SDCARD /bin/bash -c "echo SuspendState=freeze >> /etc/systemd/sleep.conf"
+	chroot $SDCARD /bin/bash -c "echo HandlePowerKey=ignore >> /etc/systemd/login.d"
+
+	return 0
+}
+
+function post_family_tweaks_bsp__PBP_BSP() {
+    display_alert "Installing BSP firmware and fixups"
+
+	# special keys
+	mkdir -p "${destination}"/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/
+	cp $SRC/packages/bsp/pinebook-pro/pointers.xml "${destination}"/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/
+
+	# touchpad and keyboard tweaks
+	mkdir -p "${destination}"/etc/X11/xorg.conf.d/
+	# from https://github.com/ayufan-rock64/linux-package/tree/master/root-pinebookpro
+	cp "${SRC}"/packages/bsp/pinebook-pro/40-pinebookpro-touchpad.conf "${destination}"/etc/X11/xorg.conf.d/
+
+	# keyboard hwdb
+	mkdir -p "${destination}"/etc/udev/hwdb.d/
+	cp "${SRC}"/packages/bsp/pinebook-pro/10-usb-kbd.hwdb "${destination}"/etc/udev/hwdb.d/
+
+	return 0
+}

config/boards/qemu-uboot-arm64.wip

@@ -1,8 +1,59 @@
 # qemu via uboot on arm64, for "virt" qemu machine type
-export BOARD_NAME="uefi-arm64"
-export BOARDFAMILY="uefi-arm64"
-export KERNEL_TARGET="current,edge"
+declare -g BOARD_NAME="uefi-arm64"
+declare -g BOARDFAMILY="uefi-arm64"
+declare -g KERNEL_TARGET="current,edge"
 
-export UEFI_GRUB="skip" # Skip GRUB for this board
-export SERIALCON="ttyS0"
-export QEMU_UBOOT_BOOTCONFIG="qemu_arm64_defconfig"
+declare -g UEFI_GRUB="skip" # Skip GRUB for this board
+declare -g SERIALCON="ttyAMA0"
+declare -g QEMU_UBOOT_BOOTCONFIG="qemu_arm64_defconfig"
+
+# qemu'ed uboot on arm64 can do extlinux.
+# declare -g SRC_EXTLINUX="yes"
+# declare -g SRC_CMDLINE="loglevel=7 console=ttyAMA0" # Those boards are serial-debug only; 'root=LABEL=armbi_root' ?
+# enable_extension "u-boot-menu"                    # this generates the extlinux.conf
+
+function post_family_config__force_uboot_bin_and_use_uboot_menu_extlinux_arm64() {
+	declare -g UBOOT_TARGET_MAP="all;;u-boot.bin"
+
+	# lets try with a bootscript. kernel does not start under extlinux...
+	declare -g BOOTSCRIPT="boot-qemu-arm64.cmd:boot.cmd"
+}
+
+# Export the u-boot.rom file next to the disk image, so it can be used as qemu's firmware via the -bios option.
+function pre_umount_final_image__export_uboot_rom() {
+	: "${version:?version is not set}"
+	local uboot_name="linux-u-boot-${BRANCH}-${BOARD}_${REVISION}_${ARCH}"
+	display_alert "Exporting u-boot.bin" "${uboot_name} - ${version}.u-boot.bin" "debug"
+	run_host_command_logged cp -pv "${MOUNT}/usr/lib/${uboot_name}/u-boot.bin" "${DESTIMG}/${version}.u-boot.bin"
+}
+
+function board_docs__qemu-uboot-arm64() {
+	: "${version:?version is not set}"
+
+	cat <<- DOCS
+		## Running on qemu, via command line
+
+		\`\`\`bash
+		# nvme stuff
+		qemu-system-aarch64 -m 2048 -machine virt -nographic -cpu cortex-a57 \\
+			-bios ${version}.u-boot.bin \\
+			-drive if=none,file=${version}.img.qcow2,id=armbian \\
+			-device nvme,drive=armbian,serial=serialnumber
+
+		# virtio, network
+		# try with -accel kvm on supported neoverse systems
+		qemu-system-aarch64 -m 2048 -machine virt -nographic -cpu cortex-a72 \\
+			-bios ${version}.u-boot.bin -nic user,model=virtio-net-pci \\
+			-drive if=none,media=disk,id=drive0,file=${version}.img.qcow2,discard=unmap,detect-zeroes=unmap \\
+			-device virtio-blk-pci,drive=drive0,bootindex=0
+
+		\`\`\`
+
+		@TODO, see docs below.
+
+		## Docs
+
+		- https://u-boot.readthedocs.io/en/latest/board/emulation/qemu-arm.html
+		- https://u-boot.readthedocs.io/en/latest/develop/devicetree/dt_qemu.html
+	DOCS
+}

config/boards/qemu-uboot-x86.wip

@@ -1,11 +1,56 @@
 # x86_64 via qemu + u-boot firmware, for q35 machine type
-export UEFI_GRUB="skip" # Skip GRUB for this board
-export BOARD_NAME="uefi-x86"
-export BOARDFAMILY="uefi-x86"
-export KERNEL_TARGET="current,edge"
+declare -g UEFI_GRUB="skip" # Skip GRUB for this board
+declare -g BOARD_NAME="uefi-x86"
+declare -g BOARDFAMILY="uefi-x86"
+declare -g KERNEL_TARGET="current,edge"
 
-export SERIALCON="ttyS0"
+declare -g SERIALCON="ttyS0"
 
 # u-boot's "x86_64" is incomplete; use the 32-bit version.
-export QEMU_UBOOT_BOOTCONFIG="qemu-x86_defconfig"
-export INITRD_ARCH='x86' # not really needed, but just in case
+declare -g QEMU_UBOOT_BOOTCONFIG="qemu-x86_defconfig"
+declare -g INITRD_ARCH='x86' # input for mkimage, needed for extlinux
+
+## qemu'ed uboot on x86 can do extlinux?
+#declare -g SRC_EXTLINUX="yes"
+#declare -g SRC_CMDLINE="loglevel=7 console=ttyS0" # Those boards are serial-debug only; 'root=LABEL=armbi_root' ?
+#enable_extension "u-boot-menu"                    # this generates the extlinux.conf
+
+function post_family_config__force_uboot_rom_build_x86() {
+	declare -g UBOOT_TARGET_MAP="all;;u-boot.rom" # Can't find the target that produces 'u-boot.rom', so for now 'make all'
+
+	# x86 requires a bootscript, since it's a bzImage and non-mkimage'd initrd; extlinux chokes.
+	declare -g BOOTSCRIPT="boot-qemu-x86.cmd:boot.cmd"
+}
+
+# Export the u-boot.rom file next to the disk image, so it can be used as qemu's firmware via the -bios option.
+function pre_umount_final_image__export_uboot_rom() {
+	: "${version:?version is not set}"
+	local uboot_name="linux-u-boot-${BRANCH}-${BOARD}_${REVISION}_${ARCH}"
+	display_alert "Exporting u-boot.rom" "${uboot_name} - ${version}.u-boot.rom" "debug"
+	run_host_command_logged cp -pv "${MOUNT}/usr/lib/${uboot_name}/u-boot.rom" "${DESTIMG}/${version}.u-boot.rom"
+}
+
+function board_docs__qemu-uboot-x86() {
+	: "${version:?version is not set}"
+	cat <<- DOCS
+		## Upstream docs
+
+		- https://u-boot.readthedocs.io/en/latest/arch/x86.html
+		- https://u-boot.readthedocs.io/en/latest/board/emulation/qemu-x86.html
+
+		## Running on qemu, via command line
+
+		### On Linux (x86), with KVM acceleration
+
+		\`\`\`bash
+		qemu-system-x86_64 -accel kvm -machine q35,vmport=off -smp 8 -nographic -bios ${version}.u-boot.rom -m 2048 -nic user,model=virtio-net-pci -device virtio-blk-pci,drive=drive0,bootindex=0 -drive if=none,media=disk,id=drive0,file=${version}.img.qcow2,discard=unmap,detect-zeroes=unmap
+		\`\`\`
+
+		### On Mac (x86)
+
+		\`\`\`bash
+		# -accel hvf does not work for me, u-boot hangs. this makes it unpractical on macos (monterey). probably also works under darwin/arm64, it's emulated anyway.
+		qemu-system-x86_64 -machine q35,vmport=off -smp 8 -nographic -bios ${version}.u-boot.rom -m 2048 -nic user,model=virtio-net-pci -device virtio-blk-pci,drive=drive0,bootindex=0 -drive if=none,media=disk,id=drive0,file=${version}.img.qcow2,discard=unmap,detect-zeroes=unmap
+		\`\`\`
+	DOCS
+}

config/boards/radxa-e25.wip

@@ -2,12 +2,11 @@
 BOARD_NAME="Radxa E25"
 BOARDFAMILY="rk35xx"
 BOOTCONFIG="radxa-e25-rk3568_defconfig"
-KERNEL_TARGET="legacy,edge"
+KERNEL_TARGET="legacy,current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3568-radxa-e25.dtb"
 BOOT_SCENARIO="spl-blobs"
 WIREGUARD="no"
-BOOT_SUPPORT_SPI="yes"
 IMAGE_PARTITION_TABLE="gpt"
 BOOTFS_TYPE="fat"

config/boards/rk3318-box.tvb

@@ -8,3 +8,13 @@ MODULES_BLACKLIST="analogix_dp bcmdhd"
 BOOT_SCENARIO="tpl-blob-atf-mainline"
 DDR_BLOB="rk33/rk3318_ddr_666Mhz_v1.16.bin"
 BOOT_SOC="rk3328"
+
+function post_family_tweaks_bsp__rk3318-box() {
+    display_alert "Installing BSP firmware and fixups"
+
+	# Optional board dtbo selection script
+	mkdir -p $destination/usr/local/bin
+	install -m 755 $SRC/packages/bsp/rk3318/rk3318-config $destination/usr/sbin
+
+	return 0
+}

config/boards/rock-3a.conf

@@ -2,12 +2,13 @@
 BOARD_NAME="Rock 3A"
 BOARDFAMILY="rk35xx"
 BOOTCONFIG="rock-3a-rk3568_defconfig"
-KERNEL_TARGET="legacy,edge"
+KERNEL_TARGET="legacy,current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3568-rock-3a.dtb"
 BOOT_SCENARIO="spl-blobs"
 WIREGUARD="no"
 BOOT_SUPPORT_SPI="yes"
+BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
 BOOTFS_TYPE="fat"

config/boards/rock-5a.wip

@@ -0,0 +1,26 @@
+# Rockchip RK3588s SoC octa core 4-16GB SoC eMMC USB3 NvME
+BOARD_NAME="Rock 5A"
+BOARDFAMILY="rockchip-rk3588"
+BOOTCONFIG="rock-5a-rk3588s_defconfig"
+KERNEL_TARGET="legacy,edge"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3588s-rock-5a.dtb"
+BOOT_SCENARIO="spl-blobs"
+BOOT_SOC="rk3588"
+WIREGUARD="no"
+BOOT_SUPPORT_SPI="yes"
+BOOT_SPI_RKSPI_LOADER="yes"
+IMAGE_PARTITION_TABLE="gpt"
+SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes
+
+function post_family_tweaks__rock5a_naming_audios() {
+	display_alert "$BOARD" "Renaming rock5a 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-dp0-sound", ENV{SOUND_DESCRIPTION}="DP0 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-es8316-sound", ENV{SOUND_DESCRIPTION}="ES8316 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+
+	return 0
+}

config/boards/rock-5b.conf

@@ -0,0 +1,28 @@
+# Rockchip RK3588 SoC octa core 4-16GB SoC 2.5GBe PoE eMMC USB3 NvME
+BOARD_NAME="Rock 5B"
+BOARDFAMILY="rockchip-rk3588"
+BOOTCONFIG="rock-5b-rk3588_defconfig"
+KERNEL_TARGET="legacy,edge,midstream"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3588-rock-5b.dtb"
+BOOT_SCENARIO="spl-blobs"
+WIREGUARD="no"
+BOOT_SUPPORT_SPI="yes"
+BOOT_SPI_RKSPI_LOADER="yes"
+IMAGE_PARTITION_TABLE="gpt"
+SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes
+BOOTFS_TYPE="ext4"
+
+function post_family_tweaks__rock5b_naming_audios() {
+	display_alert "$BOARD" "Renaming rock5b 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-hdmiin-sound", ENV{SOUND_DESCRIPTION}="HDMI-In Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-dp0-sound", ENV{SOUND_DESCRIPTION}="DP0 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-es8316-sound", ENV{SOUND_DESCRIPTION}="ES8316 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+
+	return 0
+}

config/boards/rock-5b.wip

@@ -1,14 +0,0 @@
-# Rockchip RK3588 SoC octa core 4-16GB SoC 2.5GBe PoE eMMC USB3 NvME
-BOARD_NAME="Rock 5B"
-BOARDFAMILY="rockchip-rk3588"
-BOOTCONFIG="rock-5b-rk3588_defconfig"
-KERNEL_TARGET="legacy,edge,midstream"
-FULL_DESKTOP="yes"
-BOOT_LOGO="desktop"
-BOOT_FDT_FILE="rockchip/rk3588-rock-5b.dtb"
-BOOT_SCENARIO="spl-blobs"
-WIREGUARD="no"
-BOOT_SUPPORT_SPI="yes"
-IMAGE_PARTITION_TABLE="gpt"
-SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes
-BOOTFS_TYPE="ext4"

config/boards/rockpi-4a.conf

@@ -6,5 +6,6 @@ KERNEL_TARGET="legacy,current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3399-rock-pi-4a.dtb"
+BOOT_SCENARIO="tpl-spl-blob"
 BOOT_SUPPORT_SPI=yes
 DDR_BLOB="rk33/rk3399_ddr_933MHz_v1.20.bin"

config/boards/rockpi-4b.conf

@@ -6,5 +6,20 @@ KERNEL_TARGET="legacy,current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3399-rock-pi-4b.dtb"
+BOOT_SCENARIO="tpl-spl-blob"
 BOOT_SUPPORT_SPI=yes
 DDR_BLOB="rk33/rk3399_ddr_933MHz_v1.20.bin"
+
+function post_family_tweaks_bsp__rockpi-4b_BSP() {
+    display_alert "Installing BSP firmware and fixups"
+
+	if [[ $BRANCH == legacy ]]; then
+
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+
+	fi
+
+	return 0
+}

config/boards/rockpi-4bplus.csc

@@ -6,5 +6,6 @@ KERNEL_TARGET="edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3399-rock-pi-4b-plus.dtb"
+BOOT_SCENARIO="tpl-spl-blob"
 BOOT_SUPPORT_SPI=yes
 DDR_BLOB="rk33/rk3399_ddr_933MHz_v1.25.bin"

config/boards/rockpi-4c.conf

@@ -6,4 +6,19 @@ KERNEL_TARGET="legacy,current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3399-rock-pi-4c.dtb"
+BOOT_SCENARIO="tpl-spl-blob"
 BOOT_SUPPORT_SPI=yes
+
+function post_family_tweaks_bsp__rockpi-4c_BSP() {
+    display_alert "Installing BSP firmware and fixups"
+
+	if [[ $BRANCH == legacy ]]; then
+
+		# Bluetooth for most of others (custom patchram is needed only in legacy)
+		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/
+
+	fi
+
+	return 0
+}

config/boards/rockpi-4cplus.csc

@@ -6,4 +6,5 @@ KERNEL_TARGET="current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3399-rock-pi-4c-plus.dtb"
+BOOT_SCENARIO="tpl-spl-blob"
 BOOT_SUPPORT_SPI=yes

config/boards/rockpi-n10.csc

@@ -7,3 +7,4 @@ FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3399pro-rock-pi-n10.dtb"
 BOOT_SUPPORT_SPI=yes
+BOOT_SCENARIO="tpl-spl-blob"

config/boards/rpi4b.conf

@@ -1,9 +1,9 @@
 # Broadcom BCM2711 quad core 1-8Gb RAM SoC USB3 GBE USB-C WiFi/BT
-export BOARD_NAME="Raspberry Pi 4"
-export BOARDFAMILY="bcm2711"
-export KERNEL_TARGET="legacy,current,edge"
-export FK__MACHINE_MODEL="Raspberry Pi 4 Model B" # flash kernel (FK) configuration
-export ASOUND_STATE="asound.state.rpi"
+declare -g BOARD_NAME="Raspberry Pi 4"
+declare -g BOARDFAMILY="bcm2711"
+declare -g KERNEL_TARGET="legacy,current,edge"
+declare -g FK__MACHINE_MODEL="Raspberry Pi 4 Model B" # flash kernel (FK) configuration
+declare -g ASOUND_STATE="asound.state.rpi"
 
 # Our default paritioning system is leaving esp on. Rpi3 is the only board that have issues with this.
 # Removing the ESP flag from the boot partition should allow the image to boot on both the RPi3 and RPi4.
@@ -14,14 +14,21 @@ pre_umount_final_image__remove_esp() {
 
 # configure stuff at the appropriate time in flash-kernel
 pre_initramfs_flash_kernel__write_raspi_config() {
-	# for serial console, there is also 'BOOT_UART=1' in 'rpi-eeprom-config' but that is for an earlier stage.
-	# look at with it rpi-eeprom-config, change with 'EDITOR=nano rpi-eeprom-config --edit'
-	cat <<-EOD >"${FIRMWARE_DIR}/config.txt"
+	declare comment_if_debug=""
+	declare not_comment_if_debug="#"
+	if [[ "${RPI_DEBUG_CONSOLE}" != "yes" ]]; then
+		comment_if_debug="#"
+		not_comment_if_debug=""
+		# for serial console, there is also 'BOOT_UART=1' in 'rpi-eeprom-config' but that is for an earlier stage.
+		# look at with it rpi-eeprom-config, change with 'EDITOR=nano rpi-eeprom-config --edit'
+	fi
+
+	cat <<- EOD > "${FIRMWARE_DIR}/config.txt"
 		[pi4]
 		max_framebuffers=2
 		over_voltage=2
 		arm_freq=1800
-		
+
 		[all]
 		kernel=vmlinuz
 		cmdline=cmdline.txt
@@ -33,18 +40,18 @@ pre_initramfs_flash_kernel__write_raspi_config() {
 
 		# enable audio (loads snd_bcm2835)
 		dtparam=audio=on
-		
+
 		# bootloader logs to serial, second stage
-		# enable_uart=1
-		
+		${not_comment_if_debug}enable_uart=1
+
 		# overclock. requires decent thermals. COMMENT OUT IF DON'T USE A GREAT COOLER OR HEATSINK.
 		# over_voltage=6
 		# arm_freq=2000
-		
+
 		# uncomment to disable wifi or bt.
 		#dtoverlay=disable-wifi
-		#dtoverlay=disable-bt
-		
+		${comment_if_debug}dtoverlay=disable-bt
+
 		# gpu and 3d stuff.
 		gpu_mem=256
 		dtoverlay=vc4-fkms-v3d

config/boards/station-m1.conf

@@ -10,3 +10,18 @@ SRC_EXTLINUX="yes"
 SERIALCON="ttyS0,tty0"
 SRC_CMDLINE="console=ttyS2,1500000 console=tty0"
 ASOUND_STATE="asound.state.station-m1"
+
+function post_family_tweaks__station_m1() {
+    display_alert "$BOARD" "Installing board tweaks" "info"
+
+	cp -R $SRC/packages/blobs/rtl8723bt_fw/* $SDCARD/lib/firmware/rtl_bt/
+	cp -R $SRC/packages/blobs/station/firmware/* $SDCARD/lib/firmware/
+	if [[ $BRANCH == legacy ]]; then
+		install -m 755 $SRC/packages/bsp/rk3328/m1/rtk_hciattach $SDCARD/usr/bin/rtk_hciattach
+		sed -e 's/exit 0//g' -i $SDCARD/etc/rc.local
+		echo "su -c '/usr/bin/rtk_hciattach -n -s 115200 /dev/ttyS2 rtk_h5 &'" >> $SDCARD/etc/rc.local
+		echo "exit 0" >> $SDCARD/etc/rc.local
+	fi
+
+	return 0
+}