Starfive: fix broken patch due to kernel upgrade

meson64 kernels HDMI patch is obsolete (#7579 )
* HDMI codec patch must nott be used as it is already applied to linux sources
2025-09-24 19:47:06 +07:00 · 2024-12-15 17:45:22 +01:00 · 2024-12-15 15:43:25 +01:00 · 2024-12-15 15:42:25 +01:00 · 2024-12-15 13:41:24 +01:00 · 2024-12-15 13:41:13 +01:00
1601 changed files with 109186 additions and 94171 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -20,19 +20,26 @@ config/boards/aml-a311d-cc.conf		@Tonymac32
 config/boards/aml-s905d3-cc.wip		@Tonymac32
 config/boards/aml-s9xx-box.tvb		@SteeManMI
 config/boards/armsom-sige1.csc		@amazingfate
-config/boards/avaota-a1.conf		@chainsx
+config/boards/armsom-sige3.csc		@amazingfate
+config/boards/avaota-a1.csc		@chainsx
 config/boards/ayn-odin2.eos		@FantasyGmm
 config/boards/bananapi.conf		@DylanHP @janprunk
 config/boards/bananapicm4io.conf		@pyavitz
-config/boards/bananapim2pro.conf		@bretmlw
+config/boards/bananapim2pro.conf		@igorpecovnik
 config/boards/bananapim2s.conf		@jeanrhum @pyavitz
+config/boards/bananapim2zero.csc		@mhawkins-consultant
 config/boards/bananapim3.csc		@AaronNGray
 config/boards/bananapim4zero.conf		@pyavitz
-config/boards/bananapim5.conf		@bretmlw
+config/boards/bananapim5.conf		@igorpecovnik
 config/boards/bananapim64.csc		@devdotnetorg
 config/boards/bananapim7.conf		@amazingfate
 config/boards/bigtreetech-cb1.conf		@JohnTheCoolingFan
+config/boards/bigtreetech-cb2.conf		@JohnTheCoolingFan
+config/boards/cherryba-m1.csc		@IsMrX
+config/boards/clearfogpro.csc		@Heisath
+config/boards/cm3588-nas.csc		@ColorfulRhino
 config/boards/coolpi-cm5.csc		@andyshrk
+config/boards/coolpi-genbook.csc		@andyshrk
 config/boards/firefly-itx-3588j.csc		@SeeleVolleri
 config/boards/fxblox-rk1.csc		@mahdichi
 config/boards/gateway-gz80x.conf		@pyavitz
@@ -61,50 +68,52 @@ config/boards/licheepi-4a.eos		@chainsx
 config/boards/longanpi-4b.csc		@chainsx
 config/boards/lubancat2.csc		@andyshrk
 config/boards/mangopi-m28k.csc		@sputnik2019
-config/boards/mba8mpxl-ras314.wip		@schmiedelm
-config/boards/mba8mpxl.wip		@schmiedelm
+config/boards/mba8mpxl-ras314.conf		@schmiedelm
+config/boards/mba8mpxl.conf		@schmiedelm
 config/boards/mekotronics-r58-minipc.csc		@monkaBlyat
 config/boards/mekotronics-r58x-4g.csc		@monkaBlyat
 config/boards/mekotronics-r58x.csc		@monkaBlyat
 config/boards/mixtile-blade3.csc		@rpardini
-config/boards/nanopc-cm3588-nas.csc		@ColorfulRhino
+config/boards/nanopct6-lts.conf		@SuperKali @Tonymac32
 config/boards/nanopct6.conf		@SuperKali @Tonymac32
+config/boards/nanopi-m6.conf		@efectn
 config/boards/nanopi-r4s.conf		@Manouchehri
 config/boards/nanopi-r5s.csc		@utlark
 config/boards/nanopi-r6c.csc		@ColorfulRhino
-config/boards/nanopi-r6s.csc		@efectn
+config/boards/nanopi-r6s.conf		@efectn
 config/boards/nanopiair.csc		@1ubuntuuser
 config/boards/nanopiduo.csc		@sgjava
 config/boards/nanopim4v2.conf		@igorpecovnik
 config/boards/nanopineocore2.csc		@AGM1968
 config/boards/nanopineoplus2.csc		@teknoid
+config/boards/odroidc1.conf		@juanlufont
 config/boards/odroidc2.conf		@teknoid
 config/boards/odroidc4.conf		@igorpecovnik
 config/boards/odroidhc4.conf		@igorpecovnik
 config/boards/odroidm1.conf		@rpardini
 config/boards/odroidn2.conf		@NicoD-SBC
 config/boards/odroidxu4.conf		@joekhoobyar
-config/boards/olimex-teres-a64.conf		@Kreyren
+config/boards/olimex-teres-a64.csc		@Kreyren
 config/boards/onecloud.conf		@hzyitc
-config/boards/orangepi-r1.csc		@schwar3kat
-config/boards/orangepi-r1plus-lts.csc		@schwar3kat
+config/boards/oneplus-kebab.conf		@amazingfate
 config/boards/orangepi4-lts.conf		@paolosabatino
 config/boards/orangepi4.csc		@paolosabatino
-config/boards/orangepi5-plus.conf		@alexl83 @efectn
+config/boards/orangepi5-plus.conf		@alexl83
 config/boards/orangepi5.conf		@efectn
 config/boards/orangepione.conf		@StephenGraf
 config/boards/orangepipc.csc		@lbmendes
 config/boards/orangepipcplus.csc		@Janmcha
-config/boards/orangepizero2.wip		@AGM1968 @krachlatte
+config/boards/orangepizero2.csc		@AGM1968 @krachlatte
 config/boards/orangepizero2w.csc		@chraac
 config/boards/orangepizero3.csc		@alexl83 @chraac
-config/boards/orangepizeroplus.conf		@schwar3kat
+config/boards/orangepizeroplus.csc		@schwar3kat
 config/boards/phytiumpi.conf		@chainsx
 config/boards/pine64.conf		@PanderMusubi
 config/boards/pinebook-pro.csc		@TRSx80 @ahoneybun
 config/boards/qemu-uboot-arm64.csc		@rpardini
 config/boards/qemu-uboot-x86.csc		@rpardini
 config/boards/qemu-uefi-x86.conf		@davidandreoletti
+config/boards/radxa-e20c.csc		@mattx433
 config/boards/radxa-e25.csc		@krachlatte
 config/boards/radxa-e52c.conf		@amazingfate
 config/boards/radxa-zero.conf		@clee @engineer-80
@@ -117,12 +126,13 @@ config/boards/rk3328-heltec.csc		@sicXnull
 config/boards/rock-3a.conf		@ZazaBR @amazingfate @catalinii @vamzii
 config/boards/rock-5-itx.conf		@amazingfate @prahal
 config/boards/rock-5a.conf		@amazingfate
+config/boards/rock-5b-plus.conf		@HeyMeco @fridtjof
 config/boards/rock-5b.conf		@amazingfate @linhz0hz
-config/boards/rock-5c.conf		@amazingfate
+config/boards/rock-5c.conf		@schwar3kat
 config/boards/rock-s0.conf		@brentr
 config/boards/rock64.csc		@clee
 config/boards/rockpi-4a.csc		@clee
-config/boards/rockpi-e.conf		@krachlatte
+config/boards/rockpi-e.conf		@paolosabatino
 config/boards/rockpi-s.conf		@brentr
 config/boards/rockpro64.csc		@joekhoobyar
 config/boards/rpi4b.conf		@PanderMusubi @teknoid
@@ -134,7 +144,7 @@ config/boards/sk-tda4vm.conf		@glneo
 config/boards/station-m1.csc		@150balbes
 config/boards/station-m3.csc		@chainsx
 config/boards/sweet-potato.conf		@Tonymac32
-config/boards/thinkpad-x13s.wip		@PeterChrz @rpardini
+config/boards/thinkpad-x13s.conf		@PeterChrz @rpardini
 config/boards/tinkerboard.conf		@paolosabatino
 config/boards/tritium-h3.conf		@Tonymac32
 config/boards/tritium-h5.conf		@Tonymac32
@@ -145,46 +155,46 @@ config/boards/wsl2-x86.csc		@rpardini
 config/boards/x96-mate.tvb		@Ressetkk
 config/boards/x96q.tvb		@sicXnull
 config/boards/xiaomi-elish.conf		@amazingfate
-config/boards/xiaomi-umi.conf		@FantasyGmm
+config/boards/xiaomi-umi.eos		@FantasyGmm
 config/boards/youyeetoo-r1-v3.csc		@SuperKali
 config/kernel/linux-arm64-*.config		@FantasyGmm
 config/kernel/linux-bcm2711-*.config		@PanderMusubi @teknoid
 config/kernel/linux-imx8m-*.config		@schmiedelm
 config/kernel/linux-k3-*.config		@glneo
-config/kernel/linux-meson-*.config		@hzyitc
+config/kernel/linux-meson-*.config		@hzyitc @juanlufont
 config/kernel/linux-meson-s4t7-*.config		@adeepn @rpardini @viraniac
-config/kernel/linux-meson64-*.config		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @bretmlw @clee @engineer-80 @igorpecovnik @jeanrhum @monkaBlyat @pyavitz @rpardini @teknoid
+config/kernel/linux-meson64-*.config		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @clee @engineer-80 @igorpecovnik @jeanrhum @monkaBlyat @pyavitz @rpardini @teknoid
 config/kernel/linux-mvebu-*.config		@Heisath
 config/kernel/linux-odroidxu4-*.config		@joekhoobyar
 config/kernel/linux-phytium-embedded-*.config		@chainsx
-config/kernel/linux-rk35xx-*.config		@ColorfulRhino @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @monkaBlyat @prahal @rpardini @sputnik2019 @vamzii
+config/kernel/linux-rk35xx-*.config		@ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
 config/kernel/linux-rockchip-*.config		@paolosabatino
-config/kernel/linux-rockchip-rk3588-*.config		@ColorfulRhino @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @efectn @lanefu @linhz0hz @rpardini
-config/kernel/linux-rockchip64-*.config		@150balbes @Manouchehri @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @amazingfate @andyshrk @brentr @catalinii @clee @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @paolosabatino @prahal @rpardini @schwar3kat @sicXnull @tdleiyao @utlark @vamzii
+config/kernel/linux-rockchip-rk3588-*.config		@ColorfulRhino @HeyMeco @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @efectn @fridtjof @lanefu @linhz0hz @rpardini @schwar3kat
+config/kernel/linux-rockchip64-*.config		@150balbes @JohnTheCoolingFan @Manouchehri @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @amazingfate @andyshrk @brentr @catalinii @clee @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @paolosabatino @prahal @rpardini @sicXnull @tdleiyao @utlark @vamzii
 config/kernel/linux-sm8250-*.config		@FantasyGmm @amazingfate
 config/kernel/linux-sun55iw3-syterkit-*.config		@chainsx
-config/kernel/linux-sunxi-*.config		@1ubuntuuser @AaronNGray @DylanHP @Janmcha @StephenGraf @Tonymac32 @janprunk @lbmendes @schwar3kat @sgjava
-config/kernel/linux-sunxi64-*.config		@AGM1968 @JohnTheCoolingFan @Kreyren @NicoD-SBC @PanderMusubi @Ressetkk @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @krachlatte @pyavitz @schwar3kat @sicXnull @teknoid
+config/kernel/linux-sunxi-*.config		@1ubuntuuser @AaronNGray @DylanHP @Janmcha @StephenGraf @Tonymac32 @janprunk @lbmendes @mhawkins-consultant @sgjava
+config/kernel/linux-sunxi64-*.config		@AGM1968 @IsMrX @JohnTheCoolingFan @Kreyren @NicoD-SBC @PanderMusubi @Ressetkk @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @krachlatte @pyavitz @schwar3kat @sicXnull @teknoid
 config/kernel/linux-thead-*.config		@chainsx
 config/kernel/linux-uefi-arm64-*.config		@PeterChrz @rpardini
 config/kernel/linux-uefi-x86-*.config		@davidandreoletti @rpardini
 patch/kernel/archive/meson-s4t7-*/		@adeepn @rpardini @viraniac
 patch/kernel/archive/odroidxu4-*/		@joekhoobyar
-patch/kernel/archive/sunxi-*/		@1ubuntuuser @AGM1968 @AaronNGray @DylanHP @Janmcha @JohnTheCoolingFan @Kreyren @NicoD-SBC @PanderMusubi @Ressetkk @StephenGraf @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @janprunk @krachlatte @lbmendes @pyavitz @schwar3kat @sgjava @sicXnull @teknoid
+patch/kernel/archive/sunxi-*/		@1ubuntuuser @AGM1968 @AaronNGray @DylanHP @IsMrX @Janmcha @JohnTheCoolingFan @Kreyren @NicoD-SBC @PanderMusubi @Ressetkk @StephenGraf @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @janprunk @krachlatte @lbmendes @mhawkins-consultant @pyavitz @schwar3kat @sgjava @sicXnull @teknoid
 patch/kernel/archive/uefi-arm64-*/		@PeterChrz @rpardini
 patch/kernel/archive/uefi-x86-*/		@davidandreoletti @rpardini
 patch/kernel/bcm2711-*/		@PanderMusubi @teknoid
 patch/kernel/imx8m-*/		@schmiedelm
 patch/kernel/k3-*/		@glneo
-patch/kernel/meson-*/		@hzyitc
-patch/kernel/meson64-*/		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @bretmlw @clee @engineer-80 @igorpecovnik @jeanrhum @monkaBlyat @pyavitz @rpardini @teknoid
+patch/kernel/meson-*/		@hzyitc @juanlufont
+patch/kernel/meson64-*/		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @clee @engineer-80 @igorpecovnik @jeanrhum @monkaBlyat @pyavitz @rpardini @teknoid
 patch/kernel/mvebu-*/		@Heisath
 patch/kernel/odroidxu4-*/		@joekhoobyar
 patch/kernel/phytium-embedded-*/		@chainsx
-patch/kernel/rk35xx-vendor-*/		@ColorfulRhino @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @monkaBlyat @prahal @rpardini @sputnik2019 @vamzii
+patch/kernel/rk35xx-vendor-*/		@ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
 patch/kernel/rockchip-*/		@paolosabatino
-patch/kernel/rockchip-rk3588-*/		@ColorfulRhino @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @efectn @lanefu @linhz0hz @rpardini
-patch/kernel/rockchip64-*/		@150balbes @Manouchehri @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @amazingfate @andyshrk @brentr @catalinii @clee @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @paolosabatino @prahal @rpardini @schwar3kat @sicXnull @tdleiyao @utlark @vamzii
+patch/kernel/rockchip-rk3588-*/		@ColorfulRhino @HeyMeco @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @efectn @fridtjof @lanefu @linhz0hz @rpardini @schwar3kat
+patch/kernel/rockchip64-*/		@150balbes @JohnTheCoolingFan @Manouchehri @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @amazingfate @andyshrk @brentr @catalinii @clee @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @paolosabatino @prahal @rpardini @sicXnull @tdleiyao @utlark @vamzii
 patch/kernel/sm8250-*/		@FantasyGmm @amazingfate
 patch/kernel/sm8550-*/		@FantasyGmm
 patch/kernel/sun55iw3-syterkit-*/		@chainsx
@@ -194,18 +204,18 @@ sources/families/bcm2711.conf		@PanderMusubi @teknoid
 sources/families/imx8m.conf		@schmiedelm
 sources/families/k3.conf		@glneo
 sources/families/meson-s4t7.conf		@adeepn @rpardini @viraniac
-sources/families/meson.conf		@hzyitc
-sources/families/meson64.conf		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @bretmlw @clee @engineer-80 @igorpecovnik @jeanrhum @monkaBlyat @pyavitz @rpardini @teknoid
+sources/families/meson.conf		@hzyitc @juanlufont
+sources/families/meson64.conf		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @clee @engineer-80 @igorpecovnik @jeanrhum @monkaBlyat @pyavitz @rpardini @teknoid
 sources/families/mvebu.conf		@Heisath
 sources/families/odroidxu4.conf		@joekhoobyar
 sources/families/phytium-embedded.conf		@chainsx
-sources/families/rk35xx.conf		@ColorfulRhino @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @monkaBlyat @prahal @rpardini @sputnik2019 @vamzii
-sources/families/rockchip-rk3588.conf		@ColorfulRhino @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @efectn @lanefu @linhz0hz @rpardini
+sources/families/rk35xx.conf		@ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
+sources/families/rockchip-rk3588.conf		@ColorfulRhino @HeyMeco @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @efectn @fridtjof @lanefu @linhz0hz @rpardini @schwar3kat
 sources/families/rockchip.conf		@paolosabatino
-sources/families/rockchip64.conf		@150balbes @Manouchehri @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @amazingfate @andyshrk @brentr @catalinii @clee @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @paolosabatino @prahal @rpardini @schwar3kat @sicXnull @tdleiyao @utlark @vamzii
+sources/families/rockchip64.conf		@150balbes @JohnTheCoolingFan @Manouchehri @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @amazingfate @andyshrk @brentr @catalinii @clee @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @paolosabatino @prahal @rpardini @sicXnull @tdleiyao @utlark @vamzii
 sources/families/sm8250.conf		@FantasyGmm @amazingfate
 sources/families/sun55iw3-syterkit.conf		@chainsx
-sources/families/sunxi.conf		@1ubuntuuser @AaronNGray @DylanHP @Janmcha @StephenGraf @Tonymac32 @janprunk @lbmendes @schwar3kat @sgjava
-sources/families/sunxi64.conf		@AGM1968 @JohnTheCoolingFan @Kreyren @NicoD-SBC @PanderMusubi @Ressetkk @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @krachlatte @pyavitz @schwar3kat @sicXnull @teknoid
+sources/families/sunxi.conf		@1ubuntuuser @AaronNGray @DylanHP @Janmcha @StephenGraf @Tonymac32 @janprunk @lbmendes @mhawkins-consultant @sgjava
+sources/families/sunxi64.conf		@AGM1968 @IsMrX @JohnTheCoolingFan @Kreyren @NicoD-SBC @PanderMusubi @Ressetkk @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @krachlatte @pyavitz @schwar3kat @sicXnull @teknoid
 sources/families/thead.conf		@chainsx
 sources/families/x86.conf		@davidandreoletti @rpardini
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -10,6 +10,10 @@
 #
 # Please keep the labels sorted and deduplicated.

+"Needs review":
+- changed-files:
+  - any-glob-to-any-file: '**'
+
 "Hardware":
 - all:
  - changed-files:
--- a/.github/labels.yml
+++ b/.github/labels.yml
@@ -109,6 +109,3 @@
 - name: "Improper usage"
  color: "CD456C"
  description: "Provided input is not in the expected data format or structure"
- name: "Giveaway"
-  color: "DA4C13"
-  description: "Code completition was selected to enter contributors giveaway"
--- a/.github/workflows/adjust-maintainers.yml
+++ b/.github/workflows/adjust-maintainers.yml
@@ -0,0 +1,128 @@
+name: "Sync maintainers status"
+
+# Script connects to the contacts database once per hour and updates BOARD_MAINTAINER property in the board config files.
+# If there are any changes, it opens a Pull Request
+#
+# spdx-id: GPL-2.0-or-later
+# copyright-owner: @igorpecovnik
+
+# Dependencies: lftp, jq
+
+on:
+  schedule:
+    - cron: "0 * * * *"
+  workflow_dispatch:
+
+jobs:
+
+  Build:
+    name: "Maintainers sync"
+    runs-on: ubuntu-latest
+    if: ${{ github.repository_owner == 'armbian' }}
+    steps:
+
+      - name: "Checkout build repo"
+        uses: actions/checkout@v4
+        with:
+          repository: armbian/build
+          ref:  main
+          fetch-depth: 0
+          clean: false
+
+      - name: "Install SSH key for storage"
+        uses: shimataro/ssh-key-action@v2
+        with:
+          key: ${{ secrets.KEY_UPLOAD }}
+          known_hosts: ${{ secrets.KNOWN_HOSTS_ARMBIAN_UPLOAD }}
+          if_key_exists: replace
+
+      - name: "Install dependencies"
+        run: |
+
+          sudo apt-get -y -qq install jq
+
+      - name: "Download JSON file"
+        run: |
+
+          # download json that is prepared for this action in another cron job
+          rsync -e "ssh -p ${{ secrets.HOST_UPLOAD_PORT }}" -arvc ${{ secrets.HOST_UPLOAD_USER }}@${{ secrets.HOST_UPLOAD }}:/incoming/json/armbian_maintainers.json /tmp/
+
+      - name: "Update maintainers"
+        run: |
+
+          # reset all maintainers so we generate from scratch
+          sed -i "s/BOARD_MAINTAINER.*/BOARD_MAINTAINER=\"\"/" config/boards/*.{conf,wip,eos,tvb}
+
+          # extract values fron JSON
+          declare -A MAINTAINERS
+          {
+            # By default, bash run the pipe command in subshells
+            # which make variable can't be assigned to.
+            # And yes, lastpipe can solve it
+            # But this is better.
+            while read -r i; do
+              NAME="$(echo "$i" | jq --raw-output '.First_Name')"
+              BOARD="$(echo "$i" | jq --raw-output '.Maintaining')"
+              MAINTAINER_GITHUB="$(echo "$i" | jq --raw-output '.Github' | cut -d"/" -f4)"
+              if [[ "$BOARD" != null && "$MAINTAINER_GITHUB" != null ]]; then
+                echo "- [$NAME](https://github.com/${MAINTAINER_GITHUB})"
+                while read -r i; do
+                  echo -e "  - $i"
+                  MAINTAINERS["$i"]+="$MAINTAINER_GITHUB "
+                done < <( echo "$BOARD" | sed "s/,/\n/g" | sort -u )
+              fi
+            done < <(jq -c '.[]' /tmp/armbian_maintainers.json)
+
+            for cfg in config/boards/*.{conf,wip,csc,eos,tvb}; do
+              board_name="$(echo "${cfg##*/}" | sed -E 's/\..*//')"
+              declare -a maintainers
+              readarray -t maintainers < <(echo "${MAINTAINERS[${board_name}]}" | xargs -n1 | sort -u)
+              sed -i "s/BOARD_MAINTAINER=.*/BOARD_MAINTAINER=\"${maintainers[*]}\"/" "${cfg}"
+            done
+          } >> "$GITHUB_STEP_SUMMARY"
+
+      - name: "Mark csc for no maintainer"
+        run: |
+
+          grep BOARD_MAINTAINER=\"\" config/boards/*.{wip,conf} | cut -d":" -f1 |
+            while read -r line; do
+              if [[ "${line}" != "${line/.conf/.csc}" ]]; then
+                mv -v "$line" "${line/.conf/.csc}"
+              fi
+              if [[ "${line}" != "${line/.wip/.csc}" ]]; then
+                mv -v "$line" "${line/.wip/.csc}"
+              fi
+            done
+
+      - name: "Re-generate CODEOWNERS"
+        run: |
+
+          ./.github/generate_CODEOWNERS.sh
+
+      - name: Create Pull Request
+        id: cpr
+        uses: peter-evans/create-pull-request@v7
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          commit-message: '`Automatic` board configs status synchronise'
+          signoff: false
+          branch: update-maintainers
+          delete-branch: true
+          title: '`Automatic` board configs status synchronise'
+          body: |
+            Update maintainers and board status
+
+            - synced status from the database
+            - rename to .`csc` where we don't have anyone
+
+            If you want to become a board maintainer, [adjust data here](https://www.armbian.com/update-data/).
+
+            Ref:
+              - [Board Maintainers Procedures and Guidelines](https://docs.armbian.com/Board_Maintainers_Procedures_and_Guidelines/)
+              - [Contribute](https://docs.armbian.com/Process_Contribute/)
+
+          labels: |
+            Needs review
+          #assignees: igorpecovnik
+          #reviewers: Must be org collaborator
+          draft: false
--- a/.github/workflows/build-train.yml
+++ b/.github/workflows/build-train.yml
@@ -1,22 +0,0 @@
-name: Run Build Train on config changes
-run-name: Run build train - Pushed commit "${{ github.event.push.head_commit.message }}"
-
-on:
-  push:
-    branches:
-      - "main"
-    paths:
-      - "config/*.config"
-
-jobs:
-  build-train-dispatch:
-    name: Send dispatch
-    if: ${{ github.repository_owner == 'Armbian' }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Repository Dispatch
-        uses: peter-evans/repository-dispatch@v3
-        with:
-          token: ${{ secrets.ACCESS_TOKEN }}
-          repository: armbian/os
-          event-type: "Repository update"
--- a/.github/workflows/clean-workflow-logs.yml
+++ b/.github/workflows/clean-workflow-logs.yml
@@ -0,0 +1,27 @@
+name: Clean Workflow Logs
+
+on:
+  schedule:
+    - cron: "0 0 * * 1"  # Runs "At 00:00 on Monday." (see https://crontab.guru)
+
+  workflow_dispatch:
+    inputs:
+      runs_older_than:
+        description: "The amount of days old to delete"
+        default: "21"
+        required: false
+
+env:
+  SCHEDULED_RUNS_OLDER_THAN: "21"
+  SCHEDULED_RUNS_TO_KEEP: "0"
+
+jobs:
+  clean-logs:
+    runs-on: ubuntu-latest
+    permissions:
+      actions: write
+    steps:
+      - uses: igorjs/gh-actions-clean-workflow@v6
+        with:
+          runs_older_than: ${{ github.event.inputs.runs_older_than || env.SCHEDULED_RUNS_OLDER_THAN }}
+          runs_to_keep: ${{ github.event.inputs.runs_to_keep || env.SCHEDULED_RUNS_TO_KEEP }}
--- a/.github/workflows/issue-welcome-first-time.yml
+++ b/.github/workflows/issue-welcome-first-time.yml
@@ -0,0 +1,24 @@
+name: "Welcome first-time issue contributor"
+
+on:
+  issues:
+    types: opened
+
+jobs:
+  welcome-first-time-contributor:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: plbstl/first-contribution@v3
+        with:
+          labels: "Good first issue"
+          issue-opened-msg: |
+            ### Hey @{fc-author} !
+
+            Looks like it's your first time interacting with Armbian here on GitHub.
+
+            Welcome and thank you for taking the time to report an issue :heart:.
+
+            Don't forget to star :star: the repo.
--- a/.github/workflows/merge-announce.yml
+++ b/.github/workflows/merge-announce.yml
@@ -1,4 +1,4 @@
-name: push
+name: "Announce PR merge to Discord"

 on:
  push:
--- a/.github/workflows/pr-auto-labeler.yml
+++ b/.github/workflows/pr-auto-labeler.yml
@@ -4,16 +4,31 @@ run-name: 'Set labels - PR #${{ github.event.pull_request.number }} ("${{ github
 # Set labels for pull requests automatically based on size (modified via job 'label-size') and file categories (modified via .github/labeler)
 #

-on:
-  - pull_request_target
+on: pull_request_target

 jobs:
+  label-remove:
+    permissions:
+      contents: read # for pascalgn/size-label-action to determine modified files
+      pull-requests: write # for pascalgn/size-label-action to add labels to PRs
+    name: "Remove Ready to merge"
+    if: ${{ github.event.action == 'opened' || github.event.action == 'reopened' || github.event.action == 'synchronize' }}
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: PauMAVA/add-remove-label-action@v1.0.3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          add: ""
+          remove: "Ready to merge"
+
  label-category:
    permissions:
      contents: read # for actions/labeler to determine modified files
      pull-requests: write # for actions/labeler to add labels to PRs

    name: "Category labels"
+    if: ${{ github.event.action == 'opened' || github.event.action == 'reopened' || github.event.action == 'synchronize' }}
    runs-on: ubuntu-latest

    steps:
@@ -28,11 +43,12 @@ jobs:
      pull-requests: write # for pascalgn/size-label-action to add labels to PRs

    name: "Size label"
+    if: ${{ github.event.action == 'opened' || github.event.action == 'reopened' || github.event.action == 'synchronize' }}
    runs-on: ubuntu-latest

    steps:
      - name: size-label
-        uses: "pascalgn/size-label-action@v0.5.4"
+        uses: "pascalgn/size-label-action@v0.5.5"
        env:
          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
        with:
--- a/.github/workflows/pr-build-artifacts.yml
+++ b/.github/workflows/pr-build-artifacts.yml
@@ -5,22 +5,20 @@ run-name: "Generate artifacts - PR #${{ github.event.pull_request.number }} - by
 # In the run name, ${{ github.actor }} shows who's privileges are used for this run.
 #

-on:
-  pull_request:
-    types: [opened, reopened, synchronize, labeled]
+on: pull_request_target

 jobs:
  Check:
    permissions:
      pull-requests: read

-    name: Check label and authorization
-    if: contains(github.event.pull_request.labels.*.name, 'Build')
+    name: Check label and authorization  
    runs-on: Linux
    outputs:
      member: ${{ steps.checkUserMember.outputs.isTeamMember }}
    steps:
      - uses: tspascoal/get-user-teams-membership@v3
+        if: contains(github.event.pull_request.labels.*.name, 'Build')
        id: checkUserMember
        with:
          username: ${{ github.actor }}
--- a/.github/workflows/pr-label-on-approved.yml
+++ b/.github/workflows/pr-label-on-approved.yml
@@ -0,0 +1,15 @@
+on: pull_request_review
+name: Label approved pull requests
+jobs:
+  labelWhenApproved:
+    if: ${{ github.repository_owner == 'armbian' }}
+    name: Label when approved
+    runs-on: ubuntu-latest
+    steps:
+    - name: Label when approved
+      uses: pullreminders/label-when-approved-action@master
+      env:
+        APPROVALS: "1"
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        ADD_LABEL: "Ready to merge"
+        REMOVE_LABEL: "Needs%20review"
--- a/.github/workflows/pr-welcome-first-time.yml
+++ b/.github/workflows/pr-welcome-first-time.yml
@@ -0,0 +1,23 @@
+name: "Welcome first-time PR contributor"
+
+on:
+  pull_request_target:
+    types: opened
+
+jobs:
+  welcome-first-time-contributor:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: plbstl/first-contribution@v3
+        with:
+          pr-opened-msg: |
+            ### Hey @{fc-author} !
+
+            Looks like it's your first pull reqests to Armbian codebase.
+
+            Welcome and thank you for contributing :heart: :heart: :heart:.
+
+            Don't forget to star :star: the repo.
--- 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@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
        with:
          name: SARIF file
          path: results.sarif
--- a/.github/workflows/update-board-list.yml
+++ b/.github/workflows/update-board-list.yml
@@ -1,5 +1,5 @@
-name: Update board list at armbian/os
-run-name: Update board list at armbian/os - Pushed commit "${{ github.event.push.head_commit.message }}"
+name: Update Board Lists
+run-name: Update board list at armbian/os

 on:
  push:
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@
 - Superuser rights (configured sudo or root access).
 - Make sure your system is up-to-date! Outdated Docker binaries, for example, can cause trouble.

-For stable branch use `--branch=v24.08`
+For stable branch use `--branch=v24.11`

 ```bash
 apt-get -y install git
@@ -82,9 +82,10 @@ Generated image will be uploaded to your repository release. Note: GitHub upload

 ## More information:

- [Building Armbian](https://docs.armbian.com/Developer-Guide_Build-Preparation/) (how to start, how to automate)
- [Build options](https://docs.armbian.com/Developer-Guide_Build-Options/) (all build options)
+- [Building Armbian](https://docs.armbian.com/Developer-Guide_Build-Preparation/) (how to start)
+- [Build commands](https://docs.armbian.com/Developer-Guide_Build-Commands/) and [switches](https://docs.armbian.com/Developer-Guide_Build-Switches/) (build options)
 - [User configuration](https://docs.armbian.com/Developer-Guide_User-Configurations/) (how to add packages, patches, and override sources config)
+- [System config](https://docs.armbian.com/User-Guide_Armbian-Config/) (menu driven utility to setup OS and HW features)

 ## Download prebuilt images releases

--- a/2
+++ b/2
@@ -1 +1 @@
-24.11.0-trunk
+25.02.0-trunk
--- a/action.yml
+++ b/action.yml
@@ -87,6 +87,10 @@ inputs:
    required: false
    default: "Build with [Armbian tools](https://github.com/armbian/build)"

+  armbian_release_tag:
+    description: "Armbian release tag"
+    required: false
+
 runs:
  using: "composite"

@@ -122,7 +126,7 @@ runs:
      uses: actions/checkout@v4
      with:
        repository: armbian/build
-        fetch-depth: 0
+        ref: ${{ inputs.armbian_branch }}
        clean: false
        path: build

@@ -163,9 +167,8 @@ runs:
          DESKTOP_ENVIRONMENT_CONFIG_NAME="config_base"
        fi

-        # go to build folder and checkout
+        # go to build folder
        cd build
-        git checkout ${{ inputs.armbian_branch }}

        # execute build command
        ./compile.sh "${{ inputs.armbian_target }}" \
@@ -194,7 +197,7 @@ runs:

    - uses: ncipollo/release-action@v1
      with:
-        tag: "${{ env.ARMBIAN_VERSION }}"
+        tag: ${{ inputs.armbian_release_tag != '' && inputs.armbian_release_tag || env.ARMBIAN_VERSION }}
        name: "${{ inputs.armbian_release_tittle }}"
        artifacts: "${{ inputs.armbian_artifacts }}*"
        allowUpdates: true
--- a/config/boards/aml-s9xx-box.tvb
+++ b/config/boards/aml-s9xx-box.tvb
@@ -31,7 +31,7 @@ function post_family_tweaks_bsp__config_aml-s9xx-box_bsp() {
 	run_host_command_logged chmod -v 644 "${destination}"/root/fstab.template

 	display_alert "${BOARD}" "Removing armbian-install" "info"
-	run_host_command_logged rm -v "${destination}"/usr/sbin/armbian-install
+	run_host_command_logged rm -v "${destination}"/usr/bin/armbian-install

 	display_alert "${BOARD}" "Adding bsp-cli preinst logic" "info"
 	# Inline function! So this function is automatically hashed when this hook is hashed.
--- a/config/boards/armsom-cm5-io.csc
+++ b/config/boards/armsom-cm5-io.csc
@@ -8,12 +8,10 @@ BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3576-armsom-cm5-io.dtb"
 BOOT_SCENARIO="spl-blobs"
 IMAGE_PARTITION_TABLE="gpt"
-SRC_EXTLINUX="yes"
-MODULES_BLACKLIST="panfrost"
 BOARD_MAINTAINER=""

 function post_family_config_branch_vendor__armsom-cm5-io_use_vendor_uboot() {
-        display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"
+	display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"

 	declare -g BOOTSOURCE="https://github.com/ArmSoM/u-boot.git"
 	declare -g BOOTBRANCH="tag:rk3576-6.1-rk3.1"
--- a/config/boards/armsom-cm5-rpi-cm4-io.csc
+++ b/config/boards/armsom-cm5-rpi-cm4-io.csc
@@ -0,0 +1,30 @@
+# Rockchip RK3576 SoC octa core 8-64GB SoC GBe eMMC USB3 NvME WIFI
+BOARD_NAME="ArmSoM CM5 CM4 IO"
+BOARDFAMILY="rk35xx"
+BOOTCONFIG="armsom-cm5-rpi-cm4-io-rk3576_defconfig"
+KERNEL_TARGET="vendor"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3576-armsom-cm5-rpi-cm4-io.dtb"
+BOOT_SCENARIO="spl-blobs"
+IMAGE_PARTITION_TABLE="gpt"
+BOARD_MAINTAINER=""
+
+function post_family_config_branch_vendor__armsom-cm5-rpi-cm4-io_use_vendor_uboot() {
+	display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"
+
+	declare -g BOOTSOURCE="https://github.com/ArmSoM/u-boot.git"
+	declare -g BOOTBRANCH="tag:rk3576-6.1-rk3.1"
+	declare -g BOOTPATCHDIR="legacy/u-boot-armsom-rk3576"
+	declare -g BOOTDIR="u-boot-${BOARD}"
+	declare -g UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB TEE=$RKBIN_DIR/$BL32_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb"
+}
+
+function post_family_tweaks__armsom-cm5-rpi-cm4-io_naming_audios() {
+	display_alert "$BOARD" "Renaming armsom-cm5-rpi-cm4-io 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
+
+	return 0
+}
--- a/config/boards/armsom-sige1.csc
+++ b/config/boards/armsom-sige1.csc
@@ -8,5 +8,4 @@ FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3528-armsom-sige1.dtb"
 BOOT_SCENARIO="spl-blobs"
-WIREGUARD="no"
 IMAGE_PARTITION_TABLE="gpt"
--- a/config/boards/armsom-sige5.csc
+++ b/config/boards/armsom-sige5.csc
@@ -8,12 +8,10 @@ BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3576-armsom-sige5.dtb"
 BOOT_SCENARIO="spl-blobs"
 IMAGE_PARTITION_TABLE="gpt"
-SRC_EXTLINUX="yes"
-MODULES_BLACKLIST="panfrost"
 BOARD_MAINTAINER=""

 function post_family_config_branch_vendor__armsom-sige7_use_vendor_uboot() {
-        display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"
+	display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"

 	declare -g BOOTSOURCE="https://github.com/ArmSoM/u-boot.git"
 	declare -g BOOTBRANCH="tag:rk3576-6.1-rk3.1"
--- a/config/boards/armsom-w3.csc
+++ b/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
+}
--- a/config/boards/avaota-a1.conf
+++ b/config/boards/avaota-a1.conf
--- a/config/boards/bananapif3.eos
+++ b/config/boards/bananapif3.eos
@@ -12,7 +12,7 @@ PACKAGE_LIST_BOARD="rfkill bluetooth bluez bluez-tools"

 function post_config_uboot_target__extra_configs_for_bananapi_f3() {
 	display_alert "u-boot for ${BOARD}" "u-boot: enabling extra configs" "info"
-	
+
 	run_host_command_logged scripts/config --enable CONFIG_SD_BOOT
 	run_host_command_logged scripts/config --enable CONFIG_EXT4_WRITE
 	run_host_command_logged scripts/config --enable CONFIG_FS_BTRFS
--- a/config/boards/bananapim2pro.conf
+++ b/config/boards/bananapim2pro.conf
@@ -1,7 +1,7 @@
 # Amlogic S905X3 quad core 2-4GB RAM SoC eMMC GBE USB3 SPI Wifi
 BOARD_NAME="Banana Pi M2Pro"
 BOARDFAMILY="meson-sm1"
-BOARD_MAINTAINER="bretmlw"
+BOARD_MAINTAINER="igorpecovnik"
 BOOTCONFIG="bananapi-m2-pro_defconfig"
 BOOT_FDT_FILE="amlogic/meson-sm1-bananapi-m2-pro.dtb"
 KERNEL_TARGET="current,edge"
@@ -10,8 +10,8 @@ MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost
 FULL_DESKTOP="yes"
 SERIALCON="ttyAML0"
 BOOT_LOGO="desktop"
-BOOTBRANCH_BOARD="tag:v2023.07.02"
-BOOTPATCHDIR="v2023.07.02"
+BOOTBRANCH_BOARD="tag:v2024.07"
+BOOTPATCHDIR="v2024.07"

 function fetch_sources_tools__libreelec_amlogic_fip_pre_m2-pro_blob_update() {
 	fetch_from_repo "https://github.com/Dangku/amlogic-boot-fip" "amlogic-boot-fip" "branch:master"
--- a/config/boards/bananapim2zero.csc
+++ b/config/boards/bananapim2zero.csc
@@ -1,7 +1,7 @@
 # Allwinner H2+ quad core 512MB SoC Wi-Fi/BT
 BOARD_NAME="Banana Pi M2 Zero"
 BOARDFAMILY="sun8i"
-BOARD_MAINTAINER=""
+BOARD_MAINTAINER="mhawkins-consultant"
 BOOTCONFIG="bananapi_m2_zero_defconfig"
 MODULES_LEGACY="g_serial"
 MODULES_CURRENT="g_serial"
--- a/config/boards/bananapim3.csc
+++ b/config/boards/bananapim3.csc
@@ -6,3 +6,6 @@ BOOTCONFIG="Sinovoip_BPI_M3_defconfig"
 OVERLAY_PREFIX="sun8i-a83t"
 KERNEL_TARGET="legacy,current,edge"
 KERNEL_TEST_TARGET="current"
+
+BOOTBRANCH="tag:v2024.01"
+BOOTPATCHDIR="u-boot-sunxi/board_${BOARD}"
--- a/config/boards/bananapim4zero.conf
+++ b/config/boards/bananapim4zero.conf
@@ -1,21 +1,25 @@
 # Allwinner H618 quad core 1/2/4GB RAM SoC WiFi SPI USB-C
-BOARD_NAME="Banana Pi M4Zero"
+BOARD_NAME="BananaPi BPI-M4-Zero"
 BOARDFAMILY="sun50iw9-bpi"
 BOARD_MAINTAINER="pyavitz"
 BOOTCONFIG="bananapi_m4zero_defconfig"
 OVERLAY_PREFIX="sun50i-h616"
+BOOT_FDT_FILE="sun50i-h618-bananapi-m4-zero.dtb"
 BOOT_LOGO="desktop"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
 MODULES_BLACKLIST="rtw88_8821c rtw88_8821cu"
 FORCE_BOOTSCRIPT_UPDATE="yes"
-BOOTBRANCH_BOARD="tag:v2024.01"
-BOOTPATCHDIR="v2024.01"
+BOOTBRANCH_BOARD="tag:v2024.04"
+BOOTPATCHDIR="v2024.04"
+PACKAGE_LIST_BOARD="rfkill bluetooth bluez bluez-tools"

-function post_family_tweaks_bsp__bananapi_rtl_bt() {
-	if [[ -d "$SRC/packages/bsp/bananapi/rtl_bt" ]]; then
+function post_family_tweaks_bsp__bananapi_firmware() {
+	if [[ -d "$SRC/packages/bsp/bananapi/brcm" ]] && [[ -d "$SRC/packages/bsp/bananapi/rtl_bt" ]]; then
+		mkdir -p "${destination}"/lib/firmware/updates/brcm
 		mkdir -p "${destination}"/lib/firmware/updates/rtl_bt
 		display_alert "$BOARD" "Installing upstream firmware" "info"
+		cp -fr $SRC/packages/bsp/bananapi/brcm/* "${destination}"/lib/firmware/updates/brcm/
 		cp -fr $SRC/packages/bsp/bananapi/rtl_bt/* "${destination}"/lib/firmware/updates/rtl_bt/
 	fi
 }
--- a/config/boards/bananapim5.conf
+++ b/config/boards/bananapim5.conf
@@ -1,7 +1,7 @@
 # Amlogic S905X3 quad core 2-4GB RAM SoC eMMC GBE USB3 SPI
 BOARD_NAME="Banana Pi M5"
 BOARDFAMILY="meson-sm1"
-BOARD_MAINTAINER="bretmlw"
+BOARD_MAINTAINER="igorpecovnik"
 BOOTCONFIG="bananapi-m5_defconfig"
 BOOT_FDT_FILE="amlogic/meson-sm1-bananapi-m5.dtb"
 KERNEL_TARGET="current,edge"
--- a/config/boards/bigtreetech-cb1.conf
+++ b/config/boards/bigtreetech-cb1.conf
@@ -10,4 +10,4 @@ FORCE_BOOTSCRIPT_UPDATE="yes"
 BOOTFS_TYPE="fat"
 BOOT_FS_LABEL="BOOT"
 OVERLAY_PREFIX="sun50i-h616"
-BOOT_FDT_FILE="allwinner/sun50i-h616-bigtreetech-cb1-sd.dtb"
+BOOT_FDT_FILE="sun50i-h616-bigtreetech-cb1-sd.dtb"
--- a/config/boards/bigtreetech-cb2.conf
+++ b/config/boards/bigtreetech-cb2.conf
@@ -0,0 +1,48 @@
+# Rockchip RK3566 quad core 2GB-8GB GBE eMMC NVMe USB3 WiFi
+BOARD_NAME="BigTreeTech CB2"
+BOARDFAMILY="rockchip64"
+BOARD_MAINTAINER="JohnTheCoolingFan"
+BOOTCONFIG="bigtreetech-cb2-rk3566_defconfig"
+BOOT_SOC="rk3566"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
+BOOT_FDT_FILE="rockchip/rk3566-bigtreetech-cb2.dtb"
+IMAGE_PARTITION_TABLE="gpt"
+BOOT_SCENARIO="spl-blobs"
+OVERLAY_PREFIX='rk3566'
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+
+# TODO: replace with BOOT_SCENARIO=binman when it gets merged and in good shape
+function post_family_config__bigtreetech-cb2_uboot_overrides() {
+	display_alert "$BOARD" "mainline u-boot overrides" "info"
+
+	DDR_BLOB="rk35/rk3566_ddr_1056MHz_v1.21.bin"
+	BL31_BLOB="rk35/rk3568_bl31_v1.44.elf" # NOT a typo, bl31 is shared across 68 and 66
+
+	declare -g BOOTDELAY=1                            # Wait for UART interrupt to enter UMS/RockUSB mode etc
+	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"
+	declare -g BOOTBRANCH="tag:v2024.10"
+	declare -g BOOTPATCHDIR="v2024.10/board_bigtreetech-cb2"
+	#declare -g BOOTDIR="u-boot-${BOARD}"
+	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already
+
+	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
+	function write_uboot_platform() {
+		dd "if=${1}/u-boot-rockchip.bin" "of=${2}" bs=32k seek=1 conv=notrunc
+	}
+
+	function write_uboot_platform_mtd() {
+		declare -a extra_opts_flashcp=("--verbose")
+		if flashcp -h | grep -q -e '--partition'; then
+			echo "Confirmed flashcp supports --partition -- read and write only changed blocks." >&2
+			extra_opts_flashcp+=("--partition")
+		else
+			echo "flashcp does not support --partition, will write full SPI flash blocks." >&2
+		fi
+		flashcp "${extra_opts_flashcp[@]}" "${1}/u-boot-rockchip-spi.bin" /dev/mtd0
+	}
+}
+
+# vim: ft=bash
--- a/config/boards/cherryba-m1.csc
+++ b/config/boards/cherryba-m1.csc
@@ -1,4 +1,4 @@
- # Allwinner H618 quad core 1GB 2GB 4GB RAM SoC WiFi USB-C emmc
+# Allwinner H618 quad core 1GB 2GB 4GB RAM SoC WiFi USB-C emmc
 BOARD_NAME="CherryBa M1"
 BOARDFAMILY="sun50iw9"
 BOOTCONFIG="cherryba-m1_defconfig"
--- a/config/boards/clearfogpro.csc
+++ b/config/boards/clearfogpro.csc
@@ -1,7 +1,7 @@
 # Marvell Armada 38x dual core 1GB/2GB RAM SoC 2xmPCIe M.2 GBE switch SFP
 BOARD_NAME="Clearfog Pro"
 BOARDFAMILY="mvebu"
-BOARD_MAINTAINER=""
+BOARD_MAINTAINER="Heisath"
 BOOTCONFIG="clearfog_defconfig"
 HAS_VIDEO_OUTPUT="no"
 KERNEL_TARGET="current,edge"
--- a/config/boards/nanopc-cm3588-nas.csc
+++ b/config/boards/nanopc-cm3588-nas.csc
@@ -2,16 +2,16 @@
 BOARD_NAME="FriendlyElec CM3588 NAS"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="ColorfulRhino"
-BOOTCONFIG="nanopc_cm3588_defconfig" # Enables booting from NVMe. Vendor name, not standard, see hook below, set BOOT_SOC below to compensate
+BOOTCONFIG="cm3588-nas-rk3588_defconfig" # Mainline defconfig, enables booting from NVMe
 BOOT_SOC="rk3588"
 KERNEL_TARGET="edge,current,vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 IMAGE_PARTITION_TABLE="gpt"
-BOOT_FDT_FILE="rockchip/rk3588-nanopc-cm3588-nas.dtb"
+BOOT_FDT_FILE="rockchip/rk3588-friendlyelec-cm3588-nas.dtb"
 BOOT_SCENARIO="spl-blobs"

-function post_family_tweaks__nanopccm3588nas_udev_naming_audios() {
+function post_family_tweaks__cm3588_nas_udev_naming_audios() {
 	display_alert "$BOARD" "Renaming CM3588 audio interfaces to human-readable form" "info"

 	mkdir -p $SDCARD/etc/udev/rules.d/
@@ -27,7 +27,7 @@ function post_family_tweaks__nanopccm3588nas_udev_naming_audios() {

 # Output from CM3588 syslog with edge kernel 6.8: r8169 0004:41:00.0 enP4p65s0: renamed from eth0
 # Note: legacy kernel 5.10 uses driver r8125, edge kernel uses r8169 as of 6.8
-function post_family_tweaks__nanopccm3588nas_udev_naming_network_interfaces() {
+function post_family_tweaks__cm3588_nas_udev_naming_network_interfaces() {
 	display_alert "$BOARD" "Renaming CM3588 LAN interface to eth0" "info"

 	mkdir -p $SDCARD/etc/udev/rules.d/
@@ -36,25 +36,23 @@ function post_family_tweaks__nanopccm3588nas_udev_naming_network_interfaces() {
 	EOF
 }

-# Mainline u-boot or Kwiboo's tree
-function post_family_config_branch_edge__nanopccm3588nas_use_mainline_uboot() {
-	display_alert "$BOARD" "mainline (next branch) u-boot overrides for $BOARD / $BRANCH" "info"
+# Mainline U-Boot
+function post_family_config__cm3588_nas_use_mainline_uboot() {
+	display_alert "$BOARD" "Using mainline U-Boot for $BOARD / $BRANCH" "info"

-	declare -g BOOTCONFIG="nanopc-t6-rk3588_defconfig"                    # override the default for the board/family
-	declare -g BOOTDELAY=1                                                # Wait for UART interrupt to enter UMS/RockUSB mode etc
-	declare -g BOOTSOURCE="https://github.com/Kwiboo/u-boot-rockchip.git" # We ❤️ Kwiboo's tree
-	declare -g BOOTBRANCH="branch:rk3xxx-2024.04"                         # commit:31522fe7b3c7733313e1c5eb4e340487f6000196 as of 2024-04-01
-	declare -g BOOTPATCHDIR="v2024.04/board_${BOARD}"                     # empty; defconfig changes are done in hook below
-	declare -g BOOTDIR="u-boot-${BOARD}"                                  # do not share u-boot directory
-	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
-	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already
+	declare -g BOOTDELAY=1                                       # Wait for UART interrupt to enter UMS/RockUSB mode etc
+	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
+	declare -g BOOTBRANCH="tag:v2024.10"
+	declare -g BOOTPATCHDIR="v2024.10"
+	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency
+
+	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"
+
+	# Disable stuff from rockchip64_common; we're using binman here which does all the work already
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd

 	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
 	function write_uboot_platform() {
 		dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
 	}
-
-	function write_uboot_platform_mtd() {
-		flashcp -v -p "$1/u-boot-rockchip-spi.bin" /dev/mtd0
-	}
 }
--- a/config/boards/coolpi-genbook.csc
+++ b/config/boards/coolpi-genbook.csc
@@ -0,0 +1,36 @@
+# Rockchip RK3588 SoC octa core 4-16GB SoC eMMC USB3 NVME
+BOARD_NAME="CoolPi GenBook"
+BOARDFAMILY="rockchip-rk3588"
+BOARD_MAINTAINER="andyshrk"
+BOARD_FIRMWARE_INSTALL="-full"
+BOOT_SOC="rk3588"
+BOOTCONFIG="coolpi-cm5-genbook-rk3588_defconfig"
+KERNEL_TARGET="edge"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3588-coolpi-cm5-genbook.dtb"
+BOOT_SCENARIO="spl-blobs"
+BOOT_SUPPORT_SPI="yes"
+BOOT_SPI_RKSPI_LOADER="yes"
+IMAGE_PARTITION_TABLE="gpt"
+
+# Mainline U-Boot
+function post_family_config_branch_edge__coolpi-genbook_use_mainline_uboot() {
+	display_alert "$BOARD" "mainline (next branch) u-boot overrides for $BOARD / $BRANCH" "info"
+
+	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # Mainline U-Boot
+	unset BOOTBRANCH
+	unset BOOTPATCHDIR
+	declare -g BOOTBRANCH_BOARD="tag:v2025.01-rc3"
+	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already
+
+	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
+	function write_uboot_platform() {
+		dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
+	}
+
+	function write_uboot_platform_mtd() {
+		flashcp -v -p "$1/u-boot-rockchip-spi.bin" /dev/mtd0
+	}
+}
--- a/config/boards/core3566.csc
+++ b/config/boards/core3566.csc
@@ -0,0 +1,66 @@
+# Rockchip RK3566 quad core 4/8GB RAM SoC WIFI/BT eMMC USB2 USB3 NVMe PCIe GbE HDMI SPI
+BOARD_NAME="core3566"
+BOARDFAMILY="rk35xx"
+BOARD_MAINTAINER=""
+BOOTCONFIG="orangepi-3b-rk3566_defconfig"
+BOOT_SOC="rk3566"
+KERNEL_TARGET="vendor"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3566-core3566.dtb"
+IMAGE_PARTITION_TABLE="gpt"
+BOOT_SCENARIO="spl-blobs"
+BOOT_SUPPORT_SPI="yes"
+BOOT_SPI_RKSPI_LOADER="yes"
+MODULES=""
+MODULES_BLACKLIST_LEGACY="bcmdhd"
+
+# Override family config for this board; let's avoid conditionals in family config.
+function post_family_config__core3566_use_mainline_uboot() {
+	display_alert "$BOARD" "mainline (Kwiboo's tree) u-boot overrides" "info"
+
+	BOOTSOURCE="https://github.com/Kwiboo/u-boot-rockchip.git"
+	BOOTBRANCH="branch:rk3xxx-2024.04" # specific commit tested is commit:ccef7dfc453bc03c5b5c61fa67d2745b96fa7da6
+	BOOTPATCHDIR="v2024.04-orangepi3b" # empty, patches are already in Kwiboo's branch:rk3xxx-2024.04
+
+	BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
+
+	BOOTDELAY=1 # Wait for UART interrupt to enter UMS/RockUSB mode etc
+	UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin u-boot.itb idbloader.img idbloader-spi.img"
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already
+
+	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
+	function write_uboot_platform() {
+		dd if=${1}/u-boot-rockchip.bin of=${2} bs=32k seek=1 conv=fsync
+	}
+
+	# Smarter/faster/better to-spi writer using flashcp (hopefully with --partition), using the binman-provided 'u-boot-rockchip-spi.bin'
+	function write_uboot_platform_mtd() {
+		declare -a extra_opts_flashcp=("--verbose")
+		if flashcp -h | grep -q -e '--partition'; then
+			echo "Confirmed flashcp supports --partition -- read and write only changed blocks." >&2
+			extra_opts_flashcp+=("--partition")
+		else
+			echo "flashcp does not support --partition, will write full SPI flash blocks." >&2
+		fi
+		flashcp "${extra_opts_flashcp[@]}" "${1}/u-boot-rockchip-spi.bin" /dev/mtd0
+	}
+
+}
+
+function post_family_tweaks_bsp__core3566() {
+	# display_alert "$BOARD" "Installing sprd-bluetooth.service" "info"
+
+	# Bluetooth on core3566 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
+}
+
+function post_family_tweaks__core3566_enable_services() {
+	# display_alert "$BOARD" "Enabling sprd-bluetooth.service" "info"
+	# chroot_sdcard systemctl enable sprd-bluetooth.service
+	return 0
+}
--- a/config/boards/cyber-aib-rk3588.csc
+++ b/config/boards/cyber-aib-rk3588.csc
@@ -0,0 +1,23 @@
+# Rockchip RK3588 octa core 8/16GB RAM SoC 64/128GB eMMC NVMe 1x USB3 1x USB-C 2x 2.5GbE 2x HDMI
+BOARD_NAME="Cyber Aib RK3588"
+BOARDFAMILY="rockchip-rk3588"
+BOARD_MAINTAINER=""
+BOOTCONFIG="rk3588-cyber-aib_defconfig"
+KERNEL_TARGET="vendor,edge"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3588-cyber-aib.dtb"
+BOOT_SCENARIO="spl-blobs"
+BOOT_SOC="rk3588"
+IMAGE_PARTITION_TABLE="gpt"
+
+function post_family_tweaks__cyberaib_naming_audios() {
+	display_alert "$BOARD" "Renaming cyber-aib 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-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
+
+	return 0
+}
--- a/config/boards/fxblox-rk1.csc
+++ b/config/boards/fxblox-rk1.csc
@@ -5,6 +5,7 @@ BOARD_MAINTAINER="mahdichi"
 BOOTCONFIG="fxblox-rk1-rk3588_defconfig"
 BOOT_SOC="rk3588"
 KERNEL_TARGET="vendor"
+KERNEL_TEST_TARGET="vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-fxblox-rk1.dtb"
@@ -12,48 +13,4 @@ BOOT_SCENARIO="spl-blobs"
 BOOT_SUPPORT_SPI="yes"
 BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
-
-# @TODO: consider removing those, as the defaults in rockchip64_common have been bumped up
-DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.11.bin'
-BL31_BLOB='rk35/rk3588_bl31_v1.38.elf'
-
-function post_family_tweaks__fxblox-rk1_naming_audios() {
-	display_alert "$BOARD" "Renaming fxblox rk1 audios" "info"
-
-	mkdir -p $SDCARD/etc/udev/rules.d/
-	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-dp1-sound", ENV{SOUND_DESCRIPTION}="DP1 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
-	return 0
-}
-
-function post_family_config_branch_legacy__fxblox-rk1_uboot_add_sata_target() {
-	display_alert "$BOARD" "Configuring ($BOARD) standard and sata uboot target map" "info"
-
-	UBOOT_TARGET_MAP="
-	BL31=$RKBIN_DIR/$BL31_BLOB $BOOTCONFIG spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb rkspi_loader.img
-	BL31=$RKBIN_DIR/$BL31_BLOB $BOOTCONFIG spl/u-boot-spl.bin u-boot.dtb u-boot.itb;; rkspi_loader_sata.img
-	"
-}
-
-function post_uboot_custom_postprocess__create_sata_spi_image() {
-	display_alert "$BOARD" "Create rkspi_loader_sata.img" "info"
-
-	dd if=/dev/zero of=rkspi_loader_sata.img bs=1M count=0 seek=16
-	/sbin/parted -s rkspi_loader_sata.img mklabel gpt
-	/sbin/parted -s rkspi_loader_sata.img unit s mkpart idbloader 64 7167
-	/sbin/parted -s rkspi_loader_sata.img unit s mkpart vnvm 7168 7679
-	/sbin/parted -s rkspi_loader_sata.img unit s mkpart reserved_space 7680 8063
-	/sbin/parted -s rkspi_loader_sata.img unit s mkpart reserved1 8064 8127
-	/sbin/parted -s rkspi_loader_sata.img unit s mkpart uboot_env 8128 8191
-	/sbin/parted -s rkspi_loader_sata.img unit s mkpart reserved2 8192 16383
-	/sbin/parted -s rkspi_loader_sata.img unit s mkpart uboot 16384 32734
-	dd if=idbloader.img of=rkspi_loader_sata.img seek=64 conv=notrunc
-	dd if=u-boot.itb of=rkspi_loader_sata.img seek=16384 conv=notrunc
-}
-
-# Override family config for this board; let's avoid conditionals in family config.
-function post_family_config__fxblox-rk1_use_vendor_uboot() {
-	BOOTSOURCE='https://github.com/functionland/u-boot.git'
-	BOOTBRANCH='branch:next-dev'
-	BOOTPATCHDIR="legacy"
-}
+declare -g UEFI_EDK2_BOARD_ID="fxblox-rk1" # This _only_ used for uefi-edk2-rk3588 extension
--- a/config/boards/gateway-gz80x.conf
+++ b/config/boards/gateway-gz80x.conf
@@ -5,8 +5,8 @@ BOARD_MAINTAINER="pyavitz"
 BOOTCONFIG="amper_gateway_am-gz80x_defconfig"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
-BOOTBRANCH_BOARD="tag:v2024.04"
-BOOTPATCHDIR="v2024.04"
+BOOTBRANCH_BOARD="tag:v2024.07"
+BOOTPATCHDIR="v2024.07"
 BOOT_FDT_FILE="amlogic/meson-axg-amper-gateway-am-gz80x.dtb"
 SRC_EXTLINUX="yes"
 SRC_CMDLINE="console=ttyAML0,115200n8 clk_ignore_unused loglevel=7"
--- a/config/boards/h96-tvbox-3566.tvb
+++ b/config/boards/h96-tvbox-3566.tvb
@@ -3,7 +3,7 @@ BOARD_NAME="h96-tvbox-3566"
 BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER="hqnicolas"
 BOOTCONFIG="rk3568_defconfig"
-KERNEL_TARGET="current"
+KERNEL_TARGET="current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3566-h96-tvbox.dtb"
--- a/config/boards/hinlink-h28k.csc
+++ b/config/boards/hinlink-h28k.csc
@@ -8,7 +8,6 @@ FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3528-hinlink-h28k.dtb"
 BOOT_SCENARIO="spl-blobs"
-WIREGUARD="no"
 BOOT_SUPPORT_SPI="yes"
 BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
--- a/config/boards/hinlink-h66k.csc
+++ b/config/boards/hinlink-h66k.csc
@@ -3,11 +3,10 @@ BOARD_NAME="Hinlink H66K"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER=""
 BOOTCONFIG="radxa-e25-rk3568_defconfig"
-KERNEL_TARGET="vendor"
+KERNEL_TARGET="edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3568-hinlink-h66k.dtb"
 BOOT_SCENARIO="spl-blobs"
-WIREGUARD="no"
 IMAGE_PARTITION_TABLE="gpt"
 BOOTFS_TYPE="fat"
--- a/config/boards/hinlink-h68k.csc
+++ b/config/boards/hinlink-h68k.csc
@@ -3,11 +3,10 @@ BOARD_NAME="Hinlink H68K"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER=""
 BOOTCONFIG="radxa-e25-rk3568_defconfig"
-KERNEL_TARGET="vendor"
+KERNEL_TARGET="edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3568-hinlink-h68k.dtb"
 BOOT_SCENARIO="spl-blobs"
-WIREGUARD="no"
 IMAGE_PARTITION_TABLE="gpt"
 BOOTFS_TYPE="fat"
--- a/config/boards/hinlink-hnas.csc
+++ b/config/boards/hinlink-hnas.csc
@@ -3,11 +3,10 @@ BOARD_NAME="Hinlink HNAS"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER=""
 BOOTCONFIG="radxa-e25-rk3568_defconfig"
-KERNEL_TARGET="vendor"
+KERNEL_TARGET="edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3568-hinlink-hnas.dtb"
 BOOT_SCENARIO="spl-blobs"
-WIREGUARD="no"
 IMAGE_PARTITION_TABLE="gpt"
 BOOTFS_TYPE="fat"
--- a/config/boards/hinlink-ht2.csc
+++ b/config/boards/hinlink-ht2.csc
@@ -8,6 +8,5 @@ FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3528-hinlink-ht2.dtb"
 BOOT_SCENARIO="spl-blobs"
-WIREGUARD="no"
 IMAGE_PARTITION_TABLE="gpt"
 BOOTFS_TYPE="ext4"
--- a/config/boards/inovato-quadra.conf
+++ b/config/boards/inovato-quadra.conf
@@ -4,7 +4,7 @@ BOARDFAMILY="sun50iw6"
 BOARD_MAINTAINER="NicoD-SBC"
 BOOTCONFIG="tanix_tx6_defconfig"
 CRUSTCONFIG="tanix_tx6_defconfig"
-BOOT_FDT_FILE="allwinner/sun50i-h6-inovato-quadra.dtb"
+BOOT_FDT_FILE="sun50i-h6-inovato-quadra.dtb"
 KERNEL_TARGET="legacy,current,edge"
 KERNEL_TEST_TARGET="current"
 BOOT_LOGO="desktop"
--- a/config/boards/khadas-vim1s.conf
+++ b/config/boards/khadas-vim1s.conf
@@ -13,6 +13,7 @@ KHADAS_BOARD_ID="kvim1s" # used to compile the fip blobs
 declare -g KHADAS_OOWOW_BOARD_ID="VIM1S" # for use with EXT=output-image-oowow

 OVERLAY_PREFIX='s4-s905y4'
+DEFAULT_OVERLAYS="panfrost"

 function post_family_tweaks_bsp__populate_etc_firmware() {
 	# The hciattach command needs firmware to be placed in /etc/firmware directory.
--- a/config/boards/longanpi-3h.csc
+++ b/config/boards/longanpi-3h.csc
@@ -0,0 +1,15 @@
+# Allwinner H618 quad core 1GB/2GB/4GB RAM
+BOARD_NAME="Longan Pi 3H"
+BOARDFAMILY="sun50iw9"
+BOARD_MAINTAINER=""
+BOOTCONFIG="longanpi_3h_defconfig"
+BOOTBRANCH="tag:v2024.10"
+BOOTPATCHDIR="v2024.10"
+BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
+BOOT_LOGO="desktop"
+OVERLAY_PREFIX="sun50i-h616"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
+FORCE_BOOTSCRIPT_UPDATE="yes"
+enable_extension "radxa-aic8800" # compatible with radxa-aic8800
+AIC8800_TYPE="usb"
--- a/config/boards/luckfox-core3566.csc
+++ b/config/boards/luckfox-core3566.csc
@@ -0,0 +1,28 @@
+# Rockchip RK3566 quad core
+BOARD_NAME="Luckfox Core3566"
+BOARDFAMILY="rk35xx"
+BOARD_MAINTAINER=""
+BOOTCONFIG="luckfox-core3566-rk3566_defconfig"
+KERNEL_TARGET="vendor"
+KERNEL_TEST_TARGET="vendor"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3566-luckfox-core3566.dtb"
+IMAGE_PARTITION_TABLE="gpt"
+BOOT_SCENARIO="spl-blobs"
+BOOTFS_TYPE="fat" # Only for vendor/legacy
+
+# Override family config for this board; let's avoid conditionals in family config.
+function post_family_config__luckfox-core3566_use_vendor_uboot() {
+	BOOTSOURCE='https://github.com/radxa/u-boot.git'
+	BOOTBRANCH='branch:rk35xx-2024.01'
+	BOOTPATCHDIR="u-boot-luckfox"
+
+	UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB ROCKCHIP_TPL=$RKBIN_DIR/$DDR_BLOB;;u-boot-rockchip.bin"
+
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
+
+	function write_uboot_platform() {
+		dd if=$1/u-boot-rockchip.bin of=$2 seek=64 conv=notrunc status=none
+	}
+}
--- a/config/boards/mangopi-m28k.csc
+++ b/config/boards/mangopi-m28k.csc
@@ -8,6 +8,5 @@ FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3528-mangopi-m28k.dtb"
 BOOT_SCENARIO="spl-blobs"
-WIREGUARD="no"
 IMAGE_PARTITION_TABLE="gpt"
 BOOTFS_TYPE="ext4"
--- a/config/boards/mba8mpxl-ras314.conf
+++ b/config/boards/mba8mpxl-ras314.conf
@@ -2,26 +2,29 @@
 BOARD_NAME="TQ8MP-RAS314"
 BOARDFAMILY="imx8m"
 BOARD_MAINTAINER="schmiedelm"
+HAS_VIDEO_OUTPUT="yes"
 ATF_PLAT="imx8mp"
 ATF_UART_BASE="0x30a60000"
 BOOTCONFIG="tqma8mpxl_multi_mba8mp_ras314_defconfig"
 KERNEL_TARGET="current"
+MODULES_BLACKLIST="btnxpuart" # would be loaded delayed by udev rule
 DEFAULT_CONSOLE="serial"
 SERIALCON="ttymxc3"
 BOOT_FDT_FILE="freescale/imx8mp-tqma8mpql-mba8mp-ras314.dtb"
 ASOUND_STATE="asound.state.tqma"
-BOARD_FIRMWARE_INSTALL="-full"
-PACKAGE_LIST_BOARD="gpiod python3-pip python3-periphery"

 function post_family_tweaks_bsp__mba8mpxl-ras314() {

-	mkdir -p $destination/etc/udev/rules.d
-	cat <<- EOF > "$destination"/etc/udev/70-periphery.rules
-		# Allow group periphery to access devices
-		SUBSYSTEM=="gpio*", GROUP="periphery", MODE="0660"
-		SUBSYSTEM=="spidev*", GROUP="periphery", MODE="0660"
-		SUBSYSTEM=="pwm*", GROUP="periphery", MODE="0660"
-		SUBSYSTEM=="leds*", GROUP="periphery", MODE="0660"
+	# Wifi & Bluetooth (use firmware from NXP)
+	wget https://github.com/nxp-imx/imx-firmware/raw/lf-6.6.3_1.0.0/nxp/FwImage_8997/pcieuart8997_combo_v4.bin
+	run_host_command_logged mkdir -pv --mode=755 "$destination/lib/firmware/" || exit_with_error "Unable to mkdir firmware"
+	run_host_command_logged mkdir -v --mode=775 "$destination/lib/firmware/mrvl/" || exit_with_error "Unable to mkdir mrvl"
+	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
+		# wait until combo FW is loaded by wifi driver
+		KERNEL=="mlan*", ACTION=="add", RUN+="/sbin/modprobe btnxpuart"
 	EOF

 	# Define a function to be run board-side during postinst of the BSP
--- a/config/boards/mba8mpxl.conf
+++ b/config/boards/mba8mpxl.conf
@@ -2,6 +2,7 @@
 BOARD_NAME="MBa8MPxL"
 BOARDFAMILY="imx8m"
 BOARD_MAINTAINER="schmiedelm"
+HAS_VIDEO_OUTPUT="yes"
 ATF_PLAT="imx8mp"
 ATF_UART_BASE="0x30a60000"
 BOOTCONFIG="tqma8mpxl_multi_mba8mpxl_defconfig"
@@ -10,7 +11,6 @@ DEFAULT_CONSOLE="serial"
 SERIALCON="ttymxc3"
 BOOT_FDT_FILE="freescale/imx8mp-tqma8mpql-mba8mpxl.dtb"
 ASOUND_STATE="asound.state.tqma"
-PACKAGE_LIST_BOARD="gpiod python3-pip python3-periphery"

 function post_family_tweaks_bsp__mba8mpxl() {
 	mkdir -p "$destination"/etc/X11/xorg.conf.d
--- a/config/boards/mixtile-edge2.csc
+++ b/config/boards/mixtile-edge2.csc
@@ -0,0 +1,54 @@
+# Rockchip RK3568 quad core 4GB-8GB GBE PCIe USB3 SATA NVMe
+BOARD_NAME="Mixtile Edge 2"
+BOARDFAMILY="rockchip64"
+BOARD_MAINTAINER=""
+BOOT_SOC="rk3568"
+KERNEL_TARGET="current,edge,vendor"
+BOOT_FDT_FILE="rockchip/rk3568-mixtile-edge2.dtb"
+IMAGE_PARTITION_TABLE="gpt"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+SRC_CMDLINE="earlycon=uart8250,mmio32,0xfe660000 loglevel=7 console=ttyS2,1500000" # for extlinux / EXT=u-boot-menu
+
+# Mainline U-Boot
+function post_family_config__h96_max_use_mainline_uboot() {
+	if [[ "${BRANCH}" == "vendor" || "${BRANCH}" == "legacy" ]]; then
+		display_alert "$BOARD" "Using vendor U-Boot for $BOARD / $BRANCH" "info" # See below hook
+		return
+	fi
+
+	display_alert "$BOARD" "Using mainline U-Boot for $BOARD / $BRANCH" "info"
+
+	declare -g BOOTCONFIG="generic-rk3568_defconfig"             # Use generic defconfig which should boot all RK3568 boards
+	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
+	declare -g BOOTBRANCH="tag:v2024.07"
+	declare -g BOOTPATCHDIR="v2024.07/board_${BOARD}"
+	declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
+
+	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"
+
+	# Disable stuff from rockchip64_common; we're using binman here which does all the work already
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
+
+	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
+	function write_uboot_platform() {
+		dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
+	}
+}
+
+function post_family_config_branch_vendor__kernel_and_uboot_rk35xx_mixtile_edge2() {
+	# Copypasta from rockchip-rk3588.conf family file -- we _really_ gotta find a better way!
+	declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel.
+	declare -g KERNELSOURCE='https://github.com/armbian/linux-rockchip.git'
+	declare -g KERNELBRANCH='branch:rk-6.1-rkr4.1'
+	declare -g KERNELPATCHDIR='rk35xx-vendor-6.1'
+	declare -g LINUXFAMILY=rk35xx
+	declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes
+	declare -g OVERLAY_PREFIX='rk35xx'
+
+	# Use vendor u-boot, same as rk35xx; we've a defconfig and dt in there
+	declare -g BOOTSOURCE='https://github.com/radxa/u-boot.git'
+	declare -g BOOTBRANCH='branch:next-dev-v2024.03' # Always use same version as rk3588, they share a patch dir
+	declare -g BOOTPATCHDIR="legacy/u-boot-radxa-rk35xx"
+	declare -g BOOTCONFIG="mixtile-edge2-rk3568_defconfig"
+}
--- a/config/boards/mkspi.csc
+++ b/config/boards/mkspi.csc
@@ -0,0 +1,18 @@
+# Rockchip RK3328 quad core 1GB RAM, 1x100M Ethernet, eMMC, USB3, USB2
+# Supported boards:
+# - MKS-PI - https://github.com/makerbase-mks/MKS-PI
+# - MKS-SKIPR - https://github.com/makerbase-mks/MKS-SKIPR
+# - QIDI X-4 and X-6 (made by Makerbase for 'X-Plus 3' and 'X-Max 3' 3D printers) - partially supported
+#
+# These boards and related configuration is very close to Renegade board ("roc-cc-rk3328_defconfig" and "rk3328-roc-cc" DT)
+BOARD_NAME="mkspi"
+BOARDFAMILY="rockchip64"
+BOARD_MAINTAINER="redrathnure"
+BOOTCONFIG="mkspi-rk3328_defconfig"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+MODULES="ads7846 spidev"
+BOOTFS_TYPE="fat"
+PACKAGE_LIST_BOARD="build-essential usb-modeswitch"
--- a/config/boards/nanopct6-lts.conf
+++ b/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="SuperKali Tonymac32"
+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"
--- a/config/boards/nanopct6.conf
+++ b/config/boards/nanopct6.conf
@@ -20,19 +20,23 @@ function post_family_tweaks__nanopct6_naming_audios() {

 	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-rt5616-sound", ENV{SOUND_DESCRIPTION}="RT5616 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules

 	return 0
 }

-# Mainline u-boot or Kwiboo's tree
+# Mainline u-boot
 function post_family_config_branch_edge__nanopct6_use_mainline_uboot() {
 	display_alert "$BOARD" "mainline (next branch) u-boot overrides for $BOARD / $BRANCH" "info"

-	declare -g BOOTCONFIG="nanopc-t6-rk3588_defconfig"                    # override the default for the board/family
+	declare -g BOOTCONFIG="nanopc-t6-rk3588_defconfig"
 	declare -g BOOTDELAY=1                                                # Wait for UART interrupt to enter UMS/RockUSB mode etc
-	declare -g BOOTSOURCE="https://github.com/Kwiboo/u-boot-rockchip.git" # We ❤️ Kwiboo's tree
-	declare -g BOOTBRANCH="branch:rk3xxx-2024.07"                         # commit:xx as of 2024-06-04
-	declare -g BOOTPATCHDIR="v2024.04/board_${BOARD}"                     # empty; defconfig changes are done in hook below
+	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" 		  # We ❤️ Mainline
+	declare -g BOOTBRANCH="tag:v2024.10"
+	declare -g BOOTPATCHDIR="v2024.10"
 	declare -g BOOTDIR="u-boot-${BOARD}"                                  # do not share u-boot directory
 	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
 	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already
--- a/config/boards/nanopi-m6.conf
+++ b/config/boards/nanopi-m6.conf
@@ -0,0 +1,33 @@
+# Rockchip RK3588S octa core 8GB RAM SoC eMMC USB3 USB2 1x GbE 1x M2-E 1x M2-M
+BOARD_NAME="NanoPi M6"
+BOARDFAMILY="rockchip-rk3588"
+BOARD_MAINTAINER="efectn"
+BOOTCONFIG="nanopi-m6-rk3588s_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
+BOOT_SOC="rk3588"
+KERNEL_TARGET="vendor"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+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"
+
+	mkdir -p $SDCARD/etc/udev/rules.d/
+
+	cat <<- EOF > $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+		SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi0-sound", ENV{SOUND_DESCRIPTION}="HDMI0 Audio"
+	EOF
+}
+
+function post_family_tweaks__nanopim6_naming_udev_network_interfaces() {
+	display_alert "$BOARD" "Renaming NanoPi M6 network interface to LAN" "info"
+
+	mkdir -p $SDCARD/etc/udev/rules.d/
+	cat <<- EOF > "${SDCARD}/etc/udev/rules.d/70-persistent-net.rules"
+		SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", KERNELS=="fe1c0000.ethernet", NAME:="lan"
+	EOF
+}
--- a/config/boards/nanopi-r6c.csc
+++ b/config/boards/nanopi-r6c.csc
@@ -2,7 +2,7 @@
 BOARD_NAME="NanoPi R6C"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="ColorfulRhino"
-BOOTCONFIG="nanopi-r6c-rk3588s_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
+BOOTCONFIG="nanopi-r6c-rk3588s_defconfig" # Mainline defconfig, enables booting from NVMe
 BOOT_SOC="rk3588"
 KERNEL_TARGET="edge,current,vendor"
 FULL_DESKTOP="yes"
@@ -34,11 +34,10 @@ function post_family_tweaks__nanopi_r6c_naming_udev_network_interfaces() {
 function post_family_config__nanopi_r6c_use_mainline_uboot() {
 	display_alert "$BOARD" "Using mainline U-Boot for $BOARD / $BRANCH" "info"

-	declare -g BOOTCONFIG="generic-rk3588_defconfig"             # Use generic defconfig which should boot all RK3588 boards
 	declare -g BOOTDELAY=1                                       # Wait for UART interrupt to enter UMS/RockUSB mode etc
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
-	declare -g BOOTBRANCH="tag:v2024.07"
-	declare -g BOOTPATCHDIR="v2024.07/board_${BOARD}"
+	declare -g BOOTBRANCH="tag:v2024.10"
+	declare -g BOOTPATCHDIR="v2024.10"
 	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency

 	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"
--- a/config/boards/nanopi-r6s.conf
+++ b/config/boards/nanopi-r6s.conf
@@ -2,7 +2,7 @@
 BOARD_NAME="NanoPi R6S"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="efectn"
-BOOTCONFIG="nanopi-r6s-rk3588s_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
+BOOTCONFIG="nanopi-r6s-rk3588s_defconfig" # Mainline defconfig
 BOOT_SOC="rk3588"
 KERNEL_TARGET="edge,current,vendor"
 KERNEL_TEST_TARGET="vendor,current"
@@ -38,11 +38,10 @@ function post_family_tweaks__nanopir6s_naming_udev_network_interfaces() {
 function post_family_config__nanopi_r6s_use_mainline_uboot() {
 	display_alert "$BOARD" "Using mainline U-Boot for $BOARD / $BRANCH" "info"

-	declare -g BOOTCONFIG="generic-rk3588_defconfig"             # Use generic defconfig which should boot all RK3588 boards
 	declare -g BOOTDELAY=1                                       # Wait for UART interrupt to enter UMS/RockUSB mode etc
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
-	declare -g BOOTBRANCH="tag:v2024.07"
-	declare -g BOOTPATCHDIR="v2024.07"
+	declare -g BOOTBRANCH="tag:v2024.10"
+	declare -g BOOTPATCHDIR="v2024.10"
 	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency

 	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"
--- a/config/boards/odroidc1.conf
+++ b/config/boards/odroidc1.conf
@@ -1,7 +1,7 @@
 # Amlogic S805 C1 quad core 1GB RAM SoC GBE
 BOARD_NAME="Odroid C1"
 BOARDFAMILY="meson8b"
-BOARD_MAINTAINER=""
+BOARD_MAINTAINER="juanlufont"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"

--- a/config/boards/olimex-teres-a64.conf
+++ b/config/boards/olimex-teres-a64.conf
--- a/config/boards/oneplus-kebab.conf
+++ b/config/boards/oneplus-kebab.conf
@@ -0,0 +1,101 @@
+# Generate kernel and rootfs image for Qcom ABL booting
+declare -g BOARD_NAME="Oneplus Kebab"
+declare -g BOARD_MAINTAINER="amazingfate"
+declare -g BOARDFAMILY="sm8250"
+declare -g KERNEL_TARGET="current"
+declare -g EXTRAWIFI="no"
+declare -g MODULES="spi-geni-qcom"
+declare -g BOOTCONFIG="none"
+declare -g IMAGE_PARTITION_TABLE="gpt"
+declare -g -a ABL_DTB_LIST=("sm8250-oneplus-kebab")
+
+# Use the full firmware, complete linux-firmware plus Armbian's (for qcom/a650_sqe.fw)
+declare -g BOARD_FIRMWARE_INSTALL="-full"
+
+function oneplus-kebab_is_userspace_supported() {
+	[[ "${RELEASE}" == "jammy" ]] && return 0
+	[[ "${RELEASE}" == "trixie" ]] && return 0
+	[[ "${RELEASE}" == "noble" ]] && return 0
+	return 1
+}
+
+function post_family_tweaks_bsp__oneplus-kebab_firmware() {
+	display_alert "$BOARD" "Install firmwares for oneplus kebab" "info"
+
+	# USB Gadget Network service
+	mkdir -p $destination/usr/local/bin/
+	mkdir -p $destination/usr/lib/systemd/system/
+	install -Dm655 $SRC/packages/bsp/usb-gadget-network/setup-usbgadget-network.sh $destination/usr/local/bin/
+	install -Dm655 $SRC/packages/bsp/usb-gadget-network/remove-usbgadget-network.sh $destination/usr/local/bin/
+	install -Dm644 $SRC/packages/bsp/usb-gadget-network/usbgadget-rndis.service $destination/usr/lib/systemd/system/
+
+	# Bluetooth MAC addr setup service
+	install -Dm655 $SRC/packages/bsp/generate-bt-mac-addr/bt-fixed-mac.sh $destination/usr/local/bin/
+	install -Dm644 $SRC/packages/bsp/generate-bt-mac-addr/bt-fixed-mac.service $destination/usr/lib/systemd/system/
+
+	# Kernel postinst script to update abl boot partition
+	install -Dm655 $SRC/packages/bsp/oneplus-kebab/zz-update-abl-kernel $destination/etc/kernel/postinst.d/
+
+	# Add kebab firmwares
+	mkdir -p $destination/lib/firmware/qcom/sm8250/OnePlus/kebab
+	install -Dm644 $SRC/packages/bsp/oneplus-kebab/a650_zap.mbn $destination/lib/firmware/qcom/sm8250/OnePlus/
+	install -Dm644 $SRC/packages/bsp/oneplus-kebab/adsp.mbn $destination/lib/firmware/qcom/sm8250/OnePlus/
+	install -Dm644 $SRC/packages/bsp/oneplus-kebab/cdsp.mbn $destination/lib/firmware/qcom/sm8250/OnePlus/
+	install -Dm644 $SRC/packages/bsp/oneplus-kebab/venus.mbn $destination/lib/firmware/qcom/sm8250/OnePlus/kebab
+
+	return 0
+}
+
+function post_family_tweaks__oneplus-kebab_enable_services() {
+	if ! oneplus-kebab_is_userspace_supported; then
+		if [[ "${RELEASE}" != "" ]]; then
+			display_alert "Missing userspace for ${BOARD}" "${RELEASE} does not have the userspace necessary to support the ${BOARD}" "warn"
+		fi
+		return 0
+	fi
+
+	if [[ "${RELEASE}" == "jammy" ]] || [[ "${RELEASE}" == "noble" ]]; then
+		display_alert "Adding qcom-mainline PPA" "${BOARD}" "info"
+		do_with_retries 3 chroot_sdcard add-apt-repository ppa:liujianfeng1994/qcom-mainline --yes --no-update
+	fi
+
+	# we need unudhcpd from armbian repo, so enable it
+	mv "${SDCARD}"/etc/apt/sources.list.d/armbian.list.disabled "${SDCARD}"/etc/apt/sources.list.d/armbian.list
+
+	do_with_retries 3 chroot_sdcard_apt_get_update
+	display_alert "$BOARD" "Installing board tweaks" "info"
+	do_with_retries 3 chroot_sdcard_apt_get_install alsa-ucm-conf qbootctl qrtr-tools unudhcpd mkbootimg
+
+	# disable armbian repo back
+	mv "${SDCARD}"/etc/apt/sources.list.d/armbian.list "${SDCARD}"/etc/apt/sources.list.d/armbian.list.disabled
+	do_with_retries 3 chroot_sdcard_apt_get_update
+
+	chroot_sdcard systemctl enable qbootctl.service
+	chroot_sdcard systemctl enable usbgadget-rndis.service
+	chroot_sdcard systemctl enable bt-fixed-mac.service
+	return 0
+}
+
+function post_family_tweaks_bsp__oneplus-kebab_bsp_firmware_in_initrd() {
+	display_alert "Adding to bsp-cli" "${BOARD}: firmware in initrd" "info"
+	declare file_added_to_bsp_destination # will be filled in by add_file_from_stdin_to_bsp_destination
+	add_file_from_stdin_to_bsp_destination "/etc/initramfs-tools/hooks/oneplus-kebab-firmware" <<- 'FIRMWARE_HOOK'
+		#!/bin/bash
+		[[ "$1" == "prereqs" ]] && exit 0
+		. /usr/share/initramfs-tools/hook-functions
+		for f in /lib/firmware/qcom/sm8250/OnePlus/* ; do
+			add_firmware "${f#/lib/firmware/}"
+		done
+		add_firmware "qcom/a650_sqe.fw" # extra one for dpu
+		add_firmware "qcom/a650_gmu.bin" # extra one for gpu
+	FIRMWARE_HOOK
+	run_host_command_logged chmod -v +x "${file_added_to_bsp_destination}"
+}
+
+## Modules, required to boot, add them to initrd
+function post_family_tweaks_bsp__oneplus-kebab_bsp_modules_in_initrd() {
+	display_alert "Adding to bsp-cli" "${BOARD}: modules in initrd" "info"
+	add_file_from_stdin_to_bsp_destination "/etc/initramfs-tools/modules" <<- 'EXTRA_MODULES'
+		spi-geni-qcom
+	EXTRA_MODULES
+}
--- a/config/boards/orangepi-r1.csc
+++ b/config/boards/orangepi-r1.csc
@@ -1,7 +1,7 @@
 # Allwinner H2+ quad core 256MB/512MB RAM SoC WiFi SPI 2xETH
 BOARD_NAME="Orange Pi R1"
 BOARDFAMILY="sun8i"
-BOARD_MAINTAINER="schwar3kat"
+BOARD_MAINTAINER=""
 BOOTCONFIG="orangepi_r1_defconfig"
 DEFAULT_OVERLAYS="usbhost2 usbhost3"
 MODULES="g_serial"
--- a/config/boards/orangepi-r1plus-lts.csc
+++ b/config/boards/orangepi-r1plus-lts.csc
@@ -1,7 +1,7 @@
 # Rockchip RK3328 quad core 1GB 2 x GBE USB2 SPI
 BOARD_NAME="Orange Pi R1 Plus LTS"
 BOARDFAMILY="rockchip64"
-BOARD_MAINTAINER="schwar3kat"
+BOARD_MAINTAINER=""
 BOOTCONFIG="orangepi_r1_plus_lts_rk3328_defconfig"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
--- a/config/boards/orangepi3b.csc
+++ b/config/boards/orangepi3b.csc
@@ -1,5 +1,5 @@
 # Rockchip RK3566 quad core 4/8GB RAM SoC WIFI/BT eMMC USB2 USB3 NVMe PCIe GbE HDMI SPI
-BOARD_NAME="orangepi3b"
+BOARD_NAME="Orange Pi 3B"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER=""
 BOOTCONFIG="orangepi-3b-rk3566_defconfig"
@@ -7,26 +7,23 @@ BOOT_SOC="rk3566"
 KERNEL_TARGET="vendor,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
-BOOT_FDT_FILE="rockchip/rk3566-orangepi-3b.dtb"
 IMAGE_PARTITION_TABLE="gpt"
 BOOT_SCENARIO="spl-blobs"
 BOOT_SUPPORT_SPI="yes"
 BOOT_SPI_RKSPI_LOADER="yes"
-MODULES="sprdbt_tty sprdwl_ng"
-MODULES_BLACKLIST_LEGACY="bcmdhd"

 # Override family config for this board; let's avoid conditionals in family config.
 function post_family_config__orangepi3b_use_mainline_uboot() {
-	display_alert "$BOARD" "mainline (Kwiboo's tree) u-boot overrides" "info"
+	display_alert "$BOARD" "Using mainline U-Boot for $BOARD / $BRANCH" "info"

-	BOOTSOURCE='https://github.com/u-boot/u-boot'
-	BOOTBRANCH="tag:v2024.10-rc3"
-	BOOTPATCHDIR="v2024.10-orangepi3b"
+	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
+	declare -g BOOTBRANCH="tag:v2024.10"
+	declare -g BOOTPATCHDIR="v2024.10"
+	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency

-	BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
+	declare -g BOOTDELAY=1 # Wait for UART interrupt to enter UMS/RockUSB mode etc

-	BOOTDELAY=1 # Wait for UART interrupt to enter UMS/RockUSB mode etc
-	UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin u-boot.itb idbloader.img idbloader-spi.img"
+	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin u-boot.itb idbloader.img idbloader-spi.img"
 	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already

 	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
@@ -45,22 +42,33 @@ function post_family_config__orangepi3b_use_mainline_uboot() {
 		fi
 		flashcp "${extra_opts_flashcp[@]}" "${1}/u-boot-rockchip-spi.bin" /dev/mtd0
 	}
-
 }

 function post_family_tweaks_bsp__orangepi3b() {
-	display_alert "$BOARD" "Installing sprd-bluetooth.service" "info"
+	display_alert "$BOARD" "Installing orangepi3b-sprd-bluetooth.service" "info"

 	# Bluetooth on orangepi3b 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/
+	install -m 755 $SRC/packages/bsp/orangepi3b/orangepi3b-sprd-bluetooth $destination/usr/bin/
+	cp $SRC/packages/bsp/orangepi3b/orangepi3b-sprd-bluetooth.service $destination/lib/systemd/system/

 	return 0
 }

 function post_family_tweaks__orangepi3b_enable_services() {
-	display_alert "$BOARD" "Enabling sprd-bluetooth.service" "info"
-	chroot_sdcard systemctl enable sprd-bluetooth.service
+	display_alert "$BOARD" "Enabling orangepi3b-sprd-bluetooth.service" "info"
+	chroot_sdcard systemctl enable orangepi3b-sprd-bluetooth.service
+	return 0
+}
+
+function post_family_tweaks__orangepi3b_naming_audios() {
+	display_alert "$BOARD" "Renaming orangepi3b audios" "info"
+
+	mkdir -p $SDCARD/etc/udev/rules.d/
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi-sound", ENV{SOUND_DESCRIPTION}="HDMI Audio"' > $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-rk809-sound", ENV{SOUND_DESCRIPTION}="RK809 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules # vendor dts
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-sound", ENV{SOUND_DESCRIPTION}="RK809 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules       # mainline dts
+
 	return 0
 }
--- a/config/boards/orangepi5-max.csc
+++ b/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
+}
--- a/config/boards/orangepi5-plus.conf
+++ b/config/boards/orangepi5-plus.conf
@@ -1,7 +1,7 @@
 # Rockchip RK3588 octa core 4/8/16GB RAM SoC SPI NVMe 2x USB2 2x USB3 1x USB-C 2x 2.5GbE 3x HDMI
 BOARD_NAME="Orange Pi 5 Plus"
 BOARDFAMILY="rockchip-rk3588"
-BOARD_MAINTAINER="alexl83 efectn"
+BOARD_MAINTAINER="alexl83"
 BOOTCONFIG="orangepi-5-plus-rk3588_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
 KERNEL_TARGET="edge,current,vendor"
@@ -77,9 +77,9 @@ function post_family_config_branch_current__orangepi5plus_use_mainline_uboot() {
 function post_config_uboot_target__extra_configs_for_rock5b_mainline_environment_in_spi() {
 	[[ "${BRANCH}" != "edge" && "${BRANCH}" != "current" ]] && return 0

-	 display_alert "$BOARD" "u-boot configs for ${BOOTBRANCH} u-boot config BRANCH=${BRANCH}" "info"
+	display_alert "$BOARD" "u-boot configs for ${BOOTBRANCH} u-boot config BRANCH=${BRANCH}" "info"
 	run_host_command_logged scripts/config --set-val CONFIG_BOARD_RNG_SEED "y"
-	run_host_command_logged scripts/config --set-val ARMV8_CRYPTO "n" #broken as per 2024.10-rc3
-	run_host_command_logged scripts/config --set-val ARMV8_CE_SHA1 "n" #broken as per 2024.10-rc3
+	run_host_command_logged scripts/config --set-val ARMV8_CRYPTO "n"    #broken as per 2024.10-rc3
+	run_host_command_logged scripts/config --set-val ARMV8_CE_SHA1 "n"   #broken as per 2024.10-rc3
 	run_host_command_logged scripts/config --set-val ARMV8_CE_SHA256 "n" #broken as per 2024.10-rc3
 }
--- a/config/boards/orangepizero2.csc
+++ b/config/boards/orangepizero2.csc
--- a/config/boards/orangepizeroplus.conf
+++ b/config/boards/orangepizeroplus.conf
--- a/config/boards/pineh64-b.csc
+++ b/config/boards/pineh64-b.csc
@@ -5,5 +5,5 @@ BOARD_MAINTAINER=""
 BOOTCONFIG="pine_h64_defconfig"
 KERNEL_TARGET="legacy,current,edge"
 KERNEL_TEST_TARGET="current"
-BOOT_FDT_FILE="allwinner/sun50i-h6-pine-h64-model-b.dtb"
+BOOT_FDT_FILE="sun50i-h6-pine-h64-model-b.dtb"
 CRUSTCONFIG="h6_defconfig"
--- a/config/boards/radxa-e20c.csc
+++ b/config/boards/radxa-e20c.csc
@@ -8,5 +8,4 @@ FULL_DESKTOP="no"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3528-radxa-e20c.dtb"
 BOOT_SCENARIO="spl-blobs"
-WIREGUARD="no"
 IMAGE_PARTITION_TABLE="gpt"
--- a/config/boards/radxa-zero2.csc
+++ b/config/boards/radxa-zero2.csc
@@ -14,5 +14,5 @@ BOOT_FDT_FILE="amlogic/meson-g12b-radxa-zero2.dtb"
 # Newer u-boot for the Zero2
 # 2022.10: Radxa's patches with new DT, Makefile and defconfig in v2022.10/board_radxa-zero2 dir; common to 22.10's meson64 boot-usb-first
 # v2023.10: board-specific boot-usb-first patch; zero2 landed in upstream u-boot v2023.07-rc1
-BOOTBRANCH_BOARD="tag:v2023.10"
-BOOTPATCHDIR="v2023.10"
+BOOTBRANCH_BOARD="tag:v2024.07"
+BOOTPATCHDIR="v2024.07"
--- a/config/boards/radxa-zero3.csc
+++ b/config/boards/radxa-zero3.csc
@@ -32,11 +32,11 @@ function post_family_config__radxa-zero3_use_vendor_uboot() {
 	}
 }

-function post_family_config_branch_edge__radxa-zero3_use_kwiboo_uboot() {
+function post_family_config_branch_edge__radxa-zero3_use_mainline_uboot() {
 	BOOTCONFIG="radxa-zero-3-rk3566_defconfig"
-	BOOTSOURCE='https://github.com/Kwiboo/u-boot-rockchip.git'
-	BOOTBRANCH='branch:rk3xxx-2024.07'
-	BOOTPATCHDIR="u-boot-zero3" # Empty
+	BOOTSOURCE="https://github.com/u-boot/u-boot"
+	BOOTBRANCH="tag:v2024.10"
+	BOOTPATCHDIR="v2024.10"

 	UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB ROCKCHIP_TPL=$RKBIN_DIR/$DDR_BLOB;;u-boot-rockchip.bin"

--- a/config/boards/retro-lite-cm5.csc
+++ b/config/boards/retro-lite-cm5.csc
@@ -23,4 +23,3 @@ function post_family_tweaks__retrolitecm5_naming_audios() {

 	return 0
 }
-
--- a/config/boards/retroidpocket-rp5.csc
+++ b/config/boards/retroidpocket-rp5.csc
@@ -0,0 +1,123 @@
+# Retroid Pocket RP5 Configuration
+declare -g BOARD_NAME="Retroid Pocket RP5"
+declare -g BOARD_MAINTAINER=""
+declare -g BOARDFAMILY="sm8250"
+declare -g KERNEL_TARGET="current"
+declare -g EXTRAWIFI="no"
+declare -g MODULES="panel_ddic_ch13726a"
+declare -g BOOTCONFIG="none"
+
+declare -g UEFI_GRUB_TERMINAL="gfxterm" # Use graphics in grub, for the Armbian wallpaper.
+declare -g GRUB_CMDLINE_LINUX_DEFAULT="clk_ignore_unused pd_ignore_unused arm64.nopauth efi=noruntime fbcon=rotate:3 console=ttyMSM0,115200n8"
+declare -g BOOT_FDT_FILE="qcom/sm8250-retroidpocket-rp5.dtb"
+
+declare -g SERIALCON="${SERIALCON:-tty1}"
+
+enable_extension "grub"
+enable_extension "grub-with-dtb" # important, puts the whole DTB handling in place.
+
+# declare -g BOOT_LOGO=desktop
+
+# Use the full firmware, complete linux-firmware plus Armbian's
+declare -g BOARD_FIRMWARE_INSTALL="-full"
+
+function retroidpocket-rp5_is_userspace_supported() {
+	[[ "${RELEASE}" == "bookworm" ]] && return 0
+	[[ "${RELEASE}" == "jammy" ]] && return 0
+	[[ "${RELEASE}" == "noble" ]] && return 0
+	[[ "${RELEASE}" == "trixie" ]] && return 0
+	return 1
+}
+
+function pre_customize_image__retroidpocket-rp5_alsa_ucm_conf() {
+	if ! retroidpocket-rp5_is_userspace_supported; then
+		return 0
+	fi
+
+	display_alert "Add alsa-ucm-conf for ${BOARD}" "${RELEASE}" "warn"
+	(
+		cd "${SDCARD}/usr/share/alsa" || exit 6
+		curl -L "https://github.com/RetroidPocket/alsa-ucm-conf/archive/refs/heads/rp/v1.2.13.tar.gz" | tar xvzf - --strip-components=1
+	)
+}
+
+function post_family_tweaks_bsp__retroidpocket-rp5_add_services() {
+	if ! retroidpocket-rp5_is_userspace_supported; then
+		if [[ "${RELEASE}" != "" ]]; then
+			display_alert "Missing userspace for ${BOARD}" "${RELEASE} does not have the userspace necessary to support the ${BOARD}" "warn"
+		fi
+		return 0
+	fi
+
+	display_alert "$BOARD" "Add services" "info"
+
+	# Bluetooth MAC addr setup service
+	mkdir -p $destination/usr/local/bin/
+	mkdir -p $destination/usr/lib/systemd/system/
+	install -Dm655 $SRC/packages/bsp/generate-bt-mac-addr/bt-fixed-mac.sh $destination/usr/local/bin/
+	install -Dm644 $SRC/packages/bsp/generate-bt-mac-addr/bt-fixed-mac.service $destination/usr/lib/systemd/system/
+
+	# Haptic and Gamepad rules
+	install -Dm644 $SRC/packages/bsp/retroidpocket/90-feedbackd-spmi-haptics.rules $destination/etc/udev/rules.d/90-feedbackd-spmi-haptics.rules
+	install -Dm644 $SRC/packages/bsp/retroidpocket/99-ignore-gamepad.rules $destination/etc/udev/rules.d/99-ignore-gamepad.rules
+}
+
+function post_family_tweaks__retroidpocket-rp5_enable_services() {
+	if ! retroidpocket-rp5_is_userspace_supported; then
+		if [[ "${RELEASE}" != "" ]]; then
+			display_alert "Missing userspace for ${BOARD}" "${RELEASE} does not have the userspace necessary to support the ${BOARD}" "warn"
+		fi
+		return 0
+	fi
+
+	display_alert "$BOARD" "Enable services" "info"
+
+	chroot_sdcard systemctl enable bt-fixed-mac.service
+	return 0
+}
+
+function post_family_config__retroidpocket-rp5_extra_packages() {
+	if ! retroidpocket-rp5_is_userspace_supported; then
+		if [[ "${RELEASE}" != "" ]]; then
+			display_alert "Missing userspace for ${BOARD}" "${RELEASE} does not have the userspace necessary to support the ${BOARD}" "warn"
+		fi
+		return 0
+	fi
+
+	display_alert "Setting up extra packages for ${BOARD}" "${RELEASE}" "info"
+	add_packages_to_image "bluez" "bluetooth"        # for bluetooth stuff
+	add_packages_to_image "mtools"                   # for access to the EFI partition
+	add_packages_to_image "zstd"                     # for zstd compression of initrd
+}
+
+function post_family_tweaks_bsp__retroidpocket-rp5_bsp_firmware_in_initrd() {
+	display_alert "Adding to bsp-cli" "${BOARD}: firmware in initrd" "info"
+	declare file_added_to_bsp_destination # will be filled in by add_file_from_stdin_to_bsp_destination
+	add_file_from_stdin_to_bsp_destination "/etc/initramfs-tools/hooks/retroidpocket-rp5-firmware" <<- 'FIRMWARE_HOOK'
+		#!/bin/bash
+		[[ "$1" == "prereqs" ]] && exit 0
+		. /usr/share/initramfs-tools/hook-functions
+		for f in /lib/firmware/qcom/sm8250/* ; do
+			add_firmware "${f#/lib/firmware/}"
+		done
+		add_firmware "qcom/a650_sqe.fw" # extra one for dpu
+		add_firmware "qcom/a650_gmu.bin" # extra one for gpu
+	FIRMWARE_HOOK
+	run_host_command_logged chmod -v +x "${file_added_to_bsp_destination}"
+}
+
+## Modules, required to boot, add them to initrd
+function post_family_tweaks_bsp__retroidpocket-rp5_bsp_modules_in_initrd() {
+	display_alert "Adding to bsp-cli" "${BOARD}: modules in initrd" "info"
+	add_file_from_stdin_to_bsp_destination "/etc/initramfs-tools/modules" <<- 'EXTRA_MODULES'
+		panel-ddic-ch13726a
+	EXTRA_MODULES
+}
+
+# armbian-firstrun waits for systemd to be ready, but snapd.seeded might cause it to hang due to wrong clock.
+# if the battery runs out, the clock is reset to 1970. This causes snapd.seeded to hang, and armbian-firstrun to hang.
+function pre_customize_image__disable_snapd_seeded() {
+	[[ "${DISTRIBUTION}" != "Ubuntu" ]] && return 0 # only needed for Ubuntu
+	display_alert "Disabling snapd.seeded" "${BOARD}" "info"
+	chroot_sdcard systemctl disable snapd.seeded.service "||" true
+}
--- a/config/boards/retroidpocket-rpmini.csc
+++ b/config/boards/retroidpocket-rpmini.csc
@@ -0,0 +1,123 @@
+# Retroid Pocket RPMini Configuration
+declare -g BOARD_NAME="Retroid Pocket RPMini"
+declare -g BOARD_MAINTAINER=""
+declare -g BOARDFAMILY="sm8250"
+declare -g KERNEL_TARGET="current"
+declare -g EXTRAWIFI="no"
+declare -g MODULES="panel_ddic_ch13726a"
+declare -g BOOTCONFIG="none"
+
+declare -g UEFI_GRUB_TERMINAL="gfxterm" # Use graphics in grub, for the Armbian wallpaper.
+declare -g GRUB_CMDLINE_LINUX_DEFAULT="clk_ignore_unused pd_ignore_unused arm64.nopauth efi=noruntime fbcon=rotate:1 console=ttyMSM0,115200n8"
+declare -g BOOT_FDT_FILE="qcom/sm8250-retroidpocket-rpmini.dtb"
+
+declare -g SERIALCON="${SERIALCON:-tty1}"
+
+enable_extension "grub"
+enable_extension "grub-with-dtb" # important, puts the whole DTB handling in place.
+
+# declare -g BOOT_LOGO=desktop
+
+# Use the full firmware, complete linux-firmware plus Armbian's
+declare -g BOARD_FIRMWARE_INSTALL="-full"
+
+function retroidpocket-rpmini_is_userspace_supported() {
+	[[ "${RELEASE}" == "bookworm" ]] && return 0
+	[[ "${RELEASE}" == "jammy" ]] && return 0
+	[[ "${RELEASE}" == "noble" ]] && return 0
+	[[ "${RELEASE}" == "trixie" ]] && return 0
+	return 1
+}
+
+function pre_customize_image__retroidpocket-rpmini_alsa_ucm_conf() {
+	if ! retroidpocket-rpmini_is_userspace_supported; then
+		return 0
+	fi
+
+	display_alert "Add alsa-ucm-conf for ${BOARD}" "${RELEASE}" "warn"
+	(
+		cd "${SDCARD}/usr/share/alsa" || exit 6
+		curl -L "https://github.com/RetroidPocket/alsa-ucm-conf/archive/refs/heads/rp/v1.2.13.tar.gz" | tar xvzf - --strip-components=1
+	)
+}
+
+function post_family_tweaks_bsp__retroidpocket-rpmini_add_services() {
+	if ! retroidpocket-rpmini_is_userspace_supported; then
+		if [[ "${RELEASE}" != "" ]]; then
+			display_alert "Missing userspace for ${BOARD}" "${RELEASE} does not have the userspace necessary to support the ${BOARD}" "warn"
+		fi
+		return 0
+	fi
+
+	display_alert "$BOARD" "Add services" "info"
+
+	# Bluetooth MAC addr setup service
+	mkdir -p $destination/usr/local/bin/
+	mkdir -p $destination/usr/lib/systemd/system/
+	install -Dm655 $SRC/packages/bsp/generate-bt-mac-addr/bt-fixed-mac.sh $destination/usr/local/bin/
+	install -Dm644 $SRC/packages/bsp/generate-bt-mac-addr/bt-fixed-mac.service $destination/usr/lib/systemd/system/
+
+	# Haptic and Gamepad rules
+	install -Dm644 $SRC/packages/bsp/retroidpocket/90-feedbackd-spmi-haptics.rules $destination/etc/udev/rules.d/90-feedbackd-spmi-haptics.rules
+	install -Dm644 $SRC/packages/bsp/retroidpocket/99-ignore-gamepad.rules $destination/etc/udev/rules.d/99-ignore-gamepad.rules
+}
+
+function post_family_tweaks__retroidpocket-rpmini_enable_services() {
+	if ! retroidpocket-rpmini_is_userspace_supported; then
+		if [[ "${RELEASE}" != "" ]]; then
+			display_alert "Missing userspace for ${BOARD}" "${RELEASE} does not have the userspace necessary to support the ${BOARD}" "warn"
+		fi
+		return 0
+	fi
+
+	display_alert "$BOARD" "Enable services" "info"
+
+	chroot_sdcard systemctl enable bt-fixed-mac.service
+	return 0
+}
+
+function post_family_config__retroidpocket-rpmini_extra_packages() {
+	if ! retroidpocket-rpmini_is_userspace_supported; then
+		if [[ "${RELEASE}" != "" ]]; then
+			display_alert "Missing userspace for ${BOARD}" "${RELEASE} does not have the userspace necessary to support the ${BOARD}" "warn"
+		fi
+		return 0
+	fi
+
+	display_alert "Setting up extra packages for ${BOARD}" "${RELEASE}" "info"
+	add_packages_to_image "bluez" "bluetooth"        # for bluetooth stuff
+	add_packages_to_image "mtools"                   # for access to the EFI partition
+	add_packages_to_image "zstd"                     # for zstd compression of initrd
+}
+
+function post_family_tweaks_bsp__retroidpocket-rpmini_bsp_firmware_in_initrd() {
+	display_alert "Adding to bsp-cli" "${BOARD}: firmware in initrd" "info"
+	declare file_added_to_bsp_destination # will be filled in by add_file_from_stdin_to_bsp_destination
+	add_file_from_stdin_to_bsp_destination "/etc/initramfs-tools/hooks/retroidpocket-rpmini-firmware" <<- 'FIRMWARE_HOOK'
+		#!/bin/bash
+		[[ "$1" == "prereqs" ]] && exit 0
+		. /usr/share/initramfs-tools/hook-functions
+		for f in /lib/firmware/qcom/sm8250/* ; do
+			add_firmware "${f#/lib/firmware/}"
+		done
+		add_firmware "qcom/a650_sqe.fw" # extra one for dpu
+		add_firmware "qcom/a650_gmu.bin" # extra one for gpu
+	FIRMWARE_HOOK
+	run_host_command_logged chmod -v +x "${file_added_to_bsp_destination}"
+}
+
+## Modules, required to boot, add them to initrd
+function post_family_tweaks_bsp__retroidpocket-rpmini_bsp_modules_in_initrd() {
+	display_alert "Adding to bsp-cli" "${BOARD}: modules in initrd" "info"
+	add_file_from_stdin_to_bsp_destination "/etc/initramfs-tools/modules" <<- 'EXTRA_MODULES'
+		panel-ddic-ch13726a
+	EXTRA_MODULES
+}
+
+# armbian-firstrun waits for systemd to be ready, but snapd.seeded might cause it to hang due to wrong clock.
+# if the battery runs out, the clock is reset to 1970. This causes snapd.seeded to hang, and armbian-firstrun to hang.
+function pre_customize_image__disable_snapd_seeded() {
+	[[ "${DISTRIBUTION}" != "Ubuntu" ]] && return 0 # only needed for Ubuntu
+	display_alert "Disabling snapd.seeded" "${BOARD}" "info"
+	chroot_sdcard systemctl disable snapd.seeded.service "||" true
+}
--- a/config/boards/rock-3a.conf
+++ b/config/boards/rock-3a.conf
@@ -13,3 +13,25 @@ BOOT_SUPPORT_SPI="yes"
 BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
 BOOTFS_TYPE="fat"
+
+function post_family_config_branch_edge__rock-3a_use_mainline_uboot() {
+	display_alert "$BOARD" "Mainline U-Boot overrides for $BOARD - $BRANCH" "info"
+	unset BOOTFS_TYPE # fixes armbian-install and unneeded for modern uboot anyway
+	declare -g BOOTCONFIG="rock-3a-rk3568_defconfig"
+	declare -g BOOTDELAY=1
+	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot"
+	declare -g BOOTBRANCH="tag:v2024.10"
+	declare -g BOOTPATCHDIR="v2024.10"
+	declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
+	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already
+
+	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
+	function write_uboot_platform() {
+		dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
+	}
+
+	function write_uboot_platform_mtd() {
+		flashcp -v -p "$1/u-boot-rockchip-spi.bin" /dev/mtd0
+	}
+}
--- a/config/boards/rock-5-cm-rpi-cm4-io.csc
+++ b/config/boards/rock-5-cm-rpi-cm4-io.csc
@@ -0,0 +1,14 @@
+# Rockchip RK3588S octa core 4/8/16GB RAM SoC NVMe USB3 USB-C GbE
+BOARD_NAME="Radxa CM5 on RPi CM4 IO"
+BOARDFAMILY="rockchip-rk3588"
+BOARD_MAINTAINER=""
+BOOTCONFIG="radxa-cm5-rpi-cm4-io-rk3588s_defconfig"
+BOOT_SOC="rk3588"
+KERNEL_TARGET="vendor"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3588s-radxa-cm5-rpi-cm4-io.dtb"
+BOOT_SCENARIO="spl-blobs"
+BOOT_SUPPORT_SPI="yes"
+BOOT_SPI_RKSPI_LOADER="yes"
+IMAGE_PARTITION_TABLE="gpt"
--- a/config/boards/rock-5b-plus.conf
+++ b/config/boards/rock-5b-plus.conf
@@ -0,0 +1,67 @@
+# Rockchip RK3588 SoC octa core 4-16GB SoC 2.5GBe eMMC USB3 NvME
+BOARD_NAME="Rock 5B Plus"
+BOARDFAMILY="rockchip-rk3588"
+BOARD_MAINTAINER="HeyMeco fridtjof"
+BOOTCONFIG="rock-5b-plus-rk3588_defconfig"
+KERNEL_TARGET="edge,vendor"
+KERNEL_TEST_TARGET="vendor,edge"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3588-radxa-rock-5b+.dtb"
+BOOT_SCENARIO="spl-blobs"
+BOOT_SUPPORT_SPI="yes"
+BOOT_SPI_RKSPI_LOADER="yes"
+IMAGE_PARTITION_TABLE="gpt"
+declare -g UEFI_EDK2_BOARD_ID="rock-5bplus" # This _only_ used for uefi-edk2-rk3588 extension
+
+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-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-dp1-sound", ENV{SOUND_DESCRIPTION}="DP1 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
+}
+
+# Mainline u-boot tree
+# see rock-5b.conf and https://github.com/armbian/build/pull/7135
+function post_family_config_branch_edge__rock-5b_use_mainline_uboot() {
+	display_alert "$BOARD" "mainline (next branch) u-boot overrides for $BOARD / $BRANCH" "info"
+
+	# temporary override until DT in armbian/rockchip-linux is renamed
+	declare -g BOOT_FDT_FILE="rockchip/rk3588-rock-5b-plus.dtb"
+
+	declare -g BOOTCONFIG="rock5b-rk3588_defconfig"              # override the default for the board/family
+	declare -g BOOTDELAY=1                                       # Wait for UART interrupt to enter UMS/RockUSB mode etc
+	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline tree
+	declare -g BOOTBRANCH="tag:v2024.10"                         #
+	declare -g BOOTPATCHDIR="v2024.10"                           # empty; defconfig changes are done in hook below
+	declare -g BOOTDIR="u-boot-${BOARD}"                         # do not share u-boot directory
+	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already
+
+	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
+	function write_uboot_platform() {
+		dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
+	}
+
+	function write_uboot_platform_mtd() {
+		flashcp -v -p "$1/u-boot-rockchip-spi.bin" /dev/mtd0
+	}
+}
+
+function post_config_uboot_target__extra_configs_for_rock5b_mainline_environment_in_spi() {
+	[[ "${BRANCH}" != "edge" ]] && return 0
+
+	display_alert "$BOARD" "u-boot configs for ${BOOTBRANCH} u-boot config BRANCH=${BRANCH}" "info"
+	run_host_command_logged scripts/config --set-val CONFIG_ENV_IS_NOWHERE "n"
+	run_host_command_logged scripts/config --set-val CONFIG_ENV_IS_IN_SPI_FLASH "y"
+	run_host_command_logged scripts/config --set-val CONFIG_ENV_SECT_SIZE_AUTO "y"
+	run_host_command_logged scripts/config --set-val CONFIG_ENV_OVERWRITE "y"
+	run_host_command_logged scripts/config --set-val CONFIG_ENV_SIZE "0x20000"
+	run_host_command_logged scripts/config --set-val CONFIG_ENV_OFFSET "0xc00000"
+}
--- a/config/boards/rock-5c.conf
+++ b/config/boards/rock-5c.conf
@@ -1,7 +1,7 @@
 # Rockchip RK3588s SoC octa core 4-16GB SoC eMMC USB3 NvME
 BOARD_NAME="Rock 5C"
 BOARDFAMILY="rockchip-rk3588"
-BOARD_MAINTAINER="amazingfate"
+BOARD_MAINTAINER="schwar3kat"
 BOOTCONFIG="rock-5c-rk3588s_defconfig"
 KERNEL_TARGET="vendor,edge"
 FULL_DESKTOP="yes"
@@ -12,6 +12,7 @@ BOOT_SOC="rk3588"
 IMAGE_PARTITION_TABLE="gpt"
 enable_extension "radxa-aic8800"
 AIC8800_TYPE="usb"
+ASOUND_STATE="asound.state.rock-5c"

 function post_family_config__uboot_rock5c() {
 	display_alert "$BOARD" "Configuring armsom u-boot" "info"
--- a/config/boards/rock-s0.conf
+++ b/config/boards/rock-s0.conf
@@ -1,15 +1,48 @@
 # Rockchip RK3308 quad core 512MB SoC WiFi
 # https://radxa.com/products/rocks/s0
+
 BOARD_NAME="Rock S0"
-BOARDFAMILY="rock-s0"
+BOARDFAMILY=rockchip64
 BOARD_MAINTAINER="brentr"
-BOOTCONFIG="rock-s0-rk3308_defconfig"
-DEFAULT_CONSOLE="serial"
-SERIALCON="ttyS0"
-KERNEL_TARGET="current,edge"
-KERNEL_TEST_TARGET="current"
-BOOT_FDT_FILE="rockchip/rk3308-rock-s0.dtb"
+
+BOOTCONFIG=rock-s0-rk3308_defconfig
+BOOT_FDT_FILE=rockchip/rk3308-rock-s0.dtb
+
+KERNEL_TARGET=current,edge
+KERNEL_TEST_TARGET=current
+
+DEFAULT_CONSOLE=serial
+SERIALCON=ttyS0
 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"
+HAS_VIDEO_OUTPUT=no
+
+BOOTBRANCH_BOARD=tag:v2024.10
+BOOTPATCHDIR=v2024.10
+BOOT_SCENARIO=binman
+DDR_BLOB=rk33/rk3308_ddr_589MHz_uart0_m0_v2.07.bin
+BL31_BLOB=rk33/rk3308_bl31_v2.26.elf
+
+OVERLAY_PREFIX=rk3308
+
+function post_family_config__rocks0() {
+	declare -g BOOTDIR="u-boot-${BOARD}"
+	declare -g BOOTSCRIPT=boot-rockchip64-ttyS0.cmd:boot.cmd
+
+	family_tweaks_bsp() { #overrides rockchip64_common.inc
+		#Install udev script that derives fixed, unique MAC addresses for net interfaces
+		#that are assigned random ones
+		bsp=$SRC/packages/bsp/rockpis
+		rules=etc/udev/rules.d
+
+		install -m 755 $bsp/lib/udev/fixEtherAddr $destination/lib/udev
+	}
+}
+
+function pre_install_kernel_debs__enforce_cma() {
+	# Set CMA to 16 megabytes, to provide more usable RAM since Rock Pi S
+	# has usually a small amount of DRAM (512MB)
+	display_alert "$BOARD" "set CMA size to 16MB due to small DRAM size"
+	run_host_command_logged echo "extraargs=cma=16M" ">>" "${SDCARD}"/boot/armbianEnv.txt
+
+	return 0
+}
--- a/config/boards/rockpi-e.conf
+++ b/config/boards/rockpi-e.conf
@@ -1,7 +1,7 @@
 # Rockchip RK3328 quad core 256MB-2GB 1xGBE 1xETH USB3 [WiFi]
 BOARD_NAME="Rockpi E"
 BOARDFAMILY="rockchip64"
-BOARD_MAINTAINER="krachlatte"
+BOARD_MAINTAINER="paolosabatino"
 BOOTCONFIG="rock-pi-e-rk3328_defconfig"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
--- a/config/boards/rockpi-s.conf
+++ b/config/boards/rockpi-s.conf
@@ -1,67 +1,35 @@
 # Rockchip RK3308 quad core 256-512MB SoC WiFi
+# https://radxa.com/products/rockpi/pis
+
 BOARD_NAME="Rockpi S"
-BOARDFAMILY="rockchip64"
+BOARDFAMILY=rockchip64
 BOARD_MAINTAINER="brentr"
-BOOTCONFIG="rock-pi-s-rk3308_defconfig"

-DEFAULT_CONSOLE="serial"
-MODULES_LEGACY="g_serial"
-SERIALCON="ttyS0"
-KERNEL_TARGET="current,edge"
-KERNEL_TEST_TARGET="current"
-BOOT_FDT_FILE="rockchip/rk3308-rock-pi-s.dtb"
+BOOTCONFIG=rock-pi-s-rk3308_defconfig
+BOOT_FDT_FILE=rockchip/rk3308-rock-pi-s.dtb
+
+KERNEL_TARGET=current,edge
+KERNEL_TEST_TARGET=current
+
+DEFAULT_CONSOLE=serial
+SERIALCON=ttyS0
 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"
+HAS_VIDEO_OUTPUT=no

-OVERLAY_PREFIX='rk3308'
+BOOTBRANCH_BOARD=tag:v2024.10
+BOOTPATCHDIR=v2024.10
+BOOT_SCENARIO=binman
+DDR_BLOB=rk33/rk3308_ddr_589MHz_uart0_m0_v2.07.bin
+BL31_BLOB=rk33/rk3308_bl31_v2.26.elf

-#comment out line below for an image that will NOT boot from the built-in SDNAND
-IDBLOADER_BLOB=$SRC/packages/blobs/rockchip/rk3308_idbloader_ddr589MHz_uart0_m0_v2.06.136sd.bin
+OVERLAY_PREFIX=rk3308

-#The SDNAND capabilty IDBLOADER_BLOB requires the U-Boot and Linux serial console on UART0
-#Linux will hang on reboot if the console remains on UART2
-
-#Note:  IDBLOADER_BLOB is derived from
-#  https://dl.radxa.com/rockpis/images/loader/rk3308_loader_ddr589MHz_uart0_m0_v2.06.136sd.bin
-#by using the rkdeveloptool to "upgrade" the previous DDR_BLOB loader on the SDNAND
-#To recreate it, build the image with IDBLOADER_BLOB unset and boot Rock PI-S in MASKROM mode
-#On your host (connected to the RockPi-S's USB-C port):
-#  rdeveloptool db rk3308_loader_ddr589MHz_uart0_m0_v2.06.136sd.bin
-#  rdeveloptool wl 0 newly_built_image.img
-#  rdeveloptool ul rk3308_loader_ddr589MHz_uart0_m0_v2.06.136sd.bin  #this writes 280 sectors
-
-#Then, reset the RockPi-S to boot from SDNAND.  Using that running image:
-#  dd if=/dev/mmcblk0 of=rk3308_idbloader_ddr589MHz_uart0_m0_v2.06.136sd.bin skip=64 count=280
-
-function post_family_config___uboot_config() {
-
-	display_alert "$BOARD" "u-boot ${BOOTBRANCH_BOARD} overrides" "info"
-	unset uboot_custom_postprocess family_tweaks_bsp # disable stuff from rockchip64_common
-
-	BOOTSCRIPT=boot-rockpis.cmd:boot.cmd
-	BOOTENV_FILE='rockpis.txt'
-
-	uboot_custom_postprocess() {
-
-		# TODO: remove this diversion from common caused by different loaderimage params
-		run_host_x86_binary_logged $RKBIN_DIR/tools/loaderimage --pack --uboot ./u-boot-dtb.bin uboot.img 0x600000 --size 1024 1 &&
-			if [ -r "$IDBLOADER_BLOB" ]; then
-				echo "Installing $IDBLOADER_BLOB"
-				echo "Capable of booting from built-in SDNAND"
-				cp $IDBLOADER_BLOB idbloader.bin
-			else
-				[ "$IDBLOADER_BLOB" ] && echo "Missing $IDBLOADER_BLOB"
-				echo "WARNING:  This image will not boot from built-in SDNAND"
-				tools/mkimage -n rk3308 -T rksd -d $RKBIN_DIR/$DDR_BLOB idbloader.bin &&
-					cat $RKBIN_DIR/$MINILOADER_BLOB >> idbloader.bin
-			fi &&
-			run_host_x86_binary_logged $RKBIN_DIR/tools/trust_merger --replace bl31.elf $RKBIN_DIR/$BL31_BLOB trust.ini
-	}
-
-	family_tweaks_bsp() { #Install udev script that derives fixed, unique MAC addresses for net interfaces
+function post_family_config__rockpis() {
+	declare -g BOOTDIR="u-boot-${BOARD}"
+	declare -g BOOTSCRIPT=boot-rockchip64-ttyS0.cmd:boot.cmd

+	family_tweaks_bsp() { #overrides rockchip64_common.inc
+		#Install udev script that derives fixed, unique MAC addresses for net interfaces
 		#that are assigned random ones -- like RockPI-S's WiFi network interfaces
 		bsp=$SRC/packages/bsp/rockpis
 		rules=etc/udev/rules.d
@@ -69,5 +37,13 @@ function post_family_config___uboot_config() {
 		install -m 755 $bsp/lib/udev/fixEtherAddr $destination/lib/udev &&
 			install -m 644 $bsp/$rules/05-fixMACaddress.rules $destination/$rules
 	}
-
+}
+
+function pre_install_kernel_debs__enforce_cma() {
+	# Set CMA to 16 megabytes, to provide more usable RAM since Rock Pi S
+	# has usually a small amount of DRAM (512MB)
+	display_alert "$BOARD" "set CMA size to 16MB due to small DRAM size"
+	run_host_command_logged echo "extraargs=cma=16M" ">>" "${SDCARD}"/boot/armbianEnv.txt
+
+	return 0
 }
--- a/config/boards/thinkpad-x13s.conf
+++ b/config/boards/thinkpad-x13s.conf
@@ -28,9 +28,9 @@ enable_extension "grub-with-dtb" # important, puts the whole DTB handling in pla
 # Use the full firmware, complete linux-firmware plus Armbian's
 declare -g BOARD_FIRMWARE_INSTALL="-full"

-function post_family_config_branch_sc8280xp__jhovolds_69y_kernel() {
-	declare -g KERNEL_MAJOR_MINOR="6.11" # Major and minor versions of this kernel.
-	declare -g KERNELBRANCH='branch:wip/sc8280xp-6.11-rc5'
+function post_family_config_branch_sc8280xp__jhovolds_wip_kernel() {
+	declare -g KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel.
+	declare -g KERNELBRANCH='branch:wip/sc8280xp-6.12' # @TODO: this is down to 27 patches, from hundreds back in the day. Considering merging this with default arm64 uefi kernel
 	declare -g KERNELSOURCE='https://github.com/jhovold/linux.git'
 	declare -g LINUXCONFIG="linux-${ARCH}-${BRANCH}" # for this board: linux-arm64-sc8280xp
 	display_alert "Set up jhovold's kernel ${KERNELBRANCH} for" "${BOARD}" "info"
--- a/config/boards/turing-rk1.csc
+++ b/config/boards/turing-rk1.csc
@@ -1,4 +1,4 @@
-# Rockchip RK3588 octa core 8/16/32GB RAM SoM GBE NVMe eMMC USB3 
+# Rockchip RK3588 octa core 8/16/32GB RAM SoM GBE NVMe eMMC USB3
 BOARD_NAME="Turing RK1"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER=""
@@ -18,10 +18,10 @@ function post_family_config__turing-rk1_default_serial_console_by_branch() {

 	case $BRANCH in
 		vendor)
-			declare -g  SERIALCON="ttyS9"
+			declare -g SERIALCON="ttyS9"
 			;;
 		*)
-			declare -g  SERIALCON="ttyS0"
+			declare -g SERIALCON="ttyS0"
 			;;
 	esac

@@ -51,15 +51,15 @@ function post_family_config__turing-rk1_use_mainline_uboot() {
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"
 	declare -g BOOTBRANCH='tag:v2024.04'
 	declare -g BOOTPATCHDIR="v2024.04"
-    declare -g BOOTDELAY=1
+	declare -g BOOTDELAY=1
 	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency

 	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"

-    # Disable stuff from rockchip64_common; we're using binman here which does all the work already
+	# Disable stuff from rockchip64_common; we're using binman here which does all the work already
 	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd

-    # Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
+	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
 	function write_uboot_platform() {
 		dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
 	}
--- a/config/boards/xiaomi-elish.conf
+++ b/config/boards/xiaomi-elish.conf
@@ -27,6 +27,8 @@ function post_family_tweaks_bsp__xiaomi-elish_firmware() {
 	mkdir -p $destination/usr/share/alsa/ucm2/conf.d/sm8250
 	install -Dm644 $SRC/packages/bsp/xiaomi-elish/elish.conf $destination/usr/share/alsa/ucm2/Xiaomi/elish/elish.conf
 	install -Dm644 $SRC/packages/bsp/xiaomi-elish/elish_HiFi.conf $destination/usr/share/alsa/ucm2/Xiaomi/elish/HiFi.conf
+	# conifg file used by service hexagonrpcd-sdsp
+	install -Dm644 $SRC/packages/bsp/xiaomi-elish/hexagonrpcd-sdsp $destination/etc/conf.d/hexagonrpcd-sdsp
 	ln -sfv ../../Xiaomi/elish/elish.conf \
 		"$destination/usr/share/alsa/ucm2/conf.d/sm8250/Xiaomi Mi Pad 5 Pro.conf"

@@ -65,16 +67,19 @@ function post_family_tweaks__xiaomi-elish_enable_services() {

 	do_with_retries 3 chroot_sdcard_apt_get_update
 	display_alert "$BOARD" "Installing board tweaks" "info"
-	do_with_retries 3 chroot_sdcard_apt_get_install alsa-ucm-conf qbootctl qrtr-tools protection-domain-mapper tqftpserv unudhcpd mkbootimg
+	do_with_retries 3 chroot_sdcard_apt_get_install alsa-ucm-conf qbootctl qrtr-tools unudhcpd mkbootimg

+	# Install hexagonrpc userspace service for kernel after 6.11, hexagonrpc in only packaged for noble now
+	if [[ "${RELEASE}" == "noble" ]]; then
+		do_with_retries 3 chroot_sdcard_apt_get_install hexagonrpc
+		chroot_sdcard systemctl enable hexagonrpcd-sdsp.service
+	fi
 	# disable armbian repo back
 	mv "${SDCARD}"/etc/apt/sources.list.d/armbian.list "${SDCARD}"/etc/apt/sources.list.d/armbian.list.disabled
 	do_with_retries 3 chroot_sdcard_apt_get_update

 	chroot_sdcard systemctl enable qbootctl.service
 	chroot_sdcard systemctl enable usbgadget-rndis.service
-	chroot_sdcard systemctl enable pd-mapper.service
-	chroot_sdcard systemctl enable tqftpserv.service
 	chroot_sdcard systemctl enable bt-fixed-mac.service
 	return 0
 }
@@ -101,5 +106,6 @@ function post_family_tweaks_bsp__xiaomi-elish_bsp_modules_in_initrd() {
 	add_file_from_stdin_to_bsp_destination "/etc/initramfs-tools/modules" <<- 'EXTRA_MODULES'
 		spi-geni-qcom
 		nt36523_ts
+		panel_novatek_nt36523
 	EXTRA_MODULES
 }
--- a/config/boards/xiaomi-umi.conf
+++ b/config/boards/xiaomi-umi.conf
@@ -62,7 +62,7 @@ function post_family_tweaks__xiaomi-umi_enable_services() {

 	do_with_retries 3 chroot_sdcard_apt_get_update
 	display_alert "$BOARD" "Installing board tweaks" "info"
-	do_with_retries 3 chroot_sdcard_apt_get_install alsa-ucm-conf qbootctl qrtr-tools protection-domain-mapper tqftpserv unudhcpd mkbootimg
+	do_with_retries 3 chroot_sdcard_apt_get_install alsa-ucm-conf qbootctl qrtr-tools unudhcpd mkbootimg

 	# Disable armbian repo back
 	mv "${SDCARD}"/etc/apt/sources.list.d/armbian.list "${SDCARD}"/etc/apt/sources.list.d/armbian.list.disabled
@@ -70,8 +70,6 @@ function post_family_tweaks__xiaomi-umi_enable_services() {

 	chroot_sdcard systemctl enable qbootctl.service
 	chroot_sdcard systemctl enable usbgadget-rndis.service
-	chroot_sdcard systemctl enable pd-mapper.service
-	chroot_sdcard systemctl enable tqftpserv.service
 	return 0
 }

--- a/config/boards/xt-q8l-v10.tvb
+++ b/config/boards/xt-q8l-v10.tvb
@@ -12,7 +12,7 @@ PACKAGE_LIST_BOARD="bluez"
 function post_family_config__uboot_config() {
 	# Overwrite UBOOT_TARGET_MAP to use the proprietary rockchip
 	# ddrbin in place of u-boot TPL. The reason is that the board
-	# uses DDR2 memories and u-boot TPL is not capable of 
+	# uses DDR2 memories and u-boot TPL is not capable of
 	# initializing DDR2.
 	UBOOT_TARGET_MAP="ROCKCHIP_TPL=$SRC/cache/sources/rkbin-tools/rk32/rk3288_ddr_400MHz_v1.08.bin;;u-boot-rockchip-with-spl.bin"
 }
--- a/config/boards/youyeetoo-r1-v3.csc
+++ b/config/boards/youyeetoo-r1-v3.csc
@@ -4,8 +4,7 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="SuperKali"
 BOOTCONFIG="generic-rk3588_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
-KERNEL_TARGET="edge,current,vendor"
-KERNEL_TEST_TARGET="vendor,current"
+KERNEL_TARGET="current,edge,vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 IMAGE_PARTITION_TABLE="gpt"
@@ -38,8 +37,8 @@ function post_family_config__youyeetoo_r1_use_mainline_uboot() {
 	declare -g BOOTCONFIG="generic-rk3588_defconfig"             # Use generic defconfig which should boot all RK3588 boards
 	declare -g BOOTDELAY=1                                       # Wait for UART interrupt to enter UMS/RockUSB mode etc
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
-	declare -g BOOTBRANCH="tag:v2024.07"
-	declare -g BOOTPATCHDIR="v2024.07"
+	declare -g BOOTBRANCH="tag:v2024.10"
+	declare -g BOOTPATCHDIR="v2024.10"
 	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency

 	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"
@@ -52,3 +51,15 @@ function post_family_config__youyeetoo_r1_use_mainline_uboot() {
 		dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
 	}
 }
+
+function post_family_tweaks__youyeetoo_r1 {
+	if [[ "${BRANCH}" != "vendor" ]]; then
+		display_alert "$BOARD" "Adjusting rtw89_8852be module" "info"
+		cat <<- EOF > "${SDCARD}/etc/modprobe.d/rtw8852be.conf"
+			options rtw89_pci disable_aspm_l1=y disable_aspm_l1ss=y
+			options rtw89pci disable_aspm_l1=y disable_aspm_l1ss=y
+			options rtw89_core disable_ps_mode=y
+			options rtw89core disable_ps_mode=y
+		EOF
+	fi
+}
--- a/config/bootenv/rockpis.txt
+++ b/config/bootenv/rockpis.txt
@@ -1,2 +0,0 @@
-verbosity=1
-extraargs=swiotlb=1024
--- a/config/bootscripts/boot-rk3576.cmd
+++ b/config/bootscripts/boot-rk3576.cmd
@@ -0,0 +1,86 @@
+# DO NOT EDIT THIS FILE
+#
+# Please edit /boot/armbianEnv.txt to set supported parameters
+#
+
+setenv load_addr "0x48000000"
+setenv overlay_error "false"
+# default values
+setenv rootdev "/dev/mmcblk0p1"
+setenv verbosity "1"
+setenv console "both"
+setenv bootlogo "false"
+setenv rootfstype "ext4"
+setenv docker_optimizations "on"
+setenv earlycon "off"
+
+test -n "${distro_bootpart}" || distro_bootpart=1
+
+echo "Boot script loaded from ${devtype} ${devnum}:${distro_bootpart}"
+
+if test -e ${devtype} ${devnum}:${distro_bootpart} ${prefix}armbianEnv.txt; then
+	load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}armbianEnv.txt
+	env import -t ${load_addr} ${filesize}
+fi
+
+if test "${logo}" = "disabled"; then setenv logo "logo.nologo"; fi
+
+if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=tty1"; fi
+if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "console=ttyS2,1500000 ${consoleargs}"; fi
+if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}"; fi
+if test "${bootlogo}" = "true"; then
+	setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
+else
+	setenv consoleargs "splash=verbose ${consoleargs}"
+fi
+
+# get PARTUUID of first partition on SD/eMMC the boot script was loaded from
+if test "${devtype}" = "mmc"; then part uuid mmc ${devnum}:${distro_bootpart} partuuid; fi
+
+setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} consoleblank=0 loglevel=${verbosity} ubootpart=${partuuid} usb-storage.quirks=${usbstoragequirks} ${extraargs} ${extraboardargs}"
+
+if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory"; fi
+
+load ${devtype} ${devnum}:${distro_bootpart} ${ramdisk_addr_r} ${prefix}uInitrd
+load ${devtype} ${devnum}:${distro_bootpart} ${kernel_addr_r} ${prefix}Image
+
+load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
+fdt addr ${fdt_addr_r}
+fdt resize 65536
+for overlay_file in ${overlays}; do
+	if load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
+		echo "Applying kernel provided DT overlay ${overlay_prefix}-${overlay_file}.dtbo"
+		fdt apply ${load_addr} || setenv overlay_error "true"
+	elif load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_file}.dtbo; then
+		echo "Applying kernel provided DT overlay ${overlay_file}.dtbo"
+		fdt apply ${load_addr} || setenv overlay_error "true"
+	fi
+done
+for overlay_file in ${user_overlays}; do
+	if load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}overlay-user/${overlay_file}.dtbo; then
+		echo "Applying user provided DT overlay ${overlay_file}.dtbo"
+		fdt apply ${load_addr} || setenv overlay_error "true"
+	fi
+done
+if test "${overlay_error}" = "true"; then
+	echo "Error applying DT overlays, restoring original DT"
+	load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
+else
+	if test -e ${devtype} ${devnum}:${distro_bootpart} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-fixup.scr; then
+		load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-fixup.scr
+		echo "Applying kernel provided DT fixup script (${overlay_prefix}-fixup.scr)"
+		source ${load_addr}
+	fi
+	if test -e ${devtype} ${devnum}:${distro_bootpart} ${prefix}fixup.scr; then
+		load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}fixup.scr
+		echo "Applying user provided fixup script (fixup.scr)"
+		source ${load_addr}
+	fi
+fi
+
+echo "Trying 'kaslrseed' command... Info: 'Unknown command' can be safely ignored since 'kaslrseed' does not apply to all boards."
+kaslrseed # @TODO: This gives an error (Unknown command ' kaslrseed ' - try 'help') on many devices since CONFIG_CMD_KASLRSEED is not enabled
+booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
+
+# Recompile with:
+# mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr
--- a/config/bootscripts/boot-rk3588-legacy.cmd
+++ b/config/bootscripts/boot-rk3588-legacy.cmd
@@ -14,16 +14,13 @@ setenv rootfstype "ext4"
 setenv docker_optimizations "on"
 setenv earlycon "off"

-echo "Boot script loaded from ${devtype} ${devnum}"
+test -n "${distro_bootpart}" || distro_bootpart=1

-echo "Testing for existence ${devtype} ${devnum} ${prefix}armbianEnv.txt ..."
-if test -e ${devtype} ${devnum} ${prefix}armbianEnv.txt; then
-	echo "Found ${devtype} ${devnum} ${prefix}armbianEnv.txt - loading ${devtype} ${devnum} ${load_addr} ${prefix}armbianEnv.txt ..."
-	load ${devtype} ${devnum} ${load_addr} ${prefix}armbianEnv.txt
-	echo "Loaded environment from ${devtype} ${devnum} ${prefix}armbianEnv.txt into ${load_addr} filesize ${filesize}..."
-	echo "Importing into environment ..."
+echo "Boot script loaded from ${devtype} ${devnum}:${distro_bootpart}"
+
+if test -e ${devtype} ${devnum}:${distro_bootpart} ${prefix}armbianEnv.txt; then
+	load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}armbianEnv.txt
 	env import -t ${load_addr} ${filesize}
-	echo "armbianEnv.txt imported into environment"
 fi

 if test "${logo}" = "disabled"; then setenv logo "logo.nologo"; fi
@@ -38,44 +35,44 @@ else
 fi

 # get PARTUUID of first partition on SD/eMMC the boot script was loaded from
-if test "${devtype}" = "mmc"; then part uuid mmc ${devnum}:1 partuuid; fi
+if test "${devtype}" = "mmc"; then part uuid mmc ${devnum}:${distro_bootpart} partuuid; fi

 setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} consoleblank=0 loglevel=${verbosity} ubootpart=${partuuid} usb-storage.quirks=${usbstoragequirks} ${extraargs} ${extraboardargs}"

 if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory"; fi

-load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}uInitrd
-load ${devtype} ${devnum} ${kernel_addr_r} ${prefix}Image
+load ${devtype} ${devnum}:${distro_bootpart} ${ramdisk_addr_r} ${prefix}uInitrd
+load ${devtype} ${devnum}:${distro_bootpart} ${kernel_addr_r} ${prefix}Image

-load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
+load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
 fdt addr ${fdt_addr_r}
 fdt resize 65536
 for overlay_file in ${overlays}; do
-	if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
+	if load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
 		echo "Applying kernel provided DT overlay ${overlay_prefix}-${overlay_file}.dtbo"
 		fdt apply ${load_addr} || setenv overlay_error "true"
-	elif load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_file}.dtbo; then
+	elif load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_file}.dtbo; then
 		echo "Applying kernel provided DT overlay ${overlay_file}.dtbo"
 		fdt apply ${load_addr} || setenv overlay_error "true"
 	fi
 done
 for overlay_file in ${user_overlays}; do
-	if load ${devtype} ${devnum} ${load_addr} ${prefix}overlay-user/${overlay_file}.dtbo; then
+	if load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}overlay-user/${overlay_file}.dtbo; then
 		echo "Applying user provided DT overlay ${overlay_file}.dtbo"
 		fdt apply ${load_addr} || setenv overlay_error "true"
 	fi
 done
 if test "${overlay_error}" = "true"; then
 	echo "Error applying DT overlays, restoring original DT"
-	load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
+	load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
 else
-	if test -e ${devtype} ${devnum} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-fixup.scr; then
-		load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-fixup.scr
+	if test -e ${devtype} ${devnum}:${distro_bootpart} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-fixup.scr; then
+		load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-fixup.scr
 		echo "Applying kernel provided DT fixup script (${overlay_prefix}-fixup.scr)"
 		source ${load_addr}
 	fi
-	if test -e ${devtype} ${devnum} ${prefix}fixup.scr; then
-		load ${devtype} ${devnum} ${load_addr} ${prefix}fixup.scr
+	if test -e ${devtype} ${devnum}:${distro_bootpart} ${prefix}fixup.scr; then
+		load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}fixup.scr
 		echo "Applying user provided fixup script (fixup.scr)"
 		source ${load_addr}
 	fi
--- a/config/bootscripts/boot-rock-s0.cmd
+++ b/config/bootscripts/boot-rock-s0.cmd
@@ -1,73 +0,0 @@
-# DO NOT EDIT THIS FILE
-#
-# Please edit /boot/armbianEnv.txt to set supported parameters
-#
-
-setenv load_addr  "0x9000000"
-# Ensure the ever expanding kernel never overlaps initial device tree load area
-setenv fdt_addr_r "0x7800000"
-setenv overlay_error "false"
-# default values
-setenv rootdev "/dev/mmcblk0p1"
-setenv verbosity "1"
-setenv console "both"
-setenv rootfstype "ext4"
-setenv docker_optimizations "on"
-setenv earlycon "off"
-
-echo "Boot script loaded from ${devtype} ${devnum}"
-
-if test -e ${devtype} ${devnum} ${prefix}armbianEnv.txt; then
-	load ${devtype} ${devnum} ${load_addr} ${prefix}armbianEnv.txt
-	env import -t ${load_addr} ${filesize}
-fi
-
-if test "${logo}" = "disabled"; then setenv logo "logo.nologo"; fi
-
-if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=tty1"; fi
-if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "console=ttyS0,1500000 ${consoleargs}"; fi
-if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}"; fi
-
-# get PARTUUID of first partition on SD/eMMC the boot script was loaded from
-if test "${devtype}" = "mmc"; then part uuid mmc ${devnum}:1 partuuid; fi
-
-setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} consoleblank=0 loglevel=${verbosity} ubootpart=${partuuid} usb-storage.quirks=${usbstoragequirks} ${extraargs} ${extraboardargs}"
-
-if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory"; fi
-
-load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}uInitrd
-load ${devtype} ${devnum} ${kernel_addr_r} ${prefix}Image
-
-load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
-fdt addr ${fdt_addr_r}
-fdt resize 65536
-for overlay_file in ${overlays}; do
-	if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
-		echo "Applying kernel provided DT overlay ${overlay_prefix}-${overlay_file}.dtbo"
-		fdt apply ${load_addr} || setenv overlay_error "true"
-	fi
-done
-for overlay_file in ${user_overlays}; do
-	if load ${devtype} ${devnum} ${load_addr} ${prefix}overlay-user/${overlay_file}.dtbo; then
-		echo "Applying user provided DT overlay ${overlay_file}.dtbo"
-		fdt apply ${load_addr} || setenv overlay_error "true"
-	fi
-done
-if test "${overlay_error}" = "true"; then
-	echo "Error applying DT overlays, restoring original DT"
-	load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
-else
-	if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-fixup.scr; then
-		echo "Applying kernel provided DT fixup script (${overlay_prefix}-fixup.scr)"
-		source ${load_addr}
-	fi
-	if test -e ${devtype} ${devnum} ${prefix}fixup.scr; then
-		load ${devtype} ${devnum} ${load_addr} ${prefix}fixup.scr
-		echo "Applying user provided fixup script (fixup.scr)"
-		source ${load_addr}
-	fi
-fi
-booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
-
-# Recompile with:
-# mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr
--- a/config/bootscripts/boot-rockchip64-ttyS0.cmd
+++ b/config/bootscripts/boot-rockchip64-ttyS0.cmd
@@ -3,22 +3,23 @@
 # Please edit /boot/armbianEnv.txt to set supported parameters
 #

-setenv load_addr  "0x9000000"
-# Ensure the ever expanding kernel never overlaps initial device tree load area
-setenv fdt_addr_r "0x7800000"
+setenv load_addr "0x9000000"
 setenv overlay_error "false"
 # default values
 setenv rootdev "/dev/mmcblk0p1"
 setenv verbosity "1"
 setenv console "both"
+setenv bootlogo "false"
 setenv rootfstype "ext4"
 setenv docker_optimizations "on"
 setenv earlycon "off"

-echo "Boot script loaded from ${devtype} ${devnum}"
+test -n "${distro_bootpart}" || distro_bootpart=1

-if test -e ${devtype} ${devnum} ${prefix}armbianEnv.txt; then
-	load ${devtype} ${devnum} ${load_addr} ${prefix}armbianEnv.txt
+echo "Boot script loaded from ${devtype} ${devnum}:${distro_bootpart}"
+
+if test -e ${devtype} ${devnum}:${distro_bootpart} ${prefix}armbianEnv.txt; then
+	load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}armbianEnv.txt
 	env import -t ${load_addr} ${filesize}
 fi

@@ -27,46 +28,53 @@ if test "${logo}" = "disabled"; then setenv logo "logo.nologo"; fi
 if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=tty1"; fi
 if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "console=ttyS0,1500000 ${consoleargs}"; fi
 if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}"; fi
+if test "${bootlogo}" = "true"; then
+	setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
+else
+	setenv consoleargs "splash=verbose ${consoleargs}"
+fi

 # get PARTUUID of first partition on SD/eMMC the boot script was loaded from
-if test "${devtype}" = "mmc"; then part uuid mmc ${devnum}:1 partuuid; fi
+if test "${devtype}" = "mmc"; then part uuid mmc ${devnum}:${distro_bootpart} partuuid; fi

 setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} consoleblank=0 loglevel=${verbosity} ubootpart=${partuuid} usb-storage.quirks=${usbstoragequirks} ${extraargs} ${extraboardargs}"

 if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory"; fi

-load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}uInitrd
-load ${devtype} ${devnum} ${kernel_addr_r} ${prefix}Image
+load ${devtype} ${devnum}:${distro_bootpart} ${ramdisk_addr_r} ${prefix}uInitrd
+load ${devtype} ${devnum}:${distro_bootpart} ${kernel_addr_r} ${prefix}Image

-load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
+load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
 fdt addr ${fdt_addr_r}
 fdt resize 65536
 for overlay_file in ${overlays}; do
-	if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
+	if load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
 		echo "Applying kernel provided DT overlay ${overlay_prefix}-${overlay_file}.dtbo"
 		fdt apply ${load_addr} || setenv overlay_error "true"
 	fi
 done
 for overlay_file in ${user_overlays}; do
-	if load ${devtype} ${devnum} ${load_addr} ${prefix}overlay-user/${overlay_file}.dtbo; then
+	if load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}overlay-user/${overlay_file}.dtbo; then
 		echo "Applying user provided DT overlay ${overlay_file}.dtbo"
 		fdt apply ${load_addr} || setenv overlay_error "true"
 	fi
 done
 if test "${overlay_error}" = "true"; then
 	echo "Error applying DT overlays, restoring original DT"
-	load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
+	load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
 else
-	if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-fixup.scr; then
+	if test -e ${devtype} ${devnum}:${distro_bootpart} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-fixup.scr; then
+		load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-fixup.scr
 		echo "Applying kernel provided DT fixup script (${overlay_prefix}-fixup.scr)"
 		source ${load_addr}
 	fi
-	if test -e ${devtype} ${devnum} ${prefix}fixup.scr; then
-		load ${devtype} ${devnum} ${load_addr} ${prefix}fixup.scr
+	if test -e ${devtype} ${devnum}:${distro_bootpart} ${prefix}fixup.scr; then
+		load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}fixup.scr
 		echo "Applying user provided fixup script (fixup.scr)"
 		source ${load_addr}
 	fi
 fi
+
 booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}

 # Recompile with:
--- a/config/bootscripts/boot-sun50i-next.cmd
+++ b/config/bootscripts/boot-sun50i-next.cmd
@@ -13,6 +13,17 @@ setenv console "both"
 setenv docker_optimizations "on"
 setenv bootlogo "false"

+setenv vendor "allwinner"
+
+# Remember the default fdtfile provided by u-boot and delete the vendor name
+if setexpr subfdt sub ${vendor}/ "" ${fdtfile};then
+	setenv deffdt_file ${subfdt}
+fi
+
+# Remember the default u-boot fdtdir
+setenv deffdt_dir "${prefix}dtb"
+if test "$fdtdir" = ""; then setenv fdtdir "${deffdt_dir}/${vendor}";fi
+
 # Print boot source
 itest.b *0x10028 == 0x00 && echo "U-boot loaded from SD"
 itest.b *0x10028 == 0x02 && echo "U-boot loaded from eMMC or secondary SD"
@@ -25,6 +36,37 @@ if test -e ${devtype} ${devnum} ${prefix}armbianEnv.txt; then
 	env import -t ${load_addr} ${filesize}
 fi

+# Delete the vendor's name from the fdtfile variable and record the result
+# after the file with the environment variables has been read
+if setexpr subfdt sub ${vendor}/ "" ${fdtfile};then
+	setenv fdtfile ${subfdt}
+fi
+
+# In this shell, we can only check the existence of the file.
+# Make a check of reasonable ways to find the dtb file.
+# Set the true value of the paths.
+if test -e ${devtype} ${devnum} "${fdtdir}/${fdtfile}"; then
+	echo "Load fdt: ${fdtdir}/${fdtfile}"
+else
+	echo "The file ${fdtfile} was not found in the path ${fdtdir}"
+	if test -e ${devtype} ${devnum} "${deffdt_dir}/${fdtfile}"; then
+		setenv fdtdir "${deffdt_dir}"
+		echo "Load fdt: ${fdtdir}/${fdtfile}"
+	else
+		if test -e ${devtype} ${devnum} "${deffdt_dir}/${vendor}/${deffdt_file}"; then
+			setenv fdtdir "${deffdt_dir}/${vendor}"
+			setenv fdtfile "${deffdt_file}"
+			echo "Load fdt: ${fdtdir}/${fdtfile}"
+		else
+			if test -e ${devtype} ${devnum} "${deffdt_dir}/${deffdt_file}"; then
+				setenv fdtdir "${deffdt_dir}"
+				setenv fdtfile "${deffdt_file}"
+				echo "Load fdt: ${fdtdir}/${fdtfile}"
+			fi
+		fi
+	fi
+fi
+
 if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=ttyS0,115200 console=tty1"; fi
 if test "${console}" = "serial"; then setenv consoleargs "console=ttyS0,115200"; fi
 if test "${bootlogo}" = "true"; then
@@ -41,11 +83,11 @@ setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs

 if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=memory"; fi

-load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
+load ${devtype} ${devnum} ${fdt_addr_r} ${fdtdir}/${fdtfile}
 fdt addr ${fdt_addr_r}
 fdt resize 65536
 for overlay_file in ${overlays}; do
-	if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/allwinner/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
+	if load ${devtype} ${devnum} ${load_addr} ${fdtdir}/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
 		echo "Applying kernel provided DT overlay ${overlay_prefix}-${overlay_file}.dtbo"
 		fdt apply ${load_addr} || setenv overlay_error "true"
 	fi
@@ -58,9 +100,9 @@ for overlay_file in ${user_overlays}; do
 done
 if test "${overlay_error}" = "true"; then
 	echo "Error applying DT overlays, restoring original DT"
-	load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
+	load ${devtype} ${devnum} ${fdt_addr_r} ${fdtdir}/${fdtfile}
 else
-	if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/allwinner/overlay/${overlay_prefix}-fixup.scr; then
+	if load ${devtype} ${devnum} ${load_addr} ${fdtdir}/overlay/${overlay_prefix}-fixup.scr; then
 		echo "Applying kernel provided DT fixup script (${overlay_prefix}-fixup.scr)"
 		source ${load_addr}
 	fi
--- a/config/bootscripts/boot-sunxi.cmd
+++ b/config/bootscripts/boot-sunxi.cmd
@@ -17,6 +17,15 @@ setenv devnum "0"
 setenv rootdev "/dev/mmcblk${devnum}p1"
 setenv earlycon "off"

+# Remember the default u-boot fdtfile
+setenv deffdt_file ${fdtfile}
+
+# Remember the default u-boot fdtdir
+setenv deffdt_dir "${prefix}dtb"
+if test "$fdtdir" = ""; then setenv fdtdir "${deffdt_dir}";fi
+
+setenv vendor "allwinner"
+
 # Print boot source
 itest.b *0x28 == 0x00 && echo "U-boot loaded from SD"
 itest.b *0x28 == 0x01 && echo "U-boot loaded from NAND"
@@ -31,13 +40,42 @@ if test "${devtype}" = "mmc"; then
 	setenv rootdev "/dev/mmcblk${mmc_bootdev}p1"
 fi

-echo "Boot script loaded from ${devtype}"
-
 if test -e ${devtype} ${devnum} ${prefix}armbianEnv.txt; then
 	load ${devtype} ${devnum} ${load_addr} ${prefix}armbianEnv.txt
 	env import -t ${load_addr} ${filesize}
 fi

+# Delete the vendor's name from the fdtfile variable and record the result
+# after the file with the environment variables has been read
+if setexpr subfdt sub ${vendor}/ "" ${fdtfile};then
+	setenv fdtfile ${subfdt}
+fi
+
+# In this shell, we can only check the existence of the file.
+# Make a check of reasonable ways to find the dtb file.
+# Set the true value of the paths.
+if test -e ${devtype} ${devnum} "${fdtdir}/${fdtfile}"; then
+	echo "Load fdt: ${fdtdir}/${fdtfile}"
+else
+	echo "The file ${fdtfile} was not found in the path ${fdtdir}"
+	if test -e ${devtype} ${devnum} "${deffdt_dir}/${vendor}/${fdtfile}"; then
+		setenv fdtdir "${deffdt_dir}/${vendor}"
+		echo "Load fdt: ${fdtdir}/${fdtfile}"
+	else
+		if test -e ${devtype} ${devnum} "${deffdt_dir}/${vendor}/${deffdt_file}"; then
+			setenv fdtdir "${deffdt_dir}/${vendor}"
+			setenv fdtfile "${deffdt_file}"
+			echo "Load fdt: ${fdtdir}/${fdtfile}"
+		else
+			if test -e ${devtype} ${devnum} "${deffdt_dir}/${deffdt_file}"; then
+				setenv fdtdir "${deffdt_dir}"
+				setenv fdtfile "${deffdt_file}"
+				echo "Load fdt: ${fdtdir}/${fdtfile}"
+			fi
+		fi
+	fi
+fi
+
 if test "${console}" = "display"; then setenv consoleargs "console=tty1"; fi
 if test "${console}" = "serial"; then setenv consoleargs "console=ttyS0,115200"; fi
 if test "${console}" = "both"; then setenv consoleargs "console=ttyS0,115200 console=tty1"; fi
@@ -50,7 +88,10 @@ fi

 setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} hdmi.audio=EDID:0 disp.screen0_output_mode=${disp_mode} consoleblank=0 loglevel=${verbosity} ubootpart=${partuuid} ubootsource=${devtype} usb-storage.quirks=${usbstoragequirks} ${extraargs} ${extraboardargs}"

-if test "${disp_mem_reserves}" = "off"; then setenv bootargs "${bootargs} sunxi_ve_mem_reserve=0 sunxi_g2d_mem_reserve=0 sunxi_fb_mem_reserve=16"; fi
+if test "${disp_mem_reserves}" = "off"; then
+	setenv bootargs "${bootargs} sunxi_ve_mem_reserve=0 sunxi_g2d_mem_reserve=0 sunxi_fb_mem_reserve=16"
+fi
+
 if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=memory"; fi

 load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}uInitrd
@@ -58,11 +99,11 @@ load ${devtype} ${devnum} ${kernel_addr_r} ${prefix}zImage

 if test -e ${devtype} ${devnum} "${prefix}.next"; then
 	echo "Found mainline kernel configuration"
-	load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
+	load ${devtype} ${devnum} ${fdt_addr_r} ${fdtdir}/${fdtfile}
 	fdt addr ${fdt_addr_r}
 	fdt resize 65536
 	for overlay_file in ${overlays}; do
-		if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
+		if load ${devtype} ${devnum} ${load_addr} ${fdtdir}/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
 			echo "Applying kernel provided DT overlay ${overlay_prefix}-${overlay_file}.dtbo"
 			fdt apply ${load_addr} || setenv overlay_error "true"
 		fi
@@ -75,9 +116,10 @@ if test -e ${devtype} ${devnum} "${prefix}.next"; then
 	done
 	if test "${overlay_error}" = "true"; then
 		echo "Error applying DT overlays, restoring original DT"
-		load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
+		load ${devtype} ${devnum} ${fdt_addr_r} ${fdtdir}/${fdtfile}
 	else
-		if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/overlay/${overlay_prefix}-fixup.scr; then
+		if test -e ${devtype} ${devnum} ${fdtdir}/overlay/${overlay_prefix}-fixup.scr; then
+			load ${devtype} ${devnum} ${load_addr} ${fdtdir}/overlay/${overlay_prefix}-fixup.scr
 			echo "Applying kernel provided DT fixup script (${overlay_prefix}-fixup.scr)"
 			source ${load_addr}
 		fi
--- a/config/cli/bullseye/main/packages
+++ b/config/cli/bullseye/main/packages
@@ -41,5 +41,4 @@ u-boot-tools
 usbutils
 vlan
 wget
-wireless-tools
 wpasupplicant
--- a/config/cli/common/main/packages
+++ b/config/cli/common/main/packages
@@ -39,6 +39,5 @@ tzdata
 u-boot-tools
 usbutils
 wget
-wireless-tools
 wireguard-tools
 wpasupplicant
--- a/config/cli/jammy/main/packages
+++ b/config/cli/jammy/main/packages
@@ -41,5 +41,4 @@ u-boot-tools
 usbutils
 vlan
 wget
-wireless-tools
 wpasupplicant
--- a/Show More
+++ b/Show More