feat: Use deb822 APT sources

- Replace `armbian.list` with `armbian.sources`. This holds the same
  information in a newer format, deb822.
- Replace HTTP with HTTPS for Armbian repositories.

.github/CODEOWNERS

@@ -17,12 +17,13 @@ tools/			@iav @neheb @hzyitc @mhoffrog
 
 # The following contents are generated by board configs
 config/boards/aml-a311d-cc.conf		@Tonymac32
+config/boards/aml-c400-plus.tvb		@jomadeto
 config/boards/aml-s905d3-cc.wip		@Tonymac32
 config/boards/aml-s9xx-box.tvb		@SteeManMI
 config/boards/armsom-sige1.csc		@amazingfate
 config/boards/armsom-sige3.csc		@amazingfate
 config/boards/avaota-a1.csc		@chainsx
-config/boards/ayn-odin2.eos		@FantasyGmm
+config/boards/ayn-odin2.csc		@FantasyGmm
 config/boards/bananapi.conf		@DylanHP @janprunk
 config/boards/bananapicm4io.conf		@pyavitz
 config/boards/bananapim2pro.conf		@igorpecovnik
@@ -30,14 +31,16 @@ config/boards/bananapim2s.conf		@jeanrhum @pyavitz
 config/boards/bananapim2zero.csc		@mhawkins-consultant
 config/boards/bananapim3.csc		@AaronNGray
 config/boards/bananapim4zero.conf		@pyavitz
-config/boards/bananapim5.conf		@bretmlw
+config/boards/bananapim5.conf		@igorpecovnik
 config/boards/bananapim64.csc		@devdotnetorg
 config/boards/bananapim7.conf		@amazingfate
 config/boards/bigtreetech-cb1.conf		@JohnTheCoolingFan
+config/boards/bigtreetech-cb2.conf		@JohnTheCoolingFan
 config/boards/cherryba-m1.csc		@IsMrX
 config/boards/clearfogpro.csc		@Heisath
 config/boards/cm3588-nas.csc		@ColorfulRhino
 config/boards/coolpi-cm5.csc		@andyshrk
+config/boards/coolpi-genbook.csc		@andyshrk
 config/boards/firefly-itx-3588j.csc		@SeeleVolleri
 config/boards/fxblox-rk1.csc		@mahdichi
 config/boards/gateway-gz80x.conf		@pyavitz
@@ -72,6 +75,8 @@ 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.csc		@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
@@ -82,16 +87,19 @@ config/boards/nanopi-r6s.conf		@efectn
 config/boards/nanopiair.csc		@1ubuntuuser
 config/boards/nanopiduo.csc		@sgjava
 config/boards/nanopim4v2.conf		@igorpecovnik
+config/boards/nanopineo.csc		@spendist
+config/boards/nanopineo2.csc		@spendist
 config/boards/nanopineocore2.csc		@AGM1968
 config/boards/nanopineoplus2.csc		@teknoid
+config/boards/odroidc1.csc		@juanlufont
 config/boards/odroidc2.conf		@teknoid
 config/boards/odroidc4.conf		@igorpecovnik
 config/boards/odroidhc4.conf		@igorpecovnik
 config/boards/odroidm1.conf		@rpardini
 config/boards/odroidn2.conf		@NicoD-SBC
 config/boards/odroidxu4.conf		@joekhoobyar
-config/boards/olimex-teres-a64.conf		@Kreyren
-config/boards/onecloud.conf		@hzyitc
+config/boards/olimex-teres-a64.csc		@Kreyren
+config/boards/onecloud.csc		@hzyitc
 config/boards/oneplus-kebab.conf		@amazingfate
 config/boards/orangepi4-lts.conf		@paolosabatino
 config/boards/orangepi4.csc		@paolosabatino
@@ -100,13 +108,14 @@ config/boards/orangepi5.conf		@efectn
 config/boards/orangepione.conf		@StephenGraf
 config/boards/orangepipc.csc		@lbmendes
 config/boards/orangepipcplus.csc		@Janmcha
-config/boards/orangepizero2.wip		@AGM1968 @krachlatte
+config/boards/orangepizero2.csc		@AGM1968 @krachlatte
 config/boards/orangepizero2w.csc		@chraac
 config/boards/orangepizero3.csc		@alexl83 @chraac
-config/boards/orangepizeroplus.conf		@schwar3kat
+config/boards/orangepizeroplus.csc		@schwar3kat
 config/boards/phytiumpi.conf		@chainsx
 config/boards/pine64.conf		@PanderMusubi
 config/boards/pinebook-pro.csc		@TRSx80 @ahoneybun
+config/boards/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
@@ -141,7 +150,7 @@ config/boards/sk-tda4vm.conf		@glneo
 config/boards/station-m1.csc		@150balbes
 config/boards/station-m3.csc		@chainsx
 config/boards/sweet-potato.conf		@Tonymac32
-config/boards/thinkpad-x13s.wip		@PeterChrz @rpardini
+config/boards/thinkpad-x13s.conf		@PeterChrz @rpardini
 config/boards/tinkerboard.conf		@paolosabatino
 config/boards/tritium-h3.conf		@Tonymac32
 config/boards/tritium-h5.conf		@Tonymac32
@@ -152,46 +161,44 @@ config/boards/wsl2-x86.csc		@rpardini
 config/boards/x96-mate.tvb		@Ressetkk
 config/boards/x96q.tvb		@sicXnull
 config/boards/xiaomi-elish.conf		@amazingfate
-config/boards/xiaomi-umi.conf		@FantasyGmm
+config/boards/xiaomi-umi.eos		@FantasyGmm
 config/boards/youyeetoo-r1-v3.csc		@SuperKali
 config/kernel/linux-arm64-*.config		@FantasyGmm
 config/kernel/linux-bcm2711-*.config		@PanderMusubi @teknoid
 config/kernel/linux-imx8m-*.config		@schmiedelm
 config/kernel/linux-k3-*.config		@glneo
-config/kernel/linux-meson-*.config		@hzyitc
+config/kernel/linux-meson-*.config		@hzyitc @juanlufont
 config/kernel/linux-meson-s4t7-*.config		@adeepn @rpardini @viraniac
-config/kernel/linux-meson64-*.config		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @bretmlw @clee @engineer-80 @igorpecovnik @jeanrhum @monkaBlyat @pyavitz @rpardini @teknoid
+config/kernel/linux-meson64-*.config		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @clee @engineer-80 @igorpecovnik @jeanrhum @jomadeto @monkaBlyat @pyavitz @rpardini @teknoid
 config/kernel/linux-mvebu-*.config		@Heisath
 config/kernel/linux-odroidxu4-*.config		@joekhoobyar
 config/kernel/linux-phytium-embedded-*.config		@chainsx
 config/kernel/linux-rk35xx-*.config		@ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
 config/kernel/linux-rockchip-*.config		@paolosabatino
-config/kernel/linux-rockchip-rk3588-*.config		@ColorfulRhino @HeyMeco @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @efectn @fridtjof @lanefu @linhz0hz @rpardini @schwar3kat
-config/kernel/linux-rockchip64-*.config		@150balbes @Manouchehri @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @amazingfate @andyshrk @brentr @catalinii @clee @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @paolosabatino @prahal @rpardini @sicXnull @tdleiyao @utlark @vamzii
+config/kernel/linux-rockchip64-*.config		@150balbes @ColorfulRhino @HeyMeco @JohnTheCoolingFan @Manouchehri @SuperKali @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @alexl83 @amazingfate @andyshrk @brentr @catalinii @clee @efectn @fridtjof @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @lanefu @linhz0hz @paolosabatino @prahal @redrathnure @rpardini @schwar3kat @sicXnull @tdleiyao @torte71 @utlark @vamzii
 config/kernel/linux-sm8250-*.config		@FantasyGmm @amazingfate
 config/kernel/linux-sun55iw3-syterkit-*.config		@chainsx
-config/kernel/linux-sunxi-*.config		@1ubuntuuser @AaronNGray @DylanHP @Janmcha @StephenGraf @Tonymac32 @janprunk @lbmendes @mhawkins-consultant @sgjava
-config/kernel/linux-sunxi64-*.config		@AGM1968 @IsMrX @JohnTheCoolingFan @Kreyren @NicoD-SBC @PanderMusubi @Ressetkk @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @krachlatte @pyavitz @schwar3kat @sicXnull @teknoid
+config/kernel/linux-sunxi-*.config		@1ubuntuuser @AaronNGray @DylanHP @Janmcha @StephenGraf @TheSnowfield @Tonymac32 @janprunk @lbmendes @mhawkins-consultant @sgjava @spendist
+config/kernel/linux-sunxi64-*.config		@AGM1968 @IsMrX @JohnTheCoolingFan @Kreyren @NicoD-SBC @PanderMusubi @Ressetkk @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @krachlatte @pyavitz @schwar3kat @sicXnull @spendist @teknoid
 config/kernel/linux-thead-*.config		@chainsx
 config/kernel/linux-uefi-arm64-*.config		@PeterChrz @rpardini
 config/kernel/linux-uefi-x86-*.config		@davidandreoletti @rpardini
 patch/kernel/archive/meson-s4t7-*/		@adeepn @rpardini @viraniac
 patch/kernel/archive/odroidxu4-*/		@joekhoobyar
-patch/kernel/archive/sunxi-*/		@1ubuntuuser @AGM1968 @AaronNGray @DylanHP @IsMrX @Janmcha @JohnTheCoolingFan @Kreyren @NicoD-SBC @PanderMusubi @Ressetkk @StephenGraf @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @janprunk @krachlatte @lbmendes @mhawkins-consultant @pyavitz @schwar3kat @sgjava @sicXnull @teknoid
+patch/kernel/archive/sunxi-*/		@1ubuntuuser @AGM1968 @AaronNGray @DylanHP @IsMrX @Janmcha @JohnTheCoolingFan @Kreyren @NicoD-SBC @PanderMusubi @Ressetkk @StephenGraf @TheSnowfield @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @janprunk @krachlatte @lbmendes @mhawkins-consultant @pyavitz @schwar3kat @sgjava @sicXnull @spendist @teknoid
 patch/kernel/archive/uefi-arm64-*/		@PeterChrz @rpardini
 patch/kernel/archive/uefi-x86-*/		@davidandreoletti @rpardini
 patch/kernel/bcm2711-*/		@PanderMusubi @teknoid
 patch/kernel/imx8m-*/		@schmiedelm
 patch/kernel/k3-*/		@glneo
-patch/kernel/meson-*/		@hzyitc
-patch/kernel/meson64-*/		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @bretmlw @clee @engineer-80 @igorpecovnik @jeanrhum @monkaBlyat @pyavitz @rpardini @teknoid
+patch/kernel/meson-*/		@hzyitc @juanlufont
+patch/kernel/meson64-*/		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @clee @engineer-80 @igorpecovnik @jeanrhum @jomadeto @monkaBlyat @pyavitz @rpardini @teknoid
 patch/kernel/mvebu-*/		@Heisath
 patch/kernel/odroidxu4-*/		@joekhoobyar
 patch/kernel/phytium-embedded-*/		@chainsx
 patch/kernel/rk35xx-vendor-*/		@ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
 patch/kernel/rockchip-*/		@paolosabatino
-patch/kernel/rockchip-rk3588-*/		@ColorfulRhino @HeyMeco @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @efectn @fridtjof @lanefu @linhz0hz @rpardini @schwar3kat
-patch/kernel/rockchip64-*/		@150balbes @Manouchehri @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @amazingfate @andyshrk @brentr @catalinii @clee @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @paolosabatino @prahal @rpardini @sicXnull @tdleiyao @utlark @vamzii
+patch/kernel/rockchip64-*/		@150balbes @ColorfulRhino @HeyMeco @JohnTheCoolingFan @Manouchehri @SuperKali @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @alexl83 @amazingfate @andyshrk @brentr @catalinii @clee @efectn @fridtjof @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @lanefu @linhz0hz @paolosabatino @prahal @redrathnure @rpardini @schwar3kat @sicXnull @tdleiyao @torte71 @utlark @vamzii
 patch/kernel/sm8250-*/		@FantasyGmm @amazingfate
 patch/kernel/sm8550-*/		@FantasyGmm
 patch/kernel/sun55iw3-syterkit-*/		@chainsx
@@ -201,18 +208,17 @@ sources/families/bcm2711.conf		@PanderMusubi @teknoid
 sources/families/imx8m.conf		@schmiedelm
 sources/families/k3.conf		@glneo
 sources/families/meson-s4t7.conf		@adeepn @rpardini @viraniac
-sources/families/meson.conf		@hzyitc
-sources/families/meson64.conf		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @bretmlw @clee @engineer-80 @igorpecovnik @jeanrhum @monkaBlyat @pyavitz @rpardini @teknoid
+sources/families/meson.conf		@hzyitc @juanlufont
+sources/families/meson64.conf		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @clee @engineer-80 @igorpecovnik @jeanrhum @jomadeto @monkaBlyat @pyavitz @rpardini @teknoid
 sources/families/mvebu.conf		@Heisath
 sources/families/odroidxu4.conf		@joekhoobyar
 sources/families/phytium-embedded.conf		@chainsx
 sources/families/rk35xx.conf		@ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
-sources/families/rockchip-rk3588.conf		@ColorfulRhino @HeyMeco @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @efectn @fridtjof @lanefu @linhz0hz @rpardini @schwar3kat
 sources/families/rockchip.conf		@paolosabatino
-sources/families/rockchip64.conf		@150balbes @Manouchehri @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @amazingfate @andyshrk @brentr @catalinii @clee @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @paolosabatino @prahal @rpardini @sicXnull @tdleiyao @utlark @vamzii
+sources/families/rockchip64.conf		@150balbes @ColorfulRhino @HeyMeco @JohnTheCoolingFan @Manouchehri @SuperKali @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @alexl83 @amazingfate @andyshrk @brentr @catalinii @clee @efectn @fridtjof @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @lanefu @linhz0hz @paolosabatino @prahal @redrathnure @rpardini @schwar3kat @sicXnull @tdleiyao @torte71 @utlark @vamzii
 sources/families/sm8250.conf		@FantasyGmm @amazingfate
 sources/families/sun55iw3-syterkit.conf		@chainsx
-sources/families/sunxi.conf		@1ubuntuuser @AaronNGray @DylanHP @Janmcha @StephenGraf @Tonymac32 @janprunk @lbmendes @mhawkins-consultant @sgjava
-sources/families/sunxi64.conf		@AGM1968 @IsMrX @JohnTheCoolingFan @Kreyren @NicoD-SBC @PanderMusubi @Ressetkk @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @krachlatte @pyavitz @schwar3kat @sicXnull @teknoid
+sources/families/sunxi.conf		@1ubuntuuser @AaronNGray @DylanHP @Janmcha @StephenGraf @TheSnowfield @Tonymac32 @janprunk @lbmendes @mhawkins-consultant @sgjava @spendist
+sources/families/sunxi64.conf		@AGM1968 @IsMrX @JohnTheCoolingFan @Kreyren @NicoD-SBC @PanderMusubi @Ressetkk @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @krachlatte @pyavitz @schwar3kat @sicXnull @spendist @teknoid
 sources/families/thead.conf		@chainsx
 sources/families/x86.conf		@davidandreoletti @rpardini

.github/generate_CODEOWNERS.sh

@@ -3,18 +3,24 @@
 SRC="$(realpath "${BASH_SOURCE%/*}/../")"
 
 # Dummy function for successful source
-function display_alert() {
-	:
-}
-function enable_extension() {
-	:
+function display_alert() { :; }
+function enable_extension() { :; }
+function add_packages_to_image() { :; }
+
+function run_hook() {
+	local hook_point="$1"
+	while read -r hook_point_function; do
+		"${hook_point_function}"
+	done < <(compgen -A function | grep "^${hook_point}__" | LC_ALL=C.UTF-8 sort)
 }
 
 # $1: board config
 function generate_for_board() {
 	local board_config="$1"
 	(
+		BOARD="${board_config%.*}"
 		source "${SRC}/config/boards/${board_config}"
+
 		LINUXFAMILY="${BOARDFAMILY}"
 
 		[[ -n "${BOARD_MAINTAINER}" ]] || return
@@ -26,13 +32,18 @@ function generate_for_board() {
 				source "${SRC}/config/sources/common.conf"
 				source "${SRC}/config/sources/${ARCH}.conf"
 
+				run_hook "post_family_config"
+				run_hook "post_family_config_branch_${BRANCH,,}"
+
 				[[ -z $LINUXCONFIG ]] && LINUXCONFIG="linux-${LINUXFAMILY}-${BRANCH}"
-				[[ -z $KERNELPATCHDIR ]] && KERNELPATCHDIR="$LINUXFAMILY-$BRANCH"
+				[[ -z $KERNELPATCHDIR ]] && KERNELPATCHDIR="archive/${LINUXFAMILY}-${KERNEL_MAJOR_MINOR}"
+				[[ -z $BOOTPATCHDIR ]] && BOOTPATCHDIR="u-boot-${LINUXFAMILY}"
+				[[ -z $ATFPATCHDIR ]] && ATFPATCHDIR="atf-${LINUXFAMILY}"
 
 				cat <<-EOF
 					config/boards/${board_config}			${maintainers}
 					config/kernel/${LINUXCONFIG%-*}-*.config	${maintainers}
-					sources/families/${LINUXFAMILY}.conf		${maintainers}
+					sources/families/${BOARDFAMILY}.conf		${maintainers}
 					patch/kernel/${KERNELPATCHDIR%-*}-*/		${maintainers}
 				EOF
 
@@ -41,6 +52,16 @@ function generate_for_board() {
 					patch_archive="${patch_archive%/}"
 					echo "patch/kernel/${patch_archive%-*}-*/	${maintainers}"
 				fi
+
+				if [[ -n "${BOOTCONFIG}" && "${BOOTCONFIG}" != "none" ]]; then
+					while read -r d; do
+						echo "patch/u-boot/${d}/		${maintainers}"
+					done < <(echo "${BOOTPATCHDIR}" | xargs -n1)
+				fi
+
+				if [[ -n "${ATFSOURCE}" && "${ATFSOURCE}" != "none" ]]; then
+					echo "patch/atf/${ATFPATCHDIR}/			${maintainers}"
+				fi
 			)
 		done < <(echo "${KERNEL_TARGET}" | tr ',' '\n')
 	)
@@ -68,9 +89,9 @@ function merge() {
 	local file
 	while read -r file; do
 		declare -a maintainers
-		readarray -t maintainers < <(echo "${codeowners["$file"]}" | xargs -n1 | sort -u)
+		readarray -t maintainers < <(echo "${codeowners["$file"]}" | xargs -n1 | LC_ALL=C.UTF-8 sort -u)
 		echo "${file}		${maintainers[*]}"
-	done < <(printf "%s\n" "${!codeowners[@]}" | sort)
+	done < <(printf "%s\n" "${!codeowners[@]}" | LC_ALL=C.UTF-8 sort)
 }
 
 cat <<-EOF >"${SRC}/.github/CODEOWNERS"

.github/workflows/scorecard.yml

