diff --git a/config/boards/firefly-itx-3588j.csc b/config/boards/firefly-itx-3588j.csc
index f31f412900..58697b272b 100644
--- a/config/boards/firefly-itx-3588j.csc
+++ b/config/boards/firefly-itx-3588j.csc
@@ -1,14 +1,15 @@
 # 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="SeeleVolleri"
+BOOTCONFIG="rock-5b-rk3588_defconfig"
 KERNEL_TARGET="vendor"
-BOOTCONFIG="rk3588_defconfig"
 BOOT_FDT_FILE="rockchip/rk3588-firefly-itx-3588j.dtb"
-BOOT_LOGO="desktop"
 FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_SCENARIO="spl-blobs"
 IMAGE_PARTITION_TABLE="gpt"
+declare -g UEFI_EDK2_BOARD_ID="firefly-itx-3588j" # This _only_ used for uefi-edk2-rk3588 extension
 
 function post_family_tweaks_bsp__firefly_itx_3588j() {
 	display_alert "$BOARD" "Installing rk3588-bluetooth.service" "info"
diff --git a/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_firefly-itx-3588j/board-firefly-itx-3588j-config.patch b/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_firefly-itx-3588j/board-firefly-itx-3588j-config.patch
new file mode 100644
index 0000000000..3844175729
--- /dev/null
+++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_firefly-itx-3588j/board-firefly-itx-3588j-config.patch
@@ -0,0 +1,23 @@
+t a/configs/rock-5b-rk3588_defconfig b/configs/rock-5b-rk3588_defconfig
+index 6832279aad6..87ee0e43b38 100644
+--- a/configs/rock-5b-rk3588_defconfig
++++ b/configs/rock-5b-rk3588_defconfig
+@@ -23,7 +23,7 @@ CONFIG_TARGET_EVB_RK3588=y
+ CONFIG_SPL_LIBDISK_SUPPORT=y
+ CONFIG_SPL_SPI_FLASH_SUPPORT=y
+ CONFIG_SPL_SPI_SUPPORT=y
+-CONFIG_DEFAULT_DEVICE_TREE="rk3588-rock-5b"
++CONFIG_DEFAULT_DEVICE_TREE="rk3588-evb"
+ CONFIG_DEBUG_UART=y
+ CONFIG_FIT=y
+ CONFIG_FIT_IMAGE_POST_PROCESS=y
+@@ -33,7 +33,7 @@ CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
+ CONFIG_SPL_FIT_HW_CRYPTO=y
+ # CONFIG_SPL_SYS_DCACHE_OFF is not set
+ CONFIG_BOOTDELAY=0
+-CONFIG_DISABLE_CONSOLE=y
++
+ CONFIG_SYS_CONSOLE_INFO_QUIET=y
+ # CONFIG_DISPLAY_CPUINFO is not set
+ CONFIG_ANDROID_BOOTLOADER=y
+-- 
\ No newline at end of file
diff --git a/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_firefly-itx-3588j/board-firefly-itx-3588j-disable-optee-security.patch b/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_firefly-itx-3588j/board-firefly-itx-3588j-disable-optee-security.patch
deleted file mode 100644
index b04304aba2..0000000000
--- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_firefly-itx-3588j/board-firefly-itx-3588j-disable-optee-security.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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
-