CodeRabbit Generated Unit Tests: Add test_apa.bats and test_distro_specific.bats test files

Main: adjust broken patches on Meson and Rockchip64
CAINIAO CNIoT-CORE: use ALSA UCM instead of asound.state
2025-09-24 19:47:06 +07:00 · 2025-06-22 11:34:08 +00:00 · 2025-06-21 19:37:37 +02:00 · 2025-06-19 15:05:33 +02:00 · 2025-06-19 15:05:33 +02:00 · 2025-06-19 09:52:10 +02:00
3929 changed files with 711031 additions and 745174 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -27,18 +27,19 @@ config/boards/ayn-odin2.csc		@FantasyGmm
 config/boards/bananapi.conf		@DylanHP @janprunk
 config/boards/bananapicm4io.conf		@pyavitz
 config/boards/bananapif3.conf		@pyavitz
-config/boards/bananapim2plus.csc		@leggewie
+config/boards/bananapim2plus.conf		@leggewie
 config/boards/bananapim2pro.conf		@igorpecovnik
 config/boards/bananapim2s.conf		@jeanrhum @pyavitz
 config/boards/bananapim2zero.csc		@mhawkins-consultant
 config/boards/bananapim3.csc		@AaronNGray
-config/boards/bananapim4berry.wip		@The-going
+config/boards/bananapim4berry.conf		@The-going
 config/boards/bananapim4zero.conf		@pyavitz
 config/boards/bananapim5.conf		@igorpecovnik
 config/boards/bananapim64.csc		@devdotnetorg
 config/boards/bananapim7.conf		@amazingfate
 config/boards/beaglebone-ai64.conf		@Grippy98
 config/boards/beagleplay.conf		@Grippy98
+config/boards/beagley-ai.csc		@Grippy98
 config/boards/bigtreetech-cb1.conf		@JohnTheCoolingFan
 config/boards/bigtreetech-cb2.conf		@JohnTheCoolingFan
 config/boards/cherryba-m1.csc		@IsMrX
@@ -50,10 +51,11 @@ config/boards/firefly-itx-3588j.csc		@SeeleVolleri
 config/boards/fxblox-rk1.csc		@mahdichi
 config/boards/gateway-gz80x.conf		@pyavitz
 config/boards/h96-tvbox-3566.tvb		@hqnicolas
-config/boards/helios4.csc		@Heisath
+config/boards/helios4.conf		@Heisath
 config/boards/helios64.conf		@prahal
 config/boards/hinlink-h28k.csc		@sputnik2019
 config/boards/hinlink-ht2.csc		@hoochiwetech
+config/boards/imb3588.conf		@JackHuang021
 config/boards/indiedroid-nova.csc		@lanefu
 config/boards/inovato-quadra.conf		@NicoD-SBC
 config/boards/jethubj100.conf		@adeepn
@@ -76,16 +78,16 @@ config/boards/lubancat2.csc		@andyshrk
 config/boards/mangopi-m28k.csc		@sputnik2019
 config/boards/mba8mpxl-ras314.conf		@schmiedelm
 config/boards/mba8mpxl.conf		@schmiedelm
-config/boards/mekotronics-r58-minipc.csc		@monkaBlyat
+config/boards/mekotronics-r58-minipc.conf		@monkaBlyat
 config/boards/mekotronics-r58x-4g.csc		@monkaBlyat
-config/boards/mekotronics-r58x.csc		@monkaBlyat
+config/boards/mekotronics-r58x.conf		@monkaBlyat
 config/boards/mixtile-blade3.csc		@rpardini
 config/boards/mksklipad50.conf		@torte71
 config/boards/mkspi.csc		@redrathnure
 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-r3s-lts.conf		@pyavitz
 config/boards/nanopi-r5s.csc		@utlark
 config/boards/nanopi-r6c.csc		@ColorfulRhino
 config/boards/nanopi-r6s.conf		@efectn
@@ -121,14 +123,16 @@ config/boards/orangepizeroplus.csc		@schwar3kat
 config/boards/phytiumpi.conf		@chainsx
 config/boards/pine64.conf		@PanderMusubi
 config/boards/pinebook-pro.csc		@TRSx80 @ahoneybun
-config/boards/pocketbeagle2.csc		@Grippy98
+config/boards/pocketbeagle2.conf		@Grippy98
 config/boards/pocketchip-sd.csc		@TheSnowfield
+config/boards/qcom-robotics-rb5.conf		@FantasyGmm
 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-nio-12l.conf		@HeyMeco
 config/boards/radxa-zero.conf		@clee @engineer-80
 config/boards/radxa-zero2.csc		@monkaBlyat
 config/boards/recore.csc		@eliasbakken
@@ -167,16 +171,17 @@ config/boards/tritium-h3.conf		@Tonymac32
 config/boards/tritium-h5.conf		@Tonymac32
 config/boards/uefi-arm64.conf		@rpardini
 config/boards/uefi-x86.conf		@rpardini
+config/boards/visionfive2.csc		@libiunc
 config/boards/wsl2-arm64.csc		@rpardini
 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.eos		@FantasyGmm
 config/boards/youyeetoo-r1-v3.csc		@SuperKali
 config/boards/yy3568.csc		@hqnicolas
-config/kernel/linux-arm64-*.config		@FantasyGmm @PeterChrz @rpardini
+config/kernel/linux-arm64-*.config		@PeterChrz @rpardini
 config/kernel/linux-bcm2711-*.config		@PanderMusubi @teknoid
+config/kernel/linux-genio-*.config		@HeyMeco
 config/kernel/linux-k3-*.config		@Grippy98 @glneo
 config/kernel/linux-k3-beagle-*.config		@Grippy98
 config/kernel/linux-meson-*.config		@hzyitc @juanlufont
@@ -185,11 +190,13 @@ config/kernel/linux-meson64-*.config		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @
 config/kernel/linux-mvebu-*.config		@Heisath
 config/kernel/linux-odroidxu4-*.config		@joekhoobyar
 config/kernel/linux-phytium-embedded-*.config		@chainsx
-config/kernel/linux-rk35xx-*.config		@CodeChenL @ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @hqnicolas @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
+config/kernel/linux-rk35xx-*.config		@CodeChenL @ColorfulRhino @HeyMeco @JackHuang021 @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @andyshrk @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @hqnicolas @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
 config/kernel/linux-rockchip-*.config		@paolosabatino
-config/kernel/linux-rockchip64-*.config		@150balbes @ColorfulRhino @HeyMeco @JohnTheCoolingFan @Manouchehri @SuperKali @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @alexl83 @amazingfate @andyshrk @brentr @catalinii @clee @efectn @fridtjof @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @lanefu @linhz0hz @mlegenovic @paolosabatino @prahal @redrathnure @rpardini @schwar3kat @sicXnull @tdleiyao @torte71 @utlark @vamzii
+config/kernel/linux-rockchip64-*.config		@150balbes @ColorfulRhino @HeyMeco @JohnTheCoolingFan @SuperKali @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @alexl83 @amazingfate @andyshrk @brentr @catalinii @clee @efectn @fridtjof @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @lanefu @linhz0hz @mlegenovic @paolosabatino @prahal @pyavitz @redrathnure @rpardini @schwar3kat @sicXnull @tdleiyao @torte71 @utlark @vamzii
 config/kernel/linux-sm8250-*.config		@FantasyGmm @amazingfate
+config/kernel/linux-sm8550-*.config		@FantasyGmm
 config/kernel/linux-spacemit-*.config		@pyavitz
+config/kernel/linux-starfive2-*.config		@libiunc
 config/kernel/linux-sun55iw3-syterkit-*.config		@chainsx
 config/kernel/linux-sunxi-*.config		@1ubuntuuser @AaronNGray @DylanHP @Janmcha @StephenGraf @TheSnowfield @Tonymac32 @janprunk @lbmendes @leggewie @mhawkins-consultant @sgjava @spendist
 config/kernel/linux-sunxi64-*.config		@AGM1968 @IsMrX @JohnTheCoolingFan @Kreyren @NicoD-SBC @PanderMusubi @Ressetkk @The-going @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @krachlatte @pyavitz @schwar3kat @sicXnull @spendist @teknoid
@@ -199,14 +206,16 @@ config/kernel/linux-uefi-arm64-*.config		@rpardini
 config/kernel/linux-uefi-x86-*.config		@davidandreoletti @rpardini
 config/kernel/linux-wsl2-arm64-*.config		@rpardini
 config/kernel/linux-wsl2-x86-*.config		@rpardini
-patch/atf/atf-arm64/		@FantasyGmm @PeterChrz @rpardini
+patch/atf/atf-arm64/		@PeterChrz @rpardini
 patch/atf/atf-bcm2711/		@PanderMusubi @teknoid
-patch/atf/atf-imx8m/		@schmiedelm
+patch/atf/atf-genio/		@HeyMeco
+patch/atf/atf-imx8/		@schmiedelm
 patch/atf/atf-k3-beagle/		@Grippy98
 patch/atf/atf-k3/		@Grippy98 @glneo
 patch/atf/atf-phytium-embedded/		@chainsx
-patch/atf/atf-rockchip64/		@ColorfulRhino @TRSx80 @ahoneybun @andyshrk @clee @joekhoobyar @paolosabatino @prahal
+patch/atf/atf-rockchip64/		@ColorfulRhino @SuperKali @TRSx80 @Tonymac32 @ahoneybun @andyshrk @clee @joekhoobyar @paolosabatino @prahal
 patch/atf/atf-sm8250/		@FantasyGmm @amazingfate
+patch/atf/atf-sm8550/		@FantasyGmm
 patch/atf/atf-spacemit/		@pyavitz
 patch/atf/atf-sun55iw3-syterkit/		@chainsx
 patch/atf/atf-sunxi64/		@AGM1968 @IsMrX @JohnTheCoolingFan @Kreyren @NicoD-SBC @PanderMusubi @Ressetkk @The-going @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @krachlatte @pyavitz @schwar3kat @sicXnull @spendist @teknoid
@@ -221,17 +230,19 @@ patch/kernel/archive/meson64-*/		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @clee
 patch/kernel/archive/mvebu-*/		@Heisath
 patch/kernel/archive/odroidxu4-*/		@joekhoobyar
 patch/kernel/archive/rockchip-*/		@paolosabatino
-patch/kernel/archive/rockchip64-*/		@150balbes @ColorfulRhino @HeyMeco @JohnTheCoolingFan @Manouchehri @SuperKali @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @alexl83 @amazingfate @andyshrk @brentr @catalinii @clee @efectn @fridtjof @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @lanefu @linhz0hz @mlegenovic @paolosabatino @prahal @redrathnure @rpardini @schwar3kat @sicXnull @tdleiyao @torte71 @utlark @vamzii
+patch/kernel/archive/rockchip64-*/		@150balbes @ColorfulRhino @HeyMeco @JohnTheCoolingFan @SuperKali @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @alexl83 @amazingfate @andyshrk @brentr @catalinii @clee @efectn @fridtjof @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @lanefu @linhz0hz @mlegenovic @paolosabatino @prahal @pyavitz @redrathnure @rpardini @schwar3kat @sicXnull @tdleiyao @torte71 @utlark @vamzii
 patch/kernel/archive/sm8250-*/		@FantasyGmm @amazingfate
+patch/kernel/archive/sm8550-*/		@FantasyGmm
 patch/kernel/archive/spacemit-*/		@pyavitz
 patch/kernel/archive/sunxi-*/		@1ubuntuuser @AGM1968 @AaronNGray @DylanHP @IsMrX @Janmcha @JohnTheCoolingFan @Kreyren @NicoD-SBC @PanderMusubi @Ressetkk @StephenGraf @The-going @TheSnowfield @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @janprunk @krachlatte @lbmendes @leggewie @mhawkins-consultant @pyavitz @schwar3kat @sgjava @sicXnull @spendist @teknoid
 patch/kernel/archive/uefi-arm64-*/		@PeterChrz @rpardini
 patch/kernel/archive/uefi-x86-*/		@davidandreoletti @rpardini
 patch/kernel/archive/wsl2-arm64-*/		@rpardini
 patch/kernel/archive/wsl2-x86-*/		@rpardini
+patch/kernel/genio-1200-*/		@HeyMeco
 patch/kernel/phytium-embedded-*/		@chainsx
-patch/kernel/rk35xx-vendor-*/		@CodeChenL @ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @hqnicolas @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
-patch/kernel/sm8550-*/		@FantasyGmm
+patch/kernel/rk35xx-vendor-*/		@CodeChenL @ColorfulRhino @HeyMeco @JackHuang021 @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @andyshrk @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @hqnicolas @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
+patch/kernel/starfive2-*/		@libiunc
 patch/kernel/sun55iw3-syterkit-*/		@chainsx
 patch/kernel/thead-*/		@chainsx
 patch/kernel/wsl2-arm64-*/		@rpardini
@@ -239,15 +250,16 @@ patch/u-boot/legacy/		@chainsx @joekhoobyar @juanlufont @lanefu
 patch/u-boot/legacy/u-boot-clearfog/		@Heisath
 patch/u-boot/legacy/u-boot-helios4/		@Heisath
 patch/u-boot/legacy/u-boot-khadas-edge2-rk3588/		@efectn
-patch/u-boot/legacy/u-boot-radxa-rk35xx/		@CodeChenL @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @hqnicolas @krachlatte @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @tdleiyao @vamzii
+patch/u-boot/legacy/u-boot-radxa-rk35xx/		@CodeChenL @HeyMeco @JackHuang021 @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @hqnicolas @krachlatte @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @tdleiyao @vamzii
 patch/u-boot/legacy/u-boot-spacemit-k1/		@pyavitz
+patch/u-boot/u-boot-beagle/		@Grippy98
 patch/u-boot/u-boot-k3-beagle/		@Grippy98
 patch/u-boot/u-boot-k3/		@Grippy98 @glneo
 patch/u-boot/u-boot-meson-s4t7/		@adeepn @rpardini @viraniac
 patch/u-boot/u-boot-qemu-arm64/		@rpardini
 patch/u-boot/u-boot-qemu-x86/		@rpardini
-patch/u-boot/u-boot-rockchip64-v2022.04/		@Manouchehri @TRSx80 @TheSnowfield @ahoneybun @paolosabatino
-patch/u-boot/u-boot-rockchip64/		@Tonymac32 @andyshrk @clee @igorpecovnik @paolosabatino @prahal @redrathnure @sicXnull @torte71
+patch/u-boot/u-boot-rockchip64-v2022.04/		@TRSx80 @ahoneybun @paolosabatino
+patch/u-boot/u-boot-rockchip64/		@Tonymac32 @andyshrk @clee @igorpecovnik @prahal @redrathnure @sicXnull
 patch/u-boot/u-boot-sunxi-crust/		@AGM1968 @Kreyren @NicoD-SBC @PanderMusubi @Tonymac32 @devdotnetorg @schwar3kat @spendist @teknoid
 patch/u-boot/u-boot-sunxi/		@1ubuntuuser @AGM1968 @DylanHP @Janmcha @JohnTheCoolingFan @Kreyren @NicoD-SBC @PanderMusubi @Ressetkk @StephenGraf @TheSnowfield @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @janprunk @krachlatte @lbmendes @leggewie @mhawkins-consultant @schwar3kat @sgjava @sicXnull @spendist @teknoid
 patch/u-boot/u-boot-sunxi/board_bananapim3/		@AaronNGray
@@ -257,22 +269,22 @@ patch/u-boot/v2022.07/		@Tonymac32 @igorpecovnik
 patch/u-boot/v2022.10/		@NicoD-SBC
 patch/u-boot/v2023.07.02/		@clee @engineer-80
 patch/u-boot/v2023.10/		@adeepn
-patch/u-boot/v2024.01/		@IsMrX @NicoD-SBC @Tonymac32 @rpardini
+patch/u-boot/v2024.01/		@Tonymac32 @rpardini
 patch/u-boot/v2024.01/board_orangepi5/		@efectn
 patch/u-boot/v2024.04-rock5b-radxa/		@amazingfate @linhz0hz
-patch/u-boot/v2024.04/		@Tonymac32 @chraac @igorpecovnik @pyavitz @utlark
+patch/u-boot/v2024.04/		@Tonymac32 @chraac @pyavitz @utlark
 patch/u-boot/v2024.07-coolpi-cm5/		@andyshrk
-patch/u-boot/v2024.07/		@adeepn @andyshrk @igorpecovnik @monkaBlyat @paolosabatino
+patch/u-boot/v2024.07/		@adeepn @igorpecovnik @monkaBlyat
 patch/u-boot/v2024.07/board_station-m1/		@150balbes
-patch/u-boot/v2024.10/		@HeyMeco @alexl83 @brentr @fridtjof @paolosabatino
+patch/u-boot/v2024.10/		@HeyMeco @alexl83 @brentr @fridtjof @pyavitz
 patch/u-boot/v2024.10/board_bigtreetech-cb2/		@JohnTheCoolingFan
+patch/u-boot/v2025-sunxi/		@The-going
 patch/u-boot/v2025.01-rc3-coolpi-cm5/		@andyshrk
-patch/u-boot/v2025.01/		@ColorfulRhino @SuperKali @ZazaBR @amazingfate @catalinii @efectn @jeanrhum @joekhoobyar @paolosabatino @pyavitz @rpardini @vamzii
-patch/u-boot/v2025.01/board_bananapim4berry/		@The-going
+patch/u-boot/v2025.01/		@ColorfulRhino @efectn @jeanrhum @joekhoobyar @paolosabatino @pyavitz @rpardini @torte71
 patch/u-boot/v2025.01/board_h96-tvbox-3566/		@hqnicolas
-patch/u-boot/v2025.04-rc2/		@mlegenovic
-patch/u-boot/v2025.04/		@SuperKali @Tonymac32
+patch/u-boot/v2025.04/		@IsMrX @NicoD-SBC @SuperKali @TheSnowfield @Tonymac32 @ZazaBR @amazingfate @andyshrk @catalinii @igorpecovnik @mlegenovic @pyavitz @rpardini @vamzii
 sources/families/bcm2711.conf		@PanderMusubi @teknoid
+sources/families/genio.conf		@HeyMeco
 sources/families/imx8m.conf		@schmiedelm
 sources/families/jethub.conf		@adeepn
 sources/families/k3.conf		@Grippy98 @glneo
@@ -287,13 +299,14 @@ sources/families/meson8b.conf		@hzyitc @juanlufont
 sources/families/mvebu.conf		@Heisath
 sources/families/odroidxu4.conf		@joekhoobyar
 sources/families/phytium-embedded.conf		@chainsx
-sources/families/qcom-abl.conf		@FantasyGmm
-sources/families/rk35xx.conf		@CodeChenL @ZazaBR @amazingfate @andyshrk @catalinii @hoochiwetech @hqnicolas @krachlatte @mattx433 @sputnik2019 @tdleiyao @vamzii
-sources/families/rockchip-rk3588.conf		@ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @chainsx @efectn @fridtjof @ginkage @lanefu @linhz0hz @mahdichi @monkaBlyat @prahal @rpardini @schwar3kat
+sources/families/rk35xx.conf		@CodeChenL @ZazaBR @amazingfate @andyshrk @catalinii @hoochiwetech @hqnicolas @krachlatte @mattx433 @pyavitz @sputnik2019 @tdleiyao @vamzii
+sources/families/rockchip-rk3588.conf		@ColorfulRhino @HeyMeco @JackHuang021 @SeeleVolleri @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @chainsx @efectn @fridtjof @ginkage @lanefu @linhz0hz @mahdichi @monkaBlyat @prahal @rpardini @schwar3kat
 sources/families/rockchip.conf		@paolosabatino
-sources/families/rockchip64.conf		@150balbes @JohnTheCoolingFan @Manouchehri @TRSx80 @TheSnowfield @Tonymac32 @ahoneybun @andyshrk @brentr @clee @hqnicolas @igorpecovnik @joekhoobyar @mlegenovic @paolosabatino @prahal @redrathnure @rpardini @sicXnull @torte71 @utlark
+sources/families/rockchip64.conf		@150balbes @JohnTheCoolingFan @TRSx80 @TheSnowfield @Tonymac32 @ahoneybun @andyshrk @brentr @clee @hqnicolas @igorpecovnik @joekhoobyar @mlegenovic @paolosabatino @prahal @redrathnure @rpardini @sicXnull @torte71 @utlark
 sources/families/sm8250.conf		@FantasyGmm @amazingfate
