diff options
author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2019-01-15 14:19:50 +0000 |
---|---|---|
committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2019-01-15 14:19:50 +0000 |
commit | 234bc7f88ed42a5305016009c47e8a6dc3408f96 (patch) | |
tree | e6716a4b5dde3282a08de2b534d49add178d6918 /plat/arm/common | |
parent | fe77b53e32692fc5d35df208e2b3d21a28f6228b (diff) |
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>
Diffstat (limited to 'plat/arm/common')
-rw-r--r-- | plat/arm/common/arm_bl1_setup.c | 1 | ||||
-rw-r--r-- | plat/arm/common/arm_bl2_el3_setup.c | 2 | ||||
-rw-r--r-- | plat/arm/common/arm_bl2_setup.c | 1 | ||||
-rw-r--r-- | plat/arm/common/arm_bl2u_setup.c | 1 | ||||
-rw-r--r-- | plat/arm/common/arm_bl31_setup.c | 2 | ||||
-rw-r--r-- | plat/arm/common/arm_gicv3.c | 1 | ||||
-rw-r--r-- | plat/arm/common/arm_image_load.c | 1 | ||||
-rw-r--r-- | plat/arm/common/arm_pm.c | 1 | ||||
-rw-r--r-- | plat/arm/common/arm_tzc400.c | 2 | ||||
-rw-r--r-- | plat/arm/common/arm_tzc_dmc500.c | 1 | ||||
-rw-r--r-- | plat/arm/common/tsp/arm_tsp_setup.c | 1 |
11 files changed, 2 insertions, 12 deletions
diff --git a/plat/arm/common/arm_bl1_setup.c b/plat/arm/common/arm_bl1_setup.c index e28211cf..73fee607 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 0c1f63ed..c38f2ec9 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 9319004e..b661eb15 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 0dc66e64..332ed14c 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 41151c2c..dacefc45 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 0f6690a0..e3cee3af 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 791f05ed..bf1fbfd4 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 acfd9089..4ce13aa6 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 0346fa18..322713b5 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 bea3867d..07260a7e 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 a3d2f715..0f2827db 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__) |