Bump sharkdp/bat from 0.24.0 to 0.25.0 in lib/functions/general/bat-cat.sh

.github/CODEOWNERS

@@ -25,19 +25,21 @@ config/boards/avaota-a1.csc		@chainsx
 config/boards/ayn-odin2.eos		@FantasyGmm
 config/boards/bananapi.conf		@DylanHP @janprunk
 config/boards/bananapicm4io.conf		@pyavitz
-config/boards/bananapim2pro.conf		@bretmlw
+config/boards/bananapim2pro.conf		@igorpecovnik
 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
@@ -90,20 +92,20 @@ 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
 config/boards/orangepi4.csc		@paolosabatino
-config/boards/orangepi5-plus.conf		@alexl83 @efectn
+config/boards/orangepi5-plus.conf		@alexl83
 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
@@ -123,6 +125,7 @@ config/boards/rk3328-heltec.csc		@sicXnull
 config/boards/rock-3a.conf		@ZazaBR @amazingfate @catalinii @vamzii
 config/boards/rock-5-itx.conf		@amazingfate @prahal
 config/boards/rock-5a.conf		@amazingfate
+config/boards/rock-5b-plus.conf		@HeyMeco @fridtjof
 config/boards/rock-5b.conf		@amazingfate @linhz0hz
 config/boards/rock-5c.conf		@schwar3kat
 config/boards/rock-s0.conf		@brentr
@@ -140,7 +143,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
@@ -151,22 +154,22 @@ 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-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 @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 @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
+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 @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @efectn @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-rockchip-rk3588-*.config		@ColorfulRhino @HeyMeco @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @efectn @fridtjof @lanefu @linhz0hz @rpardini @schwar3kat
+config/kernel/linux-rockchip64-*.config		@150balbes @JohnTheCoolingFan @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-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,14 +186,14 @@ 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/meson64-*/		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @clee @engineer-80 @igorpecovnik @jeanrhum @monkaBlyat @pyavitz @rpardini @teknoid
 patch/kernel/mvebu-*/		@Heisath
 patch/kernel/odroidxu4-*/		@joekhoobyar
 patch/kernel/phytium-embedded-*/		@chainsx
-patch/kernel/rk35xx-vendor-*/		@ColorfulRhino @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
+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 @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @efectn @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/rockchip-rk3588-*/		@ColorfulRhino @HeyMeco @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @efectn @fridtjof @lanefu @linhz0hz @rpardini @schwar3kat
+patch/kernel/rockchip64-*/		@150balbes @JohnTheCoolingFan @Manouchehri @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @amazingfate @andyshrk @brentr @catalinii @clee @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @paolosabatino @prahal @rpardini @sicXnull @tdleiyao @utlark @vamzii
 patch/kernel/sm8250-*/		@FantasyGmm @amazingfate
 patch/kernel/sm8550-*/		@FantasyGmm
 patch/kernel/sun55iw3-syterkit-*/		@chainsx
@@ -201,14 +204,14 @@ 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/meson64.conf		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @clee @engineer-80 @igorpecovnik @jeanrhum @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 @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
-sources/families/rockchip-rk3588.conf		@ColorfulRhino @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @efectn @lanefu @linhz0hz @rpardini @schwar3kat
+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 @JohnTheCoolingFan @Manouchehri @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @amazingfate @andyshrk @brentr @catalinii @clee @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @paolosabatino @prahal @rpardini @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

.gitignore

@@ -15,8 +15,7 @@ ubuntu-*-cloudimg-console.log
 /.tmp/
 /output/
 /cache/
-/*userpatches*/
-/userpatches
+
 
 ### General annoyances ###
 .DS_Store

README.md

@@ -1,3 +1,6 @@
+# DEPRECATED:
+# This branch will not receive any further updates or fixes. Do NOT open bug reports when using it.
+
 <p align="center">
   <a href="#build-framework">
   <img src=".github/armbian-logo.png" alt="Armbian logo" width="144">
@@ -26,7 +29,7 @@
 - Superuser rights (configured sudo or root access).
 - Make sure your system is up-to-date! Outdated Docker binaries, for example, can cause trouble.
 
