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 /bl1 | |
| parent | fb037bfb7cbf7b404c069b4ebac5a10059d948b1 (diff) | |
| download | platform_external_arm-trusted-firmware-97043ac98e13a726dbf8b3b41654dca759e3da2c.tar.gz platform_external_arm-trusted-firmware-97043ac98e13a726dbf8b3b41654dca759e3da2c.tar.bz2 platform_external_arm-trusted-firmware-97043ac98e13a726dbf8b3b41654dca759e3da2c.zip | |
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 'bl1')
| -rw-r--r-- | bl1/aarch64/bl1_arch_setup.c | 3 | ||||
| -rw-r--r-- | bl1/aarch64/bl1_exceptions.S | 4 | ||||
| -rw-r--r-- | bl1/bl1_main.c | 10 |
3 files changed, 7 insertions, 10 deletions
diff --git a/bl1/aarch64/bl1_arch_setup.c b/bl1/aarch64/bl1_arch_setup.c index 417a5366a..758b8e8fe 100644 --- a/bl1/aarch64/bl1_arch_setup.c +++ b/bl1/aarch64/bl1_arch_setup.c @@ -28,9 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include <arch.h> #include <arch_helpers.h> -#include <platform.h> -#include <assert.h> /******************************************************************************* * Function that does the first bit of architectural setup that affects diff --git a/bl1/aarch64/bl1_exceptions.S b/bl1/aarch64/bl1_exceptions.S index e57f2288a..68d088b7b 100644 --- a/bl1/aarch64/bl1_exceptions.S +++ b/bl1/aarch64/bl1_exceptions.S @@ -29,11 +29,9 @@ */ #include <arch.h> +#include <asm_macros.S> #include <bl_common.h> -#include <bl1.h> -#include <platform.h> #include <runtime_svc.h> -#include <asm_macros.S> .globl bl1_exceptions diff --git a/bl1/bl1_main.c b/bl1/bl1_main.c index 05af75a88..de7bc3180 100644 --- a/bl1/bl1_main.c +++ b/bl1/bl1_main.c @@ -28,13 +28,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <stdio.h> -#include <string.h> -#include <assert.h> +#include <arch.h> #include <arch_helpers.h> -#include <platform.h> -#include <semihosting.h> +#include <assert.h> +#include <bl_common.h> #include <bl1.h> +#include <platform.h> +#include <stdio.h> #include "bl1_private.h" /******************************************************************************* |