+sources/families/sm8550.conf		@FantasyGmm
 sources/families/spacemit.conf		@pyavitz
+sources/families/starfive2.conf		@libiunc
 sources/families/sun50iw1.conf		@Kreyren @PanderMusubi @devdotnetorg @eliasbakken
 sources/families/sun50iw2.conf		@AGM1968 @Tonymac32 @schwar3kat @spendist @teknoid
 sources/families/sun50iw6.conf		@NicoD-SBC
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -16,7 +16,7 @@ contact_links:
    url: https://bugzilla.kernel.org/
    about: If you are using upstream Linux kernel
  - name: Issue with armbian-config
-    url: https://github.com/armbian/config/issues/new
+    url: https://github.com/armbian/configng/issues/new
    about: Utility for configuring your board, adjusting services and installing applications.
  - name: Issue with infrastructure
    url: https://github.com/armbian/mirror/issues/new
--- a/.github/workflows/adjust-maintainers.yml
+++ b/.github/workflows/adjust-maintainers.yml
@@ -6,8 +6,6 @@ name: "Sync maintainers status"
 # spdx-id: GPL-2.0-or-later
 # copyright-owner: @igorpecovnik

-# Dependencies: lftp, jq
-
 on:
  schedule:
    - cron: "0 * * * *"
@@ -36,16 +34,11 @@ jobs:
          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/
+          # download json that is prepared in https://github.com/armbian/armbian.github.io
+          curl -o /tmp/armbian_maintainers.json https://github.armbian.com/maintainers.json

      - name: "Update maintainers"
        run: |
--- a/.github/workflows/issue-welcome-first-time.yml
+++ b/.github/workflows/issue-welcome-first-time.yml
@@ -15,10 +15,13 @@ jobs:
        with:
          labels: "Good first issue"
          issue-opened-msg: |
-            ### Hey @{fc-author} !
+            ### Hey @{fc-author}! 👋

-            Looks like it's your first time interacting with Armbian here on GitHub.
+            Thanks for opening your first issue with the Armbian project — we’re glad to have you here! 🧡  
+            Your input doesn’t just help us improve the project — it benefits everyone who uses Armbian.

-            Welcome and thank you for taking the time to report an issue :heart:.
+            If you'd like to stay informed about project updates or collaborate more closely with the team,  
+            you can optionally share some personal contact preferences at [armbian.com/update-data](https://www.armbian.com/update-data/).  
+            This helps us keep in touch without relying solely on GitHub notifications.

-            Don't forget to star :star: the repo.
+            Also, don’t forget to ⭐ star the repo to support the work — and welcome aboard! 🚀
--- a/.github/workflows/pr-auto-labeler.yml
+++ b/.github/workflows/pr-auto-labeler.yml
@@ -1,54 +1,69 @@
 name: Automatic Pull Request Labeling
+
+# Sets labels automatically based on:
+# - PR size (job: label-size)
+# - File categories using .github/labeler config (job: label-category)
+# - PR creation date for quarterly tracking (job: label-by-date)
+# - Removes "Ready to merge" label on PR update (job: label-remove)
+
 run-name: 'Set labels - PR #${{ github.event.pull_request.number }} ("${{ github.event.pull_request.title }}")'
-#
-# 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

+# Grant required permissions globally
+permissions:
+  contents: read          # Required for checking changed files
+  pull-requests: write    # Required for labeling PRs
+  issues: write           # Required for adding/removing labels
+
 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
+      - name: Checkout the pull request
+        uses: actions/checkout@v4
+
+      - name: Check for label using GH CLI
+        id: check
+        run: |
+          gh pr view ${{ github.event.pull_request.number }} --json labels -q '.labels[].name' | grep -q 'Ready to merge' && echo "has_label=true" >> $GITHUB_OUTPUT || echo "has_label=false" >> $GITHUB_OUTPUT
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Remove "Ready to merge" label
+        if: steps.check.outputs.has_label == 'true'
+        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' }}
+    name: "Category Labels"
    runs-on: ubuntu-latest
+    if: ${{ github.event.action == 'opened' || github.event.action == 'reopened' || github.event.action == 'synchronize' }}

    steps:
+      # Checks out the repository to read files for matching with labeler config
      - uses: actions/checkout@v4
+
+      # Applies labels based on the .github/labeler.yml config
      - uses: actions/labeler@v5
        with:
          repo-token: "${{ secrets.GITHUB_TOKEN }}"

  label-size:
-    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: "Size label"
-    if: ${{ github.event.action == 'opened' || github.event.action == 'reopened' || github.event.action == 'synchronize' }}
+    name: "Size Label"
    runs-on: ubuntu-latest
+    if: ${{ github.event.action == 'opened' || github.event.action == 'reopened' || github.event.action == 'synchronize' }}

    steps:
-      - name: size-label
-        uses: "pascalgn/size-label-action@v0.5.5"
+      # Automatically adds size labels based on total changed lines
+      - name: Label by size
+        uses: pascalgn/size-label-action@v0.5.5
        env:
          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
        with:
@@ -58,3 +73,41 @@ jobs:
              "50": "medium",
              "250": "large"
            }
+
+  label-by-date:
+    name: "Date label (Quarters)"
+    runs-on: ubuntu-latest
+    if: ${{ github.event.action == 'opened' || github.event.action == 'reopened' || github.event.action == 'synchronize' }}
+
+    steps:
+      # Determines the label (02, 05, 08, 11) based on PR creation month
+      - name: Determine quarter label
+        env:
+          PR_CREATED_AT: ${{ github.event.pull_request.created_at }}
+        run: |
+          echo "PR created at: $PR_CREATED_AT"
+
+          # Extract the numeric month (e.g., 04 for April)
+          MONTH=$(date -d "$PR_CREATED_AT" +%m | sed 's/^0*//')
+          echo "Month extracted: $MONTH"
+
+          # Determine quarter-end label based on month
+          if [ "$MONTH" -le 2 ] || [ "$MONTH" -eq 12 ]; then
+            LABEL="02"
+          elif [ "$MONTH" -le 5 ]; then
+            LABEL="05"
+          elif [ "$MONTH" -le 8 ]; then
+            LABEL="08"
+          else
+            LABEL="11"
+          fi
+
+          # Set as environment variable for next step
+          echo "LABEL=${LABEL}" >> $GITHUB_ENV
+
+      # Adds the quarter label to the PR
+      - name: Add quarter label
+        uses: PauMAVA/add-remove-label-action@v1.0.3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          add: "${{ env.LABEL }}"
--- a/.github/workflows/pr-kernel-security-analysis.yml
+++ b/.github/workflows/pr-kernel-security-analysis.yml
@@ -34,7 +34,7 @@ jobs:

      - name: Get changed files
        id: changed-files
-        uses: tj-actions/changed-files@v45
+        uses: tj-actions/changed-files@d52d20fa3f981cb852b861fd8f55308b5fe29637 # v46.0.3

      - name: Checkout repository
        uses: actions/checkout@v4
--- a/.github/workflows/pr-label-on-approved.yml
+++ b/.github/workflows/pr-label-on-approved.yml
@@ -1,5 +1,11 @@
 on: pull_request_review
 name: Label approved pull requests
+
+permissions:
+  contents: read          # Required for checking changed files
+  pull-requests: write    # Required for labeling PRs
+  issues: write           # Required for adding/removing labels
+
 jobs:
  labelWhenApproved:
    if: ${{ github.repository_owner == 'armbian' }}
--- a/.github/workflows/pr-lint-scripts.yml
+++ b/.github/workflows/pr-lint-scripts.yml
@@ -30,7 +30,7 @@ jobs:

      - name: Get changed files
        id: changed-files
-        uses: tj-actions/changed-files@v45
+        uses: tj-actions/changed-files@d52d20fa3f981cb852b861fd8f55308b5fe29637 # v46.0.3

      - name: List all changed files
        run: |
--- a/.github/workflows/pr-welcome-first-time.yml
+++ b/.github/workflows/pr-welcome-first-time.yml
@@ -14,10 +14,13 @@ jobs:
      - uses: plbstl/first-contribution@v3
        with:
          pr-opened-msg: |
-            ### Hey @{fc-author} !
+            ### Hey @{fc-author}! 👋

-            Looks like it's your first pull reqests to Armbian codebase.
+            Thanks for submitting your first pull request to the Armbian project — we're excited to have you contributing! 🧡  
+            Your effort doesn’t just improve Armbian — it benefits the entire community of users and developers.

