diff --git a/atf-20220606-637ba581b/config.in b/atf-20220606-637ba581b/config.in
index 296ec1a87..7fa357aa7 100644
--- a/atf-20220606-637ba581b/config.in
+++ b/atf-20220606-637ba581b/config.in
@@ -32,6 +32,9 @@ menu "Target"
 		config TARGET_BL31
 			bool "BL31"
 			depends on !NEED_SBC
+		config TARGET_FIP_NO_SEC_BOOT
+			bool "BL31 + FIP image without secure boot"
+			depends on !NEED_SBC
 		config TARGET_ALL_NO_SEC_BOOT
 			bool "BL2 + FIP image without secure boot"
 			depends on !NEED_SBC
@@ -234,14 +237,17 @@ config NEED_BL31
 	def_bool y if TARGET_BL31
 	def_bool y if TARGET_ALL_NO_SEC_BOOT
 	def_bool y if TARGET_ALL_HAS_SEC_BOOT
+	def_bool y if TARGET_FIP_NO_SEC_BOOT
 
 config NEED_BL33
 	def_bool y if TARGET_ALL_NO_SEC_BOOT
 	def_bool y if TARGET_ALL_HAS_SEC_BOOT
+	def_bool y if TARGET_FIP_NO_SEC_BOOT
 
 config NEED_FIP
 	def_bool y if TARGET_ALL_NO_SEC_BOOT
 	def_bool y if TARGET_ALL_HAS_SEC_BOOT
+	def_bool y if TARGET_FIP_NO_SEC_BOOT
 
 config NEED_MBEDTLS
 	def_bool y if TARGET_ALL_HAS_SEC_BOOT
diff --git a/atf-20220606-637ba581b/configs/mt7981_360t7_defconfig b/atf-20220606-637ba581b/configs/mt7981_360t7_defconfig
index ba0306d28..6378231f5 100644
--- a/atf-20220606-637ba581b/configs/mt7981_360t7_defconfig
+++ b/atf-20220606-637ba581b/configs/mt7981_360t7_defconfig
@@ -1,5 +1,5 @@
 CONFIG_PLAT_MT7981=y
-CONFIG_TARGET_ALL_NO_SEC_BOOT=y
+CONFIG_TARGET_FIP_NO_SEC_BOOT=y
 CONFIG_FLASH_DEVICE_SPIM_NAND=y
 CONFIG_BGA=y
 CONFIG_LOG_LEVEL_INFO=y
diff --git a/atf-20220606-637ba581b/configs/mt7981_cetron_ct3003_defconfig b/atf-20220606-637ba581b/configs/mt7981_cetron_ct3003_defconfig
index ba0306d28..6378231f5 100644
--- a/atf-20220606-637ba581b/configs/mt7981_cetron_ct3003_defconfig
+++ b/atf-20220606-637ba581b/configs/mt7981_cetron_ct3003_defconfig
@@ -1,5 +1,5 @@
 CONFIG_PLAT_MT7981=y
-CONFIG_TARGET_ALL_NO_SEC_BOOT=y
+CONFIG_TARGET_FIP_NO_SEC_BOOT=y
 CONFIG_FLASH_DEVICE_SPIM_NAND=y
 CONFIG_BGA=y
 CONFIG_LOG_LEVEL_INFO=y
diff --git a/atf-20220606-637ba581b/configs/mt7981_clt_r30b1_defconfig b/atf-20220606-637ba581b/configs/mt7981_clt_r30b1_defconfig
index ba0306d28..6378231f5 100644
--- a/atf-20220606-637ba581b/configs/mt7981_clt_r30b1_defconfig
+++ b/atf-20220606-637ba581b/configs/mt7981_clt_r30b1_defconfig
@@ -1,5 +1,5 @@
 CONFIG_PLAT_MT7981=y
-CONFIG_TARGET_ALL_NO_SEC_BOOT=y
+CONFIG_TARGET_FIP_NO_SEC_BOOT=y
 CONFIG_FLASH_DEVICE_SPIM_NAND=y
 CONFIG_BGA=y
 CONFIG_LOG_LEVEL_INFO=y
diff --git a/atf-20220606-637ba581b/configs/mt7981_cmcc_rax3000m_defconfig b/atf-20220606-637ba581b/configs/mt7981_cmcc_rax3000m_defconfig
index 583828a10..d1951deed 100644
--- a/atf-20220606-637ba581b/configs/mt7981_cmcc_rax3000m_defconfig
+++ b/atf-20220606-637ba581b/configs/mt7981_cmcc_rax3000m_defconfig
@@ -1,6 +1,6 @@
 CONFIG_PLAT_MT7981=y
 CONFIG_DRAM_DDR4=y
-CONFIG_TARGET_ALL_NO_SEC_BOOT=y
+CONFIG_TARGET_FIP_NO_SEC_BOOT=y
 CONFIG_FLASH_DEVICE_SPIM_NAND=y
 CONFIG_BGA=y
 CONFIG_LOG_LEVEL_INFO=y
diff --git a/atf-20220606-637ba581b/configs/mt7981_imou_lc-hx3001_defconfig b/atf-20220606-637ba581b/configs/mt7981_imou_lc-hx3001_defconfig
index ba0306d28..6378231f5 100644
--- a/atf-20220606-637ba581b/configs/mt7981_imou_lc-hx3001_defconfig
+++ b/atf-20220606-637ba581b/configs/mt7981_imou_lc-hx3001_defconfig
@@ -1,5 +1,5 @@
 CONFIG_PLAT_MT7981=y
