Merge pull request #1756 from antonio-nino-diaz-arm/an/header-deps

plat/arm: Fix header dependencies

Merge pull request #1756 from antonio-nino-diaz-arm/an/header-deps
plat/arm: Fix header dependencies
9f0f203d · Antonio Niño Díaz · GitHub · fe77b53e · 234bc7f8 · 9f0f203d
Unverified Commit 9f0f203d authored Jan 16, 2019 by Antonio Niño Díaz Committed by GitHub Jan 16, 2019
--- a/plat/arm/board/juno/juno_security.c
+++ b/plat/arm/board/juno/juno_security.c
@@ -7,10 +7,10 @@
 #include <common/debug.h>
 #include <drivers/arm/nic_400.h>
 #include <lib/mmio.h>
+#include <platform_def.h>
 #include <plat_arm.h>
 #include <soc_css.h>
-#include "juno_def.h"
 #include "juno_tzmp1_def.h"
 #ifdef JUNO_TZMP1

--- a/plat/arm/board/juno/juno_stack_protector.c
+++ b/plat/arm/board/juno/juno_stack_protector.c
@@ -7,9 +7,9 @@
 #include <arch_helpers.h>
 #include <common/debug.h>
 #include <lib/utils.h>
+#include <platform_def.h>
 #include "juno_decl.h"
-#include "juno_def.h"
 u_register_t plat_get_stack_protector_canary(void)
 {

--- a/plat/arm/board/juno/juno_topology.c
+++ b/plat/arm/board/juno/juno_topology.c
@@ -5,11 +5,10 @@
 */
 #include <plat/common/platform.h>
+#include <platform_def.h>
-#include <arm_def.h>
 #include <css_pm.h>
 #include <plat_arm.h>
-#include "juno_def.h"
 #include "../../css/drivers/scmi/scmi.h"
 #include "../../css/drivers/mhu/css_mhu_doorbell.h"

--- a/plat/arm/board/juno/juno_trng.c
+++ b/plat/arm/board/juno/juno_trng.c
@@ -9,9 +9,9 @@
 #include <lib/mmio.h>
 #include <lib/utils_def.h>
+#include <platform_def.h>
 #include "juno_decl.h"
-#include "juno_def.h"
 #define NSAMPLE_CLOCKS	1 /* min 1 cycle, max 231 cycles */
 #define NRETRIES	5

--- a/plat/arm/board/juno/juno_tzmp1_def.h
+++ b/plat/arm/board/juno/juno_tzmp1_def.h
@@ -7,8 +7,6 @@
 #ifndef JUNO_TZMP1_DEF_H
 #define JUNO_TZMP1_DEF_H
-#include <plat_arm.h>
 /*
 * Public memory regions for both protected and non-protected mode
 *

--- a/plat/arm/board/n1sdp/include/platform_def.h
+++ b/plat/arm/board/n1sdp/include/platform_def.h
@@ -9,6 +9,7 @@
 #include <arm_def.h>
 #include <css_def.h>
+#include <v2m_def.h>
 /* UART related constants */
 #define PLAT_ARM_BOOT_UART_BASE			0x2A400000

--- a/plat/arm/board/n1sdp/n1sdp_plat.c
+++ b/plat/arm/board/n1sdp/n1sdp_plat.c
@@ -10,7 +10,6 @@
 #include <common/debug.h>
 #include <plat/common/platform.h>
-#include <arm_def.h>
 #include <plat_arm.h>
 /*

--- 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"

--- 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

--- 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 */

--- 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 */

--- 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>
 /*

--- 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>
 /******************************************************************************

--- 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

--- 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 */

--- 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 */

--- 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>
 /*******************************************************************************

--- 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__)

--- a/plat/arm/css/common/aarch32/css_helpers.S
+++ b/plat/arm/css/common/aarch32/css_helpers.S
@@ -3,10 +3,11 @@
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */
 #include <arch.h>
 #include <asm_macros.S>
 #include <cpu_macros.S>
-#include <css_def.h>
+#include <platform_def.h>
 	.weak	plat_secondary_cold_boot_setup
 	.weak	plat_get_my_entrypoint

--- a/plat/arm/css/common/aarch64/css_helpers.S
+++ b/plat/arm/css/common/aarch64/css_helpers.S
@@ -3,10 +3,11 @@
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */
 #include <arch.h>
 #include <asm_macros.S>
 #include <cpu_macros.S>
-#include <css_def.h>
+#include <platform_def.h>
 	.weak	plat_secondary_cold_boot_setup
 	.weak	plat_get_my_entrypoint