summaryrefslogtreecommitdiff
path: root/bl31/bl31_main.c
diff options
context:
space:
mode:
authorVikram Kanigiri <vikram.kanigiri@arm.com>2014-07-15 16:49:22 +0100
committerVikram Kanigiri <vikram.kanigiri@arm.com>2014-08-01 09:48:07 +0100
commitfaaa2e7644ec6101de0e7d4f35b9dd2999f110a7 (patch)
tree8570f7a45b30ac70b8f6cdd326d8bf71c1666033 /bl31/bl31_main.c
parent50e27dadbcc4b442f1c5ceb343c6d55783afed54 (diff)
Support asynchronous method for BL3-2 initialization
This patch adds support for BL3-2 initialization by asynchronous method where BL3-1 transfers control to BL3-2 using world switch. After BL3-2 initialization, it transfers control to BL3-3 via SPD service handler. The SPD service handler initializes the CPU context to BL3-3 entrypoint depending on the return function indentifier from TSP initialization. Fixes ARM-software/TF-issues#184 Change-Id: I7b135c2ceeb356d3bb5b6a287932e96ac67c7a34
Diffstat (limited to 'bl31/bl31_main.c')
-rw-r--r--bl31/bl31_main.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/bl31/bl31_main.c b/bl31/bl31_main.c
index ff3c53b5..68bdd367 100644
--- a/bl31/bl31_main.c
+++ b/bl31/bl31_main.c
@@ -51,7 +51,7 @@ static int32_t (*bl32_init)(void);
* Variable to indicate whether next image to execute after BL31 is BL33
* (non-secure & default) or BL32 (secure).
******************************************************************************/
-static uint32_t next_image_type;
+static uint32_t next_image_type = NON_SECURE;
/*******************************************************************************
* Simple function to initialise all BL31 helper libraries.
@@ -89,9 +89,6 @@ void bl31_main(void)
/* Clean caches before re-entering normal world */
dcsw_op_all(DCCSW);
- /* By default run the non-secure BL3-3 image next */
- next_image_type = NON_SECURE;
-
/*
* All the cold boot actions on the primary cpu are done. We now need to
* decide which is the next image (BL32 or BL33) and how to execute it.