-CONFIG_TARGET_ALL_NO_SEC_BOOT=y
+CONFIG_TARGET_FIP_NO_SEC_BOOT=y
 CONFIG_FLASH_DEVICE_SPIM_NAND=y
 CONFIG_BGA=y
 CONFIG_LOG_LEVEL_INFO=y
diff --git a/atf-20220606-637ba581b/configs/mt7981_jcg_q30_defconfig b/atf-20220606-637ba581b/configs/mt7981_jcg_q30_defconfig
index ba0306d28..6378231f5 100644
--- a/atf-20220606-637ba581b/configs/mt7981_jcg_q30_defconfig
+++ b/atf-20220606-637ba581b/configs/mt7981_jcg_q30_defconfig
@@ -1,5 +1,5 @@
 CONFIG_PLAT_MT7981=y
-CONFIG_TARGET_ALL_NO_SEC_BOOT=y
+CONFIG_TARGET_FIP_NO_SEC_BOOT=y
 CONFIG_FLASH_DEVICE_SPIM_NAND=y
 CONFIG_BGA=y
 CONFIG_LOG_LEVEL_INFO=y
diff --git a/atf-20220606-637ba581b/configs/mt7981_konka_komi-a31_defconfig b/atf-20220606-637ba581b/configs/mt7981_konka_komi-a31_defconfig
index ba0306d28..6378231f5 100644
--- a/atf-20220606-637ba581b/configs/mt7981_konka_komi-a31_defconfig
+++ b/atf-20220606-637ba581b/configs/mt7981_konka_komi-a31_defconfig
@@ -1,5 +1,5 @@
 CONFIG_PLAT_MT7981=y
-CONFIG_TARGET_ALL_NO_SEC_BOOT=y
+CONFIG_TARGET_FIP_NO_SEC_BOOT=y
 CONFIG_FLASH_DEVICE_SPIM_NAND=y
 CONFIG_BGA=y
 CONFIG_LOG_LEVEL_INFO=y
diff --git a/atf-20220606-637ba581b/configs/mt7981_livinet_zr-3020_defconfig b/atf-20220606-637ba581b/configs/mt7981_livinet_zr-3020_defconfig
index ba0306d28..6378231f5 100644
--- a/atf-20220606-637ba581b/configs/mt7981_livinet_zr-3020_defconfig
+++ b/atf-20220606-637ba581b/configs/mt7981_livinet_zr-3020_defconfig
@@ -1,5 +1,5 @@
 CONFIG_PLAT_MT7981=y
-CONFIG_TARGET_ALL_NO_SEC_BOOT=y
+CONFIG_TARGET_FIP_NO_SEC_BOOT=y
 CONFIG_FLASH_DEVICE_SPIM_NAND=y
 CONFIG_BGA=y
 CONFIG_LOG_LEVEL_INFO=y
diff --git a/atf-20220606-637ba581b/configs/mt7981_wr30u_defconfig b/atf-20220606-637ba581b/configs/mt7981_wr30u_defconfig
index ba0306d28..6378231f5 100644
--- a/atf-20220606-637ba581b/configs/mt7981_wr30u_defconfig
+++ b/atf-20220606-637ba581b/configs/mt7981_wr30u_defconfig
@@ -1,5 +1,5 @@
 CONFIG_PLAT_MT7981=y
-CONFIG_TARGET_ALL_NO_SEC_BOOT=y
+CONFIG_TARGET_FIP_NO_SEC_BOOT=y
 CONFIG_FLASH_DEVICE_SPIM_NAND=y
 CONFIG_BGA=y
 CONFIG_LOG_LEVEL_INFO=y
diff --git a/atf-20220606-637ba581b/configs/mt7986_redmi_ax6000_defconfig b/atf-20220606-637ba581b/configs/mt7986_redmi_ax6000_defconfig
index 35210f033..686f369a6 100644
--- a/atf-20220606-637ba581b/configs/mt7986_redmi_ax6000_defconfig
+++ b/atf-20220606-637ba581b/configs/mt7986_redmi_ax6000_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PLAT_MT7986=y
-CONFIG_TARGET_ALL_NO_SEC_BOOT=y
+CONFIG_TARGET_FIP_NO_SEC_BOOT=y
 CONFIG_FLASH_DEVICE_SPIM_NAND=y
 CONFIG_DRAM_DDR4=y
diff --git a/atf-20220606-637ba581b/makefile b/atf-20220606-637ba581b/makefile
index 4419820ca..126a40523 100644
--- a/atf-20220606-637ba581b/makefile
+++ b/atf-20220606-637ba581b/makefile
@@ -102,19 +102,23 @@ endif
 ifeq ($(CONFIG_NEED_BL33),y)
 MAKE_ARGS += BL33=$(CONFIG_BL33)
 endif
+
 ifeq ($(CONFIG_AARCH32),y)
 MAKE_ARGS += ARCH=aarch32
 endif
+
+ifeq ($(CONFIG_NEED_BL2),y)
+TARGET_ARGS += bl2
+endif
+
 ifeq ($(CONFIG_NEED_FIP),y)
 TARGET_ARGS += bl31 fip
 else
-ifeq ($(CONFIG_TARGET_BL2),y)
-TARGET_ARGS += bl2
-endif
-ifeq ($(CONFIG_TARGET_BL31),y)
+ifeq ($(CONFIG_NEED_BL31),y)
 TARGET_ARGS += bl31
 endif
 endif
+
 endif
 
 PYTHON := $(shell which python3)