Merge "uniphier: run BL33 at EL2" into integration

2b4c5e4b · Manish Pandey · TrustedFirmware Code Review · caa0c85d · f998a052 · 2b4c5e4b
Commit 2b4c5e4b authored Dec 30, 2019 by Manish Pandey Committed by TrustedFirmware Code Review Dec 30, 2019
--- a/plat/socionext/uniphier/uniphier_image_desc.c
+++ b/plat/socionext/uniphier/uniphier_image_desc.c
@@ -80,7 +80,7 @@ static struct bl_mem_params_node uniphier_image_descs[] = {
 				      VERSION_2, entry_point_info_t,
 				      NON_SECURE | EXECUTABLE),
 		.ep_info.pc = UNIPHIER_BL33_BASE,
-		.ep_info.spsr = SPSR_64(MODE_EL1, MODE_SP_ELX,
+		.ep_info.spsr = SPSR_64(MODE_EL2, MODE_SP_ELX,
 					DISABLE_ALL_EXCEPTIONS),

 		.next_handoff_image_id = INVALID_IMAGE_ID,