diff options
| author | Dan Handley <dan.handley@arm.com> | 2014-05-27 18:34:30 +0100 |
|---|---|---|
| committer | Dan Handley <dan.handley@arm.com> | 2014-05-27 18:34:30 +0100 |
| commit | 22e002da5f635a9e2d4a11d2412fd7a4ac1dd477 (patch) | |
| tree | f574c9be9dc54b90430ddfb1bd5dfc39a58b9cfc /bl31 | |
| parent | f53d0fce3f8e13529d823c22ce61dc0e0fdf0ffd (diff) | |
| parent | 9865ac15765f260069047c0e7c56623eb1a70b9a (diff) | |
Merge pull request #112 from danh-arm:dh/refactor-plat-header-v4 into for-v0.4
Diffstat (limited to 'bl31')
| -rw-r--r-- | bl31/aarch64/runtime_exceptions.S | 6 | ||||
| -rw-r--r-- | bl31/bl31.ld.S | 2 | ||||
| -rw-r--r-- | bl31/bl31_main.c | 3 | ||||
| -rw-r--r-- | bl31/context_mgmt.c | 1 |
4 files changed, 7 insertions, 5 deletions
diff --git a/bl31/aarch64/runtime_exceptions.S b/bl31/aarch64/runtime_exceptions.S index 4789b33..e3673f0 100644 --- a/bl31/aarch64/runtime_exceptions.S +++ b/bl31/aarch64/runtime_exceptions.S @@ -32,7 +32,7 @@ #include <asm_macros.S> #include <context.h> #include <interrupt_mgmt.h> -#include <platform.h> +#include <platform_def.h> #include <runtime_svc.h> .globl runtime_exceptions @@ -84,7 +84,7 @@ * interrupt controller reports a spurious interrupt then * return to where we came from. */ - bl ic_get_pending_interrupt_type + bl plat_ic_get_pending_interrupt_type cmp x0, #INTR_TYPE_INVAL b.eq interrupt_exit_\label @@ -105,7 +105,7 @@ * Read the id of the highest priority pending interrupt. If * no interrupt is asserted then return to where we came from. */ - bl ic_get_pending_interrupt_id + bl plat_ic_get_pending_interrupt_id cmp x0, #INTR_ID_UNAVAILABLE b.eq interrupt_exit_\label #endif diff --git a/bl31/bl31.ld.S b/bl31/bl31.ld.S index 068d318..1501742 100644 --- a/bl31/bl31.ld.S +++ b/bl31/bl31.ld.S @@ -28,7 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <platform.h> +#include <platform_def.h> OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT) OUTPUT_ARCH(PLATFORM_LINKER_ARCH) diff --git a/bl31/bl31_main.c b/bl31/bl31_main.c index ff7caf1..5117793 100644 --- a/bl31/bl31_main.c +++ b/bl31/bl31_main.c @@ -34,6 +34,7 @@ #include <bl_common.h> #include <bl31.h> #include <context_mgmt.h> +#include <platform.h> #include <runtime_svc.h> #include <stdio.h> @@ -164,7 +165,7 @@ void bl31_prepare_next_image_entry() bl31_next_el_arch_setup(image_type); /* Program EL3 registers to enable entry into the next EL */ - next_image_info = bl31_get_next_image_info(image_type); + next_image_info = bl31_plat_get_next_image_ep_info(image_type); assert(next_image_info); scr = read_scr(); diff --git a/bl31/context_mgmt.c b/bl31/context_mgmt.c index 2e7e62d..b3dcf2d 100644 --- a/bl31/context_mgmt.c +++ b/bl31/context_mgmt.c @@ -37,6 +37,7 @@ #include <context_mgmt.h> #include <interrupt_mgmt.h> #include <platform.h> +#include <platform_def.h> #include <runtime_svc.h> /******************************************************************************* |