summaryrefslogtreecommitdiff
path: root/bl31
diff options
context:
space:
mode:
authordanh-arm <dan.handley@arm.com>2015-12-09 19:03:06 +0000
committerdanh-arm <dan.handley@arm.com>2015-12-09 19:03:06 +0000
commit7ee2b8b3f8d610bf4f0e261ebaf3bd24afc1eea2 (patch)
tree7b20cd6a7200f021d5864bf665ea31c482559fd4 /bl31
parentab5a53ef0f2f4f19f59a28738ae00c6bb5975d21 (diff)
parent080225dacd7c1e11c53756ec66d72d3573d1a70d (diff)
Merge pull request #462 from soby-mathew/sm/runtime_console
Enable BL31 to configure a runtime console
Diffstat (limited to 'bl31')
-rw-r--r--bl31/bl31_main.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/bl31/bl31_main.c b/bl31/bl31_main.c
index 9abc395b..f22e6121 100644
--- a/bl31/bl31_main.c
+++ b/bl31/bl31_main.c
@@ -77,7 +77,7 @@ void bl31_main(void)
/* Perform remaining generic architectural setup from EL3 */
bl31_arch_setup();
- /* Perform platform setup in BL1 */
+ /* Perform platform setup in BL31 */
bl31_platform_setup();
/* Initialise helper libraries */
@@ -109,6 +109,12 @@ void bl31_main(void)
* corresponding to the desired security state after the next ERET.
*/
bl31_prepare_next_image_entry();
+
+ /*
+ * Perform any platform specific runtime setup prior to cold boot exit
+ * from BL31
+ */
+ bl31_plat_runtime_setup();
}
/*******************************************************************************