diff --git a/config/boards/orangepi5.conf b/config/boards/orangepi5.conf
index 591ba2c79f..9c8b206bef 100644
--- a/config/boards/orangepi5.conf
+++ b/config/boards/orangepi5.conf
@@ -10,6 +10,7 @@ BOOT_FDT_FILE="rockchip/rk3588s-orangepi-5.dtb"
 BOOT_SCENARIO="spl-blobs"
 WIREGUARD="no"
 BOOT_SUPPORT_SPI="yes"
+BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
 SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes
 BOOTFS_TYPE="fat"
diff --git a/config/boards/rock-3a.conf b/config/boards/rock-3a.conf
index ff35e0066a..918798083f 100644
--- a/config/boards/rock-3a.conf
+++ b/config/boards/rock-3a.conf
@@ -9,5 +9,6 @@ BOOT_FDT_FILE="rockchip/rk3568-rock-3a.dtb"
 BOOT_SCENARIO="spl-blobs"
 WIREGUARD="no"
 BOOT_SUPPORT_SPI="yes"
+BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
 BOOTFS_TYPE="fat"
diff --git a/config/boards/rock-5b.wip b/config/boards/rock-5b.wip
index 837d766b2c..1634f619c1 100644
--- a/config/boards/rock-5b.wip
+++ b/config/boards/rock-5b.wip
@@ -9,6 +9,7 @@ BOOT_FDT_FILE="rockchip/rk3588-rock-5b.dtb"
 BOOT_SCENARIO="spl-blobs"
 WIREGUARD="no"
 BOOT_SUPPORT_SPI="yes"
+BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
 SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes
 BOOTFS_TYPE="ext4"
diff --git a/config/sources/families/include/rockchip64_common.inc b/config/sources/families/include/rockchip64_common.inc
index effd6b8497..9be1f39954 100644
--- a/config/sources/families/include/rockchip64_common.inc
+++ b/config/sources/families/include/rockchip64_common.inc
@@ -184,7 +184,7 @@ prepare_boot_configuration() {
 
 	if [[ $BOOT_SUPPORT_SPI == yes ]]; then
 
-		if [[ $BOARD != "rock-3a" ]] && [[ $BOARD != "rock-5b" ]] && [[ $BOARD != "orangepi5" ]]; then
+		if [[ "${BOOT_SPI_RKSPI_LOADER:-"no"}" != "yes" ]]; then
 			UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB tpl/u-boot-tpl.bin spl/u-boot-spl.bin u-boot.itb ${UBOOT_TARGET_MAP} rkspi_loader.img"
 		else
 			UBOOT_TARGET_MAP="${UBOOT_TARGET_MAP} rkspi_loader.img"
@@ -220,7 +220,7 @@ uboot_custom_postprocess() {
 	fi
 
 	if [[ $BOOT_SUPPORT_SPI == yes ]]; then
-		if [[ $BOARD == "rock-3a" ]] || [[ $BOARD == "rock-5b" ]] || [[ $BOARD == "orangepi5" ]]; then
+		if [[ "${BOOT_SPI_RKSPI_LOADER:-"no"}" == "yes" ]]; then
 			dd if=/dev/zero of=rkspi_loader.img bs=1M count=0 seek=16
 			/sbin/parted -s rkspi_loader.img mklabel gpt
 			/sbin/parted -s rkspi_loader.img unit s mkpart idbloader 64 7167