diff --git a/package/base-files/files/lib/upgrade/iopsys.sh b/package/base-files/files/lib/upgrade/iopsys.sh
index 8a62bb5570092a18b896ac1bbb93d5e375ee4340..1813f4fae62ee1d5c50a0f661637dc51be731aa9 100644
--- a/package/base-files/files/lib/upgrade/iopsys.sh
+++ b/package/base-files/files/lib/upgrade/iopsys.sh
@@ -332,12 +332,7 @@ iopsys_do_upgrade() {
 
 	if [ "$UPGRADE_OPT_FORCE_LOADER_UPGRADE" = "1" ]; then
 		log "sysupgrade" "Bootloader upgrade is enabled."
-		if fdtextract -l "$image" | grep -qF "atf"; then
-			iopsys_write_fit_image_component "$image" atf required mtd BL2            || return
-			iopsys_write_fit_image_component "$image" bootloader required mtd FIP     || return
-		else
-			iopsys_write_fit_image_component "$image" bootloader optional mtd u-boot  || return
-		fi
+		iopsys_write_fit_image_component "$image" bootloader optional mtd u-boot          || return
 	else
 		log "sysupgrade" "Bootloader upgrade is disabled."
 	fi