From 4e13f1af9ea7917e7283f6d30cfed81e08dd6a46 Mon Sep 17 00:00:00 2001
From: Sandrine Bailleux <sandrine.bailleux@arm.com>
Date: Thu, 29 May 2014 17:30:06 +0100
Subject: juno: Rework header file inclusion

Change-Id: I0837d787837a40a724a8b7f2e3abd82287f403f3
---
 bl31/aarch64/crash_reporting.S       | 1 +
 plat/juno/aarch64/bl1_plat_helpers.S | 2 +-
 plat/juno/aarch64/plat_common.c      | 1 +
 plat/juno/aarch64/plat_helpers.S     | 3 ++-
 plat/juno/bl1_plat_setup.c           | 4 +++-
 plat/juno/bl2_plat_setup.c           | 6 ++++--
 plat/juno/bl31_plat_setup.c          | 4 +++-
 plat/juno/bl32_plat_setup.c          | 4 ++--
 plat/juno/mhu.c                      | 3 ++-
 plat/juno/plat_gic.c                 | 2 ++
 plat/juno/plat_io_storage.c          | 1 +
 plat/juno/plat_pm.c                  | 5 ++++-
 plat/juno/plat_topology.c            | 2 +-
 plat/juno/scp_bootloader.c           | 7 ++++---
 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 cb9110b..69b7a1c 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 16f18a2..785aa15 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 5319fe3..b1078d8 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 9297a60..e06488e 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 badfae4..9f9583d 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 8ce09c9..563f05b 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 71861d3..008476b 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 cb76da3..d154add 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 7ead09d..4ab407f 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 7758b76..2de6a5c 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 c16a487..16259af 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 87b9d8c..6c2ec23 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 4bc58ba..39d4dab 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 9d0e608..a6d25d4 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 6b7d9a7..6af13ba 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)
-- 
cgit v1.2.3