diff options
| author | Dan Handley <dan.handley@arm.com> | 2014-05-27 16:17:21 +0100 |
|---|---|---|
| committer | Dan Handley <dan.handley@arm.com> | 2014-05-27 16:17:21 +0100 |
| commit | 9865ac15765f260069047c0e7c56623eb1a70b9a (patch) | |
| tree | f574c9be9dc54b90430ddfb1bd5dfc39a58b9cfc /bl31 | |
| parent | 0ad469110437196cfbb781b30233d62e2320f694 (diff) | |
Further renames of platform porting functions
Rename the ic_* platform porting functions to plat_ic_* to be
consistent with the other functions in platform.h. Also rename
bl31_get_next_image_info() to bl31_plat_get_next_image_ep_info()
and remove the duplicate declaration in bl31.h.
Change-Id: I4851842069d3cff14c0a468daacc0a891a7ede84
Diffstat (limited to 'bl31')
| -rw-r--r-- | bl31/aarch64/runtime_exceptions.S | 4 | ||||
| -rw-r--r-- | bl31/bl31_main.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bl31/aarch64/runtime_exceptions.S b/bl31/aarch64/runtime_exceptions.S index 7e119c5..e3673f0 100644 --- a/bl31/aarch64/runtime_exceptions.S +++ b/bl31/aarch64/runtime_exceptions.S @@ -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_main.c b/bl31/bl31_main.c index 71c6464..5117793 100644 --- a/bl31/bl31_main.c +++ b/bl31/bl31_main.c @@ -165,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(); |