BSP: fix incorrect logging for USB Gadget script

Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 8c14441336bb3d84fd6b7fa83b6d7201c740baf5 to 1ac60965030588f3b867cdd4a3900f37ec99970c.
- [Release notes](https://github.com/tj-actions/changed-files/releases)
- [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md)
- [Commits](8c14441336...1ac6096503)

---
updated-dependencies:
- dependency-name: tj-actions/changed-files
  dependency-version: 1ac60965030588f3b867cdd4a3900f37ec99970c
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/CODEOWNERS

@@ -27,19 +27,19 @@ config/boards/ayn-odin2.csc		@FantasyGmm
 config/boards/bananapi.conf		@DylanHP @janprunk
 config/boards/bananapicm4io.conf		@pyavitz
 config/boards/bananapif3.conf		@pyavitz
-config/boards/bananapim2plus.csc		@leggewie
+config/boards/bananapim2plus.conf		@leggewie
 config/boards/bananapim2pro.conf		@igorpecovnik
 config/boards/bananapim2s.conf		@jeanrhum @pyavitz
 config/boards/bananapim2zero.csc		@mhawkins-consultant
 config/boards/bananapim3.csc		@AaronNGray
-config/boards/bananapim4berry.wip		@The-going
+config/boards/bananapim4berry.conf		@The-going
 config/boards/bananapim4zero.conf		@pyavitz
 config/boards/bananapim5.conf		@igorpecovnik
 config/boards/bananapim64.csc		@devdotnetorg
 config/boards/bananapim7.conf		@amazingfate
 config/boards/beaglebone-ai64.conf		@Grippy98
 config/boards/beagleplay.conf		@Grippy98
-config/boards/beagley-ai.csc		@Grippy98
+config/boards/beagley-ai.conf		@Grippy98
 config/boards/bigtreetech-cb1.conf		@JohnTheCoolingFan
 config/boards/bigtreetech-cb2.conf		@JohnTheCoolingFan
 config/boards/cherryba-m1.csc		@IsMrX
@@ -51,23 +51,25 @@ config/boards/firefly-itx-3588j.csc		@SeeleVolleri
 config/boards/fxblox-rk1.csc		@mahdichi
 config/boards/gateway-gz80x.conf		@pyavitz
 config/boards/h96-tvbox-3566.tvb		@hqnicolas
-config/boards/helios4.csc		@Heisath
+config/boards/helios4.conf		@leggewie
 config/boards/helios64.conf		@prahal
 config/boards/hinlink-h28k.csc		@sputnik2019
 config/boards/hinlink-ht2.csc		@hoochiwetech
+config/boards/imb3588.conf		@JackHuang021
 config/boards/indiedroid-nova.csc		@lanefu
-config/boards/inovato-quadra.conf		@NicoD-SBC
+config/boards/inovato-quadra.conf		@igorpecovnik
 config/boards/jethubj100.conf		@adeepn
 config/boards/jethubj200.conf		@adeepn
 config/boards/jethubj80.conf		@adeepn
 config/boards/jp-tvbox-3566.tvb		@tdleiyao
 config/boards/khadas-edge2.conf		@efectn
 config/boards/khadas-vim1.conf		@igorpecovnik
-config/boards/khadas-vim1s.conf		@rpardini @viraniac
+config/boards/khadas-vim1s.conf		@rpardini
 config/boards/khadas-vim2.conf		@igorpecovnik
 config/boards/khadas-vim3.conf		@NicoD-SBC @rpardini
 config/boards/khadas-vim3l.conf		@rpardini
-config/boards/khadas-vim4.conf		@adeepn @rpardini @viraniac
+config/boards/khadas-vim4.conf		@adeepn @leggewie @rpardini
+config/boards/kickpik2b.csc		@pyavitz
 config/boards/lafrite.conf		@Tonymac32
 config/boards/leez-p710.csc		@andyshrk
 config/boards/lepotato.conf		@Tonymac32
@@ -77,19 +79,17 @@ config/boards/lubancat2.csc		@andyshrk
 config/boards/mangopi-m28k.csc		@sputnik2019
 config/boards/mba8mpxl-ras314.conf		@schmiedelm
 config/boards/mba8mpxl.conf		@schmiedelm
-config/boards/mekotronics-r58-minipc.csc		@monkaBlyat
-config/boards/mekotronics-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
 config/boards/nanopi-m6.conf		@efectn
-config/boards/nanopi-r4s.conf		@Manouchehri
+config/boards/nanopi-r3s-lts.conf		@pyavitz
 config/boards/nanopi-r5s.csc		@utlark
 config/boards/nanopi-r6c.csc		@ColorfulRhino
 config/boards/nanopi-r6s.conf		@efectn
+config/boards/nanopi-r76s.conf		@SuperKali
 config/boards/nanopiair.csc		@1ubuntuuser
 config/boards/nanopiduo.csc		@sgjava
 config/boards/nanopim4v2.conf		@igorpecovnik
@@ -100,7 +100,7 @@ config/boards/nanopineoplus2.csc		@teknoid
 config/boards/odroidc1.conf		@juanlufont
 config/boards/odroidc2.conf		@teknoid
 config/boards/odroidc4.conf		@igorpecovnik
-config/boards/odroidhc4.conf		@igorpecovnik
+config/boards/odroidhc4.conf		@biot
 config/boards/odroidm1.conf		@rpardini
 config/boards/odroidm2.csc		@mlegenovic
 config/boards/odroidn2.conf		@NicoD-SBC
@@ -121,17 +121,19 @@ config/boards/orangepizero3.csc		@alexl83 @chraac
 config/boards/orangepizeroplus.csc		@schwar3kat
 config/boards/phytiumpi.conf		@chainsx
 config/boards/pine64.conf		@PanderMusubi
+config/boards/pinebook-a64.csc		@Qvy-png
 config/boards/pinebook-pro.csc		@TRSx80 @ahoneybun
-config/boards/pocketbeagle2.csc		@Grippy98
+config/boards/pocketbeagle2.conf		@Grippy98
 config/boards/pocketchip-sd.csc		@TheSnowfield
 config/boards/qemu-uboot-arm64.csc		@rpardini
 config/boards/qemu-uboot-x86.csc		@rpardini
 config/boards/qemu-uefi-x86.conf		@davidandreoletti
 config/boards/radxa-e20c.csc		@mattx433
 config/boards/radxa-e25.csc		@krachlatte
-config/boards/radxa-e52c.conf		@amazingfate
+config/boards/radxa-e52c.conf		@amazingfate @schwar3kat
+config/boards/radxa-nio-12l.conf		@HeyMeco
+config/boards/radxa-rock-4d.csc		@HeyMeco
 config/boards/radxa-zero.conf		@clee @engineer-80
-config/boards/radxa-zero2.csc		@monkaBlyat
 config/boards/recore.csc		@eliasbakken
 config/boards/renegade.conf		@Tonymac32
 config/boards/retro-lite-cm5.csc		@ginkage
@@ -168,138 +170,151 @@ config/boards/tritium-h3.conf		@Tonymac32
 config/boards/tritium-h5.conf		@Tonymac32
 config/boards/uefi-arm64.conf		@rpardini
 config/boards/uefi-x86.conf		@rpardini
+config/boards/visionfive2.csc		@libiunc
 config/boards/wsl2-arm64.csc		@rpardini
 config/boards/wsl2-x86.csc		@rpardini
 config/boards/x96-mate.tvb		@Ressetkk
 config/boards/x96q.tvb		@sicXnull
 config/boards/xiaomi-elish.conf		@amazingfate
+config/boards/xpressreal-t3.csc		@wei633
 config/boards/youyeetoo-r1-v3.csc		@SuperKali
 config/boards/yy3568.csc		@hqnicolas
 config/kernel/linux-arm64-*.config		@PeterChrz @rpardini
 config/kernel/linux-bcm2711-*.config		@PanderMusubi @teknoid
+config/kernel/linux-genio-*.config		@HeyMeco
 config/kernel/linux-k3-*.config		@Grippy98 @glneo
 config/kernel/linux-k3-beagle-*.config		@Grippy98
 config/kernel/linux-meson-*.config		@hzyitc @juanlufont
-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-meson-s4t7-*.config		@adeepn @leggewie @rpardini
+config/kernel/linux-meson64-*.config		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @biot @clee @engineer-80 @igorpecovnik @jeanrhum @jomadeto @pyavitz @rpardini @teknoid
+config/kernel/linux-mvebu-*.config		@Heisath @leggewie
 config/kernel/linux-odroidxu4-*.config		@joekhoobyar
 config/kernel/linux-phytium-embedded-*.config		@chainsx
-config/kernel/linux-rk35xx-*.config		@CodeChenL @ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @hqnicolas @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
+config/kernel/linux-rk35xx-*.config		@CodeChenL @ColorfulRhino @HeyMeco @JackHuang021 @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @andyshrk @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @hqnicolas @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
 config/kernel/linux-rockchip-*.config		@paolosabatino
-config/kernel/linux-rockchip64-*.config		@150balbes @ColorfulRhino @HeyMeco @JohnTheCoolingFan @Manouchehri @SuperKali @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @alexl83 @amazingfate @andyshrk @brentr @catalinii @clee @efectn @fridtjof @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @lanefu @linhz0hz @mlegenovic @paolosabatino @prahal @redrathnure @rpardini @schwar3kat @sicXnull @tdleiyao @torte71 @utlark @vamzii
+config/kernel/linux-rockchip64-*.config		@150balbes @ColorfulRhino @HeyMeco @JohnTheCoolingFan @SuperKali @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @alexl83 @amazingfate @andyshrk @brentr @catalinii @chainsx @clee @efectn @fridtjof @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @lanefu @linhz0hz @mlegenovic @paolosabatino @prahal @pyavitz @redrathnure @rpardini @schwar3kat @sicXnull @tdleiyao @torte71 @utlark @vamzii
 config/kernel/linux-sm8250-*.config		@amazingfate
 config/kernel/linux-sm8550-*.config		@FantasyGmm
 config/kernel/linux-spacemit-*.config		@pyavitz
+config/kernel/linux-starfive2-*.config		@libiunc
 config/kernel/linux-sun55iw3-syterkit-*.config		@chainsx
 config/kernel/linux-sunxi-*.config		@1ubuntuuser @AaronNGray @DylanHP @Janmcha @StephenGraf @TheSnowfield @Tonymac32 @janprunk @lbmendes @leggewie @mhawkins-consultant @sgjava @spendist
-config/kernel/linux-sunxi64-*.config		@AGM1968 @IsMrX @JohnTheCoolingFan @Kreyren @NicoD-SBC @PanderMusubi @Ressetkk @The-going @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @krachlatte @pyavitz @schwar3kat @sicXnull @spendist @teknoid
+config/kernel/linux-sunxi64-*.config		@AGM1968 @IsMrX @JohnTheCoolingFan @Kreyren @PanderMusubi @Qvy-png @Ressetkk @The-going @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @igorpecovnik @krachlatte @pyavitz @schwar3kat @sicXnull @spendist @teknoid
 config/kernel/linux-thead-*.config		@chainsx
 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
+config/kernel/linux-xpressreal-t3-*.config		@wei633
 patch/atf/atf-arm64/		@PeterChrz @rpardini
 patch/atf/atf-bcm2711/		@PanderMusubi @teknoid
-patch/atf/atf-imx8m/		@schmiedelm
+patch/atf/atf-genio/		@HeyMeco
+patch/atf/atf-imx8/		@schmiedelm
 patch/atf/atf-k3-beagle/		@Grippy98
 patch/atf/atf-k3/		@Grippy98 @glneo
 patch/atf/atf-phytium-embedded/		@chainsx
-patch/atf/atf-rockchip64/		@ColorfulRhino @TRSx80 @ahoneybun @andyshrk @clee @joekhoobyar @paolosabatino @prahal
+patch/atf/atf-rockchip64/		@ColorfulRhino @SuperKali @TRSx80 @Tonymac32 @ahoneybun @andyshrk @clee @joekhoobyar @paolosabatino @prahal
 patch/atf/atf-sm8250/		@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-sunxi64/		@AGM1968 @IsMrX @JohnTheCoolingFan @Kreyren @PanderMusubi @Qvy-png @Ressetkk @The-going @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @igorpecovnik @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/meson-s4t7-*/		@adeepn @leggewie @rpardini
+patch/kernel/archive/meson64-*/		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @biot @clee @engineer-80 @igorpecovnik @jeanrhum @jomadeto @pyavitz @rpardini @teknoid
+patch/kernel/archive/mvebu-*/		@Heisath @leggewie
 patch/kernel/archive/odroidxu4-*/		@joekhoobyar
+patch/kernel/archive/realtek-rtd1619b-*/		@wei633
 patch/kernel/archive/rockchip-*/		@paolosabatino
-patch/kernel/archive/rockchip64-*/		@150balbes @ColorfulRhino @HeyMeco @JohnTheCoolingFan @Manouchehri @SuperKali @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @alexl83 @amazingfate @andyshrk @brentr @catalinii @clee @efectn @fridtjof @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @lanefu @linhz0hz @mlegenovic @paolosabatino @prahal @redrathnure @rpardini @schwar3kat @sicXnull @tdleiyao @torte71 @utlark @vamzii
+patch/kernel/archive/rockchip64-*/		@150balbes @ColorfulRhino @HeyMeco @JohnTheCoolingFan @SuperKali @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @alexl83 @amazingfate @andyshrk @brentr @catalinii @chainsx @clee @efectn @fridtjof @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @lanefu @linhz0hz @mlegenovic @paolosabatino @prahal @pyavitz @redrathnure @rpardini @schwar3kat @sicXnull @tdleiyao @torte71 @utlark @vamzii
 patch/kernel/archive/sm8250-*/		@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/sunxi-*/		@1ubuntuuser @AGM1968 @AaronNGray @DylanHP @IsMrX @Janmcha @JohnTheCoolingFan @Kreyren @PanderMusubi @Qvy-png @Ressetkk @StephenGraf @The-going @TheSnowfield @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @igorpecovnik @janprunk @krachlatte @lbmendes @leggewie @mhawkins-consultant @pyavitz @schwar3kat @sgjava @sicXnull @spendist @teknoid
 patch/kernel/archive/uefi-arm64-*/		@PeterChrz @rpardini
 patch/kernel/archive/uefi-x86-*/		@davidandreoletti @rpardini
 patch/kernel/archive/wsl2-arm64-*/		@rpardini
 patch/kernel/archive/wsl2-x86-*/		@rpardini
+patch/kernel/genio-1200-*/		@HeyMeco
 patch/kernel/phytium-embedded-*/		@chainsx
-patch/kernel/rk35xx-vendor-*/		@CodeChenL @ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @hqnicolas @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
+patch/kernel/rk35xx-vendor-*/		@CodeChenL @ColorfulRhino @HeyMeco @JackHuang021 @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @andyshrk @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @hqnicolas @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
+patch/kernel/starfive2-*/		@libiunc
 patch/kernel/sun55iw3-syterkit-*/		@chainsx
 patch/kernel/thead-*/		@chainsx
 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-helios4/		@leggewie
 patch/u-boot/legacy/u-boot-khadas-edge2-rk3588/		@efectn
-patch/u-boot/legacy/u-boot-radxa-rk35xx/		@CodeChenL @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @hqnicolas @krachlatte @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @tdleiyao @vamzii
+patch/u-boot/legacy/u-boot-radxa-rk35xx/		@CodeChenL @HeyMeco @JackHuang021 @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @hqnicolas @krachlatte @linhz0hz @mahdichi @mattx433 @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-meson-s4t7/		@adeepn @leggewie @rpardini
 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-v2022.04/		@TRSx80 @ahoneybun @paolosabatino
 patch/u-boot/u-boot-rockchip64/		@Tonymac32 @andyshrk @clee @igorpecovnik @prahal @redrathnure @sicXnull
-patch/u-boot/u-boot-sunxi-crust/		@AGM1968 @Kreyren @NicoD-SBC @PanderMusubi @Tonymac32 @devdotnetorg @schwar3kat @spendist @teknoid
-patch/u-boot/u-boot-sunxi/		@1ubuntuuser @AGM1968 @DylanHP @Janmcha @JohnTheCoolingFan @Kreyren @NicoD-SBC @PanderMusubi @Ressetkk @StephenGraf @TheSnowfield @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @janprunk @krachlatte @lbmendes @leggewie @mhawkins-consultant @schwar3kat @sgjava @sicXnull @spendist @teknoid
+patch/u-boot/u-boot-sunxi-crust/		@AGM1968 @Kreyren @PanderMusubi @Qvy-png @Tonymac32 @devdotnetorg @igorpecovnik @schwar3kat @spendist @teknoid
+patch/u-boot/u-boot-sunxi/		@1ubuntuuser @AGM1968 @DylanHP @Janmcha @JohnTheCoolingFan @Kreyren @PanderMusubi @Qvy-png @Ressetkk @StephenGraf @TheSnowfield @Tonymac32 @devdotnetorg @eliasbakken @igorpecovnik @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/u-boot-xpressreal/		@wei633
 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/		@Tonymac32 @rpardini
 patch/u-boot/v2024.01/board_orangepi5/		@efectn
 patch/u-boot/v2024.04-rock5b-radxa/		@amazingfate @linhz0hz
-patch/u-boot/v2024.04/		@Tonymac32 @chraac @igorpecovnik @pyavitz @utlark
+patch/u-boot/v2024.04/		@Tonymac32 @utlark
 patch/u-boot/v2024.07-coolpi-cm5/		@andyshrk
-patch/u-boot/v2024.07/		@adeepn @andyshrk @igorpecovnik @monkaBlyat
+patch/u-boot/v2024.07/		@adeepn @igorpecovnik
 patch/u-boot/v2024.07/board_station-m1/		@150balbes
-patch/u-boot/v2024.10/		@HeyMeco @alexl83 @brentr @fridtjof
+patch/u-boot/v2024.10/		@alexl83 @brentr @pyavitz
 patch/u-boot/v2024.10/board_bigtreetech-cb2/		@JohnTheCoolingFan
+patch/u-boot/v2025-sunxi/		@The-going @alexl83 @chraac
 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/		@ColorfulRhino @efectn @jeanrhum @joekhoobyar @paolosabatino @pyavitz @rpardini @torte71
 patch/u-boot/v2025.01/board_h96-tvbox-3566/		@hqnicolas
-patch/u-boot/v2025.04-rc4/		@mlegenovic
-patch/u-boot/v2025.04/		@SuperKali @Tonymac32
+patch/u-boot/v2025.04/		@HeyMeco @IsMrX @NicoD-SBC @SuperKali @TheSnowfield @Tonymac32 @ZazaBR @amazingfate @andyshrk @biot @catalinii @fridtjof @mlegenovic @pyavitz @rpardini @vamzii
+patch/u-boot/v2025.07/		@pyavitz
 sources/families/bcm2711.conf		@PanderMusubi @teknoid
+sources/families/genio.conf		@HeyMeco
 sources/families/imx8m.conf		@schmiedelm
 sources/families/jethub.conf		@adeepn
 sources/families/k3.conf		@Grippy98 @glneo
 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-g12b.conf		@NicoD-SBC @Tonymac32 @jeanrhum @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-sm1.conf		@Tonymac32 @igorpecovnik @rpardini
+sources/families/meson-s4t7.conf		@adeepn @leggewie @rpardini
+sources/families/meson-sm1.conf		@Tonymac32 @biot @igorpecovnik @rpardini
 sources/families/meson8b.conf		@hzyitc @juanlufont
-sources/families/mvebu.conf		@Heisath
+sources/families/mvebu.conf		@Heisath @leggewie
 sources/families/odroidxu4.conf		@joekhoobyar
 sources/families/phytium-embedded.conf		@chainsx
-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/realtek-rtd1619b.conf		@wei633
+sources/families/rk35xx.conf		@CodeChenL @HeyMeco @SuperKali @ZazaBR @amazingfate @andyshrk @catalinii @hoochiwetech @hqnicolas @krachlatte @mattx433 @pyavitz @sputnik2019 @tdleiyao @vamzii
+sources/families/rockchip-rk3588.conf		@ColorfulRhino @HeyMeco @JackHuang021 @SeeleVolleri @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @chainsx @efectn @fridtjof @ginkage @lanefu @linhz0hz @mahdichi @prahal @rpardini @schwar3kat
 sources/families/rockchip.conf		@paolosabatino
-sources/families/rockchip64.conf		@150balbes @JohnTheCoolingFan @Manouchehri @TRSx80 @TheSnowfield @Tonymac32 @ahoneybun @andyshrk @brentr @clee @hqnicolas @igorpecovnik @joekhoobyar @mlegenovic @paolosabatino @prahal @redrathnure @rpardini @sicXnull @torte71 @utlark
+sources/families/rockchip64.conf		@150balbes @JohnTheCoolingFan @TRSx80 @TheSnowfield @Tonymac32 @ahoneybun @andyshrk @brentr @clee @hqnicolas @igorpecovnik @joekhoobyar @mlegenovic @paolosabatino @prahal @redrathnure @rpardini @sicXnull @torte71 @utlark
 sources/families/sm8250.conf		@amazingfate
 sources/families/sm8550.conf		@FantasyGmm
 sources/families/spacemit.conf		@pyavitz
-sources/families/sun50iw1.conf		@Kreyren @PanderMusubi @devdotnetorg @eliasbakken
+sources/families/starfive2.conf		@libiunc
+sources/families/sun50iw1.conf		@Kreyren @PanderMusubi @Qvy-png @devdotnetorg @eliasbakken
 sources/families/sun50iw2.conf		@AGM1968 @Tonymac32 @schwar3kat @spendist @teknoid
-sources/families/sun50iw6.conf		@NicoD-SBC
+sources/families/sun50iw6.conf		@igorpecovnik
 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

.github/dependabot.yml

@@ -4,8 +4,14 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
-
+    labels:
+      - "GitHub Actions"
+      - "Dependencies"
   - package-ecosystem: "pip"
     directory: "/"
     schedule:
       interval: "weekly"
+    labels:
+      - "GitHub Actions"
+      - "Dependencies"
+      - "Python"

.github/workflows/adjust-maintainers.yml

@@ -6,8 +6,6 @@ name: "Sync maintainers status"
 # spdx-id: GPL-2.0-or-later
 # copyright-owner: @igorpecovnik
 
-# Dependencies: lftp, jq
-
 on:
   schedule:
     - cron: "0 * * * *"
@@ -22,7 +20,7 @@ jobs:
     steps:
 
       - name: "Checkout build repo"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: armbian/build
           ref:  main
@@ -36,16 +34,11 @@ jobs:
           known_hosts: ${{ secrets.KNOWN_HOSTS_ARMBIAN_UPLOAD }}
           if_key_exists: replace
 
-      - name: "Install dependencies"
-        run: |
-
-          sudo apt-get -y -qq install jq
-
       - name: "Download JSON file"
         run: |
 
-          # download json that is prepared for this action in another cron job
-          rsync -e "ssh -p ${{ secrets.HOST_UPLOAD_PORT }}" -arvc ${{ secrets.HOST_UPLOAD_USER }}@${{ secrets.HOST_UPLOAD }}:/incoming/json/armbian_maintainers.json /tmp/
+          # download json that is prepared in https://github.com/armbian/armbian.github.io
+          curl -o /tmp/armbian_maintainers.json https://github.armbian.com/maintainers.json
 
       - name: "Update maintainers"
         run: |
@@ -122,7 +115,7 @@ jobs:
               - [Contribute](https://docs.armbian.com/Process_Contribute/)
 
           labels: |
-            Needs review
+            Work in progress
           #assignees: igorpecovnik
           #reviewers: Must be org collaborator
           draft: false

.github/workflows/issue-welcome-first-time.yml

@@ -11,14 +11,17 @@ jobs:
       issues: write
       pull-requests: write
     steps:
-      - uses: plbstl/first-contribution@v3
+      - uses: plbstl/first-contribution@v4
         with:
           labels: "Good first issue"
           issue-opened-msg: |
-            ### Hey @{fc-author} !
+            ### Hey @{fc-author}! 👋
 
-            Looks like it's your first time interacting with Armbian here on GitHub.
+            Thanks for opening your first issue with the Armbian project — we’re glad to have you here! 🧡  
+            Your input doesn’t just help us improve the project — it benefits everyone who uses Armbian.
 
-            Welcome and thank you for taking the time to report an issue :heart:.
+            If you'd like to stay informed about project updates or collaborate more closely with the team,  
+            you can optionally share some personal contact preferences at [armbian.com/update-data](https://www.armbian.com/update-data/).  
+            This helps us keep in touch without relying solely on GitHub notifications.
 
-            Don't forget to star :star: the repo.
+            Also, don’t forget to ⭐ star the repo to support the work — and welcome aboard! 🚀

.github/workflows/labels-from-yml.yml

@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Run Labeler
         uses: crazy-max/ghaction-github-labeler@v5

.github/workflows/merge-announce.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Get repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ github.event.pull_request.head.sha }}
       - name: Send push to Discord

.github/workflows/pr-announce.yml

@@ -14,7 +14,7 @@ jobs:
     if: ${{ github.repository == 'armbian/build' && github.event.label.id == '6210849975' }}
     steps:
       - name: Get repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ github.event.pull_request.head.sha }}
       - name: Discord webhook

