Merge "Update IPL and Secure Monitor Rev1.0.17 rev2" into master

Import Renesas ATF version Rev1.0.17 rev2 from commit b15fefa ("Update IPL and Secure Monitor Rev1.0.17 rev2") of https://github.com/renesas-rcar/arm-trusted-firmware. No merge conflicts had to be fixed manually. Signed-off-by: Ovidiu Mihalachi <[email protected]>
omihalac · Mar 29, 2018 · a88e702 · a88e702
2 parents dd68014 + b15fefa
commit a88e702
Show file tree

Hide file tree

Showing 11 changed files with 349 additions and 315 deletions.
diff --git a/plat/renesas/rcar/bl2_rcar_setup.c b/plat/renesas/rcar/bl2_rcar_setup.c
@@ -871,6 +871,9 @@ void bl2_plat_set_bl33_ep_info(image_info_t *image,
 {
 	SET_SECURITY_STATE(bl33_ep_info->h.attr, NON_SECURE);
 	bl33_ep_info->spsr = rcar_get_spsr_for_bl33_entry();
+#ifdef RCAR_BL33_ARG0
+	bl33_ep_info->args.arg0 = RCAR_BL33_ARG0;
+#endif
 }