diff options
| author | Vikram Kanigiri <vikram.kanigiri@arm.com> | 2014-05-16 18:48:12 +0100 |
|---|---|---|
| committer | Vikram Kanigiri <vikram.kanigiri@arm.com> | 2014-05-22 16:19:32 +0100 |
| commit | 6871c5d3a227cb95008a25e90e358ec0ac615222 (patch) | |
| tree | fe40950e7d517aa673ab2cc11b5255c4268ae291 /bl31/bl31_main.c | |
| parent | 4112bfa0c223eda73af1cfe57ca7dc926f767dd8 (diff) | |
Rework memory information passing to BL3-x images
The issues addressed in this patch are:
1. Remove meminfo_t from the common interfaces in BL3-x,
expecting that platform code will find a suitable mechanism
to determine the memory extents in these images and provide
it to the BL3-x images.
2. Remove meminfo_t and bl31_plat_params_t from all FVP BL3-x
code as the images use link-time information to determine
memory extents.
meminfo_t is still used by common interface in BL1/BL2 for
loading images
Change-Id: I4e825ebf6f515b59d84dc2bdddf6edbf15e2d60f
Diffstat (limited to 'bl31/bl31_main.c')
| -rw-r--r-- | bl31/bl31_main.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/bl31/bl31_main.c b/bl31/bl31_main.c index d74b2549..1dc0a7a0 100644 --- a/bl31/bl31_main.c +++ b/bl31/bl31_main.c @@ -43,7 +43,7 @@ * for SP execution. In cases where both SPD and SP are absent, or when SPD * finds it impossible to execute SP, this pointer is left as NULL ******************************************************************************/ -static int32_t (*bl32_init)(meminfo_t *); +static int32_t (*bl32_init)(void); /******************************************************************************* * Variable to indicate whether next image to execute after BL31 is BL33 @@ -114,11 +114,10 @@ void bl31_main(void) */ /* - * If SPD had registerd an init hook, invoke it. Pass it the information - * about memory extents + * If SPD had registerd an init hook, invoke it. */ if (bl32_init) - (*bl32_init)(bl31_plat_get_bl32_mem_layout()); + (*bl32_init)(); /* * We are ready to enter the next EL. Prepare entry into the image @@ -189,7 +188,7 @@ void bl31_prepare_next_image_entry() * This function initializes the pointer to BL32 init function. This is expected * to be called by the SPD after it finishes all its initialization ******************************************************************************/ -void bl31_register_bl32_init(int32_t (*func)(meminfo_t *)) +void bl31_register_bl32_init(int32_t (*func)(void)) { bl32_init = func; } |