-            Welcome and thank you for contributing :heart: :heart: :heart:.
+            If you'd like to stay informed about project updates or collaborate more closely with the team,  
+            you can optionally share some personal contact preferences at [armbian.com/update-data](https://www.armbian.com/update-data/).  
+            This helps us keep in touch without relying solely on GitHub notifications.

-            Don't forget to star :star: the repo.
+            Also, don’t forget to ⭐ star the repo if you haven’t already — and welcome aboard! 🚀
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -33,7 +33,7 @@ jobs:
          persist-credentials: false

      - name: "Run analysis"
-        uses: ossf/scorecard-action@v2.4.1
+        uses: ossf/scorecard-action@v2.4.2
        with:
          results_file: results.sarif
          results_format: sarif
@@ -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@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: SARIF file
          path: results.sarif
--- a/README.md
+++ b/README.md
@@ -19,14 +19,14 @@

 ### Requirements for self hosted

- x86_64 / aarch64 machine
- at least 2GB of memory and ~35GB of disk space for VM, container or bare metal installation
- [Armbian / Ubuntu Jammy 22.04.x](https://github.com/armbian/sdk) for native building or any Docker capable Linux for containerised
- Windows 10/11 with WSL2 subsystem running Ubuntu Jammy 22.04.x
+- x86_64 / aarch64 / riscv64 machine
+- at least 8GB (less for non-[BTF](https://docs.kernel.org/bpf/btf.html) builds) of memory and ~50GB of disk space for VM, container, or bare-metal installation
+- **Armbian / Ubuntu Jammy 22.04.x** for native building or any Docker capable Linux for containerised
+- **Windows 10/11 with WSL2 subsystem** running Armbian / Ubuntu Jammy 22.04.x
 - Superuser rights (configured sudo or root access).
- Make sure your system is up-to-date! Outdated Docker binaries, for example, can cause trouble.
+- Make sure your system is up-to-date! Outdated Docker binaries, for example, can cause trouble

-For stable branch use `--branch=v24.11`
+For stable branch use `--branch=v25.05`

 ```bash
 apt-get -y install git
@@ -55,7 +55,7 @@ Build minimal CLI Armbian Jammy for Bananapi M5 with LTS kernel:
 ./compile.sh \
 BOARD=bananapim5 \
 BRANCH=current \
-RELEASE=jammy \
+RELEASE=noble \
 BUILD_MINIMAL=yes \
 BUILD_DESKTOP=no \
 KERNEL_CONFIGURE=no
@@ -69,12 +69,12 @@ on:
  workflow_dispatch:
 jobs:
  build-armbian:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm # use ubuntu-24.04 when building x86 or riscv64
    steps:
      - uses: armbian/build@main
        with:
          armbian_token:     "${{ secrets.GITHUB_TOKEN }}"  # GitHub token
-          armbian_release:   "jammy"                        # userspace
+          armbian_release:   "noble"                        # userspace
          armbian_target:    "build"                        # build=image, kernel=kernel
          armbian_board:     "bananapim5"                   # build target
 ```
@@ -184,10 +184,10 @@ Function | Armbian | Yocto | Buildroot |
 |       └── u-boot-family                For entire kernel family
 ├── tools                                Tools for dealing with kernel patches and configs
 └── userpatches                          User: configuration patching area
-    ├── lib.config                       User: framework common config/override file
-    ├── config-default.conf              User: default user config file
+    ├── config-example.conf              User: example user config file
    ├── customize-image.sh               User: script will execute just before closing the image
    ├── atf                              User: ARM trusted firmware
+    ├── extensions                       User: Extend build system with specific functionality
    ├── kernel                           User: Linux kernel per kernel family
    ├── misc                             User: various
    └── u-boot                           User: universal boot loader patches
--- a/2
+++ b/2
@@ -1 +1 @@
-25.05.0-trunk
+25.08.0-trunk
--- a/action.yml
+++ b/action.yml
@@ -147,7 +147,9 @@ runs:
        # copy os userpatches and custom
        mkdir -pv build/userpatches
        rsync -av os/userpatches/. build/userpatches/
-        [[ -d custom/userpatches ]] && rsync -av custom/userpatches/. build/userpatches/
+        if [[ -d custom/userpatches ]]; then
+          rsync -av custom/userpatches/. build/userpatches/
+        fi

    - shell: bash
      run: |
@@ -170,6 +172,10 @@ runs:
        # go to build folder
        cd build

+        # default build command below doesn't prepare host dependencies
+        sudo ./compile.sh requirements
+        sudo chown -R $USER:$USER .
+
        # execute build command
        ./compile.sh "${{ inputs.armbian_target }}" \
        REVISION="${{ env.ARMBIAN_VERSION }}" \
--- a/config/boards/ayn-odin2.csc
+++ b/config/boards/ayn-odin2.csc
@@ -1,35 +1,62 @@
-# Generate kernel and rootfs image for Qcom ABL Custom booting
+# Ayn Odin2 Configuration
 declare -g BOARD_NAME="Ayn Odin2"
 declare -g BOARD_MAINTAINER="FantasyGmm"
-declare -g BOARDFAMILY="qcom-abl"
-declare -g KERNEL_TARGET="sm8550"
-declare -g KERNELPATCHDIR="sm8550-6.7"
+declare -g BOARDFAMILY="sm8550"
+declare -g KERNEL_TARGET="current,edge"
+declare -g KERNEL_TEST_TARGET="edge"
 declare -g EXTRAWIFI="no"
 declare -g BOOTCONFIG="none"
 declare -g BOOTFS_TYPE="fat"
 declare -g BOOTSIZE="256"
-declare -g BOOTIMG_CMDLINE_EXTRA="clk_ignore_unused pd_ignore_unused panic=30 audit=0 allow_mismatched_32bit_el0 rw mem_sleep_default=s2idle"
 declare -g IMAGE_PARTITION_TABLE="gpt"
+declare -g BOOTIMG_CMDLINE_EXTRA="clk_ignore_unused pd_ignore_unused rw quiet rootwait"

 # Use the full firmware, complete linux-firmware plus Armbian's
 declare -g BOARD_FIRMWARE_INSTALL="-full"
-
 declare -g DESKTOP_AUTOLOGIN="yes"

-function post_family_config_branch_sm8550__edk2_kernel() {
-	declare -g KERNELSOURCE='https://github.com/edk2-porting/linux-next'
-	declare -g KERNEL_MAJOR_MINOR="6.7" # Major and minor versions of this kernel.
-	declare -g KERNELBRANCH="branch:ci/odin2/stable"
-	declare -g LINUXCONFIG="linux-${ARCH}-${BRANCH}" # for this board: linux-arm64-sm8550
-	display_alert "Setting up kernel ${KERNEL_MAJOR_MINOR} for" "${BOARD}" "info"
-}
-
 function ayn-odin2_is_userspace_supported() {
-	[[ "${RELEASE}" == "trixie" || "${RELEASE}" == "sid" || "${RELEASE}" == "mantic" || "${RELEASE}" == "noble" ]] && return 0
+	[[ "${RELEASE}" == "jammy" ]] && return 0
+	[[ "${RELEASE}" == "trixie" ]] && return 0
+	[[ "${RELEASE}" == "noble" ]] && return 0
 	return 1
 }

-function post_family_tweaks__enable_services() {
+function pre_customize_image__ayn-odin2_alsa_ucm_conf() {
+	if ! ayn-odin2_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 -o temp.zip "https://github.com/AYNTechnologies/alsa-ucm-conf/archive/refs/heads/ayn/v1.2.13.zip"
+		unzip -o temp.zip
+		unzip_dir=$(unzip -Z1 temp.zip | head -n1 | cut -d/ -f1)
+		cp -rf "${unzip_dir}/"* .
+		rm -rf "$unzip_dir" temp.zip
+	)
+}
+
+function post_family_tweaks_bsp__ayn-odin2_firmware() {
+	display_alert "Install firmwares for ${BOARD}" "${RELEASE}" "warn"
+
+	# USB Gadget Network service
+	mkdir -p $destination/usr/local/bin/
+	mkdir -p $destination/usr/lib/systemd/system/
+	mkdir -p $destination/etc/initramfs-tools/scripts/init-bottom/
+	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/
+	install -Dm655 $SRC/packages/bsp/usb-gadget-network/usb-gadget-initramfs-hook $destination/etc/initramfs-tools/hooks/usb-gadget
+	install -Dm655 $SRC/packages/bsp/usb-gadget-network/usb-gadget-initramfs-premount $destination/etc/initramfs-tools/scripts/init-premount/usb-gadget
+	install -Dm655 $SRC/packages/bsp/usb-gadget-network/dropbear $destination/etc/initramfs-tools/scripts/init-premount/
+	install -Dm655 $SRC/packages/bsp/usb-gadget-network/kill-dropbear $destination/etc/initramfs-tools/scripts/init-bottom/
+
+	return 0
+}
+
+function post_family_tweaks__ayn-odin2_enable_services() {
 	if ! ayn-odin2_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"
@@ -37,95 +64,47 @@ function post_family_tweaks__enable_services() {
 		return 0
 	fi

-	if [[ "${RELEASE}" == "noble" ]]; then
-		display_alert "Adding Mesa PPA For Ubuntu " "${BOARD}" "info"
-		do_with_retries 3 chroot_sdcard add-apt-repository ppa:oibaf/graphics-drivers --yes --no-update
+	if [[ "${RELEASE}" == "jammy" ]] || [[ "${RELEASE}" == "noble" ]]; then
+		display_alert "Adding Mesa PPA For Ubuntu ${BOARD}" "warn"
+		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.sources.disabled "${SDCARD}"/etc/apt/sources.list.d/armbian.sources

-	# Add Gamepad udev rule
-	echo 'SUBSYSTEM=="input", ATTRS{name}=="Ayn Odin2 Gamepad", MODE="0666", ENV{ID_INPUT_MOUSE}="0", ENV{ID_INPUT_JOYSTICK}="1"' > "${SDCARD}"/etc/udev/rules.d/99-ignore-gamepad.rules
-	# No driver support for suspend
-	chroot_sdcard systemctl mask suspend.target
-	# Add Bt Mac Fixed service
-	install -Dm655 $SRC/packages/bsp/ayn-odin2/bt-fixed-mac.sh "${SDCARD}"/usr/local/bin/
-	install -Dm644 $SRC/packages/bsp/ayn-odin2/bt-fixed-mac.service "${SDCARD}"/usr/lib/systemd/system/
-	chroot_sdcard systemctl enable bt-fixed-mac
-
 	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 unudhcpd mkbootimg git
-
-	# Disable armbian repo back
+		display_alert "Installing ${BOARD} tweaks" "warn"
+	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.sources "${SDCARD}"/etc/apt/sources.list.d/armbian.sources.disabled
 	do_with_retries 3 chroot_sdcard_apt_get_update
+	chroot_sdcard systemctl enable qbootctl.service

-	do_with_retries 3 chroot_sdcard_apt_get_install mesa-vulkan-drivers qbootctl qrtr-tools protection-domain-mapper tqftpserv
-
-	# Kernel postinst script to update abl boot partition
-	install -Dm655 $SRC/packages/bsp/ayn-odin2/zz-update-abl-kernel "${SDCARD}"/etc/kernel/postinst.d/
+	# Add Gamepad udev rule
+	echo 'SUBSYSTEM=="input", ATTRS{name}=="AYN Odin2 Gamepad", MODE="0666", ENV{ID_INPUT_JOYSTICK}="1"' > "${SDCARD}"/etc/udev/rules.d/99-ignore-gamepad.rules
+	# Not Any driver support suspend mode
+	chroot_sdcard systemctl mask suspend.target

+	chroot_sdcard systemctl enable usbgadget-rndis.service
 	cp $SRC/packages/bsp/ayn-odin2/LinuxLoader.cfg "${SDCARD}"/boot/

 	return 0
 }

-function post_family_tweaks__preset_configs() {
-	display_alert "$BOARD" "preset configs for rootfs" "info"
-	# Set PRESET_NET_CHANGE_DEFAULTS to 1 to apply any network related settings below
-	echo "PRESET_NET_CHANGE_DEFAULTS=1" > "${SDCARD}"/root/.not_logged_in_yet
-
-	# Enable WiFi or Ethernet.
-	#      NB: If both are enabled, WiFi will take priority and Ethernet will be disabled.
-	echo "PRESET_NET_ETHERNET_ENABLED=0" >> "${SDCARD}"/root/.not_logged_in_yet
-	echo "PRESET_NET_WIFI_ENABLED=1" >> "${SDCARD}"/root/.not_logged_in_yet
-
-	# Preset user default shell, you can choose bash or zsh
-	echo "PRESET_USER_SHELL=zsh" >> "${SDCARD}"/root/.not_logged_in_yet
-
-	# Set PRESET_CONNECT_WIRELESS=y if you want to connect wifi manually at first login
-	echo "PRESET_CONNECT_WIRELESS=n" >> "${SDCARD}"/root/.not_logged_in_yet
-
-	# Set SET_LANG_BASED_ON_LOCATION=n if you want to choose "Set user language based on your location?" with "n" at first login
-	echo "SET_LANG_BASED_ON_LOCATION=y" >> "${SDCARD}"/root/.not_logged_in_yet
-
-	# Preset default locale
-	echo "PRESET_LOCALE=en_US.UTF-8" >> "${SDCARD}"/root/.not_logged_in_yet
-
-	# Preset timezone
-	echo "PRESET_TIMEZONE=Etc/UTC" >> "${SDCARD}"/root/.not_logged_in_yet
-
-	# Preset root password
-	echo "PRESET_ROOT_PASSWORD=admin" >> "${SDCARD}"/root/.not_logged_in_yet
-
-	# Preset username
-	echo "PRESET_USER_NAME=odin" >> "${SDCARD}"/root/.not_logged_in_yet
-
-	# Preset user password
-	echo "PRESET_USER_PASSWORD=admin" >> "${SDCARD}"/root/.not_logged_in_yet
-
-	# Preset user default realname
-	echo "PRESET_DEFAULT_REALNAME=Odin" >> "${SDCARD}"/root/.not_logged_in_yet
-}
-
-function post_family_tweaks_bsp__firmware_in_initrd() {
-	random_mac=$(openssl rand -hex 6 | sed 's/\(..\)/\1:/g; s/.$//')
-	declare -g BOOTIMG_CMDLINE_EXTRA="${BOOTIMG_CMDLINE_EXTRA} bt_mac=${random_mac}"
-	display_alert "Generate a random Bluetooth MAC address, Mac:${random_mac}" "info"
-	display_alert "Adding to bsp-cli" "${BOARD}: firmware in initrd" "info"
+function post_family_tweaks_bsp__ayn-odin2_bsp_firmware_in_initrd() {
+	display_alert "Adding to bsp-cli" "${BOARD}: firmware in initrd" "warn"
 	declare file_added_to_bsp_destination # Will be filled in by add_file_from_stdin_to_bsp_destination
 	# Using odin2's firmware for now
 	add_file_from_stdin_to_bsp_destination "/etc/initramfs-tools/hooks/ayn-odin2-firmware" <<- 'FIRMWARE_HOOK'
 		#!/bin/bash
 		[[ "$1" == "prereqs" ]] && exit 0
 		. /usr/share/initramfs-tools/hook-functions
-		for f in /lib/firmware/qcom/sm8550/ayn/odin2/* ; do
+		for f in /lib/firmware/qcom/sm8550/ayn/odin2portal/* ; do
 			add_firmware "${f#/lib/firmware/}"
 		done
 		add_firmware "qcom/a740_sqe.fw" # Extra one for dpu
 		add_firmware "qcom/gmu_gen70200.bin" # Extra one for gpu
+		add_firmware "qcom/vpu/vpu30_p4.mbn" # Extra one for vpu
 		# Extra one for wifi
 		for f in /lib/firmware/ath12k/WCN7850/hw2.0/* ; do
 			add_firmware "${f#/lib/firmware/}"
--- a/config/boards/bananapim2plus.conf
+++ b/config/boards/bananapim2plus.conf
--- a/config/boards/bananapim4berry.conf
+++ b/config/boards/bananapim4berry.conf
@@ -0,0 +1,26 @@
+# Allwinner H618 quad core 2/4GB RAM 8GB eMMC SoC WiFi\Bt HDMI SPI USB-C
+BOARD_NAME="BananaPi M4 Berry"
+BOARDFAMILY="sun50iw9-bpi"
+BOARD_MAINTAINER="The-going"
+BOOTCONFIG="bananapi_m4_berry_defconfig"
+
+BOOTPATCHDIR="v2025-sunxi"
+BOOTBRANCH_BOARD="tag:v2025.04"
+
+OVERLAY_PREFIX="sun50i-h616"
+BOOT_FDT_FILE="sun50i-h618-bananapi-m4-berry.dtb"
+BOOT_LOGO="desktop"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
+
+PACKAGE_LIST_BOARD="rfkill bluetooth bluez bluez-tools hostapd"
+
+function post_family_tweaks_bsp__bananapi_module_conf() {
+
+	mkdir -p "${destination}"/etc/modprobe.d/
+	display_alert "$BOARD" "Configuring rtl8821cu wifi module" "info"
+
+	cp -f "${SRC}"/packages/bsp/wifi-rtl8821cu/etc/modprobe.d/8821cu.conf \
+			"${destination}"/etc/modprobe.d/8821cu.conf
+
+}
--- a/config/boards/bananapim4berry.wip
+++ b/config/boards/bananapim4berry.wip
@@ -1,26 +0,0 @@
-# Allwinner H618 quad core 2/4GB RAM 8GB eMMC SoC WiFi\Bt HDMI SPI USB-C
-BOARD_NAME="BananaPi M4 Berry"
-BOARDFAMILY="sun50iw9-bpi"
-BOARD_MAINTAINER="The-going"
-BOOTCONFIG="bananapi_m4_berry_defconfig"
-
-BOOTPATCHDIR="v2025.01/board_bananapim4berry"
-BOOTBRANCH_BOARD="tag:v2025.01"
-
-OVERLAY_PREFIX="sun50i-h616"
-BOOT_FDT_FILE="sun50i-h618-bananapi-m4-berry.dtb"
-BOOT_LOGO="desktop"
-KERNEL_TARGET="current,edge"
-KERNEL_TEST_TARGET="current"
-
-PACKAGE_LIST_BOARD="rfkill bluetooth bluez bluez-tools"
-
-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/bananapim7.conf
+++ b/config/boards/bananapim7.conf
@@ -1,3 +1,4 @@
+# Rockchip RK3588 octa core 8-32GB RAM SoC 2*2.5GBe eMMC USB3 NvME WIFI
 source "${SRC}/config/boards/armsom-sige7.csc"
 BOARD_NAME="Banana Pi M7"
 BOARD_MAINTAINER="amazingfate"
--- a/config/boards/beaglebone-ai64.conf
+++ b/config/boards/beaglebone-ai64.conf
@@ -16,3 +16,5 @@ KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
 SERIALCON="ttyS2"
 ATF_BOARD="generic"
+OPTEE_ARGS=""
+OPTEE_PLATFORM="k3-j721e"
--- a/config/boards/beagleplay.conf
+++ b/config/boards/beagleplay.conf
@@ -15,3 +15,5 @@ KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
 SERIALCON="ttyS2"
 ATF_BOARD="lite"
+OPTEE_ARGS="CFG_TEE_CORE_LOG_LEVEL=1"
+OPTEE_PLATFORM="k3-am62x"
--- a/config/boards/beagley-ai.csc
+++ b/config/boards/beagley-ai.csc
@@ -0,0 +1,32 @@
+#Texas Instruments AM67A quad core 4GB USB3 DDR4 4TOPS
+
+BOARD_NAME="BeagleY-AI"
+BOARDFAMILY="k3"
+BOARD_MAINTAINER="Grippy98"
+BOOTCONFIG="am67a_beagley_ai_a53_defconfig"
+BOOTFS_TYPE="fat"
+BOOT_FDT_FILE="k3-am67a-beagley-ai.dts"
+TIBOOT3_BOOTCONFIG="am67a_beagley_ai_r5_defconfig"
+TIBOOT3_FILE="tiboot3-j722s-hs-fs-evm.bin"
+DEFAULT_CONSOLE="serial"
+KERNEL_TARGET="current"
+KERNEL_TEST_TARGET="current"
+SERIALCON="ttyS2"
+ATF_BOARD="lite"
+OPTEE_ARGS=""
+OPTEE_PLATFORM="k3-am62x"
+
+# Use these branches until BeagleY-AI goes upstream
+function post_family_config_branch_current__beagley_ai_use_beagle_kernel_uboot() {
+	display_alert "$BOARD" " Beagleboard U-Boot and kernel overrides for $BOARD / $BRANCH" "info"
+
+	declare -g KERNELSOURCE="https://github.com/beagleboard/linux" # BeagleBoard kernel
+	declare -g KERNEL_MAJOR_MINOR="6.6"
+	declare -g KERNELBRANCH="branch:v6.6.58-ti-arm64-r21"
+	declare -g LINUXFAMILY="k3-beagle" # Separate kernel package from the regular `k3` family
+	declare -g LINUXCONFIG="linux-k3-${BRANCH}"
+
+	declare -g BOOTSOURCE="https://github.com/glneo/u-boot" # v2025.04-rc3 + BeagleY-AI support
+	declare -g BOOTBRANCH="branch:beagley-ai"
+	declare -g BOOTPATCHDIR="u-boot-beagle"
+}
--- a/config/boards/cainiao-cniot-core.csc
+++ b/config/boards/cainiao-cniot-core.csc
@@ -0,0 +1,107 @@
+# Amlogic A311D 2GB RAM 16GB eMMC GBE USB3 RTL8822CS WiFi/BT
+BOARD_NAME="CAINIAO CNIoT-CORE"
+BOARDFAMILY="meson-g12b"
+BOARD_MAINTAINER=""
+BOOTCONFIG="cainiao-cniot-core_defconfig"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
+MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost on the CAINIAO CNIoT-CORE
+FULL_DESKTOP="yes"
+SERIALCON="ttyAML0"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="amlogic/meson-g12b-a311d-cainiao-cniot-core.dtb"
+PACKAGE_LIST_BOARD="alsa-ucm-conf" # Contain ALSA UCM top-level configuration file
+
+BOOTBRANCH_BOARD="tag:v2025.04"
+BOOTPATCHDIR="v2025.04" # This has a patch that adds support for CAINIAO CNIoT-CORE.
+
+function post_family_config__use_repacked_fip() {
+	declare -g UBOOT_TARGET_MAP="u-boot.bin"
+	unset write_uboot_platform
+
+	function write_uboot_platform() {
+		dd if="$1/u-boot.bin" of="$2" bs=512 seek=1 conv=fsync 2>&1
+	}
+}
+
+function fetch_sources_tools__get_vendor_fip_and_gxlimg_source() {
+	fetch_from_repo "https://github.com/retro98boy/cainiao-cniot-core-linux.git" "cainiao-cniot-core-linux" "commit:30273c25aeabf75f609cff2c4fa7264335c295a8"
+	fetch_from_repo "https://github.com/repk/gxlimg.git" "gxlimg" "commit:0d0e5ba9cf396d1338067e8dc37a8bcd2e6874f1"
+}
+
+function build_host_tools__install_gxlimg() {
+	# Compile and install only if git commit hash changed
+	cd "${SRC}/cache/sources/gxlimg" || exit
+	# need to check if /usr/local/bin/gxlimg to detect new Docker containers with old cached sources
+	if [[ ! -f .commit_id || $(git rev-parse @ 2> /dev/null) != $(< .commit_id) || ! -f /usr/local/bin/gxlimg ]]; then
+		display_alert "Compiling" "gxlimg" "info"
+		run_host_command_logged make distclean
+		run_host_command_logged make
+		install -Dm0755 gxlimg /usr/local/bin/gxlimg
+		git rev-parse @ 2> /dev/null > .commit_id
+	fi
+}
+
+function post_uboot_custom_postprocess__repack_vendor_fip_with_mainline_uboot() {
+	display_alert "${BOARD}" "Repacking vendor FIP with mainline u-boot.bin" "info"
+
+	BLOBS_DIR="${SRC}/cache/sources/cainiao-cniot-core-linux"
+	EXTRACT_DIR="${BLOBS_DIR}/extract"
+	AML_ENCRYPT="${SRC}/cache/sources/amlogic-boot-fip/khadas-vim3/aml_encrypt_g12b"
+
+	if [ ! -f "$AML_ENCRYPT" ]; then
+		display_alert "${BOARD}" "amlogic-boot-fip/khadas-vim3/aml_encrypt_g12b not exist" "err"
+		exit 1
+	fi
+
+	mv u-boot.bin raw-u-boot.bin
+	rm -f "${EXTRACT_DIR}/bl33.enc"
+	# The current version of gxlimg has a problem with the handling of bl3x,
+	# which may cause the produced fip to fail to boot.
+	# see https://github.com/repk/gxlimg/issues/19
+	# run_host_command_logged gxlimg -t bl3x -s raw-u-boot.bin "${EXTRACT_DIR}/bl33.enc"
+	run_host_x86_binary_logged "$AML_ENCRYPT" --bl3sig \
+		--input raw-u-boot.bin \
+		--output "${EXTRACT_DIR}/bl33.enc" \
+		--level v3 --type bl33
+	run_host_command_logged gxlimg \
+		-t fip \
+		--bl2 "${EXTRACT_DIR}/bl2.sign" \
+		--ddrfw "${EXTRACT_DIR}/ddr4_1d.fw" \
+		--ddrfw "${EXTRACT_DIR}/ddr4_2d.fw" \
+		--ddrfw "${EXTRACT_DIR}/ddr3_1d.fw" \
+		--ddrfw "${EXTRACT_DIR}/piei.fw" \
+		--ddrfw "${EXTRACT_DIR}/lpddr4_1d.fw" \
+		--ddrfw "${EXTRACT_DIR}/lpddr4_2d.fw" \
+		--ddrfw "${EXTRACT_DIR}/diag_lpddr4.fw" \
+		--ddrfw "${EXTRACT_DIR}/aml_ddr.fw" \
+		--ddrfw "${EXTRACT_DIR}/lpddr3_1d.fw" \
+		--bl30 "${EXTRACT_DIR}/bl30.enc" \
+		--bl31 "${EXTRACT_DIR}/bl31.enc" \
+		--bl33 "${EXTRACT_DIR}/bl33.enc" \
+		--rev v3 u-boot.bin
+
+	if [ ! -s u-boot.bin ]; then
+		display_alert "${BOARD}" "FIP repack produced empty u-boot.bin" "err"
+		exit 1
+	fi
+}
+
+function post_family_tweaks_bsp__cainiao-cniot-core() {
+	display_alert "${BOARD}" "Installing ALSA UCM configuration files" "info"
+
+	# Use ALSA UCM via GUI: Install a desktop environment such as GNOME, PipeWire, and WirePlumber.
+
+	# Use ALSA UCM via CLI: alsactl init && alsaucm set _verb "HiFi" set _enadev "HDMI" set _enadev "Speaker"
+	# playback via HDMI: aplay -D plughw:cainiaocniotcor,0 /usr/share/sounds/alsa/Front_Center.wav
+	# playback via internal speaker: aplay -D plughw:cainiaocniotcor,1 /usr/share/sounds/alsa/Front_Center.wav
+
+	install -Dm644 "${SRC}/packages/bsp/cainiao-cniot-core/cainiao-cniot-core-HiFi.conf" "${destination}/usr/share/alsa/ucm2/Amlogic/axg-sound-card/cainiao-cniot-core-HiFi.conf"
+	install -Dm644 "${SRC}/packages/bsp/cainiao-cniot-core/cainiao-cniot-core.conf" "${destination}/usr/share/alsa/ucm2/Amlogic/axg-sound-card/cainiao-cniot-core.conf"
+
+	if [ ! -d "${destination}/usr/share/alsa/ucm2/conf.d/axg-sound-card" ]; then
+		mkdir -p "${destination}/usr/share/alsa/ucm2/conf.d/axg-sound-card"
+	fi
+	ln -sfv /usr/share/alsa/ucm2/Amlogic/axg-sound-card/cainiao-cniot-core.conf \
+		"${destination}/usr/share/alsa/ucm2/conf.d/axg-sound-card/cainiao-cniot-core.conf"
+}
--- a/config/boards/cherryba-m1.csc
+++ b/config/boards/cherryba-m1.csc
@@ -6,6 +6,6 @@ BOOT_LOGO="desktop"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current,edge" # in case different then kernel target
 FORCE_BOOTSCRIPT_UPDATE="yes"
-BOOTBRANCH_BOARD="tag:v2024.01"
-BOOTPATCHDIR="v2024.01"
+BOOTBRANCH_BOARD="tag:v2025.04"
+BOOTPATCHDIR="v2025.04"
 BOARD_MAINTAINER="IsMrX"
--- a/config/boards/coolpi-genbook.csc
+++ b/config/boards/coolpi-genbook.csc
@@ -5,7 +5,7 @@ BOARD_MAINTAINER="andyshrk"
 BOARD_FIRMWARE_INSTALL="-full"
 BOOT_SOC="rk3588"
 BOOTCONFIG="coolpi-cm5-genbook-rk3588_defconfig"
-KERNEL_TARGET="edge"
+KERNEL_TARGET="edge,vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-coolpi-cm5-genbook.dtb"
@@ -15,13 +15,13 @@ BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"

 # Mainline U-Boot
-function post_family_config_branch_edge__coolpi-genbook_use_mainline_uboot() {
+function post_family_config__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
 	declare -g BOOTPATCHDIR="v2025.01-rc3-coolpi-cm5"
-	declare -g BOOTBRANCH_BOARD="tag:v2025.01"
+	declare -g BOOTBRANCH_BOARD="tag:v2025.04"
 	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/firefly-itx-3588j.csc
+++ b/config/boards/firefly-itx-3588j.csc
@@ -1,14 +1,15 @@
 # Rockchip RK3588j Octa core 4GB-32GB eMMC GBE HDMI HDMI-IN PCIe SATA USB3 WiFi 4G 5G
 BOARD_NAME="Firefly ITX-3588J"
 BOARDFAMILY="rockchip-rk3588"
-BOOT_SOC="rk3588"
 BOARD_MAINTAINER="SeeleVolleri"
+BOOTCONFIG="rock-5b-rk3588_defconfig"
 KERNEL_TARGET="vendor"
-BOOTCONFIG="rk3588_defconfig"
 BOOT_FDT_FILE="rockchip/rk3588-firefly-itx-3588j.dtb"
-BOOT_LOGO="desktop"
 FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_SCENARIO="spl-blobs"
 IMAGE_PARTITION_TABLE="gpt"
+declare -g UEFI_EDK2_BOARD_ID="firefly-itx-3588j" # This _only_ used for uefi-edk2-rk3588 extension

 function post_family_tweaks_bsp__firefly_itx_3588j() {
 	display_alert "$BOARD" "Installing rk3588-bluetooth.service" "info"
--- 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:v2025.01"
-BOOTPATCHDIR="v2025.01"
+BOOTBRANCH_BOARD="tag:v2024.10"
+BOOTPATCHDIR="v2024.10"
 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/helios4.conf
+++ b/config/boards/helios4.conf
@@ -0,0 +1,17 @@
+# Marvell Armada 388 2GB ECC RAM SoC 4xSATA 2xUSB3.0 GBE SPI
+BOARD_NAME="Helios4"
+BOARDFAMILY="mvebu"
+BOARD_MAINTAINER="Heisath"
+BOOTCONFIG="helios4_defconfig"
+BOOTCONFIG_NEXT="helios4_defconfig"
+MODULES_LEGACY="marvell_cesa lm75"
+MODULES_CURRENT="marvell_cesa lm75"
+HAS_VIDEO_OUTPUT="no"
+FORCE_BOOTSCRIPT_UPDATE="yes"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
+
+function post_family_config__helios4_extra_packages() {
+	add_packages_to_image "fancontrol"
+	add_packages_to_image "ethtool"
+}
--- a/config/boards/helios4.csc
+++ b/config/boards/helios4.csc
@@ -1,12 +0,0 @@
-# Marvell Armada 388 2GB ECC RAM SoC 4xSATA 2xUSB3.0 GBE SPI
-BOARD_NAME="Helios4"
-BOARDFAMILY="mvebu"
-BOARD_MAINTAINER="Heisath"
-BOOTCONFIG="helios4_defconfig"
-BOOTCONFIG_NEXT="helios4_defconfig"
-MODULES_LEGACY="marvell_cesa lm75"
-MODULES_CURRENT="marvell_cesa lm75"
-HAS_VIDEO_OUTPUT="no"
-FORCE_BOOTSCRIPT_UPDATE="yes"
-KERNEL_TARGET="current,edge"
-KERNEL_TEST_TARGET="current"
--- a/config/boards/imb3588.conf
+++ b/config/boards/imb3588.conf
@@ -0,0 +1,14 @@
+# Rockchip RK3588 SoC with 4/8/16GB RAM, 16GBB/32GB/64GB/128GB EMMC, m.2 SATA, USB3, USB2, 2xGbE, WIFI6, BT5.1, LCDS, MIPI, eDP, HDMI
+BOARD_NAME="IMB3588"
+BOARDFAMILY="rockchip-rk3588"
+BOARD_MAINTAINER="JackHuang021"
+BOOTCONFIG="imb3588_defconfig"
+BOOT_SOC="rk3588"
+KERNEL_TARGET="vendor"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3588-yx-imb3588.dtb"
+BOOT_SCENARIO="spl-blobs"
+BOOT_SUPPORT_SPI="yes"
+BOOT_SPI_RKSPI_LOADER="yes"
+IMAGE_PARTITION_TABLE="gpt"
--- a/config/boards/khadas-edge2.conf
+++ b/config/boards/khadas-edge2.conf
@@ -33,7 +33,7 @@ function post_family_config__uboot_kedge2() {
 	display_alert "$BOARD" "Configuring ($BOARD) u-boot" "info"

 	declare -g BOOTSOURCE='https://github.com/khadas/u-boot.git'
-	declare -g BOOTBRANCH='branch:khadas-edges-v2017.09'
+	declare -g BOOTBRANCH="commit:df276095a29a02f8e7ce4f451770c06486106594"
 	declare -g BOOTPATCHDIR="legacy/u-boot-khadas-edge2-rk3588"
 	declare -g BOOTCONFIG="khadas-edge2-rk3588s_defconfig"
 	declare -g SRC_EXTLINUX="yes" # For now, use extlinux. Thanks Monka
--- a/config/boards/khadas-vim3.conf
+++ b/config/boards/khadas-vim3.conf
@@ -12,8 +12,8 @@ BOOT_LOGO="desktop"
 BOOT_FDT_FILE="amlogic/meson-g12b-a311d-khadas-vim3.dtb" # there is also a s922x dtb, but vim3 is a311d only
 ASOUND_STATE="asound.state.khadas-vim3"

-BOOTBRANCH_BOARD="tag:v2024.01"
-BOOTPATCHDIR="v2024.01" # this has 'board_khadas-vim3' which has a patch to boot USB/NVMe/SCSI first
+BOOTBRANCH_BOARD="tag:v2025.04"
+BOOTPATCHDIR="v2025.04" # this has 'board_khadas-vim3' which has a patch to boot USB/NVMe/SCSI first

 declare -g KHADAS_OOWOW_BOARD_ID="VIM3" # for use with EXT=output-image-oowow

@@ -53,6 +53,12 @@ function post_config_uboot_target__extra_configs_for_khadas_vim3() {
 	display_alert "u-boot for ${BOARD}" "u-boot: enable gpio LED support" "info"
 	run_host_command_logged scripts/config --enable CONFIG_LED
 	run_host_command_logged scripts/config --enable CONFIG_LED_GPIO
+	display_alert "u-boot for ${BOARD}" "u-boot: enable more cmdline commands" "info" # for extra compat with eg HAOS
+	run_host_command_logged scripts/config --enable CONFIG_CMD_SQUASHFS
+	run_host_command_logged scripts/config --enable CONFIG_CMD_SETEXPR
+	run_host_command_logged scripts/config --enable CONFIG_CMD_FILEENV # added via cmd-fileenv-read-string-from-file-into-env.patch
+	run_host_command_logged scripts/config --enable CONFIG_CMD_CAT
+	run_host_command_logged scripts/config --enable CONFIG_CMD_XXD
 	display_alert "u-boot for ${BOARD}" "u-boot: enable networking cmds" "info"
 	run_host_command_logged scripts/config --enable CONFIG_CMD_NFS
 	run_host_command_logged scripts/config --enable CONFIG_CMD_WGET
--- a/config/boards/lubancat2.csc
+++ b/config/boards/lubancat2.csc
@@ -16,8 +16,8 @@ function post_family_config_branch_edge__lubancat_2_use_mainline_uboot() {
 	display_alert "$BOARD" "Using mainline U-Boot for $BOARD / $BRANCH" "info"

 	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:v2025.04"
+	declare -g BOOTPATCHDIR="v2025.04"
 	# 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/mekotronics-r58-minipc.conf
+++ b/config/boards/mekotronics-r58-minipc.conf
--- a/config/boards/mekotronics-r58x.conf
+++ b/config/boards/mekotronics-r58x.conf
--- a/config/boards/mixtile-blade3.csc
+++ b/config/boards/mixtile-blade3.csc
@@ -12,8 +12,13 @@ declare -g UEFI_EDK2_BOARD_ID="blade3" # This _only_ used for uefi-edk2-rk3588 e

 # Vendor u-boot; use the default family (rockchip-rk3588) u-boot. See config/sources/families/rockchip-rk3588.conf
 function post_family_config__vendor_uboot_mekotronics() {
-	display_alert "$BOARD" "Configuring $BOARD vendor u-boot" "info"
+	display_alert "$BOARD" "Configuring $BOARD vendor u-boot (using Radxa's older next-dev-v2024.03)" "info"
 	declare -g BOOTDELAY=1 # build injects this into u-boot config. we can then get into UMS mode and avoid the whole rockusb/rkdeveloptool thing
+
+	# Override the stuff from rockchip-rk3588 family; Meko's have a patch for stable MAC address that breaks with Radxa's next-dev-v2024.10+
+	declare -g BOOTSOURCE='https://github.com/radxa/u-boot.git'
+	declare -g BOOTBRANCH='branch:next-dev-v2024.03' # NOT next-dev-v2024.10
+	declare -g BOOTPATCHDIR="legacy/u-boot-radxa-rk35xx"
 }

 function post_family_config_branch_edge__different_dtb_for_edge() {
--- a/config/boards/mksklipad50.conf
+++ b/config/boards/mksklipad50.conf
@@ -10,3 +10,10 @@ BOOT_LOGO="desktop"
 MODULES="pinctrl-rk805 ads7846 spidev"
 BOOTFS_TYPE="fat"
 PACKAGE_LIST_BOARD="build-essential usb-modeswitch"
+
+BOOTBRANCH='tag:v2025.01'
+BOOTPATCHDIR='v2025.01'
+
+function post_family_config__uboot_config() {
+        BOOTDELAY=1 # Wait for UART
+}
--- a/config/boards/nanopct6-lts.conf
+++ b/config/boards/nanopct6-lts.conf
@@ -7,3 +7,4 @@ 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="current,edge,vendor"
 KERNEL_TEST_TARGET="vendor,current"
+declare -g GRUB_FDT_FILE="${BOOT_FDT_FILE}" # u-boot autodetects, but grub needs to know; store it here so we can unset later
--- a/config/boards/nanopct6.conf
+++ b/config/boards/nanopct6.conf
@@ -13,7 +13,8 @@ BOOT_SCENARIO="spl-blobs"
 BOOT_SUPPORT_SPI="yes"
 BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
-declare -g UEFI_EDK2_BOARD_ID="nanopc-t6" # This _only_ used for uefi-edk2-rk3588 extension
+declare -g UEFI_EDK2_BOARD_ID="nanopc-t6"   # This _only_ used for uefi-edk2-rk3588 extension
+declare -g GRUB_FDT_FILE="${BOOT_FDT_FILE}" # u-boot autodetects, but grub needs to know; store it here so we can unset later

 function post_family_tweaks__nanopct6_naming_audios() {
 	display_alert "$BOARD" "Renaming nanopct6 audio" "info"
@@ -29,16 +30,22 @@ function post_family_tweaks__nanopct6_naming_audios() {
 }

 # 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"
+function post_family_config__nanopct6_use_mainline_uboot() {
+	[[ "${BRANCH}" == "vendor" ]] && return 0 # Not for 'vendor' branch, which uses 2017.09 vendor u-boot from Radxa
+
+	display_alert "$BOARD" "u-boot overrides for $BOARD / $BRANCH" "info"
+
+	# To reuse ATF code in rockchip64_common, let's change the BOOT_SCENARIO and call prepare_boot_configuration() again
+	BOOT_SCENARIO="tpl-blob-atf-mainline"
+	prepare_boot_configuration

 	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/u-boot/u-boot.git" # We ❤️ Mainline
-	declare -g BOOTBRANCH="tag:v2025.04-rc1"
+	declare -g BOOTBRANCH="tag:v2025.04"
 	declare -g BOOTPATCHDIR="v2025.04"
 	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"
+	declare -g UBOOT_TARGET_MAP="BL31=bl31.elf 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
@@ -54,12 +61,13 @@ function post_family_config_branch_edge__nanopct6_use_mainline_uboot() {
 # U-boot 2025.04+ can detect and set fdtfile automatically across T6 and T6-LTS boards.
 # So if using mainline u-boot, unset BOOT_FDT_FILE to let u-boot handle it.
 # That way, both variants can boot from the same image; lets keep the -lts board file for vendor kernel/u-boot.
-function post_family_config_branch_edge__t6_and_t6_lts_auto_dtb_name_via_uboot_detection() {
+function post_family_config__t6_and_t6_lts_auto_dtb_name_via_uboot_detection() {
+	[[ "${BRANCH}" == "vendor" ]] && return 0 # Not for 'vendor' branch, which uses 2017.09 vendor u-boot from Radxa
 	unset BOOT_FDT_FILE
 }

 function pre_config_uboot_target__nanoptc6_patch_uboot_dtsi_for_ums() {
-	[[ "${BRANCH}" != "edge" ]] && return 0
+	[[ "${BRANCH}" == "vendor" ]] && return 0 # Not for 'vendor' branch, which uses 2017.09 vendor u-boot from Radxa

 	display_alert "u-boot for ${BOARD}" "u-boot: add to u-boot dtsi for UMS" "info" # avoid a patch, just append to the dtsi file
 	cat <<- EOD >> arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi                        # Append to the t6 u-boot dtsi file with stuff for enabling gadget/otg/peripheral mode
@@ -68,6 +76,9 @@ function pre_config_uboot_target__nanoptc6_patch_uboot_dtsi_for_ums() {
 		&usbdp_phy0 { status = "okay"; };
 		&usb_host0_xhci { dr_mode = "peripheral";  maximum-speed = "high-speed";  status = "okay"; };
 	EOD
+	# Append to the t6 u-boot dtsi file with stuff for enabling gadget/otg/peripheral mode
+	# Append to the t6 u-boot dtsi file with stuff for enabling gadget/otg/peripheral mode
+	# Append to the t6 u-boot dtsi file with stuff for enabling gadget/otg/peripheral mode

 }

@@ -84,7 +95,7 @@ function pre_config_uboot_target__nanopct6_patch_rockchip_common_boot_order() {
 }

 function post_config_uboot_target__extra_configs_for_nanopct6_mainline_environment_in_spi() {
-	[[ "${BRANCH}" != "edge" ]] && return 0
+	[[ "${BRANCH}" == "vendor" ]] && return 0 # Not for 'vendor' branch, which uses 2017.09 vendor u-boot from Radxa

 	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable board-specific configs (env in SPI)" "info"
 	run_host_command_logged scripts/config --enable CONFIG_DM_PMIC_FAN53555
@@ -133,7 +144,7 @@ function post_config_uboot_target__extra_configs_for_nanopct6_mainline_environme
 # Include fw_setenv, configured to point to the correct spot on the SPI Flash
 PACKAGE_LIST_BOARD="libubootenv-tool" # libubootenv-tool provides fw_printenv and fw_setenv, for talking to U-Boot environment
 function post_family_tweaks__config_nanopct6_fwenv() {
-	[[ "${BRANCH}" != "edge" ]] && return 0
+	[[ "${BRANCH}" == "vendor" ]] && return 0 # Not for 'vendor' branch, which uses 2017.09 vendor u-boot from Radxa
 	display_alert "Configuring fw_printenv and fw_setenv" "for ${BOARD} and u-boot ${BOOTBRANCH}" "info"
 	# Addresses below come from CONFIG_ENV_OFFSET and CONFIG_ENV_SIZE in defconfig
 	cat <<- 'FW_ENV_CONFIG' > "${SDCARD}"/etc/fw_env.config
--- a/config/boards/nanopi-r2s-plus.csc
+++ b/config/boards/nanopi-r2s-plus.csc
@@ -0,0 +1,15 @@
+# Rockchip RK3328 quad core 1GB 2 x GBE USB2
+BOARD_NAME="Nanopi R2S Plus"
+BOARDFAMILY="rockchip64"
+BOARD_MAINTAINER=""
+BOOTBRANCH="tag:v2025.01"
+BOOTPATCHDIR="v2025.01"
+BOOTCONFIG="nanopi-r2s-plus-rk3328_defconfig"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
+DEFAULT_CONSOLE="serial"
+MODULES="g_serial"
+MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu"
+SERIALCON="ttyS2:1500000,ttyGS0"
+HAS_VIDEO_OUTPUT="no"
+BOOT_FDT_FILE="rockchip/rk3328-nanopi-r2s-plus-rev00.dtb"
--- a/config/boards/nanopi-r3s-lts.conf
+++ b/config/boards/nanopi-r3s-lts.conf
@@ -0,0 +1,30 @@
+# Rockchip RK3566 quad core 2GB RAM eMMC 2x GbE USB3 HDMI
+BOARD_NAME="NanoPi R3S LTS"
+BOARDFAMILY="rk35xx"
+BOARD_MAINTAINER="pyavitz"
+BOOTCONFIG="nanopi-r3s-lts-rk3566_defconfig"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current,edge"
+BOOT_FDT_FILE="rockchip/rk3566-nanopi-r3s-lts.dtb"
+IMAGE_PARTITION_TABLE="gpt"
+BOOT_SCENARIO="spl-blobs"
+
+
+function post_family_config__use_mainline_uboot() {
+	if [[ "$BRANCH" != "current" && "$BRANCH" != "edge" ]]; then
+    	return 0
+	fi
+	unset BOOTFS_TYPE   # mainline u-boot can boot ext4 directly
+	BOOTCONFIG="nanopi-r3s-lts-rk3566_defconfig"
+	BOOTSOURCE="https://github.com/u-boot/u-boot"
+	BOOTBRANCH="tag:v2025.04"
+	BOOTPATCHDIR="v2025.04"
+
+	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/nanopi-r3s.csc
+++ b/config/boards/nanopi-r3s.csc
@@ -11,37 +11,16 @@ IMAGE_PARTITION_TABLE="gpt"
 BOOT_SCENARIO="spl-blobs"


-function post_family_config_branch_edge__use_mainline_dtb_name() {
+function post_family_config__use_mainline_uboot() {
+	if [[ "$BRANCH" != "current" && "$BRANCH" != "edge" ]]; then
+    	return 0
+	fi
 	unset BOOT_FDT_FILE # boot.scr will use whatever u-boot detects and sets 'fdtfile' to
 	unset BOOTFS_TYPE   # mainline u-boot can boot ext4 directly
-}
-
-function post_family_config_branch_current__use_mainline_dtb_name() {
-	unset BOOT_FDT_FILE # boot.scr will use whatever u-boot detects and sets 'fdtfile' to
-	unset BOOTFS_TYPE   # mainline u-boot can boot ext4 directly
-}
-
-
-function post_family_config_branch_current__nanopi-r3s_use_mainline_uboot() {
 	BOOTCONFIG="nanopi-r3s-rk3566_defconfig"
 	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"
-
-	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
-	}
-}
-
-function post_family_config_branch_edge__nanopi-r3s_use_mainline_uboot() {
-	BOOTCONFIG="nanopi-r3s-rk3566_defconfig"
-	BOOTSOURCE="https://github.com/u-boot/u-boot"
-	BOOTBRANCH="tag:v2025.01"
-	BOOTPATCHDIR="v2025.01"
+	BOOTBRANCH="tag:v2025.04"
+	BOOTPATCHDIR="v2025.04"

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

--- a/config/boards/nanopi-r4s.conf
+++ b/config/boards/nanopi-r4s.conf
@@ -1,12 +0,0 @@
-# Rockchip RK3399 hexa core 1GB/4GB RAM SoC 2 x GBE USB3 USB-C
-BOARD_NAME="NanoPi R4S"
-BOARDFAMILY="rockchip64" # Used to be rk3399
-BOARD_MAINTAINER="Manouchehri"
-BOOTCONFIG="nanopi-r4s-rk3399_defconfig"
-KERNEL_TARGET="current,edge"
-KERNEL_TEST_TARGET="current"
-DEFAULT_CONSOLE="serial"
-MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu panfrost"
-HAS_VIDEO_OUTPUT="no"
-BOOTBRANCH_BOARD="tag:v2022.04"
-BOOTPATCHDIR="u-boot-rockchip64-v2022.04"
--- a/config/boards/nanopi-r4s.csc
+++ b/config/boards/nanopi-r4s.csc
@@ -0,0 +1,12 @@
+# Rockchip RK3399 hexa core 1GB/4GB RAM SoC 2 x GBE USB3 USB-C
+BOARD_NAME="NanoPi R4S"
+BOARDFAMILY="rockchip64" # Used to be rk3399
+BOARD_MAINTAINER=""
+BOOTCONFIG="nanopi-r4s-rk3399_defconfig"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
+DEFAULT_CONSOLE="serial"
+MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu panfrost"
+HAS_VIDEO_OUTPUT="no"
+BOOTBRANCH_BOARD="tag:v2022.04"
+BOOTPATCHDIR="u-boot-rockchip64-v2022.04"
--- a/config/boards/odroidhc4.conf
+++ b/config/boards/odroidhc4.conf
@@ -2,7 +2,7 @@
 BOARD_NAME="Odroid HC4"
 BOARDFAMILY="meson-sm1"
 BOARD_MAINTAINER="igorpecovnik"
-BOOTCONFIG="odroid-c4_defconfig" # for the SD card; but also 'odroid-hc4_defconfig', see below at pre_config_uboot_target
+BOOTCONFIG="odroid-hc4_defconfig"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
 MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost
@@ -12,8 +12,8 @@ BOOT_FDT_FILE="amlogic/meson-sm1-odroid-hc4.dtb"
 PACKAGE_LIST_BOARD="lm-sensors fancontrol" # SPI, sensors, manual fan control via 'pwmconfig'

 # Newer u-boot for the HC4. There's patches in `board_odroidhc4` for the defconfigs used in the UBOOT_TARGET_MAP below.
-BOOTBRANCH_BOARD="tag:v2024.04"
-BOOTPATCHDIR="v2024.04"
+BOOTBRANCH_BOARD="tag:v2025.04"
+BOOTPATCHDIR="v2025.04"

 # We build u-boot twice: C4 config for SD cards, and HC4 (with SATA/PCI/SPI) config for SPI.
 UBOOT_TARGET_MAP="
@@ -39,22 +39,6 @@ function post_uboot_custom_postprocess__odroid_hc4_uboot() {
 	uboot_g12_postprocess "${SRC}"/cache/sources/amlogic-boot-fip/odroid-hc4 g12a
 }

-# switch defconfig according to target, so we can still use the same post_config_uboot_target for both.
-function pre_config_uboot_target__odroidhc4_defconfig_per_target() {
-	case "${target_make}" in
-		"armbian_target=spi "*)
-			BOOTCONFIG="odroid-hc4_defconfig"
-			;;
-		"armbian_target=sd "*)
-			BOOTCONFIG="odroid-c4_defconfig"
-			;;
-		*)
-			exit_with_error "Unknown target_make: '${target_make}', unknown BOOTCONFIG."
-			;;
-	esac
-	display_alert "setting BOOTCONFIG for target" "${target_make}: '${BOOTCONFIG}'" "info"
-}
-
 # Enable extra u-boot .config options, this way we avoid patching defconfig
 function post_config_uboot_target__extra_configs_for_odroid_hc4() {
 	display_alert "u-boot for ${BOARD}" "u-boot: enable preboot & pci+usb start in preboot" "info"
--- a/config/boards/odroidm2.csc
+++ b/config/boards/odroidm2.csc
@@ -10,9 +10,9 @@ IMAGE_PARTITION_TABLE="gpt"
 FULL_DESKTOP="no"
 BOOT_LOGO="yes"

-BOOTBRANCH_BOARD="tag:v2025.04-rc2"
+BOOTBRANCH_BOARD="tag:v2025.04-rc5"
 BOOTBRANCH="${BOOTBRANCH_BOARD}"
-BOOTPATCHDIR="v2025.04-rc2"
+BOOTPATCHDIR="v2025.04"

 BOOTCONFIG="odroid-m2-rk3588s_defconfig"
 BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
--- a/config/boards/orangepi4-lts.conf
+++ b/config/boards/orangepi4-lts.conf
@@ -13,8 +13,8 @@ MODULES_EDGE="sprdbt_tty sprdwl_ng"
 FULL_DESKTOP="yes"
 ASOUND_STATE="asound.state.rk3399"
 BOOT_LOGO="desktop"
-BOOTBRANCH_BOARD="tag:v2024.10"
-BOOTPATCHDIR="v2024.10"
+BOOTBRANCH_BOARD="tag:v2025.01"
+BOOTPATCHDIR="v2025.01"
 BOOT_SCENARIO="binman"

 function post_family_tweaks_bsp__OPi4lts() {
--- a/config/boards/orangepi5-max.csc
+++ b/config/boards/orangepi5-max.csc
@@ -5,7 +5,7 @@ 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,current,edge"
-KERNEL_TEST_TARGET="vendor,current,edge"
+KERNEL_TEST_TARGET="vendor,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-orangepi-5-max.dtb"
@@ -16,6 +16,29 @@ IMAGE_PARTITION_TABLE="gpt"
 enable_extension "bcmdhd"
 BCMDHD_TYPE="sdio"

+# Mainline U-Boot for edge kernel
+function post_family_config_branch_edge__orangepi5max_use_mainline_uboot() {
+	display_alert "$BOARD" "Mainline U-Boot overrides for $BOARD - $BRANCH" "info"
+	unset BOOT_FDT_FILE                                          # boot.scr will use whatever u-boot detects and sets 'fdtfile' to
+	declare -g BOOTCONFIG="orangepi-5-max-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 U-Boot
+	declare -g BOOTBRANCH="tag:v2025.04"
+	declare -g BOOTPATCHDIR="v2025.04"
+	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_family_tweaks__orangepi5max_naming_audios() {
 	display_alert "$BOARD" "Renaming orangepi5max audios" "info"

--- a/config/boards/orangepi5-ultra.csc
+++ b/config/boards/orangepi5-ultra.csc
@@ -1,4 +1,4 @@
-# Rockchip RK3588 octa core whatever fixme
+# Rockchip RK3588 octa core 4/8/16GB RAM SoC SPI NVMe 2x USB2 2x USB3 HDMI HDMI-in
 BOARD_NAME="Orange Pi 5 Ultra"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER=""
@@ -16,15 +16,6 @@ IMAGE_PARTITION_TABLE="gpt"
 #enable_extension "bcmdhd"
 BCMDHD_TYPE="sdio"

-# for testing purpose only. needs adaption to mainline once this makes it into 6.15 or .16
-function post_family_config_branch_edge__orangepi5-ultra_use_custom_source() {
-	KERNEL_MAJOR_MINOR="6.14"   # Major and minor versions of this kernel.
-	KERNELSOURCE='https://github.com/jimmyhon/linux.git'
-	KERNELBRANCH='branch:integrate-6.15'
-	KERNELPATCHDIR='integrate-6.15'
-	EXTRAWIFI=no # due to absence of our own fixups 3rd party wifi drivers break
-}
-
 function post_family_tweaks__orangepi5ultra_naming_audios() {
 	display_alert "$BOARD" "Renaming orangepi5ultra audios" "info"

--- a/config/boards/orangepi5b.csc
+++ b/config/boards/orangepi5b.csc
@@ -0,0 +1,57 @@
+# Rockchip RK3588S octa core 4/8/16GB RAM SoC eMMC USB3 USB-C GbE
+BOARD_NAME="Orange Pi 5B"
+BOARDFAMILY="rockchip-rk3588"
+BOARD_MAINTAINER=""
+BOOTCONFIG="orangepi-5b-rk3588s_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
+BOOT_SOC="rk3588"
+KERNEL_TARGET="edge,vendor"
+KERNEL_TEST_TARGET="vendor,edge"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3588s-orangepi-5b.dtb"
+BOOT_SCENARIO="spl-blobs"
+IMAGE_PARTITION_TABLE="gpt"
+
+declare -g BLUETOOTH_HCIATTACH_PARAMS="-s 115200 /dev/ttyS9 bcm43xx 1500000" # For the bluetooth-hciattach extension
+enable_extension "bluetooth-hciattach"                                       # Enable the bluetooth-hciattach extension
+
+function post_family_tweaks_bsp__orangepi5b_copy_usb2_service() {
+	if [[ $BRANCH == "edge" || $BRANCH == "current" ]]; then
+		return
+	fi
+
+	display_alert "Installing BSP firmware and fixups"
+
+	# Add USB2 init service. Otherwise, USB2 and TYPE-C won't work by default
+	cp $SRC/packages/bsp/orangepi5/orangepi5-usb2-init.service $destination/lib/systemd/system/
+
+	return 0
+}
+
+function post_family_tweaks__orangepi5b_enable_usb2_service() {
+	if [[ $BRANCH == "edge" || $BRANCH == "current" ]]; then
+		return
+	fi
+
+	display_alert "$BOARD" "Installing board tweaks" "info"
+
+	# enable usb2 init service
+	chroot $SDCARD /bin/bash -c "systemctl --no-reload enable orangepi5-usb2-init.service >/dev/null 2>&1"
+
+	return 0
+}
+
+function post_family_tweaks__orangepi5b_naming_audios() {
+	if [[ $BRANCH == "edge" || $BRANCH == "current" ]]; then
+		return
+	fi
+
+	display_alert "$BOARD" "Renaming orangepi5b audios" "info"
+
+	mkdir -p $SDCARD/etc/udev/rules.d/
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi0-sound", ENV{SOUND_DESCRIPTION}="HDMI0 Audio"' > $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-dp0-sound", ENV{SOUND_DESCRIPTION}="DP0 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-es8388-sound", ENV{SOUND_DESCRIPTION}="ES8388 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+
+	return 0
+}
--- a/config/boards/orangepi5pro.csc
+++ b/config/boards/orangepi5pro.csc
@@ -53,5 +53,5 @@ function post_uboot_custom_postprocess__create_sata_spi_image() {
 function post_family_config__orangepi5pro_use_vendor_uboot() {
 	BOOTSOURCE='https://github.com/orangepi-xunlong/u-boot-orangepi.git'
 	BOOTBRANCH='branch:v2017.09-rk3588'
-	BOOTPATCHDIR="legacy/u-boot-orangepi5-rk3588"
+	BOOTPATCHDIR="legacy"
 }
--- a/config/boards/pocketbeagle2.conf
+++ b/config/boards/pocketbeagle2.conf
@@ -0,0 +1,31 @@
+#Texas Instruments AM62 dual core 1GB USB2 DDR4
+
+BOARD_NAME="PocketBeagle 2"
+BOARDFAMILY="k3"
+BOARD_MAINTAINER="Grippy98"
+BOOTCONFIG="am6232_pocketbeagle2_a53_defconfig"
+BOOTFS_TYPE="fat"
+TIBOOT3_BOOTCONFIG="am6232_pocketbeagle2_r5_defconfig"
+TIBOOT3_FILE="tiboot3-am62x-hs-fs-evm.bin"
+DEFAULT_CONSOLE="serial"
+KERNEL_TARGET="edge"
+KERNEL_TEST_TARGET="edge"
+SERIALCON="ttyS2"
+ATF_BOARD="lite"
+SRC_EXTLINUX="yes"
+SRC_CMDLINE="root=/dev/mmcblk1p2 rootwait console=ttyS2,115200n8"
+BOOT_FDT_FILE="ti/k3-am6232-pocketbeagle2.dtb"
+OPTEE_PLATFORM="k3-am62x"
+
+#Until PB2 goes upstream, use this branch
+function post_family_config_branch_edge__pocketbeagle2_use_beagle_kernel_uboot() {
+	display_alert "$BOARD" " beagleboard (next branch) u-boot and kernel overrides for $BOARD / $BRANCH" "info"
+
+	declare -g KERNELSOURCE="https://github.com/beagleboard/linux" # BeagleBoard kernel
+	declare -g KERNEL_MAJOR_MINOR="6.12"
+	declare -g KERNELBRANCH="branch:v6.12.24-ti-arm64-r42"
+	declare -g LINUXFAMILY="k3-beagle" # Separate kernel package from the regular `k3` family
+
+	declare -g BOOTSOURCE="https://github.com/beagleboard/u-boot" # BeagleBoard u-boot
+	declare -g BOOTBRANCH="branch:v2025.04-pocketbeagle2"
+}
--- a/config/boards/pocketbeagle2.csc
+++ b/config/boards/pocketbeagle2.csc
@@ -1,28 +0,0 @@
-#Texas Instruments AM62 dual core 1GB USB2 DDR4
-
-BOARD_NAME="PocketBeagle 2"
-BOARDFAMILY="k3"
-BOARD_MAINTAINER="Grippy98"
-BOOTCONFIG="am6232_pocketbeagle2_a53_defconfig"
-BOOTFS_TYPE="fat"
-BOOT_FDT_FILE="k3-am6232-pocketbeagle2.dts"
-TIBOOT3_BOOTCONFIG="am6232_pocketbeagle2_r5_defconfig"
-TIBOOT3_FILE="tiboot3-am62x-hs-fs-evm.bin"
-DEFAULT_CONSOLE="serial"
-KERNEL_TARGET="edge"
-KERNEL_TEST_TARGET="edge"
-SERIALCON="ttyS2"
-ATF_BOARD="lite"
-
-#Until PB2 goes upstream, use this branch
-function post_family_config_branch_edge__pocketbeagle2_use_beagle_kernel_uboot() {
-	display_alert "$BOARD" " beagleboard (next branch) u-boot and kernel overrides for $BOARD / $BRANCH" "info"
-
-	declare -g KERNELSOURCE="https://github.com/beagleboard/linux" # BeagleBoard kernel
-	declare -g KERNEL_MAJOR_MINOR="6.12"
-	declare -g KERNELBRANCH="branch:v6.12.13-ti-arm64-r24"
-	declare -g LINUXFAMILY="k3-beagle" # Separate kernel package from the regular `k3` family
-
-	declare -g BOOTSOURCE="https://github.com/beagleboard/u-boot" # BeagleBoard u-boot
-	declare -g BOOTBRANCH="branch:v2025.01-pocketbeagle2"
-}
--- a/config/boards/qcom-robotics-rb5.conf
+++ b/config/boards/qcom-robotics-rb5.conf
@@ -0,0 +1,117 @@
+# Qualcomm Robotics RB5 Configuration
+declare -g BOARD_NAME="Qualcomm Robotics RB5"
+declare -g BOARD_MAINTAINER="FantasyGmm"
+declare -g BOARDFAMILY="sm8250"
+declare -g KERNEL_TARGET="current,edge"
+declare -g KERNEL_TEST_TARGET="edge"
+declare -g EXTRAWIFI="no"
+declare -g BOOTCONFIG="none"
+declare -g IMAGE_PARTITION_TABLE="gpt"
+# declare -g -a ABL_DTB_LIST=("qrb5165-rb5")
+
+# Use the full firmware, complete linux-firmware plus Armbian's (for qcom/a650_sqe.fw)
+declare -g BOARD_FIRMWARE_INSTALL="-full"
+
+declare -g SERIALCON="${SERIALCON:-tty1}"
+declare -g GRUB_CMDLINE_LINUX_DEFAULT="clk_ignore_unused pd_ignore_unused arm64.nopauth efi=noruntime console=ttyMSM0,115200n8 pcie_pme=nomsi"
+declare -g BOOT_FDT_FILE="qcom/qrb5165-rb5.dtb"
+declare -g UEFI_PART_ALIGN="4096"
+enable_extension "grub"
+enable_extension "grub-with-dtb" # important, puts the whole DTB handling in place.
+
+function qcom-robotics-rb5_is_userspace_supported() {
+	[[ "${RELEASE}" == "bookworm" ]] && return 0
+	[[ "${RELEASE}" == "jammy" ]] && return 0
+	[[ "${RELEASE}" == "noble" ]] && return 0
+	[[ "${RELEASE}" == "trixie" ]] && return 0
+	return 1
+}
+
+function post_family_tweaks_bsp__qcom-robotics-rb5_add_services() {
+	if ! qcom-robotics-rb5_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/
+}
+
+function post_family_tweaks__qcom-robotics-rb5_enable_services() {
+	if ! qcom-robotics-rb5_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_tweaks__qcom-robotics-rb5_extra_packages() {
+	if ! qcom-robotics-rb5_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
+
+	if [[ "${RELEASE}" == "noble" ]]; then
+		display_alert "Adding Mesa PPA For Ubuntu " "${BOARD}" "info"
+		do_with_retries 3 chroot_sdcard add-apt-repository ppa:oibaf/graphics-drivers --yes --no-update
+	fi
+
+	do_with_retries 3 chroot_sdcard_apt_get_update
+	do_with_retries 3 chroot_sdcard_apt_get_install vulkan-tools mesa-vulkan-drivers btop mtools zstd
+
+	if [[ "${RELEASE}" == "noble" ]]; then
+		do_with_retries 3 chroot_sdcard_apt_get_install qbootctl
+	fi
+
+	if [[ "${DESKTOP_ENVIRONMENT}" == "kde-plasma" ]]; then
+		display_alert "Adding Extra KDE Package" "${BOARD}" "info"
+		do_with_retries 3 chroot_sdcard_apt_get_install plasma-workspace-wayland plasma-desktop plasma-systemmonitor plasma-nm kde-standard kde-spectacle kinfocenter kscreen krfb kfind filelight \
+		dolphin clinfo vulkan-tools wayland-utils
+	fi
+
+	if [[ "${RELEASE}" == "noble" ]]; then
+		chroot_sdcard systemctl enable qbootctl.service
+	fi
+	chroot_sdcard systemctl enable bt-fixed-mac.service
+
+	# No driver support for suspend
+	chroot_sdcard systemctl mask suspend.target
+}
+
+function post_family_tweaks_bsp__qcom-robotics-rb5_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
+	# Using Elish's firmware for now
+	add_file_from_stdin_to_bsp_destination "/etc/initramfs-tools/hooks/qcom-robotics-rb5-firmware" <<- 'FIRMWARE_HOOK'
+		#!/bin/bash
+		[[ "$1" == "prereqs" ]] && exit 0
+		. /usr/share/initramfs-tools/hook-functions
+		for f in /lib/firmware/qcom/sm8250/Thundercomm/RB5/* ; do
+			add_firmware "${f#/lib/firmware/}"
+		done
+		add_firmware "qcom/sm8250/a650_zap.mbn" # Extra one for dpu
+		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}"
+}
--- a/config/boards/quartz64a.csc
+++ b/config/boards/quartz64a.csc
@@ -16,9 +16,9 @@ function post_family_config__quartz64_a_use_mainline_uboot() {
 	display_alert "$BOARD" "Using mainline U-Boot for $BOARD / $BRANCH" "info"

 	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}"
-	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency
+	declare -g BOOTBRANCH="tag:v2025.04"
+	declare -g BOOTPATCHDIR="v2025.04"
+	declare -g BOOTDELAY=1 # Wait for UART interrupt to enter UMS/RockUSB mode etc

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

@@ -30,3 +30,65 @@ function post_family_config__quartz64_a_use_mainline_uboot() {
 		dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
 	}
 }
+
+# Quartz64a's OTG port is the BLACK one, on top of the USB3 port. Use an USB-A cable; not all cables work.
+function pre_config_uboot_target__quartz64a_patch_uboot_dtsi_for_ums() {
+	display_alert "u-boot for ${BOARD}" "u-boot: add to u-boot dtsi for UMS" "info" # avoid a patch, just append to the dtsi file
+	cat <<- UBOOT_BOARD_DTSI_OTG >> arch/arm/dts/rk3566-quartz64-a-u-boot.dtsi
+		&usb_host0_xhci { dr_mode = "otg"; };
+	UBOOT_BOARD_DTSI_OTG
+}
+
+# "rockchip-common: boot SD card first, then NVMe, then SATA, then USB, then mmc"
+# On quartz64a, mmc0 is the eMMC, mmc1 is the SD card slot
+function pre_config_uboot_target__quartz64a_patch_rockchip_common_boot_order() {
+	declare -a rockchip_uboot_targets=("mmc1" "nvme" "scsi" "usb" "mmc0" "pxe" "dhcp" "spi") # for future make-this-generic delight
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: adjust boot order to '${rockchip_uboot_targets[*]}'" "info"
+	sed -i -e "s/#define BOOT_TARGETS.*/#define BOOT_TARGETS \"${rockchip_uboot_targets[*]}\"/" include/configs/rockchip-common.h
+	regular_git diff -u include/configs/rockchip-common.h || true
+}
+
+# A better equivalent to patching a defconfig, do changes to .config via code.
+# For UMS/RockUSB to work in u-boot, &usb_host0_xhci { dr_mode = "otg" } is required. See 0002-board-rockchip-ODROID-M1-override-kernel-DT-for-xhci-otg-dr_mode.patch
+function post_config_uboot_target__extra_configs_for_quartz64a() {
+	[[ "${BRANCH}" == "edge" || "${BRANCH}" == "current" ]] || return 0
+
+	display_alert "u-boot for ${BOARD}" "u-boot: enable preboot & flash leds in preboot" "info"
+	run_host_command_logged scripts/config --enable CONFIG_USE_PREBOOT
+	run_host_command_logged scripts/config --set-str CONFIG_PREBOOT "'echo armbian leds; led diy-led on; led work-led on; sleep 0.1; led diy-led off; led work-led off; sleep 0.1; led diy-led on;'" # double quote
+
+	display_alert "u-boot for ${BOARD}" "u-boot: enable EFI debugging command" "info"
+	run_host_command_logged scripts/config --enable CMD_EFIDEBUG
+	run_host_command_logged scripts/config --enable CMD_NVEDIT_EFI
+
+	display_alert "u-boot for ${BOARD}" "u-boot: enable more compression support" "info"
+	run_host_command_logged scripts/config --enable CONFIG_LZO
+	run_host_command_logged scripts/config --enable CONFIG_BZIP2
+	run_host_command_logged scripts/config --enable CONFIG_ZSTD
+
+	display_alert "u-boot for ${BOARD}" "u-boot: enable gpio LED support" "info"
+	run_host_command_logged scripts/config --enable CONFIG_LED
+	run_host_command_logged scripts/config --enable CONFIG_LED_GPIO
+
+	display_alert "u-boot for ${BOARD}" "u-boot: enable networking cmds" "info"
+	run_host_command_logged scripts/config --enable CONFIG_CMD_NFS
+	run_host_command_logged scripts/config --enable CONFIG_CMD_WGET
+	run_host_command_logged scripts/config --enable CONFIG_CMD_DNS
+	run_host_command_logged scripts/config --enable CONFIG_PROT_TCP
+	run_host_command_logged scripts/config --enable CONFIG_PROT_TCP_SACK
+
+	display_alert "u-boot for ${BOARD}" "u-boot: enable more cmdline commands" "info" # for extra compat with eg HAOS
+	run_host_command_logged scripts/config --enable CONFIG_CMD_SQUASHFS
+	run_host_command_logged scripts/config --enable CONFIG_CMD_SETEXPR
+	run_host_command_logged scripts/config --enable CONFIG_CMD_FILEENV # added via cmd-fileenv-read-string-from-file-into-env.patch
+	run_host_command_logged scripts/config --enable CONFIG_CMD_CAT
+	run_host_command_logged scripts/config --enable CONFIG_CMD_XXD
+
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enabling UMS/RockUSB Gadget functionality" "info"
+	declare -a enable_configs=("CONFIG_CMD_USB_MASS_STORAGE" "CONFIG_USB_GADGET" "USB_GADGET_DOWNLOAD" "CONFIG_USB_FUNCTION_ROCKUSB" "CONFIG_USB_FUNCTION_ACM" "CONFIG_CMD_ROCKUSB" "CONFIG_CMD_USB_MASS_STORAGE")
+	for config in "${enable_configs[@]}"; do
+		run_host_command_logged scripts/config --enable "${config}"
+	done
+	# Auto-enabled by the above, force off...
+	run_host_command_logged scripts/config --disable USB_FUNCTION_FASTBOOT
+}
--- a/config/boards/radxa-cubie-a5e.csc
+++ b/config/boards/radxa-cubie-a5e.csc
@@ -0,0 +1,22 @@
+# Allwinner Cortex-A55 octa core 1/2/4GB RAM SoC
+BOARD_NAME="radxa cubie a5e"
+BOARDFAMILY="sun55iw3"
+BOARD_MAINTAINER=""
+BOOTCONFIG="radxa-a5e_defconfig"
+OVERLAY_PREFIX="sun55i-a527"
+#BOOT_LOGO="desktop"
+KERNEL_TARGET="dev"
+BOOT_FDT_FILE="dtb/allwinner/sun55i-a527-radxa-a5e.dtb"
+IMAGE_PARTITION_TABLE="gpt"
+#IMAGE_PARTITION_TABLE="msdos"
+BOOTFS_TYPE="fat"
+BOOTSTART="1"
+BOOTSIZE="512"
+ROOTSTART="513"
+
+function post_family_tweaks__radxa_cubie-a5e() {
+	display_alert "Applying wifi firmware"
+	pushd "$SDCARD/lib/firmware"
+	ln -s "aic8800/SDIO/aic8800D80" "aic8800_sdio" # use armbian-firmware
+	popd
+}
--- a/config/boards/radxa-e20c.csc
+++ b/config/boards/radxa-e20c.csc
@@ -9,3 +9,35 @@ BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3528-radxa-e20c.dtb"
 BOOT_SCENARIO="spl-blobs"
 IMAGE_PARTITION_TABLE="gpt"
+
+function post_family_tweaks_bsp__enable_leds_radxa-e20c() {
+	display_alert "Creating board support LEDs config for $BOARD"
+	cat <<- EOF > "${destination}"/etc/armbian-leds.conf
+		[/sys/class/leds/lan-led]
+		trigger=netdev
+		interval=50
+		brightness=1
+		link=1
+		tx=1
+		rx=1
+		device_name=end1
+
+		[/sys/class/leds/mmc1::]
+		trigger=mmc1
+		brightness=1
+
+		[/sys/class/leds/sys-led]
+		trigger=heartbeat
+		brightness=1
+		invert=0
+
+		[/sys/class/leds/wan-led]
+		trigger=netdev
+		interval=50
+		brightness=1
+		link=1
+		tx=1
+		rx=1
+		device_name=enp1s0
+	EOF
+}
--- a/config/boards/radxa-nio-12l.conf
+++ b/config/boards/radxa-nio-12l.conf
@@ -0,0 +1,25 @@
+# Mediatek MT8395 quad core 4GB 8GB 16GB
+BOARD_NAME="Radxa Nio 12L"
+BOARDFAMILY="genio"
+BOARD_MAINTAINER="HeyMeco"
+KERNEL_TARGET="collabora"
+KERNEL_TEST_TARGET="collabora"
+BOOT_FDT_FILE="mediatek/mt8395-radxa-nio-12l.dtb"
+enable_extension "grub-with-dtb"
+HAS_VIDEO_OUTPUT="yes"
+
+# Post-config function for vendor branch
+function post_family_config__nio12l_vendor_setup() {
+	if [[ "${BRANCH}" == "vendor" ]]; then
+		display_alert "Setting up Genio-Firmware package for ${BOARD}" "${RELEASE}///${BOARD}" "info"
+		add_packages_to_image "linux-firmware-mediatek-genio" "ubuntu-dev-tools" "ubuntu-desktop"
+	fi
+}
+
+# Post-config function for collabora branch
+function post_family_config__nio12l_collabora_setup() {
+	if [[ "${BRANCH}" == "collabora" ]]; then
+		display_alert "Setting up Firmware-Full for ${BOARD}" "${RELEASE}///${BOARD}" "info"
+		declare -g BOARD_FIRMWARE_INSTALL="-full"
+	fi
+}
--- a/config/boards/radxa-zero3.csc
+++ b/config/boards/radxa-zero3.csc
@@ -3,7 +3,7 @@ BOARD_NAME="Radxa ZERO 3"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER=""
 BOOTCONFIG="radxa-zero3-rk3566_defconfig"
-KERNEL_TARGET="vendor,edge"
+KERNEL_TARGET="vendor,current,edge"
 KERNEL_TEST_TARGET="vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
@@ -12,13 +12,33 @@ IMAGE_PARTITION_TABLE="gpt"
 BOOT_SCENARIO="spl-blobs"
 BOOTFS_TYPE="fat" # Only for vendor/legacy

-function post_family_config_branch_edge__use_mainline_dtb_name() {
+
+AIC8800_TYPE="sdio"
+enable_extension "radxa-aic8800"
+
+function post_family_config__use_mainline_uboot_except_vendor() {
+	# use mainline u-boot for _current_ and _edge_
+	if [[ "$BRANCH" != "current" && "$BRANCH" != "edge" ]]; then
+    	return 0
+	fi
 	unset BOOT_FDT_FILE # boot.scr will use whatever u-boot detects and sets 'fdtfile' to
 	unset BOOTFS_TYPE   # mainline u-boot can boot ext4 directly
+	BOOTCONFIG="radxa-zero-3-rk3566_defconfig"
+	BOOTSOURCE="https://github.com/u-boot/u-boot"
+	BOOTBRANCH="tag:v2025.04"
+	BOOTPATCHDIR="v2025.04"
+
+	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
+	}
 }

 # Override family config for this board; let's avoid conditionals in family config.
-function post_family_config__radxa-zero3_use_vendor_uboot() {
+function post_family_config_branch_vendor__radxa-zero3_use_vendor_uboot() {
 	BOOTSOURCE='https://github.com/radxa/u-boot.git'
 	BOOTBRANCH='branch:rk35xx-2024.01'
 	BOOTPATCHDIR="u-boot-radxa-latest"
@@ -30,19 +50,4 @@ function post_family_config__radxa-zero3_use_vendor_uboot() {
 	function write_uboot_platform() {
 		dd if=$1/u-boot-rockchip.bin of=$2 seek=64 conv=notrunc status=none
 	}
-}
-
-function post_family_config_branch_edge__radxa-zero3_use_mainline_uboot() {
-	BOOTCONFIG="radxa-zero-3-rk3566_defconfig"
-	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"
-
-	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/rock-3a.conf
+++ b/config/boards/rock-3a.conf
@@ -5,7 +5,7 @@ BOARD_MAINTAINER="ZazaBR amazingfate catalinii vamzii"
 BOOTCONFIG="rock-3a-rk3568_defconfig"
 BOOTCONFIG_SATA="rock-3a-sata-rk3568_defconfig"
 KERNEL_TARGET="current,edge,vendor"
-KERNEL_TEST_TARGET="current"
+KERNEL_TEST_TARGET="current,vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3568-rock-3a.dtb"
@@ -15,14 +15,24 @@ BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
 BOOTFS_TYPE="fat"

-function post_family_config_branch_edge__rock-3a_use_mainline_uboot() {
+function post_family_config__rock-3a_use_mainline_uboot_except_vendor_and_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_SATA spl/u-boot-spl.bin u-boot.dtb u-boot.itb;; rkspi_loader_sata.img"
+	
+	# use mainline uboot for _current_ and _edge_
+	if [[ "$BRANCH" != "current" && "$BRANCH" != "edge" ]]; then
+		return 0
+	fi
+
 	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:v2025.01"
-	declare -g BOOTPATCHDIR="v2025.01"
+	declare -g BOOTBRANCH="tag:v2025.04"
+	declare -g BOOTPATCHDIR="v2025.04"
 	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
@@ -37,16 +47,7 @@ function post_family_config_branch_edge__rock-3a_use_mainline_uboot() {
 	}
 }

-function post_family_config__rock3a_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_SATA 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
--- a/config/boards/rock-4se.csc
+++ b/config/boards/rock-4se.csc
@@ -2,15 +2,14 @@
 BOARD_NAME="Rock 4SE"
 BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER=""
-BOOTBRANCH_BOARD="tag:v2023.10-rc2"
-#BOOTCONFIG="rock-4se-rk3399_defconfig" ## irony being we chose mainline uboot because of support for this board but its broken
-BOOTCONFIG="rock-pi-4-rk3399_defconfig"
-BOOTPATCHDIR='v2023.10-rc2'
+BOOTPATCHDIR="v2025.04"
+BOOTBRANCH_BOARD="tag:v2025.04"
+BOOTCONFIG="rock-4se-rk3399_defconfig"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
-BOOT_FDT_FILE="rockchip/rk3399-rock-pi-4b.dtb"
+BOOT_FDT_FILE="rockchip/rk3399-rock-4se.dtb"
 BOOT_SCENARIO="spl-blobs"
 BOOT_SUPPORT_SPI="yes"
 BL31_BLOB="rk33/rk3399_bl31_v1.36.elf"
--- a/config/boards/rockpi-e.conf
+++ b/config/boards/rockpi-e.conf
@@ -8,3 +8,7 @@ KERNEL_TEST_TARGET="current"
 DEFAULT_CONSOLE="serial"
 MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima"
 HAS_VIDEO_OUTPUT="no"
+BOOTBRANCH_BOARD="tag:v2025.01"
+BOOTPATCHDIR="v2025.01"
+BOOT_SCENARIO="binman"
+
--- a/config/boards/sakurapi-rk3308b.csc
+++ b/config/boards/sakurapi-rk3308b.csc
@@ -11,11 +11,11 @@ KERNEL_TARGET="current"
 BOOT_FDT_FILE="rockchip/rk3308-sakurapi-rk3308b.dtb"
 MODULES_BLACKLIST="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"
+BOOTBRANCH_BOARD="tag:v2025.04"
+BOOTPATCHDIR="v2025.04"
 IMAGE_PARTITION_TABLE="gpt"

-BOOT_SCENARIO="only-blobs"
+BOOT_SCENARIO="binman"
 BL31_BLOB="rk33/rk3308_bl31_v2.26.elf"
 DDR_BLOB="rk33/rk3308_ddr_589MHz_uart2_m1_v1.30.bin"
 MINILOADER_BLOB="rk33/rk3308_miniloader_sd_nand_v1.13.bin"
--- a/config/boards/sk-am62b.conf
+++ b/config/boards/sk-am62b.conf
@@ -13,3 +13,5 @@ KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
 SERIALCON="ttyS2"
 ATF_BOARD="lite"
+OPTEE_ARGS="CFG_TEE_CORE_LOG_LEVEL=1"
+OPTEE_PLATFORM="k3-am62x"
--- a/config/boards/sk-am64b.conf
+++ b/config/boards/sk-am64b.conf
@@ -14,3 +14,5 @@ KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
 SERIALCON="ttyS2"
 ATF_BOARD="lite"
+OPTEE_ARGS=""
+OPTEE_PLATFORM="k3-am64x"
--- a/config/boards/sk-am68.conf
+++ b/config/boards/sk-am68.conf
@@ -14,3 +14,5 @@ KERNEL_TEST_TARGET="current"
 SERIALCON="ttyS2"
 ATF_BOARD="generic"
 ATF_K3_USART_OFFSET="K3_USART=0x8"
+OPTEE_ARGS="CFG_CONSOLE_UART=0x8"
+OPTEE_PLATFORM="k3-j784s4"
--- a/config/boards/sk-am69.conf
+++ b/config/boards/sk-am69.conf
@@ -14,3 +14,5 @@ KERNEL_TEST_TARGET="current"
 SERIALCON="ttyS2"
 ATF_BOARD="j784s4"
 ATF_K3_USART_OFFSET="K3_USART=0x8"
+OPTEE_ARGS="CFG_CONSOLE_UART=0x8"
+OPTEE_PLATFORM="k3-j784s4"
--- a/config/boards/sk-tda4vm.conf
+++ b/config/boards/sk-tda4vm.conf
@@ -16,3 +16,5 @@ KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
 SERIALCON="ttyS2"
 ATF_BOARD="generic"
+OPTEE_ARGS=""
+OPTEE_PLATFORM="k3-j721e"
--- a/config/boards/smart-am40.csc
+++ b/config/boards/smart-am40.csc
@@ -0,0 +1,17 @@
+# Rockchip RK3399 hexa core 4GB SoC eMMC GBE USB3 WiFi/BT
+BOARD_NAME="SMART AM40"
+BOARDFAMILY="rockchip64"
+BOARD_MAINTAINER=""
+BOOTCONFIG="am40-rk3399_defconfig"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
+MODULES_CURRENT="extcon-usbc-virtual-pd"
+MODULES_EDGE="extcon-usbc-virtual-pd"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3399-am40.dtb"
+BOOTBRANCH_BOARD="tag:v2025.04"
+BOOTPATCHDIR="v2025.04"
+BOOT_SCENARIO="binman"
+SRC_EXTLINUX="yes"
+SRC_CMDLINE="console=ttyS2,1500000 console=tty0"
--- a/config/boards/station-m1.csc
+++ b/config/boards/station-m1.csc
@@ -15,7 +15,6 @@ function post_family_tweaks__station_m1() {
 	display_alert "$BOARD" "Installing board tweaks" "info"

 	cp -R $SRC/packages/blobs/rtl8723bt_fw/* $SDCARD/lib/firmware/rtl_bt/
-	cp -R $SRC/packages/blobs/station/firmware/* $SDCARD/lib/firmware/
 }

 # Mainline U-Boot
--- a/config/boards/station-m3.csc
+++ b/config/boards/station-m3.csc
@@ -12,14 +12,6 @@ BOOT_SOC="rk3588"
 IMAGE_PARTITION_TABLE="gpt"
 declare -g UEFI_EDK2_BOARD_ID="station-m3" # This _only_ used for uefi-edk2-rk3588 extension

-function post_family_tweaks__station_m3() {
-	display_alert "$BOARD" "Installing board tweaks" "info"
-
-	cp -R $SRC/packages/blobs/rtl8723bt_fw/* $SDCARD/lib/firmware/rtl_bt/
-	cp -R $SRC/packages/blobs/station/firmware/* $SDCARD/lib/firmware/
-	return 0
-}
-
 function post_family_tweaks__station-m3_naming_audios() {
 	display_alert "$BOARD" "Renaming station-m3 audios" "info"

--- a/config/boards/station-p1.csc
+++ b/config/boards/station-p1.csc
@@ -13,12 +13,3 @@ BOOT_SCENARIO="tpl-spl-blob"
 SRC_EXTLINUX="yes"
 SRC_CMDLINE="console=ttyS2,1500000 console=tty0"
 ASOUND_STATE="asound.state.station-p1"
-
-function post_family_tweaks__station_p1() {
-	display_alert "$BOARD" "Installing board tweaks" "info"
-
-	cp -R $SRC/packages/blobs/rtl8723bt_fw/* $SDCARD/lib/firmware/rtl_bt/
-	cp -R $SRC/packages/blobs/station/firmware/* $SDCARD/lib/firmware/
-
-	return 0
-}
--- a/config/boards/station-p2.csc
+++ b/config/boards/station-p2.csc
@@ -2,6 +2,7 @@
 BOARD_NAME="Station P2"
 BOARDFAMILY="rockchip64"
 BOOT_SOC="rk3568"
+BOOTCONFIG="roc-pc-rk3568_defconfig"
 BOARD_MAINTAINER=""
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
@@ -11,23 +12,6 @@ BOOT_FDT_FILE="rockchip/rk3568-roc-pc.dtb"
 ASOUND_STATE="asound.state.station-p2"
 IMAGE_PARTITION_TABLE="gpt"

-# Mainline U-Boot
-function post_family_config__station_p2_use_mainline_uboot() {
-	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}"
-	# 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
-	}
-}
+BOOT_SCENARIO="binman"
+BOOTBRANCH_BOARD="tag:v2025.04"
+BOOTPATCHDIR="v2025.04"
--- a/config/boards/thinkpad-x13s.conf
+++ b/config/boards/thinkpad-x13s.conf
@@ -27,8 +27,8 @@ enable_extension "grub-with-dtb" # important, puts the whole DTB handling in pla
 declare -g BOARD_FIRMWARE_INSTALL="-full"

 function post_family_config_branch_sc8280xp__jhovolds_wip_kernel() {
-	declare -g KERNEL_MAJOR_MINOR="6.13" # Major and minor versions of this kernel.
-	declare -g KERNELBRANCH='branch:wip/sc8280xp-6.13' # @TODO: this is down to 23 patches, from hundreds back in the day. Considering merging this with default arm64 uefi kernel
+	declare -g KERNEL_MAJOR_MINOR="6.15" # Major and minor versions of this kernel.
+	declare -g KERNELBRANCH='branch:wip/sc8280xp-6.15' # @TODO: this is up to 47 patches, from 28 around 6.13; wait a bit until speculating about merging with uefi-arm64
 	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/tinkerboard-2.csc
+++ b/config/boards/tinkerboard-2.csc
@@ -9,8 +9,8 @@ FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3399-tinker-2.dtb"
 SERIALCON="ttyS2"
-BOOT_SCENARIO="spl-blobs"                   # 'blobless' also works; but some RAM issues found; see rk33/rk3399_ddr_800MHz_v1.27.bin in rockchip64_common.inc
+BOOT_SCENARIO="binman"                      # 'blobless' also works; but some RAM issues found; see rk33/rk3399_ddr_800MHz_v1.27.bin in rockchip64_common.inc
 BOARD_FIRMWARE_INSTALL="-full"              # Install full firmware, for rtl8822ce firmware and others
-BOOTBRANCH="tag:v2021.07"                   # v2021.07 ...
+BOOTBRANCH="tag:v2025.04"                   # v2025.04 ...
 BOOTPATCHDIR='legacy/u-boot-tinkerboard2'   # ...  with _only_ the patches we need for TB2, not the default rockchip64
 DDR_BLOB="rk33/rk3399_ddr_800MHz_v1.27.bin" # Different blob for TB2
--- a/config/boards/uefi-x86.conf
+++ b/config/boards/uefi-x86.conf
@@ -2,7 +2,7 @@
 declare -g BOARD_NAME="UEFI x86"
 declare -g BOARDFAMILY="uefi-x86"
 declare -g BOARD_MAINTAINER="rpardini"
-declare -g KERNEL_TARGET="legacy,current,edge"
+declare -g KERNEL_TARGET="legacy,current,edge,cloud"
 declare -g KERNEL_TEST_TARGET="current"
 declare -g SERIALCON="tty1"
 declare -g BOOT_LOGO=desktop
--- a/config/boards/visionfive2.csc
+++ b/config/boards/visionfive2.csc
@@ -0,0 +1,35 @@
+# RISC-V StarFive Visionfive V2
+BOARD_NAME="VisionFive2"
+BOARDFAMILY="starfive2"
+BOARD_MAINTAINER="libiunc"
+KERNEL_TARGET="vendor"
+BOOT_FDT_FILE="starfive/jh7110-starfive-visionfive-2-v1.3b.dtb"
+SRC_EXTLINUX="yes"
+SRC_CMDLINE="console=ttyS0,115200n8 console=tty0 earlycon=sbi rootflags=data=writeback stmmaceth=chain_mode:1 rw"
+BOOTCONFIG=none
+
+function post_family_tweaks__visionfive2_uenv() {
+	# rpardini: uEnv.txt is needed to re-enable distroboot-like behaviour on the board's SPI u-boot
+	display_alert "$BOARD" "creating uEnv.txt" "info"
+	cat <<- UENV_SCRIPT_HEADER > "${SDCARD}/boot/uEnv.txt"
+		fdt_high=0xffffffffffffffff
+		initrd_high=0xffffffffffffffff
+
+		kernel_addr_r=0x44000000
+		kernel_comp_addr_r=0x90000000
+		kernel_comp_size=0x10000000
+
+		fdt_addr_r=0x48000000
+		ramdisk_addr_r=0x48100000
+
+		# Move distro to first boot to speed up booting
+		boot_targets=distro mmc1 dhcp
+
+		distro_bootpart=1
+
+		# Fix missing bootcmd
+		bootcmd=run bootcmd_distro
+	UENV_SCRIPT_HEADER
+
+	return 0
+}
--- a/config/boards/visionfive2.eos
+++ b/config/boards/visionfive2.eos
@@ -1,35 +0,0 @@
-# RISC-V StarFive Visionfive V2
-BOARD_NAME="VisionFive2"
-BOARDFAMILY="starfive2"
-BOARD_MAINTAINER=""
-KERNEL_TARGET="edge"
-BOOT_FDT_FILE="starfive/jh7110-visionfive-v2.dtb"
-SRC_EXTLINUX="yes"
-SRC_CMDLINE="console=ttyS0,115200n8 console=tty0 earlycon=sbi rootflags=data=writeback stmmaceth=chain_mode:1 rw"
-BOOTCONFIG=none
-
-function post_family_tweaks__visionfive2_uenv() {
-	# rpardini: uEnv.txt is needed to re-enable distroboot-like behaviour on the board's SPI u-boot
-	display_alert "$BOARD" "creating uEnv.txt" "info"
-	cat <<- UENV_SCRIPT_HEADER > "${SDCARD}/boot/uEnv.txt"
-		fdt_high=0xffffffffffffffff
-		initrd_high=0xffffffffffffffff
-
-		kernel_addr_r=0x44000000
-		kernel_comp_addr_r=0x90000000
-		kernel_comp_size=0x10000000
-
-		fdt_addr_r=0x48000000
-		ramdisk_addr_r=0x48100000
-
-		# Move distro to first boot to speed up booting
-		boot_targets=distro mmc1 dhcp 
-
-		distro_bootpart=1
-
-		# Fix missing bootcmd
-		bootcmd=run bootcmd_distro
-	UENV_SCRIPT_HEADER
-
-	return 0
-}
--- a/config/boards/xiaomi-umi.eos
+++ b/config/boards/xiaomi-umi.eos
@@ -1,99 +0,0 @@
-# Generate kernel and rootfs image for Qcom ABL booting
-declare -g BOARD_NAME="Xiaomi Umi"
-declare -g BOARD_MAINTAINER="FantasyGmm"
-declare -g BOARDFAMILY="sm8250"
-declare -g KERNEL_TARGET="current,edge"
-declare -g KERNEL_TEST_TARGET="edge"
-declare -g EXTRAWIFI="no"
-declare -g MODULES="spi-geni-qcom"
-declare -g BOOTCONFIG="none"
-declare -g BOOTIMG_CMDLINE_EXTRA="clk_ignore_unused pd_ignore_unused"
-declare -g IMAGE_PARTITION_TABLE="gpt"
-declare -g -a ABL_DTB_LIST=("sm8250-xiaomi-umi-csot" "sm8250-xiaomi-umi-sms")
-
-# Use the full firmware, complete linux-firmware plus Armbian's (for qcom/a650_sqe.fw)
-declare -g BOARD_FIRMWARE_INSTALL="-full"
-
-function xiaomi-umi_is_userspace_supported() {
-	[[ "${RELEASE}" == "jammy" ]] && return 0
-	[[ "${RELEASE}" == "trixie" ]] && return 0
-	[[ "${RELEASE}" == "noble" ]] && return 0
-	return 1
-}
-
-function post_family_tweaks_bsp__xiaomi-umi_firmware() {
-	display_alert "$BOARD" "Install firmwares for xiaomi umi" "info"
-
-	# Alsa-ucm-conf profile for Xiaomi Umi
-	mkdir -p $destination/usr/share/alsa/ucm2/conf.d/sm8250
-	install -Dm644 $SRC/packages/bsp/xiaomi-umi/umi.conf $destination/usr/share/alsa/ucm2/Xiaomi/umi/umi.conf
-	install -Dm644 $SRC/packages/bsp/xiaomi-umi/umi_HiFi.conf $destination/usr/share/alsa/ucm2/Xiaomi/umi/HiFi.conf
-	ln -sfv ../../Xiaomi/umi/umi.conf \
-		"$destination/usr/share/alsa/ucm2/conf.d/sm8250/Xiaomi Mi 10.conf"
-
-	# 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/
-
-	# Kernel postinst script to update abl boot partition
-	install -Dm655 $SRC/packages/bsp/xiaomi-umi/zz-update-abl-kernel $destination/etc/kernel/postinst.d/
-
-	return 0
-}
-
-function post_family_tweaks__xiaomi-umi_enable_services() {
-	if ! xiaomi-umi_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.sources.disabled "${SDCARD}"/etc/apt/sources.list.d/armbian.sources
-
-	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.sources "${SDCARD}"/etc/apt/sources.list.d/armbian.sources.disabled
-	do_with_retries 3 chroot_sdcard_apt_get_update
-
-	chroot_sdcard systemctl enable qbootctl.service
-	chroot_sdcard systemctl enable usbgadget-rndis.service
-	return 0
-}
-
-function post_family_tweaks_bsp__xiaomi-umi_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
-	# Using Elish's firmware for now
-	add_file_from_stdin_to_bsp_destination "/etc/initramfs-tools/hooks/xiaomi-elish-firmware" <<- 'FIRMWARE_HOOK'
-		#!/bin/bash
-		[[ "$1" == "prereqs" ]] && exit 0
-		. /usr/share/initramfs-tools/hook-functions
-		for f in /lib/firmware/qcom/sm8250/xiaomi/elish/* ; 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__xiaomi-umi_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/youyeetoo-r1-v3.csc
+++ b/config/boards/youyeetoo-r1-v3.csc
@@ -2,9 +2,10 @@
 BOARD_NAME="Youyeetoo R1 v3"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="SuperKali"
-BOOTCONFIG="generic-rk3588_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
+BOOTCONFIG="youyeetoo-r1-rk3588s_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
-KERNEL_TARGET="current,edge,vendor"
+KERNEL_TARGET="vendor,current,edge"
+KERNEL_TEST_TARGET="vendor,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 IMAGE_PARTITION_TABLE="gpt"
@@ -34,11 +35,11 @@ function post_family_tweaks__youyeetoo_r1_naming_udev_network_interfaces() {
 function post_family_config__youyeetoo_r1_use_mainline_uboot() {
 	display_alert "$BOARD" "Using mainline (next branch) U-Boot for $BOARD / $BRANCH" "info"

-	declare -g BOOTCONFIG="generic-rk3588_defconfig"             # Use generic defconfig which should boot all RK3588 boards
+	declare -g BOOTCONFIG="youyeetoo-r1-rk3588s_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:v2025.01"
-	declare -g BOOTPATCHDIR="v2025.01"
+	declare -g BOOTBRANCH="tag:v2025.04"
+	declare -g BOOTPATCHDIR="v2025.04"
 	# 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/bootscripts/boot-mvebu.cmd
+++ b/config/bootscripts/boot-mvebu.cmd
@@ -3,80 +3,539 @@
 # Please edit /boot/armbianEnv.txt to set supported parameters
 #

-setenv load_addr "0x300000"
-# default values
-setenv overlay_error "false"
-setenv rootdev "/dev/mmcblk0p1"
-setenv rootfstype "ext4"
-setenv verbosity "1"
+# NOTE
+# If you intend to use 'outside' of 'global' variables from U-Boot, make sure that you do not change them!
+# The boot logic will attempt a list of 'boot_targets' that all might rely on (environment) variables that
+# have been set by U-Boot, either compile-time or as part of U-Boot's default 'bootcmd'.
+# Any variable that this bootscript uses needs to be set explicitly and not conflict with any pre-set variables.
+# Variables that we might change will be saved in preset_x and variables we use will be copied into l_x.
+
+# default environment variables
+setenv align_overlap_oboe_avoidance "on"
+setenv align_to "0x00001000"
+setenv console "both"
+setenv docker_optimizations "on"
+setenv earlycon "off"
 setenv emmc_fix "off"
-setenv spi_workaround "off"
-setenv ethaddr "00:50:43:84:fb:2f"
 setenv eth1addr "00:50:43:25:fb:84"
 setenv eth2addr "00:50:43:84:25:2f"
 setenv eth3addr "00:50:43:0d:19:18"
+setenv ethaddr "00:50:43:84:fb:2f"
+setenv exit_on_critical_errors "on"
+setenv fdt_extrasize "0x00010000"
+setenv kver
+setenv load_addr_calc
+setenv overlay_error "false"
+setenv preset_fdtdir "${fdtdir}"
+setenv preset_fdtfile "${fdtfile}"
+setenv preset_kernel_comp_addr_r "${kernel_comp_addr_r}"
+setenv preset_kernel_comp_size "${kernel_comp_size}"
+setenv rootdev "/dev/mmcblk${devnum}p${distro_bootpart}"
+setenv rootfstype "ext4"
+setenv spi_workaround "off"
+setenv vendor "marvell"
+setenv verbosity "1"

-echo "Boot script loaded from ${devtype}"
+# load addresses
+setenv load_addr "0x00300000"
+setenv fdt_addr_r "0x02040000" # max size 256 KiB (=dtb+dto+fdt_extrasize)
+setenv kernel_addr_r "0x02080000" # max size 16 MiB
+setenv ramdisk_addr_r "0x03080000"

-if load ${devtype} ${devnum} ${load_addr} ${prefix}armbianEnv.txt; then
-	env import -t ${load_addr} ${filesize}
+# environment run variables
+setenv func_align_addr_next '
+	test "${align_overlap_oboe_avoidance}" = "on" && setexpr l_addr_next ${l_addr_next} + 1 ;
+	setexpr modulo ${l_addr_next} % ${align_to} ;
+	if itest ${modulo} -gt 0 ; then
+		setexpr l_addr_next ${l_addr_next} / ${align_to} ;
+		setexpr l_addr_next ${l_addr_next} + 1 ;
+		setexpr l_addr_next ${l_addr_next} * ${align_to} ;
+	fi'
+setenv func_inform 'test "${verbosity}" = "" || itest ${verbosity} -gt 0 && echo "${l_message}"'
+setenv func_warn 'echo "** WARNING: ${l_message}"'
+setenv func_critical_error '
+	echo "!! CRITICAL: ${l_message}" ;
+	if test "${exit_on_critical_errors}" = "on" ; then
+		false ;
+	else
+		true ;
+	fi'
+
+# set some defaults in case there are no pre-sets
+if test "${envfile}" = "" ; then
+	setenv l_envfile 'armbianEnv.txt'
+else
+	setenv l_envfile "${envfile}"
 fi

-setenv bootargs "console=ttyS0,115200 root=${rootdev} rootwait rootfstype=${rootfstype} ubootdev=${devtype} scandelay loglevel=${verbosity} usb-storage.quirks=${usbstoragequirks} ${extraargs}"
+echo "Boot script loaded from ${devtype} ${devnum}:${distro_bootpart}."

-load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
-load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}uInitrd
-load ${devtype} ${devnum} ${kernel_addr_r} ${prefix}zImage
+# load (merge) on-disk environment
+setenv l_file "${prefix}${l_envfile}"
+if test -e ${devtype} ${devnum}:${distro_bootpart} ${l_file} ; then
+	if load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${l_file} ; then
+		if env import -t ${load_addr} ${filesize} ; then
+			setenv l_message "Loaded/imported environment ${l_file} to/from ${load_addr}."
+			run func_inform
+		else
+			setenv l_message "Could not import environment ${l_file} - using default environment!"
+			run func_warn
+		fi
+	else
+		setenv l_message "Could not load environment ${l_file} - using default environment!"
+		run func_warn
+	fi
+fi

-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
-		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}
+# compose kernel commandline options (bootargs)
+setenv consoleargs
+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,115200 ${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
-	if test -e ${devtype} ${devnum} ${prefix}dtb/overlay/${overlay_prefix}-fixup.scr; then
-		load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/overlay/${overlay_prefix}-fixup.scr
-		echo "Applying kernel provided DT fixup script (${overlay_prefix}-fixup.scr)"
-		source ${load_addr}
+	setenv consoleargs "splash=verbose ${consoleargs}"
+fi
+
+part uuid ${devtype} ${devnum}:${distro_bootpart} l_ubootpart
+
+setenv bootargs "root=${rootdev} rootfstype=${rootfstype} rootwait ${consoleargs} consoleblank=0 loglevel=${verbosity} ubootpart=${l_ubootpart} 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
+
+if test "${vendor}" = "allwinner" ; then
+	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 -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
+if test "${vendor}" = "marvell" ; then
+	# nothing here yet
+fi
+if test "${vendor}" = "rockchip" ; then
+	# nothing here yet
+fi
+
+# check if we are requested (or are able to) use load address calculation
+if test "${load_addr_calc}" = "" ; then
+	if setexpr load_addr_calc 1 + 1 ; then
+		setenv load_addr_calc 'on'
+	else
+		setenv load_addr_calc 'off'
 	fi
 fi
+if test "${load_addr_calc}" != "on" ; then
+	setenv load_addr_calc 'off'
+
+	setenv l_message "Using fixed load addresses."
+	run func_inform
+	setenv l_message "  fdt_addr_r:     ${fdt_addr_r}"
+	run func_inform
+	setenv l_message "  kernel_addr_r:  ${kernel_addr_r}"
+	run func_inform
+	setenv l_message "  ramdisk_addr_r: ${ramdisk_addr_r}"
+	run func_inform
+fi
+
+if test "${kver}" != "" ; then
+	setenv l_message "Using version override ${kver} for image loading."
+	run func_inform
+fi
+
+# set a default kernel image type in case 'setexpr' not available
+if test "${cpu}" = "armv8" ; then
+	# aarch64 uses a flat kernel image
+	setenv l_kernel_image_type "flat"
+	setenv l_bootfile "Image${kver}"
+else
+	if test "${cpu}" = "armv7" ; then
+		# aarch32 mostly uses compressed kernel image
+		setenv l_kernel_image_type "compressed"
+		setenv l_bootfile "zImage${kver}"
+	else
+		# per default use compressed kernel image
+		setenv l_kernel_image_type "compressed"
+		setenv l_bootfile "zImage${kver}"
+	fi
+fi
+
+setenv l_ramdiskfile "uInitrd${kver}"
+
+# $fdtdir:
+#   some boards use "${prefix}dtb/" others use "${prefix}dtb/${vendor}/" as base location for the DT files
+#   user can also override by specifying an fdtdir=... in armbianEnv.txt
+#   try any U-Boot built-in (or pre-set) fdtdir as last resort
+# $fdtfile:
+#   some boards use a "filename.dts" others use "${vendor}/filename.dts"
+#   user can also override by specifying an fdtfile=... in armbianEnv.txt
+#   strip any leading path components and try any U-Boot built-in (or pre-set) fdtfile as last resort
+
+setenv l_fdtfile_basename
+setexpr l_fdtfile_basename sub ".*/" "" "${fdtfile}"
+if test "${l_fdtfile_basename}" = "" ; then
+	setenv l_fdtfile_basename "${fdtfile}"
+fi
+
+setenv l_fdtdir "${fdtdir}"
+setenv l_fdtfile "${l_fdtfile_basename}"
+if test -e ${devtype} ${devnum}:${distro_bootpart} "${l_fdtdir}/${l_fdtfile}" ; then
+	true
+else
+	setenv l_fdtdir "${prefix}dtb${kver}/${vendor}"
+	setenv l_fdtfile "${l_fdtfile_basename}"
+	if test -e ${devtype} ${devnum}:${distro_bootpart} "${l_fdtdir}/${l_fdtfile}" ; then
+		true
+	else
+		setenv l_fdtdir "${prefix}dtb${kver}"
+		setenv l_fdtfile "${l_fdtfile_basename}"
+		if test -e ${devtype} ${devnum}:${distro_bootpart} "${l_fdtdir}/${l_fdtfile}" ; then
+			true
+		else
+			setenv l_fdtdir "${fdtdir}"
+			setenv l_fdtfile "${fdtfile}"
+			if test -e ${devtype} ${devnum}:${distro_bootpart} "${l_fdtdir}/${l_fdtfile}" ; then
+				true
+			else
+				setenv l_fdtdir "${preset_fdtdir}"
+				setenv l_fdtfile "${preset_fdtfile}"
+				if test -e ${devtype} ${devnum}:${distro_bootpart} "${l_fdtdir}/${l_fdtfile}" ; then
+					true
+				else
+					false
+				fi
+			fi
+		fi
+	fi
+fi
+if itest $? -ne 0 ; then
+	setenv l_message "Cannot find DT!"
+	run func_critical_error || exit
+fi
+
+# load the device tree blob
+setenv l_file "${l_fdtdir}/${l_fdtfile}"
+if load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${l_file} ; then
+	setenv l_message "Loaded DT ${l_file} to ${fdt_addr_r}."
+	run func_inform
+
+	setenv l_fdt_filesize ${filesize}
+	fdt addr ${fdt_addr_r}
+	fdt resize ${fdt_extrasize}
+else
+	setenv l_message "Could not load DT ${l_file}!"
+	run func_critical_error || exit
+fi
+
+# process "overlays=..." from $l_envfile
+if test "${overlays}" != "" ; then
+	setenv l_message "Loading kernel provided DT overlay(s) from ${l_fdtdir}/overlay to ${load_addr} .."
+	run func_inform
+
+	# as some families offer overlays with different (or no) prefixes, try to guess the most commonly seen ones
+	# just changing overlay_prefix= will not work for all available overlays, as some have prefixes and some do not
+
+	setenv each_overlay
+	for each_overlay in ${overlays} ; do
+		setenv l_overlay_prefix "${overlay_prefix}"
+		setenv l_file "${l_fdtdir}/overlay/${l_overlay_prefix}-${each_overlay}.dtbo"
+		if test -e ${devtype} ${devnum}:${distro_bootpart} ${l_file} ; then
+			true
+		else
+			setenv l_overlay_prefix "${vendor}"
+			setenv l_file "${l_fdtdir}/overlay/${l_overlay_prefix}-${each_overlay}.dtbo"
+			if test -e ${devtype} ${devnum}:${distro_bootpart} ${l_file} ; then
+				setenv l_message "Found DT overlay ${l_overlay_prefix}-${each_overlay} instead of ${overlay_prefix}-${each_overlay} in ${l_fdtdir}/overlay!"
+				run func_warn
+				setenv l_message "Consider setting overlay_prefix=${l_overlay_prefix} in your ${l_envfile}."
+				run func_inform
+				true
+			else
+				setenv l_overlay_prefix "${vendor}-${soc}"
+				setenv l_file "${l_fdtdir}/overlay/${l_overlay_prefix}-${each_overlay}.dtbo"
+				if test -e ${devtype} ${devnum}:${distro_bootpart} ${l_file} ; then
+					setenv l_message "Found DT overlay ${l_overlay_prefix}-${each_overlay} instead of ${overlay_prefix}-${each_overlay} in ${l_fdtdir}/overlay!"
+					run func_warn
+					setenv l_message "Consider setting overlay_prefix=${l_overlay_prefix} in your ${l_envfile}."
+					run func_inform
+					true
+				else
+					false
+				fi
+			fi
+		fi
+		if itest $? -eq 0 ; then
+			if load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${l_file} ; then
+				if fdt apply ${load_addr} ; then
+					setenv l_message "Applied DT overlay ${each_overlay} (${l_file})."
+					run func_inform
+				else
+					setenv overlay_error "true"
+					setenv l_message "Could NOT apply DT overlay ${each_overlay} (${l_file})!"
+					run func_warn
+				fi
+			else
+				setenv l_message "Could NOT load DT overlay ${each_overlay} (${l_file})!"
+				run func_warn
+			fi
+		else
+			setenv l_message "Could NOT find DT overlay ${each_overlay}!"
+			run func_warn
+		fi
+	done
+fi
+
+# process "user_overlays=..." from $l_envfile
+if test "${user_overlays}" != "" ; then
+	setenv l_message "Loading user provided DT overlay(s) from ${prefix}overlay-user to ${load_addr} .."
+	run func_inform
+
+	setenv each_user_overlay
+	for each_user_overlay in ${user_overlays} ; do
+		setenv l_file "${prefix}overlay-user/${each_user_overlay}.dtbo"
+		if test -e ${devtype} ${devnum}:${distro_bootpart} ${l_file} ; then
+			if load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${l_file} ; then
+				if fdt apply ${load_addr} ; then
+					setenv l_message "Applied user DT overlay ${each_user_overlay} (${l_file})."
+					run func_inform
+				else
+					setenv overlay_error "true"
+					setenv l_message "Could NOT apply user DT overlay ${each_user_overlay} (${l_file})!"
+					run func_warn
+				fi
+			else
+				setenv l_message "Could NOT load user DT overlay ${each_user_overlay} (${l_file})!"
+				run func_warn
+			fi
+		else
+			setenv l_message "Could NOT find user DT overlay ${each_user_overlay} (${l_file})!"
+			run func_warn
+		fi
+	done
+fi
+if test "${overlay_error}" = "true" ; then
+	setenv l_message "Could not apply DT overlays!"
+	run func_warn
+
+	setenv l_file "${l_fdtdir}/${l_fdtfile}"
+	if load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${l_file} ; then
+		setenv l_message "Loaded original DT ${l_file} to ${fdt_addr_r}."
+		run func_inform
+
+		setenv l_fdt_filesize ${filesize}
+		fdt addr ${fdt_addr_r}
+		fdt resize ${fdt_extrasize}
+	else
+		setenv l_message "Could not load original DT ${l_file}!"
+		run func_critical_error || exit
+	fi
+else
+	# process any available DT fixup scripts
+	setenv l_fixup_scripts "${prefix}fixup.scr"
+	if test "${overlay_prefix}" != "" ; then
+		setenv l_fixup_scripts "${l_fdtdir}/overlay/${overlay_prefix}-fixup.scr ${l_fixup_scripts}"
+	fi
+	if test "${vendor}" != "" ; then
+		if test "${vendor}" != "${overlay_prefix}" ; then
+			setenv l_fixup_scripts "${l_fdtdir}/overlay/${vendor}-fixup.scr ${l_fixup_scripts}"
+		fi
+	fi
+
+	setenv each_fixup_script
+	for each_fixup_script in ${l_fixup_scripts} ; do
+		if test -e ${devtype} ${devnum}:${distro_bootpart} ${each_fixup_script} ; then
+			if load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${each_fixup_script} ; then
+				if source ${load_addr} ; then
+					setenv l_message "Loaded/sourced fixup script ${each_fixup_script} to/at ${load_addr}."
+					run func_inform
+				else
+					setenv l_message "Fixup script ${each_fixup_script} returned an error!"
+					run func_warn
+				fi
+			else
+				setenv l_message "Could not load fixup script ${each_fixup_script}!"
+				run func_warn
+			fi
+		fi
+	done
+fi

 # eMMC fix
 if test "${emmc_fix}" = "on"; then
-	echo "Applying eMMC compatibility fix to the DT"
+	echo "Applying eMMC compatibility fix to the DT."
 	fdt rm /soc/internal-regs/sdhci@d8000/ cd-gpios
 	fdt set /soc/internal-regs/sdhci@d8000/ non-removable
 fi

 # SPI - SATA workaround
 if test "${spi_workaround}" = "on"; then
-	echo "Applying SPI workaround to the DT"
-	fdt addr ${fdt_addr}
-	fdt resize
+	echo "Applying SPI workaround to the DT."
 	fdt set /soc/internal-regs/sata@e0000 status "disabled"
 	fdt set /soc/internal-regs/sata@a8000 status "disabled"
 	fdt set /soc/spi@10680 status "okay"
 	fdt set /soc/spi@10680/spi-flash@0 status "okay"
 fi

-bootz ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
+# resize (trim) device tree after all overlays have been applied and fixup scripts have been run
+fdt resize
+
+# determine the load address for the kernel image
+if test "${load_addr_calc}" = "on" ; then
+	# get the total size of the DT
+	setenv l_fdt_totalsize
+	fdt header get l_fdt_totalsize totalsize
+
+	if test "${l_fdt_totalsize}" = "" ; then
+		# could not get the total size of the DT so calculate it instead
+		setenv l_message "Calculating DT size."
+		run func_inform
+
+		# 'fdt resize' will align upwards to 4k address boundary
+		setexpr l_fdt_totalsize ${l_fdt_filesize} / 0x1000
+		setexpr l_fdt_totalsize ${l_fdt_totalsize} + 1
+		setexpr l_fdt_totalsize ${l_fdt_totalsize} * 0x1000
+		if test "${fdt_extrasize}" != "" ; then
+			setexpr l_fdt_totalsize ${l_fdt_totalsize} + ${fdt_extrasize}
+		fi
+	fi
+
+	setexpr l_addr_next ${fdt_addr_r} + ${l_fdt_totalsize}
+	run func_align_addr_next
+
+	setenv l_kernel_addr_r ${l_addr_next}
+else
+	setenv l_kernel_addr_r ${kernel_addr_r}
+fi
+
+setenv l_file "${prefix}${l_bootfile}"
+if load ${devtype} ${devnum}:${distro_bootpart} ${l_kernel_addr_r} ${l_file} ; then
+	if test "${load_addr_calc}" = "on" ; then
+		setenv kernel_comp_size ${filesize}
+	fi
+
+	setenv l_message "Loaded ${l_kernel_image_type} kernel image ${l_file} to ${l_kernel_addr_r}."
+	run func_inform
+else
+	if test "${load_addr_calc}" = "on" ; then
+		setenv kernel_comp_addr_r "${preset_kernel_comp_addr_r}"
+		setenv kernel_comp_size "${preset_kernel_comp_size}"
+	fi
+	setenv l_message "Could not load ${l_kernel_image_type} kernel image ${l_file}!"
+	run func_critical_error || exit
+fi
+
+# determine the load address for the initial ramdisk
+if test "${load_addr_calc}" = "on" ; then
+	# vmlinux image + 0x38 contain magic (le-double) 'ARMd'
+	setexpr l_ptr ${l_kernel_addr_r} + 0x00000038
+	setexpr.w l_magic_lsw *${l_ptr}
+
+	setexpr l_ptr ${l_kernel_addr_r} + 0x0000003a
+	setexpr.w l_magic_msw *${l_ptr}
+
+	if test "${l_magic_msw}${l_magic_lsw}" != "" && itest "${l_magic_msw}${l_magic_lsw}" -eq 0x644d5241 ; then
+		setenv l_kernel_image_type "flat"
+	else
+		setenv l_kernel_image_type "compressed"
+	fi
+
+	if test "${l_kernel_image_type}" = "flat" ; then
+		# vmlinux image + 0x10 contains image_size
+		setexpr l_ptr ${l_kernel_addr_r} + 0x00000010
+		setexpr.l l_image_size *${l_ptr}
+
+		setenv l_message "Using ${l_kernel_image_type} kernel image image_size 0x${l_image_size} bytes to calculate initial ramdisk load address."
+		run func_inform
+
+		# vmlinux image + 0x08 contains text_offset
+		setexpr l_ptr ${l_kernel_addr_r} + 0x00000008
+		setexpr.l l_text_offset *${l_ptr}
+
+		setenv l_message "Using ${l_kernel_image_type} kernel image text_offset 0x${l_text_offset} bytes to offset initial ramdisk load address."
+		run func_inform
+
+		setexpr l_addr_next ${l_kernel_addr_r} + ${l_image_size}
+		run func_align_addr_next
+
+		# take into account that U-Boot's booti_setup() might relocate the kernel image
+		setexpr l_addr_next ${l_addr_next} + ${l_text_offset}
+	else
+		setexpr l_addr_next ${l_kernel_addr_r} + ${filesize}
+		run func_align_addr_next
+
+		setenv l_message "Using ${l_kernel_image_type} kernel image filesize 0x${filesize} bytes to calculate initial ramdisk load address."
+		run func_inform
+	fi
+
+	setenv l_ramdisk_addr_r ${l_addr_next}
+else
+	setenv l_ramdisk_addr_r ${ramdisk_addr_r}
+fi
+
+setenv l_file "${prefix}${l_ramdiskfile}"
+if load ${devtype} ${devnum}:${distro_bootpart} ${l_ramdisk_addr_r} ${l_file} ; then
+	if test "${load_addr_calc}" = "on" ; then
+		setexpr l_addr_next ${l_ramdisk_addr_r} + ${filesize}
+		run func_align_addr_next
+
+		setenv kernel_comp_addr_r ${l_addr_next}
+	fi
+
+	setenv l_message "Loaded initial ramdisk ${l_file} to ${l_ramdisk_addr_r}."
+	run func_inform
+else
+	if test "${load_addr_calc}" = "on" ; then
+		setenv kernel_comp_addr_r "${preset_kernel_comp_addr_r}"
+		setenv kernel_comp_size "${preset_kernel_comp_size}"
+	fi
+	setenv l_message "Could not load initial ramdisk ${l_file}!"
+	run func_critical_error || exit
+fi
+
+# attempt to prepare for kernel address space randomization
+if kaslrseed ; then
+else
+	setenv l_message "Not able to prepare for KASLR."
+	run func_inform
+fi
+
+setenv l_message "Kernel commandline arguments:"
+run func_inform
+
+setenv each_bootarg
+for each_bootarg in ${bootargs} ; do
+	setenv l_message "  ${each_bootarg}"
+	run func_inform
+done
+
+if test "${l_kernel_image_type}" = "flat" ; then
+	booti ${l_kernel_addr_r} ${l_ramdisk_addr_r} ${fdt_addr_r}
+else
+	if test "${l_kernel_image_type}" = "compressed" ; then
+		bootz ${l_kernel_addr_r} ${l_ramdisk_addr_r} ${fdt_addr_r}
+	else
+		# default booting command
+		bootz ${l_kernel_addr_r} ${l_ramdisk_addr_r} ${fdt_addr_r}
+	fi
+fi
+
+# booting failed, restore environment variables that are not unique
+# to this bootmeth
+if test "${load_addr_calc}" = "on" ; then
+	# restore original presets
+	setenv kernel_comp_addr_r "${preset_kernel_comp_addr_r}"
+	setenv kernel_comp_size "${preset_kernel_comp_size}"
+fi
+
+setenv l_message "Could not boot kernel!"
+run func_critical_error || exit

 # Recompile with:
 # mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr
--- a/config/bootscripts/boot-qemu-arm64.cmd
+++ b/config/bootscripts/boot-qemu-arm64.cmd
@@ -10,7 +10,7 @@ echo "INITRD LOAD ADDRESS: ramdisk_addr_r: ${ramdisk_addr_r}"
 echo "FDT LOAD ADDRESS   : fdt_addr      : ${fdt_addr}"

 # /vmlinuz and /initrd.img are standard Debian symlinks to the "latest installed kernel"
-load ${devtype} ${devnum}:${distro_bootpart} ${kernel_addr_r} /vmlinuz
+load ${devtype} ${devnum}:${distro_bootpart} ${kernel_addr_r} ${prefix}vmlinuz
 # Attention, this is uInitrd for uboot/ARM; there's a symlink put there by Armbian hooks
 load ${devtype} ${devnum}:${distro_bootpart} ${ramdisk_addr_r} ${prefix}uInitrd

--- a/config/cli/common/main/packages.additional
+++ b/config/cli/common/main/packages.additional
@@ -47,7 +47,7 @@ qrencode
 rfkill
 rng-tools
 screen
-software-properties-common
+#software-properties-common
 smartmontools
 stress
 sysfsutils
--- a/config/desktop/bookworm/environments/kde-plasma/config_base/packages
+++ b/config/desktop/bookworm/environments/kde-plasma/config_base/packages
@@ -77,9 +77,9 @@ pasystray
 pavucontrol
 pavucontrol-qt
 pavumeter
+pkexec
 plasma-discover
 polkitd
-pkexec
 printer-driver-all
 profile-sync-daemon
 pulseaudio-module-bluetooth
--- a/config/desktop/common/environments/budgie/config_base/packages
+++ b/config/desktop/common/environments/budgie/config_base/packages
@@ -83,7 +83,6 @@ gvfs-backends
 hplip
 indicator-printers
 inputattach
-kerneloops
 keyutils
 language-pack-gnome-de
 language-pack-gnome-en
@@ -130,11 +129,11 @@ pamix
 pasystray
 pavucontrol
 pavucontrol-qt
-pavumeter
+pkexec
 plank
-policykit-1
 policykit-1-gnome
 policykit-desktop-privileges
+polkitd
 printer-driver-all
 profile-sync-daemon
 pulseaudio-module-bluetooth
--- a/config/desktop/common/environments/cinnamon/config_base/packages
+++ b/config/desktop/common/environments/cinnamon/config_base/packages
@@ -88,8 +88,9 @@ p7zip-full
 pamix
 pasystray
 pavucontrol
-policykit-1
+pkexec
 policykit-desktop-privileges
+polkitd
 printer-driver-all
 profile-sync-daemon
 pulseaudio-module-bluetooth
--- a/config/desktop/common/environments/deepin/config_base/packages
+++ b/config/desktop/common/environments/deepin/config_base/packages
@@ -95,7 +95,6 @@ gvfs-backends
 hplip
 indicator-printers
 inputattach
-kerneloops
 keyutils
 language-pack-gnome-de
 language-pack-gnome-en
@@ -137,9 +136,9 @@ pamix
 pasystray
 pavucontrol
 pavucontrol-qt
-pavumeter
-policykit-1
+pkexec
 policykit-desktop-privileges
+polkitd
 printer-driver-all
 profile-sync-daemon
 pulseaudio-module-bluetooth
--- a/config/desktop/common/environments/enlightenment/config_base/packages
+++ b/config/desktop/common/environments/enlightenment/config_base/packages
@@ -58,7 +58,6 @@ gvfs-backends
 hplip
 indicator-printers
 inputattach
-kerneloops
 keyutils
 language-pack-gnome-de
 language-pack-gnome-en
@@ -102,10 +101,10 @@ pamix
 pasystray
 pavucontrol
 pavucontrol-qt
-pavumeter
+pkexec
 plank
-policykit-1
 policykit-desktop-privileges
+polkitd
 printer-driver-all
 profile-sync-daemon
 pulseaudio-module-bluetooth
--- a/config/desktop/common/environments/i3-wm/config_base/packages
+++ b/config/desktop/common/environments/i3-wm/config_base/packages
@@ -43,7 +43,6 @@ foomatic-db-compressed-ppds
 gdebi
 ghostscript-x
 gir1.2-appindicator3-0.1
-gnome-bluetooth
 gnome-disk-utility
 gnome-font-viewer
 gnome-orca
@@ -62,7 +61,6 @@ i3-wm
 suckless-tools
 indicator-printers
 inputattach
-kerneloops
 keyutils
 language-pack-en
 laptop-detect
@@ -76,7 +74,6 @@ libfontembed1
 libfontenc1
 libgail-common
 libgl1-mesa-dri
-libgnome-bluetooth13
 libgsettings-qt1
 libjson-xs-perl
 libnotify-bin
@@ -100,10 +97,10 @@ pamix
 pasystray
 pavucontrol
 pavucontrol-qt
-pavumeter
-policykit-1
+pkexec
 policykit-1-gnome
 policykit-desktop-privileges
+polkitd
 printer-driver-all
 profile-sync-daemon
 pulseaudio-module-bluetooth
--- a/config/desktop/common/environments/kde-plasma/config_base/packages
+++ b/config/desktop/common/environments/kde-plasma/config_base/packages
@@ -57,7 +57,6 @@ hplip
 indicator-printers
 inputattach
 kde-plasma-desktop
-kerneloops
 keyutils
 language-pack-gnome-de
 language-pack-gnome-en
@@ -96,13 +95,13 @@ pamix
 pasystray
 pavucontrol
 pavucontrol-qt
-pavumeter
-policykit-1
+pkexec
 policykit-desktop-privileges
+polkitd
 printer-driver-all
 profile-sync-daemon
 pulseaudio-module-bluetooth
-plasma-workspace-wayland
+plasma-workspace
 redshift
 samba
 smbclient
--- a/config/desktop/common/environments/mate/config_base/packages
+++ b/config/desktop/common/environments/mate/config_base/packages
@@ -57,7 +57,6 @@ gvfs-backends
 hplip
 indicator-printers
 inputattach
-kerneloops
 keyutils
 language-pack-gnome-de
 language-pack-gnome-en
@@ -157,7 +156,6 @@ pamix
 pasystray
 pavucontrol
 pavucontrol-qt
-pavumeter
 printer-driver-all
 profile-sync-daemon
 pulseaudio-module-bluetooth
--- a/config/desktop/common/environments/xfce/config_base/packages
+++ b/config/desktop/common/environments/xfce/config_base/packages
@@ -69,9 +69,9 @@ p7zip-full
 pamix
 pasystray
 pavucontrol
-pavumeter
-policykit-1
+pkexec
 policykit-desktop-privileges
+polkitd
 printer-driver-all
 profile-sync-daemon
 pulseaudio
--- a/config/desktop/common/environments/xmonad/config_base/packages
+++ b/config/desktop/common/environments/xmonad/config_base/packages
@@ -38,7 +38,6 @@ fonts-ubuntu-font-family-console
 foomatic-db-compressed-ppds
 ghostscript-x
 gir1.2-appindicator3-0.1
-gnome-bluetooth
 gnome-disk-utility
 gnome-font-viewer
 gromit
@@ -49,7 +48,6 @@ gvfs-backends
 hplip
 indicator-printers
 inputattach
-kerneloops
 keyutils
 language-pack-de
 language-pack-en
@@ -69,7 +67,6 @@ libfontenc1
 libgail-common
 libghc-xmonad-contrib-dev
 libghc-xmonad-wallpaper-dev
-libgnome-bluetooth13
 libgsettings-qt1
 libnotify-bin
 libproxy1-plugin-gsettings
@@ -89,10 +86,10 @@ pamix
 pasystray
 pavucontrol
 pavucontrol-qt
-pavumeter
-policykit-1
+pkexec
 policykit-1-gnome
 policykit-desktop-privileges
+polkitd
 printer-driver-all
 profile-sync-daemon
 pulseaudio-module-bluetooth
--- a/config/desktop/jammy/environments/budgie/config_base/packages
+++ b/config/desktop/jammy/environments/budgie/config_base/packages
@@ -83,7 +83,6 @@ hplip
 indicator-printers
 inputattach
 inxi
-kerneloops
 keyutils
 language-pack-gnome-de
 language-pack-gnome-en
--- a/config/desktop/jammy/environments/i3-wm/config_base/packages
+++ b/config/desktop/jammy/environments/i3-wm/config_base/packages
@@ -61,7 +61,6 @@ i3-wm
 suckless-tools
 indicator-printers
 inputattach
-kerneloops
 keyutils
 language-pack-en
 laptop-detect
--- a/config/desktop/jammy/environments/kde-plasma/config_base/packages
+++ b/config/desktop/jammy/environments/kde-plasma/config_base/packages
@@ -57,7 +57,6 @@ indicator-printers
 inputattach
 inxi
 kde-plasma-desktop
-kerneloops
 keyutils
 kwin-x11
 language-pack-gnome-de
--- a/config/desktop/jammy/environments/xmonad/config_base/packages
+++ b/config/desktop/jammy/environments/xmonad/config_base/packages
@@ -51,7 +51,6 @@ hplip
 indicator-printers
 inputattach
 inxi
-kerneloops
 keyutils
 language-pack-de
 language-pack-en
--- a/config/desktop/noble/environments/i3-wm/config_base/packages
+++ b/config/desktop/noble/environments/i3-wm/config_base/packages
@@ -59,7 +59,6 @@ i3-wm
 suckless-tools
 indicator-printers
 inputattach
-kerneloops
 keyutils
 language-pack-en
 laptop-detect
--- a/config/desktop/plucky/environments/i3-wm/config_base/packages
+++ b/config/desktop/plucky/environments/i3-wm/config_base/packages
@@ -42,7 +42,6 @@ foomatic-db-compressed-ppds
 gdebi
 ghostscript-x
 gir1.2-appindicator3-0.1
-gnome-bluetooth
 gnome-disk-utility
 gnome-font-viewer
 gnome-power-manager
@@ -59,7 +58,6 @@ i3-wm
 suckless-tools
 indicator-printers
 inputattach
-kerneloops
 keyutils
 language-pack-en
 laptop-detect
@@ -94,9 +92,10 @@ pamix
 pasystray
 pavucontrol
 pavucontrol-qt
-policykit-1
+pkexec
 policykit-1-gnome
 policykit-desktop-privileges
+polkitd
 printer-driver-all
 profile-sync-daemon
 redshift
--- a/config/desktop/sid/environments/xfce/config_base/packages
+++ b/config/desktop/sid/environments/xfce/config_base/packages
@@ -67,7 +67,6 @@ p7zip-full
 pamix
 pasystray
 pavucontrol
-#pavumeter
 polkitd
 pkexec
 #printer-driver-all
--- a/config/desktop/trixie
+++ b/config/desktop/trixie
@@ -1 +0,0 @@
-bookworm
--- a/Show More
+++ b/Show More