From 987daf5431adad553252f8d7f5ed13f46833e38a Mon Sep 17 00:00:00 2001
From: Tony <tonymckahan@gmail.com>
Date: Sat, 25 May 2024 01:24:43 -0400
Subject: [PATCH 1/2] Add config for Libre Computer Sweet Potato (#6660)

* Add config for Libre Computer Sweet Potato

* update meson-gxl.conf for Sweet Potato
---
 config/boards/sweet-potato.conf        | 15 +++++++++++++++
 config/sources/families/meson-gxl.conf |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 config/boards/sweet-potato.conf

diff --git a/config/boards/sweet-potato.conf b/config/boards/sweet-potato.conf
new file mode 100644
index 000000000000..26e8f4fb4a47
--- /dev/null
+++ b/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'
+ }
diff --git a/config/sources/families/meson-gxl.conf b/config/sources/families/meson-gxl.conf
index d1fd79ddc9de..b5ce02467e97 100644
--- a/config/sources/families/meson-gxl.conf
+++ b/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

From 92f82686c47d81c24da986f24223538d83881aaf Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor@armbian.com>
Date: Sat, 25 May 2024 11:57:05 +0200
Subject: [PATCH 2/2] Extend CSC build target config to CURRENT kernel too

To mitigate build automation error ...
---
 config/boards/rockpi-4bplus.csc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/boards/rockpi-4bplus.csc b/config/boards/rockpi-4bplus.csc
index 9bb5427cb64a..389ff2a2c03e 100644
--- a/config/boards/rockpi-4bplus.csc
+++ b/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"