diff options
91 files changed, 136 insertions, 184 deletions
diff --git a/include/plat/arm/board/common/board_css_def.h b/include/plat/arm/board/common/board_css_def.h index 6cca38909..a77ea96ef 100644 --- a/include/plat/arm/board/common/board_css_def.h +++ b/include/plat/arm/board/common/board_css_def.h @@ -8,11 +8,10 @@ #define BOARD_CSS_DEF_H #include <lib/utils_def.h> +#include <plat/arm/board/common/v2m_def.h> +#include <plat/arm/soc/common/soc_css_def.h> #include <plat/common/common_def.h> -#include <soc_css_def.h> -#include <v2m_def.h> - /* * Definitions common to all ARM CSS-based development platforms */ diff --git a/include/plat/arm/board/common/v2m_def.h b/include/plat/arm/board/common/v2m_def.h index c5de407af..6a6979c9c 100644 --- a/include/plat/arm/board/common/v2m_def.h +++ b/include/plat/arm/board/common/v2m_def.h @@ -6,7 +6,7 @@ #ifndef V2M_DEF_H #define V2M_DEF_H -#include <lib/xlat_tables/xlat_tables_compat.h> +#include <lib/utils_def.h> /* V2M motherboard system registers & offsets */ #define V2M_SYSREGS_BASE UL(0x1c010000) diff --git a/lib/utils/mem_region.c b/lib/utils/mem_region.c index 662f6a05a..08bccf64b 100644 --- a/lib/utils/mem_region.c +++ b/lib/utils/mem_region.c @@ -6,7 +6,9 @@ #include <assert.h> +#include <common/debug.h> #include <lib/utils.h> +#include <lib/xlat_tables/xlat_tables_compat.h> /* * All the regions defined in mem_region_t must have the following properties diff --git a/plat/arm/board/common/board_common.mk b/plat/arm/board/common/board_common.mk index 487aad739..b98dfd48b 100644 --- a/plat/arm/board/common/board_common.mk +++ b/plat/arm/board/common/board_common.mk @@ -4,8 +4,6 @@ # SPDX-License-Identifier: BSD-3-Clause # -PLAT_INCLUDES += -Iinclude/plat/arm/board/common/ - PLAT_BL_COMMON_SOURCES += drivers/arm/pl011/${ARCH}/pl011_console.S \ plat/arm/board/common/${ARCH}/board_arm_helpers.S diff --git a/plat/arm/board/fvp/drivers/pwrc/fvp_pwrc.c b/plat/arm/board/fvp/drivers/pwrc/fvp_pwrc.c index cae9827c3..9080e22f8 100644 --- a/plat/arm/board/fvp/drivers/pwrc/fvp_pwrc.c +++ b/plat/arm/board/fvp/drivers/pwrc/fvp_pwrc.c @@ -6,9 +6,9 @@ #include <lib/bakery_lock.h> #include <lib/mmio.h> +#include <plat/arm/common/plat_arm.h> #include <platform_def.h> -#include <plat_arm.h> #include "../../fvp_private.h" #include "fvp_pwrc.h" diff --git a/plat/arm/board/fvp/fvp_bl1_setup.c b/plat/arm/board/fvp/fvp_bl1_setup.c index d6e82f50d..75090e87c 100644 --- a/plat/arm/board/fvp/fvp_bl1_setup.c +++ b/plat/arm/board/fvp/fvp_bl1_setup.c @@ -5,10 +5,9 @@ */ #include <common/tbbr/tbbr_img_def.h> +#include <plat/arm/common/plat_arm.h> #include <plat/common/platform.h> -#include <plat_arm.h> - #include "fvp_private.h" /******************************************************************************* diff --git a/plat/arm/board/fvp/fvp_bl2_el3_setup.c b/plat/arm/board/fvp/fvp_bl2_el3_setup.c index 69f2f7adf..7def56a70 100644 --- a/plat/arm/board/fvp/fvp_bl2_el3_setup.c +++ b/plat/arm/board/fvp/fvp_bl2_el3_setup.c @@ -4,7 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <plat_arm.h> +#include <plat/arm/common/plat_arm.h> + #include "fvp_private.h" void bl2_el3_early_platform_setup(u_register_t arg0 __unused, diff --git a/plat/arm/board/fvp/fvp_bl2_setup.c b/plat/arm/board/fvp/fvp_bl2_setup.c index 7aa620b1a..d28094993 100644 --- a/plat/arm/board/fvp/fvp_bl2_setup.c +++ b/plat/arm/board/fvp/fvp_bl2_setup.c @@ -7,10 +7,10 @@ #include <drivers/arm/sp804_delay_timer.h> #include <drivers/generic_delay_timer.h> #include <lib/mmio.h> +#include <plat/arm/common/plat_arm.h> #include <plat/common/platform.h> #include <platform_def.h> -#include <plat_arm.h> #include "fvp_private.h" void bl2_early_platform_setup2(u_register_t arg0, u_register_t arg1, u_register_t arg2, u_register_t arg3) diff --git a/plat/arm/board/fvp/fvp_bl2u_setup.c b/plat/arm/board/fvp/fvp_bl2u_setup.c index 6367be626..a8db05567 100644 --- a/plat/arm/board/fvp/fvp_bl2u_setup.c +++ b/plat/arm/board/fvp/fvp_bl2u_setup.c @@ -4,10 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <plat/arm/common/plat_arm.h> #include <plat/common/platform.h> #include <platform_def.h> -#include <plat_arm.h> #include "fvp_private.h" void bl2u_early_platform_setup(struct meminfo *mem_layout, void *plat_info) diff --git a/plat/arm/board/fvp/fvp_bl31_setup.c b/plat/arm/board/fvp/fvp_bl31_setup.c index 5f2121c52..7f28b202d 100644 --- a/plat/arm/board/fvp/fvp_bl31_setup.c +++ b/plat/arm/board/fvp/fvp_bl31_setup.c @@ -5,10 +5,10 @@ */ #include <drivers/arm/smmu_v3.h> +#include <plat/arm/common/arm_config.h> +#include <plat/arm/common/plat_arm.h> #include <plat/common/platform.h> -#include <arm_config.h> -#include <plat_arm.h> #include "fvp_private.h" void __init bl31_early_platform_setup2(u_register_t arg0, diff --git a/plat/arm/board/fvp/fvp_common.c b/plat/arm/board/fvp/fvp_common.c index fdf82f493..b885b47a4 100644 --- a/plat/arm/board/fvp/fvp_common.c +++ b/plat/arm/board/fvp/fvp_common.c @@ -12,13 +12,12 @@ #include <drivers/arm/gicv2.h> #include <lib/mmio.h> #include <lib/xlat_tables/xlat_tables_compat.h> +#include <plat/arm/common/arm_config.h> +#include <plat/arm/common/plat_arm.h> #include <plat/common/platform.h> #include <platform_def.h> #include <services/secure_partition.h> -#include <arm_config.h> -#include <plat_arm.h> - #include "fvp_private.h" /* Defines for GIC Driver build time selection */ diff --git a/plat/arm/board/fvp/fvp_io_storage.c b/plat/arm/board/fvp/fvp_io_storage.c index e186b3083..9c4c1d574 100644 --- a/plat/arm/board/fvp/fvp_io_storage.c +++ b/plat/arm/board/fvp/fvp_io_storage.c @@ -11,10 +11,9 @@ #include <drivers/io/io_semihosting.h> #include <drivers/io/io_storage.h> #include <lib/semihosting.h> +#include <plat/arm/common/plat_arm.h> #include <plat/common/common_def.h> -#include <plat_arm.h> - /* Semihosting filenames */ #define BL2_IMAGE_NAME "bl2.bin" #define BL31_IMAGE_NAME "bl31.bin" diff --git a/plat/arm/board/fvp/fvp_pm.c b/plat/arm/board/fvp/fvp_pm.c index 8ba828155..a51fa1718 100644 --- a/plat/arm/board/fvp/fvp_pm.c +++ b/plat/arm/board/fvp/fvp_pm.c @@ -13,13 +13,11 @@ #include <lib/extensions/spe.h> #include <lib/mmio.h> #include <lib/psci/psci.h> +#include <plat/arm/common/arm_config.h> +#include <plat/arm/common/plat_arm.h> #include <plat/common/platform.h> #include <platform_def.h> -#include <arm_config.h> -#include <plat_arm.h> - -#include "../../../../drivers/arm/gic/v3/gicv3_private.h" #include "drivers/pwrc/fvp_pwrc.h" #include "fvp_private.h" diff --git a/plat/arm/board/fvp/fvp_private.h b/plat/arm/board/fvp/fvp_private.h index e7dea9944..3d9653739 100644 --- a/plat/arm/board/fvp/fvp_private.h +++ b/plat/arm/board/fvp/fvp_private.h @@ -7,7 +7,7 @@ #ifndef FVP_PRIVATE_H #define FVP_PRIVATE_H -#include <plat_arm.h> +#include <plat/arm/common/plat_arm.h> /******************************************************************************* * Function and variable prototypes diff --git a/plat/arm/board/fvp/fvp_security.c b/plat/arm/board/fvp/fvp_security.c index 028522cfe..80ec2171b 100644 --- a/plat/arm/board/fvp/fvp_security.c +++ b/plat/arm/board/fvp/fvp_security.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arm_config.h> -#include <plat_arm.h> +#include <plat/arm/common/arm_config.h> +#include <plat/arm/common/plat_arm.h> /* * We assume that all security programming is done by the primary core. diff --git a/plat/arm/board/fvp/fvp_topology.c b/plat/arm/board/fvp/fvp_topology.c index 3384a2f70..5e066eaab 100644 --- a/plat/arm/board/fvp/fvp_topology.c +++ b/plat/arm/board/fvp/fvp_topology.c @@ -8,10 +8,10 @@ #include <arch.h> #include <lib/cassert.h> +#include <plat/arm/common/arm_config.h> +#include <plat/arm/common/plat_arm.h> #include <plat/common/platform.h> -#include <plat_arm.h> -#include <arm_config.h> #include "drivers/pwrc/fvp_pwrc.h" /* The FVP power domain tree descriptor */ diff --git a/plat/arm/board/fvp/include/plat.ld.S b/plat/arm/board/fvp/include/plat.ld.S index ad2d46c43..f024f551a 100644 --- a/plat/arm/board/fvp/include/plat.ld.S +++ b/plat/arm/board/fvp/include/plat.ld.S @@ -6,7 +6,7 @@ #ifndef PLAT_LD_S #define PLAT_LD_S -#include <arm_tzc_dram.ld.S> -#include <arm_reclaim_init.ld.S> +#include <plat/arm/common/arm_tzc_dram.ld.S> +#include <plat/arm/common/arm_reclaim_init.ld.S> #endif /* PLAT_LD_S */ diff --git a/plat/arm/board/fvp/include/platform_def.h b/plat/arm/board/fvp/include/platform_def.h index 8c0daf130..e325aa558 100644 --- a/plat/arm/board/fvp/include/platform_def.h +++ b/plat/arm/board/fvp/include/platform_def.h @@ -20,12 +20,11 @@ #include <drivers/arm/tzc400.h> #include <lib/utils_def.h> +#include <plat/arm/board/common/v2m_def.h> +#include <plat/arm/common/arm_def.h> +#include <plat/arm/common/arm_spm_def.h> #include <plat/common/common_def.h> -#include <arm_def.h> -#include <arm_spm_def.h> -#include <v2m_def.h> - #include "../fvp_def.h" /* Required platform porting definitions */ diff --git a/plat/arm/board/fvp/sp_min/fvp_sp_min_setup.c b/plat/arm/board/fvp/sp_min/fvp_sp_min_setup.c index 7c89c27e3..88c91e6fe 100644 --- a/plat/arm/board/fvp/sp_min/fvp_sp_min_setup.c +++ b/plat/arm/board/fvp/sp_min/fvp_sp_min_setup.c @@ -4,7 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <plat_arm.h> +#include <plat/arm/common/plat_arm.h> + #include "../fvp_private.h" void plat_arm_sp_min_early_platform_setup(u_register_t arg0, u_register_t arg1, diff --git a/plat/arm/board/fvp/tsp/fvp_tsp_setup.c b/plat/arm/board/fvp/tsp/fvp_tsp_setup.c index 86d265a38..3c8a9639c 100644 --- a/plat/arm/board/fvp/tsp/fvp_tsp_setup.c +++ b/plat/arm/board/fvp/tsp/fvp_tsp_setup.c @@ -4,7 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <plat_arm.h> +#include <plat/arm/common/plat_arm.h> + #include "../fvp_private.h" void tsp_early_platform_setup(void) diff --git a/plat/arm/board/juno/include/platform_def.h b/plat/arm/board/juno/include/platform_def.h index b10cfdcbd..3be1b6843 100644 --- a/plat/arm/board/juno/include/platform_def.h +++ b/plat/arm/board/juno/include/platform_def.h @@ -23,13 +23,13 @@ #if TRUSTED_BOARD_BOOT #include <drivers/auth/mbedtls/mbedtls_config.h> #endif +#include <plat/arm/board/common/board_css_def.h> +#include <plat/arm/board/common/v2m_def.h> +#include <plat/arm/common/arm_def.h> +#include <plat/arm/css/common/css_def.h> +#include <plat/arm/soc/common/soc_css_def.h> #include <plat/common/common_def.h> -#include <arm_def.h> -#include <board_css_def.h> -#include <css_def.h> -#include <soc_css_def.h> -#include <v2m_def.h> #include "../juno_def.h" /* Required platform porting definitions */ diff --git a/plat/arm/board/juno/juno_bl1_setup.c b/plat/arm/board/juno/juno_bl1_setup.c index 383409df0..f72dba181 100644 --- a/plat/arm/board/juno/juno_bl1_setup.c +++ b/plat/arm/board/juno/juno_bl1_setup.c @@ -10,10 +10,10 @@ #include <common/debug.h> #include <common/tbbr/tbbr_img_def.h> #include <drivers/arm/sp805.h> +#include <plat/arm/common/plat_arm.h> #include <plat/common/platform.h> #include <platform_def.h> -#include <plat_arm.h> #include <sds.h> void juno_reset_to_aarch32_state(void); diff --git a/plat/arm/board/juno/juno_bl2_setup.c b/plat/arm/board/juno/juno_bl2_setup.c index 56f05eb18..95ef77c0d 100644 --- a/plat/arm/board/juno/juno_bl2_setup.c +++ b/plat/arm/board/juno/juno_bl2_setup.c @@ -8,8 +8,7 @@ #include <common/bl_common.h> #include <common/desc_image_load.h> - -#include <plat_arm.h> +#include <plat/arm/common/plat_arm.h> #if JUNO_AARCH32_EL3_RUNTIME /******************************************************************************* diff --git a/plat/arm/board/juno/juno_common.c b/plat/arm/board/juno/juno_common.c index e13410836..118c19ab7 100644 --- a/plat/arm/board/juno/juno_common.c +++ b/plat/arm/board/juno/juno_common.c @@ -5,7 +5,7 @@ */ #include <platform_def.h> -#include <plat_arm.h> +#include <plat/arm/common/plat_arm.h> /* * Table of memory regions for different BL stages to map using the MMU. diff --git a/plat/arm/board/juno/juno_pm.c b/plat/arm/board/juno/juno_pm.c index dbf7b6c69..4864f488b 100644 --- a/plat/arm/board/juno/juno_pm.c +++ b/plat/arm/board/juno/juno_pm.c @@ -4,7 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <plat_arm.h> +#include <plat/arm/common/plat_arm.h> + #include <scmi.h> const plat_psci_ops_t *plat_arm_psci_override_pm_ops(plat_psci_ops_t *ops) diff --git a/plat/arm/board/juno/juno_security.c b/plat/arm/board/juno/juno_security.c index 51c8669a8..9d7f0e421 100644 --- a/plat/arm/board/juno/juno_security.c +++ b/plat/arm/board/juno/juno_security.c @@ -8,9 +8,9 @@ #include <drivers/arm/nic_400.h> #include <lib/mmio.h> #include <platform_def.h> +#include <plat/arm/common/plat_arm.h> +#include <plat/arm/soc/common/soc_css.h> -#include <plat_arm.h> -#include <soc_css.h> #include "juno_tzmp1_def.h" #ifdef JUNO_TZMP1 diff --git a/plat/arm/board/juno/juno_topology.c b/plat/arm/board/juno/juno_topology.c index e70cbdcb0..1402bbdf7 100644 --- a/plat/arm/board/juno/juno_topology.c +++ b/plat/arm/board/juno/juno_topology.c @@ -4,11 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <plat/arm/common/plat_arm.h> +#include <plat/arm/css/common/css_pm.h> #include <plat/common/platform.h> #include <platform_def.h> -#include <css_pm.h> -#include <plat_arm.h> #include "../../css/drivers/scmi/scmi.h" #include "../../css/drivers/mhu/css_mhu_doorbell.h" diff --git a/plat/arm/board/n1sdp/include/platform_def.h b/plat/arm/board/n1sdp/include/platform_def.h index 68d0f936c..7b8c367a2 100644 --- a/plat/arm/board/n1sdp/include/platform_def.h +++ b/plat/arm/board/n1sdp/include/platform_def.h @@ -7,9 +7,9 @@ #ifndef PLATFORM_DEF_H #define PLATFORM_DEF_H -#include <arm_def.h> -#include <css_def.h> -#include <v2m_def.h> +#include <plat/arm/board/common/v2m_def.h> +#include <plat/arm/common/arm_def.h> +#include <plat/arm/css/common/css_def.h> /* UART related constants */ #define PLAT_ARM_BOOT_UART_BASE 0x2A400000 diff --git a/plat/arm/board/n1sdp/n1sdp_bl31_setup.c b/plat/arm/board/n1sdp/n1sdp_bl31_setup.c index d044b7ccf..93f2803c9 100644 --- a/plat/arm/board/n1sdp/n1sdp_bl31_setup.c +++ b/plat/arm/board/n1sdp/n1sdp_bl31_setup.c @@ -6,9 +6,10 @@ #include <platform_def.h> +#include <plat/arm/common/plat_arm.h> + #include "../../css/drivers/scmi/scmi.h" #include "../../css/drivers/mhu/css_mhu_doorbell.h" -#include <plat_arm.h> static scmi_channel_plat_info_t n1sdp_scmi_plat_info = { .scmi_mbx_mem = N1SDP_SCMI_PAYLOAD_BASE, diff --git a/plat/arm/board/n1sdp/n1sdp_plat.c b/plat/arm/board/n1sdp/n1sdp_plat.c index 87e151108..6905896c8 100644 --- a/plat/arm/board/n1sdp/n1sdp_plat.c +++ b/plat/arm/board/n1sdp/n1sdp_plat.c @@ -8,10 +8,9 @@ #include <common/bl_common.h> #include <common/debug.h> +#include <plat/arm/common/plat_arm.h> #include <plat/common/platform.h> -#include <plat_arm.h> - /* * Table of regions to map using the MMU. * Replace or extend the below regions as required diff --git a/plat/arm/board/n1sdp/n1sdp_topology.c b/plat/arm/board/n1sdp/n1sdp_topology.c index c3b4550d0..edf117099 100644 --- a/plat/arm/board/n1sdp/n1sdp_topology.c +++ b/plat/arm/board/n1sdp/n1sdp_topology.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <plat_arm.h> +#include <plat/arm/common/plat_arm.h> /* Topology */ typedef struct n1sdp_topology { diff --git a/plat/arm/common/arm_bl1_fwu.c b/plat/arm/common/arm_bl1_fwu.c index cd92aa8ed..124c1af53 100644 --- a/plat/arm/common/arm_bl1_fwu.c +++ b/plat/arm/common/arm_bl1_fwu.c @@ -13,10 +13,9 @@ #include <common/bl_common.h> #include <common/debug.h> #include <lib/utils.h> +#include <plat/arm/common/plat_arm.h> #include <plat/common/platform.h> -#include <plat_arm.h> - /* Struct to keep track of usable memory */ typedef struct bl1_mem_info { uintptr_t mem_base; diff --git a/plat/arm/common/arm_bl1_setup.c b/plat/arm/common/arm_bl1_setup.c index 3a8b5c275..fd4809c16 100644 --- a/plat/arm/common/arm_bl1_setup.c +++ b/plat/arm/common/arm_bl1_setup.c @@ -14,10 +14,9 @@ #include <drivers/arm/sp805.h> #include <lib/utils.h> #include <lib/xlat_tables/xlat_tables_compat.h> +#include <plat/arm/common/plat_arm.h> #include <plat/common/platform.h> -#include <plat_arm.h> - /* Weak definitions may be overridden in specific ARM standard platform */ #pragma weak bl1_early_platform_setup #pragma weak bl1_plat_arch_setup diff --git a/plat/arm/common/arm_bl2_el3_setup.c b/plat/arm/common/arm_bl2_el3_setup.c index c38f2ec94..0c01c872e 100644 --- a/plat/arm/common/arm_bl2_el3_setup.c +++ b/plat/arm/common/arm_bl2_el3_setup.c @@ -7,11 +7,10 @@ #include <assert.h> #include <drivers/generic_delay_timer.h> +#include <plat/arm/common/plat_arm.h> #include <plat/common/platform.h> #include <platform_def.h> -#include <plat_arm.h> - #pragma weak bl2_el3_early_platform_setup #pragma weak bl2_el3_plat_arch_setup #pragma weak bl2_el3_plat_prepare_exit diff --git a/plat/arm/common/arm_bl2_setup.c b/plat/arm/common/arm_bl2_setup.c index b661eb15a..32617f68d 100644 --- a/plat/arm/common/arm_bl2_setup.c +++ b/plat/arm/common/arm_bl2_setup.c @@ -18,10 +18,9 @@ #include <lib/optee_utils.h> #endif #include <lib/utils.h> +#include <plat/arm/common/plat_arm.h> #include <plat/common/platform.h> -#include <plat_arm.h> - /* Data structure which holds the extents of the trusted SRAM for BL2 */ static meminfo_t bl2_tzram_layout __aligned(CACHE_WRITEBACK_GRANULE); diff --git a/plat/arm/common/arm_bl2u_setup.c b/plat/arm/common/arm_bl2u_setup.c index 332ed14cf..9f44b9e6c 100644 --- a/plat/arm/common/arm_bl2u_setup.c +++ b/plat/arm/common/arm_bl2u_setup.c @@ -12,10 +12,9 @@ #include <arch_helpers.h> #include <common/bl_common.h> #include <drivers/generic_delay_timer.h> +#include <plat/arm/common/plat_arm.h> #include <plat/common/platform.h> -#include <plat_arm.h> - /* Weak definitions may be overridden in specific ARM standard platform */ #pragma weak bl2u_platform_setup #pragma weak bl2u_early_platform_setup diff --git a/plat/arm/common/arm_bl31_setup.c b/plat/arm/common/arm_bl31_setup.c index dacefc457..8e1a26300 100644 --- a/plat/arm/common/arm_bl31_setup.c +++ b/plat/arm/common/arm_bl31_setup.c @@ -15,11 +15,10 @@ #include <lib/mmio.h> #include <lib/utils.h> #include <lib/xlat_tables/xlat_tables_compat.h> +#include <plat/arm/common/plat_arm.h> #include <plat/common/platform.h> #include <platform_def.h> -#include <plat_arm.h> - /* * Placeholder variables for copying the arguments that have been passed to * BL31 from BL2. diff --git a/plat/arm/common/arm_cci.c b/plat/arm/common/arm_cci.c index 7ee997e29..3795fc52f 100644 --- a/plat/arm/common/arm_cci.c +++ b/plat/arm/common/arm_cci.c @@ -9,8 +9,7 @@ #include <arch.h> #include <drivers/arm/cci.h> #include <lib/utils.h> - -#include <plat_arm.h> +#include <plat/arm/common/plat_arm.h> static const int cci_map[] = { PLAT_ARM_CCI_CLUSTER0_SL_IFACE_IX, diff --git a/plat/arm/common/arm_ccn.c b/plat/arm/common/arm_ccn.c index 6aa56f217..2e681ca1f 100644 --- a/plat/arm/common/arm_ccn.c +++ b/plat/arm/common/arm_ccn.c @@ -8,8 +8,7 @@ #include <arch.h> #include <drivers/arm/ccn.h> - -#include <plat_arm.h> +#include <plat/arm/common/plat_arm.h> static const unsigned char master_to_rn_id_map[] = { PLAT_ARM_CLUSTER_TO_CCN_ID_MAP diff --git a/plat/arm/common/arm_common.c b/plat/arm/common/arm_common.c index 4cd2ce3d6..5361d4ad1 100644 --- a/plat/arm/common/arm_common.c +++ b/plat/arm/common/arm_common.c @@ -14,11 +14,10 @@ #include <common/romlib.h> #include <lib/mmio.h> #include <lib/xlat_tables/xlat_tables_compat.h> +#include <plat/arm/common/plat_arm.h> #include <plat/common/platform.h> #include <services/secure_partition.h> -#include <plat_arm.h> - /* Weak definitions may be overridden in specific ARM standard platform */ #pragma weak plat_get_ns_image_entrypoint #pragma weak plat_arm_get_mmap diff --git a/plat/arm/common/arm_common.mk b/plat/arm/common/arm_common.mk index 9ad7bd723..f18a9af69 100644 --- a/plat/arm/common/arm_common.mk +++ b/plat/arm/common/arm_common.mk @@ -141,9 +141,6 @@ ifeq (${ARM_CRYPTOCELL_INTEG},1) endif endif -PLAT_INCLUDES += -Iinclude/common/tbbr \ - -Iinclude/plat/arm/common - ifeq (${ARCH}, aarch64) PLAT_INCLUDES += -Iinclude/plat/arm/common/aarch64 endif @@ -257,8 +254,6 @@ ifneq (${TRUSTED_BOARD_BOOT},0) drivers/auth/img_parser_mod.c \ drivers/auth/tbbr/tbbr_cot.c \ - PLAT_INCLUDES += -Iinclude/bl1/tbbr - BL1_SOURCES += ${AUTH_SOURCES} \ bl1/tbbr/tbbr_img_desc.c \ plat/arm/common/arm_bl1_fwu.c \ diff --git a/plat/arm/common/arm_console.c b/plat/arm/common/arm_console.c index 29cb37827..03670858c 100644 --- a/plat/arm/common/arm_console.c +++ b/plat/arm/common/arm_console.c @@ -11,8 +11,7 @@ #include <common/debug.h> #include <drivers/arm/pl011.h> #include <drivers/console.h> - -#include <plat_arm.h> +#include <plat/arm/common/plat_arm.h> /******************************************************************************* * Functions that set up the console diff --git a/plat/arm/common/arm_dyn_cfg.c b/plat/arm/common/arm_dyn_cfg.c index 6c6dc568c..1c58649ba 100644 --- a/plat/arm/common/arm_dyn_cfg.c +++ b/plat/arm/common/arm_dyn_cfg.c @@ -15,11 +15,10 @@ #if TRUSTED_BOARD_BOOT #include <drivers/auth/mbedtls/mbedtls_config.h> #endif +#include <plat/arm/common/arm_dyn_cfg_helpers.h> +#include <plat/arm/common/plat_arm.h> #include <plat/common/platform.h> -#include <arm_dyn_cfg_helpers.h> -#include <plat_arm.h> - /* Variable to store the address to TB_FW_CONFIG passed from BL1 */ static void *tb_fw_cfg_dtb; static size_t tb_fw_cfg_dtb_size; diff --git a/plat/arm/common/arm_dyn_cfg_helpers.c b/plat/arm/common/arm_dyn_cfg_helpers.c index bf2f15643..36d37f8f6 100644 --- a/plat/arm/common/arm_dyn_cfg_helpers.c +++ b/plat/arm/common/arm_dyn_cfg_helpers.c @@ -10,9 +10,8 @@ #include <common/desc_image_load.h> #include <common/fdt_wrappers.h> - -#include <arm_dyn_cfg_helpers.h> -#include <plat_arm.h> +#include <plat/arm/common/arm_dyn_cfg_helpers.h> +#include <plat/arm/common/plat_arm.h> #define DTB_PROP_MBEDTLS_HEAP_ADDR "mbedtls_heap_addr" #define DTB_PROP_MBEDTLS_HEAP_SIZE "mbedtls_heap_size" diff --git a/plat/arm/common/arm_err.c b/plat/arm/common/arm_err.c index 8650d48a7..e77f5dc5c 100644 --- a/plat/arm/common/arm_err.c +++ b/plat/arm/common/arm_err.c @@ -13,10 +13,9 @@ #include <common/debug.h> #include <drivers/cfi/v2m_flash.h> #include <drivers/console.h> +#include <plat/arm/common/plat_arm.h> #include <plat/common/platform.h> -#include <plat_arm.h> - #pragma weak plat_arm_error_handler /* diff --git a/plat/arm/common/arm_gicv2.c b/plat/arm/common/arm_gicv2.c index fc848c198..80a845fa1 100644 --- a/plat/arm/common/arm_gicv2.c +++ b/plat/arm/common/arm_gicv2.c @@ -7,10 +7,9 @@ #include <platform_def.h> #include <drivers/arm/gicv2.h> +#include <plat/arm/common/plat_arm.h> #include <plat/common/platform.h> -#include <plat_arm.h> - /****************************************************************************** * The following functions are defined as weak to allow a platform to override * the way the GICv2 driver is initialised and used. diff --git a/plat/arm/common/arm_gicv3.c b/plat/arm/common/arm_gicv3.c index e16e13d24..93bebf347 100644 --- a/plat/arm/common/arm_gicv3.c +++ b/plat/arm/common/arm_gicv3.c @@ -9,10 +9,9 @@ #include <common/interrupt_props.h> #include <drivers/arm/gicv3.h> #include <lib/utils.h> +#include <plat/arm/common/plat_arm.h> #include <plat/common/platform.h> -#include <plat_arm.h> - /****************************************************************************** * The following functions are defined as weak to allow a platform to override * the way the GICv3 driver is initialised and used. diff --git a/plat/arm/common/arm_image_load.c b/plat/arm/common/arm_image_load.c index 74018d2d0..2faaa76c4 100644 --- a/plat/arm/common/arm_image_load.c +++ b/plat/arm/common/arm_image_load.c @@ -7,10 +7,9 @@ #include <assert.h> #include <common/bl_common.h> #include <common/desc_image_load.h> +#include <plat/arm/common/plat_arm.h> #include <plat/common/platform.h> -#include <plat_arm.h> - #pragma weak plat_flush_next_bl_params #pragma weak plat_get_bl_image_load_info #pragma weak plat_get_next_bl_params diff --git a/plat/arm/common/arm_io_storage.c b/plat/arm/common/arm_io_storage.c index d7c5cac24..fc1eb490e 100644 --- a/plat/arm/common/arm_io_storage.c +++ b/plat/arm/common/arm_io_storage.c @@ -15,11 +15,10 @@ #include <drivers/io/io_memmap.h> #include <drivers/io/io_storage.h> #include <lib/utils.h> +#include <plat/arm/common/plat_arm.h> #include <plat/common/platform.h> #include <tools_share/firmware_image_package.h> -#include <plat_arm.h> - /* IO devices */ static const io_dev_connector_t *fip_dev_con; static uintptr_t fip_dev_handle; diff --git a/plat/arm/common/arm_nor_psci_mem_protect.c b/plat/arm/common/arm_nor_psci_mem_protect.c index 4ae57e534..dfbd12900 100644 --- a/plat/arm/common/arm_nor_psci_mem_protect.c +++ b/plat/arm/common/arm_nor_psci_mem_protect.c @@ -11,8 +11,7 @@ #include <lib/psci/psci.h> #include <lib/mmio.h> #include <lib/utils.h> - -#include <plat_arm.h> +#include <plat/arm/common/plat_arm.h> /* * DRAM1 is used also to load the NS boot loader. For this reason we diff --git a/plat/arm/common/arm_pm.c b/plat/arm/common/arm_pm.c index 4ce13aa6a..cb87bafdd 100644 --- a/plat/arm/common/arm_pm.c +++ b/plat/arm/common/arm_pm.c @@ -11,10 +11,9 @@ #include <arch_helpers.h> #include <lib/psci/psci.h> +#include <plat/arm/common/plat_arm.h> #include <plat/common/platform.h> -#include <plat_arm.h> - /* Allow ARM Standard platforms to override these functions */ #pragma weak plat_arm_program_trusted_mailbox diff --git a/plat/arm/common/arm_sip_svc.c b/plat/arm/common/arm_sip_svc.c index 6b0f7e7be..3d308a335 100644 --- a/plat/arm/common/arm_sip_svc.c +++ b/plat/arm/common/arm_sip_svc.c @@ -9,11 +9,10 @@ #include <common/debug.h> #include <common/runtime_svc.h> #include <lib/pmf/pmf.h> +#include <plat/arm/common/arm_sip_svc.h> +#include <plat/arm/common/plat_arm.h> #include <tools_share/uuid.h> -#include <arm_sip_svc.h> -#include <plat_arm.h> - /* ARM SiP Service UUID */ DEFINE_SVC_UUID2(arm_sip_svc_uid, 0x556d75e2, 0x6033, 0xb54b, 0xb5, 0x75, diff --git a/plat/arm/common/arm_topology.c b/plat/arm/common/arm_topology.c index 6986e52b0..37047bcf3 100644 --- a/plat/arm/common/arm_topology.c +++ b/plat/arm/common/arm_topology.c @@ -7,8 +7,7 @@ #include <platform_def.h> #include <arch.h> - -#include <plat_arm.h> +#include <plat/arm/common/plat_arm.h> /******************************************************************************* * This function validates an MPIDR by checking whether it falls within the diff --git a/plat/arm/common/arm_tzc400.c b/plat/arm/common/arm_tzc400.c index 322713b5f..34e650f19 100644 --- a/plat/arm/common/arm_tzc400.c +++ b/plat/arm/common/arm_tzc400.c @@ -8,8 +8,7 @@ #include <common/debug.h> #include <drivers/arm/tzc400.h> - -#include <plat_arm.h> +#include <plat/arm/common/plat_arm.h> /* Weak definitions may be overridden in specific ARM standard platform */ #pragma weak plat_arm_security_setup diff --git a/plat/arm/common/arm_tzc_dmc500.c b/plat/arm/common/arm_tzc_dmc500.c index 07260a7e9..e9f897f4d 100644 --- a/plat/arm/common/arm_tzc_dmc500.c +++ b/plat/arm/common/arm_tzc_dmc500.c @@ -10,8 +10,7 @@ #include <common/debug.h> #include <drivers/arm/tzc_dmc500.h> - -#include <plat_arm.h> +#include <plat/arm/common/plat_arm.h> /******************************************************************************* * Initialize the DMC500-TrustZone Controller for ARM standard platforms. diff --git a/plat/arm/common/execution_state_switch.c b/plat/arm/common/execution_state_switch.c index e3134102d..d47113029 100644 --- a/plat/arm/common/execution_state_switch.c +++ b/plat/arm/common/execution_state_switch.c @@ -12,11 +12,10 @@ #include <lib/el3_runtime/context_mgmt.h> #include <lib/psci/psci.h> #include <lib/utils.h> +#include <plat/arm/common/arm_sip_svc.h> +#include <plat/arm/common/plat_arm.h> #include <smccc_helpers.h> -#include <arm_sip_svc.h> -#include <plat_arm.h> - /* * Handle SMC from a lower exception level to switch its execution state * (either from AArch64 to AArch32, or vice versa). diff --git a/plat/arm/common/sp_min/arm_sp_min_setup.c b/plat/arm/common/sp_min/arm_sp_min_setup.c index 967b551e4..c0ea027b8 100644 --- a/plat/arm/common/sp_min/arm_sp_min_setup.c +++ b/plat/arm/common/sp_min/arm_sp_min_setup.c @@ -14,10 +14,9 @@ #include <drivers/arm/pl011.h> #include <drivers/console.h> #include <lib/mmio.h> +#include <plat/arm/common/plat_arm.h> #include <plat/common/platform.h> -#include <plat_arm.h> - static entry_point_info_t bl33_image_ep_info; /* Weak definitions may be overridden in specific ARM standard platform */ diff --git a/plat/arm/common/tsp/arm_tsp_setup.c b/plat/arm/common/tsp/arm_tsp_setup.c index 29376972d..2965ccd40 100644 --- a/plat/arm/common/tsp/arm_tsp_setup.c +++ b/plat/arm/common/tsp/arm_tsp_setup.c @@ -13,8 +13,7 @@ #include <common/debug.h> #include <drivers/arm/pl011.h> #include <drivers/console.h> - -#include <plat_arm.h> +#include <plat/arm/common/plat_arm.h> #define BL32_END (unsigned long)(&__BL32_END__) diff --git a/plat/arm/css/common/css_bl1_setup.c b/plat/arm/css/common/css_bl1_setup.c index ae0f01133..596cc3d67 100644 --- a/plat/arm/css/common/css_bl1_setup.c +++ b/plat/arm/css/common/css_bl1_setup.c @@ -6,11 +6,10 @@ #include <common/bl_common.h> #include <common/debug.h> +#include <plat/arm/common/plat_arm.h> +#include <plat/arm/soc/common/soc_css.h> #include <plat/common/platform.h> -#include <plat_arm.h> -#include <soc_css.h> - void bl1_platform_setup(void) { arm_bl1_platform_setup(); diff --git a/plat/arm/css/common/css_bl2_setup.c b/plat/arm/css/common/css_bl2_setup.c index 6aefe03a7..1538e2976 100644 --- a/plat/arm/css/common/css_bl2_setup.c +++ b/plat/arm/css/common/css_bl2_setup.c @@ -10,10 +10,9 @@ #include <common/debug.h> #include <lib/mmio.h> #include <lib/utils.h> +#include <plat/arm/common/plat_arm.h> #include <platform_def.h> -#include <plat_arm.h> - #include "../drivers/scp/css_scp.h" /* Weak definition may be overridden in specific CSS based platform */ diff --git a/plat/arm/css/common/css_bl2u_setup.c b/plat/arm/css/common/css_bl2u_setup.c index 564e98f70..c3b4f2b3f 100644 --- a/plat/arm/css/common/css_bl2u_setup.c +++ b/plat/arm/css/common/css_bl2u_setup.c @@ -6,10 +6,9 @@ #include <common/bl_common.h> #include <common/debug.h> +#include <plat/arm/common/plat_arm.h> #include <plat/common/platform.h> -#include <plat_arm.h> - #include "../drivers/scp/css_scp.h" /* Weak definition may be overridden in specific CSS based platform */ diff --git a/plat/arm/css/common/css_common.mk b/plat/arm/css/common/css_common.mk index ca1edab17..0795306cb 100644 --- a/plat/arm/css/common/css_common.mk +++ b/plat/arm/css/common/css_common.mk @@ -11,8 +11,7 @@ CSS_LOAD_SCP_IMAGES ?= 1 # By default, SCMI driver is disabled for CSS platforms CSS_USE_SCMI_SDS_DRIVER ?= 0 -PLAT_INCLUDES += -Iinclude/plat/arm/css/common \ - -Iinclude/plat/arm/css/common/aarch64 +PLAT_INCLUDES += -Iinclude/plat/arm/css/common/aarch64 PLAT_BL_COMMON_SOURCES += plat/arm/css/common/${ARCH}/css_helpers.S diff --git a/plat/arm/css/common/css_pm.c b/plat/arm/css/common/css_pm.c index 8a156e675..47412dfa4 100644 --- a/plat/arm/css/common/css_pm.c +++ b/plat/arm/css/common/css_pm.c @@ -12,11 +12,10 @@ #include <arch_helpers.h> #include <common/debug.h> #include <lib/cassert.h> +#include <plat/arm/common/plat_arm.h> +#include <plat/arm/css/common/css_pm.h> #include <plat/common/platform.h> -#include <css_pm.h> -#include <plat_arm.h> - #include "../drivers/scp/css_scp.h" /* Allow CSS platforms to override `plat_arm_psci_pm_ops` */ diff --git a/plat/arm/css/common/css_topology.c b/plat/arm/css/common/css_topology.c index 8ac223230..8aca7449f 100644 --- a/plat/arm/css/common/css_topology.c +++ b/plat/arm/css/common/css_topology.c @@ -6,10 +6,9 @@ #include <assert.h> +#include <plat/arm/common/plat_arm.h> #include <plat/common/platform.h> -#include <plat_arm.h> - #if ARM_PLAT_MT #pragma weak plat_arm_get_cpu_pe_count #endif diff --git a/plat/arm/css/drivers/mhu/css_mhu.c b/plat/arm/css/drivers/mhu/css_mhu.c index 981df9c43..65695d846 100644 --- a/plat/arm/css/drivers/mhu/css_mhu.c +++ b/plat/arm/css/drivers/mhu/css_mhu.c @@ -11,8 +11,7 @@ #include <arch_helpers.h> #include <lib/bakery_lock.h> #include <lib/mmio.h> - -#include <plat_arm.h> +#include <plat/arm/common/plat_arm.h> #include "css_mhu.h" diff --git a/plat/arm/css/drivers/scp/css_pm_scmi.c b/plat/arm/css/drivers/scp/css_pm_scmi.c index fa4dd8a88..ab9f5f58d 100644 --- a/plat/arm/css/drivers/scp/css_pm_scmi.c +++ b/plat/arm/css/drivers/scp/css_pm_scmi.c @@ -9,12 +9,11 @@ #include <arch_helpers.h> #include <common/debug.h> +#include <plat/arm/common/plat_arm.h> +#include <plat/arm/css/common/css_pm.h> #include <plat/common/platform.h> #include <platform_def.h> -#include <css_pm.h> -#include <plat_arm.h> - #include "../scmi/scmi.h" #include "css_scp.h" diff --git a/plat/arm/css/drivers/scp/css_pm_scpi.c b/plat/arm/css/drivers/scp/css_pm_scpi.c index f53ac3015..04c5f9b49 100644 --- a/plat/arm/css/drivers/scp/css_pm_scpi.c +++ b/plat/arm/css/drivers/scp/css_pm_scpi.c @@ -8,9 +8,8 @@ #include <arch_helpers.h> #include <common/debug.h> - -#include <css_pm.h> -#include <plat_arm.h> +#include <plat/arm/common/plat_arm.h> +#include <plat/arm/css/common/css_pm.h> #include "../scpi/css_scpi.h" #include "css_scp.h" diff --git a/plat/arm/css/sgi/include/sgi_base_platform_def.h b/plat/arm/css/sgi/include/sgi_base_platform_def.h index 4afaae1d9..c0e655586 100644 --- a/plat/arm/css/sgi/include/sgi_base_platform_def.h +++ b/plat/arm/css/sgi/include/sgi_base_platform_def.h @@ -9,15 +9,14 @@ #include <lib/utils_def.h> #include <lib/xlat_tables/xlat_tables_defs.h> +#include <plat/arm/board/common/board_css_def.h> +#include <plat/arm/board/common/v2m_def.h> +#include <plat/arm/common/arm_def.h> +#include <plat/arm/common/arm_spm_def.h> +#include <plat/arm/css/common/css_def.h> +#include <plat/arm/soc/common/soc_css_def.h> #include <plat/common/common_def.h> -#include <arm_def.h> -#include <arm_spm_def.h> -#include <board_css_def.h> -#include <css_def.h> -#include <soc_css_def.h> -#include <v2m_def.h> - #define PLATFORM_CORE_COUNT (PLAT_ARM_CLUSTER_COUNT * \ CSS_SGI_MAX_CPUS_PER_CLUSTER * \ CSS_SGI_MAX_PE_PER_CPU) diff --git a/plat/arm/css/sgi/sgi_bl31_setup.c b/plat/arm/css/sgi/sgi_bl31_setup.c index 617a62b77..53244825b 100644 --- a/plat/arm/css/sgi/sgi_bl31_setup.c +++ b/plat/arm/css/sgi/sgi_bl31_setup.c @@ -10,8 +10,8 @@ #include <common/bl_common.h> #include <common/debug.h> +#include <plat/arm/common/plat_arm.h> -#include <plat_arm.h> #include <sgi_ras.h> #include <sgi_variant.h> diff --git a/plat/arm/css/sgi/sgi_image_load.c b/plat/arm/css/sgi/sgi_image_load.c index e52124f22..a2f10dcc7 100644 --- a/plat/arm/css/sgi/sgi_image_load.c +++ b/plat/arm/css/sgi/sgi_image_load.c @@ -9,9 +9,9 @@ #include <arch_helpers.h> #include <common/debug.h> #include <common/desc_image_load.h> +#include <plat/arm/common/plat_arm.h> #include <plat/common/platform.h> -#include <plat_arm.h> #include <sgi_variant.h> /******************************************************************************* diff --git a/plat/arm/css/sgi/sgi_plat.c b/plat/arm/css/sgi/sgi_plat.c index 72cda7f15..83ca30c87 100644 --- a/plat/arm/css/sgi/sgi_plat.c +++ b/plat/arm/css/sgi/sgi_plat.c @@ -11,11 +11,10 @@ #include <common/bl_common.h> #include <common/debug.h> #include <drivers/arm/ccn.h> +#include <plat/arm/common/plat_arm.h> #include <plat/common/platform.h> #include <services/secure_partition.h> -#include <plat_arm.h> - #if USE_COHERENT_MEM /* * The next 2 constants identify the extents of the coherent memory region. diff --git a/plat/arm/css/sgi/sgi_ras.c b/plat/arm/css/sgi/sgi_ras.c index a6a32d150..0001ffdde 100644 --- a/plat/arm/css/sgi/sgi_ras.c +++ b/plat/arm/css/sgi/sgi_ras.c @@ -10,12 +10,12 @@ #include <bl31/interrupt_mgmt.h> #include <lib/el3_runtime/context_mgmt.h> #include <lib/extensions/ras.h> +#include <plat/arm/common/arm_spm_def.h> #include <plat/common/platform.h> #include <services/mm_svc.h> #include <services/sdei.h> #include <services/spm_svc.h> -#include <arm_spm_def.h> #include <sgi_ras.h> static int sgi_ras_intr_handler(const struct err_record_info *err_rec, diff --git a/plat/arm/css/sgi/sgi_topology.c b/plat/arm/css/sgi/sgi_topology.c index 2921c0c27..dafaf40bf 100644 --- a/plat/arm/css/sgi/sgi_topology.c +++ b/plat/arm/css/sgi/sgi_topology.c @@ -4,7 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <plat_arm.h> +#include <plat/arm/common/plat_arm.h> + #include <sgi_variant.h> /* Topology */ diff --git a/plat/arm/css/sgm/include/platform_oid.h b/plat/arm/css/sgm/include/platform_oid.h index 18d41e3df..fd1854a03 100644 --- a/plat/arm/css/sgm/include/platform_oid.h +++ b/plat/arm/css/sgm/include/platform_oid.h @@ -3,7 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include "../../../../../include/plat/arm/board/common/board_arm_oid.h" + +#include <plat/arm/board/common/board_arm_oid.h> /* * Required platform OIDs diff --git a/plat/arm/css/sgm/include/sgm_base_platform_def.h b/plat/arm/css/sgm/include/sgm_base_platform_def.h index e3fa3f30e..4647e742f 100644 --- a/plat/arm/css/sgm/include/sgm_base_platform_def.h +++ b/plat/arm/css/sgm/include/sgm_base_platform_def.h @@ -9,14 +9,13 @@ #include <drivers/arm/tzc400.h> #include <drivers/arm/tzc_common.h> +#include <plat/arm/board/common/board_css_def.h> +#include <plat/arm/board/common/v2m_def.h> +#include <plat/arm/common/arm_def.h> +#include <plat/arm/css/common/css_def.h> +#include <plat/arm/soc/common/soc_css_def.h> #include <plat/common/common_def.h> -#include <arm_def.h> -#include <board_css_def.h> -#include <css_def.h> -#include <soc_css_def.h> -#include <v2m_def.h> - /* CPU topology */ #define PLAT_ARM_CLUSTER_COUNT 1 #define PLAT_ARM_CLUSTER_CORE_COUNT 8 diff --git a/plat/arm/css/sgm/sgm_bl1_setup.c b/plat/arm/css/sgm/sgm_bl1_setup.c index 8b7c5dabb..203651598 100644 --- a/plat/arm/css/sgm/sgm_bl1_setup.c +++ b/plat/arm/css/sgm/sgm_bl1_setup.c @@ -6,10 +6,10 @@ #include <common/bl_common.h> #include <common/debug.h> +#include <plat/arm/common/plat_arm.h> +#include <plat/arm/soc/common/soc_css.h> -#include <plat_arm.h> #include <sgm_plat_config.h> -#include <soc_css.h> void bl1_early_platform_setup(void) { diff --git a/plat/arm/css/sgm/sgm_bl31_setup.c b/plat/arm/css/sgm/sgm_bl31_setup.c index 7967cb59c..03d88e8ce 100644 --- a/plat/arm/css/sgm/sgm_bl31_setup.c +++ b/plat/arm/css/sgm/sgm_bl31_setup.c @@ -6,10 +6,9 @@ #include <common/bl_common.h> #include <common/debug.h> +#include <plat/arm/common/plat_arm.h> -#include <plat_arm.h> #include <sgm_plat_config.h> - #include "../../css/drivers/scmi/scmi.h" #include "../../css/drivers/mhu/css_mhu_doorbell.h" diff --git a/plat/arm/css/sgm/sgm_mmap_config.c b/plat/arm/css/sgm/sgm_mmap_config.c index 763f36a82..e5b4b0338 100644 --- a/plat/arm/css/sgm/sgm_mmap_config.c +++ b/plat/arm/css/sgm/sgm_mmap_config.c @@ -8,8 +8,8 @@ #include <common/bl_common.h> #include <common/debug.h> +#include <plat/arm/common/plat_arm.h> -#include <plat_arm.h> #include <sgm_variant.h> /* diff --git a/plat/arm/css/sgm/sgm_plat_config.c b/plat/arm/css/sgm/sgm_plat_config.c index 2a43487f1..d9e65c513 100644 --- a/plat/arm/css/sgm/sgm_plat_config.c +++ b/plat/arm/css/sgm/sgm_plat_config.c @@ -10,8 +10,8 @@ #include <platform_def.h> #include <common/debug.h> +#include <plat/arm/common/plat_arm.h> -#include <plat_arm.h> #include <sgm_plat_config.h> #include <sgm_variant.h> diff --git a/plat/arm/css/sgm/sgm_security.c b/plat/arm/css/sgm/sgm_security.c index 548ec7bd5..21d53069a 100644 --- a/plat/arm/css/sgm/sgm_security.c +++ b/plat/arm/css/sgm/sgm_security.c @@ -6,10 +6,10 @@ #include <common/debug.h> #include <drivers/arm/tzc_dmc500.h> +#include <plat/arm/common/plat_arm.h> +#include <plat/arm/soc/common/soc_css.h> -#include <plat_arm.h> #include <sgm_variant.h> -#include <soc_css.h> /* Is populated with the DMC-500 controllers base addresses */ static tzc_dmc500_driver_data_t plat_driver_data; diff --git a/plat/arm/css/sgm/sgm_topology.c b/plat/arm/css/sgm/sgm_topology.c index ce7246448..2d9552d7c 100644 --- a/plat/arm/css/sgm/sgm_topology.c +++ b/plat/arm/css/sgm/sgm_topology.c @@ -4,7 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <plat_arm.h> +#include <plat/arm/common/plat_arm.h> + #include <sgm_plat_config.h> /******************************************************************************* diff --git a/plat/arm/css/sgm/tsp/sgm_tsp_setup.c b/plat/arm/css/sgm/tsp/sgm_tsp_setup.c index 39bba94a3..5f40c4c82 100644 --- a/plat/arm/css/sgm/tsp/sgm_tsp_setup.c +++ b/plat/arm/css/sgm/tsp/sgm_tsp_setup.c @@ -4,7 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <plat_arm.h> +#include <plat/arm/common/plat_arm.h> + #include <sgm_plat_config.h> void tsp_early_platform_setup(void) diff --git a/plat/arm/soc/common/soc_css.mk b/plat/arm/soc/common/soc_css.mk index e00946744..8cad2a58d 100644 --- a/plat/arm/soc/common/soc_css.mk +++ b/plat/arm/soc/common/soc_css.mk @@ -4,8 +4,6 @@ # SPDX-License-Identifier: BSD-3-Clause # -PLAT_INCLUDES += -Iinclude/plat/arm/soc/common/ - #PLAT_BL_COMMON_SOURCES += BL1_SOURCES += plat/arm/soc/common/soc_css_security.c diff --git a/plat/arm/soc/common/soc_css_security.c b/plat/arm/soc/common/soc_css_security.c index b48357a6f..4f6bf61b0 100644 --- a/plat/arm/soc/common/soc_css_security.c +++ b/plat/arm/soc/common/soc_css_security.c @@ -8,8 +8,7 @@ #include <drivers/arm/nic_400.h> #include <lib/mmio.h> - -#include <soc_css.h> +#include <plat/arm/soc/common/soc_css.h> void soc_css_init_nic400(void) { diff --git a/plat/mediatek/mt8173/bl31_plat_setup.c b/plat/mediatek/mt8173/bl31_plat_setup.c index bd384a1d4..dd23e63e6 100644 --- a/plat/mediatek/mt8173/bl31_plat_setup.c +++ b/plat/mediatek/mt8173/bl31_plat_setup.c @@ -11,13 +11,13 @@ #include <drivers/console.h> #include <drivers/generic_delay_timer.h> #include <lib/mmio.h> +#include <plat/arm/common/plat_arm.h> #include <plat/common/common_def.h> #include <plat/common/platform.h> #include <mcucfg.h> #include <mtcmos.h> #include <mtk_plat_common.h> -#include <plat_arm.h> #include <plat_private.h> #include <spm.h> diff --git a/plat/mediatek/mt8173/plat_pm.c b/plat/mediatek/mt8173/plat_pm.c index 9673d2c28..1b52470d5 100644 --- a/plat/mediatek/mt8173/plat_pm.c +++ b/plat/mediatek/mt8173/plat_pm.c @@ -15,11 +15,11 @@ #include <lib/bakery_lock.h> #include <lib/mmio.h> #include <lib/psci/psci.h> +#include <plat/arm/common/plat_arm.h> #include <mcucfg.h> #include <mt8173_def.h> #include <mt_cpuxgpt.h> /* generic_timer_backup() */ -#include <plat_arm.h> #include <plat_private.h> #include <power_tracer.h> #include <rtc.h> diff --git a/plat/mediatek/mt8173/platform.mk b/plat/mediatek/mt8173/platform.mk index 294aea4f8..0726efe45 100644 --- a/plat/mediatek/mt8173/platform.mk +++ b/plat/mediatek/mt8173/platform.mk @@ -9,7 +9,6 @@ MTK_PLAT_SOC := ${MTK_PLAT}/${PLAT} PLAT_INCLUDES := -I${MTK_PLAT}/common/ \ -I${MTK_PLAT}/common/drivers/uart/ \ - -Iinclude/plat/arm/common \ -Iinclude/plat/arm/common/aarch64 \ -I${MTK_PLAT_SOC}/drivers/crypt/ \ -I${MTK_PLAT_SOC}/drivers/mtcmos/ \ diff --git a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c index 8ecd6d7af..b0eb66ca4 100644 --- a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c +++ b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c @@ -11,10 +11,11 @@ #include <common/bl_common.h> #include <common/debug.h> #include <drivers/console.h> -#include <plat_arm.h> -#include <plat_private.h> +#include <plat/arm/common/plat_arm.h> #include <plat/common/platform.h> +#include <plat_private.h> + #define BL31_END (unsigned long)(&__BL31_END__) static entry_point_info_t bl32_image_ep_info; diff --git a/plat/xilinx/zynqmp/plat_psci.c b/plat/xilinx/zynqmp/plat_psci.c index 8522d3e6c..a32e08988 100644 --- a/plat/xilinx/zynqmp/plat_psci.c +++ b/plat/xilinx/zynqmp/plat_psci.c @@ -12,10 +12,10 @@ #include <drivers/arm/gicv2.h> #include <lib/mmio.h> #include <lib/psci/psci.h> -#include <plat_private.h> +#include <plat/arm/common/plat_arm.h> #include <plat/common/platform.h> -#include <plat_arm.h> +#include <plat_private.h> #include "pm_api_sys.h" #include "pm_client.h" diff --git a/plat/xilinx/zynqmp/platform.mk b/plat/xilinx/zynqmp/platform.mk index d147916f7..b2f91cd8e 100644 --- a/plat/xilinx/zynqmp/platform.mk +++ b/plat/xilinx/zynqmp/platform.mk @@ -45,8 +45,7 @@ ifdef ZYNQMP_WDT_RESTART $(eval $(call add_define,ZYNQMP_WDT_RESTART)) endif -PLAT_INCLUDES := -Iinclude/plat/arm/common/ \ - -Iinclude/plat/arm/common/aarch64/ \ +PLAT_INCLUDES := -Iinclude/plat/arm/common/aarch64/ \ -Iplat/xilinx/common/include/ \ -Iplat/xilinx/zynqmp/include/ \ -Iplat/xilinx/zynqmp/pm_service/ \ diff --git a/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c b/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c index 97718d656..902e4b3b6 100644 --- a/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c +++ b/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c @@ -7,8 +7,8 @@ #include <common/bl_common.h> #include <common/debug.h> #include <drivers/console.h> +#include <plat/arm/common/plat_arm.h> -#include <plat_arm.h> #include <plat_private.h> #include <platform_tsp.h> |