diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c
index fe14701623a4514b6533f77ef54b1a3c30c0231d..a28387c664de25840730415ba9d969c82a97488e 100644
--- a/common/spl/spl_atf.c
+++ b/common/spl/spl_atf.c
@@ -52,16 +52,13 @@ static struct bl31_params *bl2_plat_get_bl31_params(struct spl_image_info *spl_i
 	SET_PARAM_HEAD(bl2_to_bl31_params->bl31_image_info,
 		       ATF_PARAM_IMAGE_BINARY, ATF_VERSION_1, 0);
 
-	if (bl32_entry == -1)
-		goto bl33_setup;
-
 	/* Fill BL32 related information */
 	bl2_to_bl31_params->bl32_ep_info = &bl31_params_mem.bl32_ep_info;
 	bl32_ep_info = &bl31_params_mem.bl32_ep_info;
 	SET_PARAM_HEAD(bl32_ep_info, ATF_PARAM_EP, ATF_VERSION_1,
 		       ATF_EP_SECURE);
 
-	bl32_ep_info->pc = bl32_entry;
+	bl32_ep_info->pc = bl32_entry == -1 ? 0 : bl32_entry;
 	bl32_ep_info->spsr = SPSR_64(MODE_EL1, MODE_SP_ELX,
 				     DISABLE_ALL_EXECPTIONS);
 
@@ -69,7 +66,6 @@ static struct bl31_params *bl2_plat_get_bl31_params(struct spl_image_info *spl_i
 	SET_PARAM_HEAD(bl2_to_bl31_params->bl32_image_info,
 		       ATF_PARAM_IMAGE_BINARY, ATF_VERSION_1, 0);
 
-bl33_setup:
 	/* Fill BL33 related information */
 	bl2_to_bl31_params->bl33_ep_info = &bl31_params_mem.bl33_ep_info;
 	bl33_ep_info = &bl31_params_mem.bl33_ep_info;