diff options
| author | Dan Handley <dan.handley@arm.com> | 2014-04-09 13:14:54 +0100 |
|---|---|---|
| committer | Dan Handley <dan.handley@arm.com> | 2014-05-06 13:57:48 +0100 |
| commit | 97043ac98e13a726dbf8b3b41654dca759e3da2c (patch) | |
| tree | 18133148dea88d9a2313113111b24b56e8130505 /lib/aarch64 | |
| parent | fb037bfb7cbf7b404c069b4ebac5a10059d948b1 (diff) | |
Reduce deep nesting of header files
Reduce the number of header files included from other header
files as much as possible without splitting the files. Use forward
declarations where possible. This allows removal of some unnecessary
"#ifndef __ASSEMBLY__" statements.
Also, review the .c and .S files for which header files really need
including and reorder the #include statements alphabetically.
Fixes ARM-software/tf-issues#31
Change-Id: Iec92fb976334c77453e010b60bcf56f3be72bd3e
Diffstat (limited to 'lib/aarch64')
| -rw-r--r-- | lib/aarch64/cache_helpers.S | 2 | ||||
| -rw-r--r-- | lib/aarch64/misc_helpers.S | 3 | ||||
| -rw-r--r-- | lib/aarch64/sysreg_helpers.S | 2 | ||||
| -rw-r--r-- | lib/aarch64/tlb_helpers.S | 1 | ||||
| -rw-r--r-- | lib/aarch64/xlat_helpers.c | 3 |
5 files changed, 4 insertions, 7 deletions
diff --git a/lib/aarch64/cache_helpers.S b/lib/aarch64/cache_helpers.S index 2696d90..2649ad0 100644 --- a/lib/aarch64/cache_helpers.S +++ b/lib/aarch64/cache_helpers.S @@ -28,7 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <arch_helpers.h> +#include <arch.h> #include <asm_macros.S> .globl dcisw diff --git a/lib/aarch64/misc_helpers.S b/lib/aarch64/misc_helpers.S index e3b4ab5..e7b2331 100644 --- a/lib/aarch64/misc_helpers.S +++ b/lib/aarch64/misc_helpers.S @@ -28,8 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <arch_helpers.h> -#include <runtime_svc.h> +#include <arch.h> #include <asm_macros.S> .globl enable_irq diff --git a/lib/aarch64/sysreg_helpers.S b/lib/aarch64/sysreg_helpers.S index 8e816f0..61468f9 100644 --- a/lib/aarch64/sysreg_helpers.S +++ b/lib/aarch64/sysreg_helpers.S @@ -28,7 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <arch_helpers.h> +#include <arch.h> #include <asm_macros.S> .globl read_vbar_el1 diff --git a/lib/aarch64/tlb_helpers.S b/lib/aarch64/tlb_helpers.S index 4244974..ec1558b 100644 --- a/lib/aarch64/tlb_helpers.S +++ b/lib/aarch64/tlb_helpers.S @@ -28,7 +28,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <arch_helpers.h> #include <asm_macros.S> .globl tlbialle1 diff --git a/lib/aarch64/xlat_helpers.c b/lib/aarch64/xlat_helpers.c index 87d24ec..d401ffc 100644 --- a/lib/aarch64/xlat_helpers.c +++ b/lib/aarch64/xlat_helpers.c @@ -28,9 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <string.h> -#include <assert.h> #include <arch.h> +#include <assert.h> /******************************************************************************* * Helper to create a level 1/2 table descriptor which points to a level 2/3 |