update

config/boards/firefly-itx-3588j.csc

@@ -11,35 +11,6 @@ SRC_CMDLINE="console=ttyS02,1500000 console=tty0"
 BOOT_SOC="rk3588"
 IMAGE_PARTITION_TABLE="gpt"
 
-# Mainline U-Boot
-function post_family_config__firefly_itx_3588j_use_mainline_uboot() {
-	display_alert "$BOARD" "Using mainline U-Boot for $BOARD / $BRANCH" "info"
-
-	BOOTCONFIG="generic-rk3588_defconfig"               # Use generic defconfig which should boot all RK3588 boards
-	BOOTDELAY=1                                         # Wait for UART interrupt to enter UMS/RockUSB mode etc
-	BOOTSOURCE="https://github.com/u-boot/u-boot.git"   # We ❤️ Mainline U-Boot
-	BOOTBRANCH="tag:v2024.07-rc4"
-	BOOTPATCHDIR="v2024.07/board_${BOARD}"
-	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency
-
-	UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"
-
-	# Disable stuff from rockchip64_common; we're using binman here which does all the work already
-	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
-
-	# 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 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() {
 	display_alert "$BOARD" "Installing rk3588-bluetooth.service" "info"
@@ -60,3 +31,11 @@ function post_family_tweaks__firefly-itx-3588j_enable_services() {
 	chroot_sdcard systemctl enable rk3588-bluetooth.service
 	return 0
 }
+
+function post_family_tweaks__firefly-itx-3588j_naming_audios() {
+	display_alert "$BOARD" "Renaming firefly-itx-3588j 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
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-dp0-sound", ENV{SOUND_DESCRIPTION}="DP0 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-es8388-sound", ENV{SOUND_DESCRIPTION}="ES8388 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	return 0

patch/u-boot/legacy/u-boot-radxa-rk3588/board_firefly-itx-rk3588j/uboot-firefly-itx-rk3588j-config.patch

@@ -0,0 +1,11 @@
+--- a/configs/rock-5a-rk3588s_defconfig
++++ b/configs/rock-5a-rk3588s_defconfig
+@@ -23,7 +23,7 @@
+ CONFIG_SPL_LIBDISK_SUPPORT=y
+ CONFIG_SPL_SPI_FLASH_SUPPORT=y
+ CONFIG_SPL_SPI_SUPPORT=y
+-CONFIG_DEFAULT_DEVICE_TREE="rk3588s-rock-5a"
++CONFIG_DEFAULT_DEVICE_TREE="rk3588-evb"
+ CONFIG_DEBUG_UART=y
+ CONFIG_FIT=y
+ CONFIG_FIT_IMAGE_POST_PROCESS=y