📝 Add docstrings to rgblogo

Docstrings generation was requested by @igorpecovnik. * https://github.com/armbian/build/pull/8018#issuecomment-2761030989 The following files were modified: * `lib/functions/configuration/main-config.sh`
Add support for MOTD logo colors
2025-09-24 19:47:06 +07:00 · 2025-03-28 11:36:20 +00:00 · 2025-03-28 12:27:06 +01:00 · 2025-03-27 19:24:07 +01:00 · 2025-03-27 19:24:07 +01:00 · 2025-03-27 19:24:07 +01:00
2317 changed files with 356808 additions and 37321 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -17,23 +17,29 @@ tools/			@iav @neheb @hzyitc @mhoffrog

 # The following contents are generated by board configs
 config/boards/aml-a311d-cc.conf		@Tonymac32
-config/boards/aml-c400-plus.tvb		@jomadeto
+config/boards/aml-c400-plus.conf		@jomadeto
 config/boards/aml-s905d3-cc.wip		@Tonymac32
 config/boards/aml-s9xx-box.tvb		@SteeManMI
 config/boards/armsom-sige1.csc		@amazingfate
 config/boards/armsom-sige3.csc		@amazingfate
 config/boards/avaota-a1.csc		@chainsx
-config/boards/ayn-odin2.eos		@FantasyGmm
+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/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/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
@@ -75,6 +81,7 @@ config/boards/mekotronics-r58-minipc.csc		@monkaBlyat
 config/boards/mekotronics-r58x-4g.csc		@monkaBlyat
 config/boards/mekotronics-r58x.csc		@monkaBlyat
 config/boards/mixtile-blade3.csc		@rpardini
+config/boards/mksklipad50.conf		@torte71
 config/boards/mkspi.csc		@redrathnure
 config/boards/nanopct6-lts.conf		@SuperKali @Tonymac32
 config/boards/nanopct6.conf		@SuperKali @Tonymac32
@@ -95,10 +102,11 @@ config/boards/odroidc2.conf		@teknoid
 config/boards/odroidc4.conf		@igorpecovnik
 config/boards/odroidhc4.conf		@igorpecovnik
 config/boards/odroidm1.conf		@rpardini
+config/boards/odroidm2.csc		@mlegenovic
 config/boards/odroidn2.conf		@NicoD-SBC
 config/boards/odroidxu4.conf		@joekhoobyar
 config/boards/olimex-teres-a64.csc		@Kreyren
-config/boards/onecloud.conf		@hzyitc
+config/boards/onecloud.csc		@hzyitc
 config/boards/oneplus-kebab.conf		@amazingfate
 config/boards/orangepi4-lts.conf		@paolosabatino
 config/boards/orangepi4.csc		@paolosabatino
@@ -114,7 +122,8 @@ config/boards/orangepizeroplus.csc		@schwar3kat
 config/boards/phytiumpi.conf		@chainsx
 config/boards/pine64.conf		@PanderMusubi
 config/boards/pinebook-pro.csc		@TRSx80 @ahoneybun
-config/boards/pocketchip.csc		@TheSnowfield
+config/boards/pocketbeagle2.csc		@Grippy98
+config/boards/pocketchip-sd.csc		@TheSnowfield
 config/boards/qemu-uboot-arm64.csc		@rpardini
 config/boards/qemu-uboot-x86.csc		@rpardini
 config/boards/qemu-uefi-x86.conf		@davidandreoletti
@@ -128,14 +137,17 @@ config/boards/renegade.conf		@Tonymac32
 config/boards/retro-lite-cm5.csc		@ginkage
 config/boards/rk3318-box.tvb		@paolosabatino
 config/boards/rk3328-heltec.csc		@sicXnull
+config/boards/rock-2a.csc		@CodeChenL
+config/boards/rock-2f.csc		@CodeChenL
 config/boards/rock-3a.conf		@ZazaBR @amazingfate @catalinii @vamzii
 config/boards/rock-5-itx.conf		@amazingfate @prahal
 config/boards/rock-5a.conf		@amazingfate
 config/boards/rock-5b-plus.conf		@HeyMeco @fridtjof
 config/boards/rock-5b.conf		@amazingfate @linhz0hz
 config/boards/rock-5c.conf		@schwar3kat
+config/boards/rock-5t.conf		@HeyMeco
 config/boards/rock-s0.conf		@brentr
-config/boards/rock64.csc		@clee
+config/boards/rock64.conf		@clee
 config/boards/rockpi-4a.csc		@clee
 config/boards/rockpi-e.conf		@paolosabatino
 config/boards/rockpi-s.conf		@brentr
@@ -145,6 +157,7 @@ config/boards/sakurapi-rk3308b.csc		@TheSnowfield
 config/boards/sk-am62b.conf		@glneo
 config/boards/sk-am64b.conf		@glneo
 config/boards/sk-am68.conf		@glneo
+config/boards/sk-am69.conf		@glneo
 config/boards/sk-tda4vm.conf		@glneo
 config/boards/station-m1.csc		@150balbes
 config/boards/station-m3.csc		@chainsx
@@ -160,64 +173,139 @@ 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/kernel/linux-arm64-*.config		@FantasyGmm
+config/boards/yy3568.csc		@hqnicolas
+config/kernel/linux-arm64-*.config		@PeterChrz @rpardini
 config/kernel/linux-bcm2711-*.config		@PanderMusubi @teknoid
-config/kernel/linux-imx8m-*.config		@schmiedelm
-config/kernel/linux-k3-*.config		@glneo
+config/kernel/linux-k3-*.config		@Grippy98 @glneo
+config/kernel/linux-k3-beagle-*.config		@Grippy98
 config/kernel/linux-meson-*.config		@hzyitc @juanlufont
 config/kernel/linux-meson-s4t7-*.config		@adeepn @rpardini @viraniac
 config/kernel/linux-meson64-*.config		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @clee @engineer-80 @igorpecovnik @jeanrhum @jomadeto @monkaBlyat @pyavitz @rpardini @teknoid
 config/kernel/linux-mvebu-*.config		@Heisath
 config/kernel/linux-odroidxu4-*.config		@joekhoobyar
 config/kernel/linux-phytium-embedded-*.config		@chainsx
-config/kernel/linux-rk35xx-*.config		@ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
+config/kernel/linux-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-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 @paolosabatino @prahal @redrathnure @rpardini @schwar3kat @sicXnull @tdleiyao @utlark @vamzii
-config/kernel/linux-sm8250-*.config		@FantasyGmm @amazingfate
+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-sm8250-*.config		@amazingfate
+config/kernel/linux-sm8550-*.config		@FantasyGmm
+config/kernel/linux-spacemit-*.config		@pyavitz
 config/kernel/linux-sun55iw3-syterkit-*.config		@chainsx
-config/kernel/linux-sunxi-*.config		@1ubuntuuser @AaronNGray @DylanHP @Janmcha @StephenGraf @TheSnowfield @Tonymac32 @janprunk @lbmendes @mhawkins-consultant @sgjava @spendist
-config/kernel/linux-sunxi64-*.config		@AGM1968 @IsMrX @JohnTheCoolingFan @Kreyren @NicoD-SBC @PanderMusubi @Ressetkk @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @krachlatte @pyavitz @schwar3kat @sicXnull @spendist @teknoid
+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
 config/kernel/linux-thead-*.config		@chainsx
-config/kernel/linux-uefi-arm64-*.config		@PeterChrz @rpardini
+config/kernel/linux-tqma-*.config		@schmiedelm
+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/		@PeterChrz @rpardini
+patch/atf/atf-bcm2711/		@PanderMusubi @teknoid
+patch/atf/atf-imx8m/		@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-sm8250/		@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
+patch/atf/atf-wsl2-arm64/		@rpardini
+patch/kernel/archive/bcm2711-*/		@PanderMusubi @teknoid
+patch/kernel/archive/imx8m-*/		@schmiedelm
+patch/kernel/archive/k3-*/		@Grippy98 @glneo
+patch/kernel/archive/k3-beagle-*/		@Grippy98
+patch/kernel/archive/meson-*/		@hzyitc @juanlufont
 patch/kernel/archive/meson-s4t7-*/		@adeepn @rpardini @viraniac
+patch/kernel/archive/meson64-*/		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @clee @engineer-80 @igorpecovnik @jeanrhum @jomadeto @monkaBlyat @pyavitz @rpardini @teknoid
+patch/kernel/archive/mvebu-*/		@Heisath
 patch/kernel/archive/odroidxu4-*/		@joekhoobyar
-patch/kernel/archive/sunxi-*/		@1ubuntuuser @AGM1968 @AaronNGray @DylanHP @IsMrX @Janmcha @JohnTheCoolingFan @Kreyren @NicoD-SBC @PanderMusubi @Ressetkk @StephenGraf @TheSnowfield @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @janprunk @krachlatte @lbmendes @mhawkins-consultant @pyavitz @schwar3kat @sgjava @sicXnull @spendist @teknoid
+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/sm8250-*/		@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/bcm2711-*/		@PanderMusubi @teknoid
-patch/kernel/imx8m-*/		@schmiedelm
-patch/kernel/k3-*/		@glneo
-patch/kernel/meson-*/		@hzyitc @juanlufont
-patch/kernel/meson64-*/		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @clee @engineer-80 @igorpecovnik @jeanrhum @jomadeto @monkaBlyat @pyavitz @rpardini @teknoid
-patch/kernel/mvebu-*/		@Heisath
-patch/kernel/odroidxu4-*/		@joekhoobyar
+patch/kernel/archive/wsl2-arm64-*/		@rpardini
+patch/kernel/archive/wsl2-x86-*/		@rpardini
 patch/kernel/phytium-embedded-*/		@chainsx
-patch/kernel/rk35xx-vendor-*/		@ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
-patch/kernel/rockchip-*/		@paolosabatino
-patch/kernel/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 @paolosabatino @prahal @redrathnure @rpardini @schwar3kat @sicXnull @tdleiyao @utlark @vamzii
-patch/kernel/sm8250-*/		@FantasyGmm @amazingfate
-patch/kernel/sm8550-*/		@FantasyGmm
+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/sun55iw3-syterkit-*/		@chainsx
 patch/kernel/thead-*/		@chainsx
-sources/families/arm64.conf		@FantasyGmm @PeterChrz @rpardini
+patch/kernel/wsl2-arm64-*/		@rpardini
+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-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 @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
+patch/u-boot/u-boot-tqma/		@schmiedelm
+patch/u-boot/v2022.01/		@teknoid
+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/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.07-coolpi-cm5/		@andyshrk
+patch/u-boot/v2024.07/		@adeepn @andyshrk @igorpecovnik @monkaBlyat
+patch/u-boot/v2024.07/board_station-m1/		@150balbes
+patch/u-boot/v2024.10/		@HeyMeco @alexl83 @brentr @fridtjof
+patch/u-boot/v2024.10/board_bigtreetech-cb2/		@JohnTheCoolingFan
+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 @torte71 @vamzii
+patch/u-boot/v2025.01/board_bananapim4berry/		@The-going
+patch/u-boot/v2025.01/board_h96-tvbox-3566/		@hqnicolas
+patch/u-boot/v2025.04-rc4/		@mlegenovic
+patch/u-boot/v2025.04/		@SuperKali @Tonymac32
 sources/families/bcm2711.conf		@PanderMusubi @teknoid
 sources/families/imx8m.conf		@schmiedelm
-sources/families/k3.conf		@glneo
+sources/families/jethub.conf		@adeepn
+sources/families/k3.conf		@Grippy98 @glneo
+sources/families/meson-axg.conf		@pyavitz
+sources/families/meson-g12a.conf		@clee @engineer-80
+sources/families/meson-g12b.conf		@NicoD-SBC @Tonymac32 @jeanrhum @monkaBlyat @pyavitz @rpardini
+sources/families/meson-gxbb.conf		@teknoid
+sources/families/meson-gxl.conf		@SteeManMI @Tonymac32 @igorpecovnik @jomadeto
 sources/families/meson-s4t7.conf		@adeepn @rpardini @viraniac
-sources/families/meson.conf		@hzyitc @juanlufont
-sources/families/meson64.conf		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @clee @engineer-80 @igorpecovnik @jeanrhum @jomadeto @monkaBlyat @pyavitz @rpardini @teknoid
+sources/families/meson-sm1.conf		@Tonymac32 @igorpecovnik @rpardini
+sources/families/meson8b.conf		@hzyitc @juanlufont
 sources/families/mvebu.conf		@Heisath
 sources/families/odroidxu4.conf		@joekhoobyar
 sources/families/phytium-embedded.conf		@chainsx
-sources/families/rk35xx.conf		@ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
+sources/families/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/rockchip.conf		@paolosabatino
-sources/families/rockchip64.conf		@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 @paolosabatino @prahal @redrathnure @rpardini @schwar3kat @sicXnull @tdleiyao @utlark @vamzii
-sources/families/sm8250.conf		@FantasyGmm @amazingfate
+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/sm8250.conf		@amazingfate
+sources/families/sm8550.conf		@FantasyGmm
+sources/families/spacemit.conf		@pyavitz
+sources/families/sun50iw1.conf		@Kreyren @PanderMusubi @devdotnetorg @eliasbakken
+sources/families/sun50iw2.conf		@AGM1968 @Tonymac32 @schwar3kat @spendist @teknoid
+sources/families/sun50iw6.conf		@NicoD-SBC
+sources/families/sun50iw9-bpi.conf		@The-going @pyavitz
+sources/families/sun50iw9.conf		@AGM1968 @IsMrX @JohnTheCoolingFan @Ressetkk @alexl83 @chraac @krachlatte @sicXnull
 sources/families/sun55iw3-syterkit.conf		@chainsx
-sources/families/sunxi.conf		@1ubuntuuser @AaronNGray @DylanHP @Janmcha @StephenGraf @TheSnowfield @Tonymac32 @janprunk @lbmendes @mhawkins-consultant @sgjava @spendist
-sources/families/sunxi64.conf		@AGM1968 @IsMrX @JohnTheCoolingFan @Kreyren @NicoD-SBC @PanderMusubi @Ressetkk @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @krachlatte @pyavitz @schwar3kat @sicXnull @spendist @teknoid
+sources/families/sun5i.conf		@TheSnowfield
+sources/families/sun7i.conf		@DylanHP @janprunk
+sources/families/sun8i.conf		@1ubuntuuser @AaronNGray @Janmcha @StephenGraf @Tonymac32 @lbmendes @leggewie @mhawkins-consultant @sgjava @spendist
 sources/families/thead.conf		@chainsx
