From 8302d12390c856124a4dfb24f827c093a107d8eb Mon Sep 17 00:00:00 2001
From: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com>
Date: Sat, 29 Jun 2024 16:34:20 +0200
Subject: [PATCH] firefly-itx: Don't use abandoned `media` U-Boot

The board config file was likely copy-pasted from a former `media` board and thus includes some stuff that is not needed, like the abandoned U-Boot repo which is basically an old fork from Raxda's vendor U-Boot.

- Switch to default rk3588 vendor U-Boot (using a generic rk3588 defconfig)
- Cleanup board config file
---
 config/boards/firefly-itx-3588j.csc | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/config/boards/firefly-itx-3588j.csc b/config/boards/firefly-itx-3588j.csc
index d7d3c65ef715..b848fb3d0355 100644
--- a/config/boards/firefly-itx-3588j.csc
+++ b/config/boards/firefly-itx-3588j.csc
@@ -1,25 +1,16 @@
 # Rockchip RK3588j Octa core 4GB-32GB eMMC GBE HDMI HDMI-IN PCIe SATA USB3 WiFi 4G 5G
 BOARD_NAME="Firefly ITX-3588J"
 BOARDFAMILY="rockchip-rk3588"
+BOOT_SOC="rk3588"
 BOARD_MAINTAINER=""
 KERNEL_TARGET="vendor"
-FULL_DESKTOP="yes"
-BOOT_LOGO="desktop"
+BOOTCONFIG="rk3588_defconfig"
 BOOT_FDT_FILE="rockchip/rk3588-firefly-itx-3588j.dtb"
-SRC_EXTLINUX="yes"
-SRC_CMDLINE="console=ttyS02,1500000 console=tty0"
-BOOT_SOC="rk3588"
+BOOT_LOGO="desktop"
+FULL_DESKTOP="yes"
 IMAGE_PARTITION_TABLE="gpt"
 
-function post_family_config__firefly-itx-3588j_use_vendor_uboot() {
-	BOOTCONFIG="rk3588_defconfig"
-	BOOTSOURCE='https://github.com/150balbes/u-boot-rk'
-	BOOTBRANCH='branch:rk3588'
-	BOOTDIR="u-boot-${BOARD}"
-	BOOTPATCHDIR="u-boot-firefly-itx-3588j"
-}
-
-function post_family_tweaks_bsp__firefly-itx-3588j() {
+function post_family_tweaks_bsp__firefly_itx_3588j() {
 	display_alert "$BOARD" "Installing rk3588-bluetooth.service" "info"
 
 	# Bluetooth on this board is handled by a Broadcom (AP6275PR3) chip and requires
@@ -33,7 +24,7 @@ function post_family_tweaks_bsp__firefly-itx-3588j() {
 	return 0
 }
 
-function post_family_tweaks__firefly-itx-3588j_enable_services() {
+function post_family_tweaks__firefly_itx_3588j_enable_services() {
 	display_alert "$BOARD" "Enabling rk3588-bluetooth.service" "info"
 	chroot_sdcard systemctl enable rk3588-bluetooth.service
 	return 0