plat/arm: Fix header dependencies
From now on, platform_def.h must include any header with definitions that
are platform-specific (like arm_def.h) and the included headers mustn't
include back platform_def.h, and shouldn't be used by other files. Only
platform_def.h should be included in other files. This will ensure that all
needed definitions are present, rather than needing to include all the
headers in all the definitions' headers just in case.
This also prevents problems like cyclic dependencies.
Change-Id: I9d3cf4d1de4b956fa035c79545222697acdaf5ca
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
diff --git a/plat/arm/common/arm_bl1_setup.c b/plat/arm/common/arm_bl1_setup.c
index e28211c..73fee60 100644
--- a/plat/arm/common/arm_bl1_setup.c
+++ b/plat/arm/common/arm_bl1_setup.c
@@ -16,7 +16,6 @@
#include <lib/xlat_tables/xlat_tables_compat.h>
#include <plat/common/platform.h>
-#include <arm_def.h>
#include <plat_arm.h>
#include "../../../bl1/bl1_private.h"
diff --git a/plat/arm/common/arm_bl2_el3_setup.c b/plat/arm/common/arm_bl2_el3_setup.c
index 0c1f63e..c38f2ec 100644
--- a/plat/arm/common/arm_bl2_el3_setup.c
+++ b/plat/arm/common/arm_bl2_el3_setup.c
@@ -8,8 +8,8 @@
#include <drivers/generic_delay_timer.h>
#include <plat/common/platform.h>
+#include <platform_def.h>
-#include <arm_def.h>
#include <plat_arm.h>
#pragma weak bl2_el3_early_platform_setup
diff --git a/plat/arm/common/arm_bl2_setup.c b/plat/arm/common/arm_bl2_setup.c
index 9319004..b661eb1 100644
--- a/plat/arm/common/arm_bl2_setup.c
+++ b/plat/arm/common/arm_bl2_setup.c
@@ -20,7 +20,6 @@
#include <lib/utils.h>
#include <plat/common/platform.h>
-#include <arm_def.h>
#include <plat_arm.h>
/* Data structure which holds the extents of the trusted SRAM for BL2 */
diff --git a/plat/arm/common/arm_bl2u_setup.c b/plat/arm/common/arm_bl2u_setup.c
index 0dc66e6..332ed14 100644
--- a/plat/arm/common/arm_bl2u_setup.c
+++ b/plat/arm/common/arm_bl2u_setup.c
@@ -14,7 +14,6 @@
#include <drivers/generic_delay_timer.h>
#include <plat/common/platform.h>
-#include <arm_def.h>
#include <plat_arm.h>
/* Weak definitions may be overridden in specific ARM standard platform */
diff --git a/plat/arm/common/arm_bl31_setup.c b/plat/arm/common/arm_bl31_setup.c
index 41151c2..dacefc4 100644
--- a/plat/arm/common/arm_bl31_setup.c
+++ b/plat/arm/common/arm_bl31_setup.c
@@ -16,8 +16,8 @@
#include <lib/utils.h>
#include <lib/xlat_tables/xlat_tables_compat.h>
#include <plat/common/platform.h>
+#include <platform_def.h>
-#include <arm_def.h>
#include <plat_arm.h>
/*
diff --git a/plat/arm/common/arm_gicv3.c b/plat/arm/common/arm_gicv3.c
index 0f6690a..e3cee3a 100644
--- a/plat/arm/common/arm_gicv3.c
+++ b/plat/arm/common/arm_gicv3.c
@@ -11,7 +11,6 @@
#include <lib/utils.h>
#include <plat/common/platform.h>
-#include <arm_def.h>
#include <plat_arm.h>
/******************************************************************************
diff --git a/plat/arm/common/arm_image_load.c b/plat/arm/common/arm_image_load.c
index 791f05e..bf1fbfd 100644
--- a/plat/arm/common/arm_image_load.c
+++ b/plat/arm/common/arm_image_load.c
@@ -8,7 +8,6 @@
#include <common/desc_image_load.h>
#include <plat/common/platform.h>
-#include <arm_def.h>
#include <plat_arm.h>
#pragma weak plat_flush_next_bl_params
diff --git a/plat/arm/common/arm_pm.c b/plat/arm/common/arm_pm.c
index acfd908..4ce13aa 100644
--- a/plat/arm/common/arm_pm.c
+++ b/plat/arm/common/arm_pm.c
@@ -13,7 +13,6 @@
#include <lib/psci/psci.h>
#include <plat/common/platform.h>
-#include <arm_def.h>
#include <plat_arm.h>
/* Allow ARM Standard platforms to override these functions */
diff --git a/plat/arm/common/arm_tzc400.c b/plat/arm/common/arm_tzc400.c
index 0346fa1..322713b 100644
--- a/plat/arm/common/arm_tzc400.c
+++ b/plat/arm/common/arm_tzc400.c
@@ -9,8 +9,6 @@
#include <common/debug.h>
#include <drivers/arm/tzc400.h>
-#include <arm_def.h>
-#include <arm_spm_def.h>
#include <plat_arm.h>
/* Weak definitions may be overridden in specific ARM standard platform */
diff --git a/plat/arm/common/arm_tzc_dmc500.c b/plat/arm/common/arm_tzc_dmc500.c
index bea3867..07260a7 100644
--- a/plat/arm/common/arm_tzc_dmc500.c
+++ b/plat/arm/common/arm_tzc_dmc500.c
@@ -11,7 +11,6 @@
#include <common/debug.h>
#include <drivers/arm/tzc_dmc500.h>
-#include <arm_def.h>
#include <plat_arm.h>
/*******************************************************************************
diff --git a/plat/arm/common/tsp/arm_tsp_setup.c b/plat/arm/common/tsp/arm_tsp_setup.c
index a3d2f71..0f2827d 100644
--- a/plat/arm/common/tsp/arm_tsp_setup.c
+++ b/plat/arm/common/tsp/arm_tsp_setup.c
@@ -14,7 +14,6 @@
#include <drivers/arm/pl011.h>
#include <drivers/console.h>
-#include <arm_def.h>
#include <plat_arm.h>
#define BL32_END (unsigned long)(&__BL32_END__)