-sources/families/x86.conf		@davidandreoletti @rpardini
+sources/families/uefi-arm64.conf		@PeterChrz @rpardini
+sources/families/uefi-x86.conf		@davidandreoletti @rpardini
--- 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/generate_CODEOWNERS.sh
+++ b/.github/generate_CODEOWNERS.sh
@@ -3,18 +3,24 @@
 SRC="$(realpath "${BASH_SOURCE%/*}/../")"

 # Dummy function for successful source
-function display_alert() {
-	:
-}
-function enable_extension() {
-	:
+function display_alert() { :; }
+function enable_extension() { :; }
+function add_packages_to_image() { :; }
+
+function run_hook() {
+	local hook_point="$1"
+	while read -r hook_point_function; do
+		"${hook_point_function}"
+	done < <(compgen -A function | grep "^${hook_point}__" | LC_ALL=C.UTF-8 sort)
 }

 # $1: board config
 function generate_for_board() {
 	local board_config="$1"
 	(
+		BOARD="${board_config%.*}"
 		source "${SRC}/config/boards/${board_config}"
+
 		LINUXFAMILY="${BOARDFAMILY}"

 		[[ -n "${BOARD_MAINTAINER}" ]] || return
@@ -26,13 +32,18 @@ function generate_for_board() {
 				source "${SRC}/config/sources/common.conf"
 				source "${SRC}/config/sources/${ARCH}.conf"

+				run_hook "post_family_config"
+				run_hook "post_family_config_branch_${BRANCH,,}"
+
 				[[ -z $LINUXCONFIG ]] && LINUXCONFIG="linux-${LINUXFAMILY}-${BRANCH}"
-				[[ -z $KERNELPATCHDIR ]] && KERNELPATCHDIR="$LINUXFAMILY-$BRANCH"
+				[[ -z $KERNELPATCHDIR ]] && KERNELPATCHDIR="archive/${LINUXFAMILY}-${KERNEL_MAJOR_MINOR}"
+				[[ -z $BOOTPATCHDIR ]] && BOOTPATCHDIR="u-boot-${LINUXFAMILY}"
+				[[ -z $ATFPATCHDIR ]] && ATFPATCHDIR="atf-${LINUXFAMILY}"

 				cat <<-EOF
 					config/boards/${board_config}			${maintainers}
 					config/kernel/${LINUXCONFIG%-*}-*.config	${maintainers}
-					sources/families/${LINUXFAMILY}.conf		${maintainers}
+					sources/families/${BOARDFAMILY}.conf		${maintainers}
 					patch/kernel/${KERNELPATCHDIR%-*}-*/		${maintainers}
 				EOF

@@ -41,6 +52,16 @@ function generate_for_board() {
 					patch_archive="${patch_archive%/}"
 					echo "patch/kernel/${patch_archive%-*}-*/	${maintainers}"
 				fi
+
+				if [[ -n "${BOOTCONFIG}" && "${BOOTCONFIG}" != "none" ]]; then
+					while read -r d; do
+						echo "patch/u-boot/${d}/		${maintainers}"
+					done < <(echo "${BOOTPATCHDIR}" | xargs -n1)
+				fi
+
+				if [[ -n "${ATFSOURCE}" && "${ATFSOURCE}" != "none" ]]; then
+					echo "patch/atf/${ATFPATCHDIR}/			${maintainers}"
+				fi
 			)
 		done < <(echo "${KERNEL_TARGET}" | tr ',' '\n')
 	)
@@ -68,9 +89,9 @@ function merge() {
 	local file
 	while read -r file; do
 		declare -a maintainers
-		readarray -t maintainers < <(echo "${codeowners["$file"]}" | xargs -n1 | sort -u)
+		readarray -t maintainers < <(echo "${codeowners["$file"]}" | xargs -n1 | LC_ALL=C.UTF-8 sort -u)
 		echo "${file}		${maintainers[*]}"
-	done < <(printf "%s\n" "${!codeowners[@]}" | sort)
+	done < <(printf "%s\n" "${!codeowners[@]}" | LC_ALL=C.UTF-8 sort)
 }

 cat <<-EOF >"${SRC}/.github/CODEOWNERS"
--- a/.github/workflows/pr-kernel-security-analysis.yml
+++ b/.github/workflows/pr-kernel-security-analysis.yml
@@ -1,11 +1,27 @@
 name: Kernel Hardening Analysis
 run-name: 'Check kernel security options - PR #${{ github.event.pull_request.number }} ("${{ github.event.pull_request.title }}")'
+
+# -----------------------------------------------------------------------------
+# This workflow analyzes Linux kernel configuration files to check for 
+# security hardening options using the kernel-hardening-checker tool.
 #
-#  Check the Linux kernel options against security hardening
+# ⚠️ Important: 
+# Modifying security parameters may impact system performance and 
+# functionality of userspace software.
 #
-#  Attention! Changing security parameters may also affect system performance and functionality of userspace software!
-#  More info:
-#  https://github.com/a13xp0p0v/kernel-hardening-checker
+# More info:
+# https://github.com/a13xp0p0v/kernel-hardening-checker
+#
+# Triggers:
+# - Manually via workflow_dispatch
+# - On pull request events: ready_for_review, opened, reopened, or synchronized
+#
+# Features:
+# - Runs only for PRs targeting the 'Armbian' repository
+# - Validates kernel `.config` files for security best practices
+# - Skips RISC-V configurations due to known compatibility issues
+# - Provides a formatted security report in GitHub Actions summary
+# -----------------------------------------------------------------------------

 on:
  workflow_dispatch:
@@ -17,7 +33,7 @@ permissions:
  contents: read

 concurrency:
-  group: pipeline-security-${{github.event.pull_request.number}}
+  group: pipeline-security-${{ github.event.pull_request.number }}
  cancel-in-progress: true

 jobs:
@@ -33,22 +49,23 @@ jobs:
          fetch-depth: 0

      - name: Get changed files
-        id: changed-files
-        uses: tj-actions/changed-files@v45
+        id: files
+        uses: UplandJacob/retrieve-changed-files@v4

-      - name: Checkout repository
+      - name: Checkout kernel-hardening-checker
        uses: actions/checkout@v4
        with:
          repository: a13xp0p0v/kconfig-hardened-check
          path: kconfig-hardened-check

-      - name: Check kernel config for security issues
-        # Run kernel-hardening-checker for each kernel config file excluding RISC-V configs, since they are not supported yet.
-        # See https://github.com/a13xp0p0v/kernel-hardening-checker/issues/56
-        # sed explanation: 1) Put spaces in front of every line 2) replace colored output with emojis since GitHub Actions job summaries don't support colored output
+      - name: Run kernel security analysis
        run: |