.github/workflows/pr-auto-labeler.yml

@@ -1,54 +1,69 @@
 name: Automatic Pull Request Labeling
+
+# Sets labels automatically based on:
+# - PR size (job: label-size)
+# - File categories using .github/labeler config (job: label-category)
+# - PR creation date for quarterly tracking (job: label-by-date)
+# - Removes "Ready to merge" label on PR update (job: label-remove)
+
 run-name: 'Set labels - PR #${{ github.event.pull_request.number }} ("${{ github.event.pull_request.title }}")'
-#
-# Set labels for pull requests automatically based on size (modified via job 'label-size') and file categories (modified via .github/labeler)
-#
 
 on: pull_request_target
 
+# Grant required permissions globally
+permissions:
+  contents: read          # Required for checking changed files
+  pull-requests: write    # Required for labeling PRs
+  issues: write           # Required for adding/removing labels
+
 jobs:
   label-remove:
-    permissions:
-      contents: read # for pascalgn/size-label-action to determine modified files
-      pull-requests: write # for pascalgn/size-label-action to add labels to PRs
     name: "Remove Ready to merge"
     if: ${{ github.event.action == 'opened' || github.event.action == 'reopened' || github.event.action == 'synchronize' }}
     runs-on: ubuntu-latest
 
     steps:
-      - uses: PauMAVA/add-remove-label-action@v1.0.3
+      - name: Checkout the pull request
+        uses: actions/checkout@v5
+
+      - name: Check for label using GH CLI
+        id: check
+        run: |
+          gh pr view ${{ github.event.pull_request.number }} --json labels -q '.labels[].name' | grep -q 'Ready to merge' && echo "has_label=true" >> $GITHUB_OUTPUT || echo "has_label=false" >> $GITHUB_OUTPUT
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Remove "Ready to merge" label
+        if: steps.check.outputs.has_label == 'true'
+        uses: PauMAVA/add-remove-label-action@v1.0.3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           add: ""
           remove: "Ready to merge"
 
   label-category:
-    permissions:
-      contents: read # for actions/labeler to determine modified files
-      pull-requests: write # for actions/labeler to add labels to PRs
-
-    name: "Category labels"
-    if: ${{ github.event.action == 'opened' || github.event.action == 'reopened' || github.event.action == 'synchronize' }}
+    name: "Category Labels"
     runs-on: ubuntu-latest
+    if: ${{ github.event.action == 'opened' || github.event.action == 'reopened' || github.event.action == 'synchronize' }}
 
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/labeler@v5
+      # Checks out the repository to read files for matching with labeler config
+      - uses: actions/checkout@v5
+
+      # Applies labels based on the .github/labeler.yml config
+      - uses: actions/labeler@v6
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
 
   label-size:
-    permissions:
-      contents: read # for pascalgn/size-label-action to determine modified files
-      pull-requests: write # for pascalgn/size-label-action to add labels to PRs
-
-    name: "Size label"
-    if: ${{ github.event.action == 'opened' || github.event.action == 'reopened' || github.event.action == 'synchronize' }}
+    name: "Size Label"
     runs-on: ubuntu-latest
+    if: ${{ github.event.action == 'opened' || github.event.action == 'reopened' || github.event.action == 'synchronize' }}
 
     steps:
-      - name: size-label
-        uses: "pascalgn/size-label-action@v0.5.5"
+      # Automatically adds size labels based on total changed lines
+      - name: Label by size
+        uses: pascalgn/size-label-action@v0.5.5
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         with:
@@ -58,3 +73,41 @@ jobs:
               "50": "medium",
               "250": "large"
             }
+
+  label-by-date:
+    name: "Date label (Quarters)"
+    runs-on: ubuntu-latest
+    if: ${{ github.event.action == 'opened' || github.event.action == 'reopened' || github.event.action == 'synchronize' }}
+
+    steps:
+      # Determines the label (02, 05, 08, 11) based on PR creation month
+      - name: Determine quarter label
+        env:
+          PR_CREATED_AT: ${{ github.event.pull_request.created_at }}
+        run: |
+          echo "PR created at: $PR_CREATED_AT"
+
+          # Extract the numeric month (e.g., 04 for April)
+          MONTH=$(date -d "$PR_CREATED_AT" +%m | sed 's/^0*//')
+          echo "Month extracted: $MONTH"
+
+          # Determine quarter-end label based on month
+          if [ "$MONTH" -le 2 ] || [ "$MONTH" -eq 12 ]; then
+            LABEL="02"
+          elif [ "$MONTH" -le 5 ]; then
+            LABEL="05"
+          elif [ "$MONTH" -le 8 ]; then
+            LABEL="08"
+          else
+            LABEL="11"
+          fi
+
+          # Set as environment variable for next step
+          echo "LABEL=${LABEL}" >> $GITHUB_ENV
+
+      # Adds the quarter label to the PR
+      - name: Add quarter label
+        uses: PauMAVA/add-remove-label-action@v1.0.3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          add: "${{ env.LABEL }}"

.github/workflows/pr-kernel-security-analysis.yml

@@ -1,27 +1,11 @@
 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.
 #
-# ⚠️ Important: 
-# Modifying security parameters may impact system performance and 
-# functionality of userspace software.
+#  Check the Linux kernel options against security hardening
 #
-# 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
-# -----------------------------------------------------------------------------
+#  Attention! Changing security parameters may also affect system performance and functionality of userspace software!
+#  More info:
+#  https://github.com/a13xp0p0v/kernel-hardening-checker
 
 on:
   workflow_dispatch:
@@ -33,7 +17,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:
@@ -44,28 +28,27 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
       - name: Get changed files
-        id: files
-        uses: UplandJacob/retrieve-changed-files@v4
+        id: changed-files
+        uses: tj-actions/changed-files@1ac60965030588f3b867cdd4a3900f37ec99970c # v46.0.3
 
-      - name: Checkout kernel-hardening-checker
-        uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v5
         with:
           repository: a13xp0p0v/kconfig-hardened-check
           path: kconfig-hardened-check
 
-      - name: Run kernel security analysis
+      - 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
         run: |
