diff --git a/config/boards/rock-3a.conf b/config/boards/rock-3a.conf
index 18a82e6383..f37766cc3f 100644
--- a/config/boards/rock-3a.conf
+++ b/config/boards/rock-3a.conf
@@ -15,7 +15,12 @@ BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
 BOOTFS_TYPE="fat"
 
-function post_family_config__rock-3a_use_mainline_uboot_except_vendor() {
+function post_family_config__rock-3a_use_mainline_uboot_except_vendor_and_add_sata_target() {
+	display_alert "$BOARD" "Configuring ($BOARD) standard and sata uboot target map" "info"
+	UBOOT_TARGET_MAP="
+	BL31=$RKBIN_DIR/$BL31_BLOB $BOOTCONFIG spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb rkspi_loader.img
+	BL31=$RKBIN_DIR/$BL31_BLOB $BOOTCONFIG_SATA spl/u-boot-spl.bin u-boot.dtb u-boot.itb;; rkspi_loader_sata.img"
+	
 	# use mainline uboot for _current_ and _edge_
 	if [[ "$BRANCH" != "current" && "$BRANCH" != "edge" ]]; then
 		return 0
@@ -42,14 +47,6 @@ function post_family_config__rock-3a_use_mainline_uboot_except_vendor() {
 	}
 }
 
-function post_family_config__rock3a_uboot_add_sata_target() {
-    display_alert "$BOARD" "Configuring ($BOARD) standard and sata uboot target map" "info"
-
-	UBOOT_TARGET_MAP="
-	BL31=$RKBIN_DIR/$BL31_BLOB $BOOTCONFIG spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb rkspi_loader.img
-	BL31=$RKBIN_DIR/$BL31_BLOB $BOOTCONFIG_SATA spl/u-boot-spl.bin u-boot.dtb u-boot.itb;; rkspi_loader_sata.img"
-}
-
 function post_uboot_custom_postprocess__create_sata_spi_image() {
 	display_alert "$BOARD" "Create rkspi_loader_sata.img" "info"