-          for file in ${{ steps.changed-files.outputs.all_changed_files }}; do
+          for file in ${{ steps.files.outputs.all }}; do
+              # Process only kernel configuration files and skip RISC-V configs
              if [[ "${file}" = config/kernel/*.config && ! $(head -n 10 "${file}" | grep -q "riscv") ]]; then
-                  kconfig-hardened-check/bin/kernel-hardening-checker -m show_fail -c $file | sed 's/^/     /; s/\x1b\[32m/✅ /; s/\x1b\[31m/❌ /; s/\x1b\[0m//' >> $GITHUB_STEP_SUMMARY
+                  # Run security checks and format output for GitHub Actions summary
+                  kconfig-hardened-check/bin/kernel-hardening-checker -m show_fail -c $file \
+                      | sed 's/^/     /; s/\x1b\[32m/✅ /; s/\x1b\[31m/❌ /; s/\x1b\[0m//' \
+                      >> $GITHUB_STEP_SUMMARY
              fi
          done
--- a/.github/workflows/pr-lint-scripts.yml
+++ b/.github/workflows/pr-lint-scripts.yml
@@ -1,8 +1,21 @@
 name: Lint on Scripts
-run-name: 'Shellcheck - PR #${{ github.event.pull_request.number }} ("${{ github.event.pull_request.title }}")'
+run-name: 'ShellCheck - PR #${{ github.event.pull_request.number }} ("${{ github.event.pull_request.title }}")'
+
+# -----------------------------------------------------------------------------
+# This workflow runs ShellCheck on all relevant shell scripts in the repository
+# to ensure code quality, best practices, and prevent common scripting errors.
+# It generates a linting report and provides feedback for pull requests.
 #
-# Run ShellCheck on all scripts and generate report as build artifact
+# Triggers:
+# - Manually via workflow_dispatch
+# - On pull request events: opened, reopened, or synchronized with new commits
 #
+# Features:
+# - Runs only for PRs targeting the 'Armbian' repository
+# - Checks only modified shell scripts while ignoring non-shell files
+# - Ensures accurate analysis by leveraging framework-specific mechanisms
+# - Uses concurrency control to prevent redundant executions
+# -----------------------------------------------------------------------------

 on:
  workflow_dispatch:
@@ -13,7 +26,7 @@ permissions:
  contents: read

 concurrency:
-  group: pipeline-lint-${{github.event.pull_request.number}}
+  group: pipeline-lint-${{ github.event.pull_request.number }}
  cancel-in-progress: true

 jobs:
@@ -29,31 +42,25 @@ jobs:
          fetch-depth: 2

      - name: Get changed files
-        id: changed-files
-        uses: tj-actions/changed-files@v45
+        id: files
+        uses: UplandJacob/retrieve-changed-files@v4

-      - name: List all changed files
+      - name: List and analyze changed shell scripts
        run: |
-
-          # Use framework internal mechanism for checking `lib` and `extensions` code only one file is passed,
-          # and source's are followed, thus the whole project is "understood" by shellcheck.
-          # For example, when checking individual files, one variable might be thought "unused" because it
-          # is only used in another file, which does not happen when done properly.
-
+          # Utilize the framework's internal mechanism to check `lib/` and `extensions/` scripts.
+          # This ensures correct context resolution, avoiding false positives in variable usage.
          bash lib/tools/shellcheck.sh

          ret=0

-          for file in ${{ steps.changed-files.outputs.all_changed_files }}; do
-
+          for file in ${{ steps.files.outputs.all }}; do
+              # Ignore non-shell files
              if [[ ! "${file}" =~ lib/|extensions/|.py|.service|.rules|.network|.netdev ]]; then
-                  if grep -qE "^#\!/.*bash" $file; then
-
-                      shellcheck --severity=error $file || ret=$?
-
+                  # Check if the file has a bash shebang and run ShellCheck
+                  if grep -qE "^#\!/.*bash" "$file"; then
+                      shellcheck --severity=error "$file" || ret=$?
                  fi
              fi
-
          done

-          exit $ret
+          exit $ret
--- 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.0
+        uses: ossf/scorecard-action@v2.4.1
        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@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: SARIF file
          path: results.sarif
--- a/.github/workflows/update-tools.yml
+++ b/.github/workflows/update-tools.yml
@@ -81,13 +81,6 @@ jobs:
          version_latest=$(curl --silent "https://api.github.com/repos/${{ matrix.tool.PROJECT_NAME }}/releases/latest" | jq -r .tag_name)
          version_latest=${version_latest#v}                        # Removing the 'v' prefix since the script uses only plain numbers
          echo "version_latest=$version_latest" >> $GITHUB_OUTPUT                                                                                
-          {
-            echo "CHANGE_LOG<<EOFFEOFFF42"                          # Has to be a unique delimiter that doesn't appear in the changelog itself
-            curl --silent "https://api.github.com/repos/${{ matrix.tool.PROJECT_NAME }}/releases/latest" | jq -r .body \
-            | sed -E -e 's/(#([0-9]+))/${{ matrix.tool.USER_NAME }}\/${{ matrix.tool.REPO_NAME }}\1/g' \
-            -e 's/https\:\/\/github\.com/https\:\/\/redirect.github.com/g'
-            echo "EOFFEOFFF42"
-          } >> "$GITHUB_ENV"

      - name: Update ${{ matrix.tool.VERSION_VAR}} in script
        # @TODO Make sure that the version is actually higher, not lower (the 'latest' tag does not neccessarily mean that the version is higher!)
@@ -106,13 +99,6 @@ jobs:
          body: |
            Bump [${{ matrix.tool.PROJECT_NAME}}](https://github.com/${{ matrix.tool.PROJECT_NAME }}) from ${{ steps.get-version-current.outputs.version_current }} to ${{ steps.get-version-latest.outputs.version_latest }} by bumping `${{ matrix.tool.VERSION_VAR}}` in `${{ matrix.tool.VAR_FILE}}`.

-            <details><summary><b>Release notes</b></summary>
-            <p><em>Sourced from <a href="https://github.com/${{ matrix.tool.PROJECT_NAME }}/releases">${{ matrix.tool.PROJECT_NAME }}'s releases</a>.
-            <br>Please note that this only shows the release notes for the latest release.</em></p>
-            <blockquote>
-
-            ${{ env.CHANGE_LOG }}
-
-            </blockquote>
-            </details>
+            Check <a href="https://github.com/${{ matrix.tool.PROJECT_NAME }}/releases/latest">the upstream release notes</a>.
+            <p><em>Please note that the above link only shows the release notes for the latest release.</em></p>
          labels: Dependencies, Bash
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@
 - Superuser rights (configured sudo or root access).
 - Make sure your system is up-to-date! Outdated Docker binaries, for example, can cause trouble.

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

 ```bash
 apt-get -y install git
--- a/2
+++ b/2
@@ -1 +1 @@
-25.02.0-trunk
+25.05.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: |
--- a/config/boards/aml-c400-plus.conf
+++ b/config/boards/aml-c400-plus.conf
@@ -5,7 +5,6 @@ BOARD_MAINTAINER="jomadeto"
 BOOTSIZE="512"
 BOOTFS_TYPE="fat"
 KERNEL_TARGET="current,edge"
-MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost
 KERNEL_TEST_TARGET="current"
 SERIALCON="ttyAML0"
 FULL_DESKTOP="yes"
--- a/config/boards/aml-s805-mxq.tvb
+++ b/config/boards/aml-s805-mxq.tvb
@@ -0,0 +1,14 @@
+# MXQ TV box based on Amlogic S805 quad core 1GB RAM SoC GBE
+BOARD_NAME="MXQ"
+BOARDFAMILY="meson8b"
+BOARD_MAINTAINER=""
+KERNEL_TARGET="current"
+KERNEL_TEST_TARGET="current"
+BOOTCONFIG="none"
+BOOTSCRIPT="boot-aml-s805-mxq.cmd:boot.cmd"
+# The preinstalled U-BOOT looks for this script
+BOOTSCRIPT_OUTPUT="s805_autoscript"
+BOOTENV_FILE="aml-s805-mxq.txt"
+
+BOOTSIZE="200"
+BOOTFS_TYPE="fat"
--- a/config/boards/armsom-cm5-io.csc
+++ b/config/boards/armsom-cm5-io.csc
@@ -10,16 +10,6 @@ BOOT_SCENARIO="spl-blobs"
 IMAGE_PARTITION_TABLE="gpt"
 BOARD_MAINTAINER=""

-function post_family_config_branch_vendor__armsom-cm5-io_use_vendor_uboot() {
-	display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"
-
-	declare -g BOOTSOURCE="https://github.com/ArmSoM/u-boot.git"
-	declare -g BOOTBRANCH="tag:rk3576-6.1-rk3.1"
-	declare -g BOOTPATCHDIR="legacy/u-boot-armsom-rk3576"
-	declare -g BOOTDIR="u-boot-${BOARD}"
-	declare -g UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB TEE=$RKBIN_DIR/$BL32_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb"
-}
-
 function post_family_tweaks__armsom-cm5-io_naming_audios() {
 	display_alert "$BOARD" "Renaming armsom-cm5 audios" "info"

--- a/config/boards/armsom-cm5-rpi-cm4-io.csc
+++ b/config/boards/armsom-cm5-rpi-cm4-io.csc
@@ -10,16 +10,6 @@ BOOT_SCENARIO="spl-blobs"
 IMAGE_PARTITION_TABLE="gpt"
 BOARD_MAINTAINER=""

-function post_family_config_branch_vendor__armsom-cm5-rpi-cm4-io_use_vendor_uboot() {
-	display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"
-
-	declare -g BOOTSOURCE="https://github.com/ArmSoM/u-boot.git"
-	declare -g BOOTBRANCH="tag:rk3576-6.1-rk3.1"
-	declare -g BOOTPATCHDIR="legacy/u-boot-armsom-rk3576"
-	declare -g BOOTDIR="u-boot-${BOARD}"
-	declare -g UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB TEE=$RKBIN_DIR/$BL32_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb"
-}
-
 function post_family_tweaks__armsom-cm5-rpi-cm4-io_naming_audios() {
 	display_alert "$BOARD" "Renaming armsom-cm5-rpi-cm4-io audios" "info"

--- a/config/boards/armsom-sige5.csc
+++ b/config/boards/armsom-sige5.csc
@@ -10,16 +10,6 @@ BOOT_SCENARIO="spl-blobs"
 IMAGE_PARTITION_TABLE="gpt"
 BOARD_MAINTAINER=""

-function post_family_config_branch_vendor__armsom-sige7_use_vendor_uboot() {
-	display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"
-
-	declare -g BOOTSOURCE="https://github.com/ArmSoM/u-boot.git"
-	declare -g BOOTBRANCH="tag:rk3576-6.1-rk3.1"
-	declare -g BOOTPATCHDIR="legacy/u-boot-armsom-rk3576"
-	declare -g BOOTDIR="u-boot-${BOARD}"
-	declare -g UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB TEE=$RKBIN_DIR/$BL32_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb"
-}
-
 function post_family_tweaks__armsom-sige7_naming_audios() {
 	display_alert "$BOARD" "Renaming armsom-sige7 audios" "info"

--- a/config/boards/armsom-sige7.csc
+++ b/config/boards/armsom-sige7.csc
@@ -3,7 +3,7 @@ BOARD_NAME="ArmSoM Sige7"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER=""
 BOOTCONFIG="armsom-sige7-rk3588_defconfig"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-armsom-sige7.dtb"
--- a/config/boards/ayn-odin2.csc
+++ b/config/boards/ayn-odin2.csc
@@ -0,0 +1,130 @@
+# Ayn Odin2 Configuration
+declare -g BOARD_NAME="Ayn Odin2"
+declare -g BOARD_MAINTAINER="FantasyGmm"
+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 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 ayn-odin2_is_userspace_supported() {
+	[[ "${RELEASE}" == "jammy" ]] && return 0
+	[[ "${RELEASE}" == "trixie" ]] && return 0
+	[[ "${RELEASE}" == "noble" ]] && return 0
+	return 1
+}
+
+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"
+		fi
+		return 0
+	fi
+
+	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
+
+	do_with_retries 3 chroot_sdcard_apt_get_update
+		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
+
+	# 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_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/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/}"
+		done
+		# Extra one for bt
+		for f in /lib/firmware/qca/* ; do
+			add_firmware "${f#/lib/firmware/}"
+		done
+	FIRMWARE_HOOK
+	run_host_command_logged chmod -v +x "${file_added_to_bsp_destination}"
+}
+
+function pre_umount_final_image__update_ABL_settings() {
+	if [ -z "$BOOTFS_TYPE" ]; then
+		return 0
+	fi
+	display_alert "Update ABL settings for " "${BOARD}" "info"
+	uuid_line=$(head -n 1 "${SDCARD}"/etc/fstab)
+	rootfs_image_uuid=$(echo "${uuid_line}" | awk '{print $1}' | awk -F '=' '{print $2}')
+	initrd_name=$(find "${SDCARD}/boot/" -type f -name "config-*" | sed 's/.*config-//')
+	sed -i "s/UUID_PLACEHOLDER/${rootfs_image_uuid}/g" "${MOUNT}"/boot/LinuxLoader.cfg
+	sed -i "s/INITRD_PLACEHOLDER/${initrd_name}/g" "${MOUNT}"/boot/LinuxLoader.cfg
+}
--- a/config/boards/ayn-odin2.eos
+++ b/config/boards/ayn-odin2.eos
@@ -1,155 +0,0 @@
-# Generate kernel and rootfs image for Qcom ABL Custom booting
-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 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"
-
-# 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:integration/ayn-odin2"
-	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
-	return 1
-}
-
-function post_family_tweaks__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"
-		fi
-		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
-	fi
-
-	# We need unudhcpd from armbian repo, so enable it
-	mv "${SDCARD}"/etc/apt/sources.list.d/armbian.list.disabled "${SDCARD}"/etc/apt/sources.list.d/armbian.list
-
-	# Add zink env
-	echo '__GLX_VENDOR_LIBRARY_NAME=mesa' | tee -a "${SDCARD}"/etc/environment
-	echo 'MESA_LOADER_DRIVER_OVERRIDE=zink' | tee -a "${SDCARD}"/etc/environment
-	echo 'GALLIUM_DRIVER=zink' | tee -a "${SDCARD}"/etc/environment
-	# 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
-	mv "${SDCARD}"/etc/apt/sources.list.d/armbian.list "${SDCARD}"/etc/apt/sources.list.d/armbian.list.disabled
-	do_with_retries 3 chroot_sdcard_apt_get_update
-
-	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/
-
-	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"
-	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
-			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
-		# Extra one for wifi
-		for f in /lib/firmware/ath12k/WCN7850/hw2.0/* ; do
-			add_firmware "${f#/lib/firmware/}"
-		done
-		# Extra one for bt
-		for f in /lib/firmware/qca/* ; do
-			add_firmware "${f#/lib/firmware/}"
-		done 
-	FIRMWARE_HOOK
-	run_host_command_logged chmod -v +x "${file_added_to_bsp_destination}"
-}
-
-function pre_umount_final_image__update_ABL_settings() {
-	if [ -z "$BOOTFS_TYPE" ]; then
-		return 0
-	fi
-	display_alert "Update ABL settings for " "${BOARD}" "info"
-	uuid_line=$(head -n 1 "${SDCARD}"/etc/fstab)
-	rootfs_image_uuid=$(echo "${uuid_line}" | awk '{print $1}' | awk -F '=' '{print $2}')
-	initrd_name=$(find "${SDCARD}/boot/" -type f -name "config-*" | sed 's/.*config-//')
-	sed -i "s/UUID_PLACEHOLDER/${rootfs_image_uuid}/g" "${MOUNT}"/boot/LinuxLoader.cfg
-	sed -i "s/INITRD_PLACEHOLDER/${initrd_name}/g" "${MOUNT}"/boot/LinuxLoader.cfg
-}
--- a/config/boards/bananapicm4io.conf
+++ b/config/boards/bananapicm4io.conf
@@ -10,8 +10,8 @@ FULL_DESKTOP="yes"
 SERIALCON="ttyAML0"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="amlogic/meson-g12b-bananapi-cm4-cm4io.dtb"
-BOOTBRANCH_BOARD="tag:v2024.07"
-BOOTPATCHDIR="v2024.07"
+BOOTBRANCH_BOARD="tag:v2025.01"
+BOOTPATCHDIR="v2025.01"

 function post_family_tweaks_bsp__bananapi_rtl_bt() {
 	if [[ -d "$SRC/packages/bsp/bananapi/rtl_bt" ]]; then
--- a/config/boards/bananapif3.conf
+++ b/config/boards/bananapif3.conf
@@ -1,12 +1,12 @@
 # SpacemiT K1 octa core RISC-V SoC 2GB/4GB RAM 8GB/16GB eMMC 4x USB3 2x GbE
 BOARD_NAME="BananaPi BPI-F3"
 BOARDFAMILY="spacemit"
-BOARD_MAINTAINER=""
+BOARD_MAINTAINER="pyavitz"
 KERNEL_TARGET="current"
 BOOT_FDT_FILE="spacemit/k1-bananapi-f3.dtb"
 BOOTDELAY=1
 SRC_EXTLINUX="yes"
-SRC_CMDLINE="earlycon=sbi console=tty1 console=ttyS0,115200 clk_ignore_unused"
+SRC_CMDLINE="earlycon=sbi console=tty1 console=ttyS0,115200"
 PACKAGE_LIST_BOARD="rfkill bluetooth bluez bluez-tools"

 function post_config_uboot_target__extra_configs_for_bananapi_f3() {
--- a/config/boards/bananapim2plus.csc
+++ b/config/boards/bananapim2plus.csc
@@ -1,7 +1,7 @@
 # Allwinner H3 quad core 1Gb RAM SoC Wifi GBE
 BOARD_NAME="Banana Pi M2+"
 BOARDFAMILY="sun8i"
-BOARD_MAINTAINER=""
+BOARD_MAINTAINER="leggewie"
 BOOTCONFIG="bananapi_m2_plus_h3_defconfig"
 DEFAULT_OVERLAYS="analog-codec"
 MODULES_CURRENT="g_serial"
--- a/config/boards/bananapim2s.conf
+++ b/config/boards/bananapim2s.conf
@@ -10,8 +10,8 @@ FULL_DESKTOP="yes"
 SERIALCON="ttyAML0"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="amlogic/meson-g12b-a311d-bananapi-m2s.dtb"
-BOOTBRANCH_BOARD="tag:v2024.07"
-BOOTPATCHDIR="v2024.07"
+BOOTBRANCH_BOARD="tag:v2025.01"
+BOOTPATCHDIR="v2025.01"

 function post_family_tweaks_bsp__bananapi_rtl_bt() {
 	if [[ -d "$SRC/packages/bsp/bananapi/rtl_bt" ]]; then
--- a/config/boards/bananapim4berry.wip
+++ b/config/boards/bananapim4berry.wip
@@ -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.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
@@ -3,6 +3,6 @@ BOARD_NAME="Banana Pi M7"
 BOARD_MAINTAINER="amazingfate"
 BOOT_FDT_FILE="rockchip/rk3588-bananapi-m7.dtb"
 # Those are included in armsom-sige7.csc, but this file is parsed directly by the JSON matrix generator and thus those need to be in here
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="vendor,current"
 BOARDFAMILY="rockchip-rk3588"
--- a/config/boards/beaglebone-ai64.conf
+++ b/config/boards/beaglebone-ai64.conf
@@ -0,0 +1,18 @@
+# BeagleBone® AI-64 dual core 4GB GBE USB3 OSPI DisplayPort HDMI
+
+BOARD_NAME="BeagleBone AI-64"
+BOARDFAMILY="k3"
+BOARD_MAINTAINER="Grippy98"
+BOOTCONFIG="j721e_beagleboneai64_a72_defconfig"
+BOOTFS_TYPE="fat"
+BOOT_FDT_FILE="ti/k3-j721e-beagleboneai64.dts"
+TIBOOT3_BOOTCONFIG="j721e_beagleboneai64_r5_defconfig"
+TIBOOT3_FILE="tiboot3-j721e-gp-evm.bin"
+SYSFW_FILE="sysfw-j721e-gp-evm.itb"
+TISPL_FILE="tispl.bin_unsigned"
+UBOOT_FILE="u-boot.img_unsigned"
+DEFAULT_CONSOLE="serial"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
+SERIALCON="ttyS2"
+ATF_BOARD="generic"
--- a/config/boards/beagleplay.conf
+++ b/config/boards/beagleplay.conf
@@ -0,0 +1,17 @@
+# TI AM62 quad core 2GB DDR4 16GB eMMC 1xGBE 1xSPE HDMI
+
+BOARD_NAME="BeaglePlay"
+BOARDFAMILY="k3"
+BOARD_MAINTAINER="Grippy98"
+BOOTCONFIG="am62x_beagleplay_a53_defconfig"
+BOOTFS_TYPE="fat"
+BOOT_FDT_FILE="ti/k3-am625-beagleplay.dts"
+TIBOOT3_BOOTCONFIG="am62x_beagleplay_r5_defconfig"
+TIBOOT3_FILE="tiboot3-am62x-gp-evm.bin"
+TISPL_FILE="tispl.bin_unsigned"
+UBOOT_FILE="u-boot.img_unsigned"
+DEFAULT_CONSOLE="serial"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
+SERIALCON="ttyS2"
+ATF_BOARD="lite"
--- a/config/boards/beaglev.eos
+++ b/config/boards/beaglev.eos
--- a/config/boards/beagley-ai.csc
+++ b/config/boards/beagley-ai.csc
@@ -0,0 +1,30 @@
+#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"
+
+# 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/bigtreetech-cb2.conf
+++ b/config/boards/bigtreetech-cb2.conf
@@ -6,7 +6,7 @@ BOOTCONFIG="bigtreetech-cb2-rk3566_defconfig"
 BOOT_SOC="rk3566"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
-BOOT_FDT_FILE="rockchip/rk3566-bigtreetech-cb2.dtb"
+BOOT_FDT_FILE="rockchip/rk3566-bigtreetech-pi2.dtb"
 IMAGE_PARTITION_TABLE="gpt"
 BOOT_SCENARIO="spl-blobs"
 OVERLAY_PREFIX='rk3566'
@@ -15,6 +15,7 @@ BOOT_LOGO="desktop"

 # TODO: replace with BOOT_SCENARIO=binman when it gets merged and in good shape
 function post_family_config__bigtreetech-cb2_uboot_overrides() {
+
 	display_alert "$BOARD" "mainline u-boot overrides" "info"

 	DDR_BLOB="rk35/rk3566_ddr_1056MHz_v1.21.bin"
--- a/config/boards/cm3588-nas.csc
+++ b/config/boards/cm3588-nas.csc
@@ -4,12 +4,13 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="ColorfulRhino"
 BOOTCONFIG="cm3588-nas-rk3588_defconfig" # Mainline defconfig, enables booting from NVMe
 BOOT_SOC="rk3588"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 IMAGE_PARTITION_TABLE="gpt"
 BOOT_FDT_FILE="rockchip/rk3588-friendlyelec-cm3588-nas.dtb"
-BOOT_SCENARIO="spl-blobs"
+BOOT_SCENARIO="tpl-blob-atf-mainline"
+UEFI_EDK2_BOARD_ID="nanopc-cm3588-nas" # This _only_ used for uefi-edk2-rk3588 extension; cm3588-nas was introduced in v0.12 of edk2-porting/edk2-rk3588

 function post_family_tweaks__cm3588_nas_udev_naming_audios() {
 	display_alert "$BOARD" "Renaming CM3588 audio interfaces to human-readable form" "info"
@@ -42,17 +43,73 @@ function post_family_config__cm3588_nas_use_mainline_uboot() {

 	declare -g BOOTDELAY=1                                       # Wait for UART interrupt to enter UMS/RockUSB mode etc
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
-	declare -g BOOTBRANCH="tag:v2024.10"
-	declare -g BOOTPATCHDIR="v2024.10"
-	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency
-
-	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"
-
-	# Disable stuff from rockchip64_common; we're using binman here which does all the work already
-	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
+	declare -g BOOTBRANCH="tag:v2025.01"
+	declare -g BOOTPATCHDIR="v2025.01"
+	declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
+	declare -g UBOOT_TARGET_MAP="BL31=bl31.elf ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # Disable stuff from rockchip64_common; we're using binman here which does all the work

 	# 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 pre_config_uboot_target__cm3588_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/rk3588-friendlyelec-cm3588-nas-u-boot.dtsi
+		&u2phy0 { status = "okay"; };
+		&u2phy0_otg { status = "okay"; };
+		&usbdp_phy0 { status = "okay"; };
+		&usb_host0_xhci { dr_mode = "peripheral";  maximum-speed = "high-speed";  status = "okay"; };
+	UBOOT_BOARD_DTSI_OTG
+}
+
+# "rockchip-common: boot SD card first, then NVMe, then mmc"
+# include/configs/rockchip-common.h
+# -#define BOOT_TARGETS "mmc1 mmc0 nvme scsi usb pxe dhcp spi"
+# +#define BOOT_TARGETS "mmc0 nvme mmc1 scsi usb pxe dhcp spi"
+# On cm3588-nas, mmc0 is the eMMC, mmc1 is the SD card slot
+function pre_config_uboot_target__cm3588_patch_rockchip_common_boot_order() {
+	declare -a rockchip_uboot_targets=("mmc1" "nvme" "mmc0" "scsi" "usb" "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
+}
+
+function post_config_uboot_target__extra_configs_for_cm3588-nas_uboot() {
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable preboot & flash user LED in preboot" "info"
+	run_host_command_logged scripts/config --enable CONFIG_USE_PREBOOT
+	run_host_command_logged scripts/config --set-str CONFIG_PREBOOT "'led led-1 on; sleep 0.1; led led-1 off'" # double quotes required due to run_host_command_logged's quirks
+
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable EFI debugging commands" "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}/${BRANCH}" "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}/${BRANCH}" "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}/${BRANCH}" "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
+
+	# UMS, RockUSB, gadget stuff
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable UMS/RockUSB gadget" "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
+
+	return 0
+}
--- a/config/boards/coolpi-genbook.csc
+++ b/config/boards/coolpi-genbook.csc
@@ -21,7 +21,7 @@ function post_family_config_branch_edge__coolpi-genbook_use_mainline_uboot() {
 	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-rc3"
+	declare -g BOOTBRANCH_BOARD="tag:v2025.01"
 	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/gateway-gz80x.conf
+++ b/config/boards/gateway-gz80x.conf
@@ -5,8 +5,8 @@ BOARD_MAINTAINER="pyavitz"
 BOOTCONFIG="amper_gateway_am-gz80x_defconfig"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
-BOOTBRANCH_BOARD="tag:v2024.07"
-BOOTPATCHDIR="v2024.07"
+BOOTBRANCH_BOARD="tag:v2025.01"
+BOOTPATCHDIR="v2025.01"
 BOOT_FDT_FILE="amlogic/meson-axg-amper-gateway-am-gz80x.dtb"
 SRC_EXTLINUX="yes"
 SRC_CMDLINE="console=ttyAML0,115200n8 clk_ignore_unused loglevel=7"
--- a/config/boards/h96-tvbox-3566.tvb
+++ b/config/boards/h96-tvbox-3566.tvb
@@ -2,29 +2,25 @@
 BOARD_NAME="h96-tvbox-3566"
 BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER="hqnicolas"
-BOOTCONFIG="rk3568_defconfig"
-KERNEL_TARGET="current,edge"
-FULL_DESKTOP="yes"
-BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3566-h96-tvbox.dtb"
+BOOT_LOGO="desktop"
+BOOT_SCENARIO="spl-blobs"
+FULL_DESKTOP="yes"
 IMAGE_PARTITION_TABLE="gpt"
+KERNEL_TARGET="current,edge"
+
+DDR_BLOB="rk35/rk3568_ddr_1560MHz_v1.21.bin"
+BL31_BLOB="rk35/rk3568_bl31_v1.44.elf"

 # Mainline U-Boot
 function post_family_config__h96_max_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
+	declare -g BOOTCONFIG="h96max-v56_defconfig"
+	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"
+	declare -g BOOTBRANCH="tag:v2025.01"
+	declare -g BOOTPATCHDIR="v2025.01/board_${BOARD}"
+	declare -g UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB ROCKCHIP_TPL=$RKBIN_DIR/$DDR_BLOB;;u-boot-rockchip.bin"
 	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
-
-	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
 	function write_uboot_platform() {
 		dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
 	}
--- a/config/boards/hinlink-h66k.csc
+++ b/config/boards/hinlink-h66k.csc
@@ -3,7 +3,8 @@ BOARD_NAME="Hinlink H66K"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER=""
 BOOTCONFIG="radxa-e25-rk3568_defconfig"
-KERNEL_TARGET="edge"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3568-hinlink-h66k.dtb"
--- a/config/boards/hinlink-h68k.csc
+++ b/config/boards/hinlink-h68k.csc
@@ -3,7 +3,8 @@ BOARD_NAME="Hinlink H68K"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER=""
 BOOTCONFIG="radxa-e25-rk3568_defconfig"
-KERNEL_TARGET="edge"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3568-hinlink-h68k.dtb"
--- a/config/boards/hinlink-hnas.csc
+++ b/config/boards/hinlink-hnas.csc
@@ -3,7 +3,8 @@ BOARD_NAME="Hinlink HNAS"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER=""
 BOOTCONFIG="radxa-e25-rk3568_defconfig"
-KERNEL_TARGET="edge"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3568-hinlink-hnas.dtb"
--- a/config/boards/indiedroid-nova.csc
+++ b/config/boards/indiedroid-nova.csc
@@ -4,7 +4,7 @@ declare -g BOARD_MAINTAINER="lanefu"
 declare -g BOARDFAMILY="rockchip-rk3588"
 declare -g BOOTCONFIG="indiedroid_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 declare -g BOOT_SOC="rk3588"
-declare -g KERNEL_TARGET="edge,current,vendor"
+declare -g KERNEL_TARGET="current,edge,vendor"
 declare -g FULL_DESKTOP="yes"
 declare -g BOOT_LOGO="desktop"
 declare -g BOOT_FDT_FILE="rockchip/rk3588s-indiedroid-nova.dtb"
--- a/config/boards/khadas-edge2.conf
+++ b/config/boards/khadas-edge2.conf
@@ -3,7 +3,7 @@ declare -g BOARD_NAME="Khadas Edge2"
 declare -g BOARDFAMILY="rockchip-rk3588"
 declare -g BOARD_MAINTAINER="efectn"
 declare -g BOOT_SOC="rk3588" # Just to avoid errors in rockchip64_commmon
-declare -g KERNEL_TARGET="edge,current,vendor"
+declare -g KERNEL_TARGET="current,edge,vendor"
 declare -g KERNEL_TEST_TARGET="vendor,current"
 declare -g IMAGE_PARTITION_TABLE="gpt"
 declare -g KERNEL_UPGRADE_FREEZE="vendor-rk35xx@24.8.1"
--- a/config/boards/macchiatobin-doubleshot.eos
+++ b/config/boards/macchiatobin-doubleshot.eos
--- a/config/boards/mba8mpxl-ras314.conf
+++ b/config/boards/mba8mpxl-ras314.conf
@@ -1,5 +1,5 @@
-# MBa8MPxL-RAS314 with TQMa8MPxL
-BOARD_NAME="TQ8MP-RAS314"
+# MBa8MP-RAS314 with TQMa8MPxL
+BOARD_NAME="MBa8MP-RAS314"
 BOARDFAMILY="imx8m"
 BOARD_MAINTAINER="schmiedelm"
 HAS_VIDEO_OUTPUT="yes"
@@ -19,28 +19,30 @@ function post_family_tweaks_bsp__mba8mpxl-ras314() {
 	wget https://github.com/nxp-imx/imx-firmware/raw/lf-6.6.3_1.0.0/nxp/FwImage_8997/pcieuart8997_combo_v4.bin
 	run_host_command_logged mkdir -pv --mode=755 "$destination/lib/firmware/" || exit_with_error "Unable to mkdir firmware"
 	run_host_command_logged mkdir -v --mode=775 "$destination/lib/firmware/mrvl/" || exit_with_error "Unable to mkdir mrvl"
-	run_host_command_logged cp -Pv "pcieuart8997_combo_v4.bin" "$destination/lib/firmware/mrvl/" || exit_with_error "Unable to copy mrvl firmware"
+	run_host_command_logged mv -v "pcieuart8997_combo_v4.bin" "$destination/lib/firmware/mrvl/" || exit_with_error "Unable to copy mrvl firmware"

 	# Add udev rule to delay btnxpuart loading
-	cat <<- EOF > "${destination}"/etc/udev/rules.d/10-nxp-bluetooth-delay.rules
+	cat <<- NXP_UDEV_RULE > "${destination}"/etc/udev/rules.d/10-nxp-bluetooth-delay.rules
 		# wait until combo FW is loaded by wifi driver
 		KERNEL=="mlan*", ACTION=="add", RUN+="/sbin/modprobe btnxpuart"
-	EOF
-
-	# Define a function to be run board-side during postinst of the BSP
-	display_alert "Adding to bsp-cli" "${BOARD}: postinst for periferial access" "info"
-	postinst_functions+=("board_side_imx8m_bsp_cli_postinst") # add to the postinst function list
-	function board_side_imx8mpxl_bsp_cli_postinst() {
-		# Peripheral access for specific groups
-		addgroup --system --quiet periphery
-	}
+	NXP_UDEV_RULE

+	# fix X11 config
 	mkdir -p "$destination"/etc/X11/xorg.conf.d
-	cat <<- EOF > "$destination"/etc/X11/xorg.conf.d/02-driver.conf
+
+	cat <<- XORG_HDMI_CONF > "$destination"/etc/X11/xorg.conf.d/10-hdmi.conf
 		Section "Device"
-		Identifier              "main"
-		driver                  "fbdev"
-		Option                  "fbdev" "/dev/fb0"
+			Identifier "etnaviv"
+			Driver     "modesetting"
+			Option     "kmsdev"      "/dev/dri/card1"
+			Option     "AccelMethod" "none" ### "glamor" to enable 3D acceleration, "none" to disable.
+			Option     "Atomic"      "On"
 		EndSection
-	EOF
+
+		Section "ServerFlags"
+			Option     "AutoAddGPU"  "false"
+			Option     "DRI"         "3"
+		EndSection
+	XORG_HDMI_CONF
+
 }
--- a/config/boards/mba8mpxl.conf
+++ b/config/boards/mba8mpxl.conf
@@ -13,12 +13,23 @@ BOOT_FDT_FILE="freescale/imx8mp-tqma8mpql-mba8mpxl.dtb"
 ASOUND_STATE="asound.state.tqma"

 function post_family_tweaks_bsp__mba8mpxl() {
+
+	# fix X11 config
 	mkdir -p "$destination"/etc/X11/xorg.conf.d
-	cat <<- EOF > "$destination"/etc/X11/xorg.conf.d/02-driver.conf
+
+	cat <<- XORG_HDMI_CONF > "$destination"/etc/X11/xorg.conf.d/10-hdmi.conf
 		Section "Device"
-		Identifier              "main"
-		driver                  "fbdev"
-		Option                  "fbdev" "/dev/fb0"
+			Identifier "etnaviv"
+			Driver     "modesetting"
+			Option     "kmsdev"      "/dev/dri/card1"
+			Option     "AccelMethod" "none" ### "glamor" to enable 3D acceleration, "none" to disable.
+			Option     "Atomic"      "On"
 		EndSection
-	EOF
+
+		Section "ServerFlags"
+			Option     "AutoAddGPU"  "false"
+			Option     "DRI"         "3"
+		EndSection
+	XORG_HDMI_CONF
+
 }
--- a/config/boards/mixtile-edge2.csc
+++ b/config/boards/mixtile-edge2.csc
@@ -1,6 +1,7 @@
 # Rockchip RK3568 quad core 4GB-8GB GBE PCIe USB3 SATA NVMe
 BOARD_NAME="Mixtile Edge 2"
-BOARDFAMILY="rockchip64"
+BOARDFAMILY="rk35xx"
+BOOTCONFIG="mixtile-edge2-rk3568_defconfig"
 BOARD_MAINTAINER=""
 BOOT_SOC="rk3568"
 KERNEL_TARGET="current,edge,vendor"
@@ -35,20 +36,3 @@ function post_family_config__h96_max_use_mainline_uboot() {
 		dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
 	}
 }
-
-function post_family_config_branch_vendor__kernel_and_uboot_rk35xx_mixtile_edge2() {
-	# Copypasta from rockchip-rk3588.conf family file -- we _really_ gotta find a better way!
-	declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel.
-	declare -g KERNELSOURCE='https://github.com/armbian/linux-rockchip.git'
-	declare -g KERNELBRANCH='branch:rk-6.1-rkr4.1'
-	declare -g KERNELPATCHDIR='rk35xx-vendor-6.1'
-	declare -g LINUXFAMILY=rk35xx
-	declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes
-	declare -g OVERLAY_PREFIX='rk35xx'
-
-	# Use vendor u-boot, same as rk35xx; we've a defconfig and dt in there
-	declare -g BOOTSOURCE='https://github.com/radxa/u-boot.git'
-	declare -g BOOTBRANCH='branch:next-dev-v2024.03' # Always use same version as rk3588, they share a patch dir
-	declare -g BOOTPATCHDIR="legacy/u-boot-radxa-rk35xx"
-	declare -g BOOTCONFIG="mixtile-edge2-rk3568_defconfig"
-}
--- a/config/boards/mksklipad50.conf
+++ b/config/boards/mksklipad50.conf
@@ -0,0 +1,19 @@
+# Rockchip RK3328 quad core 1GB RAM eMMC USB-C USB3 USB2 WiFi
+BOARD_NAME="mksklipad50"
+BOARDFAMILY="rockchip64"
+BOARD_MAINTAINER="torte71"
+BOOTCONFIG="mksklipad50-rk3328_defconfig"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
+HAS_VIDEO_OUTPUT="no"
+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/mkspi.csc
+++ b/config/boards/mkspi.csc
@@ -11,7 +11,8 @@ BOARD_MAINTAINER="redrathnure"
 BOOTCONFIG="mkspi-rk3328_defconfig"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
-FULL_DESKTOP="yes"
+#No need to build Desktop images, minimal set will be installed together with KlipperScreen
+HAS_VIDEO_OUTPUT="no"
 BOOT_LOGO="desktop"
 MODULES="ads7846 spidev"
 BOOTFS_TYPE="fat"
--- a/config/boards/nanopct4.csc
+++ b/config/boards/nanopct4.csc
@@ -9,6 +9,6 @@ FULL_DESKTOP="yes"
 ASOUND_STATE="asound.state.rt5651"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3399-nanopc-t4.dtb"
-BOOT_SCENARIO="spl-blobs"
+BOOT_SCENARIO="blobless"
 SRC_EXTLINUX="yes"
 SRC_CMDLINE="console=ttyS2,1500000 console=tty0"
--- a/config/boards/nanopct6-lts.conf
+++ b/config/boards/nanopct6-lts.conf
@@ -5,5 +5,6 @@ BOARD_NAME="NanoPC T6 LTS"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="SuperKali Tonymac32"
 BOOT_FDT_FILE="rockchip/rk3588-nanopc-t6-lts.dtb" # As opposed to "rockchip/rk3588-nanopc-t6.dtb" for the non-LTS version
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_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
@@ -4,7 +4,7 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="SuperKali Tonymac32"
 BOOTCONFIG="nanopc_t6_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
@@ -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"
@@ -33,11 +34,11 @@ function post_family_config_branch_edge__nanopct6_use_mainline_uboot() {
 	display_alert "$BOARD" "mainline (next branch) u-boot overrides for $BOARD / $BRANCH" "info"

 	declare -g BOOTCONFIG="nanopc-t6-rk3588_defconfig"
-	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:v2024.10"
-	declare -g BOOTPATCHDIR="v2024.10"
-	declare -g BOOTDIR="u-boot-${BOARD}"                                  # do not share u-boot directory
+	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 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

@@ -51,10 +52,44 @@ 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() {
+	unset BOOT_FDT_FILE
+}
+
+function pre_config_uboot_target__nanoptc6_patch_uboot_dtsi_for_ums() {
+	[[ "${BRANCH}" != "edge" ]] && return 0
+
+	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
+		&u2phy0 { status = "okay"; };
+		&u2phy0_otg { status = "okay"; };
+		&usbdp_phy0 { status = "okay"; };
+		&usb_host0_xhci { dr_mode = "peripheral";  maximum-speed = "high-speed";  status = "okay"; };
+	EOD
+
+}
+
+# "rockchip-common: boot SD card first, then NVMe, then mmc"
+# include/configs/rockchip-common.h
+# -#define BOOT_TARGETS "mmc1 mmc0 nvme scsi usb pxe dhcp spi"
+# +#define BOOT_TARGETS "mmc0 nvme mmc1 scsi usb pxe dhcp spi"
+# On nanopct6, mmc0 is the eMMC, mmc1 is the SD card slot
+function pre_config_uboot_target__nanopct6_patch_rockchip_common_boot_order() {
+	declare -a rockchip_uboot_targets=("mmc1" "nvme" "mmc0" "scsi" "usb" "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
+}
+
 function post_config_uboot_target__extra_configs_for_nanopct6_mainline_environment_in_spi() {
 	[[ "${BRANCH}" != "edge" ]] && return 0

-	display_alert "$BOARD" "u-boot configs for ${BOOTBRANCH} u-boot config BRANCH=${BRANCH}" "info"
+	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
+	run_host_command_logged scripts/config --enable CONFIG_CMD_MISC
 	run_host_command_logged scripts/config --set-val CONFIG_ENV_IS_NOWHERE "n"
 	run_host_command_logged scripts/config --set-val CONFIG_ENV_IS_IN_SPI_FLASH "y"
 	run_host_command_logged scripts/config --set-val CONFIG_ENV_SECT_SIZE_AUTO "y"
@@ -62,24 +97,24 @@ function post_config_uboot_target__extra_configs_for_nanopct6_mainline_environme
 	run_host_command_logged scripts/config --set-val CONFIG_ENV_SIZE "0x20000"
 	run_host_command_logged scripts/config --set-val CONFIG_ENV_OFFSET "0xc00000"

-	display_alert "u-boot for ${BOARD}" "u-boot: enable preboot & flash user LED in preboot" "info"
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable preboot & flash user LED in preboot" "info"
 	run_host_command_logged scripts/config --enable CONFIG_USE_PREBOOT
 	run_host_command_logged scripts/config --set-str CONFIG_PREBOOT "'led user-led on; sleep 0.1; led user-led off'" # double quotes required due to run_host_command_logged's quirks

-	display_alert "u-boot for ${BOARD}" "u-boot: enable EFI debugging command" "info"
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable EFI debugging commands" "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"
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "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"
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "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"
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "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
@@ -87,14 +122,13 @@ function post_config_uboot_target__extra_configs_for_nanopct6_mainline_environme
 	run_host_command_logged scripts/config --enable CONFIG_PROT_TCP_SACK

 	# UMS, RockUSB, gadget stuff
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable UMS/RockUSB gadget" "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
-		display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable ${config}" "info"
 		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
-
 }

 # Include fw_setenv, configured to point to the correct spot on the SPI Flash
--- a/config/boards/nanopi-m6.conf
+++ b/config/boards/nanopi-m6.conf
@@ -4,15 +4,23 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="efectn"
 BOOTCONFIG="nanopi-m6-rk3588s_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
-KERNEL_TARGET="vendor"
+KERNEL_TARGET="current,edge,vendor"
+KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 IMAGE_PARTITION_TABLE="gpt"
 BOOT_FDT_FILE="rockchip/rk3588s-nanopi-m6.dtb"
 BOOT_SCENARIO="spl-blobs"
+BOOT_SUPPORT_SPI="yes"
+BOOT_SPI_RKSPI_LOADER="yes"

 DEFAULT_OVERLAYS="nanopi-m6-display-dsi1-yx35" # Enable YX35 LCD

+function post_family_config__nanopi_m6_support_spi_boot() {
+	UBOOT_TARGET_MAP="nanopi-m6-rk3588s_defconfig BL31=$RKBIN_DIR/$BL31_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb
+nanopi-m6-spi-rk3588s_defconfig BL31=$RKBIN_DIR/$BL31_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;rkspi_loader.img"
+}
+
 function post_family_tweaks__nanopim6_naming_udev_audios() {
 	display_alert "$BOARD" "Renaming NanoPi M6 HDMI audio" "info"

--- 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.csc
+++ b/config/boards/nanopi-r3s.csc
@@ -0,0 +1,53 @@
+# Rockchip RK3566 quad core 2GB RAM eMMC 2x GbE USB3
+BOARD_NAME="NanoPi R3S"
+BOARDFAMILY="rk35xx"
+BOARD_MAINTAINER=""
+HAS_VIDEO_OUTPUT="no"
+BOOTCONFIG="nanopi-r3s-rk3566_defconfig"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current,edge"
+BOOT_FDT_FILE="rockchip/rk3566-nanopi-r3s.dtb"
+IMAGE_PARTITION_TABLE="gpt"
+BOOT_SCENARIO="spl-blobs"
+
+
+function post_family_config_branch_edge__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__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"
+
+	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-r6c.csc
+++ b/config/boards/nanopi-r6c.csc
@@ -4,12 +4,13 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="ColorfulRhino"
 BOOTCONFIG="nanopi-r6c-rk3588s_defconfig" # Mainline defconfig, enables booting from NVMe
 BOOT_SOC="rk3588"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 IMAGE_PARTITION_TABLE="gpt"
 BOOT_FDT_FILE="rockchip/rk3588s-nanopi-r6c.dtb"
 BOOT_SCENARIO="spl-blobs"
+declare -g UEFI_EDK2_BOARD_ID="nanopi-r6c" # This _only_ used for uefi-edk2-rk3588 extension

 function post_family_tweaks__nanopi_r6c_naming_audios() {
 	display_alert "$BOARD" "Renaming NanoPi R6C HDMI audio interface to human-readable form" "info"
@@ -36,17 +37,80 @@ function post_family_config__nanopi_r6c_use_mainline_uboot() {

 	declare -g BOOTDELAY=1                                       # Wait for UART interrupt to enter UMS/RockUSB mode etc
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
-	declare -g BOOTBRANCH="tag:v2024.10"
-	declare -g BOOTPATCHDIR="v2024.10"
-	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency
-
+	declare -g BOOTBRANCH="tag:v2025.01"
+	declare -g BOOTPATCHDIR="v2025.01"
+	declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
 	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"
-
-	# Disable stuff from rockchip64_common; we're using binman here which does all the work already
-	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
+	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 pre_config_uboot_target__r6c_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 <<- EOD >> arch/arm/dts/rk3588s-nanopi-r6c-u-boot.dtsi
+		&u2phy0 { status = "okay"; };
+		&u2phy0_otg { status = "okay"; };
+		&usbdp_phy0 { status = "okay"; };
+		&usb_host0_xhci { dr_mode = "peripheral";  maximum-speed = "high-speed";  status = "okay"; };
+	EOD
+}
+
+# The upstream DTs (kernel 6.13 / u-boot 2025.01) are in flux and different
+# let's just patch to normalize the SD and eMMC order as in mainline Linux DT: https://github.com/torvalds/linux/blob/master/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi#L14-L15
+function pre_config_uboot_target__r6c_patch_uboot_dtsi_for_sd_emmc_order() {
+	display_alert "u-boot for ${BOARD}" "u-boot: add to u-boot dtsi for SD=mmc0 and eMMC=mmc1" "info"
+	cat <<- EOD >> arch/arm/dts/rk3588s-nanopi-r6c-u-boot.dtsi
+		/ { aliases { mmc0 = &sdmmc; mmc1 = &sdhci; }; };
+	EOD
+}
+
+# "rockchip-common: boot SD card first, then NVMe, then mmc"
+# include/configs/rockchip-common.h
+# -#define BOOT_TARGETS "mmc1 mmc0 nvme scsi usb pxe dhcp spi"
+# +#define BOOT_TARGETS "mmc0 nvme mmc1 scsi usb pxe dhcp spi"
+# On R6C, mmc1 is the eMMC, mmc0 is the SD card slot
+function pre_config_uboot_target__r6c_patch_rockchip_common_boot_order() {
+	declare -a rockchip_uboot_targets=("mmc0" "nvme" "mmc1" "scsi" "usb" "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
+}
+
+function post_config_uboot_target__extra_configs_for_r6c_mainline() {
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable board-specific configs" "info"
+	run_host_command_logged scripts/config --enable CONFIG_DM_PMIC_FAN53555
+	run_host_command_logged scripts/config --enable CONFIG_CMD_MISC
+
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable EFI debugging commands" "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}/${BRANCH}" "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}/${BRANCH}" "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}/${BRANCH}" "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
+
+	# UMS, RockUSB, gadget stuff
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable UMS/RockUSB gadget" "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/nanopi-r6s.conf
+++ b/config/boards/nanopi-r6s.conf
@@ -4,7 +4,7 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="efectn"
 BOOTCONFIG="nanopi-r6s-rk3588s_defconfig" # Mainline defconfig
 BOOT_SOC="rk3588"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
@@ -40,17 +40,80 @@ function post_family_config__nanopi_r6s_use_mainline_uboot() {

 	declare -g BOOTDELAY=1                                       # Wait for UART interrupt to enter UMS/RockUSB mode etc
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
-	declare -g BOOTBRANCH="tag:v2024.10"
-	declare -g BOOTPATCHDIR="v2024.10"
-	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency
-
+	declare -g BOOTBRANCH="tag:v2025.01"
+	declare -g BOOTPATCHDIR="v2025.01"
+	declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
 	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"
-
-	# Disable stuff from rockchip64_common; we're using binman here which does all the work already
-	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
+	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 pre_config_uboot_target__r6s_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 <<- EOD >> arch/arm/dts/rk3588s-nanopi-r6s-u-boot.dtsi
+		&u2phy0 { status = "okay"; };
+		&u2phy0_otg { status = "okay"; };
+		&usbdp_phy0 { status = "okay"; };
+		&usb_host0_xhci { dr_mode = "peripheral";  maximum-speed = "high-speed";  status = "okay"; };
+	EOD
+}
+
+# The upstream DTs (kernel 6.13 / u-boot 2025.01) are in flux and different
+# let's just patch to normalize the SD and eMMC order as in mainline Linux DT: https://github.com/torvalds/linux/blob/master/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi#L14-L15
+function pre_config_uboot_target__r6s_patch_uboot_dtsi_for_sd_emmc_order() {
+	display_alert "u-boot for ${BOARD}" "u-boot: add to u-boot dtsi for SD=mmc0 and eMMC=mmc1" "info"
+	cat <<- EOD >> arch/arm/dts/rk3588s-nanopi-r6s-u-boot.dtsi
+		/ { aliases { mmc0 = &sdmmc; mmc1 = &sdhci; }; };
+	EOD
+}
+
+# "rockchip-common: boot SD card first, then NVMe, then mmc"
+# include/configs/rockchip-common.h
+# -#define BOOT_TARGETS "mmc1 mmc0 nvme scsi usb pxe dhcp spi"
+# +#define BOOT_TARGETS "mmc0 nvme mmc1 scsi usb pxe dhcp spi"
+# On R6S, mmc1 is the eMMC, mmc0 is the SD card slot
+function pre_config_uboot_target__r6s_patch_rockchip_common_boot_order() {
+	declare -a rockchip_uboot_targets=("mmc0" "nvme" "mmc1" "scsi" "usb" "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
+}
+
+function post_config_uboot_target__extra_configs_for_r6s_mainline() {
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable board-specific configs" "info"
+	run_host_command_logged scripts/config --enable CONFIG_DM_PMIC_FAN53555
+	run_host_command_logged scripts/config --enable CONFIG_CMD_MISC
+
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable EFI debugging commands" "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}/${BRANCH}" "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}/${BRANCH}" "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}/${BRANCH}" "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
+
+	# UMS, RockUSB, gadget stuff
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable UMS/RockUSB gadget" "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/odroidc1.conf
+++ b/config/boards/odroidc1.conf
@@ -2,7 +2,7 @@
 BOARD_NAME="Odroid C1"
 BOARDFAMILY="meson8b"
 BOARD_MAINTAINER="juanlufont"
-KERNEL_TARGET="current,edge"
+KERNEL_TARGET="current"
 KERNEL_TEST_TARGET="current"

 BOOTDIR='u-boot-odroidc1'
--- a/config/boards/odroidm1.conf
+++ b/config/boards/odroidm1.conf
@@ -12,8 +12,8 @@ IMAGE_PARTITION_TABLE="gpt"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"

-BOOTBRANCH_BOARD="tag:v2024.07"
-BOOTPATCHDIR="v2024.07"
+BOOTBRANCH_BOARD="tag:v2025.01"
+BOOTPATCHDIR="v2025.01" # but all changes are done in this board file, not patches

 BOOTCONFIG="odroid-m1-rk3568_defconfig"
 BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
@@ -21,10 +21,6 @@ BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
 # The overlays for this board are prefixed by 'rockchip-rk3568-hk' (see for example patch/kernel/archive/rockchip64-6.6/overlay/rockchip-rk3568-hk-i2c0.dts)
 OVERLAY_PREFIX="rockchip-rk3568-hk"

-# HK's SPI partition on MTD:
-# mtd0: start 0         size 917.504   end 917.504    : SPL          == start 0x0      size 0xe0000  : SPL
-# mtd1: start 917.504   size 131.072   end 1.048.576  : U-Boot Env   == start 0xe0000  size 0x20000  : U-Boot Env
-# mtd2: start 1.048.576 size 2.097.152 end 3.145.728  : U-Boot       == start 0x100000 size 0x200000 : U-Boot
 function post_family_config__uboot_config() {
 	display_alert "$BOARD" "u-boot ${BOOTBRANCH_BOARD} overrides" "info"
 	BOOTDELAY=1 # Wait for UART interrupt to enter UMS/RockUSB mode etc
@@ -67,14 +63,20 @@ function post_family_tweaks__config_odroidm1_fwenv() {
 	#   https://github.com/hardkernel/u-boot/blob/356906e6445378a45ac14ec184fc6e666b22338a/configs/odroid_rk3568_defconfig#L212-L213
 	# The kernel DT has a convenient partition table, so mtd1 is ready to use, just gotta set the size.
 	#   https://github.com/torvalds/linux/blob/master/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts#L637-L662
+	# HK's SPI partition on MTD:
+	# mtd0: start 0         size 917.504   end 917.504    : SPL          == start 0x0      size 0xe0000  : SPL
+	# mtd1: start 917.504   size 131.072   end 1.048.576  : U-Boot Env   == start 0xe0000  size 0x20000  : U-Boot Env
+	# mtd2: start 1.048.576 size 2.097.152 end 3.145.728  : U-Boot       == start 0x100000 size 0x200000 : U-Boot

 	cat <<- 'FW_ENV_CONFIG' > "${SDCARD}"/etc/fw_env.config
 		# MTD on the SPI for the Odroid-M1; this requires the MTD partition table in the board kernel DTS
 		# MTD device name Device offset Env. size Flash sector size Number of sectors
 		/dev/mtd1                       0x0000                      0x20000
 	FW_ENV_CONFIG
+}

-	# add a network rule to rename default name
+# add a network rule to rename default name
+function post_family_tweaks__odroidm1_rename_gmac_eth0() {
 	display_alert "Creating network rename rule for Odroid M1"
 	mkdir -p "${SDCARD}"/etc/udev/rules.d/
 	cat <<- EOF > "${SDCARD}"/etc/udev/rules.d/70-rename-lan.rules
@@ -83,6 +85,22 @@ function post_family_tweaks__config_odroidm1_fwenv() {

 }

+function pre_config_uboot_target__odroidm1_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/rk3568-odroid-m1-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 odroidm1, mmc0 is the eMMC, mmc1 is the SD card slot
+function pre_config_uboot_target__odroidm1_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_odroid-m1() {
@@ -119,6 +137,13 @@ function post_config_uboot_target__extra_configs_for_odroid-m1() {
 	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
--- a/config/boards/odroidm2.csc
+++ b/config/boards/odroidm2.csc
@@ -0,0 +1,51 @@
+# Rockchip RK3588s SoC octa core 4-16GB SoC eMMC USB3 NvME
+BOARD_NAME="Odroid M2"
+BOARDFAMILY="rockchip64"
+BOARD_MAINTAINER="mlegenovic"
+BOOT_SOC="rk3588"
+KERNEL_TARGET="edge"
+BOOT_FDT_FILE="rockchip/rk3588s-odroid-m2.dtb"
+BOOT_SCENARIO="binman"
+IMAGE_PARTITION_TABLE="gpt"
+FULL_DESKTOP="no"
+BOOT_LOGO="yes"
+
+BOOTBRANCH_BOARD="tag:v2025.04-rc4"
+BOOTBRANCH="${BOOTBRANCH_BOARD}"
+BOOTPATCHDIR="v2025.04-rc4"
+
+BOOTCONFIG="odroid-m2-rk3588s_defconfig"
+BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
+
+OVERLAY_PREFIX='rockchip-rk3588'
+
+function post_family_config__uboot_config() {
+	display_alert "$BOARD" "u-boot ${BOOTBRANCH_BOARD} overrides" "info"
+	BOOTDELAY=1 # Wait for UART interrupt to enter UMS/RockUSB mode etc
+	UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/$BL31_BLOB ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already
+
+	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
+	function write_uboot_platform() {
+		dd if=${1}/u-boot-rockchip.bin of=${2} bs=32k seek=1 conv=fsync
+	}
+}
+
+# "rockchip-common: boot SD card first, then NVMe, then SATA, then USB, then mmc"
+# On odroidm2, mmc0 is the eMMC, mmc1 is the SD card slot
+function pre_config_uboot_target__odroidm2_patch_rockchip_common_boot_order() {
+	declare -a rockchip_uboot_targets=("mmc1" "nvme" "mmc0" "usb" "pxe" "dhcp") # 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
+}
+
+# add a network rule to rename default name
+function post_family_tweaks__odroidm2_rename_gmac_eth0() {
+	display_alert "Creating network rename rule for Odroid M2"
+	mkdir -p "${SDCARD}"/etc/udev/rules.d/
+	cat <<- EOF > "${SDCARD}"/etc/udev/rules.d/70-rename-lan.rules
+		SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", KERNEL=="end*", NAME="eth0"
+	EOF
+
+}
--- a/config/boards/onecloud.conf
+++ b/config/boards/onecloud.conf
@@ -2,7 +2,7 @@
 BOARD_NAME="OneCloud"
 BOARDFAMILY="meson8b"
 BOARD_MAINTAINER="hzyitc"
-KERNEL_TARGET="current,edge"
+KERNEL_TARGET="current"
 KERNEL_TEST_TARGET="current"
 BOOTCONFIG="none"
 BOOTSCRIPT="boot-onecloud.cmd:boot.cmd"
--- a/config/boards/oneplus-kebab.conf
+++ b/config/boards/oneplus-kebab.conf
@@ -25,9 +25,14 @@ function post_family_tweaks_bsp__oneplus-kebab_firmware() {
 	# 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/

 	# Bluetooth MAC addr setup service
 	install -Dm655 $SRC/packages/bsp/generate-bt-mac-addr/bt-fixed-mac.sh $destination/usr/local/bin/
@@ -60,14 +65,14 @@ function post_family_tweaks__oneplus-kebab_enable_services() {
 	fi

 	# we need unudhcpd from armbian repo, so enable it
-	mv "${SDCARD}"/etc/apt/sources.list.d/armbian.list.disabled "${SDCARD}"/etc/apt/sources.list.d/armbian.list
+	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
+	do_with_retries 3 chroot_sdcard_apt_get_install alsa-ucm-conf qbootctl qrtr-tools unudhcpd mkbootimg dropbear-bin

 	# disable armbian repo back
-	mv "${SDCARD}"/etc/apt/sources.list.d/armbian.list "${SDCARD}"/etc/apt/sources.list.d/armbian.list.disabled
+	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
--- a/config/boards/orangepi4-lts.conf
+++ b/config/boards/orangepi4-lts.conf
@@ -4,7 +4,7 @@
 BOARD_NAME="Orange Pi 4 LTS"
 BOARDFAMILY="rockchip64" # Used to be rk3399
 BOARD_MAINTAINER="paolosabatino"
-BOOTCONFIG="orangepi-4-rk3399_defconfig"
+BOOTCONFIG="orangepi-rk3399_defconfig"
 BOOT_FDT_FILE="rockchip/rk3399-orangepi-4-lts.dtb"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
@@ -13,8 +13,9 @@ MODULES_EDGE="sprdbt_tty sprdwl_ng"
 FULL_DESKTOP="yes"
 ASOUND_STATE="asound.state.rk3399"
 BOOT_LOGO="desktop"
-BOOTBRANCH_BOARD="tag:v2022.04"
-BOOTPATCHDIR="u-boot-rockchip64-v2022.04"
+BOOTBRANCH_BOARD="tag:v2025.01"
+BOOTPATCHDIR="v2025.01"
+BOOT_SCENARIO="binman"

 function post_family_tweaks_bsp__OPi4lts() {
 	display_alert "Installing BSP firmware and fixups"
--- a/config/boards/orangepi5-max.csc
+++ b/config/boards/orangepi5-max.csc
@@ -4,8 +4,8 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER=""
 BOOTCONFIG="orangepi-5-max-rk3588_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
-KERNEL_TARGET="vendor"
-KERNEL_TEST_TARGET="vendor"
+KERNEL_TARGET="vendor,current,edge"
+KERNEL_TEST_TARGET="vendor,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-orangepi-5-max.dtb"
--- a/config/boards/orangepi5-plus.conf
+++ b/config/boards/orangepi5-plus.conf
@@ -4,7 +4,7 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="alexl83"
 BOOTCONFIG="orangepi-5-plus-rk3588_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
--- a/config/boards/orangepi5-ultra.csc
+++ b/config/boards/orangepi5-ultra.csc
@@ -0,0 +1,57 @@
+# Rockchip RK3588 octa core whatever fixme
+BOARD_NAME="Orange Pi 5 Ultra"
+BOARDFAMILY="rockchip-rk3588"
+BOARD_MAINTAINER=""
+BOOTCONFIG="orangepi-5-ultra-rk3588_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
+BOOT_SOC="rk3588"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current,edge"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3588-orangepi-5-ultra.dtb"
+BOOT_SCENARIO="spl-blobs"
+BOOT_SUPPORT_SPI="yes"
+BOOT_SPI_RKSPI_LOADER="yes"
+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"
+
+	mkdir -p $SDCARD/etc/udev/rules.d/
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi0-sound", ENV{SOUND_DESCRIPTION}="HDMI0 Audio"' > $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi1-sound", ENV{SOUND_DESCRIPTION}="HDMI1 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-es8388-sound", ENV{SOUND_DESCRIPTION}="ES8388 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+
+	return 0
+}
+
+function post_family_tweaks_bsp__orangepi5ultra_bluetooth() {
+	display_alert "$BOARD" "Installing ap6611s-bluetooth.service" "info"
+
+	# Bluetooth on this board is handled by a Broadcom (AP6611S) chip and requires
+	# a custom brcm_patchram_plus binary, plus a systemd service to run it at boot time
+	install -m 755 $SRC/packages/bsp/rk3399/brcm_patchram_plus_rk3399 $destination/usr/bin
+	cp $SRC/packages/bsp/rk3399/rk3399-bluetooth.service $destination/lib/systemd/system/ap6611s-bluetooth.service
+
+	# Reuse the service file, ttyS0 -> ttyS7; BCM4345C5.hcd -> SYN43711A0.hcd
+	sed -i 's/ttyS0/ttyS7/g' $destination/lib/systemd/system/ap6611s-bluetooth.service
+	sed -i 's/BCM4345C5.hcd/SYN43711A0.hcd/g' $destination/lib/systemd/system/ap6611s-bluetooth.service
+	return 0
+}
+
+function post_family_tweaks__orangepi5ultra_enable_bluetooth_service() {
+	display_alert "$BOARD" "Enabling ap6611s-bluetooth.service" "info"
+	chroot_sdcard systemctl enable ap6611s-bluetooth.service
+	return 0
+}
--- a/config/boards/orangepi5.conf
+++ b/config/boards/orangepi5.conf
@@ -5,7 +5,7 @@ BOARD_MAINTAINER="efectn"
 BOOTCONFIG="orangepi-5-rk3588s_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOTCONFIG_SATA="orangepi-5-sata-rk3588s_defconfig"
 BOOT_SOC="rk3588"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
@@ -14,12 +14,32 @@ BOOT_SCENARIO="spl-blobs"
 BOOT_SUPPORT_SPI="yes"
 BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
-KERNEL_UPGRADE_FREEZE="vendor-rk35xx@24.8.1"
 declare -g UEFI_EDK2_BOARD_ID="orangepi-5" # This _only_ used for uefi-edk2-rk3588 extension

-# @TODO: consider removing those, as the defaults in rockchip64_common have been bumped up
-DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.15.bin'
-BL31_BLOB='rk35/rk3588_bl31_v1.44.elf'
+# Mainline U-Boot for current kernel
+function post_family_config_branch_current__orangepi5_use_mainline_uboot() {
+	display_alert "$BOARD" "Mainline U-Boot overrides for $BOARD - $BRANCH" "info"
+
+	declare -g BOOTCONFIG="orangepi-5-rk3588s_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.01"
+	declare -g BOOTPATCHDIR="v2025.01"
+	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
+	}
+}
+
+

 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
--- a/config/boards/pocketbeagle2.csc
+++ b/config/boards/pocketbeagle2.csc
@@ -0,0 +1,28 @@
+#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/pocketchip-sd.csc
+++ b/config/boards/pocketchip-sd.csc
@@ -1,4 +1,4 @@
-# Allwinner R8(A13) single core 512Mb (NextThing C.H.I.P.)
+# Allwinner R8(A13) single core 512Mb (NextThing C.H.I.P.) with MMC2 breakout
 BOARD_NAME="NextThing C.H.I.P."
 BOARDFAMILY="sun5i"
 BOARD_MAINTAINER="TheSnowfield"
--- 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-e25.csc
+++ b/config/boards/radxa-e25.csc
@@ -3,7 +3,7 @@ BOARD_NAME="Radxa E25"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER="krachlatte"
 BOOTCONFIG="radxa-e25-rk3568_defconfig"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
--- a/config/boards/radxa-zero.conf
+++ b/config/boards/radxa-zero.conf
@@ -13,6 +13,7 @@ FORCE_BOOTSCRIPT_UPDATE="yes"
 BOOT_LOGO="desktop"
 ASOUND_STATE="asound.state.radxa-zero"
 BOOT_FDT_FILE="amlogic/meson-g12a-radxa-zero.dtb"
+OVERLAY_PREFIX="meson-g12a"

 # Newer u-boot for the Zero
 BOOTBRANCH_BOARD="tag:v2023.07.02"
--- a/config/boards/rk3318-box.tvb
+++ b/config/boards/rk3318-box.tvb
@@ -10,8 +10,8 @@ BOOT_SCENARIO="tpl-blob-atf-mainline"
 DDR_BLOB="rk33/rk3318_ddr_333Mhz_v1.16.bin"
 BOOT_SOC="rk3328"

-BOOTBRANCH_BOARD="tag:v2024.07"
-BOOTPATCHDIR="v2024.07"
+BOOTBRANCH_BOARD="tag:v2025.01"
+BOOTPATCHDIR="v2025.01"

 enable_extension xorg-lima-serverflags

--- a/config/boards/rock-2a.csc
+++ b/config/boards/rock-2a.csc
@@ -0,0 +1,13 @@
+# Rockchip RK3528 quad core 1-4GB SoC 1xGBe 0-32GB eMMC
+BOARD_NAME="ROCK 2A"
+BOARDFAMILY="rk35xx"
+BOOTCONFIG="rock-2-rk3528_defconfig"
+BOARD_MAINTAINER="CodeChenL"
+KERNEL_TARGET="vendor"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3528-rock-2a.dtb"
+BOOT_SCENARIO="spl-blobs"
+IMAGE_PARTITION_TABLE="gpt"
+enable_extension "radxa-aic8800"
+AIC8800_TYPE="usb"
--- a/config/boards/rock-2f.csc
+++ b/config/boards/rock-2f.csc
@@ -0,0 +1,13 @@
+# Rockchip RK3528 quad core 1-4GB SoC WIFI/BT 0-32GB eMMC
+BOARD_NAME="ROCK 2F"
+BOARDFAMILY="rk35xx"
+BOOTCONFIG="rock-2-rk3528_defconfig"
+BOARD_MAINTAINER="CodeChenL"
+KERNEL_TARGET="vendor"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3528-rock-2f.dtb"
+BOOT_SCENARIO="spl-blobs"
+IMAGE_PARTITION_TABLE="gpt"
+enable_extension "radxa-aic8800"
+AIC8800_TYPE="usb"
--- a/config/boards/rock-3a.conf
+++ b/config/boards/rock-3a.conf
@@ -4,7 +4,7 @@ BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER="ZazaBR amazingfate catalinii vamzii"
 BOOTCONFIG="rock-3a-rk3568_defconfig"
 BOOTCONFIG_SATA="rock-3a-sata-rk3568_defconfig"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
@@ -21,8 +21,30 @@ function post_family_config_branch_edge__rock-3a_use_mainline_uboot() {
 	declare -g BOOTCONFIG="rock-3a-rk3568_defconfig"
 	declare -g BOOTDELAY=1
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot"
-	declare -g BOOTBRANCH="tag:v2024.10"
-	declare -g BOOTPATCHDIR="v2024.10"
+	declare -g BOOTBRANCH="tag:v2025.01"
+	declare -g BOOTPATCHDIR="v2025.01"
+	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_config_branch_current__rock-3a_use_mainline_uboot() {
+	display_alert "$BOARD" "Mainline U-Boot overrides for $BOARD - $BRANCH" "info"
+	unset BOOTFS_TYPE # fixes armbian-install and unneeded for modern uboot anyway
+	declare -g BOOTCONFIG="rock-3a-rk3568_defconfig"
+	declare -g BOOTDELAY=1
+	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot"
+	declare -g BOOTBRANCH="tag:v2025.01"
+	declare -g BOOTPATCHDIR="v2025.01"
 	declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
 	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
 	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already
--- a/config/boards/rock-5-itx.conf
+++ b/config/boards/rock-5-itx.conf
@@ -4,6 +4,7 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="amazingfate prahal"
 BOOTCONFIG="rock-5-itx-rk3588_defconfig"
 KERNEL_TARGET="current,edge,vendor"
+KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-rock-5-itx.dtb"
--- a/config/boards/rock-5a.conf
+++ b/config/boards/rock-5a.conf
@@ -3,7 +3,7 @@ BOARD_NAME="Rock 5A"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="amazingfate"
 BOOTCONFIG="rock-5a-rk3588s_defconfig"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
--- a/config/boards/rock-5b.conf
+++ b/config/boards/rock-5b.conf
@@ -3,7 +3,7 @@ BOARD_NAME="Rock 5B"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="amazingfate linhz0hz"
 BOOTCONFIG="rock-5b-rk3588_defconfig"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
--- a/config/boards/rock-5c.conf
+++ b/config/boards/rock-5c.conf
@@ -3,7 +3,8 @@ BOARD_NAME="Rock 5C"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="schwar3kat"
 BOOTCONFIG="rock-5c-rk3588s_defconfig"
-KERNEL_TARGET="vendor,edge"
+KERNEL_TARGET="vendor,current,edge"
+KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588s-rock-5c.dtb"
@@ -14,14 +15,6 @@ enable_extension "radxa-aic8800"
 AIC8800_TYPE="usb"
 ASOUND_STATE="asound.state.rock-5c"

-function post_family_config__uboot_rock5c() {
-	display_alert "$BOARD" "Configuring armsom u-boot" "info"
-	declare -g BOOTSOURCE='https://github.com/radxa/u-boot.git'
-	declare -g BOOTBRANCH="branch:next-dev-v2024.03"
-	declare -g OVERLAY_PREFIX='rockchip-rk3588'
-	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
-}
-
 function post_family_tweaks__rock5c_naming_audios() {
 	display_alert "$BOARD" "Renaming rock5c audios" "info"

@@ -31,12 +24,3 @@ function post_family_tweaks__rock5c_naming_audios() {

 	return 0
 }
-
-function post_family_tweaks__rock5c_naming_wireless_interface() {
-	display_alert "$BOARD" "Renaming rock5c wifi" "info"
-
-	mkdir -p $SDCARD/etc/udev/rules.d/
-	echo 'SUBSYSTEM=="net", ACTION=="add", ATTR{address}=="88:00:*", NAME="$ENV{ID_NET_SLOT}"' > $SDCARD/etc/udev/rules.d/99-radxa-aic8800.rules
-
-	return 0
-}
--- a/config/boards/rock-5t.conf
+++ b/config/boards/rock-5t.conf
@@ -0,0 +1,28 @@
+# Rockchip RK3588 SoC octa core 4-16GB SoC 2.5GBe eMMC USB3 NvME
+BOARD_NAME="Rock 5T"
+BOARDFAMILY="rockchip-rk3588"
+BOARD_MAINTAINER="HeyMeco"
+BOOTCONFIG="rock-5t-rk3588_defconfig"
+KERNEL_TARGET="vendor"
+KERNEL_TEST_TARGET="vendor"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3588-rock-5t.dtb"
+BOOT_SCENARIO="spl-blobs"
+BOOT_SUPPORT_SPI="yes"
+BOOT_SPI_RKSPI_LOADER="yes"
+IMAGE_PARTITION_TABLE="gpt"
+declare -g UEFI_EDK2_BOARD_ID="rock-5t" # This _only_ used for uefi-edk2-rk3588 extension
+
+function post_family_tweaks__rock5b_naming_audios() {
+	display_alert "$BOARD" "Renaming rock5b audios" "info"
+
+	mkdir -p $SDCARD/etc/udev/rules.d/
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi1-sound", ENV{SOUND_DESCRIPTION}="HDMI1 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmiin-sound", ENV{SOUND_DESCRIPTION}="HDMI-In Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-dp0-sound", ENV{SOUND_DESCRIPTION}="DP0 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-dp1-sound", ENV{SOUND_DESCRIPTION}="DP1 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-es8316-sound", ENV{SOUND_DESCRIPTION}="ES8316 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+
+	return 0
+}
--- a/config/boards/rock-s0.conf
+++ b/config/boards/rock-s0.conf
@@ -21,6 +21,7 @@ BOOTPATCHDIR="v2024.10"
 BOOT_SCENARIO="binman"
 DDR_BLOB="rk33/rk3308_ddr_589MHz_uart0_m0_v2.07.bin"
 BL31_BLOB="rk33/rk3308_bl31_v2.26.elf"
+FORCE_UBOOT_UPDATE="yes"

 OVERLAY_PREFIX="rk3308"

--- a/config/boards/rock64.conf
+++ b/config/boards/rock64.conf
--- 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/rockpi-s.conf
+++ b/config/boards/rockpi-s.conf
@@ -21,6 +21,7 @@ BOOTPATCHDIR="v2024.10"
 BOOT_SCENARIO="binman"
 DDR_BLOB="rk33/rk3308_ddr_589MHz_uart0_m0_v2.07.bin"
 BL31_BLOB="rk33/rk3308_bl31_v2.26.elf"
+FORCE_UBOOT_UPDATE="yes"

 OVERLAY_PREFIX="rk3308"

--- a/config/boards/rockpro64.csc
+++ b/config/boards/rockpro64.csc
@@ -10,17 +10,15 @@ BOOT_LOGO="desktop"
 BOOT_SCENARIO="blobless"
 BOOT_SUPPORT_SPI=yes

-# u-boot v2024.07 for rockpro64; this includes https://github.com/u-boot/u-boot/commit/5e7cd8a119953dc2f466fea81e230d683ee03493
-BOOTBRANCH_BOARD="tag:v2024.07"
-BOOTPATCHDIR="v2024.07"
+BOOTBRANCH_BOARD="tag:v2025.01"
+BOOTPATCHDIR="v2025.01"

 # 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_config__use_mainline_uboot_rockpro64() {
-	# Use latest lts 2.8 ATF
-	ATFBRANCH='tag:lts-v2.8.16'
-	ATFPATCHDIR="atf-rockchip64" # patches for logging etc
+	# Do not set ATFBRANCH; instead uses the default from rockchip64_common, tested with v2.12.0 as of 2025.01[.09]
+
 	display_alert "$BOARD" "using ATF (blobless) ${ATFBRANCH} for ${BOOTBRANCH_BOARD} u-boot" "info"
 	# bl31.elf is copied directly from ATF build dir to uboot dir (by armbian u-boot build system)
 	UBOOT_TARGET_MAP="BL31=bl31.elf;;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
@@ -42,9 +40,7 @@ function post_config_uboot_target__extra_configs_for_rockpro64() {
 	run_host_command_logged scripts/config --set-val CONFIG_OF_LIBFDT_OVERLAY "y"
 	run_host_command_logged scripts/config --set-val CONFIG_MMC_HS400_SUPPORT "y"

-	# upstream defconfig already has env in SPI: https://github.com/u-boot/u-boot/blob/v2024.07/configs/rockpro64-rk3399_defconfig
-
-	# No preboot stuff for rockpro64.
+	# upstream defconfig already has env in SPI: https://github.com/u-boot/u-boot/blob/v2025.01/configs/rockpro64-rk3399_defconfig

 	display_alert "u-boot for ${BOARD}" "u-boot: enable EFI debugging command" "info"
 	run_host_command_logged scripts/config --enable CMD_EFIDEBUG
@@ -76,6 +72,22 @@ function post_config_uboot_target__extra_configs_for_rockpro64() {
 	run_host_command_logged scripts/config --disable USB_FUNCTION_FASTBOOT
 }

+function pre_config_uboot_target__rockpro64_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/rk3399-rockpro64-u-boot.dtsi
+		&usbdrd_dwc3_0 { status = "okay"; dr_mode = "otg"; };
+	UBOOT_BOARD_DTSI_OTG
+}
+
+# "rockchip-common: boot SD card first, then NVMe, then SATA, then USB, then mmc"
+# On rockpro64, mmc0 is the eMMC, mmc1 is the SD card slot https://github.com/torvalds/linux/blob/master/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi#L15-L16
+function pre_config_uboot_target__rockpro64_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
+}
+
 function post_family_tweaks__config_rockpro64_fwenv() {
 	display_alert "Configuring fw_printenv and fw_setenv" "for ${BOARD} and u-boot ${BOOTBRANCH_BOARD}" "info"
 	# Addresses below come from CONFIG_ENV_OFFSET and CONFIG_ENV_SIZE in https://github.com/u-boot/u-boot/blob/v2024.07/configs/rockpro64-rk3399_defconfig
--- a/config/boards/rpi4b.conf
+++ b/config/boards/rpi4b.conf
@@ -1,7 +1,8 @@
-# Broadcom BCM2711 quad core 1-8Gb RAM SoC USB3 GBE USB-C WiFi/BT
-declare -g BOARD_NAME="Raspberry Pi 4"
+# All 64b Raspberry models from Broadcom BCM2837 - BCM271x quad core 1-16Gb RAM SoC USB3 GBE USB-C WiFi/BT
+declare -g BOARD_NAME="Raspberry Pi"
 declare -g BOARDFAMILY="bcm2711"
 declare -g BOARD_MAINTAINER="PanderMusubi teknoid"
 declare -g KERNEL_TARGET="legacy,current,edge"
 declare -g ASOUND_STATE="asound.state.rpi"
 declare -g KERNEL_TEST_TARGET="current"
+declare -g MODULES="i2c_dev"
--- a/config/boards/rpi5b.csc
+++ b/config/boards/rpi5b.csc
@@ -1,7 +0,0 @@
-# Broadcom BCM2712 quad core 1-8Gb RAM SoC USB3 GBE USB-C WiFi/BT
-declare -g BOARD_NAME="Raspberry Pi 5"
-declare -g BOARDFAMILY="bcm2711"
-declare -g BOARD_MAINTAINER=""
-declare -g KERNEL_TARGET="current,edge"
-declare -g KERNEL_TEST_TARGET="current"
-declare -g ASOUND_STATE="asound.state.rpi"
--- a/config/boards/sakurapi-rk3308b.csc
+++ b/config/boards/sakurapi-rk3308b.csc
@@ -9,9 +9,13 @@ MODULES_LEGACY="g_serial"
 SERIALCON="ttyS0"
 KERNEL_TARGET="current"
 BOOT_FDT_FILE="rockchip/rk3308-sakurapi-rk3308b.dtb"
-MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu panfrost"
+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"
 IMAGE_PARTITION_TABLE="gpt"
-BOOT_SCENARIO="spl-blobs"
+
+BOOT_SCENARIO="only-blobs"
+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
@@ -9,8 +9,7 @@ BOOT_FDT_FILE="ti/k3-am625-sk.dts"
 TIBOOT3_BOOTCONFIG="am62x_evm_r5_defconfig"
 TIBOOT3_FILE="tiboot3-am62x-hs-fs-evm.bin"
 DEFAULT_CONSOLE="serial"
-HAS_VIDEO_OUTPUT="no"
-KERNEL_TARGET="edge"
-KERNEL_TEST_TARGET="edge"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 SERIALCON="ttyS2"
 ATF_BOARD="lite"
--- a/config/boards/sk-am68.conf
+++ b/config/boards/sk-am68.conf
@@ -10,6 +10,7 @@ TIBOOT3_BOOTCONFIG="j721s2_evm_r5_defconfig"
 TIBOOT3_FILE="tiboot3-j721s2-hs-fs-evm.bin"
 DEFAULT_CONSOLE="serial"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 SERIALCON="ttyS2"
 ATF_BOARD="generic"
 ATF_K3_USART_OFFSET="K3_USART=0x8"
--- a/config/boards/sk-am69.conf
+++ b/config/boards/sk-am69.conf
@@ -0,0 +1,16 @@
+# TI SK-AM69 octa core 32GB 32TOPS GBE USB3 OSPI DisplayPort HDMI
+
+BOARD_NAME="SK-AM69"
+BOARDFAMILY="k3"
+BOARD_MAINTAINER="glneo"
+BOOTCONFIG="am69_sk_a72_defconfig"
+BOOTFS_TYPE="fat"
+BOOT_FDT_FILE="ti/k3-am69-sk.dts"
+TIBOOT3_BOOTCONFIG="am69_sk_r5_defconfig"
+TIBOOT3_FILE="tiboot3-j784s4-hs-fs-evm.bin"
+DEFAULT_CONSOLE="serial"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
+SERIALCON="ttyS2"
+ATF_BOARD="j784s4"
+ATF_K3_USART_OFFSET="K3_USART=0x8"
--- a/config/boards/sk-tda4vm.conf
+++ b/config/boards/sk-tda4vm.conf
@@ -9,6 +9,8 @@ BOOT_FDT_FILE="ti/k3-j721e-sk.dts"
 TIBOOT3_BOOTCONFIG="j721e_evm_r5_defconfig"
 TIBOOT3_FILE="tiboot3-j721e-gp-evm.bin"
 SYSFW_FILE="sysfw-j721e-gp-evm.itb"
+TISPL_FILE="tispl.bin_unsigned"
+UBOOT_FILE="u-boot.img_unsigned"
 DEFAULT_CONSOLE="serial"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
--- 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:v2024.10"
+BOOTPATCHDIR="v2024.10"
+BOOT_SCENARIO="binman"
+SRC_EXTLINUX="yes"
+SRC_CMDLINE="console=ttyS2,1500000 console=tty0"
--- a/config/boards/station-m2.csc
+++ b/config/boards/station-m2.csc
@@ -3,23 +3,15 @@ BOARD_NAME="Station M2"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER=""
 BOOTCONFIG="station-m2-rk3566_defconfig"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
-BOOT_FDT_FILE="rockchip/rk3566-firefly-roc-pc.dtb"
+BOOT_FDT_FILE="rockchip/rk3566-roc-pc.dtb"
 BOOT_SCENARIO="spl-blobs"
 ASOUND_STATE="asound.state.station-m2"
 IMAGE_PARTITION_TABLE="gpt"

-function post_family_tweaks__station_m2() {
-	display_alert "$BOARD" "Installing board tweaks" "info"
-
-	cp -R $SRC/packages/blobs/station/firmware/* $SDCARD/lib/firmware/
-
-	return 0
-}
-
 # Override family config for this board; let's avoid conditionals in family config.
 function post_family_config__stationm2_use_radxa_vendor_uboot() {
 	BOOTSOURCE='https://github.com/radxa/u-boot.git'
--- a/config/boards/station-p2.csc
+++ b/config/boards/station-p2.csc
@@ -11,15 +11,6 @@ BOOT_FDT_FILE="rockchip/rk3568-roc-pc.dtb"
 ASOUND_STATE="asound.state.station-p2"
 IMAGE_PARTITION_TABLE="gpt"

-function post_family_tweaks__station_p2() {
-	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
-}
-
 # Mainline U-Boot
 function post_family_config__station_p2_use_mainline_uboot() {
 	display_alert "$BOARD" "Using mainline U-Boot for $BOARD / $BRANCH" "info"
--- 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-rc4' # @TODO: this is down to 16 patches, from hundreds back in the day. Considering merging this with default arm64 uefi kernel
+	declare -g KERNEL_MAJOR_MINOR="6.14" # Major and minor versions of this kernel.
+	declare -g KERNELBRANCH='branch:wip/sc8280xp-6.14' # @TODO: this is down to 31 patches, from hundreds back in the day. Considering merging this with default arm64 uefi kernel
 	declare -g KERNELSOURCE='https://github.com/jhovold/linux.git'
 	declare -g LINUXCONFIG="linux-${ARCH}-${BRANCH}" # for this board: linux-arm64-sc8280xp
 	display_alert "Set up jhovold's kernel ${KERNELBRANCH} for" "${BOARD}" "info"
--- a/config/boards/turing-rk1.csc
+++ b/config/boards/turing-rk1.csc
@@ -4,7 +4,7 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER=""
 BOOTCONFIG="turing-rk1-rk3588_defconfig"
 BOOT_SOC="rk3588"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
--- 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/unleashed.eos
+++ b/config/boards/unleashed.eos
--- a/config/boards/unmatched.eos
+++ b/config/boards/unmatched.eos
--- a/config/boards/visionfive.eos
+++ b/config/boards/visionfive.eos
--- a/config/boards/xiaomi-elish.conf
+++ b/config/boards/xiaomi-elish.conf
@@ -35,9 +35,14 @@ function post_family_tweaks_bsp__xiaomi-elish_firmware() {
 	# 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/

 	# Bluetooth MAC addr setup service
 	install -Dm655 $SRC/packages/bsp/generate-bt-mac-addr/bt-fixed-mac.sh $destination/usr/local/bin/
@@ -63,11 +68,11 @@ function post_family_tweaks__xiaomi-elish_enable_services() {
 	fi

 	# we need unudhcpd from armbian repo, so enable it
-	mv "${SDCARD}"/etc/apt/sources.list.d/armbian.list.disabled "${SDCARD}"/etc/apt/sources.list.d/armbian.list
+	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
+	do_with_retries 3 chroot_sdcard_apt_get_install alsa-ucm-conf qbootctl qrtr-tools unudhcpd mkbootimg dropbear-bin

 	# Install hexagonrpc userspace service for kernel after 6.11, hexagonrpc in only packaged for noble now
 	if [[ "${RELEASE}" == "noble" ]]; then
@@ -75,7 +80,7 @@ function post_family_tweaks__xiaomi-elish_enable_services() {
 		chroot_sdcard systemctl enable hexagonrpcd-sdsp.service
 	fi
 	# disable armbian repo back
-	mv "${SDCARD}"/etc/apt/sources.list.d/armbian.list "${SDCARD}"/etc/apt/sources.list.d/armbian.list.disabled
+	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
--- 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.list.disabled "${SDCARD}"/etc/apt/sources.list.d/armbian.list
-
-	do_with_retries 3 chroot_sdcard_apt_get_update
-	display_alert "$BOARD" "Installing board tweaks" "info"
-	do_with_retries 3 chroot_sdcard_apt_get_install alsa-ucm-conf qbootctl qrtr-tools unudhcpd mkbootimg
-
-	# Disable armbian repo back
-	mv "${SDCARD}"/etc/apt/sources.list.d/armbian.list "${SDCARD}"/etc/apt/sources.list.d/armbian.list.disabled
-	do_with_retries 3 chroot_sdcard_apt_get_update
-
-	chroot_sdcard systemctl enable qbootctl.service
-	chroot_sdcard systemctl enable usbgadget-rndis.service
-	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
@@ -32,13 +32,13 @@ function post_family_tweaks__youyeetoo_r1_naming_udev_network_interfaces() {

 # Mainline U-Boot
 function post_family_config__youyeetoo_r1_use_mainline_uboot() {
-	display_alert "$BOARD" "Using mainline U-Boot for $BOARD / $BRANCH" "info"
+	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 BOOTDELAY=1                                       # Wait for UART interrupt to enter UMS/RockUSB mode etc
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
-	declare -g BOOTBRANCH="tag:v2024.10"
-	declare -g BOOTPATCHDIR="v2024.10"
+	declare -g BOOTBRANCH="tag:v2025.01"
+	declare -g BOOTPATCHDIR="v2025.01"
 	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency

 	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"
@@ -52,6 +52,18 @@ function post_family_config__youyeetoo_r1_use_mainline_uboot() {
 	}
 }

+# "rockchip-common: boot SD card first, then NVMe, then mmc"
+# include/configs/rockchip-common.h
+# -#define BOOT_TARGETS "mmc1 mmc0 nvme scsi usb pxe dhcp"
+# +#define BOOT_TARGETS "mmc0 nvme mmc1 scsi usb pxe dhcp"
+# On youyeetoo R1, mmc0 is the SD card, mmc1 is the eMMC slot
+function pre_config_uboot_target__youyeetoo_r1_patch_rockchip_common_boot_order() {
+	declare -a rockchip_uboot_targets=("mmc0" "nvme" "mmc1" "scsi" "usb" "pxe" "dhcp") # 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
+}
+
 function post_family_tweaks__youyeetoo_r1 {
 	if [[ "${BRANCH}" != "vendor" ]]; then
 		display_alert "$BOARD" "Adjusting rtw89_8852be module" "info"
--- a/Show More
+++ b/Show More