[pull] main from armbian:main

.github/CODEOWNERS

@@ -17,6 +17,7 @@ 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
@@ -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,7 @@ config/boards/mekotronics-r58-minipc.csc		@monkaBlyat
 config/boards/mekotronics-r58x-4g.csc		@monkaBlyat
 config/boards/mekotronics-r58x.csc		@monkaBlyat
 config/boards/mixtile-blade3.csc		@rpardini
+config/boards/mkspi.csc		@redrathnure
 config/boards/nanopct6-lts.conf		@SuperKali @Tonymac32
 config/boards/nanopct6.conf		@SuperKali @Tonymac32
 config/boards/nanopi-m6.conf		@efectn
@@ -84,13 +88,14 @@ config/boards/nanopiduo.csc		@sgjava
 config/boards/nanopim4v2.conf		@igorpecovnik
 config/boards/nanopineocore2.csc		@AGM1968
 config/boards/nanopineoplus2.csc		@teknoid
+config/boards/odroidc1.conf		@juanlufont
 config/boards/odroidc2.conf		@teknoid
 config/boards/odroidc4.conf		@igorpecovnik
 config/boards/odroidhc4.conf		@igorpecovnik
 config/boards/odroidm1.conf		@rpardini
 config/boards/odroidn2.conf		@NicoD-SBC
 config/boards/odroidxu4.conf		@joekhoobyar
-config/boards/olimex-teres-a64.conf		@Kreyren
+config/boards/olimex-teres-a64.csc		@Kreyren
 config/boards/onecloud.conf		@hzyitc
 config/boards/oneplus-kebab.conf		@amazingfate
 config/boards/orangepi4-lts.conf		@paolosabatino
@@ -100,10 +105,10 @@ 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
@@ -141,7 +146,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,22 +157,21 @@ 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 @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
@@ -183,15 +187,14 @@ 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 @utlark @vamzii
 patch/kernel/sm8250-*/		@FantasyGmm @amazingfate
 patch/kernel/sm8550-*/		@FantasyGmm
 patch/kernel/sun55iw3-syterkit-*/		@chainsx
@@ -201,15 +204,14 @@ 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 @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

VERSION

@@ -1 +1 @@
-24.11.0-trunk
+25.02.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.tvb

@@ -0,0 +1,51 @@
+# 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"
+MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost
+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/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/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/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/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-rc3"
+	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already
+
+	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
+	function write_uboot_platform() {
+		dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
+	}
+
+	function write_uboot_platform_mtd() {
+		flashcp -v -p "$1/u-boot-rockchip-spi.bin" /dev/mtd0
+	}
+}

config/boards/hinlink-h66k.csc

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

config/boards/hinlink-h68k.csc

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

config/boards/hinlink-hnas.csc

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