diff options
| author | Vikram Kanigiri <vikram.kanigiri@arm.com> | 2014-04-15 18:08:08 +0100 |
|---|---|---|
| committer | Vikram Kanigiri <vikram.kanigiri@arm.com> | 2014-05-22 16:14:19 +0100 |
| commit | 4112bfa0c223eda73af1cfe57ca7dc926f767dd8 (patch) | |
| tree | 652b5cb01c095a39c771209caac10b6332a62929 /bl31/bl31_main.c | |
| parent | 29fb905d5f36a415a170a4bffeadf13b5f084345 (diff) | |
Populate BL31 input parameters as per new spec
This patch is based on spec published at
https://github.com/ARM-software/tf-issues/issues/133
It rearranges the bl31_args struct into
bl31_params and bl31_plat_params which provide the
information needed for Trusted firmware and platform
specific data via x0 and x1
On the FVP platform BL3-1 params and BL3-1 plat params
and its constituents are stored at the start of TZDRAM.
The information about memory availability and size for
BL3-1, BL3-2 and BL3-3 is moved into platform specific data.
Change-Id: I8b32057a3d0dd3968ea26c2541a0714177820da9
Diffstat (limited to 'bl31/bl31_main.c')
| -rw-r--r-- | bl31/bl31_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bl31/bl31_main.c b/bl31/bl31_main.c index 5a09829b..d74b2549 100644 --- a/bl31/bl31_main.c +++ b/bl31/bl31_main.c @@ -152,7 +152,7 @@ uint32_t bl31_get_next_image_type(void) ******************************************************************************/ void bl31_prepare_next_image_entry() { - el_change_info_t *next_image_info; + entry_point_info_t *next_image_info; uint32_t scr, image_type; /* Determine which image to execute next */ @@ -176,13 +176,13 @@ void bl31_prepare_next_image_entry() * Tell the context mgmt. library to ensure that SP_EL3 points to * the right context to exit from EL3 correctly. */ - cm_set_el3_eret_context(next_image_info->security_state, - next_image_info->entrypoint, + cm_set_el3_eret_context(GET_SECURITY_STATE(next_image_info->h.attr), + next_image_info->pc, next_image_info->spsr, scr); /* Finally set the next context */ - cm_set_next_eret_context(next_image_info->security_state); + cm_set_next_eret_context(GET_SECURITY_STATE(next_image_info->h.attr)); } /******************************************************************************* |