-For stable branch use `--branch=v24.08`
+For stable branch use `--branch=v24.11`
 
 ```bash
 apt-get -y install git
@@ -82,9 +85,10 @@ Generated image will be uploaded to your repository release. Note: GitHub upload
 
 ## More information:
 
-- [Building Armbian](https://docs.armbian.com/Developer-Guide_Build-Preparation/) (how to start, how to automate)
-- [Build options](https://docs.armbian.com/Developer-Guide_Build-Options/) (all build options)
+- [Building Armbian](https://docs.armbian.com/Developer-Guide_Build-Preparation/) (how to start)
+- [Build commands](https://docs.armbian.com/Developer-Guide_Build-Commands/) and [switches](https://docs.armbian.com/Developer-Guide_Build-Switches/) (build options)
 - [User configuration](https://docs.armbian.com/Developer-Guide_User-Configurations/) (how to add packages, patches, and override sources config)
+- [System config](https://docs.armbian.com/User-Guide_Armbian-Config/) (menu driven utility to setup OS and HW features)
 
 ## Download prebuilt images releases
 

config/boards/aml-s9xx-box.tvb

@@ -31,7 +31,7 @@ function post_family_tweaks_bsp__config_aml-s9xx-box_bsp() {
 	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/sbin/armbian-install
+	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.

config/boards/armsom-cm5-io.csc

@@ -11,7 +11,7 @@ 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"
+	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"

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

@@ -0,0 +1,30 @@
+# Rockchip RK3576 SoC octa core 8-64GB SoC GBe eMMC USB3 NvME WIFI
+BOARD_NAME="ArmSoM CM5 CM4 IO"
+BOARDFAMILY="rk35xx"
+BOOTCONFIG="armsom-cm5-rpi-cm4-io-rk3576_defconfig"
+KERNEL_TARGET="vendor"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3576-armsom-cm5-rpi-cm4-io.dtb"
+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"
+
+	mkdir -p $SDCARD/etc/udev/rules.d/
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi0-sound", ENV{SOUND_DESCRIPTION}="HDMI0 Audio"' > $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+
+	return 0
+}

config/boards/armsom-sige1.csc

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

config/boards/armsom-sige5.csc

@@ -11,7 +11,7 @@ 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"
+	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"

config/boards/bananapif3.csc → config/boards/bananapif3.eos

@@ -12,7 +12,7 @@ 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/bananapim2pro.conf

@@ -1,7 +1,7 @@
 # Amlogic S905X3 quad core 2-4GB RAM SoC eMMC GBE USB3 SPI Wifi
 BOARD_NAME="Banana Pi M2Pro"
 BOARDFAMILY="meson-sm1"
-BOARD_MAINTAINER="bretmlw"
+BOARD_MAINTAINER="igorpecovnik"
 BOOTCONFIG="bananapi-m2-pro_defconfig"
 BOOT_FDT_FILE="amlogic/meson-sm1-bananapi-m2-pro.dtb"
 KERNEL_TARGET="current,edge"
@@ -10,8 +10,8 @@ MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost
 FULL_DESKTOP="yes"
 SERIALCON="ttyAML0"
 BOOT_LOGO="desktop"
-BOOTBRANCH_BOARD="tag:v2023.07.02"
-BOOTPATCHDIR="v2023.07.02"
+BOOTBRANCH_BOARD="tag:v2024.07"
+BOOTPATCHDIR="v2024.07"
 
 function fetch_sources_tools__libreelec_amlogic_fip_pre_m2-pro_blob_update() {
 	fetch_from_repo "https://github.com/Dangku/amlogic-boot-fip" "amlogic-boot-fip" "branch:master"

config/boards/bananapim3.csc

@@ -6,3 +6,6 @@ BOOTCONFIG="Sinovoip_BPI_M3_defconfig"
 OVERLAY_PREFIX="sun8i-a83t"
 KERNEL_TARGET="legacy,current,edge"
 KERNEL_TEST_TARGET="current"
+
+BOOTBRANCH="tag:v2024.01"
+BOOTPATCHDIR="u-boot-sunxi/board_${BOARD}"

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/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"