diff options
author | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2014-05-29 17:30:06 +0100 |
---|---|---|
committer | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2014-06-05 17:39:40 +0100 |
commit | 4e13f1af9ea7917e7283f6d30cfed81e08dd6a46 (patch) | |
tree | 9c3e47d237ad0f96eeb6ac5b8958572400867aaf | |
parent | 57a5b5c30fd099ed013086749023b6ead8b69127 (diff) | |
download | trusted-firmware-a-4e13f1af9ea7917e7283f6d30cfed81e08dd6a46.tar.gz |
juno: Rework header file inclusion
Change-Id: I0837d787837a40a724a8b7f2e3abd82287f403f3
-rw-r--r-- | bl31/aarch64/crash_reporting.S | 1 | ||||
-rw-r--r-- | plat/juno/aarch64/bl1_plat_helpers.S | 2 | ||||
-rw-r--r-- | plat/juno/aarch64/plat_common.c | 1 | ||||
-rw-r--r-- | plat/juno/aarch64/plat_helpers.S | 3 | ||||
-rw-r--r-- | plat/juno/bl1_plat_setup.c | 4 | ||||
-rw-r--r-- | plat/juno/bl2_plat_setup.c | 6 | ||||
-rw-r--r-- | plat/juno/bl31_plat_setup.c | 4 | ||||
-rw-r--r-- | plat/juno/bl32_plat_setup.c | 4 | ||||
-rw-r--r-- | plat/juno/mhu.c | 3 | ||||
-rw-r--r-- | plat/juno/plat_gic.c | 2 | ||||
-rw-r--r-- | plat/juno/plat_io_storage.c | 1 | ||||
-rw-r--r-- | plat/juno/plat_pm.c | 5 | ||||
-rw-r--r-- | plat/juno/plat_topology.c | 2 | ||||
-rw-r--r-- | plat/juno/scp_bootloader.c | 7 | ||||
-rw-r--r-- | plat/juno/scpi.c | 5 |
15 files changed, 34 insertions, 16 deletions
diff --git a/bl31/aarch64/crash_reporting.S b/bl31/aarch64/crash_reporting.S index cb9110b5fa..69b7a1c81c 100644 --- a/bl31/aarch64/crash_reporting.S +++ b/bl31/aarch64/crash_reporting.S @@ -31,6 +31,7 @@ #include <asm_macros.S> #include <context.h> #include <plat_macros.S> +#include <platform_def.h> .globl get_crash_stack .globl dump_state_and_die diff --git a/plat/juno/aarch64/bl1_plat_helpers.S b/plat/juno/aarch64/bl1_plat_helpers.S index 16f18a2a2f..785aa15adb 100644 --- a/plat/juno/aarch64/bl1_plat_helpers.S +++ b/plat/juno/aarch64/bl1_plat_helpers.S @@ -30,7 +30,7 @@ #include <arch.h> #include <asm_macros.S> -#include <platform.h> +#include "../juno_def.h" .globl platform_get_entrypoint .globl platform_cold_boot_init diff --git a/plat/juno/aarch64/plat_common.c b/plat/juno/aarch64/plat_common.c index 5319fe36ed..b1078d84b9 100644 --- a/plat/juno/aarch64/plat_common.c +++ b/plat/juno/aarch64/plat_common.c @@ -33,6 +33,7 @@ #include <bl_common.h> #include <mmio.h> #include <platform.h> +#include <platform_def.h> #include <xlat_tables.h> diff --git a/plat/juno/aarch64/plat_helpers.S b/plat/juno/aarch64/plat_helpers.S index 9297a607bb..e06488e74d 100644 --- a/plat/juno/aarch64/plat_helpers.S +++ b/plat/juno/aarch64/plat_helpers.S @@ -31,7 +31,8 @@ #include <arch.h> #include <asm_macros.S> #include <bl_common.h> -#include <platform.h> +#include <platform_def.h> +#include "../juno_def.h" .globl plat_report_exception .globl platform_mem_init diff --git a/plat/juno/bl1_plat_setup.c b/plat/juno/bl1_plat_setup.c index badfae4ee5..9f9583d64f 100644 --- a/plat/juno/bl1_plat_setup.c +++ b/plat/juno/bl1_plat_setup.c @@ -31,12 +31,14 @@ #include <arch_helpers.h> #include <assert.h> #include <bl_common.h> -#include <bl1.h> #include <cci400.h> #include <console.h> #include <mmio.h> #include <platform.h> +#include <platform_def.h> #include <tzc400.h> +#include "juno_def.h" +#include "juno_private.h" /******************************************************************************* * Declarations of linker defined symbols which will help us find the layout diff --git a/plat/juno/bl2_plat_setup.c b/plat/juno/bl2_plat_setup.c index 8ce09c9cd8..563f05b372 100644 --- a/plat/juno/bl2_plat_setup.c +++ b/plat/juno/bl2_plat_setup.c @@ -31,12 +31,14 @@ #include <arch_helpers.h> #include <assert.h> #include <bl_common.h> -#include <bl2.h> #include <console.h> #include <debug.h> #include <platform.h> -#include <scp_bootloader.h> +#include <platform_def.h> #include <string.h> +#include "juno_def.h" +#include "juno_private.h" +#include "scp_bootloader.h" /******************************************************************************* * Declarations of linker defined symbols which will help us find the layout diff --git a/plat/juno/bl31_plat_setup.c b/plat/juno/bl31_plat_setup.c index 71861d3311..008476b659 100644 --- a/plat/juno/bl31_plat_setup.c +++ b/plat/juno/bl31_plat_setup.c @@ -33,10 +33,12 @@ #include <bl31.h> #include <bl_common.h> #include <console.h> -#include <mhu.h> #include <mmio.h> #include <platform.h> #include <stddef.h> +#include "juno_def.h" +#include "juno_private.h" +#include "mhu.h" /******************************************************************************* * Declarations of linker defined symbols which will help us find the layout diff --git a/plat/juno/bl32_plat_setup.c b/plat/juno/bl32_plat_setup.c index cb76da396d..d154add931 100644 --- a/plat/juno/bl32_plat_setup.c +++ b/plat/juno/bl32_plat_setup.c @@ -28,11 +28,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <arch_helpers.h> #include <bl_common.h> -#include <bl32.h> #include <console.h> #include <platform.h> +#include "juno_def.h" +#include "juno_private.h" /******************************************************************************* * Declarations of linker defined symbols which will help us find the layout diff --git a/plat/juno/mhu.c b/plat/juno/mhu.c index 7ead09d364..4ab407f7b5 100644 --- a/plat/juno/mhu.c +++ b/plat/juno/mhu.c @@ -30,8 +30,9 @@ #include <arch_helpers.h> #include <bakery_lock.h> -#include <mhu.h> #include <mmio.h> +#include "juno_def.h" +#include "mhu.h" /* SCP MHU secure channel registers */ #define SCP_INTR_S_STAT 0x200 diff --git a/plat/juno/plat_gic.c b/plat/juno/plat_gic.c index 7758b7625c..2de6a5c350 100644 --- a/plat/juno/plat_gic.c +++ b/plat/juno/plat_gic.c @@ -34,6 +34,8 @@ #include <gic_v2.h> #include <interrupt_mgmt.h> #include <platform.h> +#include "juno_def.h" +#include "juno_private.h" /* Value used to initialise Non-Secure irq priorities four at a time */ diff --git a/plat/juno/plat_io_storage.c b/plat/juno/plat_io_storage.c index c16a48713e..16259afe12 100644 --- a/plat/juno/plat_io_storage.c +++ b/plat/juno/plat_io_storage.c @@ -37,6 +37,7 @@ #include <io_fip.h> #include <io_memmap.h> #include <debug.h> +#include "juno_def.h" /* IO devices */ static io_plat_data_t io_data; diff --git a/plat/juno/plat_pm.c b/plat/juno/plat_pm.c index 87b9d8cff5..6c2ec232a6 100644 --- a/plat/juno/plat_pm.c +++ b/plat/juno/plat_pm.c @@ -31,8 +31,11 @@ #include <arch_helpers.h> #include <cci400.h> #include <platform.h> +#include <platform_def.h> #include <psci.h> -#include <scpi.h> +#include "juno_def.h" +#include "juno_private.h" +#include "scpi.h" int pm_on(unsigned long mpidr, unsigned long sec_entrypoint, diff --git a/plat/juno/plat_topology.c b/plat/juno/plat_topology.c index 4bc58ba7e2..39d4dabc65 100644 --- a/plat/juno/plat_topology.c +++ b/plat/juno/plat_topology.c @@ -28,7 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <platform.h> +#include <platform_def.h> #include <psci.h> unsigned int plat_get_aff_count(unsigned int aff_lvl, unsigned long mpidr) diff --git a/plat/juno/scp_bootloader.c b/plat/juno/scp_bootloader.c index 9d0e608ab6..a6d25d49bf 100644 --- a/plat/juno/scp_bootloader.c +++ b/plat/juno/scp_bootloader.c @@ -29,10 +29,11 @@ */ #include <arch_helpers.h> -#include <mhu.h> #include <platform.h> -#include <scp_bootloader.h> -#include <scpi.h> +#include "juno_def.h" +#include "mhu.h" +#include "scp_bootloader.h" +#include "scpi.h" /* Boot commands sent from AP -> SCP */ #define BOOT_CMD_START 0x01 diff --git a/plat/juno/scpi.c b/plat/juno/scpi.c index 6b7d9a7da9..6af13baba4 100644 --- a/plat/juno/scpi.c +++ b/plat/juno/scpi.c @@ -29,9 +29,10 @@ */ #include <arch_helpers.h> -#include <mhu.h> #include <platform.h> -#include <scpi.h> +#include "juno_def.h" +#include "mhu.h" +#include "scpi.h" #define MHU_SECURE_SCP_TO_AP_PAYLOAD (MHU_SECURE_BASE+0x0080) #define MHU_SECURE_AP_TO_SCP_PAYLOAD (MHU_SECURE_BASE+0x0280) |