-          for file in ${{ steps.files.outputs.all }}; do
-              # Process only kernel configuration files and skip RISC-V configs
+          for file in ${{ steps.changed-files.outputs.all_changed_files }}; do
               if [[ "${file}" = config/kernel/*.config && ! $(head -n 10 "${file}" | grep -q "riscv") ]]; then
-                  # 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
+                  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

.github/workflows/pr-label-on-approved.yml

@@ -1,15 +1,54 @@
-on: pull_request_review
-name: Label approved pull requests
+name: PR review labeler
+on:
+  workflow_run:
+    workflows: ["PR review listener"]
+    types: [completed]
+
 jobs:
-  labelWhenApproved:
-    if: ${{ github.repository_owner == 'armbian' }}
-    name: Label when approved
+  label:
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      issues: write
+      pull-requests: write
+
     steps:
-    - name: Label when approved
-      uses: pullreminders/label-when-approved-action@master
-      env:
-        APPROVALS: "1"
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        ADD_LABEL: "Ready to merge"
-        REMOVE_LABEL: "Needs%20review"
+      - name: Download PR number artifact from upstream run
+        uses: actions/download-artifact@v5
+        with:
+          name: pr-number-${{ github.event.workflow_run.id }}   # same unique name
+          path: .
+          run-id: ${{ github.event.workflow_run.id }}           # ← CRITICAL: fetch from the upstream run
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - id: pr
+        run: echo "number=$(cat pr.txt)" >> $GITHUB_OUTPUT
+
+      - name: Label when approved
+        uses: j-fulbright/label-when-approved-action@v1.2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          label: 'Ready to merge'
+          require_committers_approval: 'true'
+          remove_label_when_approval_missing: 'true'
+          comment: '✅ This PR has been reviewed and approved — all set for merge!'
+          pullRequestNumber: ${{ steps.pr.outputs.number }}
+
+      - name: Remove review-related labels
+        if: ${{ success() }}
+        uses: actions/github-script@v8
+        with:
+          script: |
+            const { owner, repo } = context.repo;
+            const issue_number = ${{ steps.pr.outputs.number }};
+            const labelsToRemove = ["Needs review", "Work in progress", "Backlog", "Can be closed?", "Help needed", "Needs Documentation"];
+
+            for (const name of labelsToRemove) {
+              try {
+                await github.rest.issues.removeLabel({ owner, repo, issue_number, name });
+                core.info(`Removed label "${name}"`);
+              } catch (e) {
+                core.warning(`Could not remove label "${name}": ${e.message}`);
+              }
+            }

.github/workflows/pr-lint-scripts.yml

@@ -1,21 +1,8 @@
 name: Lint on Scripts
-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-name: 'Shellcheck - PR #${{ github.event.pull_request.number }} ("${{ github.event.pull_request.title }}")'
 #
-# Triggers:
-# - Manually via workflow_dispatch
-# - On pull request events: opened, reopened, or synchronized with new commits
+# Run ShellCheck on all scripts and generate report as build artifact
 #
-# 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:
@@ -26,7 +13,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:
@@ -37,30 +24,36 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 2
 
       - name: Get changed files
-        id: files
-        uses: UplandJacob/retrieve-changed-files@v4
+        id: changed-files
+        uses: tj-actions/changed-files@1ac60965030588f3b867cdd4a3900f37ec99970c # v46.0.3
 
-      - name: List and analyze changed shell scripts
+      - name: List all changed files
         run: |
-          # Utilize the framework's internal mechanism to check `lib/` and `extensions/` scripts.
-          # This ensures correct context resolution, avoiding false positives in variable usage.
+
+          # 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.
+
           bash lib/tools/shellcheck.sh
 
           ret=0
 
-          for file in ${{ steps.files.outputs.all }}; do
-              # Ignore non-shell files
+          for file in ${{ steps.changed-files.outputs.all_changed_files }}; do
+
               if [[ ! "${file}" =~ lib/|extensions/|.py|.service|.rules|.network|.netdev ]]; then
-                  # Check if the file has a bash shebang and run ShellCheck
-                  if grep -qE "^#\!/.*bash" "$file"; then
-                      shellcheck --severity=error "$file" || ret=$?
+                  if grep -qE "^#\!/.*bash" $file; then
+
+                      shellcheck --severity=error $file || ret=$?
+
                   fi
               fi
+
           done
 
-          exit $ret
+          exit $ret

.github/workflows/pr-review-listener.yml

@@ -0,0 +1,20 @@
+name: PR review listener
+on:
+  pull_request_review:
+    types: [submitted]
+
+jobs:
+  ping:
+    if: ${{ github.event.review.state == 'approved' }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - name: Save PR number
+        run: echo "${{ github.event.pull_request.number }}" > pr.txt
+
+      - uses: actions/upload-artifact@v4
+        with:
+          # unique name: includes workflow run id
+          name: pr-number-${{ github.run_id }}
+          path: pr.txt

.github/workflows/pr-welcome-first-time.yml

@@ -11,13 +11,16 @@ jobs:
       issues: write
       pull-requests: write
     steps:
-      - uses: plbstl/first-contribution@v3
+      - uses: plbstl/first-contribution@v4
         with:
           pr-opened-msg: |
-            ### Hey @{fc-author} !
+            ### Hey @{fc-author}! 👋
 
-            Looks like it's your first pull reqests to Armbian codebase.
+            Thanks for submitting your first pull request to the Armbian project — we're excited to have you contributing! 🧡  
+            Your effort doesn’t just improve Armbian — it benefits the entire community of users and developers.
 
-            Welcome and thank you for contributing :heart: :heart: :heart:.
+            If you'd like to stay informed about project updates or collaborate more closely with the team,  
+            you can optionally share some personal contact preferences at [armbian.com/update-data](https://www.armbian.com/update-data/).  
+            This helps us keep in touch without relying solely on GitHub notifications.
 
-            Don't forget to star :star: the repo.
+            Also, don’t forget to ⭐ star the repo if you haven’t already — and welcome aboard! 🚀

.github/workflows/scorecard.yml

@@ -28,12 +28,12 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@v2.4.1
+        uses: ossf/scorecard-action@v2.4.2
         with:
           results_file: results.sarif
           results_format: sarif
@@ -52,7 +52,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: SARIF file
           path: results.sarif

.github/workflows/update-tools.yml

@@ -63,7 +63,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Get current ${{ matrix.tool.PROJECT_NAME }} version
         id: get-version-current

README.md

@@ -1,233 +1,78 @@
-<p align="center">
-  <a href="#build-framework">
-  <img src=".github/armbian-logo.png" alt="Armbian logo" width="144">
-  </a><br>
-  <strong>Armbian Linux Build Framework</strong><br>
-<br>
-<a href=https://github.com/armbian/build/graphs/contributors><img alt="GitHub contributors" src="https://img.shields.io/github/contributors-anon/armbian/build?logo=stackexchange&label=Contributors&style=for-the-badge&branch=main&logoColor=white"></a>
-<a href=https://github.com/armbian/os><img alt="Artifacts generation" src="https://img.shields.io/github/actions/workflow/status/armbian/os/complete-artifact-matrix-all.yml?logo=dependabot&label=CI%20Build&style=for-the-badge&branch=main&logoColor=white"></a>
-<a href=https://github.com/armbian/build/commits/main><img alt="GitHub last commit (branch)" src="https://img.shields.io/github/last-commit/armbian/build/main?logo=github&label=Last%20commit&style=for-the-badge&branch=main&logoColor=white"></a>
-</p>
+<h2 align="center">
+  <a href=#><img src="https://raw.githubusercontent.com/armbian/.github/master/profile/logosmall.png" alt="Armbian logo"></a>
+  <br><br>
+</h2>
 
-## What does this project do?
+### Purpose of This Repository
 
-- Builds custom **kernel**, **image** or a **distribution** optimized for low-resource hardware,
-- Include filesystem generation, low-level control software, kernel image and **bootloader** compilation,
-- Provides a **consistent user experience** by keeping system standards across different platforms.
+The **Armbian Linux Build Framework** creates minimal, efficient, and fully [customizable operating system images](https://docs.armbian.com/#key-features) based on **Debian** or **Ubuntu**. It is designed specifically for **low-resource single board computers (SBCs)** and other embedded devices.
 
-## Getting started
+This toolchain compiles a custom **Linux kernel**, **bootloader**, and **root filesystem**, providing fine-grained control over:
 
-### Requirements for self hosted
+- Kernel versions and configuration
+- Bootloader selection and customization
+- Filesystem layout and compression
+- Additional firmware, overlays, and device trees
+- System optimizations for performance and size
 
-- x86_64 / aarch64 machine
-- at least 2GB of memory and ~35GB of disk space for VM, container or bare metal installation
-- [Armbian / Ubuntu Jammy 22.04.x](https://github.com/armbian/sdk) for native building or any Docker capable Linux for containerised
-- Windows 10/11 with WSL2 subsystem running Ubuntu Jammy 22.04.x
-- Superuser rights (configured sudo or root access).
-- Make sure your system is up-to-date! Outdated Docker binaries, for example, can cause trouble.
+The framework supports **native**, **cross**, and **containerized** builds for multiple architectures (`x86_64`, `aarch64`, `armhf`, `riscv64`), and is suitable for development, testing, production deployment, or automation pipelines.
 
-For stable branch use `--branch=v24.11`
+It ensures **consistency across devices** while remaining modular and extensible through a variety of configuration files, templates, and user patches.
+
+### Quick Start
 
 ```bash
-apt-get -y install git
-git clone --depth=1 --branch=main https://github.com/armbian/build
+git clone https://github.com/armbian/build
 cd build
 ./compile.sh
 ```
 
+### Resources
+
+[Documentation](https://docs.armbian.com/Developer-Guide_Overview/) • [Website](https://www.armbian.com) • [Blog](https://blog.armbian.com) • [Community Forums](https://forum.armbian.com)
+
+
+
 <a href="#how-to-build-an-image-or-a-kernel"><img src=".github/README.gif" alt="Armbian logo" width="100%"></a>
 
-- Interactive graphical interface.
-- Prepares the workspace by installing the necessary dependencies and sources.
-- It guides the entire process and creates a kernel package or a ready-to-use SD card image.
+### Build Host Requirements
 
-### Build parameter examples
+- **Supported Architectures:** `x86_64`, `aarch64`, `riscv64`
+- **System:** VM, container, or bare-metal with:
+  - **≥ 8GB RAM** (less with `KERNEL_BTF=no`)
+  - **~50GB disk space**
+- **Operating System:**
+  - Armbian / Ubuntu 24.04 (Noble) for native builds
+  - Any Docker-capable Linux for containerized setup
+- **Windows:** Windows 10/11 with WSL2 running Armbian / Ubuntu 24.04
+- **Access:** Superuser rights (`sudo` or `root`)
+- **Important:** Keep your system up-to-date — outdated tools (e.g., Docker) can cause issues.
 
-Show work-in-progress areas in interactive mode:
+### Download
 
-```bash
-./compile.sh EXPERT="yes"
-```
+Prebuilt Armbian OS Images: <https://www.armbian.com/download>
 
-Build minimal CLI Armbian Jammy for Bananapi M5 with LTS kernel:
+### Contribute
 
-```bash
-./compile.sh \
-BOARD=bananapim5 \
-BRANCH=current \
-RELEASE=jammy \
-BUILD_MINIMAL=yes \
-BUILD_DESKTOP=no \
-KERNEL_CONFIGURE=no
-```
+Learn how to report issues, suggest improvements, or submit code: [CONTRIBUTING.md](CONTRIBUTING.md)
 
-Build with GitHub actions: ([advanced version](https://github.com/armbian/os/blob/main/.github/workflows/complete-artifact-one-by-one.yml))
+### Support
 
-```
-name: "Build Armbian"
-on:
-  workflow_dispatch:
-jobs:
-  build-armbian:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: armbian/build@main
-        with:
-          armbian_token:     "${{ secrets.GITHUB_TOKEN }}"  # GitHub token
-          armbian_release:   "jammy"                        # userspace
-          armbian_target:    "build"                        # build=image, kernel=kernel
-          armbian_board:     "bananapim5"                   # build target
-```
-Generated image will be uploaded to your repository release. Note: GitHub upload file limit is 2Gb.
+Armbian offers multiple support channels, depending on your needs:
 
-## More information:
+- **Community Forums**  
+  Get help from fellow users and contributors on a wide range of topics — from troubleshooting to development.  
+  👉 [forum.armbian.com](https://forum.armbian.com)
 
-- [Building Armbian](https://docs.armbian.com/Developer-Guide_Build-Preparation/) (how to start)
-- [Build commands](https://docs.armbian.com/Developer-Guide_Build-Commands/) and [switches](https://docs.armbian.com/Developer-Guide_Build-Switches/) (build options)
-- [User configuration](https://docs.armbian.com/Developer-Guide_User-Configurations/) (how to add packages, patches, and override sources config)
-- [System config](https://docs.armbian.com/User-Guide_Armbian-Config/) (menu driven utility to setup OS and HW features)
+- **Discord / IRC/ Matrix Chat**  
+  Join real-time discussions with developers and community members for faster feedback and collaboration.  
+  👉 [Community Chat](https://docs.armbian.com/Community_IRC/)
 
-## Download prebuilt images releases
+- **Paid Consultation**  
+  For advanced needs, commercial projects, or guaranteed response times, paid support is available directly from Armbian maintainers.  
+  👉 [Contact us](https://www.armbian.com/contact) to discuss consulting options.
 
-### Point
-
-- [manually released **standard supported** builds](https://www.armbian.com/download/?device_support=Standard%20support) (quarterly)
-
-### Rolling
-
-- [automatically released **staging and standard supported** builds](https://github.com/armbian/os/releases/latest) (daily)
-- [automatically released **community maintained** builds](https://github.com/armbian/community/releases/latest) (weekly)
-
-## Compared with industry standards
-
-<details><summary>Expand</summary>
-Check similarities, advantages and disadvantages compared with leading industry standard build software.
-
-Function | Armbian | Yocto | Buildroot |
-|:--|:--|:--|:--|
-| Target | general purpose | embedded | embedded / IOT |
-| U-boot and kernel | compiled from sources | compiled from sources | compiled from sources |
-| Board support maintenance &nbsp; | complete | outside | outside |
-| Root file system | Debian or Ubuntu based| custom | custom |
-| Package manager | APT | any | none |
-| Configurability | limited | large | large |
-| Initramfs support | yes | yes | yes |
-| Getting started | quick | very slow | slow |
-| Cross compilation | yes | yes | yes |
-</details>
-
-## Project structure
-
-<details><summary>Expand</summary>
-
-```text
-├── cache                                Work / cache directory
-│   ├── aptcache                         Packages
-│   ├── ccache                           C/C++ compiler
-│   ├── docker                           Docker last pull
-│   ├── git-bare                         Minimal Git
-│   ├── git-bundles                      Full Git
-│   ├── initrd                           Ram disk
-│   ├── memoize                          Git status
-│   ├── patch                            Kernel drivers patch
-│   ├── pip                              Python
-│   ├── rootfs                           Compressed userspaces
-│   ├── sources                          Kernel, u-boot and other sources
-│   ├── tools                            Additional tools like ORAS
-│   └── utility
-├── config                               Packages repository configurations
-│   ├── targets.conf                     Board build target configuration
-│   ├── boards                           Board configurations
-│   ├── bootenv                          Initial boot loaders environments per family
-│   ├── bootscripts                      Initial Boot loaders scripts per family
-│   ├── cli                              CLI packages configurations per distribution
-│   ├── desktop                          Desktop packages configurations per distribution
-│   ├── distributions                    Distributions settings
-│   ├── kernel                           Kernel build configurations per family
-│   ├── sources                          Kernel and u-boot sources locations and scripts
-│   ├── templates                        User configuration templates which populate userpatches
-│   └── torrents                         External compiler and rootfs cache torrents
-├── extensions                           Extend build system with specific functionality
-├── lib                                  Main build framework libraries
-│   ├── functions
-│   │   ├── artifacts
-│   │   ├── bsp
-│   │   ├── cli
-│   │   ├── compilation
-│   │   ├── configuration
-│   │   ├── general
-│   │   ├── host
-│   │   ├── image
-│   │   ├── logging
-│   │   ├── main
-│   │   └── rootfs
-│   └── tools
-├── output                               Build artifact
-│   └── deb                              Deb packages
-│   └── images                           Bootable images - RAW or compressed
-│   └── debug                            Patch and build logs
-│   └── config                           Kernel configuration export location
-│   └── patch                            Created patches location
-├── packages                             Support scripts, binary blobs, packages
-│   ├── blobs                            Wallpapers, various configs, closed source bootloaders
-│   ├── bsp-cli                          Automatically added to armbian-bsp-cli package
-│   ├── bsp-desktop                      Automatically added to armbian-bsp-desktopo package
-│   ├── bsp                              Scripts and configs overlay for rootfs
-│   └── extras-buildpkgs                 Optional compilation and packaging engine
-├── patch                                Collection of patches
-│   ├── atf                              ARM trusted firmware
-│   ├── kernel                           Linux kernel patches
-|   |   └── family-branch                Per kernel family and branch
-│   ├── misc                             Linux kernel packaging patches
-│   └── u-boot                           Universal boot loader patches
-|       ├── u-boot-board                 For specific board
-|       └── u-boot-family                For entire kernel family
-├── tools                                Tools for dealing with kernel patches and configs
-└── userpatches                          User: configuration patching area
-    ├── lib.config                       User: framework common config/override file
-    ├── config-default.conf              User: default user config file
-    ├── customize-image.sh               User: script will execute just before closing the image
-    ├── atf                              User: ARM trusted firmware
-    ├── kernel                           User: Linux kernel per kernel family
-    ├── misc                             User: various
-    └── u-boot                           User: universal boot loader patches
-```
-</details>
-
-## Contribution
-
-### Want to help?
-
-We always need those volunteering positions:
-
-- [Code reviewer](https://forum.armbian.com/staffapplications/application/23-code-reviewer/)
-- [Build framework maintainer](https://forum.armbian.com/staffapplications/application/9-build-framework-maintainer/)
-- [Test Automation Engineer](https://forum.armbian.com/staffapplications/application/19-test-automation-engineer/)
-
-Just apply and follow!
-
-## Support
-
-For commercial or prioritized assistance:
- - Book an hour of [professional consultation](https://calendly.com/armbian/consultation)
- - Consider becoming a [project partner](https://forum.armbian.com/subscriptions/)
- - [Contact us](https://armbian.com/contact)!
-
-Free support:
-
- Find free support via [general project search engine](https://www.armbian.com/search), [documentation](https://docs.armbian.com), [community forums](https://forum.armbian.com/) or [IRC/Discord](https://docs.armbian.com/Community_IRC/). Remember that our awesome community members mainly provide this in a **best-effort** manner, so there are no guaranteed solutions.
-
-## Contact
-
-- [Forums](https://forum.armbian.com) for Participate in Armbian
-- IRC: `#armbian` on Libera.chat / oftc.net
-- Matrix: [https://forum.armbian.com/topic/40413-enter-the-matrix/](https://forum.armbian.com/topic/40413-enter-the-matrix/)
-- Discord: [https://discord.gg/armbian](https://discord.gg/armbian)
-- Follow [@armbian](https://twitter.com/armbian) on 𝕏 (formerly known as Twitter), <a rel="me" href="https://fosstodon.org/@armbian">Mastodon</a> or [LinkedIn](https://www.linkedin.com/company/armbian).
-- Bugs: [issues](https://github.com/armbian/build/issues) / [JIRA](https://armbian.atlassian.net/jira/dashboards/10000)
-- Office hours: [Wednesday, 12 midday, 18 afternoon, CET](https://calendly.com/armbian/office-hours)
-
-## Contributors
+### Contributors
 
 Thank you to all the people who already contributed to Armbian!
 
@@ -235,24 +80,6 @@ Thank you to all the people who already contributed to Armbian!
   <img src="https://contrib.rocks/image?repo=armbian/build" />
 </a>
 
-### Also
-
-- [Current and past contributors](https://github.com/armbian/build/graphs/contributors), our families and friends.
-- [Support staff](https://forum.armbian.com/members/2-moderators/) that keeps forums usable.
-- [Friends and individuals](https://armbian.com/authors) who support us with resources and their time.
-- [The Armbian Community](https://forum.armbian.com/) helps with their ideas, reports and [donations](https://www.armbian.com/donate).
-
 ## Armbian Partners
 
-Armbian's partnership program helps to support Armbian and the Armbian community! Please take a moment to familiarize yourself with our Partners:
-
-- [Click here to visit our Partners page!](https://armbian.com/partners)
-- [How can I become a Partner?](https://forum.armbian.com/subscriptions)
-
-## Star History
-
-[![Star History Chart](https://api.star-history.com/svg?repos=armbian/build&type=Date)](https://star-history.com/#armbian/build&Date)
-
-## License
-
-This software is published under the GPL-2.0 License license.
+Armbian's [partnership program](https://forum.armbian.com/subscriptions) helps to support Armbian and the Armbian community! Please take a moment to familiarize yourself with [our Partners](https://armbian.com/partners).

VERSION

@@ -1 +1 @@
-25.05.0-trunk
+25.11.0-trunk

action.yml

@@ -115,7 +115,7 @@ runs:
         passphrase: ${{ inputs.armbian_pgp_password }}
 
     - name: "Checkout Armbian os"
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         repository: armbian/os
         fetch-depth: 0
@@ -123,7 +123,7 @@ runs:
         path: os
 
     - name: "Checkout Armbian build framework"
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         repository: armbian/build
         ref: ${{ inputs.armbian_branch }}
@@ -131,7 +131,7 @@ runs:
         path: build
 
     - name: "Checkout customisations"
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         fetch-depth: 0
         clean: false
@@ -147,7 +147,9 @@ runs:
         # copy os userpatches and custom
         mkdir -pv build/userpatches
         rsync -av os/userpatches/. build/userpatches/
-        [[ -d custom/userpatches ]] && rsync -av custom/userpatches/. build/userpatches/
+        if [[ -d custom/userpatches ]]; then
+          rsync -av custom/userpatches/. build/userpatches/
+        fi
 
     - shell: bash
       run: |
@@ -170,6 +172,10 @@ runs:
         # go to build folder
         cd build
 
+        # default build command below doesn't prepare host dependencies
+        sudo ./compile.sh requirements
+        sudo chown -R $USER:$USER .
+
         # execute build command
         ./compile.sh "${{ inputs.armbian_target }}" \
         REVISION="${{ env.ARMBIAN_VERSION }}" \

config/armbian.key

@@ -1,52 +1,52 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
 
-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
-cckukNqqFv/CXh+BZFlQT4DDvJlY0/KQFFKogQ==
-=I/P8
+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
+=nzf6
 -----END PGP PUBLIC KEY BLOCK-----

config/boards/armsom-sige5.csc

@@ -2,7 +2,7 @@
 BOARD_NAME="ArmSoM Sige5"
 BOARDFAMILY="rk35xx"
 BOOTCONFIG="armsom-sige5-rk3576_defconfig"
-KERNEL_TARGET="vendor"
+KERNEL_TARGET="vendor,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3576-armsom-sige5.dtb"

config/boards/bananapi.conf

@@ -3,7 +3,7 @@ BOARD_NAME="Banana Pi"
 BOARDFAMILY="sun7i"
 BOARD_MAINTAINER="DylanHP janprunk"
 BOOTCONFIG="Bananapi_defconfig"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge,legacy"
 KERNEL_TEST_TARGET="current"
 
 function post_config_uboot_target__extra_configs_for_bananapi() {

config/boards/bananapicm4io.conf

@@ -13,6 +13,11 @@ BOOT_FDT_FILE="amlogic/meson-g12b-bananapi-cm4-cm4io.dtb"
 BOOTBRANCH_BOARD="tag:v2025.01"
 BOOTPATCHDIR="v2025.01"
 
+# CPUFREQ (/etc/default/cpufrequtils)
+CPUMIN=1000000
+CPUMAX=2400000
+GOVERNOR=performance
+
 function post_family_tweaks_bsp__bananapi_rtl_bt() {
 	if [[ -d "$SRC/packages/bsp/bananapi/rtl_bt" ]]; then
 		mkdir -p "${destination}"/lib/firmware/updates/rtl_bt

config/boards/bananapif3.conf

@@ -2,16 +2,15 @@
 BOARD_NAME="BananaPi BPI-F3"
 BOARDFAMILY="spacemit"
 BOARD_MAINTAINER="pyavitz"
-KERNEL_TARGET="current"
+KERNEL_TARGET="current,edge"
 BOOT_FDT_FILE="spacemit/k1-bananapi-f3.dtb"
 BOOTDELAY=1
 SRC_EXTLINUX="yes"
-SRC_CMDLINE="earlycon=sbi console=tty1 console=ttyS0,115200"
+SRC_CMDLINE="earlycon=sbi console=tty1 console=ttyS0,115200 loglevel=1"
 PACKAGE_LIST_BOARD="rfkill bluetooth bluez bluez-tools"
 
 function post_config_uboot_target__extra_configs_for_bananapi_f3() {
 	display_alert "u-boot for ${BOARD}" "u-boot: enabling extra configs" "info"
-
 	run_host_command_logged scripts/config --enable CONFIG_SD_BOOT
 	run_host_command_logged scripts/config --enable CONFIG_EXT4_WRITE
 	run_host_command_logged scripts/config --enable CONFIG_FS_BTRFS
@@ -24,9 +23,7 @@ function post_family_tweaks_bsp__bananapi_f3_extras() {
 		display_alert "$BOARD" "Installing boot firmware" "info"
 		run_host_command_logged cp -fv $SRC/packages/blobs/riscv64/spacemit/esos.elf "${destination}"/lib/firmware
 	fi
-
 	display_alert "$BOARD" "Force load wireless" "info"
-
 	run_host_command_logged mkdir -pv "${destination}"/etc/modules-load.d
 	run_host_command_logged echo "8852bs" > "${destination}"/etc/modules-load.d/${BOARD}.conf
 }

config/boards/bananapim1plus.csc

@@ -3,5 +3,5 @@ BOARD_NAME="Banana Pi M1+"
 BOARDFAMILY="sun7i"
 BOARD_MAINTAINER=""
 BOOTCONFIG="bananapi_m1_plus_defconfig"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge,legacy"
 KERNEL_TEST_TARGET="current"

config/boards/bananapim2.eos

@@ -4,5 +4,5 @@ BOARDFAMILY="sun6i"
 BOARD_MAINTAINER=""
 BOOTCONFIG="Sinovoip_BPI_M2_defconfig"
 OVERLAY_PREFIX="sun6i-a31s"
-KERNEL_TARGET="legacy,current"
+KERNEL_TARGET="current,legacy"
 KERNEL_TEST_TARGET="current"

config/boards/bananapim2plus.conf

@@ -0,0 +1,11 @@
+# Allwinner H3 quad core 1Gb RAM SoC Wifi GBE
+BOARD_NAME="Banana Pi M2+"
+BOARDFAMILY="sun8i"
+BOARD_MAINTAINER="leggewie"
+BOOTCONFIG="bananapi_m2_plus_h3_defconfig"
+DEFAULT_OVERLAYS="analog-codec"
+MODULES_CURRENT="g_serial"
+MODULES_LEGACY="g_serial"
+SERIALCON="ttyS0,ttyGS0"
+KERNEL_TARGET="current,edge,legacy"
+KERNEL_TEST_TARGET="current"

config/boards/bananapim2plus.csc

@@ -1,11 +0,0 @@
-# Allwinner H3 quad core 1Gb RAM SoC Wifi GBE
-BOARD_NAME="Banana Pi M2+"
-BOARDFAMILY="sun8i"
-BOARD_MAINTAINER="leggewie"
-BOOTCONFIG="bananapi_m2_plus_h3_defconfig"
-DEFAULT_OVERLAYS="analog-codec"
-MODULES_CURRENT="g_serial"
-MODULES_LEGACY="g_serial"
-SERIALCON="ttyS0,ttyGS0"
-KERNEL_TARGET="legacy,current,edge"
-KERNEL_TEST_TARGET="current"

config/boards/bananapim2s.conf

@@ -13,6 +13,11 @@ BOOT_FDT_FILE="amlogic/meson-g12b-a311d-bananapi-m2s.dtb"
 BOOTBRANCH_BOARD="tag:v2025.01"
 BOOTPATCHDIR="v2025.01"
 
+# CPUFREQ (/etc/default/cpufrequtils)
+CPUMIN=1000000
+CPUMAX=2400000
+GOVERNOR=performance
+
 function post_family_tweaks_bsp__bananapi_rtl_bt() {
 	if [[ -d "$SRC/packages/bsp/bananapi/rtl_bt" ]]; then
 		mkdir -p "${destination}"/lib/firmware/updates/rtl_bt

config/boards/bananapim2ultra.csc

@@ -4,5 +4,5 @@ BOARDFAMILY="sun8i"
 BOARD_MAINTAINER=""
 BOOTCONFIG="Bananapi_M2_Ultra_defconfig"
 OVERLAY_PREFIX="sun8i-r40"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge,legacy"
 KERNEL_TEST_TARGET="current"

config/boards/bananapim2zero.csc

@@ -6,5 +6,5 @@ BOOTCONFIG="bananapi_m2_zero_defconfig"
 MODULES_LEGACY="g_serial"
 MODULES_CURRENT="g_serial"
 SERIALCON="ttyS0,ttyGS0"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge,legacy"
 KERNEL_TEST_TARGET="current"

config/boards/bananapim3.csc

@@ -4,7 +4,7 @@ BOARDFAMILY="sun8i"
 BOARD_MAINTAINER="AaronNGray"
 BOOTCONFIG="Sinovoip_BPI_M3_defconfig"
 OVERLAY_PREFIX="sun8i-a83t"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge,legacy"
 KERNEL_TEST_TARGET="current"
 
 BOOTBRANCH="tag:v2024.01"

config/boards/bananapim4berry.conf

@@ -0,0 +1,26 @@
+# Allwinner H618 quad core 2/4GB RAM 8GB eMMC SoC WiFi\Bt HDMI SPI USB-C
+BOARD_NAME="BananaPi M4 Berry"
+BOARDFAMILY="sun50iw9-bpi"
+BOARD_MAINTAINER="The-going"
+BOOTCONFIG="bananapi_m4_berry_defconfig"
+
+BOOTPATCHDIR="v2025-sunxi"
+BOOTBRANCH_BOARD="tag:v2025.04"
+
+OVERLAY_PREFIX="sun50i-h616"
+BOOT_FDT_FILE="sun50i-h618-bananapi-m4-berry.dtb"
+BOOT_LOGO="desktop"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
+
+PACKAGE_LIST_BOARD="rfkill bluetooth bluez bluez-tools hostapd"
+
+function post_family_tweaks_bsp__bananapi_module_conf() {
+
+	mkdir -p "${destination}"/etc/modprobe.d/
+	display_alert "$BOARD" "Configuring rtl8821cu wifi module" "info"
+
+	cp -f "${SRC}"/packages/bsp/wifi-rtl8821cu/etc/modprobe.d/8821cu.conf \
+			"${destination}"/etc/modprobe.d/8821cu.conf
+
+}

config/boards/bananapim4berry.wip

@@ -1,26 +0,0 @@
-# Allwinner H618 quad core 2/4GB RAM 8GB eMMC SoC WiFi\Bt HDMI SPI USB-C
-BOARD_NAME="BananaPi M4 Berry"
-BOARDFAMILY="sun50iw9-bpi"
-BOARD_MAINTAINER="The-going"
-BOOTCONFIG="bananapi_m4_berry_defconfig"
-
-BOOTPATCHDIR="v2025.01/board_bananapim4berry"
-BOOTBRANCH_BOARD="tag:v2025.01"
-
-OVERLAY_PREFIX="sun50i-h616"
-BOOT_FDT_FILE="sun50i-h618-bananapi-m4-berry.dtb"
-BOOT_LOGO="desktop"
-KERNEL_TARGET="current,edge"
-KERNEL_TEST_TARGET="current"
-
-PACKAGE_LIST_BOARD="rfkill bluetooth bluez bluez-tools"
-
-function post_family_tweaks_bsp__bananapi_firmware() {
-	if [[ -d "$SRC/packages/bsp/bananapi/brcm" ]] && [[ -d "$SRC/packages/bsp/bananapi/rtl_bt" ]]; then
-		mkdir -p "${destination}"/lib/firmware/updates/brcm
-		mkdir -p "${destination}"/lib/firmware/updates/rtl_bt
-		display_alert "$BOARD" "Installing upstream firmware" "info"
-		cp -fr $SRC/packages/bsp/bananapi/brcm/* "${destination}"/lib/firmware/updates/brcm/
-		cp -fr $SRC/packages/bsp/bananapi/rtl_bt/* "${destination}"/lib/firmware/updates/rtl_bt/
-	fi
-}

config/boards/bananapim4zero.conf

@@ -5,13 +5,14 @@ BOARD_MAINTAINER="pyavitz"
 BOOTCONFIG="bananapi_m4zero_defconfig"
 OVERLAY_PREFIX="sun50i-h616"
 BOOT_FDT_FILE="sun50i-h618-bananapi-m4-zero.dtb"
+DEFAULT_OVERLAYS="bananapi-m4-sdio-wifi-bt"
 BOOT_LOGO="desktop"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
 MODULES_BLACKLIST="rtw88_8821c rtw88_8821cu"
 FORCE_BOOTSCRIPT_UPDATE="yes"
-BOOTBRANCH_BOARD="tag:v2024.04"
-BOOTPATCHDIR="v2024.04"
+BOOTBRANCH_BOARD="tag:v2025.07"
+BOOTPATCHDIR="v2025.07"
 PACKAGE_LIST_BOARD="rfkill bluetooth bluez bluez-tools"
 
 function post_family_tweaks_bsp__bananapi_firmware() {

config/boards/bananapim64.csc

@@ -4,6 +4,6 @@ BOARDFAMILY="sun50iw1"
 BOARD_MAINTAINER="devdotnetorg"
 BOOTCONFIG_DEFAULT="sun50iw1p1_config"
 BOOTCONFIG="bananapi_m64_defconfig"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge,legacy"
 KERNEL_TEST_TARGET="current"
 CRUSTCONFIG="a64_defconfig"

config/boards/bananapim7.conf

@@ -1,3 +1,4 @@
+# Rockchip RK3588 octa core 8-32GB RAM SoC 2*2.5GBe eMMC USB3 NvME WIFI
 source "${SRC}/config/boards/armsom-sige7.csc"
 BOARD_NAME="Banana Pi M7"
 BOARD_MAINTAINER="amazingfate"

config/boards/bananapipro.csc

@@ -3,7 +3,7 @@ BOARD_NAME="Banana Pi Pro"
 BOARDFAMILY="sun7i"
 BOARD_MAINTAINER=""
 BOOTCONFIG="Bananapro_defconfig"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge,legacy"
 KERNEL_TEST_TARGET="current"
 
 function post_config_uboot_target__extra_configs_for_bananapipro() {

config/boards/bananapir4.csc

@@ -0,0 +1,18 @@
+# Mediatek MT7988a quad core Cortex-A73 4/8GB RAM 8GB EMMC mPci USB3.0 4xGBE
+BOARD_NAME="Banana Pi R4"
+BOARDFAMILY="filogic"
+BOARD_MAINTAINER=""
+KERNEL_TARGET="current"
+KERNEL_TEST_TARGET="current"
+BOOTCONFIG="mt7988a_bananapi_bpi-r4-sdmmc_defconfig"
+BOOT_FDT_FILE="mediatek/mt7988a-bananapi-bpi-r4-sd.dtb"
+SRC_EXTLINUX="yes"
+SRC_CMDLINE="console=ttyS0,115200n1 earlyprintk loglevel=8 initcall_debug=0 swiotlb=512 cgroup_enable cgroup_memory=1 init=/sbin/init"
+
+function post_family_tweaks__bpi-r4() {
+	display_alert "Applying eth blobs"
+	
+	mkdir -p "$SDCARD/lib/firmware/mediatek/mt7988"
+	cp -v "$SRC/packages/blobs/filogic/firmware/mediatek/mt7988/mt7988_wo_0.bin" "$SDCARD/lib/firmware/mediatek/mt7988/mt7988_wo_0.bin"
+	cp -v "$SRC/packages/blobs/filogic/firmware/mediatek/mt7988/mt7988_wo_1.bin" "$SDCARD/lib/firmware/mediatek/mt7988/mt7988_wo_1.bin"
+}

config/boards/beaglebone-ai64.conf

@@ -16,3 +16,5 @@ KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
 SERIALCON="ttyS2"
 ATF_BOARD="generic"
+OPTEE_ARGS=""
+OPTEE_PLATFORM="k3-j721e"

config/boards/beagleplay.conf

@@ -15,3 +15,5 @@ KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
 SERIALCON="ttyS2"
 ATF_BOARD="lite"
+OPTEE_ARGS="CFG_TEE_CORE_LOG_LEVEL=1"
+OPTEE_PLATFORM="k3-am62x"

config/boards/beagley-ai.conf

@@ -0,0 +1,33 @@
+# Texas Instruments AM67A quad core 4GB USB3 DDR4 4TOPS
+
+BOARD_NAME="BeagleY-AI"
+BOARDFAMILY="k3"
+BOARD_MAINTAINER="Grippy98"
+BOOTCONFIG="am67a_beagley_ai_a53_defconfig"
+BOOTFS_TYPE="fat"
+BOOT_FDT_FILE="k3-am67a-beagley-ai.dts"
+TIBOOT3_BOOTCONFIG="am67a_beagley_ai_r5_defconfig"
+TIBOOT3_FILE="tiboot3-j722s-hs-fs-evm.bin"
+DEFAULT_CONSOLE="serial"
+KERNEL_TARGET="current"
+KERNEL_TEST_TARGET="current"
+SERIALCON="ttyS2"
+ATF_BOARD="lite"
+OPTEE_ARGS=""
+OPTEE_PLATFORM="k3-am62x"
+CC33XX_SUPPORT="yes"
+
+# 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"
+}

config/boards/beagley-ai.csc

@@ -1,30 +0,0 @@
-#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"
-}

config/boards/beelinkx2.tvb

@@ -3,5 +3,5 @@ BOARD_NAME="Beelink X2"
 BOARDFAMILY="sun8i"
 BOARD_MAINTAINER=""
 BOOTCONFIG="beelink_x2_defconfig"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge,legacy"
 KERNEL_TEST_TARGET="current"

config/boards/cainiao-cniot-core.csc

@@ -0,0 +1,107 @@
+# Amlogic A311D 2GB RAM 16GB eMMC GBE USB3 RTL8822CS WiFi/BT
+BOARD_NAME="CAINIAO CNIoT-CORE"
+BOARDFAMILY="meson-g12b"
+BOARD_MAINTAINER=""
+BOOTCONFIG="cainiao-cniot-core_defconfig"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
+MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost on the CAINIAO CNIoT-CORE
+FULL_DESKTOP="yes"
+SERIALCON="ttyAML0"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="amlogic/meson-g12b-a311d-cainiao-cniot-core.dtb"
+PACKAGE_LIST_BOARD="alsa-ucm-conf" # Contain ALSA UCM top-level configuration file
+
+BOOTBRANCH_BOARD="tag:v2025.04"
+BOOTPATCHDIR="v2025.04" # This has a patch that adds support for CAINIAO CNIoT-CORE.
+
+function post_family_config__use_repacked_fip() {
+	declare -g UBOOT_TARGET_MAP="u-boot.bin"
+	unset write_uboot_platform
+
+	function write_uboot_platform() {
+		dd if="$1/u-boot.bin" of="$2" bs=512 seek=1 conv=fsync 2>&1
+	}
+}
+
+function fetch_sources_tools__get_vendor_fip_and_gxlimg_source() {
+	fetch_from_repo "https://github.com/retro98boy/cainiao-cniot-core-linux.git" "cainiao-cniot-core-linux" "commit:30273c25aeabf75f609cff2c4fa7264335c295a8"
+	fetch_from_repo "https://github.com/repk/gxlimg.git" "gxlimg" "commit:0d0e5ba9cf396d1338067e8dc37a8bcd2e6874f1"
+}
+
+function build_host_tools__install_gxlimg() {
+	# Compile and install only if git commit hash changed
+	cd "${SRC}/cache/sources/gxlimg" || exit
+	# need to check if /usr/local/bin/gxlimg to detect new Docker containers with old cached sources
+	if [[ ! -f .commit_id || $(git rev-parse @ 2> /dev/null) != $(< .commit_id) || ! -f /usr/local/bin/gxlimg ]]; then
+		display_alert "Compiling" "gxlimg" "info"
+		run_host_command_logged make distclean
+		run_host_command_logged make
+		install -Dm0755 gxlimg /usr/local/bin/gxlimg
+		git rev-parse @ 2> /dev/null > .commit_id
+	fi
+}
+
+function post_uboot_custom_postprocess__repack_vendor_fip_with_mainline_uboot() {
+	display_alert "${BOARD}" "Repacking vendor FIP with mainline u-boot.bin" "info"
+
+	BLOBS_DIR="${SRC}/cache/sources/cainiao-cniot-core-linux"
+	EXTRACT_DIR="${BLOBS_DIR}/extract"
+	AML_ENCRYPT="${SRC}/cache/sources/amlogic-boot-fip/khadas-vim3/aml_encrypt_g12b"
+
+	if [ ! -f "$AML_ENCRYPT" ]; then
+		display_alert "${BOARD}" "amlogic-boot-fip/khadas-vim3/aml_encrypt_g12b not exist" "err"
+		exit 1
+	fi
+
+	mv u-boot.bin raw-u-boot.bin
+	rm -f "${EXTRACT_DIR}/bl33.enc"
+	# The current version of gxlimg has a problem with the handling of bl3x,
+	# which may cause the produced fip to fail to boot.
+	# see https://github.com/repk/gxlimg/issues/19
+	# run_host_command_logged gxlimg -t bl3x -s raw-u-boot.bin "${EXTRACT_DIR}/bl33.enc"
+	run_host_x86_binary_logged "$AML_ENCRYPT" --bl3sig \
+		--input raw-u-boot.bin \
+		--output "${EXTRACT_DIR}/bl33.enc" \
+		--level v3 --type bl33
+	run_host_command_logged gxlimg \
+		-t fip \
+		--bl2 "${EXTRACT_DIR}/bl2.sign" \
+		--ddrfw "${EXTRACT_DIR}/ddr4_1d.fw" \
+		--ddrfw "${EXTRACT_DIR}/ddr4_2d.fw" \
+		--ddrfw "${EXTRACT_DIR}/ddr3_1d.fw" \
+		--ddrfw "${EXTRACT_DIR}/piei.fw" \
+		--ddrfw "${EXTRACT_DIR}/lpddr4_1d.fw" \
+		--ddrfw "${EXTRACT_DIR}/lpddr4_2d.fw" \
+		--ddrfw "${EXTRACT_DIR}/diag_lpddr4.fw" \
+		--ddrfw "${EXTRACT_DIR}/aml_ddr.fw" \
+		--ddrfw "${EXTRACT_DIR}/lpddr3_1d.fw" \
+		--bl30 "${EXTRACT_DIR}/bl30.enc" \
+		--bl31 "${EXTRACT_DIR}/bl31.enc" \
+		--bl33 "${EXTRACT_DIR}/bl33.enc" \
+		--rev v3 u-boot.bin
+
+	if [ ! -s u-boot.bin ]; then
+		display_alert "${BOARD}" "FIP repack produced empty u-boot.bin" "err"
+		exit 1
+	fi
+}
+
+function post_family_tweaks_bsp__cainiao-cniot-core() {
+	display_alert "${BOARD}" "Installing ALSA UCM configuration files" "info"
+
+	# Use ALSA UCM via GUI: Install a desktop environment such as GNOME, PipeWire, and WirePlumber.
+
+	# Use ALSA UCM via CLI: alsactl init && alsaucm set _verb "HiFi" set _enadev "HDMI" set _enadev "Speaker"
+	# playback via HDMI: aplay -D plughw:cainiaocniotcor,0 /usr/share/sounds/alsa/Front_Center.wav
+	# playback via internal speaker: aplay -D plughw:cainiaocniotcor,1 /usr/share/sounds/alsa/Front_Center.wav
+
+	install -Dm644 "${SRC}/packages/bsp/cainiao-cniot-core/cainiao-cniot-core-HiFi.conf" "${destination}/usr/share/alsa/ucm2/Amlogic/axg-sound-card/cainiao-cniot-core-HiFi.conf"
+	install -Dm644 "${SRC}/packages/bsp/cainiao-cniot-core/cainiao-cniot-core.conf" "${destination}/usr/share/alsa/ucm2/Amlogic/axg-sound-card/cainiao-cniot-core.conf"
+
+	if [ ! -d "${destination}/usr/share/alsa/ucm2/conf.d/axg-sound-card" ]; then
+		mkdir -p "${destination}/usr/share/alsa/ucm2/conf.d/axg-sound-card"
+	fi
+	ln -sfv /usr/share/alsa/ucm2/Amlogic/axg-sound-card/cainiao-cniot-core.conf \
+		"${destination}/usr/share/alsa/ucm2/conf.d/axg-sound-card/cainiao-cniot-core.conf"
+}

config/boards/cherryba-m1.csc

@@ -6,6 +6,6 @@ BOOT_LOGO="desktop"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current,edge" # in case different then kernel target
 FORCE_BOOTSCRIPT_UPDATE="yes"
-BOOTBRANCH_BOARD="tag:v2024.01"
-BOOTPATCHDIR="v2024.01"
+BOOTBRANCH_BOARD="tag:v2025.04"
+BOOTPATCHDIR="v2025.04"
 BOARD_MAINTAINER="IsMrX"

config/boards/coolpi-genbook.csc

@@ -5,7 +5,7 @@ BOARD_MAINTAINER="andyshrk"
 BOARD_FIRMWARE_INSTALL="-full"
 BOOT_SOC="rk3588"
 BOOTCONFIG="coolpi-cm5-genbook-rk3588_defconfig"
-KERNEL_TARGET="edge"
+KERNEL_TARGET="edge,vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-coolpi-cm5-genbook.dtb"
@@ -15,13 +15,13 @@ BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
 
 # Mainline U-Boot
-function post_family_config_branch_edge__coolpi-genbook_use_mainline_uboot() {
+function post_family_config__coolpi-genbook_use_mainline_uboot() {
 	display_alert "$BOARD" "mainline (next branch) u-boot overrides for $BOARD / $BRANCH" "info"
 
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # Mainline U-Boot
 	unset BOOTBRANCH
 	declare -g BOOTPATCHDIR="v2025.01-rc3-coolpi-cm5"
-	declare -g BOOTBRANCH_BOARD="tag:v2025.01"
+	declare -g BOOTBRANCH_BOARD="tag:v2025.04"
 	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
 	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already
 

config/boards/core3566.csc

@@ -1,66 +0,0 @@
-# Rockchip RK3566 quad core 4/8GB RAM SoC WIFI/BT eMMC USB2 USB3 NVMe PCIe GbE HDMI SPI
-BOARD_NAME="core3566"
-BOARDFAMILY="rk35xx"
-BOARD_MAINTAINER=""
-BOOTCONFIG="orangepi-3b-rk3566_defconfig"
-BOOT_SOC="rk3566"
-KERNEL_TARGET="vendor"
-FULL_DESKTOP="yes"
-BOOT_LOGO="desktop"
-BOOT_FDT_FILE="rockchip/rk3566-core3566.dtb"
-IMAGE_PARTITION_TABLE="gpt"
-BOOT_SCENARIO="spl-blobs"
-BOOT_SUPPORT_SPI="yes"
-BOOT_SPI_RKSPI_LOADER="yes"
-MODULES=""
-MODULES_BLACKLIST_LEGACY="bcmdhd"
-
-# Override family config for this board; let's avoid conditionals in family config.
-function post_family_config__core3566_use_mainline_uboot() {
-	display_alert "$BOARD" "mainline (Kwiboo's tree) u-boot overrides" "info"
-
-	BOOTSOURCE="https://github.com/Kwiboo/u-boot-rockchip.git"
-	BOOTBRANCH="branch:rk3xxx-2024.04" # specific commit tested is commit:ccef7dfc453bc03c5b5c61fa67d2745b96fa7da6
-	BOOTPATCHDIR="v2024.04-orangepi3b" # empty, patches are already in Kwiboo's branch:rk3xxx-2024.04
-
-	BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
-
-	BOOTDELAY=1 # Wait for UART interrupt to enter UMS/RockUSB mode etc
-	UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin u-boot.itb idbloader.img idbloader-spi.img"
-	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already
-
-	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
-	function write_uboot_platform() {
-		dd if=${1}/u-boot-rockchip.bin of=${2} bs=32k seek=1 conv=fsync
-	}
-
-	# Smarter/faster/better to-spi writer using flashcp (hopefully with --partition), using the binman-provided 'u-boot-rockchip-spi.bin'
-	function write_uboot_platform_mtd() {
-		declare -a extra_opts_flashcp=("--verbose")
-		if flashcp -h | grep -q -e '--partition'; then
-			echo "Confirmed flashcp supports --partition -- read and write only changed blocks." >&2
-			extra_opts_flashcp+=("--partition")
-		else
-			echo "flashcp does not support --partition, will write full SPI flash blocks." >&2
-		fi
-		flashcp "${extra_opts_flashcp[@]}" "${1}/u-boot-rockchip-spi.bin" /dev/mtd0
-	}
-
-}
-
-function post_family_tweaks_bsp__core3566() {
-	# display_alert "$BOARD" "Installing sprd-bluetooth.service" "info"
-
-	# Bluetooth on core3566 board is handled by a Spreadtrum (sprd) chip and requires
-	# a custom hciattach_opi binary, plus a systemd service to run it at boot time
-	#install -m 755 $SRC/packages/bsp/rk3399/hciattach_opi $destination/usr/bin
-	# cp $SRC/packages/bsp/rk3399/sprd-bluetooth.service $destination/lib/systemd/system/
-
-	return 0
-}
-
-function post_family_tweaks__core3566_enable_services() {
-	# display_alert "$BOARD" "Enabling sprd-bluetooth.service" "info"
-	# chroot_sdcard systemctl enable sprd-bluetooth.service
-	return 0
-}

config/boards/cubieboard.csc

@@ -4,7 +4,7 @@ BOARDFAMILY="sun4i"
 BOARD_MAINTAINER=""
 BOOTCONFIG="Cubieboard_config"
 HAS_VIDEO_OUTPUT="no"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge,legacy"
 KERNEL_TEST_TARGET="current"
 MODULES_BLACKLIST="ir_lirc_codec lirc_dev sunxi-cir"
 

config/boards/cubieboard2.csc

@@ -3,7 +3,7 @@ BOARD_NAME="Cubieboard 2"
 BOARDFAMILY="sun7i"
 BOARD_MAINTAINER=""
 BOOTCONFIG="Cubieboard2_config"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge,legacy"
 KERNEL_TEST_TARGET="current"
 
 function post_config_uboot_target__extra_configs_for_cubieboard2() {

config/boards/cubieboard4.csc

@@ -3,5 +3,5 @@ BOARD_NAME="Cubieboard 4"
 BOARDFAMILY="sun9i"
 BOARD_MAINTAINER=""
 BOOTCONFIG=Cubieboard4_defconfig
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge,legacy"
 KERNEL_TEST_TARGET="current"

config/boards/cubietruck.csc

@@ -3,5 +3,5 @@ BOARD_NAME="Cubietruck"
 BOARDFAMILY="sun7i"
 BOARD_MAINTAINER=""
 BOOTCONFIG="Cubietruck_config"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge,legacy"
 KERNEL_TEST_TARGET="current"

config/boards/cubietruckplus.eos

@@ -4,4 +4,4 @@ BOARDFAMILY="sun8i"
 BOARD_MAINTAINER=""
 BOOTCONFIG="Cubietruck_plus_defconfig"
 OVERLAY_PREFIX="sun8i-a83t"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge,legacy"

config/boards/dshanpi-a1.csc

@@ -0,0 +1,23 @@
+# Rockchip RK3576 SoC octa core 4-32GB SoC 2*GBe eMMC USB3 NvME WIFI
+BOARD_NAME="100ASK DShanPI A1"
+BOARDFAMILY="rk35xx"
+BOARD_MAINTAINER=""
+BOOTCONFIG="dshanpi-a1-rk3576_defconfig"
+KERNEL_TARGET="vendor"
+KERNEL_TEST_TARGET="vendor"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3576-100ask-dshanpi-a1.dtb"
+BOOT_SCENARIO="spl-blobs"
+IMAGE_PARTITION_TABLE="gpt"
+
+function post_family_tweaks__dshanpi-a1_naming_audios() {
+	display_alert "$BOARD" "Renaming dshanpi-a1 audios" "info"
+
+	mkdir -p $SDCARD/etc/udev/rules.d/
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi0-sound", ENV{SOUND_DESCRIPTION}="HDMI0 Audio"' > $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-dp0-sound", ENV{SOUND_DESCRIPTION}="DP0 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-es8316-sound", ENV{SOUND_DESCRIPTION}="ES8316 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+
+	return 0
+}

config/boards/firefly-itx-3588j.csc

@@ -1,14 +1,15 @@
 # Rockchip RK3588j Octa core 4GB-32GB eMMC GBE HDMI HDMI-IN PCIe SATA USB3 WiFi 4G 5G
 BOARD_NAME="Firefly ITX-3588J"
 BOARDFAMILY="rockchip-rk3588"
-BOOT_SOC="rk3588"
 BOARD_MAINTAINER="SeeleVolleri"
+BOOTCONFIG="rock-5b-rk3588_defconfig"
 KERNEL_TARGET="vendor"
-BOOTCONFIG="rk3588_defconfig"
 BOOT_FDT_FILE="rockchip/rk3588-firefly-itx-3588j.dtb"
-BOOT_LOGO="desktop"
 FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_SCENARIO="spl-blobs"
 IMAGE_PARTITION_TABLE="gpt"
+declare -g UEFI_EDK2_BOARD_ID="firefly-itx-3588j" # This _only_ used for uefi-edk2-rk3588 extension
 
 function post_family_tweaks_bsp__firefly_itx_3588j() {
 	display_alert "$BOARD" "Installing rk3588-bluetooth.service" "info"

config/boards/gateway-gz80x.conf

@@ -5,15 +5,25 @@ BOARD_MAINTAINER="pyavitz"
 BOOTCONFIG="amper_gateway_am-gz80x_defconfig"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
-BOOTBRANCH_BOARD="tag:v2025.01"
-BOOTPATCHDIR="v2025.01"
+BOOTBRANCH_BOARD="tag:v2024.10"
+BOOTPATCHDIR="v2024.10"
 BOOT_FDT_FILE="amlogic/meson-axg-amper-gateway-am-gz80x.dtb"
 SRC_EXTLINUX="yes"
 SRC_CMDLINE="console=ttyAML0,115200n8 clk_ignore_unused loglevel=7"
 HAS_VIDEO_OUTPUT="no"
+MODULES_BLACKLIST="rtw88_8723d rtw88_8723ds meson_nand"
+PACKAGE_LIST_BOARD="rfkill bluetooth bluez bluez-tools"
+
+function post_family_tweaks_bsp__gateway_gz80x_firmware() {
+	if [[ -d "$SRC/packages/bsp/gateway-gz80x/rtl_bt" ]]; then
+		mkdir -p "${destination}"/lib/firmware/updates/rtl_bt
+		display_alert "$BOARD" "Installing bluetooth firmware" "info"
+		cp -fr $SRC/packages/bsp/gateway-gz80x/rtl_bt/* "${destination}"/lib/firmware/updates/rtl_bt/
+	fi
+}
 
 function post_family_tweaks_bsp__gateway_gz80x_udev() {
 	mkdir -p "${destination}"/etc/udev/rules.d
-	display_alert "$BOARD" "Install zwave udev rule" "info"
+	display_alert "$BOARD" "Installing zwave udev rule" "info"
 	echo 'KERNEL=="ttyAML2", NAME="tts/%n", SYMLINK+="zwave", GROUP="dialout", MODE="0660"' > "${destination}"/etc/udev/rules.d/10-zwave.rules
 }

config/boards/helios4.conf

@@ -0,0 +1,17 @@
+# Marvell Armada 388 2GB ECC RAM SoC 4xSATA 2xUSB3.0 GBE SPI
+BOARD_NAME="Helios4"
+BOARDFAMILY="mvebu"
+BOARD_MAINTAINER="leggewie"
+BOOTCONFIG="helios4_defconfig"
+BOOTCONFIG_NEXT="helios4_defconfig"
+MODULES_LEGACY="marvell_cesa lm75"
+MODULES_CURRENT="marvell_cesa lm75"
+HAS_VIDEO_OUTPUT="no"
+FORCE_BOOTSCRIPT_UPDATE="yes"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
+
+function post_family_config__helios4_extra_packages() {
+	add_packages_to_image "fancontrol"
+	add_packages_to_image "ethtool"
+}

config/boards/helios4.csc

@@ -1,12 +0,0 @@
-# Marvell Armada 388 2GB ECC RAM SoC 4xSATA 2xUSB3.0 GBE SPI
-BOARD_NAME="Helios4"
-BOARDFAMILY="mvebu"
-BOARD_MAINTAINER="Heisath"
-BOOTCONFIG="helios4_defconfig"
-BOOTCONFIG_NEXT="helios4_defconfig"
-MODULES_LEGACY="marvell_cesa lm75"
-MODULES_CURRENT="marvell_cesa lm75"
-HAS_VIDEO_OUTPUT="no"
-FORCE_BOOTSCRIPT_UPDATE="yes"
-KERNEL_TARGET="current,edge"
-KERNEL_TEST_TARGET="current"

config/boards/imb3588.conf

@@ -0,0 +1,14 @@
+# Rockchip RK3588 SoC with 4/8/16GB RAM, 16GBB/32GB/64GB/128GB EMMC, m.2 SATA, USB3, USB2, 2xGbE, WIFI6, BT5.1, LCDS, MIPI, eDP, HDMI
+BOARD_NAME="IMB3588"
+BOARDFAMILY="rockchip-rk3588"
+BOARD_MAINTAINER="JackHuang021"
+BOOTCONFIG="imb3588_defconfig"
+BOOT_SOC="rk3588"
+KERNEL_TARGET="vendor"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3588-yx-imb3588.dtb"
+BOOT_SCENARIO="spl-blobs"
+BOOT_SUPPORT_SPI="yes"
+BOOT_SPI_RKSPI_LOADER="yes"
+IMAGE_PARTITION_TABLE="gpt"

config/boards/imx7sabre.eos

@@ -3,4 +3,4 @@ BOARD_NAME="MCIMX7SABRE"
 BOARDFAMILY="imx7d"
 BOARD_MAINTAINER=""
 BOOTCONFIG="imx_v7_defconfig"
-KERNEL_TARGET="legacy,current"
+KERNEL_TARGET="current,legacy"

config/boards/inovato-quadra.conf

@@ -1,12 +1,15 @@
 # Allwinner H6 quad core 2GB SoC WiFi eMMC
 BOARD_NAME="Inovato Quadra"
 BOARDFAMILY="sun50iw6"
-BOARD_MAINTAINER="NicoD-SBC"
+BOARD_MAINTAINER="igorpecovnik"
 BOOTCONFIG="tanix_tx6_defconfig"
 CRUSTCONFIG="tanix_tx6_defconfig"
-BOOT_FDT_FILE="sun50i-h6-inovato-quadra.dtb"
-KERNEL_TARGET="legacy,current,edge"
+BOOT_FDT_FILE="allwinner/sun50i-h6-inovato-quadra.dtb"
+KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
+#BOOTBRANCH="tag:v2025.04"
+#BOOTPATCHDIR="v2025-sunxi"
+#OVERLAY_PREFIX="sun50i-h6"
 BOOT_LOGO="desktop"
 FULL_DESKTOP="yes"
 SRC_EXTLINUX="yes"

config/boards/khadas-edge2.conf

@@ -33,7 +33,7 @@ function post_family_config__uboot_kedge2() {
 	display_alert "$BOARD" "Configuring ($BOARD) u-boot" "info"
 
 	declare -g BOOTSOURCE='https://github.com/khadas/u-boot.git'
-	declare -g BOOTBRANCH='branch:khadas-edges-v2017.09'
+	declare -g BOOTBRANCH="commit:df276095a29a02f8e7ce4f451770c06486106594"
 	declare -g BOOTPATCHDIR="legacy/u-boot-khadas-edge2-rk3588"
 	declare -g BOOTCONFIG="khadas-edge2-rk3588s_defconfig"
 	declare -g SRC_EXTLINUX="yes" # For now, use extlinux. Thanks Monka

config/boards/khadas-vim1s.conf

@@ -2,7 +2,7 @@
 BOARD_NAME="Khadas VIM1S" # don't confuse with VIM1 (S905X)
 BOARDFAMILY="meson-s4t7"
 KERNEL_TARGET="legacy"
-BOARD_MAINTAINER="rpardini viraniac"
+BOARD_MAINTAINER="rpardini"
 SERIALCON="ttyS0" # for vendor kernel
 # BOOT_FDT_FILE="amlogic/kvim1s.dtb" # unset on purpose: uboot auto-determines the DTB to use
 

config/boards/khadas-vim3.conf

@@ -12,8 +12,8 @@ BOOT_LOGO="desktop"
 BOOT_FDT_FILE="amlogic/meson-g12b-a311d-khadas-vim3.dtb" # there is also a s922x dtb, but vim3 is a311d only
 ASOUND_STATE="asound.state.khadas-vim3"
 
-BOOTBRANCH_BOARD="tag:v2024.01"
-BOOTPATCHDIR="v2024.01" # this has 'board_khadas-vim3' which has a patch to boot USB/NVMe/SCSI first
+BOOTBRANCH_BOARD="tag:v2025.04"
+BOOTPATCHDIR="v2025.04" # this has 'board_khadas-vim3' which has a patch to boot USB/NVMe/SCSI first
 
 declare -g KHADAS_OOWOW_BOARD_ID="VIM3" # for use with EXT=output-image-oowow
 
@@ -53,6 +53,12 @@ function post_config_uboot_target__extra_configs_for_khadas_vim3() {
 	display_alert "u-boot for ${BOARD}" "u-boot: enable gpio LED support" "info"
 	run_host_command_logged scripts/config --enable CONFIG_LED
 	run_host_command_logged scripts/config --enable CONFIG_LED_GPIO
+	display_alert "u-boot for ${BOARD}" "u-boot: enable more cmdline commands" "info" # for extra compat with eg HAOS
+	run_host_command_logged scripts/config --enable CONFIG_CMD_SQUASHFS
+	run_host_command_logged scripts/config --enable CONFIG_CMD_SETEXPR
+	run_host_command_logged scripts/config --enable CONFIG_CMD_FILEENV # added via cmd-fileenv-read-string-from-file-into-env.patch
+	run_host_command_logged scripts/config --enable CONFIG_CMD_CAT
+	run_host_command_logged scripts/config --enable CONFIG_CMD_XXD
 	display_alert "u-boot for ${BOARD}" "u-boot: enable networking cmds" "info"
 	run_host_command_logged scripts/config --enable CONFIG_CMD_NFS
 	run_host_command_logged scripts/config --enable CONFIG_CMD_WGET

config/boards/khadas-vim4.conf

@@ -2,7 +2,7 @@
 BOARD_NAME="Khadas VIM4"
 BOARDFAMILY="meson-s4t7"
 KERNEL_TARGET="legacy"
-BOARD_MAINTAINER="adeepn rpardini viraniac"
+BOARD_MAINTAINER="adeepn leggewie rpardini"
 SERIALCON="ttyS0" # for vendor kernel
 # BOOT_FDT_FILE="amlogic/kvim4.dtb" # not set on purpose; u-boot auto-selects kvim4.dtb or kvim4n.dtb for "new VIM4"
 

config/boards/kickpik2b.csc

@@ -0,0 +1,56 @@
+# Allwinner H618 quad core 1/2/4GB RAM SoC WiFi SPI USB-C
+BOARD_NAME="KickPi K2B"
+BOARDFAMILY="sun50iw9-bpi"
+BOARD_MAINTAINER="pyavitz"
+BOOTCONFIG="kickpi_k2b_defconfig"
+OVERLAY_PREFIX="sun50i-h616"
+BOOT_FDT_FILE="sun50i-h618-kickpi-k2b.dtb"
+BOOT_LOGO="desktop"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
+FORCE_BOOTSCRIPT_UPDATE="yes"
+BOOTBRANCH_BOARD="tag:v2025.07"
+BOOTPATCHDIR="v2025.07"
+PACKAGE_LIST_BOARD="rfkill bluetooth bluez bluez-tools"
+
+# AIC8800
+AIC8800_TYPE="sdio"
+enable_extension "radxa-aic8800"
+
+# AIC8800 Wireless
+function post_family_tweaks_bsp__aic8800_wireless() {
+	display_alert "$BOARD" "Installing AIC8800 Tweaks" "info"
+	mkdir -p "${destination}"/etc/modprobe.d
+	mkdir -p "${destination}"/etc/modules-load.d
+	# Add wireless conf
+	cat > "${destination}"/etc/modprobe.d/aic8800-wireless.conf <<- EOT
+	options aic8800_fdrv_sdio aicwf_dbg_level=0 custregd=0 ps_on=0
+	options aic8800_bsp_sdio aic_fw_path=/lib/firmware/aic8800_fw/SDIO/aic8800
+	EOT
+	# Add needed bluetooth modules
+	cat > "${destination}"/etc/modules-load.d/aic8800-btlpm.conf <<- EOT
+	hidp
+	rfcomm
+	bnep
+	aic8800_btlpm_sdio
+	EOT
+	# Add AIC8800 Bluetooth Service and Script
+	if [[ -d "$SRC/packages/bsp/aic8800" ]]; then
+		install -d -m 0755 "${destination}/usr/bin"
+		install -m 0755 "$SRC/packages/bsp/aic8800/aic-bluetooth" "${destination}/usr/bin/aic-bluetooth"
+		install -d -m 0755 "${destination}/usr/lib/systemd/system"
+		install -m 0644 "$SRC/packages/bsp/aic8800/aic-bluetooth.service" "${destination}/usr/lib/systemd/system/aic-bluetooth.service"
+	else
+		display_alert "$BOARD" "Skipping AIC8800 BT assets (packages/bsp/aic8800 not found)" "warn"
+	fi
+}
+
+# Enable AIC8800 Bluetooth Service
+function post_family_tweaks__enable_aic8800_bluetooth_service() {
+	display_alert "$BOARD" "Enabling AIC8800 Bluetooth Service" "info"
+	if chroot_sdcard test -f /lib/systemd/system/aic-bluetooth.service || chroot_sdcard test -f /etc/systemd/system/aic-bluetooth.service; then
+		chroot_sdcard systemctl --no-reload enable aic-bluetooth.service
+	else
+		display_alert "$BOARD" "aic-bluetooth.service not found in image; skipping enable" "warn"
+	fi
+}

config/boards/lckfb-taishanpi.csc

@@ -2,20 +2,27 @@
 BOARD_NAME="LCKFB Taishan Pi"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER=""
-BOOTCONFIG="radxa-zero3-rk3566_defconfig"
-KERNEL_TARGET="vendor"
-BOOT_FDT_FILE="rockchip/rk3566-taishanpi-v10.dtb"
+BOOTCONFIG="lckfb-tspi-rk3566_defconfig"
+BOOT_SOC="rk3566"
+KERNEL_TARGET="vendor,current,edge"
+KERNEL_TEST_TARGET="current,vendor"
+BOOT_FDT_FILE="rockchip/rk3566-lckfb-tspi.dtb"
 BOOT_SCENARIO="spl-blobs"
 IMAGE_PARTITION_TABLE="gpt"
 
 # Override family config for this board; let's avoid conditionals in family config.
 function post_family_config__tspi_use_radxa_vendor() {
-	BOOTSOURCE='https://github.com/radxa/u-boot.git'
-	BOOTBRANCH='branch:rk35xx-2024.01'
-	BOOTPATCHDIR="u-boot-radxa-latest"
-	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
+	display_alert "$BOARD" "Mainline U-Boot overrides for $BOARD - $BRANCH" "info"
+	BOOTDELAY=1
+	BOOTSOURCE="https://github.com/u-boot/u-boot"
+	BOOTBRANCH="tag:v2025.04"
+	BOOTPATCHDIR="v2025.04"
+	BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
+	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 seek=64 conv=notrunc status=none
+		dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
 	}
 }

config/boards/licheepi-4a.eos

@@ -2,7 +2,7 @@
 BOARD_NAME="LicheePi 4A"
 BOARDFAMILY="thead"
 BOARD_MAINTAINER="chainsx"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge,legacy"
 KERNEL_TEST_TARGET="current"
 BOOT_FDT_FILE="thead/th1520-lichee-pi-4a.dtb"
 SRC_EXTLINUX="yes"

config/boards/lime-a33.csc

@@ -5,5 +5,5 @@ BOARD_MAINTAINER=""
 HAS_VIDEO_OUTPUT="no"
 BOOTCONFIG="A33-OLinuXino_defconfig"
 OVERLAY_PREFIX="sun8i-a33"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge,legacy"
 KERNEL_TEST_TARGET="current"

config/boards/lime-a64.csc

@@ -4,7 +4,7 @@ BOARDFAMILY="sun50iw1"
 BOARD_MAINTAINER=""
 BOOTCONFIG_DEFAULT="sun50iw1p1_config"
 BOOTCONFIG="a64-olinuxino_defconfig"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge,legacy"
 KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 CRUSTCONFIG="a64_defconfig"

config/boards/lime.csc

@@ -3,5 +3,5 @@ BOARD_NAME="A20 OLinuXino Lime"
 BOARDFAMILY="sun7i"
 BOARD_MAINTAINER=""
 BOOTCONFIG="A20-OLinuXino-Lime_defconfig"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge,legacy"
 KERNEL_TEST_TARGET="current"

config/boards/lime2.csc

@@ -3,7 +3,7 @@ BOARD_NAME="A20 OLinuXino Lime 2"
 BOARDFAMILY="sun7i"
 BOARD_MAINTAINER=""
 BOOTCONFIG="A20-OLinuXino-Lime2-eMMC_defconfig"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge,legacy"
 KERNEL_TEST_TARGET="current"
 
 function post_config_uboot_target__extra_configs_for_lime2() {

config/boards/lubancat2.csc

@@ -16,8 +16,8 @@ function post_family_config_branch_edge__lubancat_2_use_mainline_uboot() {
 	display_alert "$BOARD" "Using mainline U-Boot for $BOARD / $BRANCH" "info"
 
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
-	declare -g BOOTBRANCH="tag:v2024.07"
-	declare -g BOOTPATCHDIR="v2024.07"
+	declare -g BOOTBRANCH="tag:v2025.04"
+	declare -g BOOTPATCHDIR="v2025.04"
 	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency
 
 	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"

config/boards/luckfox-core3566.csc

@@ -1,4 +1,4 @@
-# Rockchip RK3566 quad core
+# Rockchip RK3566 quad core 4/8GB RAM SoC WIFI/BT eMMC USB2 USB3 NVMe PCIe GbE HDMI SPI
 BOARD_NAME="Luckfox Core3566"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER=""
@@ -11,6 +11,9 @@ BOOT_FDT_FILE="rockchip/rk3566-luckfox-core3566.dtb"
 IMAGE_PARTITION_TABLE="gpt"
 BOOT_SCENARIO="spl-blobs"
 BOOTFS_TYPE="fat" # Only for vendor/legacy
+BOOT_SUPPORT_SPI="yes"
+BOOT_SPI_RKSPI_LOADER="yes"
+MODULES_BLACKLIST_LEGACY="bcmdhd"
 
 # Override family config for this board; let's avoid conditionals in family config.
 function post_family_config__luckfox-core3566_use_vendor_uboot() {

config/boards/mekotronics-r58-minipc.csc

@@ -1,7 +1,7 @@
 # Rockchip RK3588 SoC octa core 4-16GB SoC 1GBe eMMC USB3 SATA WiFi/BT
 declare -g BOARD_NAME="Mekotronics R58 MiniPC"
 declare -g BOARDFAMILY="rockchip-rk3588"
-declare -g BOARD_MAINTAINER="monkaBlyat"
+declare -g BOARD_MAINTAINER=""
 declare -g KERNEL_TARGET="vendor"
 declare -g BOOTCONFIG="mekotronics_r58-rk3588_defconfig"              # generic ebv-ish defconfig
 declare -g BOOT_FDT_FILE="rockchip/rk3588-blueberry-minipc-linux.dtb" # Specific to this board

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

@@ -1,7 +1,7 @@
 # Rockchip RK3588 SoC octa core 4-16GB SoC 2x1GBe eMMC USB3 NVMe SATA 4G WiFi/BT HDMI DP HDMI-In RS232 RS485
 declare -g BOARD_NAME="Mekotronics R58X-4G"
 declare -g BOARDFAMILY="rockchip-rk3588"
-declare -g BOARD_MAINTAINER="monkaBlyat"
+declare -g BOARD_MAINTAINER=""
 declare -g KERNEL_TARGET="vendor"
 declare -g BOOTCONFIG="mekotronics_r58x-rk3588_defconfig"               # vendor u-boot; with NVMe and a DTS
 declare -g BOOT_FDT_FILE="rockchip/rk3588-blueberry-edge-v12-linux.dtb" # Specific to this board

config/boards/mekotronics-r58x.csc

@@ -1,7 +1,7 @@
 # Rockchip RK3588 SoC octa core 4-16GB SoC 2x1GBe eMMC USB3 NVMe SATA WiFi/BT HDMI DP HDMI-In RS232 RS485
 declare -g BOARD_NAME="Mekotronics R58X"
 declare -g BOARDFAMILY="rockchip-rk3588"
-declare -g BOARD_MAINTAINER="monkaBlyat"
+declare -g BOARD_MAINTAINER=""
 declare -g KERNEL_TARGET="vendor"
 declare -g BOOTCONFIG="mekotronics_r58x-rk3588_defconfig"               # vendor u-boot; with NVMe and a DTS
 declare -g BOOT_FDT_FILE="rockchip/rk3588-blueberry-edge-v10-linux.dtb" # Specific to this board

config/boards/melea1000.csc

@@ -4,5 +4,5 @@ BOARDFAMILY="sun4i"
 BOARD_MAINTAINER=""
 HAS_VIDEO_OUTPUT="no"
 BOOTCONFIG="Mele_A1000_defconfig"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge,legacy"
 KERNEL_TEST_TARGET="current"

config/boards/mixtile-blade3.csc

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

config/boards/mk808c.csc

@@ -4,5 +4,5 @@ BOARDFAMILY="sun7i"
 BOARD_MAINTAINER=""
 HAS_VIDEO_OUTPUT="no"
 BOOTCONFIG="MK808C_defconfig"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge,legacy"
 KERNEL_TEST_TARGET="current"

config/boards/nanopct6.conf

@@ -30,16 +30,22 @@ function post_family_tweaks__nanopct6_naming_audios() {
 }
 
 # Mainline u-boot
-function post_family_config_branch_edge__nanopct6_use_mainline_uboot() {
-	display_alert "$BOARD" "mainline (next branch) u-boot overrides for $BOARD / $BRANCH" "info"
+function post_family_config__nanopct6_use_mainline_uboot() {
+	[[ "${BRANCH}" == "vendor" ]] && return 0 # Not for 'vendor' branch, which uses 2017.09 vendor u-boot from Radxa
+
+	display_alert "$BOARD" "u-boot overrides for $BOARD / $BRANCH" "info"
+
+	# To reuse ATF code in rockchip64_common, let's change the BOOT_SCENARIO and call prepare_boot_configuration() again
+	BOOT_SCENARIO="tpl-blob-atf-mainline"
+	prepare_boot_configuration
 
 	declare -g BOOTCONFIG="nanopc-t6-rk3588_defconfig"
 	declare -g BOOTDELAY=1                                       # Wait for UART interrupt to enter UMS/RockUSB mode etc
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline
-	declare -g BOOTBRANCH="tag:v2025.04-rc1"
+	declare -g BOOTBRANCH="tag:v2025.04"
 	declare -g BOOTPATCHDIR="v2025.04"
 	declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
-	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
+	declare -g UBOOT_TARGET_MAP="BL31=bl31.elf ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
 	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already
 
 	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
@@ -55,12 +61,13 @@ function post_family_config_branch_edge__nanopct6_use_mainline_uboot() {
 # U-boot 2025.04+ can detect and set fdtfile automatically across T6 and T6-LTS boards.
 # So if using mainline u-boot, unset BOOT_FDT_FILE to let u-boot handle it.
 # That way, both variants can boot from the same image; lets keep the -lts board file for vendor kernel/u-boot.
-function post_family_config_branch_edge__t6_and_t6_lts_auto_dtb_name_via_uboot_detection() {
+function post_family_config__t6_and_t6_lts_auto_dtb_name_via_uboot_detection() {
+	[[ "${BRANCH}" == "vendor" ]] && return 0 # Not for 'vendor' branch, which uses 2017.09 vendor u-boot from Radxa
 	unset BOOT_FDT_FILE
 }
 
 function pre_config_uboot_target__nanoptc6_patch_uboot_dtsi_for_ums() {
-	[[ "${BRANCH}" != "edge" ]] && return 0
+	[[ "${BRANCH}" == "vendor" ]] && return 0 # Not for 'vendor' branch, which uses 2017.09 vendor u-boot from Radxa
 
 	display_alert "u-boot for ${BOARD}" "u-boot: add to u-boot dtsi for UMS" "info" # avoid a patch, just append to the dtsi file
 	cat <<- EOD >> arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi                        # Append to the t6 u-boot dtsi file with stuff for enabling gadget/otg/peripheral mode
@@ -69,6 +76,9 @@ function pre_config_uboot_target__nanoptc6_patch_uboot_dtsi_for_ums() {
 		&usbdp_phy0 { status = "okay"; };
 		&usb_host0_xhci { dr_mode = "peripheral";  maximum-speed = "high-speed";  status = "okay"; };
 	EOD
+	# Append to the t6 u-boot dtsi file with stuff for enabling gadget/otg/peripheral mode
+	# Append to the t6 u-boot dtsi file with stuff for enabling gadget/otg/peripheral mode
+	# Append to the t6 u-boot dtsi file with stuff for enabling gadget/otg/peripheral mode
 
 }
 
@@ -85,7 +95,7 @@ function pre_config_uboot_target__nanopct6_patch_rockchip_common_boot_order() {
 }
 
 function post_config_uboot_target__extra_configs_for_nanopct6_mainline_environment_in_spi() {
-	[[ "${BRANCH}" != "edge" ]] && return 0
+	[[ "${BRANCH}" == "vendor" ]] && return 0 # Not for 'vendor' branch, which uses 2017.09 vendor u-boot from Radxa
 
 	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable board-specific configs (env in SPI)" "info"
 	run_host_command_logged scripts/config --enable CONFIG_DM_PMIC_FAN53555
@@ -134,7 +144,7 @@ function post_config_uboot_target__extra_configs_for_nanopct6_mainline_environme
 # Include fw_setenv, configured to point to the correct spot on the SPI Flash
 PACKAGE_LIST_BOARD="libubootenv-tool" # libubootenv-tool provides fw_printenv and fw_setenv, for talking to U-Boot environment
 function post_family_tweaks__config_nanopct6_fwenv() {
-	[[ "${BRANCH}" != "edge" ]] && return 0
+	[[ "${BRANCH}" == "vendor" ]] && return 0 # Not for 'vendor' branch, which uses 2017.09 vendor u-boot from Radxa
 	display_alert "Configuring fw_printenv and fw_setenv" "for ${BOARD} and u-boot ${BOOTBRANCH}" "info"
 	# Addresses below come from CONFIG_ENV_OFFSET and CONFIG_ENV_SIZE in defconfig
 	cat <<- 'FW_ENV_CONFIG' > "${SDCARD}"/etc/fw_env.config

config/boards/nanopi-r1.csc

@@ -9,7 +9,7 @@ DEFAULT_OVERLAYS="usbhost0 usbhost1 uart1"
 DEFAULT_CONSOLE="serial"
 SERIALCON="ttyS1,ttyGS0"
 HAS_VIDEO_OUTPUT="no"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge,legacy"
 KERNEL_TEST_TARGET="current"
 BOOT_FDT_FILE="sun8i-h3-nanopi-r1.dtb"
 

config/boards/nanopi-r1s-h5.csc

@@ -8,7 +8,7 @@ MODULES_BLACKLIST="lima"
 DEFAULT_OVERLAYS="usbhost1 usbhost2"
 DEFAULT_CONSOLE="serial"
 SERIALCON="ttyS0,ttyGS0"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge,legacy"
 KERNEL_TEST_TARGET="current"
 HAS_VIDEO_OUTPUT="no"
 CRUSTCONFIG="h5_defconfig"

config/boards/nanopi-r3s-lts.conf

@@ -0,0 +1,30 @@
+# Rockchip RK3566 quad core 2GB RAM eMMC 2x GbE USB3 HDMI
+BOARD_NAME="NanoPi R3S LTS"
+BOARDFAMILY="rk35xx"
+BOARD_MAINTAINER="pyavitz"
+BOOTCONFIG="nanopi-r3s-lts-rk3566_defconfig"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current,edge"
+BOOT_FDT_FILE="rockchip/rk3566-nanopi-r3s-lts.dtb"
+IMAGE_PARTITION_TABLE="gpt"
+BOOT_SCENARIO="spl-blobs"
+
+
+function post_family_config__use_mainline_uboot() {
+	if [[ "$BRANCH" != "current" && "$BRANCH" != "edge" ]]; then
+    	return 0
+	fi
+	unset BOOTFS_TYPE   # mainline u-boot can boot ext4 directly
+	BOOTCONFIG="nanopi-r3s-lts-rk3566_defconfig"
+	BOOTSOURCE="https://github.com/u-boot/u-boot"
+	BOOTBRANCH="tag:v2025.04"
+	BOOTPATCHDIR="v2025.04"
+
+	UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB ROCKCHIP_TPL=$RKBIN_DIR/$DDR_BLOB;;u-boot-rockchip.bin"
+
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
+
+	function write_uboot_platform() {
+		dd if=$1/u-boot-rockchip.bin of=$2 seek=64 conv=notrunc status=none
+	}
+}

config/boards/nanopi-r3s.csc

@@ -11,37 +11,16 @@ IMAGE_PARTITION_TABLE="gpt"
 BOOT_SCENARIO="spl-blobs"
 
 
-function post_family_config_branch_edge__use_mainline_dtb_name() {
+function post_family_config__use_mainline_uboot() {
+	if [[ "$BRANCH" != "current" && "$BRANCH" != "edge" ]]; then
+    	return 0
+	fi
 	unset BOOT_FDT_FILE # boot.scr will use whatever u-boot detects and sets 'fdtfile' to
 	unset BOOTFS_TYPE   # mainline u-boot can boot ext4 directly
-}
-
-function post_family_config_branch_current__use_mainline_dtb_name() {
-	unset BOOT_FDT_FILE # boot.scr will use whatever u-boot detects and sets 'fdtfile' to
-	unset BOOTFS_TYPE   # mainline u-boot can boot ext4 directly
-}
-
-
-function post_family_config_branch_current__nanopi-r3s_use_mainline_uboot() {
 	BOOTCONFIG="nanopi-r3s-rk3566_defconfig"
 	BOOTSOURCE="https://github.com/u-boot/u-boot"
-	BOOTBRANCH="tag:v2024.10"
-	BOOTPATCHDIR="v2024.10"
-
-	UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB ROCKCHIP_TPL=$RKBIN_DIR/$DDR_BLOB;;u-boot-rockchip.bin"
-
-	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
-
-	function write_uboot_platform() {
-		dd if=$1/u-boot-rockchip.bin of=$2 seek=64 conv=notrunc status=none
-	}
-}
-
-function post_family_config_branch_edge__nanopi-r3s_use_mainline_uboot() {
-	BOOTCONFIG="nanopi-r3s-rk3566_defconfig"
-	BOOTSOURCE="https://github.com/u-boot/u-boot"
-	BOOTBRANCH="tag:v2025.01"
-	BOOTPATCHDIR="v2025.01"
+	BOOTBRANCH="tag:v2025.04"
+	BOOTPATCHDIR="v2025.04"
 
 	UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB ROCKCHIP_TPL=$RKBIN_DIR/$DDR_BLOB;;u-boot-rockchip.bin"
 

config/boards/nanopi-r4s.conf

@@ -1,12 +0,0 @@
-# Rockchip RK3399 hexa core 1GB/4GB RAM SoC 2 x GBE USB3 USB-C
-BOARD_NAME="NanoPi R4S"
-BOARDFAMILY="rockchip64" # Used to be rk3399
-BOARD_MAINTAINER="Manouchehri"
-BOOTCONFIG="nanopi-r4s-rk3399_defconfig"
-KERNEL_TARGET="current,edge"
-KERNEL_TEST_TARGET="current"
-DEFAULT_CONSOLE="serial"
-MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu panfrost"
-HAS_VIDEO_OUTPUT="no"
-BOOTBRANCH_BOARD="tag:v2022.04"
-BOOTPATCHDIR="u-boot-rockchip64-v2022.04"

config/boards/nanopi-r4s.csc

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

config/boards/nanopi-r5c.csc

@@ -30,7 +30,7 @@ function post_family_tweaks__nanopir5c_udev_network_interfaces() {
 
 	mkdir -p $SDCARD/etc/udev/rules.d/
 	cat <<- EOF > "${SDCARD}/etc/udev/rules.d/70-persistent-net.rules"
-		SUBSYSTEM=="net", ACTION=="add", KERNELS=="0001:01:00.0", NAME:="lan"
-		SUBSYSTEM=="net", ACTION=="add", KERNELS=="0002:01:00.0", NAME:="wan"
+		SUBSYSTEM=="net", ACTION=="add", KERNELS=="0001:01:00.0", NAME:="lan1"
+		SUBSYSTEM=="net", ACTION=="add", KERNELS=="0002:01:00.0", NAME:="wan1"
 	EOF
 }

config/boards/nanopi-r5s.csc

@@ -26,11 +26,11 @@ function post_family_config__uboot_config() {
 }
 
 function post_family_tweaks__nanopir5s_udev_network_interfaces() {
-	display_alert "$BOARD" "Renaming interfaces WAN LAN1 LAN2" "info"
+	display_alert "$BOARD" "Renaming interfaces WAN1 LAN1 LAN2" "info"
 
 	mkdir -p $SDCARD/etc/udev/rules.d/
 	cat <<- EOF > "${SDCARD}/etc/udev/rules.d/70-persistent-net.rules"
-		SUBSYSTEM=="net", ACTION=="add", KERNELS=="fe2a0000.ethernet", NAME:="wan"
+		SUBSYSTEM=="net", ACTION=="add", KERNELS=="fe2a0000.ethernet", NAME:="wan1"
 		SUBSYSTEM=="net", ACTION=="add", KERNELS=="0000:01:00.0", NAME:="lan1"
 		SUBSYSTEM=="net", ACTION=="add", KERNELS=="0001:01:00.0", NAME:="lan2"
 	EOF

config/boards/nanopi-r6c.csc

@@ -22,12 +22,12 @@ function post_family_tweaks__nanopi_r6c_naming_audios() {
 }
 
 function post_family_tweaks__nanopi_r6c_naming_udev_network_interfaces() {
-	display_alert "$BOARD" "Renaming NanoPi R6C network interfaces to 'wan' and 'lan'" "info"
+	display_alert "$BOARD" "Renaming NanoPi R6C network interfaces to 'wan1' and 'lan1'" "info"
 
 	mkdir -p $SDCARD/etc/udev/rules.d/
 	cat <<- EOF > "${SDCARD}/etc/udev/rules.d/70-persistent-net.rules"
-		SUBSYSTEM=="net", ACTION=="add", KERNELS=="fe1c0000.ethernet", NAME:="wan"
-		SUBSYSTEM=="net", ACTION=="add", KERNELS=="0003:31:00.0", NAME:="lan"
+		SUBSYSTEM=="net", ACTION=="add", KERNELS=="fe1c0000.ethernet", NAME:="wan1"
+		SUBSYSTEM=="net", ACTION=="add", KERNELS=="0003:31:00.0", NAME:="lan1"
 	EOF
 }
 

config/boards/nanopi-r6s.conf

@@ -28,9 +28,9 @@ function post_family_tweaks__nanopir6s_naming_udev_network_interfaces() {
 
 	mkdir -p $SDCARD/etc/udev/rules.d/
 	cat <<- EOF > "${SDCARD}/etc/udev/rules.d/70-persistent-net.rules"
-		SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", KERNELS=="fe1c0000.ethernet", NAME:="wan"
-		SUBSYSTEM=="net", ACTION=="add", DRIVERS=="r8169", KERNELS=="0003:31:00.0", NAME:="lan1"
-		SUBSYSTEM=="net", ACTION=="add", DRIVERS=="r8169", KERNELS=="0004:41:00.0", NAME:="lan2"
+		SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", KERNELS=="fe1c0000.ethernet", NAME:="lan2"
+		SUBSYSTEM=="net", ACTION=="add", DRIVERS=="r8169", KERNELS=="0003:31:00.0", NAME:="wan"
+		SUBSYSTEM=="net", ACTION=="add", DRIVERS=="r8169", KERNELS=="0004:41:00.0", NAME:="lan1"
 	EOF
 }
 

config/boards/nanopi-r76s.conf

@@ -0,0 +1,21 @@
+# Rockchip RK3576 SoC octa core 2-4-16GB RAM SoC 2x 2.5GbE eMMC USB3 WIFI
+BOARD_NAME="NanoPi R76S"
+BOARDFAMILY="rk35xx"
+BOOTCONFIG="nanopi-r76s-rk3576_defconfig"
+KERNEL_TARGET="vendor,edge" # WIP: current kernel
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3576-nanopi-r76s.dtb"
+BOOT_SCENARIO="spl-blobs"
+SERIALCON="ttyS0"
+IMAGE_PARTITION_TABLE="gpt"
+BOARD_MAINTAINER="SuperKali"
+
+
+function post_family_tweaks__nanopi-r76s_naming_audios() {
+	display_alert "$BOARD" "Renaming NanoPi R76S audio" "info"
+
+	mkdir -p $SDCARD/etc/udev/rules.d/
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi-sound", ENV{SOUND_DESCRIPTION}="HDMI Audio"' > $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	return 0
+}

config/boards/nanopia64.csc

@@ -3,7 +3,7 @@ BOARD_NAME="NanoPi A64"
 BOARDFAMILY="sun50iw1"
 BOARD_MAINTAINER=""
 BOOTCONFIG="nanopi_a64_defconfig"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge,legacy"
 KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 CRUSTCONFIG="a64_defconfig"

config/boards/nanopiair.csc

@@ -9,5 +9,5 @@ DEFAULT_OVERLAYS="usbhost2 usbhost3"
 DEFAULT_CONSOLE="serial"
 SERIALCON="ttyS0,ttyGS0"
 HAS_VIDEO_OUTPUT="no"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge,legacy"
 KERNEL_TEST_TARGET="current"

config/boards/nanopiduo.csc

@@ -9,5 +9,5 @@ DEFAULT_OVERLAYS="usbhost2 usbhost3"
 DEFAULT_CONSOLE="serial"
 HAS_VIDEO_OUTPUT="no"
 SERIALCON="ttyS0,ttyGS0"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge,legacy"
 KERNEL_TEST_TARGET="current"

config/boards/nanopiduo2.csc

@@ -9,7 +9,7 @@ DEFAULT_OVERLAYS="usbhost0 usbhost2 usbhost3"
 DEFAULT_CONSOLE="serial"
 HAS_VIDEO_OUTPUT="no"
 SERIALCON="ttyS0,ttyGS0"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge,legacy"
 KERNEL_TEST_TARGET="current"
 BOOT_FDT_FILE="sun8i-h3-nanopi-duo2.dtb"
 CRUSTCONFIG="nanopi_m1_plus_defconfig"

config/boards/nanopik1plus.csc

@@ -4,6 +4,6 @@ BOARDFAMILY="sun50iw2"
 BOARD_MAINTAINER=""
 BOOTCONFIG="nanopi_k1_plus_defconfig"
 DEFAULT_OVERLAYS="analog-codec"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge,legacy"
 KERNEL_TEST_TARGET="current"
 CRUSTCONFIG="h5_defconfig"

config/boards/nanopim1.eos

@@ -6,5 +6,5 @@ BOOTCONFIG="nanopi_m1_defconfig"
 MODULES_LEGACY="g_serial"
 MODULES_CURRENT="g_serial"
 SERIALCON="ttyS0"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge,legacy"
 

config/boards/nanopim1plus.eos

@@ -6,7 +6,7 @@ BOOTCONFIG="nanopi_m1_plus_defconfig"
 MODULES_LEGACY="g_serial"
 MODULES_CURRENT="g_serial"
 SERIALCON="ttyS0,ttyGS0"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge,legacy"
 
 function post_config_uboot_target__extra_configs_for_nanopi_m1_plus() {
 	display_alert "$BOARD" "set dram clock" "info"

config/boards/nanopim1plus2.eos

@@ -3,5 +3,5 @@ BOARD_NAME="Nanopi M1 Plus 2"
 BOARDFAMILY="sun50iw2"
 BOARD_MAINTAINER=""
 BOOTCONFIG="nanopi_m1_plus2_defconfig"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge,legacy"
 CRUSTCONFIG="h5_defconfig"