From 4573778507d8f5ba0817f7a295e157e3767fe628 Mon Sep 17 00:00:00 2001
From: 33335 <33335@33335.top>
Date: Wed, 3 Jul 2024 04:55:23 +0800
Subject: [PATCH] fix: firefly-itx-3588j fails to boot, and audio output

---
 config/boards/firefly-itx-3588j.csc           |  9 ++++++++
 ...fly-itx-3588j-disable-optee-security.patch | 22 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 patch/u-boot/legacy/u-boot-radxa-rk3588/board_firefly-itx-3588j/board-firefly-itx-3588j-disable-optee-security.patch

diff --git a/config/boards/firefly-itx-3588j.csc b/config/boards/firefly-itx-3588j.csc
index b848fb3d03..db186aff3c 100644
--- a/config/boards/firefly-itx-3588j.csc
+++ b/config/boards/firefly-itx-3588j.csc
@@ -24,8 +24,17 @@ function post_family_tweaks_bsp__firefly_itx_3588j() {
 	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
+	return 0
+}
+
 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
 }
+
+
diff --git a/patch/u-boot/legacy/u-boot-radxa-rk3588/board_firefly-itx-3588j/board-firefly-itx-3588j-disable-optee-security.patch b/patch/u-boot/legacy/u-boot-radxa-rk3588/board_firefly-itx-3588j/board-firefly-itx-3588j-disable-optee-security.patch
new file mode 100644
index 0000000000..b04304aba2
--- /dev/null
+++ b/patch/u-boot/legacy/u-boot-radxa-rk3588/board_firefly-itx-3588j/board-firefly-itx-3588j-disable-optee-security.patch
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: None <None>
+Date: Tue, 2 Jul 2024 21:37:46 +0000
+Subject: disable always use security partition avoid not booting
+
+---
+ configs/rk3588_defconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configs/rk3588_defconfig b/configs/rk3588_defconfig
+index 111111111111..222222222222 100644
+--- a/configs/rk3588_defconfig
++++ b/configs/rk3588_defconfig
+@@ -233,4 +233,4 @@ CONFIG_AVB_LIBAVB_USER=y
+ CONFIG_RK_AVB_LIBAVB_USER=y
+ CONFIG_OPTEE_CLIENT=y
+ CONFIG_OPTEE_V2=y
+-CONFIG_OPTEE_ALWAYS_USE_SECURITY_PARTITION=y
++CONFIG_OPTEE_ALWAYS_USE_SECURITY_PARTITION=n
+-- 
+Armbian
+