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/board/common | |
| parent | fe77b53e32692fc5d35df208e2b3d21a28f6228b (diff) | |
| download | arm-trusted-firmware-234bc7f88ed42a5305016009c47e8a6dc3408f96.tar.gz | |
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/board/common')
| -rw-r--r-- | plat/arm/board/common/aarch32/board_arm_helpers.S | 2 | ||||
| -rw-r--r-- | plat/arm/board/common/aarch64/board_arm_helpers.S | 2 | ||||
| -rw-r--r-- | plat/arm/board/common/board_arm_trusted_boot.c | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/plat/arm/board/common/aarch32/board_arm_helpers.S b/plat/arm/board/common/aarch32/board_arm_helpers.S index 320bfb3c3..8c6369334 100644 --- a/plat/arm/board/common/aarch32/board_arm_helpers.S +++ b/plat/arm/board/common/aarch32/board_arm_helpers.S @@ -6,7 +6,7 @@ #include <asm_macros.S> #include <common/bl_common.h> -#include <v2m_def.h> +#include <platform_def.h> .globl plat_report_exception diff --git a/plat/arm/board/common/aarch64/board_arm_helpers.S b/plat/arm/board/common/aarch64/board_arm_helpers.S index 5a905244f..cde6b007c 100644 --- a/plat/arm/board/common/aarch64/board_arm_helpers.S +++ b/plat/arm/board/common/aarch64/board_arm_helpers.S @@ -6,7 +6,7 @@ #include <asm_macros.S> #include <common/bl_common.h> -#include <v2m_def.h> +#include <platform_def.h> .globl plat_report_exception diff --git a/plat/arm/board/common/board_arm_trusted_boot.c b/plat/arm/board/common/board_arm_trusted_boot.c index 64ca3c36d..e3c6805ac 100644 --- a/plat/arm/board/common/board_arm_trusted_boot.c +++ b/plat/arm/board/common/board_arm_trusted_boot.c @@ -11,8 +11,7 @@ #include <lib/cassert.h> #include <plat/common/platform.h> #include <tools_share/tbbr_oid.h> - -#include <arm_def.h> +#include <platform_def.h> /* SHA256 algorithm */ #define SHA256_BYTES 32 |