Merge branch 'main' into fix_slow_image_creation

config/boards/rockpi-4bplus.csc

@@ -3,7 +3,7 @@ BOARD_NAME="Rockpi 4B+"
 BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER=""
 BOOTCONFIG="rock-pi-4-rk3399_defconfig"
-KERNEL_TARGET="edge"
+KERNEL_TARGET="current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3399-rock-pi-4b-plus.dtb"

config/boards/sweet-potato.conf

@@ -0,0 +1,15 @@
+# Amlogic S905x quad core 2Gb RAM SoC eMMC SPI
+BOARD_NAME="Sweet Potato"
+BOARDFAMILY="meson-gxl"
+BOARD_MAINTAINER="Tonymac32"
+BOOTCONFIG="libretech-cc_v2_defconfig"
+BOOT_FDT_FILE="amlogic/meson-gxl-s905x-libretech-cc-v2.dts"
+KERNEL_TARGET="current,edge"
+FULL_DESKTOP="yes"
+ASOUND_STATE="asound.state.mesongx"
+BOOT_LOGO="desktop"
+
+function post_family_config__declare_u-boot-version() {
+	BOOTBRANCH='tag:v2024.04'
+	BOOTPATCHDIR='v2024.04'
+ }

config/sources/families/meson-gxl.conf

@@ -14,7 +14,7 @@ function fetch_sources_tools__amlogic_odroidc2_blobs_fip() {
 	fetch_from_repo "https://github.com/armbian/odroidc2-blobs" "odroidc2-blobs" "branch:master"
 }
 
-if [[ $BOARD == lafrite ]]; then
+if [[ $BOARD == lafrite ]] || [[ $BOARD == sweet-potato ]]; then
 	UBOOT_TARGET_MAP="u-boot-dtb.img;;u-boot.bin:u-boot.bin u-boot-dtb.img"
 	BOOTSCRIPT="boot-meson-gx.cmd:boot.cmd"
 fi