diff options
| author | danh-arm <dan.handley@arm.com> | 2014-05-06 17:54:03 +0100 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2014-05-06 17:54:03 +0100 |
| commit | 408c37682a0233c8c4fa88700b603f0b09d6361f (patch) | |
| tree | 18133148dea88d9a2313113111b24b56e8130505 /bl31/bl31_main.c | |
| parent | b495bdef190acf166c713e138b61c5bb25402fc0 (diff) | |
| parent | 97043ac98e13a726dbf8b3b41654dca759e3da2c (diff) | |
Merge pull request #48 from danh-arm/dh/major-refactoring
dh/major refactoring
Diffstat (limited to 'bl31/bl31_main.c')
| -rw-r--r-- | bl31/bl31_main.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/bl31/bl31_main.c b/bl31/bl31_main.c index 536bb864..cf826d01 100644 --- a/bl31/bl31_main.c +++ b/bl31/bl31_main.c @@ -28,17 +28,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <stdio.h> -#include <string.h> -#include <assert.h> +#include <arch.h> #include <arch_helpers.h> -#include <console.h> -#include <platform.h> -#include <semihosting.h> +#include <assert.h> #include <bl_common.h> #include <bl31.h> -#include <runtime_svc.h> #include <context_mgmt.h> +#include <runtime_svc.h> +#include <stdio.h> /******************************************************************************* @@ -47,7 +44,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 *); +static int32_t (*bl32_init)(meminfo_t *); /******************************************************************************* * Variable to indicate whether next image to execute after BL31 is BL33 @@ -153,7 +150,7 @@ uint32_t bl31_get_next_image_type(void) ******************************************************************************/ void bl31_prepare_next_image_entry() { - el_change_info *next_image_info; + el_change_info_t *next_image_info; uint32_t scr, image_type; /* Determine which image to execute next */ @@ -190,7 +187,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 *)) +void bl31_register_bl32_init(int32_t (*func)(meminfo_t *)) { bl32_init = func; } |