@@ -52,7 +52,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
         with:
           name: SARIF file
           path: results.sarif

.github/workflows/update-tools.yml

@@ -81,13 +81,6 @@ jobs:
           version_latest=$(curl --silent "https://api.github.com/repos/${{ matrix.tool.PROJECT_NAME }}/releases/latest" | jq -r .tag_name)
           version_latest=${version_latest#v}                        # Removing the 'v' prefix since the script uses only plain numbers
           echo "version_latest=$version_latest" >> $GITHUB_OUTPUT                                                                                
-          {
-            echo "CHANGE_LOG<<EOFFEOFFF42"                          # Has to be a unique delimiter that doesn't appear in the changelog itself
-            curl --silent "https://api.github.com/repos/${{ matrix.tool.PROJECT_NAME }}/releases/latest" | jq -r .body \
-            | sed -E -e 's/(#([0-9]+))/${{ matrix.tool.USER_NAME }}\/${{ matrix.tool.REPO_NAME }}\1/g' \
-            -e 's/https\:\/\/github\.com/https\:\/\/redirect.github.com/g'
-            echo "EOFFEOFFF42"
-          } >> "$GITHUB_ENV"
 
       - name: Update ${{ matrix.tool.VERSION_VAR}} in script
         # @TODO Make sure that the version is actually higher, not lower (the 'latest' tag does not neccessarily mean that the version is higher!)
@@ -106,13 +99,6 @@ jobs:
           body: |
             Bump [${{ matrix.tool.PROJECT_NAME}}](https://github.com/${{ matrix.tool.PROJECT_NAME }}) from ${{ steps.get-version-current.outputs.version_current }} to ${{ steps.get-version-latest.outputs.version_latest }} by bumping `${{ matrix.tool.VERSION_VAR}}` in `${{ matrix.tool.VAR_FILE}}`.
 
-            <details><summary><b>Release notes</b></summary>
-            <p><em>Sourced from <a href="https://github.com/${{ matrix.tool.PROJECT_NAME }}/releases">${{ matrix.tool.PROJECT_NAME }}'s releases</a>.
-            <br>Please note that this only shows the release notes for the latest release.</em></p>
-            <blockquote>
-
-            ${{ env.CHANGE_LOG }}
-
-            </blockquote>
-            </details>
+            Check <a href="https://github.com/${{ matrix.tool.PROJECT_NAME }}/releases/latest">the upstream release notes</a>.
+            <p><em>Please note that the above link only shows the release notes for the latest release.</em></p>
           labels: Dependencies, Bash

VERSION

@@ -1 +1 @@
-24.11.0-trunk
+25.05.0-trunk

action.yml

@@ -87,6 +87,10 @@ inputs:
     required: false
     default: "Build with [Armbian tools](https://github.com/armbian/build)"
 
+  armbian_release_tag:
+    description: "Armbian release tag"
+    required: false
+
 runs:
   using: "composite"
 
@@ -122,7 +126,7 @@ runs:
       uses: actions/checkout@v4
       with:
         repository: armbian/build
-        fetch-depth: 0
+        ref: ${{ inputs.armbian_branch }}
         clean: false
         path: build
 
@@ -163,9 +167,8 @@ runs:
           DESKTOP_ENVIRONMENT_CONFIG_NAME="config_base"
         fi
 
-        # go to build folder and checkout
+        # go to build folder
         cd build
-        git checkout ${{ inputs.armbian_branch }}
 
         # execute build command
         ./compile.sh "${{ inputs.armbian_target }}" \
@@ -194,7 +197,7 @@ runs:
 
     - uses: ncipollo/release-action@v1
       with:
-        tag: "${{ env.ARMBIAN_VERSION }}"
+        tag: ${{ inputs.armbian_release_tag != '' && inputs.armbian_release_tag || env.ARMBIAN_VERSION }}
         name: "${{ inputs.armbian_release_tittle }}"
         artifacts: "${{ inputs.armbian_artifacts }}*"
         allowUpdates: true

config/boards/aml-c400-plus.conf

@@ -0,0 +1,50 @@
+# Amlogic S912 octa core 3Gb RAM SoC eMMC
+BOARD_NAME="Magicsee C400 Plus"
+BOARDFAMILY="meson-gxl"
+BOARD_MAINTAINER="jomadeto"
+BOOTSIZE="512"
+BOOTFS_TYPE="fat"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
+SERIALCON="ttyAML0"
+FULL_DESKTOP="yes"
+ASOUND_STATE="asound.state.mesongx"
+BOOT_FDT_FILE="amlogic/meson-gxm-c400-plus.dtb"
+BOOT_LOGO="desktop"
+SRC_EXTLINUX="no"
+SRC_CMDLINE='rootflags=data=writeback console=ttyAML0,115200n8 console=tty0'
+
+function post_family_config__uboot_aml-c400-plus() {
+	# This board type relies on the vendor installed u-boot on emmc to boot
+	display_alert "$BOARD" "Configuring ($BOARD) non-u-boot" "info"
+	unset BOOTSOURCE
+	declare -g BOOTCONFIG='none'
+}
+
+function post_family_tweaks_bsp__config_aml-c400-plus_bsp() {
+	: "${destination:?destination is not set}"
+
+	# Important: this board has board-specific bsp-cli files in config/optional/boards/aml-c400-plus/_packages/bsp-cli
+	#            that path is hashed by the bsp-cli hashing function automatically
+	display_alert "${BOARD}" "Adjusting perms of bsp-cli files for ${BOARD} in /root" "info"
+	run_host_command_logged chmod -v 744 "${destination}"/root/install-aml.sh
+	run_host_command_logged chmod -v 644 "${destination}"/root/fstab.template
+
+	display_alert "${BOARD}" "Removing armbian-install" "info"
+	run_host_command_logged rm -v "${destination}"/usr/bin/armbian-install
+
+	display_alert "${BOARD}" "Adding bsp-cli preinst logic" "info"
+	# Inline function! So this function is automatically hashed when this hook is hashed.
+	function aml-c400-plus-bsp-cli-preinst() {
+		#update of the board bsp-cli package fails because the filesystem type is
+		#fat and dpkg tries to create a hard link for the existing files as backup
+		#so rm the files instead in a preinst step
+		[ -f /boot/armbianEnv.txt ] && rm /boot/armbianEnv.txt
+		[ -f /boot/aml_autoscript ] && rm /boot/aml_autoscript
+		[ -f /boot/emmc_autoscript ] && rm /boot/emmc_autoscript
+		return 0 # short-circuits above, avoid errors
+	}
+	preinst_functions+=('aml-c400-plus-bsp-cli-preinst')
+	if false; then aml-c400-plus-bsp-cli-preinst; fi # so shellcheck stops complaining the function is unused. sorry
+
+}

config/boards/aml-s805-mxq.tvb

@@ -0,0 +1,14 @@
+# MXQ TV box based on Amlogic S805 quad core 1GB RAM SoC GBE
+BOARD_NAME="MXQ"
+BOARDFAMILY="meson8b"
+BOARD_MAINTAINER=""
+KERNEL_TARGET="current"
+KERNEL_TEST_TARGET="current"
+BOOTCONFIG="none"
+BOOTSCRIPT="boot-aml-s805-mxq.cmd:boot.cmd"
+# The preinstalled U-BOOT looks for this script
+BOOTSCRIPT_OUTPUT="s805_autoscript"
+BOOTENV_FILE="aml-s805-mxq.txt"
+
+BOOTSIZE="200"
+BOOTFS_TYPE="fat"

config/boards/armsom-cm5-io.csc

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

config/boards/armsom-cm5-rpi-cm4-io.csc

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

config/boards/armsom-sige5.csc

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

config/boards/armsom-sige7.csc

@@ -3,7 +3,7 @@ BOARD_NAME="ArmSoM Sige7"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER=""
 BOOTCONFIG="armsom-sige7-rk3588_defconfig"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-armsom-sige7.dtb"

config/boards/avaota-a1.csc

@@ -13,9 +13,9 @@ declare -g SYTERKIT_BOARD_ID="avaota-a1" # This _only_ used for syterkit-allwinn
 
 function post_family_tweaks__avaota-a1() {
 	display_alert "Applying boot blobs"
-	cp -v "$SRC/packages/blobs/sunxi/sun50iw3/bl31.bin" "$SDCARD/boot/bl31.bin"
-	cp -v "$SRC/packages/blobs/sunxi/sun50iw3/scp.bin" "$SDCARD/boot/scp.bin"
-	cp -v "$SRC/packages/blobs/sunxi/sun50iw3/splash.bin" "$SDCARD/boot/splash.bin"
+	cp -v "$SRC/packages/blobs/sunxi/sun55iw3/bl31.bin" "$SDCARD/boot/bl31.bin"
+	cp -v "$SRC/packages/blobs/sunxi/sun55iw3/scp.bin" "$SDCARD/boot/scp.bin"
+	cp -v "$SRC/packages/blobs/sunxi/sun55iw3/splash.bin" "$SDCARD/boot/splash.bin"
 
 	display_alert "Applying wifi firmware"
 	pushd "$SDCARD/lib/firmware"

config/boards/ayn-odin2.csc

@@ -19,7 +19,7 @@ declare -g DESKTOP_AUTOLOGIN="yes"
 function post_family_config_branch_sm8550__edk2_kernel() {
 	declare -g KERNELSOURCE='https://github.com/edk2-porting/linux-next'
 	declare -g KERNEL_MAJOR_MINOR="6.7" # Major and minor versions of this kernel.
-	declare -g KERNELBRANCH="branch:integration/ayn-odin2"
+	declare -g KERNELBRANCH="branch:ci/odin2/stable"
 	declare -g LINUXCONFIG="linux-${ARCH}-${BRANCH}" # for this board: linux-arm64-sm8550
 	display_alert "Setting up kernel ${KERNEL_MAJOR_MINOR} for" "${BOARD}" "info"
 }
@@ -43,12 +43,8 @@ function post_family_tweaks__enable_services() {
 	fi
 
 	# We need unudhcpd from armbian repo, so enable it
-	mv "${SDCARD}"/etc/apt/sources.list.d/armbian.list.disabled "${SDCARD}"/etc/apt/sources.list.d/armbian.list
+	mv "${SDCARD}"/etc/apt/sources.list.d/armbian.sources.disabled "${SDCARD}"/etc/apt/sources.list.d/armbian.sources
 
-	# Add zink env
-	echo '__GLX_VENDOR_LIBRARY_NAME=mesa' | tee -a "${SDCARD}"/etc/environment
-	echo 'MESA_LOADER_DRIVER_OVERRIDE=zink' | tee -a "${SDCARD}"/etc/environment
-	echo 'GALLIUM_DRIVER=zink' | tee -a "${SDCARD}"/etc/environment
 	# Add Gamepad udev rule
 	echo 'SUBSYSTEM=="input", ATTRS{name}=="Ayn Odin2 Gamepad", MODE="0666", ENV{ID_INPUT_MOUSE}="0", ENV{ID_INPUT_JOYSTICK}="1"' > "${SDCARD}"/etc/udev/rules.d/99-ignore-gamepad.rules
 	# No driver support for suspend
@@ -63,7 +59,7 @@ function post_family_tweaks__enable_services() {
 	do_with_retries 3 chroot_sdcard_apt_get_install alsa-ucm-conf unudhcpd mkbootimg git
 
 	# Disable armbian repo back
-	mv "${SDCARD}"/etc/apt/sources.list.d/armbian.list "${SDCARD}"/etc/apt/sources.list.d/armbian.list.disabled
+	mv "${SDCARD}"/etc/apt/sources.list.d/armbian.sources "${SDCARD}"/etc/apt/sources.list.d/armbian.sources.disabled
 	do_with_retries 3 chroot_sdcard_apt_get_update
 
 	do_with_retries 3 chroot_sdcard_apt_get_install mesa-vulkan-drivers qbootctl qrtr-tools protection-domain-mapper tqftpserv
@@ -137,7 +133,7 @@ function post_family_tweaks_bsp__firmware_in_initrd() {
 		# Extra one for bt
 		for f in /lib/firmware/qca/* ; do
 			add_firmware "${f#/lib/firmware/}"
-		done 
+		done
 	FIRMWARE_HOOK
 	run_host_command_logged chmod -v +x "${file_added_to_bsp_destination}"
 }

config/boards/bananapicm4io.conf

@@ -10,8 +10,8 @@ FULL_DESKTOP="yes"
 SERIALCON="ttyAML0"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="amlogic/meson-g12b-bananapi-cm4-cm4io.dtb"
-BOOTBRANCH_BOARD="tag:v2024.07"
-BOOTPATCHDIR="v2024.07"
+BOOTBRANCH_BOARD="tag:v2025.01"
+BOOTPATCHDIR="v2025.01"
 
 function post_family_tweaks_bsp__bananapi_rtl_bt() {
 	if [[ -d "$SRC/packages/bsp/bananapi/rtl_bt" ]]; then

config/boards/bananapif3.conf

@@ -1,18 +1,17 @@
 # SpacemiT K1 octa core RISC-V SoC 2GB/4GB RAM 8GB/16GB eMMC 4x USB3 2x GbE
-BOARD_NAME="Banana Pi F3"
+BOARD_NAME="BananaPi BPI-F3"
 BOARDFAMILY="spacemit"
-BOARD_MAINTAINER=""
-KERNEL_TARGET="legacy,current"
-KERNEL_TEST_TARGET="legacy"
+BOARD_MAINTAINER="pyavitz"
+KERNEL_TARGET="current"
 BOOT_FDT_FILE="spacemit/k1-bananapi-f3.dtb"
 BOOTDELAY=1
 SRC_EXTLINUX="yes"
-SRC_CMDLINE="earlycon=sbi console=tty1 console=ttyS0,115200 clk_ignore_unused swiotlb=65536"
+SRC_CMDLINE="earlycon=sbi console=tty1 console=ttyS0,115200"
 PACKAGE_LIST_BOARD="rfkill bluetooth bluez bluez-tools"
 
 function post_config_uboot_target__extra_configs_for_bananapi_f3() {
 	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

config/boards/bananapim2s.conf

@@ -10,8 +10,8 @@ FULL_DESKTOP="yes"
 SERIALCON="ttyAML0"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="amlogic/meson-g12b-a311d-bananapi-m2s.dtb"
-BOOTBRANCH_BOARD="tag:v2024.07"
-BOOTPATCHDIR="v2024.07"
+BOOTBRANCH_BOARD="tag:v2025.01"
+BOOTPATCHDIR="v2025.01"
 
 function post_family_tweaks_bsp__bananapi_rtl_bt() {
 	if [[ -d "$SRC/packages/bsp/bananapi/rtl_bt" ]]; then

config/boards/bananapim4berry.wip

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

config/boards/bananapim4zero.conf

@@ -4,7 +4,7 @@ BOARDFAMILY="sun50iw9-bpi"
 BOARD_MAINTAINER="pyavitz"
 BOOTCONFIG="bananapi_m4zero_defconfig"
 OVERLAY_PREFIX="sun50i-h616"
-BOOT_FDT_FILE="allwinner/sun50i-h618-bananapi-m4-zero.dtb"
+BOOT_FDT_FILE="sun50i-h618-bananapi-m4-zero.dtb"
 BOOT_LOGO="desktop"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"

config/boards/bananapim5.conf

@@ -1,7 +1,7 @@
 # Amlogic S905X3 quad core 2-4GB RAM SoC eMMC GBE USB3 SPI
 BOARD_NAME="Banana Pi M5"
 BOARDFAMILY="meson-sm1"
-BOARD_MAINTAINER="bretmlw"
+BOARD_MAINTAINER="igorpecovnik"
 BOOTCONFIG="bananapi-m5_defconfig"
 BOOT_FDT_FILE="amlogic/meson-sm1-bananapi-m5.dtb"
 KERNEL_TARGET="current,edge"

config/boards/bananapim7.conf

@@ -3,6 +3,6 @@ BOARD_NAME="Banana Pi M7"
 BOARD_MAINTAINER="amazingfate"
 BOOT_FDT_FILE="rockchip/rk3588-bananapi-m7.dtb"
 # Those are included in armsom-sige7.csc, but this file is parsed directly by the JSON matrix generator and thus those need to be in here
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="vendor,current"
 BOARDFAMILY="rockchip-rk3588"

config/boards/bigtreetech-cb1.conf

@@ -10,4 +10,4 @@ FORCE_BOOTSCRIPT_UPDATE="yes"
 BOOTFS_TYPE="fat"
 BOOT_FS_LABEL="BOOT"
 OVERLAY_PREFIX="sun50i-h616"
-BOOT_FDT_FILE="allwinner/sun50i-h616-bigtreetech-cb1-sd.dtb"
+BOOT_FDT_FILE="sun50i-h616-bigtreetech-cb1-sd.dtb"

config/boards/bigtreetech-cb2.conf

@@ -0,0 +1,48 @@
+# Rockchip RK3566 quad core 2GB-8GB GBE eMMC NVMe USB3 WiFi
+BOARD_NAME="BigTreeTech CB2"
+BOARDFAMILY="rockchip64"
+BOARD_MAINTAINER="JohnTheCoolingFan"
+BOOTCONFIG="bigtreetech-cb2-rk3566_defconfig"
+BOOT_SOC="rk3566"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
+BOOT_FDT_FILE="rockchip/rk3566-bigtreetech-cb2.dtb"
+IMAGE_PARTITION_TABLE="gpt"
+BOOT_SCENARIO="spl-blobs"
+OVERLAY_PREFIX='rk3566'
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+
+# TODO: replace with BOOT_SCENARIO=binman when it gets merged and in good shape
+function post_family_config__bigtreetech-cb2_uboot_overrides() {
+	display_alert "$BOARD" "mainline u-boot overrides" "info"
+
+	DDR_BLOB="rk35/rk3566_ddr_1056MHz_v1.21.bin"
+	BL31_BLOB="rk35/rk3568_bl31_v1.44.elf" # NOT a typo, bl31 is shared across 68 and 66
+
+	declare -g BOOTDELAY=1                            # Wait for UART interrupt to enter UMS/RockUSB mode etc
+	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"
+	declare -g BOOTBRANCH="tag:v2024.10"
+	declare -g BOOTPATCHDIR="v2024.10/board_bigtreetech-cb2"
+	#declare -g BOOTDIR="u-boot-${BOARD}"
+	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already
+
+	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
+	function write_uboot_platform() {
+		dd "if=${1}/u-boot-rockchip.bin" "of=${2}" bs=32k seek=1 conv=notrunc
+	}
+
+	function write_uboot_platform_mtd() {
+		declare -a extra_opts_flashcp=("--verbose")
+		if flashcp -h | grep -q -e '--partition'; then
+			echo "Confirmed flashcp supports --partition -- read and write only changed blocks." >&2
+			extra_opts_flashcp+=("--partition")
+		else
+			echo "flashcp does not support --partition, will write full SPI flash blocks." >&2
+		fi
+		flashcp "${extra_opts_flashcp[@]}" "${1}/u-boot-rockchip-spi.bin" /dev/mtd0
+	}
+}
+
+# vim: ft=bash

config/boards/cherryba-m1.csc

@@ -1,4 +1,4 @@
- # Allwinner H618 quad core 1GB 2GB 4GB RAM SoC WiFi USB-C emmc
+# Allwinner H618 quad core 1GB 2GB 4GB RAM SoC WiFi USB-C emmc
 BOARD_NAME="CherryBa M1"
 BOARDFAMILY="sun50iw9"
 BOOTCONFIG="cherryba-m1_defconfig"

config/boards/cm3588-nas.csc

@@ -4,12 +4,13 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="ColorfulRhino"
 BOOTCONFIG="cm3588-nas-rk3588_defconfig" # Mainline defconfig, enables booting from NVMe
 BOOT_SOC="rk3588"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 IMAGE_PARTITION_TABLE="gpt"
 BOOT_FDT_FILE="rockchip/rk3588-friendlyelec-cm3588-nas.dtb"
 BOOT_SCENARIO="spl-blobs"
+UEFI_EDK2_BOARD_ID="nanopc-cm3588-nas" # This _only_ used for uefi-edk2-rk3588 extension; cm3588-nas was introduced in v0.12 of edk2-porting/edk2-rk3588
 
 function post_family_tweaks__cm3588_nas_udev_naming_audios() {
 	display_alert "$BOARD" "Renaming CM3588 audio interfaces to human-readable form" "info"
@@ -42,17 +43,73 @@ function post_family_config__cm3588_nas_use_mainline_uboot() {
 
 	declare -g BOOTDELAY=1                                       # Wait for UART interrupt to enter UMS/RockUSB mode etc
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
-	declare -g BOOTBRANCH="tag:v2024.10"
-	declare -g BOOTPATCHDIR="v2024.10"
-	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency
-
+	declare -g BOOTBRANCH="tag:v2025.01"
+	declare -g BOOTPATCHDIR="v2025.01"
+	declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
 	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"
-
-	# Disable stuff from rockchip64_common; we're using binman here which does all the work already
-	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # Disable stuff from rockchip64_common; we're using binman here which does all the work
 
 	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
 	function write_uboot_platform() {
 		dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
 	}
 }
+
+function pre_config_uboot_target__cm3588_patch_uboot_dtsi_for_ums() {
+	display_alert "u-boot for ${BOARD}" "u-boot: add to u-boot dtsi for UMS" "info" # avoid a patch, just append to the dtsi file
+	cat <<- UBOOT_BOARD_DTSI_OTG >> arch/arm/dts/rk3588-friendlyelec-cm3588-nas-u-boot.dtsi
+		&u2phy0 { status = "okay"; };
+		&u2phy0_otg { status = "okay"; };
+		&usbdp_phy0 { status = "okay"; };
+		&usb_host0_xhci { dr_mode = "peripheral";  maximum-speed = "high-speed";  status = "okay"; };
+	UBOOT_BOARD_DTSI_OTG
+}
+
+# "rockchip-common: boot SD card first, then NVMe, then mmc"
+# include/configs/rockchip-common.h
+# -#define BOOT_TARGETS "mmc1 mmc0 nvme scsi usb pxe dhcp spi"
+# +#define BOOT_TARGETS "mmc0 nvme mmc1 scsi usb pxe dhcp spi"
+# On cm3588-nas, mmc0 is the eMMC, mmc1 is the SD card slot
+function pre_config_uboot_target__cm3588_patch_rockchip_common_boot_order() {
+	declare -a rockchip_uboot_targets=("mmc1" "nvme" "mmc0" "scsi" "usb" "pxe" "dhcp" "spi") # for future make-this-generic delight
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: adjust boot order to '${rockchip_uboot_targets[*]}'" "info"
+	sed -i -e "s/#define BOOT_TARGETS.*/#define BOOT_TARGETS \"${rockchip_uboot_targets[*]}\"/" include/configs/rockchip-common.h
+	regular_git diff -u include/configs/rockchip-common.h || true
+}
+
+function post_config_uboot_target__extra_configs_for_cm3588-nas_uboot() {
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable preboot & flash user LED in preboot" "info"
+	run_host_command_logged scripts/config --enable CONFIG_USE_PREBOOT
+	run_host_command_logged scripts/config --set-str CONFIG_PREBOOT "'led led-1 on; sleep 0.1; led led-1 off'" # double quotes required due to run_host_command_logged's quirks
+
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable EFI debugging commands" "info"
+	run_host_command_logged scripts/config --enable CMD_EFIDEBUG
+	run_host_command_logged scripts/config --enable CMD_NVEDIT_EFI
+
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable more compression support" "info"
+	run_host_command_logged scripts/config --enable CONFIG_LZO
+	run_host_command_logged scripts/config --enable CONFIG_BZIP2
+	run_host_command_logged scripts/config --enable CONFIG_ZSTD
+
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable gpio LED support" "info"
+	run_host_command_logged scripts/config --enable CONFIG_LED
+	run_host_command_logged scripts/config --enable CONFIG_LED_GPIO
+
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable networking cmds" "info"
+	run_host_command_logged scripts/config --enable CONFIG_CMD_NFS
+	run_host_command_logged scripts/config --enable CONFIG_CMD_WGET
+	run_host_command_logged scripts/config --enable CONFIG_CMD_DNS
+	run_host_command_logged scripts/config --enable CONFIG_PROT_TCP
+	run_host_command_logged scripts/config --enable CONFIG_PROT_TCP_SACK
+
+	# UMS, RockUSB, gadget stuff
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable UMS/RockUSB gadget" "info"
+	declare -a enable_configs=("CONFIG_CMD_USB_MASS_STORAGE" "CONFIG_USB_GADGET" "USB_GADGET_DOWNLOAD" "CONFIG_USB_FUNCTION_ROCKUSB" "CONFIG_USB_FUNCTION_ACM" "CONFIG_CMD_ROCKUSB" "CONFIG_CMD_USB_MASS_STORAGE")
+	for config in "${enable_configs[@]}"; do
+		run_host_command_logged scripts/config --enable "${config}"
+	done
+	# Auto-enabled by the above, force off...
+	run_host_command_logged scripts/config --disable USB_FUNCTION_FASTBOOT
+
+	return 0
+}

config/boards/coolpi-cm5.csc

@@ -20,7 +20,7 @@ function post_family_config_branch_edge__coolpi-cm5_use_mainline_uboot() {
 
 	declare -g BOOTSOURCE="https://github.com/Kwiboo/u-boot-rockchip.git" # Kwiboo U-Boot
 	unset BOOTBRANCH
-	unset BOOTPATCHDIR
+	declare -g BOOTPATCHDIR="v2024.07-coolpi-cm5"
 	declare -g BOOTBRANCH_BOARD="tag:v2024.07"
 	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"

config/boards/coolpi-genbook.csc

@@ -0,0 +1,36 @@
+# Rockchip RK3588 SoC octa core 4-16GB SoC eMMC USB3 NVME
+BOARD_NAME="CoolPi GenBook"
+BOARDFAMILY="rockchip-rk3588"
+BOARD_MAINTAINER="andyshrk"
+BOARD_FIRMWARE_INSTALL="-full"
+BOOT_SOC="rk3588"
+BOOTCONFIG="coolpi-cm5-genbook-rk3588_defconfig"
+KERNEL_TARGET="edge"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3588-coolpi-cm5-genbook.dtb"
+BOOT_SCENARIO="spl-blobs"
+BOOT_SUPPORT_SPI="yes"
+BOOT_SPI_RKSPI_LOADER="yes"
+IMAGE_PARTITION_TABLE="gpt"
+
+# Mainline U-Boot
+function post_family_config_branch_edge__coolpi-genbook_use_mainline_uboot() {
+	display_alert "$BOARD" "mainline (next branch) u-boot overrides for $BOARD / $BRANCH" "info"
+
+	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # Mainline U-Boot
+	unset BOOTBRANCH
+	declare -g BOOTPATCHDIR="v2025.01-rc3-coolpi-cm5"
+	declare -g BOOTBRANCH_BOARD="tag:v2025.01"
+	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already
+
+	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
+	function write_uboot_platform() {
+		dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
+	}
+
+	function write_uboot_platform_mtd() {
+		flashcp -v -p "$1/u-boot-rockchip-spi.bin" /dev/mtd0
+	}
+}

config/boards/dshanpi-r1.csc

@@ -0,0 +1,30 @@
+# Rockchip RK3568 quad core 1-8GB SoC GBe eMMC USB3
+BOARD_NAME="100ASK DShanPI R1"
+BOARDFAMILY="rk35xx"
+BOARD_MAINTAINER=""
+BOOTCONFIG="dshanpi-r1-rk3568_defconfig"
+KERNEL_TARGET="vendor"
+KERNEL_TEST_TARGET="vendor"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3568-dshapi-r1.dtb"
+BOOT_SCENARIO="spl-blobs"
+IMAGE_PARTITION_TABLE="gpt"
+
+function post_family_config__dshanpi-r1_use_mainline_uboot() {
+	display_alert "$BOARD" "Mainline U-Boot overrides for $BOARD - $BRANCH" "info"
+	unset BOOTFS_TYPE # fixes armbian-install and unneeded for modern uboot anyway
+	declare -g BOOTCONFIG="dshanpi-r1-rk3568_defconfig"
+	declare -g BOOTDELAY=1
+	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot"
+	declare -g BOOTBRANCH="tag:v2024.10"
+	declare -g BOOTPATCHDIR="v2024.10"
+	declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
+	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already
+
+	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
+	function write_uboot_platform() {
+		dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
+	}
+}

config/boards/gateway-gz80x.conf

@@ -5,8 +5,8 @@ BOARD_MAINTAINER="pyavitz"
 BOOTCONFIG="amper_gateway_am-gz80x_defconfig"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
-BOOTBRANCH_BOARD="tag:v2024.07"
-BOOTPATCHDIR="v2024.07"
+BOOTBRANCH_BOARD="tag:v2025.01"
+BOOTPATCHDIR="v2025.01"
 BOOT_FDT_FILE="amlogic/meson-axg-amper-gateway-am-gz80x.dtb"
 SRC_EXTLINUX="yes"
 SRC_CMDLINE="console=ttyAML0,115200n8 clk_ignore_unused loglevel=7"

config/boards/h96-tvbox-3566.tvb

@@ -2,29 +2,25 @@
 BOARD_NAME="h96-tvbox-3566"
 BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER="hqnicolas"
-BOOTCONFIG="rk3568_defconfig"
-KERNEL_TARGET="current,edge"
-FULL_DESKTOP="yes"
-BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3566-h96-tvbox.dtb"
+BOOT_LOGO="desktop"
+BOOT_SCENARIO="spl-blobs"
+FULL_DESKTOP="yes"
 IMAGE_PARTITION_TABLE="gpt"
+KERNEL_TARGET="current,edge"
+
+DDR_BLOB="rk35/rk3568_ddr_1560MHz_v1.21.bin"
+BL31_BLOB="rk35/rk3568_bl31_v1.44.elf"
 
 # Mainline U-Boot
 function post_family_config__h96_max_use_mainline_uboot() {
 	display_alert "$BOARD" "Using mainline U-Boot for $BOARD / $BRANCH" "info"
-
-	declare -g BOOTCONFIG="generic-rk3568_defconfig"             # Use generic defconfig which should boot all RK3568 boards
-	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
-	declare -g BOOTBRANCH="tag:v2024.07"
-	declare -g BOOTPATCHDIR="v2024.07/board_${BOARD}"
-	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency
-
-	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"
-
-	# Disable stuff from rockchip64_common; we're using binman here which does all the work already
+	declare -g BOOTCONFIG="h96max-v56_defconfig"
+	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"
+	declare -g BOOTBRANCH="tag:v2025.01"
+	declare -g BOOTPATCHDIR="v2025.01/board_${BOARD}"
+	declare -g UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB ROCKCHIP_TPL=$RKBIN_DIR/$DDR_BLOB;;u-boot-rockchip.bin"
 	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
-
-	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
 	function write_uboot_platform() {
 		dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
 	}

config/boards/hinlink-h66k.csc

@@ -3,7 +3,8 @@ BOARD_NAME="Hinlink H66K"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER=""
 BOOTCONFIG="radxa-e25-rk3568_defconfig"
-KERNEL_TARGET="vendor"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3568-hinlink-h66k.dtb"

config/boards/hinlink-h68k.csc

@@ -3,7 +3,8 @@ BOARD_NAME="Hinlink H68K"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER=""
 BOOTCONFIG="radxa-e25-rk3568_defconfig"
-KERNEL_TARGET="vendor"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3568-hinlink-h68k.dtb"

config/boards/hinlink-h88k.csc

@@ -24,3 +24,15 @@ function post_family_tweaks__hinlink_h88k_naming_audios() {
 
 	return 0
 }
+
+function post_family_tweaks_bsp__hinlink_h88k_bsp_firmware_in_initrd() {
+	display_alert "Adding to bsp-cli" "${BOARD}: firmware in initrd" "info"
+	declare file_added_to_bsp_destination # will be filled in by add_file_from_stdin_to_bsp_destination
+	add_file_from_stdin_to_bsp_destination "/etc/initramfs-tools/hooks/hinlink-h88k-firmware" <<- 'FIRMWARE_HOOK'
+		#!/bin/bash
+		[[ "$1" == "prereqs" ]] && exit 0
+		. /usr/share/initramfs-tools/hook-functions
+		add_firmware "hinlink-h88k-240x135-lcd.bin" # firmware for 240x135 spi lcd
+	FIRMWARE_HOOK
+	run_host_command_logged chmod -v +x "${file_added_to_bsp_destination}"
+}

config/boards/hinlink-hnas.csc

@@ -3,7 +3,8 @@ BOARD_NAME="Hinlink HNAS"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER=""
 BOOTCONFIG="radxa-e25-rk3568_defconfig"
-KERNEL_TARGET="vendor"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3568-hinlink-hnas.dtb"

config/boards/indiedroid-nova.csc

@@ -4,7 +4,7 @@ declare -g BOARD_MAINTAINER="lanefu"
 declare -g BOARDFAMILY="rockchip-rk3588"
 declare -g BOOTCONFIG="indiedroid_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 declare -g BOOT_SOC="rk3588"
-declare -g KERNEL_TARGET="edge,current,vendor"
+declare -g KERNEL_TARGET="current,edge,vendor"
 declare -g FULL_DESKTOP="yes"
 declare -g BOOT_LOGO="desktop"
 declare -g BOOT_FDT_FILE="rockchip/rk3588s-indiedroid-nova.dtb"

config/boards/inovato-quadra.conf

@@ -4,7 +4,7 @@ BOARDFAMILY="sun50iw6"
 BOARD_MAINTAINER="NicoD-SBC"
 BOOTCONFIG="tanix_tx6_defconfig"
 CRUSTCONFIG="tanix_tx6_defconfig"
-BOOT_FDT_FILE="allwinner/sun50i-h6-inovato-quadra.dtb"
+BOOT_FDT_FILE="sun50i-h6-inovato-quadra.dtb"
 KERNEL_TARGET="legacy,current,edge"
 KERNEL_TEST_TARGET="current"
 BOOT_LOGO="desktop"

config/boards/khadas-edge2.conf

@@ -3,7 +3,7 @@ declare -g BOARD_NAME="Khadas Edge2"
 declare -g BOARDFAMILY="rockchip-rk3588"
 declare -g BOARD_MAINTAINER="efectn"
 declare -g BOOT_SOC="rk3588" # Just to avoid errors in rockchip64_commmon
-declare -g KERNEL_TARGET="edge,current,vendor"
+declare -g KERNEL_TARGET="current,edge,vendor"
 declare -g KERNEL_TEST_TARGET="vendor,current"
 declare -g IMAGE_PARTITION_TABLE="gpt"
 declare -g KERNEL_UPGRADE_FREEZE="vendor-rk35xx@24.8.1"

config/boards/longanpi-3h.csc

@@ -0,0 +1,15 @@
+# Allwinner H618 quad core 1GB/2GB/4GB RAM
+BOARD_NAME="Longan Pi 3H"
+BOARDFAMILY="sun50iw9"
+BOARD_MAINTAINER=""
+BOOTCONFIG="longanpi_3h_defconfig"
+BOOTBRANCH="tag:v2024.10"
+BOOTPATCHDIR="v2024.10"
+BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
+BOOT_LOGO="desktop"
+OVERLAY_PREFIX="sun50i-h616"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
+FORCE_BOOTSCRIPT_UPDATE="yes"
+enable_extension "radxa-aic8800" # compatible with radxa-aic8800
+AIC8800_TYPE="usb"

config/boards/longanpi-4b.csc

@@ -13,8 +13,8 @@ declare -g SYTERKIT_BOARD_ID="longanpi-4b" # This _only_ used for syterkit-allwi
 
 function post_family_tweaks__longanpi-4b() {
 	display_alert "Applying boot blobs"
-	cp -v "$SRC/packages/blobs/sunxi/sun50iw3/bl31.bin" "$SDCARD/boot/bl31.bin"
-	cp -v "$SRC/packages/blobs/sunxi/sun50iw3/scp.bin" "$SDCARD/boot/scp.bin"
+	cp -v "$SRC/packages/blobs/sunxi/sun55iw3/bl31.bin" "$SDCARD/boot/bl31.bin"
+	cp -v "$SRC/packages/blobs/sunxi/sun55iw3/scp.bin" "$SDCARD/boot/scp.bin"
 
 	display_alert "Applying wifi firmware"
 	pushd "$SDCARD/lib/firmware"

config/boards/mba8mpxl-ras314.conf

@@ -1,5 +1,5 @@
-# MBa8MPxL-RAS314 with TQMa8MPxL
-BOARD_NAME="TQ8MP-RAS314"
+# MBa8MP-RAS314 with TQMa8MPxL
+BOARD_NAME="MBa8MP-RAS314"
 BOARDFAMILY="imx8m"
 BOARD_MAINTAINER="schmiedelm"
 HAS_VIDEO_OUTPUT="yes"
@@ -19,28 +19,30 @@ function post_family_tweaks_bsp__mba8mpxl-ras314() {
 	wget https://github.com/nxp-imx/imx-firmware/raw/lf-6.6.3_1.0.0/nxp/FwImage_8997/pcieuart8997_combo_v4.bin
 	run_host_command_logged mkdir -pv --mode=755 "$destination/lib/firmware/" || exit_with_error "Unable to mkdir firmware"
 	run_host_command_logged mkdir -v --mode=775 "$destination/lib/firmware/mrvl/" || exit_with_error "Unable to mkdir mrvl"
-	run_host_command_logged cp -Pv "pcieuart8997_combo_v4.bin" "$destination/lib/firmware/mrvl/" || exit_with_error "Unable to copy mrvl firmware"
+	run_host_command_logged mv -v "pcieuart8997_combo_v4.bin" "$destination/lib/firmware/mrvl/" || exit_with_error "Unable to copy mrvl firmware"
 
 	# Add udev rule to delay btnxpuart loading
-	cat <<- EOF > "${destination}"/etc/udev/rules.d/10-nxp-bluetooth-delay.rules
+	cat <<- NXP_UDEV_RULE > "${destination}"/etc/udev/rules.d/10-nxp-bluetooth-delay.rules
 		# wait until combo FW is loaded by wifi driver
 		KERNEL=="mlan*", ACTION=="add", RUN+="/sbin/modprobe btnxpuart"
-	EOF
-
-	# Define a function to be run board-side during postinst of the BSP
-	display_alert "Adding to bsp-cli" "${BOARD}: postinst for periferial access" "info"
-	postinst_functions+=("board_side_imx8m_bsp_cli_postinst") # add to the postinst function list
-	function board_side_imx8mpxl_bsp_cli_postinst() {
-		# Peripheral access for specific groups
-		addgroup --system --quiet periphery
-	}
+	NXP_UDEV_RULE
 
+	# fix X11 config
 	mkdir -p "$destination"/etc/X11/xorg.conf.d
-	cat <<- EOF > "$destination"/etc/X11/xorg.conf.d/02-driver.conf
+
+	cat <<- XORG_HDMI_CONF > "$destination"/etc/X11/xorg.conf.d/10-hdmi.conf
 		Section "Device"
-		Identifier              "main"
-		driver                  "fbdev"
-		Option                  "fbdev" "/dev/fb0"
+			Identifier "etnaviv"
+			Driver     "modesetting"
+			Option     "kmsdev"      "/dev/dri/card1"
+			Option     "AccelMethod" "none" ### "glamor" to enable 3D acceleration, "none" to disable.
+			Option     "Atomic"      "On"
 		EndSection
-	EOF
+
+		Section "ServerFlags"
+			Option     "AutoAddGPU"  "false"
+			Option     "DRI"         "3"
+		EndSection
+	XORG_HDMI_CONF
+
 }

config/boards/mba8mpxl.conf

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

config/boards/mixtile-edge2.csc

@@ -1,6 +1,7 @@
 # Rockchip RK3568 quad core 4GB-8GB GBE PCIe USB3 SATA NVMe
 BOARD_NAME="Mixtile Edge 2"
-BOARDFAMILY="rockchip64"
+BOARDFAMILY="rk35xx"
+BOOTCONFIG="mixtile-edge2-rk3568_defconfig"
 BOARD_MAINTAINER=""
 BOOT_SOC="rk3568"
 KERNEL_TARGET="current,edge,vendor"
@@ -35,20 +36,3 @@ function post_family_config__h96_max_use_mainline_uboot() {
 		dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
 	}
 }
-
-function post_family_config_branch_vendor__kernel_and_uboot_rk35xx_mixtile_edge2() {
-	# Copypasta from rockchip-rk3588.conf family file -- we _really_ gotta find a better way!
-	declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel.
-	declare -g KERNELSOURCE='https://github.com/armbian/linux-rockchip.git'
-	declare -g KERNELBRANCH='branch:rk-6.1-rkr3'
-	declare -g KERNELPATCHDIR='rk35xx-vendor-6.1'
-	declare -g LINUXFAMILY=rk35xx
-	declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes
-	declare -g OVERLAY_PREFIX='rk35xx'
-
-	# Use vendor u-boot, same as rk35xx; we've a defconfig and dt in there
-	declare -g BOOTSOURCE='https://github.com/radxa/u-boot.git'
-	declare -g BOOTBRANCH='branch:next-dev-v2024.03' # Always use same version as rk3588, they share a patch dir
-	declare -g BOOTPATCHDIR="legacy/u-boot-radxa-rk35xx"
-	declare -g BOOTCONFIG="mixtile-edge2-rk3568_defconfig"
-}

config/boards/mksklipad50.conf

@@ -0,0 +1,12 @@
+# Rockchip RK3328 quad core 1GB RAM eMMC USB-C USB3 USB2 WiFi
+BOARD_NAME="mksklipad50"
+BOARDFAMILY="rockchip64"
+BOARD_MAINTAINER="torte71"
+BOOTCONFIG="mksklipad50-rk3328_defconfig"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
+HAS_VIDEO_OUTPUT="no"
+BOOT_LOGO="desktop"
+MODULES="pinctrl-rk805 ads7846 spidev"
+BOOTFS_TYPE="fat"
+PACKAGE_LIST_BOARD="build-essential usb-modeswitch"

config/boards/mkspi.csc

@@ -0,0 +1,19 @@
+# Rockchip RK3328 quad core 1GB RAM, 1x100M Ethernet, eMMC, USB3, USB2
+# Supported boards:
+# - MKS-PI - https://github.com/makerbase-mks/MKS-PI
+# - MKS-SKIPR - https://github.com/makerbase-mks/MKS-SKIPR
+# - QIDI X-4 and X-6 (made by Makerbase for 'X-Plus 3' and 'X-Max 3' 3D printers) - partially supported
+#
+# These boards and related configuration is very close to Renegade board ("roc-cc-rk3328_defconfig" and "rk3328-roc-cc" DT)
+BOARD_NAME="mkspi"
+BOARDFAMILY="rockchip64"
+BOARD_MAINTAINER="redrathnure"
+BOOTCONFIG="mkspi-rk3328_defconfig"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
+#No need to build Desktop images, minimal set will be installed together with KlipperScreen
+HAS_VIDEO_OUTPUT="no"
+BOOT_LOGO="desktop"
+MODULES="ads7846 spidev"
+BOOTFS_TYPE="fat"
+PACKAGE_LIST_BOARD="build-essential usb-modeswitch"

config/boards/nanopct4.csc

@@ -9,6 +9,6 @@ FULL_DESKTOP="yes"
 ASOUND_STATE="asound.state.rt5651"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3399-nanopc-t4.dtb"
-BOOT_SCENARIO="spl-blobs"
+BOOT_SCENARIO="blobless"
 SRC_EXTLINUX="yes"
 SRC_CMDLINE="console=ttyS2,1500000 console=tty0"

config/boards/nanopct6-lts.conf

@@ -5,5 +5,5 @@ BOARD_NAME="NanoPC T6 LTS"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="SuperKali Tonymac32"
 BOOT_FDT_FILE="rockchip/rk3588-nanopc-t6-lts.dtb" # As opposed to "rockchip/rk3588-nanopc-t6.dtb" for the non-LTS version
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="vendor,current"

config/boards/nanopct6.conf

@@ -4,7 +4,7 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="SuperKali Tonymac32"
 BOOTCONFIG="nanopc_t6_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
@@ -33,11 +33,11 @@ function post_family_config_branch_edge__nanopct6_use_mainline_uboot() {
 	display_alert "$BOARD" "mainline (next branch) u-boot overrides for $BOARD / $BRANCH" "info"
 
 	declare -g BOOTCONFIG="nanopc-t6-rk3588_defconfig"
-	declare -g BOOTDELAY=1                                                # Wait for UART interrupt to enter UMS/RockUSB mode etc
-	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" 		  # We ❤️ Mainline
-	declare -g BOOTBRANCH="tag:v2024.10"
-	declare -g BOOTPATCHDIR="v2024.10"
-	declare -g BOOTDIR="u-boot-${BOARD}"                                  # do not share u-boot directory
+	declare -g BOOTDELAY=1                                       # Wait for UART interrupt to enter UMS/RockUSB mode etc
+	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline
+	declare -g BOOTBRANCH="tag:v2025.04-rc1"
+	declare -g BOOTPATCHDIR="v2025.04"
+	declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
 	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
 	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already
 
@@ -51,10 +51,44 @@ function post_family_config_branch_edge__nanopct6_use_mainline_uboot() {
 	}
 }
 
+# U-boot 2025.04+ can detect and set fdtfile automatically across T6 and T6-LTS boards.
+# So if using mainline u-boot, unset BOOT_FDT_FILE to let u-boot handle it.
+# That way, both variants can boot from the same image; lets keep the -lts board file for vendor kernel/u-boot.
+function post_family_config_branch_edge__t6_and_t6_lts_auto_dtb_name_via_uboot_detection() {
+	unset BOOT_FDT_FILE
+}
+
+function pre_config_uboot_target__nanoptc6_patch_uboot_dtsi_for_ums() {
+	[[ "${BRANCH}" != "edge" ]] && return 0
+
+	display_alert "u-boot for ${BOARD}" "u-boot: add to u-boot dtsi for UMS" "info" # avoid a patch, just append to the dtsi file
+	cat <<- EOD >> arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi                        # Append to the t6 u-boot dtsi file with stuff for enabling gadget/otg/peripheral mode
+		&u2phy0 { status = "okay"; };
+		&u2phy0_otg { status = "okay"; };
+		&usbdp_phy0 { status = "okay"; };
+		&usb_host0_xhci { dr_mode = "peripheral";  maximum-speed = "high-speed";  status = "okay"; };
+	EOD
+
+}
+
+# "rockchip-common: boot SD card first, then NVMe, then mmc"
+# include/configs/rockchip-common.h
+# -#define BOOT_TARGETS "mmc1 mmc0 nvme scsi usb pxe dhcp spi"
+# +#define BOOT_TARGETS "mmc0 nvme mmc1 scsi usb pxe dhcp spi"
+# On nanopct6, mmc0 is the eMMC, mmc1 is the SD card slot
+function pre_config_uboot_target__nanopct6_patch_rockchip_common_boot_order() {
+	declare -a rockchip_uboot_targets=("mmc1" "nvme" "mmc0" "scsi" "usb" "pxe" "dhcp" "spi") # for future make-this-generic delight
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: adjust boot order to '${rockchip_uboot_targets[*]}'" "info"
+	sed -i -e "s/#define BOOT_TARGETS.*/#define BOOT_TARGETS \"${rockchip_uboot_targets[*]}\"/" include/configs/rockchip-common.h
+	regular_git diff -u include/configs/rockchip-common.h || true
+}
+
 function post_config_uboot_target__extra_configs_for_nanopct6_mainline_environment_in_spi() {
 	[[ "${BRANCH}" != "edge" ]] && return 0
 
-	display_alert "$BOARD" "u-boot configs for ${BOOTBRANCH} u-boot config BRANCH=${BRANCH}" "info"
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable board-specific configs (env in SPI)" "info"
+	run_host_command_logged scripts/config --enable CONFIG_DM_PMIC_FAN53555
+	run_host_command_logged scripts/config --enable CONFIG_CMD_MISC
 	run_host_command_logged scripts/config --set-val CONFIG_ENV_IS_NOWHERE "n"
 	run_host_command_logged scripts/config --set-val CONFIG_ENV_IS_IN_SPI_FLASH "y"
 	run_host_command_logged scripts/config --set-val CONFIG_ENV_SECT_SIZE_AUTO "y"
@@ -62,24 +96,24 @@ function post_config_uboot_target__extra_configs_for_nanopct6_mainline_environme
 	run_host_command_logged scripts/config --set-val CONFIG_ENV_SIZE "0x20000"
 	run_host_command_logged scripts/config --set-val CONFIG_ENV_OFFSET "0xc00000"
 
-	display_alert "u-boot for ${BOARD}" "u-boot: enable preboot & flash user LED in preboot" "info"
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable preboot & flash user LED in preboot" "info"
 	run_host_command_logged scripts/config --enable CONFIG_USE_PREBOOT
 	run_host_command_logged scripts/config --set-str CONFIG_PREBOOT "'led user-led on; sleep 0.1; led user-led off'" # double quotes required due to run_host_command_logged's quirks
 
-	display_alert "u-boot for ${BOARD}" "u-boot: enable EFI debugging command" "info"
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable EFI debugging commands" "info"
 	run_host_command_logged scripts/config --enable CMD_EFIDEBUG
 	run_host_command_logged scripts/config --enable CMD_NVEDIT_EFI
 
-	display_alert "u-boot for ${BOARD}" "u-boot: enable more compression support" "info"
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable more compression support" "info"
 	run_host_command_logged scripts/config --enable CONFIG_LZO
 	run_host_command_logged scripts/config --enable CONFIG_BZIP2
 	run_host_command_logged scripts/config --enable CONFIG_ZSTD
 
-	display_alert "u-boot for ${BOARD}" "u-boot: enable gpio LED support" "info"
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable gpio LED support" "info"
 	run_host_command_logged scripts/config --enable CONFIG_LED
 	run_host_command_logged scripts/config --enable CONFIG_LED_GPIO
 
-	display_alert "u-boot for ${BOARD}" "u-boot: enable networking cmds" "info"
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable networking cmds" "info"
 	run_host_command_logged scripts/config --enable CONFIG_CMD_NFS
 	run_host_command_logged scripts/config --enable CONFIG_CMD_WGET
 	run_host_command_logged scripts/config --enable CONFIG_CMD_DNS
@@ -87,14 +121,13 @@ function post_config_uboot_target__extra_configs_for_nanopct6_mainline_environme
 	run_host_command_logged scripts/config --enable CONFIG_PROT_TCP_SACK
 
 	# UMS, RockUSB, gadget stuff
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable UMS/RockUSB gadget" "info"
 	declare -a enable_configs=("CONFIG_CMD_USB_MASS_STORAGE" "CONFIG_USB_GADGET" "USB_GADGET_DOWNLOAD" "CONFIG_USB_FUNCTION_ROCKUSB" "CONFIG_USB_FUNCTION_ACM" "CONFIG_CMD_ROCKUSB" "CONFIG_CMD_USB_MASS_STORAGE")
 	for config in "${enable_configs[@]}"; do
-		display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable ${config}" "info"
 		run_host_command_logged scripts/config --enable "${config}"
 	done
 	# Auto-enabled by the above, force off...
 	run_host_command_logged scripts/config --disable USB_FUNCTION_FASTBOOT
-
 }
 
 # Include fw_setenv, configured to point to the correct spot on the SPI Flash

config/boards/nanopi-m6.conf

@@ -4,15 +4,23 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="efectn"
 BOOTCONFIG="nanopi-m6-rk3588s_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
-KERNEL_TARGET="vendor"
+KERNEL_TARGET="current,edge,vendor"
+KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 IMAGE_PARTITION_TABLE="gpt"
 BOOT_FDT_FILE="rockchip/rk3588s-nanopi-m6.dtb"
 BOOT_SCENARIO="spl-blobs"
+BOOT_SUPPORT_SPI="yes"
+BOOT_SPI_RKSPI_LOADER="yes"
 
 DEFAULT_OVERLAYS="nanopi-m6-display-dsi1-yx35" # Enable YX35 LCD
 
+function post_family_config__nanopi_m6_support_spi_boot() {
+	UBOOT_TARGET_MAP="nanopi-m6-rk3588s_defconfig BL31=$RKBIN_DIR/$BL31_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb
+nanopi-m6-spi-rk3588s_defconfig BL31=$RKBIN_DIR/$BL31_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;rkspi_loader.img"
+}
+
 function post_family_tweaks__nanopim6_naming_udev_audios() {
 	display_alert "$BOARD" "Renaming NanoPi M6 HDMI audio" "info"
 

config/boards/nanopi-r3s.csc

@@ -0,0 +1,53 @@
+# Rockchip RK3566 quad core 2GB RAM eMMC 2x GbE USB3
+BOARD_NAME="NanoPi R3S"
+BOARDFAMILY="rk35xx"
+BOARD_MAINTAINER=""
+HAS_VIDEO_OUTPUT="no"
+BOOTCONFIG="nanopi-r3s-rk3566_defconfig"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current,edge"
+BOOT_FDT_FILE="rockchip/rk3566-nanopi-r3s.dtb"
+IMAGE_PARTITION_TABLE="gpt"
+BOOT_SCENARIO="spl-blobs"
+
+
+function post_family_config_branch_edge__use_mainline_dtb_name() {
+	unset BOOT_FDT_FILE # boot.scr will use whatever u-boot detects and sets 'fdtfile' to
+	unset BOOTFS_TYPE   # mainline u-boot can boot ext4 directly
+}
+
+function post_family_config_branch_current__use_mainline_dtb_name() {
+	unset BOOT_FDT_FILE # boot.scr will use whatever u-boot detects and sets 'fdtfile' to
+	unset BOOTFS_TYPE   # mainline u-boot can boot ext4 directly
+}
+
+
+function post_family_config_branch_current__nanopi-r3s_use_mainline_uboot() {
+	BOOTCONFIG="nanopi-r3s-rk3566_defconfig"
+	BOOTSOURCE="https://github.com/u-boot/u-boot"
+	BOOTBRANCH="tag:v2024.10"
+	BOOTPATCHDIR="v2024.10"
+
+	UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB ROCKCHIP_TPL=$RKBIN_DIR/$DDR_BLOB;;u-boot-rockchip.bin"
+
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
+
+	function write_uboot_platform() {
+		dd if=$1/u-boot-rockchip.bin of=$2 seek=64 conv=notrunc status=none
+	}
+}
+
+function post_family_config_branch_edge__nanopi-r3s_use_mainline_uboot() {
+	BOOTCONFIG="nanopi-r3s-rk3566_defconfig"
+	BOOTSOURCE="https://github.com/u-boot/u-boot"
+	BOOTBRANCH="tag:v2025.01"
+	BOOTPATCHDIR="v2025.01"
+
+	UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB ROCKCHIP_TPL=$RKBIN_DIR/$DDR_BLOB;;u-boot-rockchip.bin"
+
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
+
+	function write_uboot_platform() {
+		dd if=$1/u-boot-rockchip.bin of=$2 seek=64 conv=notrunc status=none
+	}
+}

config/boards/nanopi-r6c.csc

@@ -4,12 +4,13 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="ColorfulRhino"
 BOOTCONFIG="nanopi-r6c-rk3588s_defconfig" # Mainline defconfig, enables booting from NVMe
 BOOT_SOC="rk3588"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 IMAGE_PARTITION_TABLE="gpt"
 BOOT_FDT_FILE="rockchip/rk3588s-nanopi-r6c.dtb"
 BOOT_SCENARIO="spl-blobs"
+declare -g UEFI_EDK2_BOARD_ID="nanopi-r6c" # This _only_ used for uefi-edk2-rk3588 extension
 
 function post_family_tweaks__nanopi_r6c_naming_audios() {
 	display_alert "$BOARD" "Renaming NanoPi R6C HDMI audio interface to human-readable form" "info"
@@ -36,17 +37,80 @@ function post_family_config__nanopi_r6c_use_mainline_uboot() {
 
 	declare -g BOOTDELAY=1                                       # Wait for UART interrupt to enter UMS/RockUSB mode etc
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
-	declare -g BOOTBRANCH="tag:v2024.10"
-	declare -g BOOTPATCHDIR="v2024.10"
-	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency
-
+	declare -g BOOTBRANCH="tag:v2025.01"
+	declare -g BOOTPATCHDIR="v2025.01"
+	declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
 	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"
-
-	# Disable stuff from rockchip64_common; we're using binman here which does all the work already
-	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already
 
 	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
 	function write_uboot_platform() {
 		dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
 	}
 }
+
+function pre_config_uboot_target__r6c_patch_uboot_dtsi_for_ums() {
+	display_alert "u-boot for ${BOARD}" "u-boot: add to u-boot dtsi for UMS" "info" # avoid a patch, just append to the dtsi file
+	cat <<- EOD >> arch/arm/dts/rk3588s-nanopi-r6c-u-boot.dtsi
+		&u2phy0 { status = "okay"; };
+		&u2phy0_otg { status = "okay"; };
+		&usbdp_phy0 { status = "okay"; };
+		&usb_host0_xhci { dr_mode = "peripheral";  maximum-speed = "high-speed";  status = "okay"; };
+	EOD
+}
+
+# The upstream DTs (kernel 6.13 / u-boot 2025.01) are in flux and different
+# let's just patch to normalize the SD and eMMC order as in mainline Linux DT: https://github.com/torvalds/linux/blob/master/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi#L14-L15
+function pre_config_uboot_target__r6c_patch_uboot_dtsi_for_sd_emmc_order() {
+	display_alert "u-boot for ${BOARD}" "u-boot: add to u-boot dtsi for SD=mmc0 and eMMC=mmc1" "info"
+	cat <<- EOD >> arch/arm/dts/rk3588s-nanopi-r6c-u-boot.dtsi
+		/ { aliases { mmc0 = &sdmmc; mmc1 = &sdhci; }; };
+	EOD
+}
+
+# "rockchip-common: boot SD card first, then NVMe, then mmc"
+# include/configs/rockchip-common.h
+# -#define BOOT_TARGETS "mmc1 mmc0 nvme scsi usb pxe dhcp spi"
+# +#define BOOT_TARGETS "mmc0 nvme mmc1 scsi usb pxe dhcp spi"
+# On R6C, mmc1 is the eMMC, mmc0 is the SD card slot
+function pre_config_uboot_target__r6c_patch_rockchip_common_boot_order() {
+	declare -a rockchip_uboot_targets=("mmc0" "nvme" "mmc1" "scsi" "usb" "pxe" "dhcp" "spi") # for future make-this-generic delight
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: adjust boot order to '${rockchip_uboot_targets[*]}'" "info"
+	sed -i -e "s/#define BOOT_TARGETS.*/#define BOOT_TARGETS \"${rockchip_uboot_targets[*]}\"/" include/configs/rockchip-common.h
+	regular_git diff -u include/configs/rockchip-common.h || true
+}
+
+function post_config_uboot_target__extra_configs_for_r6c_mainline() {
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable board-specific configs" "info"
+	run_host_command_logged scripts/config --enable CONFIG_DM_PMIC_FAN53555
+	run_host_command_logged scripts/config --enable CONFIG_CMD_MISC
+
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable EFI debugging commands" "info"
+	run_host_command_logged scripts/config --enable CMD_EFIDEBUG
+	run_host_command_logged scripts/config --enable CMD_NVEDIT_EFI
+
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable more compression support" "info"
+	run_host_command_logged scripts/config --enable CONFIG_LZO
+	run_host_command_logged scripts/config --enable CONFIG_BZIP2
+	run_host_command_logged scripts/config --enable CONFIG_ZSTD
+
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable gpio LED support" "info"
+	run_host_command_logged scripts/config --enable CONFIG_LED
+	run_host_command_logged scripts/config --enable CONFIG_LED_GPIO
+
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable networking cmds" "info"
+	run_host_command_logged scripts/config --enable CONFIG_CMD_NFS
+	run_host_command_logged scripts/config --enable CONFIG_CMD_WGET
+	run_host_command_logged scripts/config --enable CONFIG_CMD_DNS
+	run_host_command_logged scripts/config --enable CONFIG_PROT_TCP
+	run_host_command_logged scripts/config --enable CONFIG_PROT_TCP_SACK
+
+	# UMS, RockUSB, gadget stuff
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable UMS/RockUSB gadget" "info"
+	declare -a enable_configs=("CONFIG_CMD_USB_MASS_STORAGE" "CONFIG_USB_GADGET" "USB_GADGET_DOWNLOAD" "CONFIG_USB_FUNCTION_ROCKUSB" "CONFIG_USB_FUNCTION_ACM" "CONFIG_CMD_ROCKUSB" "CONFIG_CMD_USB_MASS_STORAGE")
+	for config in "${enable_configs[@]}"; do
+		run_host_command_logged scripts/config --enable "${config}"
+	done
+	# Auto-enabled by the above, force off...
+	run_host_command_logged scripts/config --disable USB_FUNCTION_FASTBOOT
+}

config/boards/nanopi-r6s.conf

@@ -4,7 +4,7 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="efectn"
 BOOTCONFIG="nanopi-r6s-rk3588s_defconfig" # Mainline defconfig
 BOOT_SOC="rk3588"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
@@ -40,17 +40,80 @@ function post_family_config__nanopi_r6s_use_mainline_uboot() {
 
 	declare -g BOOTDELAY=1                                       # Wait for UART interrupt to enter UMS/RockUSB mode etc
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
-	declare -g BOOTBRANCH="tag:v2024.10"
-	declare -g BOOTPATCHDIR="v2024.10"
-	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency
-
+	declare -g BOOTBRANCH="tag:v2025.01"
+	declare -g BOOTPATCHDIR="v2025.01"
+	declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
 	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"
-
-	# Disable stuff from rockchip64_common; we're using binman here which does all the work already
-	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already
 
 	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
 	function write_uboot_platform() {
 		dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
 	}
 }
+
+function pre_config_uboot_target__r6s_patch_uboot_dtsi_for_ums() {
+	display_alert "u-boot for ${BOARD}" "u-boot: add to u-boot dtsi for UMS" "info" # avoid a patch, just append to the dtsi file
+	cat <<- EOD >> arch/arm/dts/rk3588s-nanopi-r6s-u-boot.dtsi
+		&u2phy0 { status = "okay"; };
+		&u2phy0_otg { status = "okay"; };
+		&usbdp_phy0 { status = "okay"; };
+		&usb_host0_xhci { dr_mode = "peripheral";  maximum-speed = "high-speed";  status = "okay"; };
+	EOD
+}
+
+# The upstream DTs (kernel 6.13 / u-boot 2025.01) are in flux and different
+# let's just patch to normalize the SD and eMMC order as in mainline Linux DT: https://github.com/torvalds/linux/blob/master/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi#L14-L15
+function pre_config_uboot_target__r6s_patch_uboot_dtsi_for_sd_emmc_order() {
+	display_alert "u-boot for ${BOARD}" "u-boot: add to u-boot dtsi for SD=mmc0 and eMMC=mmc1" "info"
+	cat <<- EOD >> arch/arm/dts/rk3588s-nanopi-r6s-u-boot.dtsi
+		/ { aliases { mmc0 = &sdmmc; mmc1 = &sdhci; }; };
+	EOD
+}
+
+# "rockchip-common: boot SD card first, then NVMe, then mmc"
+# include/configs/rockchip-common.h
+# -#define BOOT_TARGETS "mmc1 mmc0 nvme scsi usb pxe dhcp spi"
+# +#define BOOT_TARGETS "mmc0 nvme mmc1 scsi usb pxe dhcp spi"
+# On R6S, mmc1 is the eMMC, mmc0 is the SD card slot
+function pre_config_uboot_target__r6s_patch_rockchip_common_boot_order() {
+	declare -a rockchip_uboot_targets=("mmc0" "nvme" "mmc1" "scsi" "usb" "pxe" "dhcp" "spi") # for future make-this-generic delight
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: adjust boot order to '${rockchip_uboot_targets[*]}'" "info"
+	sed -i -e "s/#define BOOT_TARGETS.*/#define BOOT_TARGETS \"${rockchip_uboot_targets[*]}\"/" include/configs/rockchip-common.h
+	regular_git diff -u include/configs/rockchip-common.h || true
+}
+
+function post_config_uboot_target__extra_configs_for_r6s_mainline() {
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable board-specific configs" "info"
+	run_host_command_logged scripts/config --enable CONFIG_DM_PMIC_FAN53555
+	run_host_command_logged scripts/config --enable CONFIG_CMD_MISC
+
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable EFI debugging commands" "info"
+	run_host_command_logged scripts/config --enable CMD_EFIDEBUG
+	run_host_command_logged scripts/config --enable CMD_NVEDIT_EFI
+
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable more compression support" "info"
+	run_host_command_logged scripts/config --enable CONFIG_LZO
+	run_host_command_logged scripts/config --enable CONFIG_BZIP2
+	run_host_command_logged scripts/config --enable CONFIG_ZSTD
+
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable gpio LED support" "info"
+	run_host_command_logged scripts/config --enable CONFIG_LED
+	run_host_command_logged scripts/config --enable CONFIG_LED_GPIO
+
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable networking cmds" "info"
+	run_host_command_logged scripts/config --enable CONFIG_CMD_NFS
+	run_host_command_logged scripts/config --enable CONFIG_CMD_WGET
+	run_host_command_logged scripts/config --enable CONFIG_CMD_DNS
+	run_host_command_logged scripts/config --enable CONFIG_PROT_TCP
+	run_host_command_logged scripts/config --enable CONFIG_PROT_TCP_SACK
+
+	# UMS, RockUSB, gadget stuff
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable UMS/RockUSB gadget" "info"
+	declare -a enable_configs=("CONFIG_CMD_USB_MASS_STORAGE" "CONFIG_USB_GADGET" "USB_GADGET_DOWNLOAD" "CONFIG_USB_FUNCTION_ROCKUSB" "CONFIG_USB_FUNCTION_ACM" "CONFIG_CMD_ROCKUSB" "CONFIG_CMD_USB_MASS_STORAGE")
+	for config in "${enable_configs[@]}"; do
+		run_host_command_logged scripts/config --enable "${config}"
+	done
+	# Auto-enabled by the above, force off...
+	run_host_command_logged scripts/config --disable USB_FUNCTION_FASTBOOT
+}

config/boards/nanopineo.csc

@@ -1,7 +1,7 @@
 # Allwinner H3 quad core 256/512MB RAM SoC headless
 BOARD_NAME="NanoPi Neo"
 BOARDFAMILY="sun8i"
-BOARD_MAINTAINER=""
+BOARD_MAINTAINER="spendist"
 BOOTCONFIG="nanopi_neo_defconfig"
 MODULES="g_serial"
 MODULES_BLACKLIST="lima"

config/boards/nanopineo2.csc

@@ -1,7 +1,7 @@
 # Allwinner H5 quad core 256/512MB RAM SoC headless GBE
 BOARD_NAME="NanoPi Neo 2"
 BOARDFAMILY="sun50iw2"
-BOARD_MAINTAINER=""
+BOARD_MAINTAINER="spendist"
 BOOTCONFIG="nanopi_neo2_defconfig"
 MODULES="g_serial"
 MODULES_BLACKLIST="lima"

config/boards/odroidc1.conf

@@ -1,8 +1,8 @@
 # Amlogic S805 C1 quad core 1GB RAM SoC GBE
 BOARD_NAME="Odroid C1"
 BOARDFAMILY="meson8b"
-BOARD_MAINTAINER=""
-KERNEL_TARGET="current,edge"
+BOARD_MAINTAINER="juanlufont"
+KERNEL_TARGET="current"
 KERNEL_TEST_TARGET="current"
 
 BOOTDIR='u-boot-odroidc1'

config/boards/odroidm1.conf

@@ -12,8 +12,8 @@ IMAGE_PARTITION_TABLE="gpt"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 
-BOOTBRANCH_BOARD="tag:v2024.07"
-BOOTPATCHDIR="v2024.07"
+BOOTBRANCH_BOARD="tag:v2025.01"
+BOOTPATCHDIR="v2025.01" # but all changes are done in this board file, not patches
 
 BOOTCONFIG="odroid-m1-rk3568_defconfig"
 BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
@@ -21,10 +21,6 @@ BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
 # The overlays for this board are prefixed by 'rockchip-rk3568-hk' (see for example patch/kernel/archive/rockchip64-6.6/overlay/rockchip-rk3568-hk-i2c0.dts)
 OVERLAY_PREFIX="rockchip-rk3568-hk"
 
-# HK's SPI partition on MTD:
-# mtd0: start 0         size 917.504   end 917.504    : SPL          == start 0x0      size 0xe0000  : SPL
-# mtd1: start 917.504   size 131.072   end 1.048.576  : U-Boot Env   == start 0xe0000  size 0x20000  : U-Boot Env
-# mtd2: start 1.048.576 size 2.097.152 end 3.145.728  : U-Boot       == start 0x100000 size 0x200000 : U-Boot
 function post_family_config__uboot_config() {
 	display_alert "$BOARD" "u-boot ${BOOTBRANCH_BOARD} overrides" "info"
 	BOOTDELAY=1 # Wait for UART interrupt to enter UMS/RockUSB mode etc
@@ -67,14 +63,20 @@ function post_family_tweaks__config_odroidm1_fwenv() {
 	#   https://github.com/hardkernel/u-boot/blob/356906e6445378a45ac14ec184fc6e666b22338a/configs/odroid_rk3568_defconfig#L212-L213
 	# The kernel DT has a convenient partition table, so mtd1 is ready to use, just gotta set the size.
 	#   https://github.com/torvalds/linux/blob/master/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts#L637-L662
+	# HK's SPI partition on MTD:
+	# mtd0: start 0         size 917.504   end 917.504    : SPL          == start 0x0      size 0xe0000  : SPL
+	# mtd1: start 917.504   size 131.072   end 1.048.576  : U-Boot Env   == start 0xe0000  size 0x20000  : U-Boot Env
+	# mtd2: start 1.048.576 size 2.097.152 end 3.145.728  : U-Boot       == start 0x100000 size 0x200000 : U-Boot
 
 	cat <<- 'FW_ENV_CONFIG' > "${SDCARD}"/etc/fw_env.config
 		# MTD on the SPI for the Odroid-M1; this requires the MTD partition table in the board kernel DTS
 		# MTD device name Device offset Env. size Flash sector size Number of sectors
 		/dev/mtd1                       0x0000                      0x20000
 	FW_ENV_CONFIG
+}
 
-	# add a network rule to rename default name
+# add a network rule to rename default name
+function post_family_tweaks__odroidm1_rename_gmac_eth0() {
 	display_alert "Creating network rename rule for Odroid M1"
 	mkdir -p "${SDCARD}"/etc/udev/rules.d/
 	cat <<- EOF > "${SDCARD}"/etc/udev/rules.d/70-rename-lan.rules
@@ -83,6 +85,22 @@ function post_family_tweaks__config_odroidm1_fwenv() {
 
 }
 
+function pre_config_uboot_target__odroidm1_patch_uboot_dtsi_for_ums() {
+	display_alert "u-boot for ${BOARD}" "u-boot: add to u-boot dtsi for UMS" "info" # avoid a patch, just append to the dtsi file
+	cat <<- UBOOT_BOARD_DTSI_OTG >> arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi
+		&usb_host0_xhci { dr_mode = "otg"; };
+	UBOOT_BOARD_DTSI_OTG
+}
+
+# "rockchip-common: boot SD card first, then NVMe, then SATA, then USB, then mmc"
+# On odroidm1, mmc0 is the eMMC, mmc1 is the SD card slot
+function pre_config_uboot_target__odroidm1_patch_rockchip_common_boot_order() {
+	declare -a rockchip_uboot_targets=("mmc1" "nvme" "scsi" "usb" "mmc0" "pxe" "dhcp" "spi") # for future make-this-generic delight
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: adjust boot order to '${rockchip_uboot_targets[*]}'" "info"
+	sed -i -e "s/#define BOOT_TARGETS.*/#define BOOT_TARGETS \"${rockchip_uboot_targets[*]}\"/" include/configs/rockchip-common.h
+	regular_git diff -u include/configs/rockchip-common.h || true
+}
+
 # A better equivalent to patching a defconfig, do changes to .config via code.
 # For UMS/RockUSB to work in u-boot, &usb_host0_xhci { dr_mode = "otg" } is required. See 0002-board-rockchip-ODROID-M1-override-kernel-DT-for-xhci-otg-dr_mode.patch
 function post_config_uboot_target__extra_configs_for_odroid-m1() {
@@ -119,6 +137,13 @@ function post_config_uboot_target__extra_configs_for_odroid-m1() {
 	run_host_command_logged scripts/config --enable CONFIG_PROT_TCP
 	run_host_command_logged scripts/config --enable CONFIG_PROT_TCP_SACK
 
+	display_alert "u-boot for ${BOARD}" "u-boot: enable more cmdline commands" "info" # for extra compat with eg HAOS
+	run_host_command_logged scripts/config --enable CONFIG_CMD_SQUASHFS
+	run_host_command_logged scripts/config --enable CONFIG_CMD_SETEXPR
+	run_host_command_logged scripts/config --enable CONFIG_CMD_FILEENV # added via cmd-fileenv-read-string-from-file-into-env.patch
+	run_host_command_logged scripts/config --enable CONFIG_CMD_CAT
+	run_host_command_logged scripts/config --enable CONFIG_CMD_XXD
+
 	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enabling UMS/RockUSB Gadget functionality" "info"
 	declare -a enable_configs=("CONFIG_CMD_USB_MASS_STORAGE" "CONFIG_USB_GADGET" "USB_GADGET_DOWNLOAD" "CONFIG_USB_FUNCTION_ROCKUSB" "CONFIG_USB_FUNCTION_ACM" "CONFIG_CMD_ROCKUSB" "CONFIG_CMD_USB_MASS_STORAGE")
 	for config in "${enable_configs[@]}"; do

config/boards/odroidm2.csc

@@ -0,0 +1,51 @@
+# Rockchip RK3588s SoC octa core 4-16GB SoC eMMC USB3 NvME
+BOARD_NAME="Odroid M2"
+BOARDFAMILY="rockchip64"
+BOARD_MAINTAINER="mlegenovic"
+BOOT_SOC="rk3588"
+KERNEL_TARGET="edge"
+BOOT_FDT_FILE="rockchip/rk3588s-odroid-m2.dtb"
+BOOT_SCENARIO="binman"
+IMAGE_PARTITION_TABLE="gpt"
+FULL_DESKTOP="no"
+BOOT_LOGO="yes"
+
+BOOTBRANCH_BOARD="tag:v2025.04-rc2"
+BOOTBRANCH="${BOOTBRANCH_BOARD}"
+BOOTPATCHDIR="v2025.04-rc2"
+
+BOOTCONFIG="odroid-m2-rk3588s_defconfig"
+BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
+
+OVERLAY_PREFIX='rockchip-rk3588'
+
+function post_family_config__uboot_config() {
+	display_alert "$BOARD" "u-boot ${BOOTBRANCH_BOARD} overrides" "info"
+	BOOTDELAY=1 # Wait for UART interrupt to enter UMS/RockUSB mode etc
+	UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/$BL31_BLOB ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already
+
+	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
+	function write_uboot_platform() {
+		dd if=${1}/u-boot-rockchip.bin of=${2} bs=32k seek=1 conv=fsync
+	}
+}
+
+# "rockchip-common: boot SD card first, then NVMe, then SATA, then USB, then mmc"
+# On odroidm2, mmc0 is the eMMC, mmc1 is the SD card slot
+function pre_config_uboot_target__odroidm2_patch_rockchip_common_boot_order() {
+	declare -a rockchip_uboot_targets=("mmc1" "nvme" "mmc0" "usb" "pxe" "dhcp") # for future make-this-generic delight
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: adjust boot order to '${rockchip_uboot_targets[*]}'" "info"
+	sed -i -e "s/#define BOOT_TARGETS.*/#define BOOT_TARGETS \"${rockchip_uboot_targets[*]}\"/" include/configs/rockchip-common.h
+	regular_git diff -u include/configs/rockchip-common.h || true
+}
+
+# add a network rule to rename default name
+function post_family_tweaks__odroidm2_rename_gmac_eth0() {
+	display_alert "Creating network rename rule for Odroid M2"
+	mkdir -p "${SDCARD}"/etc/udev/rules.d/
+	cat <<- EOF > "${SDCARD}"/etc/udev/rules.d/70-rename-lan.rules
+		SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", KERNEL=="end*", NAME="eth0"
+	EOF
+
+}

config/boards/onecloud.csc

@@ -2,7 +2,7 @@
 BOARD_NAME="OneCloud"
 BOARDFAMILY="meson8b"
 BOARD_MAINTAINER="hzyitc"
-KERNEL_TARGET="current,edge"
+KERNEL_TARGET="current"
 KERNEL_TEST_TARGET="current"
 BOOTCONFIG="none"
 BOOTSCRIPT="boot-onecloud.cmd:boot.cmd"

config/boards/oneplus-kebab.conf

@@ -25,9 +25,14 @@ function post_family_tweaks_bsp__oneplus-kebab_firmware() {
 	# USB Gadget Network service
 	mkdir -p $destination/usr/local/bin/
 	mkdir -p $destination/usr/lib/systemd/system/
+	mkdir -p $destination/etc/initramfs-tools/scripts/init-bottom/
 	install -Dm655 $SRC/packages/bsp/usb-gadget-network/setup-usbgadget-network.sh $destination/usr/local/bin/
 	install -Dm655 $SRC/packages/bsp/usb-gadget-network/remove-usbgadget-network.sh $destination/usr/local/bin/
 	install -Dm644 $SRC/packages/bsp/usb-gadget-network/usbgadget-rndis.service $destination/usr/lib/systemd/system/
+	install -Dm655 $SRC/packages/bsp/usb-gadget-network/usb-gadget-initramfs-hook $destination/etc/initramfs-tools/hooks/usb-gadget
+	install -Dm655 $SRC/packages/bsp/usb-gadget-network/usb-gadget-initramfs-premount $destination/etc/initramfs-tools/scripts/init-premount/usb-gadget
+	install -Dm655 $SRC/packages/bsp/usb-gadget-network/dropbear $destination/etc/initramfs-tools/scripts/init-premount/
+	install -Dm655 $SRC/packages/bsp/usb-gadget-network/kill-dropbear $destination/etc/initramfs-tools/scripts/init-bottom/
 
 	# Bluetooth MAC addr setup service
 	install -Dm655 $SRC/packages/bsp/generate-bt-mac-addr/bt-fixed-mac.sh $destination/usr/local/bin/
@@ -54,20 +59,20 @@ function post_family_tweaks__oneplus-kebab_enable_services() {
 		return 0
 	fi
 
-	if [[ "${RELEASE}" == "jammy" ]] || [[ "${RELEASE}" == "noble" ]];then
+	if [[ "${RELEASE}" == "jammy" ]] || [[ "${RELEASE}" == "noble" ]]; then
 		display_alert "Adding qcom-mainline PPA" "${BOARD}" "info"
 		do_with_retries 3 chroot_sdcard add-apt-repository ppa:liujianfeng1994/qcom-mainline --yes --no-update
 	fi
 
 	# we need unudhcpd from armbian repo, so enable it
-	mv "${SDCARD}"/etc/apt/sources.list.d/armbian.list.disabled "${SDCARD}"/etc/apt/sources.list.d/armbian.list
+	mv "${SDCARD}"/etc/apt/sources.list.d/armbian.sources.disabled "${SDCARD}"/etc/apt/sources.list.d/armbian.sources
 
 	do_with_retries 3 chroot_sdcard_apt_get_update
 	display_alert "$BOARD" "Installing board tweaks" "info"
-	do_with_retries 3 chroot_sdcard_apt_get_install alsa-ucm-conf qbootctl qrtr-tools unudhcpd mkbootimg
+	do_with_retries 3 chroot_sdcard_apt_get_install alsa-ucm-conf qbootctl qrtr-tools unudhcpd mkbootimg dropbear-bin
 
 	# disable armbian repo back
-	mv "${SDCARD}"/etc/apt/sources.list.d/armbian.list "${SDCARD}"/etc/apt/sources.list.d/armbian.list.disabled
+	mv "${SDCARD}"/etc/apt/sources.list.d/armbian.sources "${SDCARD}"/etc/apt/sources.list.d/armbian.sources.disabled
 	do_with_retries 3 chroot_sdcard_apt_get_update
 
 	chroot_sdcard systemctl enable qbootctl.service

config/boards/orangepi3b.csc

@@ -68,7 +68,7 @@ function post_family_tweaks__orangepi3b_naming_audios() {
 	mkdir -p $SDCARD/etc/udev/rules.d/
 	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi-sound", ENV{SOUND_DESCRIPTION}="HDMI Audio"' > $SDCARD/etc/udev/rules.d/90-naming-audios.rules
 	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-rk809-sound", ENV{SOUND_DESCRIPTION}="RK809 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules # vendor dts
-	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-sound", ENV{SOUND_DESCRIPTION}="RK809 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules # mainline dts
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-sound", ENV{SOUND_DESCRIPTION}="RK809 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules       # mainline dts
 
 	return 0
 }

config/boards/orangepi5-max.csc

@@ -4,8 +4,8 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER=""
 BOOTCONFIG="orangepi-5-max-rk3588_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
-KERNEL_TARGET="vendor"
-KERNEL_TEST_TARGET="vendor"
+KERNEL_TARGET="vendor,current"
+KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-orangepi-5-max.dtb"

config/boards/orangepi5-plus.conf

@@ -4,7 +4,7 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="alexl83"
 BOOTCONFIG="orangepi-5-plus-rk3588_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
@@ -77,9 +77,9 @@ function post_family_config_branch_current__orangepi5plus_use_mainline_uboot() {
 function post_config_uboot_target__extra_configs_for_rock5b_mainline_environment_in_spi() {
 	[[ "${BRANCH}" != "edge" && "${BRANCH}" != "current" ]] && return 0
 
-	 display_alert "$BOARD" "u-boot configs for ${BOOTBRANCH} u-boot config BRANCH=${BRANCH}" "info"
+	display_alert "$BOARD" "u-boot configs for ${BOOTBRANCH} u-boot config BRANCH=${BRANCH}" "info"
 	run_host_command_logged scripts/config --set-val CONFIG_BOARD_RNG_SEED "y"
-	run_host_command_logged scripts/config --set-val ARMV8_CRYPTO "n" #broken as per 2024.10-rc3
-	run_host_command_logged scripts/config --set-val ARMV8_CE_SHA1 "n" #broken as per 2024.10-rc3
+	run_host_command_logged scripts/config --set-val ARMV8_CRYPTO "n"    #broken as per 2024.10-rc3
+	run_host_command_logged scripts/config --set-val ARMV8_CE_SHA1 "n"   #broken as per 2024.10-rc3
 	run_host_command_logged scripts/config --set-val ARMV8_CE_SHA256 "n" #broken as per 2024.10-rc3
 }

config/boards/orangepi5.conf

@@ -5,7 +5,7 @@ BOARD_MAINTAINER="efectn"
 BOOTCONFIG="orangepi-5-rk3588s_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOTCONFIG_SATA="orangepi-5-sata-rk3588s_defconfig"
 BOOT_SOC="rk3588"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
@@ -71,11 +71,9 @@ function post_family_config__orangepi5_uboot_add_sata_target() {
 	fi
 
 	display_alert "$BOARD" "Configuring ($BOARD) standard and sata uboot target map" "info"
-
-	UBOOT_TARGET_MAP="
-	BL31=$RKBIN_DIR/$BL31_BLOB $BOOTCONFIG spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb rkspi_loader.img
-	BL31=$RKBIN_DIR/$BL31_BLOB $BOOTCONFIG_SATA spl/u-boot-spl.bin u-boot.dtb u-boot.itb;; rkspi_loader_sata.img
-	"
+	# Note: whitespace/newlines are significant; BOOT_SUPPORT_SPI & BOOT_SPI_RKSPI_LOADER influence the postprocess step that runs for _every_ target and produces rkspi_loader.img
+	UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB $BOOTCONFIG spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb rkspi_loader.img
+	BL31=$RKBIN_DIR/$BL31_BLOB $BOOTCONFIG_SATA spl/u-boot-spl.bin u-boot.dtb u-boot.itb;; rkspi_loader_sata.img"
 }
 
 function post_family_config_branch_edge__uboot_config() {

config/boards/orangepi5pro.csc

@@ -28,11 +28,9 @@ function post_family_tweaks__orangepi5pro_naming_audios() {
 
 function post_family_config_branch_vendor__orangepi5pro_uboot_add_sata_target() {
 	display_alert "$BOARD" "Configuring ($BOARD) standard and sata uboot target map" "info"
-
-	UBOOT_TARGET_MAP="
-	BL31=$RKBIN_DIR/$BL31_BLOB $BOOTCONFIG spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb rkspi_loader.img
-	BL31=$RKBIN_DIR/$BL31_BLOB $BOOTCONFIG_SATA spl/u-boot-spl.bin u-boot.dtb u-boot.itb;; rkspi_loader_sata.img
-	"
+	# Note: whitespace/newlines are significant; BOOT_SUPPORT_SPI & BOOT_SPI_RKSPI_LOADER influence the postprocess step that runs for _every_ target and produces rkspi_loader.img
+	UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB $BOOTCONFIG spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb rkspi_loader.img
+	BL31=$RKBIN_DIR/$BL31_BLOB $BOOTCONFIG_SATA spl/u-boot-spl.bin u-boot.dtb u-boot.itb;; rkspi_loader_sata.img"
 }
 
 function post_uboot_custom_postprocess__create_sata_spi_image() {

config/boards/pineh64-b.csc

@@ -5,5 +5,5 @@ BOARD_MAINTAINER=""
 BOOTCONFIG="pine_h64_defconfig"
 KERNEL_TARGET="legacy,current,edge"
 KERNEL_TEST_TARGET="current"
-BOOT_FDT_FILE="allwinner/sun50i-h6-pine-h64-model-b.dtb"
+BOOT_FDT_FILE="sun50i-h6-pine-h64-model-b.dtb"
 CRUSTCONFIG="h6_defconfig"

config/boards/pocketchip-sd.csc

@@ -0,0 +1,8 @@
+# Allwinner R8(A13) single core 512Mb (NextThing C.H.I.P.) with MMC2 breakout
+BOARD_NAME="NextThing C.H.I.P."
+BOARDFAMILY="sun5i"
+BOARD_MAINTAINER="TheSnowfield"
+HAS_VIDEO_OUTPUT="yes"
+BOOTCONFIG="CHIP_defconfig"
+KERNEL_TARGET="current"
+KERNEL_TEST_TARGET="current"

config/boards/radxa-e20c.csc

@@ -8,5 +8,4 @@ FULL_DESKTOP="no"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3528-radxa-e20c.dtb"
 BOOT_SCENARIO="spl-blobs"
-WIREGUARD="no"
 IMAGE_PARTITION_TABLE="gpt"

config/boards/radxa-e25.csc

@@ -3,7 +3,7 @@ BOARD_NAME="Radxa E25"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER="krachlatte"
 BOOTCONFIG="radxa-e25-rk3568_defconfig"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"

config/boards/radxa-zero.conf

@@ -13,6 +13,7 @@ FORCE_BOOTSCRIPT_UPDATE="yes"
 BOOT_LOGO="desktop"
 ASOUND_STATE="asound.state.radxa-zero"
 BOOT_FDT_FILE="amlogic/meson-g12a-radxa-zero.dtb"
+OVERLAY_PREFIX="meson-g12a"
 
 # Newer u-boot for the Zero
 BOOTBRANCH_BOARD="tag:v2023.07.02"

config/boards/retro-lite-cm5.csc

@@ -23,4 +23,3 @@ function post_family_tweaks__retrolitecm5_naming_audios() {
 
 	return 0
 }
-

config/boards/retroidpocket-rp5.csc

@@ -0,0 +1,123 @@
+# Retroid Pocket RP5 Configuration
+declare -g BOARD_NAME="Retroid Pocket RP5"
+declare -g BOARD_MAINTAINER=""
+declare -g BOARDFAMILY="sm8250"
+declare -g KERNEL_TARGET="current"
+declare -g EXTRAWIFI="no"
+declare -g MODULES="panel_ddic_ch13726a"
+declare -g BOOTCONFIG="none"
+
+declare -g UEFI_GRUB_TERMINAL="gfxterm" # Use graphics in grub, for the Armbian wallpaper.
+declare -g GRUB_CMDLINE_LINUX_DEFAULT="clk_ignore_unused pd_ignore_unused arm64.nopauth efi=noruntime fbcon=rotate:3 console=ttyMSM0,115200n8"
+declare -g BOOT_FDT_FILE="qcom/sm8250-retroidpocket-rp5.dtb"
+
+declare -g SERIALCON="${SERIALCON:-tty1}"
+
+enable_extension "grub"
+enable_extension "grub-with-dtb" # important, puts the whole DTB handling in place.
+
+# declare -g BOOT_LOGO=desktop
+
+# Use the full firmware, complete linux-firmware plus Armbian's
+declare -g BOARD_FIRMWARE_INSTALL="-full"
+
+function retroidpocket-rp5_is_userspace_supported() {
+	[[ "${RELEASE}" == "bookworm" ]] && return 0
+	[[ "${RELEASE}" == "jammy" ]] && return 0
+	[[ "${RELEASE}" == "noble" ]] && return 0
+	[[ "${RELEASE}" == "trixie" ]] && return 0
+	return 1
+}
+
+function pre_customize_image__retroidpocket-rp5_alsa_ucm_conf() {
+	if ! retroidpocket-rp5_is_userspace_supported; then
+		return 0
+	fi
+
+	display_alert "Add alsa-ucm-conf for ${BOARD}" "${RELEASE}" "warn"
+	(
+		cd "${SDCARD}/usr/share/alsa" || exit 6
+		curl -L "https://github.com/RetroidPocket/alsa-ucm-conf/archive/refs/heads/rp/v1.2.13.tar.gz" | tar xvzf - --strip-components=1
+	)
+}
+
+function post_family_tweaks_bsp__retroidpocket-rp5_add_services() {
+	if ! retroidpocket-rp5_is_userspace_supported; then
+		if [[ "${RELEASE}" != "" ]]; then
+			display_alert "Missing userspace for ${BOARD}" "${RELEASE} does not have the userspace necessary to support the ${BOARD}" "warn"
+		fi
+		return 0
+	fi
+
+	display_alert "$BOARD" "Add services" "info"
+
+	# Bluetooth MAC addr setup service
+	mkdir -p $destination/usr/local/bin/
+	mkdir -p $destination/usr/lib/systemd/system/
+	install -Dm655 $SRC/packages/bsp/generate-bt-mac-addr/bt-fixed-mac.sh $destination/usr/local/bin/
+	install -Dm644 $SRC/packages/bsp/generate-bt-mac-addr/bt-fixed-mac.service $destination/usr/lib/systemd/system/
+
+	# Haptic and Gamepad rules
+	install -Dm644 $SRC/packages/bsp/retroidpocket/90-feedbackd-spmi-haptics.rules $destination/etc/udev/rules.d/90-feedbackd-spmi-haptics.rules
+	install -Dm644 $SRC/packages/bsp/retroidpocket/99-ignore-gamepad.rules $destination/etc/udev/rules.d/99-ignore-gamepad.rules
+}
+
+function post_family_tweaks__retroidpocket-rp5_enable_services() {
+	if ! retroidpocket-rp5_is_userspace_supported; then
+		if [[ "${RELEASE}" != "" ]]; then
+			display_alert "Missing userspace for ${BOARD}" "${RELEASE} does not have the userspace necessary to support the ${BOARD}" "warn"
+		fi
+		return 0
+	fi
+
+	display_alert "$BOARD" "Enable services" "info"
+
+	chroot_sdcard systemctl enable bt-fixed-mac.service
+	return 0
+}
+
+function post_family_config__retroidpocket-rp5_extra_packages() {
+	if ! retroidpocket-rp5_is_userspace_supported; then
+		if [[ "${RELEASE}" != "" ]]; then
+			display_alert "Missing userspace for ${BOARD}" "${RELEASE} does not have the userspace necessary to support the ${BOARD}" "warn"
+		fi
+		return 0
+	fi
+
+	display_alert "Setting up extra packages for ${BOARD}" "${RELEASE}" "info"
+	add_packages_to_image "bluez" "bluetooth"        # for bluetooth stuff
+	add_packages_to_image "mtools"                   # for access to the EFI partition
+	add_packages_to_image "zstd"                     # for zstd compression of initrd
+}
+
+function post_family_tweaks_bsp__retroidpocket-rp5_bsp_firmware_in_initrd() {
+	display_alert "Adding to bsp-cli" "${BOARD}: firmware in initrd" "info"
+	declare file_added_to_bsp_destination # will be filled in by add_file_from_stdin_to_bsp_destination
+	add_file_from_stdin_to_bsp_destination "/etc/initramfs-tools/hooks/retroidpocket-rp5-firmware" <<- 'FIRMWARE_HOOK'
+		#!/bin/bash
+		[[ "$1" == "prereqs" ]] && exit 0
+		. /usr/share/initramfs-tools/hook-functions
+		for f in /lib/firmware/qcom/sm8250/* ; do
+			add_firmware "${f#/lib/firmware/}"
+		done
+		add_firmware "qcom/a650_sqe.fw" # extra one for dpu
+		add_firmware "qcom/a650_gmu.bin" # extra one for gpu
+	FIRMWARE_HOOK
+	run_host_command_logged chmod -v +x "${file_added_to_bsp_destination}"
+}
+
+## Modules, required to boot, add them to initrd
+function post_family_tweaks_bsp__retroidpocket-rp5_bsp_modules_in_initrd() {
+	display_alert "Adding to bsp-cli" "${BOARD}: modules in initrd" "info"
+	add_file_from_stdin_to_bsp_destination "/etc/initramfs-tools/modules" <<- 'EXTRA_MODULES'
+		panel-ddic-ch13726a
+	EXTRA_MODULES
+}
+
+# armbian-firstrun waits for systemd to be ready, but snapd.seeded might cause it to hang due to wrong clock.
+# if the battery runs out, the clock is reset to 1970. This causes snapd.seeded to hang, and armbian-firstrun to hang.
+function pre_customize_image__disable_snapd_seeded() {
+	[[ "${DISTRIBUTION}" != "Ubuntu" ]] && return 0 # only needed for Ubuntu
+	display_alert "Disabling snapd.seeded" "${BOARD}" "info"
+	chroot_sdcard systemctl disable snapd.seeded.service "||" true
+}

config/boards/retroidpocket-rpmini.csc

@@ -0,0 +1,123 @@
+# Retroid Pocket RPMini Configuration
+declare -g BOARD_NAME="Retroid Pocket RPMini"
+declare -g BOARD_MAINTAINER=""
+declare -g BOARDFAMILY="sm8250"
+declare -g KERNEL_TARGET="current"
+declare -g EXTRAWIFI="no"
+declare -g MODULES="panel_ddic_ch13726a"
+declare -g BOOTCONFIG="none"
+
+declare -g UEFI_GRUB_TERMINAL="gfxterm" # Use graphics in grub, for the Armbian wallpaper.
+declare -g GRUB_CMDLINE_LINUX_DEFAULT="clk_ignore_unused pd_ignore_unused arm64.nopauth efi=noruntime fbcon=rotate:1 console=ttyMSM0,115200n8"
+declare -g BOOT_FDT_FILE="qcom/sm8250-retroidpocket-rpmini.dtb"
+
+declare -g SERIALCON="${SERIALCON:-tty1}"
+
+enable_extension "grub"
+enable_extension "grub-with-dtb" # important, puts the whole DTB handling in place.
+
+# declare -g BOOT_LOGO=desktop
+
+# Use the full firmware, complete linux-firmware plus Armbian's
+declare -g BOARD_FIRMWARE_INSTALL="-full"
+
+function retroidpocket-rpmini_is_userspace_supported() {
+	[[ "${RELEASE}" == "bookworm" ]] && return 0
+	[[ "${RELEASE}" == "jammy" ]] && return 0
+	[[ "${RELEASE}" == "noble" ]] && return 0
+	[[ "${RELEASE}" == "trixie" ]] && return 0
+	return 1
+}
+
+function pre_customize_image__retroidpocket-rpmini_alsa_ucm_conf() {
+	if ! retroidpocket-rpmini_is_userspace_supported; then
+		return 0
+	fi
+
+	display_alert "Add alsa-ucm-conf for ${BOARD}" "${RELEASE}" "warn"
+	(
+		cd "${SDCARD}/usr/share/alsa" || exit 6
+		curl -L "https://github.com/RetroidPocket/alsa-ucm-conf/archive/refs/heads/rp/v1.2.13.tar.gz" | tar xvzf - --strip-components=1
+	)
+}
+
+function post_family_tweaks_bsp__retroidpocket-rpmini_add_services() {
+	if ! retroidpocket-rpmini_is_userspace_supported; then
+		if [[ "${RELEASE}" != "" ]]; then
+			display_alert "Missing userspace for ${BOARD}" "${RELEASE} does not have the userspace necessary to support the ${BOARD}" "warn"
+		fi
+		return 0
+	fi
+
+	display_alert "$BOARD" "Add services" "info"
+
+	# Bluetooth MAC addr setup service
+	mkdir -p $destination/usr/local/bin/
+	mkdir -p $destination/usr/lib/systemd/system/
+	install -Dm655 $SRC/packages/bsp/generate-bt-mac-addr/bt-fixed-mac.sh $destination/usr/local/bin/
+	install -Dm644 $SRC/packages/bsp/generate-bt-mac-addr/bt-fixed-mac.service $destination/usr/lib/systemd/system/
+
+	# Haptic and Gamepad rules
+	install -Dm644 $SRC/packages/bsp/retroidpocket/90-feedbackd-spmi-haptics.rules $destination/etc/udev/rules.d/90-feedbackd-spmi-haptics.rules
+	install -Dm644 $SRC/packages/bsp/retroidpocket/99-ignore-gamepad.rules $destination/etc/udev/rules.d/99-ignore-gamepad.rules
+}
+
+function post_family_tweaks__retroidpocket-rpmini_enable_services() {
+	if ! retroidpocket-rpmini_is_userspace_supported; then
+		if [[ "${RELEASE}" != "" ]]; then
+			display_alert "Missing userspace for ${BOARD}" "${RELEASE} does not have the userspace necessary to support the ${BOARD}" "warn"
+		fi
+		return 0
+	fi
+
+	display_alert "$BOARD" "Enable services" "info"
+
+	chroot_sdcard systemctl enable bt-fixed-mac.service
+	return 0
+}
+
+function post_family_config__retroidpocket-rpmini_extra_packages() {
+	if ! retroidpocket-rpmini_is_userspace_supported; then
+		if [[ "${RELEASE}" != "" ]]; then
+			display_alert "Missing userspace for ${BOARD}" "${RELEASE} does not have the userspace necessary to support the ${BOARD}" "warn"
+		fi
+		return 0
+	fi
+
+	display_alert "Setting up extra packages for ${BOARD}" "${RELEASE}" "info"
+	add_packages_to_image "bluez" "bluetooth"        # for bluetooth stuff
+	add_packages_to_image "mtools"                   # for access to the EFI partition
+	add_packages_to_image "zstd"                     # for zstd compression of initrd
+}
+
+function post_family_tweaks_bsp__retroidpocket-rpmini_bsp_firmware_in_initrd() {
+	display_alert "Adding to bsp-cli" "${BOARD}: firmware in initrd" "info"
+	declare file_added_to_bsp_destination # will be filled in by add_file_from_stdin_to_bsp_destination
+	add_file_from_stdin_to_bsp_destination "/etc/initramfs-tools/hooks/retroidpocket-rpmini-firmware" <<- 'FIRMWARE_HOOK'
+		#!/bin/bash
+		[[ "$1" == "prereqs" ]] && exit 0
+		. /usr/share/initramfs-tools/hook-functions
+		for f in /lib/firmware/qcom/sm8250/* ; do
+			add_firmware "${f#/lib/firmware/}"
+		done
+		add_firmware "qcom/a650_sqe.fw" # extra one for dpu
+		add_firmware "qcom/a650_gmu.bin" # extra one for gpu
+	FIRMWARE_HOOK
+	run_host_command_logged chmod -v +x "${file_added_to_bsp_destination}"
+}
+
+## Modules, required to boot, add them to initrd
+function post_family_tweaks_bsp__retroidpocket-rpmini_bsp_modules_in_initrd() {
+	display_alert "Adding to bsp-cli" "${BOARD}: modules in initrd" "info"
+	add_file_from_stdin_to_bsp_destination "/etc/initramfs-tools/modules" <<- 'EXTRA_MODULES'
+		panel-ddic-ch13726a
+	EXTRA_MODULES
+}
+
+# armbian-firstrun waits for systemd to be ready, but snapd.seeded might cause it to hang due to wrong clock.
+# if the battery runs out, the clock is reset to 1970. This causes snapd.seeded to hang, and armbian-firstrun to hang.
+function pre_customize_image__disable_snapd_seeded() {
+	[[ "${DISTRIBUTION}" != "Ubuntu" ]] && return 0 # only needed for Ubuntu
+	display_alert "Disabling snapd.seeded" "${BOARD}" "info"
+	chroot_sdcard systemctl disable snapd.seeded.service "||" true
+}

config/boards/rock-2a.csc

@@ -0,0 +1,11 @@
+# Rockchip RK3528 quad core 1-4GB SoC 1xGBe 0-32GB eMMC
+BOARD_NAME="ROCK 2A"
+BOARDFAMILY="rk35xx"
+BOOTCONFIG="rock-2-rk3528_defconfig"
+BOARD_MAINTAINER="CodeChenL"
+KERNEL_TARGET="vendor"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3528-rock-2a.dtb"
+BOOT_SCENARIO="spl-blobs"
+IMAGE_PARTITION_TABLE="gpt"

config/boards/rock-2f.csc

@@ -0,0 +1,13 @@
+# Rockchip RK3528 quad core 1-4GB SoC WIFI/BT 0-32GB eMMC
+BOARD_NAME="ROCK 2F"
+BOARDFAMILY="rk35xx"
+BOOTCONFIG="rock-2-rk3528_defconfig"
+BOARD_MAINTAINER="CodeChenL"
+KERNEL_TARGET="vendor"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3528-rock-2f.dtb"
+BOOT_SCENARIO="spl-blobs"
+IMAGE_PARTITION_TABLE="gpt"
+enable_extension "radxa-aic8800"
+AIC8800_TYPE="usb"

config/boards/rock-3a.conf

@@ -3,7 +3,8 @@ BOARD_NAME="Rock 3A"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER="ZazaBR amazingfate catalinii vamzii"
 BOOTCONFIG="rock-3a-rk3568_defconfig"
-KERNEL_TARGET="edge,current,vendor"
+BOOTCONFIG_SATA="rock-3a-sata-rk3568_defconfig"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
@@ -18,10 +19,10 @@ function post_family_config_branch_edge__rock-3a_use_mainline_uboot() {
 	display_alert "$BOARD" "Mainline U-Boot overrides for $BOARD - $BRANCH" "info"
 	unset BOOTFS_TYPE # fixes armbian-install and unneeded for modern uboot anyway
 	declare -g BOOTCONFIG="rock-3a-rk3568_defconfig"
-	declare -g BOOTDELAY=1                           
+	declare -g BOOTDELAY=1
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot"
-	declare -g BOOTBRANCH="tag:v2024.10"
-	declare -g BOOTPATCHDIR="v2024.10"
+	declare -g BOOTBRANCH="tag:v2025.01"
+	declare -g BOOTPATCHDIR="v2025.01"
 	declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
 	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
 	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already
@@ -35,3 +36,28 @@ function post_family_config_branch_edge__rock-3a_use_mainline_uboot() {
 		flashcp -v -p "$1/u-boot-rockchip-spi.bin" /dev/mtd0
 	}
 }
+
+function post_family_config__rock3a_uboot_add_sata_target() {
+    display_alert "$BOARD" "Configuring ($BOARD) standard and sata uboot target map" "info"
+
+	UBOOT_TARGET_MAP="
+	BL31=$RKBIN_DIR/$BL31_BLOB $BOOTCONFIG spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb rkspi_loader.img
+	BL31=$RKBIN_DIR/$BL31_BLOB $BOOTCONFIG_SATA spl/u-boot-spl.bin u-boot.dtb u-boot.itb;; rkspi_loader_sata.img"
+}
+
+function post_uboot_custom_postprocess__create_sata_spi_image() {
+
+	display_alert "$BOARD" "Create rkspi_loader_sata.img" "info"
+
+	dd if=/dev/zero of=rkspi_loader_sata.img bs=1M count=0 seek=16
+	/sbin/parted -s rkspi_loader_sata.img mklabel gpt
+	/sbin/parted -s rkspi_loader_sata.img unit s mkpart idbloader 64 7167
+	/sbin/parted -s rkspi_loader_sata.img unit s mkpart vnvm 7168 7679
+	/sbin/parted -s rkspi_loader_sata.img unit s mkpart reserved_space 7680 8063
+	/sbin/parted -s rkspi_loader_sata.img unit s mkpart reserved1 8064 8127
+	/sbin/parted -s rkspi_loader_sata.img unit s mkpart uboot_env 8128 8191
+	/sbin/parted -s rkspi_loader_sata.img unit s mkpart reserved2 8192 16383
+	/sbin/parted -s rkspi_loader_sata.img unit s mkpart uboot 16384 32734
+	dd if=idbloader.img of=rkspi_loader_sata.img seek=64 conv=notrunc
+	dd if=u-boot.itb of=rkspi_loader_sata.img seek=16384 conv=notrunc
+}

config/boards/rock-5-itx.conf

@@ -3,7 +3,8 @@ BOARD_NAME="Rock 5 ITX"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="amazingfate prahal"
 BOOTCONFIG="rock-5-itx-rk3588_defconfig"
-KERNEL_TARGET="vendor"
+KERNEL_TARGET="current,edge,vendor"
+KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-rock-5-itx.dtb"
@@ -13,8 +14,8 @@ BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
 declare -g UEFI_EDK2_BOARD_ID="rock-5-itx" # This _only_ used for uefi-edk2-rk3588 extension
 
-function post_family_tweaks__rock5b_naming_audios() {
-	display_alert "$BOARD" "Renaming rock5b audios" "info"
+function post_family_tweaks__rock5itx_naming_audios() {
+	display_alert "$BOARD" "Renaming rock 5 itx audios" "info"
 
 	mkdir -p $SDCARD/etc/udev/rules.d/
 	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi1-sound", ENV{SOUND_DESCRIPTION}="HDMI1 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules

config/boards/rock-5a.conf

@@ -3,7 +3,7 @@ BOARD_NAME="Rock 5A"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="amazingfate"
 BOOTCONFIG="rock-5a-rk3588s_defconfig"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
@@ -28,8 +28,7 @@ function post_family_tweaks__rock5a_naming_audios() {
 
 function post_family_config_branch_vendor__dual_uboot_for_rock5a() {
 	display_alert "$BOARD" "Configuring ($BOARD) normal/SPI uboot target map" "info"
-	UBOOT_TARGET_MAP="
-	BL31=$RKBIN_DIR/$BL31_BLOB rock-5a-spi-rk3588s_defconfig spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;rkspi_loader.img
-	BL31=$RKBIN_DIR/$BL31_BLOB rock-5a-rk3588s_defconfig spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb
-	"
+	# Note: whitespace/newlines are significant; BOOT_SUPPORT_SPI & BOOT_SPI_RKSPI_LOADER influence the postprocess step that runs for _every_ target and produces rkspi_loader.img
+	UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB rock-5a-spi-rk3588s_defconfig spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;rkspi_loader.img
+	BL31=$RKBIN_DIR/$BL31_BLOB rock-5a-rk3588s_defconfig spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb"
 }

config/boards/rock-5b-plus.conf

@@ -4,6 +4,7 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="HeyMeco fridtjof"
 BOOTCONFIG="rock-5b-plus-rk3588_defconfig"
 KERNEL_TARGET="edge,vendor"
+KERNEL_TEST_TARGET="vendor,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-radxa-rock-5b+.dtb"
@@ -34,12 +35,12 @@ function post_family_config_branch_edge__rock-5b_use_mainline_uboot() {
 	# temporary override until DT in armbian/rockchip-linux is renamed
 	declare -g BOOT_FDT_FILE="rockchip/rk3588-rock-5b-plus.dtb"
 
-	declare -g BOOTCONFIG="rock5b-rk3588_defconfig"                       # override the default for the board/family
-	declare -g BOOTDELAY=1                                                # Wait for UART interrupt to enter UMS/RockUSB mode etc
-	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"          # We ❤️ Mainline tree
-	declare -g BOOTBRANCH="tag:v2024.10"                                  #
-	declare -g BOOTPATCHDIR="v2024.10"                                    # empty; defconfig changes are done in hook below
-	declare -g BOOTDIR="u-boot-${BOARD}"                                  # do not share u-boot directory
+	declare -g BOOTCONFIG="rock5b-rk3588_defconfig"              # override the default for the board/family
+	declare -g BOOTDELAY=1                                       # Wait for UART interrupt to enter UMS/RockUSB mode etc
+	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline tree
+	declare -g BOOTBRANCH="tag:v2024.10"                         #
+	declare -g BOOTPATCHDIR="v2024.10"                           # empty; defconfig changes are done in hook below
+	declare -g BOOTDIR="u-boot-${BOARD}"                         # do not share u-boot directory
 	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
 	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already
 

config/boards/rock-5b.conf

@@ -3,7 +3,7 @@ BOARD_NAME="Rock 5B"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="amazingfate linhz0hz"
 BOOTCONFIG="rock-5b-rk3588_defconfig"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"

config/boards/rock-5c.conf

@@ -3,7 +3,8 @@ BOARD_NAME="Rock 5C"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="schwar3kat"
 BOOTCONFIG="rock-5c-rk3588s_defconfig"
-KERNEL_TARGET="vendor,edge"
+KERNEL_TARGET="vendor,current,edge"
+KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588s-rock-5c.dtb"
@@ -14,14 +15,6 @@ enable_extension "radxa-aic8800"
 AIC8800_TYPE="usb"
 ASOUND_STATE="asound.state.rock-5c"
 
-function post_family_config__uboot_rock5c() {
-	display_alert "$BOARD" "Configuring armsom u-boot" "info"
-	declare -g BOOTSOURCE='https://github.com/radxa/u-boot.git'
-	declare -g BOOTBRANCH="branch:next-dev-v2024.03"
-	declare -g OVERLAY_PREFIX='rockchip-rk3588'
-	declare -g BOOTDELAY=1 # build injects this into u-boot config. we can then get into UMS mode and avoid the whole rockusb/rkdeveloptool thing
-}
-
 function post_family_tweaks__rock5c_naming_audios() {
 	display_alert "$BOARD" "Renaming rock5c audios" "info"
 
@@ -31,12 +24,3 @@ function post_family_tweaks__rock5c_naming_audios() {
 
 	return 0
 }
-
-function post_family_tweaks__rock5c_naming_wireless_interface() {
-	display_alert "$BOARD" "Renaming rock5c wifi" "info"
-
-	mkdir -p $SDCARD/etc/udev/rules.d/
-	echo 'SUBSYSTEM=="net", ACTION=="add", ATTR{address}=="88:00:*", NAME="$ENV{ID_NET_SLOT}"' > $SDCARD/etc/udev/rules.d/99-radxa-aic8800.rules
-
-	return 0
-}

config/boards/rock-5t.conf

@@ -0,0 +1,28 @@
+# Rockchip RK3588 SoC octa core 4-16GB SoC 2.5GBe eMMC USB3 NvME
+BOARD_NAME="Rock 5T"
+BOARDFAMILY="rockchip-rk3588"
+BOARD_MAINTAINER="HeyMeco"
+BOOTCONFIG="rock-5t-rk3588_defconfig"
+KERNEL_TARGET="vendor"
+KERNEL_TEST_TARGET="vendor"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3588-rock-5t.dtb"
+BOOT_SCENARIO="spl-blobs"
+BOOT_SUPPORT_SPI="yes"
+BOOT_SPI_RKSPI_LOADER="yes"
+IMAGE_PARTITION_TABLE="gpt"
+declare -g UEFI_EDK2_BOARD_ID="rock-5t" # This _only_ used for uefi-edk2-rk3588 extension
+
+function post_family_tweaks__rock5b_naming_audios() {
+	display_alert "$BOARD" "Renaming rock5b audios" "info"
+
+	mkdir -p $SDCARD/etc/udev/rules.d/
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi1-sound", ENV{SOUND_DESCRIPTION}="HDMI1 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmiin-sound", ENV{SOUND_DESCRIPTION}="HDMI-In Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-dp0-sound", ENV{SOUND_DESCRIPTION}="DP0 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-dp1-sound", ENV{SOUND_DESCRIPTION}="DP1 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-es8316-sound", ENV{SOUND_DESCRIPTION}="ES8316 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+
+	return 0
+}

config/boards/rock-s0.conf

@@ -2,31 +2,48 @@
 # https://radxa.com/products/rocks/s0
 
 BOARD_NAME="Rock S0"
-BOARDFAMILY=rockchip64
-BOARD_MAINTAINER=brentr
+BOARDFAMILY="rockchip64"
+BOARD_MAINTAINER="brentr"
 
-BOOTCONFIG=rock-s0-rk3308_defconfig
-BOOT_FDT_FILE=rockchip/rk3308-rock-s0.dtb
+BOOTCONFIG="rock-s0-rk3308_defconfig"
+BOOT_FDT_FILE="rockchip/rk3308-rock-s0.dtb"
 
-KERNEL_TARGET=current,edge
-KERNEL_TEST_TARGET=current
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 
-DEFAULT_CONSOLE=serial
-SERIALCON=ttyS0
+DEFAULT_CONSOLE="serial"
+SERIALCON="ttyS0"
 MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu panfrost"
-HAS_VIDEO_OUTPUT=no
+HAS_VIDEO_OUTPUT="no"
 
-BOOTBRANCH_BOARD=tag:v2024.10
-BOOTPATCHDIR=v2024.10
-BOOT_SCENARIO=binman
-DDR_BLOB=rk33/rk3308_ddr_589MHz_uart0_m0_v2.07.bin
-BL31_BLOB=rk33/rk3308_bl31_v2.26.elf
+BOOTBRANCH_BOARD="tag:v2024.10"
+BOOTPATCHDIR="v2024.10"
+BOOT_SCENARIO="binman"
+DDR_BLOB="rk33/rk3308_ddr_589MHz_uart0_m0_v2.07.bin"
+BL31_BLOB="rk33/rk3308_bl31_v2.26.elf"
+FORCE_UBOOT_UPDATE="yes"
 
-OVERLAY_PREFIX=rk3308
+OVERLAY_PREFIX="rk3308"
 
 function post_family_config__rocks0() {
 	declare -g BOOTDIR="u-boot-${BOARD}"
-	declare -g BOOTSCRIPT=boot-rockchip64-ttyS0.cmd:boot.cmd
+	declare -g BOOTSCRIPT="boot-rockchip64-ttyS0.cmd:boot.cmd"
 
-	unset family_tweaks_bsp # disable from rockchip64_common
+	family_tweaks_bsp() { #overrides rockchip64_common.inc
+		#Install udev script that derives fixed, unique MAC addresses for net interfaces
+		#that are assigned random ones
+		bsp=$SRC/packages/bsp/rockpis
+		rules=etc/udev/rules.d
+
+		install -m 755 $bsp/lib/udev/fixEtherAddr $destination/lib/udev
+	}
+}
+
+function pre_install_kernel_debs__enforce_cma() {
+	# Set CMA to 16 megabytes, to provide more usable RAM since Rock Pi S
+	# has usually a small amount of DRAM (512MB)
+	display_alert "$BOARD" "set CMA size to 16MB due to small DRAM size"
+	run_host_command_logged echo "extraargs=cma=16M" ">>" "${SDCARD}"/boot/armbianEnv.txt
+
+	return 0
 }

config/boards/rockpi-s.conf

@@ -2,31 +2,32 @@
 # https://radxa.com/products/rockpi/pis
 
 BOARD_NAME="Rockpi S"
-BOARDFAMILY=rockchip64
-BOARD_MAINTAINER=brentr
+BOARDFAMILY="rockchip64"
+BOARD_MAINTAINER="brentr"
 
-BOOTCONFIG=rock-pi-s-rk3308_defconfig
-BOOT_FDT_FILE=rockchip/rk3308-rock-pi-s.dtb
+BOOTCONFIG="rock-pi-s-rk3308_defconfig"
+BOOT_FDT_FILE="rockchip/rk3308-rock-pi-s.dtb"
 
-KERNEL_TARGET=current,edge
-KERNEL_TEST_TARGET=current
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 
-DEFAULT_CONSOLE=serial
-SERIALCON=ttyS0
+DEFAULT_CONSOLE="serial"
+SERIALCON="ttyS0"
 MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu panfrost"
-HAS_VIDEO_OUTPUT=no
+HAS_VIDEO_OUTPUT="no"
 
-BOOTBRANCH_BOARD=tag:v2024.10
-BOOTPATCHDIR=v2024.10
-BOOT_SCENARIO=binman
-DDR_BLOB=rk33/rk3308_ddr_589MHz_uart0_m0_v2.07.bin
-BL31_BLOB=rk33/rk3308_bl31_v2.26.elf
+BOOTBRANCH_BOARD="tag:v2024.10"
+BOOTPATCHDIR="v2024.10"
+BOOT_SCENARIO="binman"
+DDR_BLOB="rk33/rk3308_ddr_589MHz_uart0_m0_v2.07.bin"
+BL31_BLOB="rk33/rk3308_bl31_v2.26.elf"
+FORCE_UBOOT_UPDATE="yes"
 
-OVERLAY_PREFIX=rk3308
+OVERLAY_PREFIX="rk3308"
 
 function post_family_config__rockpis() {
 	declare -g BOOTDIR="u-boot-${BOARD}"
-	declare -g BOOTSCRIPT=boot-rockchip64-ttyS0.cmd:boot.cmd
+	declare -g BOOTSCRIPT="boot-rockchip64-ttyS0.cmd:boot.cmd"
 
 	family_tweaks_bsp() { #overrides rockchip64_common.inc
 		#Install udev script that derives fixed, unique MAC addresses for net interfaces

config/boards/rockpro64.csc

@@ -10,17 +10,15 @@ BOOT_LOGO="desktop"
 BOOT_SCENARIO="blobless"
 BOOT_SUPPORT_SPI=yes
 
-# u-boot v2024.07 for rockpro64; this includes https://github.com/u-boot/u-boot/commit/5e7cd8a119953dc2f466fea81e230d683ee03493
-BOOTBRANCH_BOARD="tag:v2024.07"
-BOOTPATCHDIR="v2024.07"
+BOOTBRANCH_BOARD="tag:v2025.01"
+BOOTPATCHDIR="v2025.01"
 
 # Include fw_setenv, configured to point to the correct spot on the SPI Flash
 PACKAGE_LIST_BOARD="libubootenv-tool" # libubootenv-tool provides fw_printenv and fw_setenv, for talking to U-Boot environment
 
 function post_family_config__use_mainline_uboot_rockpro64() {
-	# Use latest lts 2.8 ATF
-	ATFBRANCH='tag:lts-v2.8.16'
-	ATFPATCHDIR="atf-rockchip64" # patches for logging etc
+	# Do not set ATFBRANCH; instead uses the default from rockchip64_common, tested with v2.12.0 as of 2025.01[.09]
+
 	display_alert "$BOARD" "using ATF (blobless) ${ATFBRANCH} for ${BOOTBRANCH_BOARD} u-boot" "info"
 	# bl31.elf is copied directly from ATF build dir to uboot dir (by armbian u-boot build system)
 	UBOOT_TARGET_MAP="BL31=bl31.elf;;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
@@ -42,9 +40,7 @@ function post_config_uboot_target__extra_configs_for_rockpro64() {
 	run_host_command_logged scripts/config --set-val CONFIG_OF_LIBFDT_OVERLAY "y"
 	run_host_command_logged scripts/config --set-val CONFIG_MMC_HS400_SUPPORT "y"
 
-	# upstream defconfig already has env in SPI: https://github.com/u-boot/u-boot/blob/v2024.07/configs/rockpro64-rk3399_defconfig
-
-	# No preboot stuff for rockpro64.
+	# upstream defconfig already has env in SPI: https://github.com/u-boot/u-boot/blob/v2025.01/configs/rockpro64-rk3399_defconfig
 
 	display_alert "u-boot for ${BOARD}" "u-boot: enable EFI debugging command" "info"
 	run_host_command_logged scripts/config --enable CMD_EFIDEBUG
@@ -76,6 +72,22 @@ function post_config_uboot_target__extra_configs_for_rockpro64() {
 	run_host_command_logged scripts/config --disable USB_FUNCTION_FASTBOOT
 }
 
+function pre_config_uboot_target__rockpro64_patch_uboot_dtsi_for_ums() {
+	display_alert "u-boot for ${BOARD}" "u-boot: add to u-boot dtsi for UMS" "info" # avoid a patch, just append to the dtsi file
+	cat <<- UBOOT_BOARD_DTSI_OTG >> arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
+		&usbdrd_dwc3_0 { status = "okay"; dr_mode = "otg"; };
+	UBOOT_BOARD_DTSI_OTG
+}
+
+# "rockchip-common: boot SD card first, then NVMe, then SATA, then USB, then mmc"
+# On rockpro64, mmc0 is the eMMC, mmc1 is the SD card slot https://github.com/torvalds/linux/blob/master/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi#L15-L16
+function pre_config_uboot_target__rockpro64_patch_rockchip_common_boot_order() {
+	declare -a rockchip_uboot_targets=("mmc1" "nvme" "scsi" "usb" "mmc0" "pxe" "dhcp" "spi") # for future make-this-generic delight
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: adjust boot order to '${rockchip_uboot_targets[*]}'" "info"
+	sed -i -e "s/#define BOOT_TARGETS.*/#define BOOT_TARGETS \"${rockchip_uboot_targets[*]}\"/" include/configs/rockchip-common.h
+	regular_git diff -u include/configs/rockchip-common.h || true
+}
+
 function post_family_tweaks__config_rockpro64_fwenv() {
 	display_alert "Configuring fw_printenv and fw_setenv" "for ${BOARD} and u-boot ${BOOTBRANCH_BOARD}" "info"
 	# Addresses below come from CONFIG_ENV_OFFSET and CONFIG_ENV_SIZE in https://github.com/u-boot/u-boot/blob/v2024.07/configs/rockpro64-rk3399_defconfig

config/boards/rpi4b.conf

@@ -1,7 +1,8 @@
-# Broadcom BCM2711 quad core 1-8Gb RAM SoC USB3 GBE USB-C WiFi/BT
-declare -g BOARD_NAME="Raspberry Pi 4"
+# All 64b Raspberry models from Broadcom BCM2837 - BCM271x quad core 1-16Gb RAM SoC USB3 GBE USB-C WiFi/BT
+declare -g BOARD_NAME="Raspberry Pi"
 declare -g BOARDFAMILY="bcm2711"
 declare -g BOARD_MAINTAINER="PanderMusubi teknoid"
-declare -g KERNEL_TARGET="legacy,current,edge"
+declare -g KERNEL_TARGET="current,edge"
 declare -g ASOUND_STATE="asound.state.rpi"
 declare -g KERNEL_TEST_TARGET="current"
+declare -g MODULES="i2c_dev"

config/boards/rpi5b.csc

@@ -1,31 +0,0 @@
-# Broadcom BCM2712 quad core 1-8Gb RAM SoC USB3 GBE USB-C WiFi/BT
-declare -g BOARD_NAME="Raspberry Pi 5"
-declare -g BOARDFAMILY="bcm2711"
-declare -g BOARD_MAINTAINER=""
-declare -g KERNEL_TARGET="current,edge"
-declare -g KERNEL_TEST_TARGET="current"
-declare -g ASOUND_STATE="asound.state.rpi"
-
-function post_family_config__rename_linux_family() {
-	display_alert "rpi5b" "Changing LINUXFAMILY" "info"
-	declare -g LINUXFAMILY=bcm2712
-}
-
-#function custom_kernel_config__rpi5b_16k_variant() {
-#	display_alert "rpi5b" "Enabling 16K page size" "info"
-#	kernel_config_modifying_hashes+=(
-#		"CONFIG_ARM64_16K_PAGES=y"
-#		"CONFIG_ARCH_MMAP_RND_BITS=18"
-#		"CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11"
-#	)
-
-#	# As kernel config is shared between two variants, override the settings
-#	# but make sure not to write them back to config/kernel directory
-#	if [[ -f .config ]] && [[ "${KERNEL_CONFIGURE:-yes}" != "yes" ]]; then
-#		display_alert "Enabling 16K page size" "armbian-kernel" "debug"
-#		kernel_config_set_y CONFIG_ARM64_16K_PAGES
-#		run_host_command_logged ./scripts/config --set-val CONFIG_ARCH_MMAP_RND_BITS 18
-#		run_host_command_logged ./scripts/config --set-val CONFIG_ARCH_MMAP_RND_COMPAT_BITS 11
-#		run_kernel_make olddefconfig
-#	fi
-#}

config/boards/sakurapi-rk3308b.csc

@@ -9,9 +9,13 @@ MODULES_LEGACY="g_serial"
 SERIALCON="ttyS0"
 KERNEL_TARGET="current"
 BOOT_FDT_FILE="rockchip/rk3308-sakurapi-rk3308b.dtb"
-MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu panfrost"
+MODULES_BLACKLIST="analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu panfrost"
 HAS_VIDEO_OUTPUT="no"
 BOOTBRANCH_BOARD="tag:v2022.04"
 BOOTPATCHDIR="u-boot-rockchip64-v2022.04"
 IMAGE_PARTITION_TABLE="gpt"
-BOOT_SCENARIO="spl-blobs"
+
+BOOT_SCENARIO="only-blobs"
+BL31_BLOB="rk33/rk3308_bl31_v2.26.elf"
+DDR_BLOB="rk33/rk3308_ddr_589MHz_uart2_m1_v1.30.bin"
+MINILOADER_BLOB="rk33/rk3308_miniloader_sd_nand_v1.13.bin"

config/boards/sk-am62b.conf

@@ -9,8 +9,7 @@ BOOT_FDT_FILE="ti/k3-am625-sk.dts"
 TIBOOT3_BOOTCONFIG="am62x_evm_r5_defconfig"
 TIBOOT3_FILE="tiboot3-am62x-hs-fs-evm.bin"
 DEFAULT_CONSOLE="serial"
-HAS_VIDEO_OUTPUT="no"
-KERNEL_TARGET="edge"
-KERNEL_TEST_TARGET="edge"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 SERIALCON="ttyS2"
 ATF_BOARD="lite"

config/boards/sk-am68.conf

@@ -10,6 +10,7 @@ TIBOOT3_BOOTCONFIG="j721s2_evm_r5_defconfig"
 TIBOOT3_FILE="tiboot3-j721s2-hs-fs-evm.bin"
 DEFAULT_CONSOLE="serial"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 SERIALCON="ttyS2"
 ATF_BOARD="generic"
 ATF_K3_USART_OFFSET="K3_USART=0x8"

config/boards/sk-tda4vm.conf

@@ -9,6 +9,8 @@ BOOT_FDT_FILE="ti/k3-j721e-sk.dts"
 TIBOOT3_BOOTCONFIG="j721e_evm_r5_defconfig"
 TIBOOT3_FILE="tiboot3-j721e-gp-evm.bin"
 SYSFW_FILE="sysfw-j721e-gp-evm.itb"
+TISPL_FILE="tispl.bin_unsigned"
+UBOOT_FILE="u-boot.img_unsigned"
 DEFAULT_CONSOLE="serial"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"

config/boards/station-m2.csc

@@ -3,23 +3,15 @@ BOARD_NAME="Station M2"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER=""
 BOOTCONFIG="station-m2-rk3566_defconfig"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
-BOOT_FDT_FILE="rockchip/rk3566-firefly-roc-pc.dtb"
+BOOT_FDT_FILE="rockchip/rk3566-roc-pc.dtb"
 BOOT_SCENARIO="spl-blobs"
 ASOUND_STATE="asound.state.station-m2"
 IMAGE_PARTITION_TABLE="gpt"
 
-function post_family_tweaks__station_m2() {
-	display_alert "$BOARD" "Installing board tweaks" "info"
-
-	cp -R $SRC/packages/blobs/station/firmware/* $SDCARD/lib/firmware/
-
-	return 0
-}
-
 # Override family config for this board; let's avoid conditionals in family config.
 function post_family_config__stationm2_use_radxa_vendor_uboot() {
 	BOOTSOURCE='https://github.com/radxa/u-boot.git'

config/boards/station-p2.csc

@@ -11,15 +11,6 @@ BOOT_FDT_FILE="rockchip/rk3568-roc-pc.dtb"
 ASOUND_STATE="asound.state.station-p2"
 IMAGE_PARTITION_TABLE="gpt"
 
-function post_family_tweaks__station_p2() {
-	display_alert "$BOARD" "Installing board tweaks" "info"
-
-	cp -R $SRC/packages/blobs/rtl8723bt_fw/* $SDCARD/lib/firmware/rtl_bt/
-	cp -R $SRC/packages/blobs/station/firmware/* $SDCARD/lib/firmware/
-
-	return 0
-}
-
 # Mainline U-Boot
 function post_family_config__station_p2_use_mainline_uboot() {
 	display_alert "$BOARD" "Using mainline U-Boot for $BOARD / $BRANCH" "info"

config/boards/thinkpad-x13s.conf

@@ -10,18 +10,16 @@ declare -g BOOT_LOGO=desktop
 # Absolutely watch this video https://www.youtube.com/watch?v=qffWt4o334Y - jhovold explains it all there.
 # @TODO list
 #  - cleanup the .config using jhovold's defconfig.
-#  - consider dropping steev's kernel in favor of jhovold's.
+#  - consider dropping steev's kernel in favor of jhovold's. [DONE]
 #  - rework the initramfs firmware/modules required, according to jhovold's defconfig-commit-msg instructions
 ###########################################################################################################
 # Userspace TO-DO:
-# - (mantic/others?) hangs waiting for the EFI partition via UUID, why? [yeah WHY?!]
 # - deploy fprintd/libpam-fprintd (sic) for fingerprint authentication [done]
 # - (ubuntu, mantic for sure): protection-domain-mapper's pd-mapper.service has a condition on "-laptop" kernel, use override to get rid of it [done]
 
 # This board boots via EFI/Grub, but requires a DTB to be passed, from Grub, to the Kernel.
 declare -g GRUB_CMDLINE_LINUX_DEFAULT="clk_ignore_unused pd_ignore_unused arm64.nopauth efi=noruntime" # iommu.passthrough=0 iommu.strict=0 pcie_aspm.policy=powersupersave
 declare -g BOOT_FDT_FILE="qcom/sc8280xp-lenovo-thinkpad-x13s.dtb"
-# declare -g UEFI_MOUNT_POINT_SKIP_FSTAB="yes" # If we leave the /boot/efi in fstab, systemd hangs waiting for it; FIXED: by adding mtools pkg
 
 enable_extension "grub-with-dtb" # important, puts the whole DTB handling in place.
 
@@ -29,8 +27,8 @@ enable_extension "grub-with-dtb" # important, puts the whole DTB handling in pla
 declare -g BOARD_FIRMWARE_INSTALL="-full"
 
 function post_family_config_branch_sc8280xp__jhovolds_wip_kernel() {
-	declare -g KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel.
-	declare -g KERNELBRANCH='branch:wip/sc8280xp-6.12' # @TODO: this is down to 27 patches, from hundreds back in the day. Considering merging this with default arm64 uefi kernel
+	declare -g KERNEL_MAJOR_MINOR="6.13" # Major and minor versions of this kernel.
+	declare -g KERNELBRANCH='branch:wip/sc8280xp-6.13' # @TODO: this is down to 23 patches, from hundreds back in the day. Considering merging this with default arm64 uefi kernel
 	declare -g KERNELSOURCE='https://github.com/jhovold/linux.git'
 	declare -g LINUXCONFIG="linux-${ARCH}-${BRANCH}" # for this board: linux-arm64-sc8280xp
 	display_alert "Set up jhovold's kernel ${KERNELBRANCH} for" "${BOARD}" "info"