From 09d40e0e08283a249e7dce0e106c07c5141f9b7e Mon Sep 17 00:00:00 2001 From: Antonio Nino Diaz Date: Fri, 14 Dec 2018 00:18:21 +0000 Subject: Sanitise includes across codebase Enforce full include path for includes. Deprecate old paths. The following folders inside include/lib have been left unchanged: - include/lib/cpus/${ARCH} - include/lib/el3_runtime/${ARCH} The reason for this change is that having a global namespace for includes isn't a good idea. It defeats one of the advantages of having folders and it introduces problems that are sometimes subtle (because you may not know the header you are actually including if there are two of them). For example, this patch had to be created because two headers were called the same way: e0ea0928d5b7 ("Fix gpio includes of mt8173 platform to avoid collision."). More recently, this patch has had similar problems: 46f9b2c3a282 ("drivers: add tzc380 support"). This problem was introduced in commit 4ecca33988b9 ("Move include and source files to logical locations"). At that time, there weren't too many headers so it wasn't a real issue. However, time has shown that this creates problems. Platforms that want to preserve the way they include headers may add the removed paths to PLAT_INCLUDES, but this is discouraged. Change-Id: I39dc53ed98f9e297a5966e723d1936d6ccf2fc8f Signed-off-by: Antonio Nino Diaz --- plat/arm/board/common/aarch32/board_arm_helpers.S | 3 ++- plat/arm/board/common/aarch64/board_arm_helpers.S | 3 ++- plat/arm/board/common/board_arm_trusted_boot.c | 16 ++++++++------- plat/arm/board/common/board_common.mk | 3 +-- plat/arm/board/fvp/aarch64/fvp_helpers.S | 4 ++-- plat/arm/board/fvp/aarch64/fvp_ras.c | 2 +- plat/arm/board/fvp/drivers/pwrc/fvp_pwrc.c | 6 ++++-- plat/arm/board/fvp/fvp_bl1_setup.c | 7 ++++--- plat/arm/board/fvp/fvp_bl2_setup.c | 9 ++++---- plat/arm/board/fvp/fvp_bl2u_setup.c | 3 ++- plat/arm/board/fvp/fvp_bl31_setup.c | 5 +++-- plat/arm/board/fvp/fvp_common.c | 20 ++++++++++-------- plat/arm/board/fvp/fvp_def.h | 2 +- plat/arm/board/fvp/fvp_io_storage.c | 14 +++++++------ plat/arm/board/fvp/fvp_pm.c | 19 +++++++++-------- plat/arm/board/fvp/fvp_stack_protector.c | 5 +++-- plat/arm/board/fvp/fvp_topology.c | 10 +++++---- plat/arm/board/fvp/fvp_trusted_boot.c | 5 +++-- plat/arm/board/fvp/include/platform_def.h | 8 +++++--- plat/arm/board/juno/aarch32/juno_helpers.S | 2 +- plat/arm/board/juno/aarch64/juno_helpers.S | 2 +- plat/arm/board/juno/include/platform_def.h | 11 +++++----- plat/arm/board/juno/juno_bl1_setup.c | 12 ++++++----- plat/arm/board/juno/juno_bl2_setup.c | 6 ++++-- plat/arm/board/juno/juno_def.h | 2 +- plat/arm/board/juno/juno_err.c | 6 ++++-- plat/arm/board/juno/juno_security.c | 8 ++++---- plat/arm/board/juno/juno_stack_protector.c | 5 +++-- plat/arm/board/juno/juno_topology.c | 3 ++- plat/arm/board/juno/juno_trng.c | 6 ++++-- plat/arm/board/n1sdp/n1sdp_bl31_setup.c | 3 ++- plat/arm/board/n1sdp/n1sdp_plat.c | 10 +++++---- plat/arm/board/sgi575/include/platform_def.h | 3 ++- plat/arm/board/sgi575/sgi575_plat.c | 2 +- plat/arm/board/sgi575/sgi575_security.c | 5 +++-- plat/arm/board/sgiclarka/include/platform_def.h | 3 ++- plat/arm/board/sgiclarka/sgiclarka_plat.c | 2 +- plat/arm/board/sgiclarka/sgiclarka_security.c | 5 +++-- plat/arm/board/sgiclarkh/include/platform_def.h | 3 ++- plat/arm/board/sgiclarkh/sgiclarkh_plat.c | 2 +- plat/arm/board/sgiclarkh/sgiclarkh_security.c | 5 +++-- plat/arm/common/aarch32/arm_bl2_mem_params_desc.c | 6 +++--- plat/arm/common/aarch64/arm_bl2_mem_params_desc.c | 6 +++--- plat/arm/common/aarch64/arm_ehf.c | 3 ++- plat/arm/common/aarch64/arm_sdei.c | 5 +++-- plat/arm/common/arm_bl1_fwu.c | 15 ++++++++------ plat/arm/common/arm_bl1_setup.c | 19 +++++++++-------- plat/arm/common/arm_bl2_el3_setup.c | 9 +++++--- plat/arm/common/arm_bl2_setup.c | 25 +++++++++++++---------- plat/arm/common/arm_bl2u_setup.c | 15 ++++++++------ plat/arm/common/arm_bl31_setup.c | 20 ++++++++++-------- plat/arm/common/arm_cci.c | 8 +++++--- plat/arm/common/arm_ccn.c | 6 ++++-- plat/arm/common/arm_common.c | 20 ++++++++++-------- plat/arm/common/arm_console.c | 12 +++++++---- plat/arm/common/arm_dyn_cfg.c | 20 ++++++++++-------- plat/arm/common/arm_dyn_cfg_helpers.c | 9 +++++--- plat/arm/common/arm_err.c | 17 ++++++++------- plat/arm/common/arm_gicv2.c | 8 +++++--- plat/arm/common/arm_gicv3.c | 12 ++++++----- plat/arm/common/arm_image_load.c | 8 ++++---- plat/arm/common/arm_io_storage.c | 24 +++++++++++++--------- plat/arm/common/arm_nor_psci_mem_protect.c | 14 +++++++------ plat/arm/common/arm_pm.c | 13 +++++++----- plat/arm/common/arm_sip_svc.c | 13 ++++++------ plat/arm/common/arm_topology.c | 4 +++- plat/arm/common/arm_tzc400.c | 9 ++++---- plat/arm/common/arm_tzc_dmc500.c | 11 ++++++---- plat/arm/common/execution_state_switch.c | 16 ++++++++------- plat/arm/common/sp_min/arm_sp_min_setup.c | 19 +++++++++-------- plat/arm/common/tsp/arm_tsp_setup.c | 17 ++++++++------- plat/arm/css/common/css_bl1_setup.c | 7 ++++--- plat/arm/css/common/css_bl2_setup.c | 13 +++++++----- plat/arm/css/common/css_bl2u_setup.c | 8 +++++--- plat/arm/css/common/css_pm.c | 16 +++++++++------ plat/arm/css/common/css_topology.c | 6 ++++-- plat/arm/css/drivers/mhu/css_mhu.c | 12 +++++++---- plat/arm/css/drivers/mhu/css_mhu_doorbell.c | 4 +++- plat/arm/css/drivers/mhu/css_mhu_doorbell.h | 3 ++- plat/arm/css/drivers/scmi/scmi.h | 7 ++++--- plat/arm/css/drivers/scmi/scmi_ap_core_proto.c | 6 ++++-- plat/arm/css/drivers/scmi/scmi_common.c | 7 ++++--- plat/arm/css/drivers/scmi/scmi_pwr_dmn_proto.c | 6 ++++-- plat/arm/css/drivers/scmi/scmi_sys_pwr_proto.c | 6 ++++-- plat/arm/css/drivers/scp/css_bom_bootloader.c | 11 ++++++---- plat/arm/css/drivers/scp/css_pm_scmi.c | 11 ++++++---- plat/arm/css/drivers/scp/css_pm_scpi.c | 7 +++++-- plat/arm/css/drivers/scp/css_scp.h | 6 ++++-- plat/arm/css/drivers/scp/css_sds.c | 13 +++++++----- plat/arm/css/drivers/scpi/css_scpi.c | 13 +++++++----- plat/arm/css/drivers/sds/sds.c | 7 ++++--- plat/arm/css/sgi/include/sgi_base_platform_def.h | 7 ++++--- plat/arm/css/sgi/sgi_bl31_setup.c | 8 ++++++-- plat/arm/css/sgi/sgi_image_load.c | 10 +++++---- plat/arm/css/sgi/sgi_interconnect.c | 2 +- plat/arm/css/sgi/sgi_plat.c | 17 ++++++++------- plat/arm/css/sgi/sgi_ras.c | 20 ++++++++++-------- plat/arm/css/sgm/include/sgm_base_platform_def.h | 7 ++++--- plat/arm/css/sgm/include/sgm_plat_config.h | 4 ++-- plat/arm/css/sgm/sgm_bl1_setup.c | 5 +++-- plat/arm/css/sgm/sgm_bl31_setup.c | 6 ++++-- plat/arm/css/sgm/sgm_mmap_config.c | 8 +++++--- plat/arm/css/sgm/sgm_plat_config.c | 9 +++++--- plat/arm/css/sgm/sgm_security.c | 5 +++-- plat/arm/soc/common/soc_css_security.c | 8 +++++--- 105 files changed, 548 insertions(+), 370 deletions(-) (limited to 'plat/arm') diff --git a/plat/arm/board/common/aarch32/board_arm_helpers.S b/plat/arm/board/common/aarch32/board_arm_helpers.S index d64da292ad..320bfb3c34 100644 --- a/plat/arm/board/common/aarch32/board_arm_helpers.S +++ b/plat/arm/board/common/aarch32/board_arm_helpers.S @@ -3,8 +3,9 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + #include -#include +#include #include .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 4385e62ba8..5a905244f4 100644 --- a/plat/arm/board/common/aarch64/board_arm_helpers.S +++ b/plat/arm/board/common/aarch64/board_arm_helpers.S @@ -3,8 +3,9 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + #include -#include +#include #include .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 6c03c91b5d..64ca3c36d8 100644 --- a/plat/arm/board/common/board_arm_trusted_boot.c +++ b/plat/arm/board/common/board_arm_trusted_boot.c @@ -4,13 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include #include #include -#include + +#include +#include +#include + +#include /* SHA256 algorithm */ #define SHA256_BYTES 32 @@ -180,9 +182,9 @@ int plat_set_nv_ctr(void *cookie, unsigned int nv_ctr) } #else /* ARM_CRYPTOCELL_INTEG */ -#include -#include -#include +#include +#include +#include CASSERT(HASH_RESULT_SIZE_IN_BYTES == SHA256_BYTES, assert_mismatch_in_hash_result_size); diff --git a/plat/arm/board/common/board_common.mk b/plat/arm/board/common/board_common.mk index 2556fc04af..487aad7399 100644 --- a/plat/arm/board/common/board_common.mk +++ b/plat/arm/board/common/board_common.mk @@ -4,8 +4,7 @@ # SPDX-License-Identifier: BSD-3-Clause # -PLAT_INCLUDES += -Iinclude/drivers/cfi/ \ - -Iinclude/plat/arm/board/common/ +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/aarch64/fvp_helpers.S b/plat/arm/board/fvp/aarch64/fvp_helpers.S index abc3ceb00f..0f905151b4 100644 --- a/plat/arm/board/fvp/aarch64/fvp_helpers.S +++ b/plat/arm/board/fvp/aarch64/fvp_helpers.S @@ -6,8 +6,8 @@ #include #include -#include -#include +#include +#include #include #include #include "../drivers/pwrc/fvp_pwrc.h" diff --git a/plat/arm/board/fvp/aarch64/fvp_ras.c b/plat/arm/board/fvp/aarch64/fvp_ras.c index fb80a8a0b9..759f6d0d86 100644 --- a/plat/arm/board/fvp/aarch64/fvp_ras.c +++ b/plat/arm/board/fvp/aarch64/fvp_ras.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include struct ras_interrupt fvp_ras_interrupts[] = { }; diff --git a/plat/arm/board/fvp/drivers/pwrc/fvp_pwrc.c b/plat/arm/board/fvp/drivers/pwrc/fvp_pwrc.c index b17446c10c..c48bb07a3a 100644 --- a/plat/arm/board/fvp/drivers/pwrc/fvp_pwrc.c +++ b/plat/arm/board/fvp/drivers/pwrc/fvp_pwrc.c @@ -4,9 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include +#include + #include + #include "../../fvp_def.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 4b2a340b0c..d6e82f50d9 100644 --- a/plat/arm/board/fvp/fvp_bl1_setup.c +++ b/plat/arm/board/fvp/fvp_bl1_setup.c @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include +#include + #include -#include -#include -#include "fvp_private.h" +#include "fvp_private.h" /******************************************************************************* * Perform any BL1 specific platform actions. diff --git a/plat/arm/board/fvp/fvp_bl2_setup.c b/plat/arm/board/fvp/fvp_bl2_setup.c index 0a3b67d399..13e74fd9a3 100644 --- a/plat/arm/board/fvp/fvp_bl2_setup.c +++ b/plat/arm/board/fvp/fvp_bl2_setup.c @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include +#include +#include +#include + #include -#include -#include #include #include "fvp_def.h" #include "fvp_private.h" diff --git a/plat/arm/board/fvp/fvp_bl2u_setup.c b/plat/arm/board/fvp/fvp_bl2u_setup.c index b9ab3f36e8..c51e287f61 100644 --- a/plat/arm/board/fvp/fvp_bl2u_setup.c +++ b/plat/arm/board/fvp/fvp_bl2u_setup.c @@ -4,8 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + #include -#include #include "fvp_def.h" #include "fvp_private.h" diff --git a/plat/arm/board/fvp/fvp_bl31_setup.c b/plat/arm/board/fvp/fvp_bl31_setup.c index 1c8804f10a..5f2121c528 100644 --- a/plat/arm/board/fvp/fvp_bl31_setup.c +++ b/plat/arm/board/fvp/fvp_bl31_setup.c @@ -4,10 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include +#include + #include #include -#include -#include #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 f36b637ef1..31a61de4e7 100644 --- a/plat/arm/board/fvp/fvp_common.c +++ b/plat/arm/board/fvp/fvp_common.c @@ -4,20 +4,22 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + +#include +#include +#include +#include +#include +#include +#include +#include + #include #include #include -#include -#include -#include -#include -#include -#include #include -#include -#include #include -#include #include "../fvp_def.h" #include "fvp_private.h" diff --git a/plat/arm/board/fvp/fvp_def.h b/plat/arm/board/fvp/fvp_def.h index a8ed9d324a..1b9f84b001 100644 --- a/plat/arm/board/fvp/fvp_def.h +++ b/plat/arm/board/fvp/fvp_def.h @@ -7,7 +7,7 @@ #ifndef FVP_DEF_H #define FVP_DEF_H -#include +#include #ifndef FVP_CLUSTER_COUNT #define FVP_CLUSTER_COUNT 2 diff --git a/plat/arm/board/fvp/fvp_io_storage.c b/plat/arm/board/fvp/fvp_io_storage.c index 11c7c3bcde..e186b30838 100644 --- a/plat/arm/board/fvp/fvp_io_storage.c +++ b/plat/arm/board/fvp/fvp_io_storage.c @@ -5,13 +5,15 @@ */ #include -#include -#include -#include -#include -#include + +#include +#include +#include +#include +#include +#include + #include -#include /* For FOPEN_MODE_... */ /* Semihosting filenames */ #define BL2_IMAGE_NAME "bl2.bin" diff --git a/plat/arm/board/fvp/fvp_pm.c b/plat/arm/board/fvp/fvp_pm.c index 78d3025559..7da246bd60 100644 --- a/plat/arm/board/fvp/fvp_pm.c +++ b/plat/arm/board/fvp/fvp_pm.c @@ -4,18 +4,21 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include -#include #include -#include -#include + +#include +#include +#include +#include +#include +#include +#include + +#include #include -#include -#include -#include #include + #include "../../../../drivers/arm/gic/v3/gicv3_private.h" #include "drivers/pwrc/fvp_pwrc.h" #include "fvp_def.h" diff --git a/plat/arm/board/fvp/fvp_stack_protector.c b/plat/arm/board/fvp/fvp_stack_protector.c index 1e8e3010ff..e940a12914 100644 --- a/plat/arm/board/fvp/fvp_stack_protector.c +++ b/plat/arm/board/fvp/fvp_stack_protector.c @@ -4,10 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include +#include +#include + #define RANDOM_CANARY_VALUE ((u_register_t) 3288484550995823360ULL) u_register_t plat_get_stack_protector_canary(void) diff --git a/plat/arm/board/fvp/fvp_topology.c b/plat/arm/board/fvp/fvp_topology.c index e21b9d28c7..3384a2f704 100644 --- a/plat/arm/board/fvp/fvp_topology.c +++ b/plat/arm/board/fvp/fvp_topology.c @@ -4,12 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + #include -#include -#include +#include +#include + #include -#include -#include +#include #include "drivers/pwrc/fvp_pwrc.h" /* The FVP power domain tree descriptor */ diff --git a/plat/arm/board/fvp/fvp_trusted_boot.c b/plat/arm/board/fvp/fvp_trusted_boot.c index 39be4a6e7e..c18bfb2137 100644 --- a/plat/arm/board/fvp/fvp_trusted_boot.c +++ b/plat/arm/board/fvp/fvp_trusted_boot.c @@ -7,8 +7,9 @@ #include #include #include -#include -#include + +#include +#include #include "fvp_def.h" diff --git a/plat/arm/board/fvp/include/platform_def.h b/plat/arm/board/fvp/include/platform_def.h index 3097f909bb..ca4bd53996 100644 --- a/plat/arm/board/fvp/include/platform_def.h +++ b/plat/arm/board/fvp/include/platform_def.h @@ -18,12 +18,14 @@ # endif #endif /* AARCH32 */ +#include +#include +#include + #include #include -#include -#include -#include #include + #include "../fvp_def.h" /* Required platform porting definitions */ diff --git a/plat/arm/board/juno/aarch32/juno_helpers.S b/plat/arm/board/juno/aarch32/juno_helpers.S index 1bc4e309a8..080a8ddcc5 100644 --- a/plat/arm/board/juno/aarch32/juno_helpers.S +++ b/plat/arm/board/juno/aarch32/juno_helpers.S @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include diff --git a/plat/arm/board/juno/aarch64/juno_helpers.S b/plat/arm/board/juno/aarch64/juno_helpers.S index edcfc74491..373f2fc893 100644 --- a/plat/arm/board/juno/aarch64/juno_helpers.S +++ b/plat/arm/board/juno/aarch64/juno_helpers.S @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include diff --git a/plat/arm/board/juno/include/platform_def.h b/plat/arm/board/juno/include/platform_def.h index 8098bc3feb..ed82879afc 100644 --- a/plat/arm/board/juno/include/platform_def.h +++ b/plat/arm/board/juno/include/platform_def.h @@ -19,15 +19,16 @@ #endif /* AARCH32 */ +#include +#if TRUSTED_BOARD_BOOT +#include +#endif +#include + #include #include -#include #include -#if TRUSTED_BOARD_BOOT -#include -#endif #include -#include #include #include "../juno_def.h" diff --git a/plat/arm/board/juno/juno_bl1_setup.c b/plat/arm/board/juno/juno_bl1_setup.c index 3dd2a227c1..e751ab69c3 100644 --- a/plat/arm/board/juno/juno_bl1_setup.c +++ b/plat/arm/board/juno/juno_bl1_setup.c @@ -4,14 +4,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include + +#include +#include +#include +#include +#include + #include -#include #include -#include -#include #include 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 1f483d63da..56f05eb185 100644 --- a/plat/arm/board/juno/juno_bl2_setup.c +++ b/plat/arm/board/juno/juno_bl2_setup.c @@ -5,8 +5,10 @@ */ #include -#include -#include + +#include +#include + #include #if JUNO_AARCH32_EL3_RUNTIME diff --git a/plat/arm/board/juno/juno_def.h b/plat/arm/board/juno/juno_def.h index 5301886fb8..7a8bedf5ab 100644 --- a/plat/arm/board/juno/juno_def.h +++ b/plat/arm/board/juno/juno_def.h @@ -7,7 +7,7 @@ #ifndef JUNO_DEF_H #define JUNO_DEF_H -#include +#include /******************************************************************************* * Juno memory map related constants diff --git a/plat/arm/board/juno/juno_err.c b/plat/arm/board/juno/juno_err.c index dd8e27881d..69daa1ae0e 100644 --- a/plat/arm/board/juno/juno_err.c +++ b/plat/arm/board/juno/juno_err.c @@ -4,9 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include + +#include +#include + #include /* diff --git a/plat/arm/board/juno/juno_security.c b/plat/arm/board/juno/juno_security.c index b6cfe7817d..b0df837912 100644 --- a/plat/arm/board/juno/juno_security.c +++ b/plat/arm/board/juno/juno_security.c @@ -4,12 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include +#include +#include +#include + #include #include - #include "juno_def.h" #include "juno_tzmp1_def.h" diff --git a/plat/arm/board/juno/juno_stack_protector.c b/plat/arm/board/juno/juno_stack_protector.c index ec0b1fbee9..ff05b5d468 100644 --- a/plat/arm/board/juno/juno_stack_protector.c +++ b/plat/arm/board/juno/juno_stack_protector.c @@ -5,8 +5,9 @@ */ #include -#include -#include +#include +#include + #include "juno_decl.h" #include "juno_def.h" diff --git a/plat/arm/board/juno/juno_topology.c b/plat/arm/board/juno/juno_topology.c index c8a7598244..51b99aca7f 100644 --- a/plat/arm/board/juno/juno_topology.c +++ b/plat/arm/board/juno/juno_topology.c @@ -4,10 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + #include #include #include -#include #include "juno_def.h" #include "../../css/drivers/scmi/scmi.h" #include "../../css/drivers/mhu/css_mhu_doorbell.h" diff --git a/plat/arm/board/juno/juno_trng.c b/plat/arm/board/juno/juno_trng.c index d9ad1d4eb9..505fb02667 100644 --- a/plat/arm/board/juno/juno_trng.c +++ b/plat/arm/board/juno/juno_trng.c @@ -5,9 +5,11 @@ */ #include -#include #include -#include + +#include +#include + #include "juno_decl.h" #include "juno_def.h" diff --git a/plat/arm/board/n1sdp/n1sdp_bl31_setup.c b/plat/arm/board/n1sdp/n1sdp_bl31_setup.c index cdd0b63da7..d044b7ccf3 100644 --- a/plat/arm/board/n1sdp/n1sdp_bl31_setup.c +++ b/plat/arm/board/n1sdp/n1sdp_bl31_setup.c @@ -4,10 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + #include "../../css/drivers/scmi/scmi.h" #include "../../css/drivers/mhu/css_mhu_doorbell.h" #include -#include 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 8c057c55eb..5aaa7376a4 100644 --- a/plat/arm/board/n1sdp/n1sdp_plat.c +++ b/plat/arm/board/n1sdp/n1sdp_plat.c @@ -4,12 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + +#include +#include +#include + #include -#include -#include #include -#include -#include /* * Table of regions to map using the MMU. diff --git a/plat/arm/board/sgi575/include/platform_def.h b/plat/arm/board/sgi575/include/platform_def.h index 16e2898de0..6aea522f0d 100644 --- a/plat/arm/board/sgi575/include/platform_def.h +++ b/plat/arm/board/sgi575/include/platform_def.h @@ -7,8 +7,9 @@ #ifndef PLATFORM_DEF_H #define PLATFORM_DEF_H +#include + #include -#include #define PLAT_ARM_CLUSTER_COUNT 2 #define CSS_SGI_MAX_CPUS_PER_CLUSTER 4 diff --git a/plat/arm/board/sgi575/sgi575_plat.c b/plat/arm/board/sgi575/sgi575_plat.c index a8ca916d98..d1a1fbf46f 100644 --- a/plat/arm/board/sgi575/sgi575_plat.c +++ b/plat/arm/board/sgi575/sgi575_plat.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include unsigned int plat_arm_sgi_get_platform_id(void) { diff --git a/plat/arm/board/sgi575/sgi575_security.c b/plat/arm/board/sgi575/sgi575_security.c index 7ccc59a7bc..8417e10084 100644 --- a/plat/arm/board/sgi575/sgi575_security.c +++ b/plat/arm/board/sgi575/sgi575_security.c @@ -4,9 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include + +#include +#include uintptr_t sgi575_dmc_base[] = { SGI575_DMC620_BASE0, diff --git a/plat/arm/board/sgiclarka/include/platform_def.h b/plat/arm/board/sgiclarka/include/platform_def.h index 39907e8bc7..d2cdb49744 100644 --- a/plat/arm/board/sgiclarka/include/platform_def.h +++ b/plat/arm/board/sgiclarka/include/platform_def.h @@ -7,8 +7,9 @@ #ifndef PLATFORM_DEF_H #define PLATFORM_DEF_H +#include + #include -#include #define PLAT_ARM_CLUSTER_COUNT 2 #define CSS_SGI_MAX_CPUS_PER_CLUSTER 4 diff --git a/plat/arm/board/sgiclarka/sgiclarka_plat.c b/plat/arm/board/sgiclarka/sgiclarka_plat.c index 3df2da666f..3b7e5ee4e4 100644 --- a/plat/arm/board/sgiclarka/sgiclarka_plat.c +++ b/plat/arm/board/sgiclarka/sgiclarka_plat.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include unsigned int plat_arm_sgi_get_platform_id(void) { diff --git a/plat/arm/board/sgiclarka/sgiclarka_security.c b/plat/arm/board/sgiclarka/sgiclarka_security.c index 29cd754744..c455111d10 100644 --- a/plat/arm/board/sgiclarka/sgiclarka_security.c +++ b/plat/arm/board/sgiclarka/sgiclarka_security.c @@ -4,9 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include + +#include +#include uintptr_t sgiclarka_dmc_base[] = { SGICLARKA_DMC620_BASE0, diff --git a/plat/arm/board/sgiclarkh/include/platform_def.h b/plat/arm/board/sgiclarkh/include/platform_def.h index 544ad90f32..fe8907bee6 100644 --- a/plat/arm/board/sgiclarkh/include/platform_def.h +++ b/plat/arm/board/sgiclarkh/include/platform_def.h @@ -7,8 +7,9 @@ #ifndef PLATFORM_DEF_H #define PLATFORM_DEF_H +#include + #include -#include #define PLAT_ARM_CLUSTER_COUNT 2 #define CSS_SGI_MAX_CPUS_PER_CLUSTER 8 diff --git a/plat/arm/board/sgiclarkh/sgiclarkh_plat.c b/plat/arm/board/sgiclarkh/sgiclarkh_plat.c index 437592dbd7..a1b8d621d6 100644 --- a/plat/arm/board/sgiclarkh/sgiclarkh_plat.c +++ b/plat/arm/board/sgiclarkh/sgiclarkh_plat.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include unsigned int plat_arm_sgi_get_platform_id(void) { diff --git a/plat/arm/board/sgiclarkh/sgiclarkh_security.c b/plat/arm/board/sgiclarkh/sgiclarkh_security.c index 5ae0b82844..aaf9691ced 100644 --- a/plat/arm/board/sgiclarkh/sgiclarkh_security.c +++ b/plat/arm/board/sgiclarkh/sgiclarkh_security.c @@ -4,9 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include + +#include +#include uintptr_t sgiclarkh_dmc_base[] = { SGICLARKH_DMC620_BASE0, diff --git a/plat/arm/common/aarch32/arm_bl2_mem_params_desc.c b/plat/arm/common/aarch32/arm_bl2_mem_params_desc.c index 890f2c960d..e23dd258b2 100644 --- a/plat/arm/common/aarch32/arm_bl2_mem_params_desc.c +++ b/plat/arm/common/aarch32/arm_bl2_mem_params_desc.c @@ -4,11 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include #include +#include +#include +#include /******************************************************************************* * Following descriptor provides BL image/ep information that gets used diff --git a/plat/arm/common/aarch64/arm_bl2_mem_params_desc.c b/plat/arm/common/aarch64/arm_bl2_mem_params_desc.c index 8e6d00d056..c0f42f3108 100644 --- a/plat/arm/common/aarch64/arm_bl2_mem_params_desc.c +++ b/plat/arm/common/aarch64/arm_bl2_mem_params_desc.c @@ -4,11 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include #include +#include +#include +#include /******************************************************************************* * Following descriptor provides BL image/ep information that gets used diff --git a/plat/arm/common/aarch64/arm_ehf.c b/plat/arm/common/aarch64/arm_ehf.c index f313851852..4ae992c95e 100644 --- a/plat/arm/common/aarch64/arm_ehf.c +++ b/plat/arm/common/aarch64/arm_ehf.c @@ -4,9 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include +#include + /* * Enumeration of priority levels on ARM platforms. */ diff --git a/plat/arm/common/aarch64/arm_sdei.c b/plat/arm/common/aarch64/arm_sdei.c index 687b21d43b..493134b6a1 100644 --- a/plat/arm/common/aarch64/arm_sdei.c +++ b/plat/arm/common/aarch64/arm_sdei.c @@ -6,9 +6,10 @@ /* SDEI configuration for ARM platforms */ -#include #include -#include + +#include +#include /* Private event mappings */ static sdei_ev_map_t arm_sdei_private[] = { diff --git a/plat/arm/common/arm_bl1_fwu.c b/plat/arm/common/arm_bl1_fwu.c index f2be47792b..cd92aa8ed0 100644 --- a/plat/arm/common/arm_bl1_fwu.c +++ b/plat/arm/common/arm_bl1_fwu.c @@ -5,14 +5,17 @@ */ #include -#include -#include #include -#include -#include + #include -#include -#include + +#include +#include +#include +#include +#include + +#include /* Struct to keep track of usable memory */ typedef struct bl1_mem_info { diff --git a/plat/arm/common/arm_bl1_setup.c b/plat/arm/common/arm_bl1_setup.c index f760e18dce..e28211cfa7 100644 --- a/plat/arm/common/arm_bl1_setup.c +++ b/plat/arm/common/arm_bl1_setup.c @@ -4,17 +4,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + +#include + #include +#include +#include +#include +#include +#include +#include + #include -#include -#include -#include #include -#include -#include -#include -#include -#include #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 4f5e6a9e6e..0c1f63ed41 100644 --- a/plat/arm/common/arm_bl2_el3_setup.c +++ b/plat/arm/common/arm_bl2_el3_setup.c @@ -3,11 +3,14 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include + #include -#include + +#include +#include + +#include #include -#include #pragma weak bl2_el3_early_platform_setup #pragma weak bl2_el3_plat_arch_setup diff --git a/plat/arm/common/arm_bl2_setup.c b/plat/arm/common/arm_bl2_setup.c index 628a50def4..9319004eae 100644 --- a/plat/arm/common/arm_bl2_setup.c +++ b/plat/arm/common/arm_bl2_setup.c @@ -4,21 +4,24 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include -#include -#include -#include -#include +#include + +#include + +#include +#include +#include +#include +#include #ifdef SPD_opteed -#include +#include #endif +#include +#include + +#include #include -#include -#include -#include -#include /* 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 3848aa065d..0dc66e647e 100644 --- a/plat/arm/common/arm_bl2u_setup.c +++ b/plat/arm/common/arm_bl2u_setup.c @@ -4,15 +4,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include +#include + +#include + #include +#include +#include +#include + #include -#include -#include -#include #include -#include -#include -#include /* Weak definitions may be overridden in specific ARM standard platform */ #pragma weak bl2u_platform_setup diff --git a/plat/arm/common/arm_bl31_setup.c b/plat/arm/common/arm_bl31_setup.c index 1b05f46e90..41151c2c82 100644 --- a/plat/arm/common/arm_bl31_setup.c +++ b/plat/arm/common/arm_bl31_setup.c @@ -4,19 +4,21 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + #include #include +#include +#include +#include +#include +#include +#include +#include +#include + #include -#include -#include -#include -#include -#include #include -#include -#include -#include -#include /* * Placeholder variables for copying the arguments that have been passed to diff --git a/plat/arm/common/arm_cci.c b/plat/arm/common/arm_cci.c index 6505b9174f..7ee997e296 100644 --- a/plat/arm/common/arm_cci.c +++ b/plat/arm/common/arm_cci.c @@ -4,11 +4,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + #include -#include +#include +#include + #include -#include -#include 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 ddf3286d79..6aa56f217d 100644 --- a/plat/arm/common/arm_ccn.c +++ b/plat/arm/common/arm_ccn.c @@ -4,10 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + #include -#include +#include + #include -#include 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 56ad8aeeb1..4cd2ce3d6b 100644 --- a/plat/arm/common/arm_common.c +++ b/plat/arm/common/arm_common.c @@ -3,17 +3,21 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + +#include + +#include + #include #include -#include -#include -#include +#include +#include +#include +#include +#include +#include + #include -#include -#include -#include -#include -#include /* Weak definitions may be overridden in specific ARM standard platform */ #pragma weak plat_get_ns_image_entrypoint diff --git a/plat/arm/common/arm_console.c b/plat/arm/common/arm_console.c index bd3dca17f6..29cb378275 100644 --- a/plat/arm/common/arm_console.c +++ b/plat/arm/common/arm_console.c @@ -3,13 +3,17 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + #include -#include -#include -#include -#include + #include +#include +#include +#include + +#include + /******************************************************************************* * 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 c2a4bb1e65..6c6dc568ca 100644 --- a/plat/arm/common/arm_dyn_cfg.c +++ b/plat/arm/common/arm_dyn_cfg.c @@ -4,19 +4,21 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include +#include + +#include + +#include +#include +#include #if TRUSTED_BOARD_BOOT -#include +#include #endif -#include -#include -#include -#include -#include +#include +#include +#include /* Variable to store the address to TB_FW_CONFIG passed from BL1 */ static void *tb_fw_cfg_dtb; diff --git a/plat/arm/common/arm_dyn_cfg_helpers.c b/plat/arm/common/arm_dyn_cfg_helpers.c index d12d09c7f2..bf2f15643d 100644 --- a/plat/arm/common/arm_dyn_cfg_helpers.c +++ b/plat/arm/common/arm_dyn_cfg_helpers.c @@ -4,11 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include + #include + +#include +#include + +#include #include #define DTB_PROP_MBEDTLS_HEAP_ADDR "mbedtls_heap_addr" diff --git a/plat/arm/common/arm_err.c b/plat/arm/common/arm_err.c index aa65f4f338..8650d48a7d 100644 --- a/plat/arm/common/arm_err.c +++ b/plat/arm/common/arm_err.c @@ -4,15 +4,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include #include -#include -#include -#include #include -#include + +#include + +#include +#include +#include +#include +#include + +#include #pragma weak plat_arm_error_handler diff --git a/plat/arm/common/arm_gicv2.c b/plat/arm/common/arm_gicv2.c index 5644c60404..fc848c1987 100644 --- a/plat/arm/common/arm_gicv2.c +++ b/plat/arm/common/arm_gicv2.c @@ -4,11 +4,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include #include +#include +#include + +#include + /****************************************************************************** * 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 a43bff3d48..0f6690a0b9 100644 --- a/plat/arm/common/arm_gicv3.c +++ b/plat/arm/common/arm_gicv3.c @@ -4,13 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + +#include +#include +#include +#include + #include -#include -#include #include -#include -#include -#include /****************************************************************************** * The following functions are defined as weak to allow a platform to override diff --git a/plat/arm/common/arm_image_load.c b/plat/arm/common/arm_image_load.c index 4f86efdf92..791f05ed70 100644 --- a/plat/arm/common/arm_image_load.c +++ b/plat/arm/common/arm_image_load.c @@ -4,12 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include +#include +#include + #include -#include -#include #include -#include - #pragma weak plat_flush_next_bl_params #pragma weak plat_get_bl_image_load_info diff --git a/plat/arm/common/arm_io_storage.c b/plat/arm/common/arm_io_storage.c index cd58e4564a..d7c5cac246 100644 --- a/plat/arm/common/arm_io_storage.c +++ b/plat/arm/common/arm_io_storage.c @@ -3,18 +3,22 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + #include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include /* IO devices */ static const io_dev_connector_t *fip_dev_con; diff --git a/plat/arm/common/arm_nor_psci_mem_protect.c b/plat/arm/common/arm_nor_psci_mem_protect.c index 2a46b95d62..4ae57e5344 100644 --- a/plat/arm/common/arm_nor_psci_mem_protect.c +++ b/plat/arm/common/arm_nor_psci_mem_protect.c @@ -4,13 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include #include -#include -#include -#include + +#include +#include +#include +#include +#include + +#include /* * 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 3be1b5d393..acfd908995 100644 --- a/plat/arm/common/arm_pm.c +++ b/plat/arm/common/arm_pm.c @@ -4,14 +4,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include #include -#include -#include + #include -#include + +#include +#include +#include + +#include +#include /* 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 e482a89456..6b0f7e7be8 100644 --- a/plat/arm/common/arm_sip_svc.c +++ b/plat/arm/common/arm_sip_svc.c @@ -4,14 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include -#include -#include #include -#include +#include +#include +#include +#include + +#include +#include /* ARM SiP Service UUID */ DEFINE_SVC_UUID2(arm_sip_svc_uid, diff --git a/plat/arm/common/arm_topology.c b/plat/arm/common/arm_topology.c index b0ad4d1c6a..6986e52b03 100644 --- a/plat/arm/common/arm_topology.c +++ b/plat/arm/common/arm_topology.c @@ -4,9 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + #include + #include -#include /******************************************************************************* * 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 2ae084c7bc..0346fa1845 100644 --- a/plat/arm/common/arm_tzc400.c +++ b/plat/arm/common/arm_tzc400.c @@ -4,13 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + +#include +#include + #include #include -#include #include -#include -#include - /* 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 6bd771b0e5..bea3867d37 100644 --- a/plat/arm/common/arm_tzc_dmc500.c +++ b/plat/arm/common/arm_tzc_dmc500.c @@ -4,12 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include + #include -#include + +#include +#include + +#include +#include /******************************************************************************* * 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 8fa864d66b..e3134102dd 100644 --- a/plat/arm/common/execution_state_switch.c +++ b/plat/arm/common/execution_state_switch.c @@ -4,16 +4,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include +#include + #include -#include #include -#include -#include -#include +#include +#include +#include #include -#include -#include -#include + +#include +#include /* * Handle SMC from a lower exception level to switch its execution state 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 ca427d58a4..967b551e4e 100644 --- a/plat/arm/common/sp_min/arm_sp_min_setup.c +++ b/plat/arm/common/sp_min/arm_sp_min_setup.c @@ -5,15 +5,18 @@ */ #include -#include -#include -#include -#include -#include -#include -#include + #include -#include + +#include +#include +#include +#include +#include +#include +#include + +#include static entry_point_info_t bl33_image_ep_info; diff --git a/plat/arm/common/tsp/arm_tsp_setup.c b/plat/arm/common/tsp/arm_tsp_setup.c index 3cf88251f1..a3d2f7157c 100644 --- a/plat/arm/common/tsp/arm_tsp_setup.c +++ b/plat/arm/common/tsp/arm_tsp_setup.c @@ -4,15 +4,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include -#include -#include -#include + #include -#include + +#include +#include +#include +#include +#include + +#include +#include #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 b1b275c6e7..ae0f01133f 100644 --- a/plat/arm/css/common/css_bl1_setup.c +++ b/plat/arm/css/common/css_bl1_setup.c @@ -4,10 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include +#include +#include + #include -#include #include void bl1_platform_setup(void) diff --git a/plat/arm/css/common/css_bl2_setup.c b/plat/arm/css/common/css_bl2_setup.c index e41b1ca0aa..c1c7868b8b 100644 --- a/plat/arm/css/common/css_bl2_setup.c +++ b/plat/arm/css/common/css_bl2_setup.c @@ -4,13 +4,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include + +#include +#include +#include +#include + #include -#include -#include #include -#include -#include + #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 4ceb5cda7c..564e98f705 100644 --- a/plat/arm/css/common/css_bl2u_setup.c +++ b/plat/arm/css/common/css_bl2u_setup.c @@ -4,10 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include +#include +#include + #include -#include + #include "../drivers/scp/css_scp.h" /* Weak definition may be overridden in specific CSS based platform */ diff --git a/plat/arm/css/common/css_pm.c b/plat/arm/css/common/css_pm.c index 4735a9dcca..8a156e675d 100644 --- a/plat/arm/css/common/css_pm.c +++ b/plat/arm/css/common/css_pm.c @@ -4,15 +4,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include -#include #include -#include -#include + #include + +#include +#include +#include +#include + +#include +#include + #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 d1f1c98f4b..8ac2232308 100644 --- a/plat/arm/css/common/css_topology.c +++ b/plat/arm/css/common/css_topology.c @@ -4,10 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include +#include + +#include + #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 7b33317566..e13818f299 100644 --- a/plat/arm/css/drivers/mhu/css_mhu.c +++ b/plat/arm/css/drivers/mhu/css_mhu.c @@ -4,13 +4,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include + +#include + +#include +#include +#include + #include -#include #include -#include + #include "css_mhu.h" /* SCP MHU secure channel registers */ diff --git a/plat/arm/css/drivers/mhu/css_mhu_doorbell.c b/plat/arm/css/drivers/mhu/css_mhu_doorbell.c index 54f3e057d7..b3203c2a75 100644 --- a/plat/arm/css/drivers/mhu/css_mhu_doorbell.c +++ b/plat/arm/css/drivers/mhu/css_mhu_doorbell.c @@ -4,8 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include + +#include + #include "css_mhu_doorbell.h" #include "../scmi/scmi.h" diff --git a/plat/arm/css/drivers/mhu/css_mhu_doorbell.h b/plat/arm/css/drivers/mhu/css_mhu_doorbell.h index cb75ed050a..ecee56361f 100644 --- a/plat/arm/css/drivers/mhu/css_mhu_doorbell.h +++ b/plat/arm/css/drivers/mhu/css_mhu_doorbell.h @@ -7,9 +7,10 @@ #ifndef CSS_MHU_DOORBELL_H #define CSS_MHU_DOORBELL_H -#include #include +#include + /* MHUv2 Base Address */ #define MHUV2_BASE_ADDR PLAT_CSS_MHU_BASE diff --git a/plat/arm/css/drivers/scmi/scmi.h b/plat/arm/css/drivers/scmi/scmi.h index 28dfc9ac6a..df259f76d8 100644 --- a/plat/arm/css/drivers/scmi/scmi.h +++ b/plat/arm/css/drivers/scmi/scmi.h @@ -7,11 +7,12 @@ #ifndef SCMI_H #define SCMI_H -#include -#include #include #include -#include + +#include +#include +#include /* Supported SCMI Protocol Versions */ #define SCMI_AP_CORE_PROTO_VER MAKE_SCMI_VERSION(1, 0) diff --git a/plat/arm/css/drivers/scmi/scmi_ap_core_proto.c b/plat/arm/css/drivers/scmi/scmi_ap_core_proto.c index 1438cba46d..e495dccb0a 100644 --- a/plat/arm/css/drivers/scmi/scmi_ap_core_proto.c +++ b/plat/arm/css/drivers/scmi/scmi_ap_core_proto.c @@ -4,9 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include + +#include +#include + #include "scmi.h" #include "scmi_private.h" diff --git a/plat/arm/css/drivers/scmi/scmi_common.c b/plat/arm/css/drivers/scmi/scmi_common.c index b34178ec35..1b4ecb239c 100644 --- a/plat/arm/css/drivers/scmi/scmi_common.c +++ b/plat/arm/css/drivers/scmi/scmi_common.c @@ -4,13 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include + +#include +#include + #include "scmi.h" #include "scmi_private.h" - #if HW_ASSISTED_COHERENCY #define scmi_lock_init(lock) #define scmi_lock_get(lock) spin_lock(lock) diff --git a/plat/arm/css/drivers/scmi/scmi_pwr_dmn_proto.c b/plat/arm/css/drivers/scmi/scmi_pwr_dmn_proto.c index 90c5d6bc7b..f315621314 100644 --- a/plat/arm/css/drivers/scmi/scmi_pwr_dmn_proto.c +++ b/plat/arm/css/drivers/scmi/scmi_pwr_dmn_proto.c @@ -4,9 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include + +#include +#include + #include "scmi.h" #include "scmi_private.h" diff --git a/plat/arm/css/drivers/scmi/scmi_sys_pwr_proto.c b/plat/arm/css/drivers/scmi/scmi_sys_pwr_proto.c index f6da394168..03c3c063d8 100644 --- a/plat/arm/css/drivers/scmi/scmi_sys_pwr_proto.c +++ b/plat/arm/css/drivers/scmi/scmi_sys_pwr_proto.c @@ -4,9 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include + +#include +#include + #include "scmi.h" #include "scmi_private.h" diff --git a/plat/arm/css/drivers/scp/css_bom_bootloader.c b/plat/arm/css/drivers/scp/css_bom_bootloader.c index 5268510dbd..27c9e1d50f 100644 --- a/plat/arm/css/drivers/scp/css_bom_bootloader.c +++ b/plat/arm/css/drivers/scp/css_bom_bootloader.c @@ -4,12 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include -#include #include + +#include +#include +#include + +#include + #include "../mhu/css_mhu.h" #include "../scpi/css_scpi.h" #include "css_scp.h" diff --git a/plat/arm/css/drivers/scp/css_pm_scmi.c b/plat/arm/css/drivers/scp/css_pm_scmi.c index 1397fd80cc..bd6b595320 100644 --- a/plat/arm/css/drivers/scp/css_pm_scmi.c +++ b/plat/arm/css/drivers/scp/css_pm_scmi.c @@ -4,14 +4,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include +#include + +#include +#include +#include + #include #include -#include #include -#include -#include + #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 123d54f4e5..f53ac30158 100644 --- a/plat/arm/css/drivers/scp/css_pm_scpi.c +++ b/plat/arm/css/drivers/scp/css_pm_scpi.c @@ -4,11 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include + +#include +#include + #include -#include #include + #include "../scpi/css_scpi.h" #include "css_scp.h" diff --git a/plat/arm/css/drivers/scp/css_scp.h b/plat/arm/css/drivers/scp/css_scp.h index 84c1487d31..f3c08c52f3 100644 --- a/plat/arm/css/drivers/scp/css_scp.h +++ b/plat/arm/css/drivers/scp/css_scp.h @@ -7,10 +7,12 @@ #ifndef CSS_SCP_H #define CSS_SCP_H -#include -#include #include +#include + +#include + /* Forward declarations */ struct psci_power_state; diff --git a/plat/arm/css/drivers/scp/css_sds.c b/plat/arm/css/drivers/scp/css_sds.c index 561e97b2e4..c152abca08 100644 --- a/plat/arm/css/drivers/scp/css_sds.c +++ b/plat/arm/css/drivers/scp/css_sds.c @@ -4,13 +4,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include -#include -#include #include + +#include +#include +#include +#include + +#include + #include "css_scp.h" #include "../sds/sds.h" diff --git a/plat/arm/css/drivers/scpi/css_scpi.c b/plat/arm/css/drivers/scpi/css_scpi.c index 2ed5760118..42bf3b8e00 100644 --- a/plat/arm/css/drivers/scpi/css_scpi.c +++ b/plat/arm/css/drivers/scpi/css_scpi.c @@ -4,13 +4,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include -#include #include -#include + +#include +#include +#include +#include + +#include + #include "../mhu/css_mhu.h" #include "css_scpi.h" diff --git a/plat/arm/css/drivers/sds/sds.c b/plat/arm/css/drivers/sds/sds.c index e2fac54f37..3eeb0dc4df 100644 --- a/plat/arm/css/drivers/sds/sds.c +++ b/plat/arm/css/drivers/sds/sds.c @@ -4,13 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include #include #include +#include +#include + +#include #include "sds.h" #include "sds_private.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 8705d63b10..ad7ab81d95 100644 --- a/plat/arm/css/sgi/include/sgi_base_platform_def.h +++ b/plat/arm/css/sgi/include/sgi_base_platform_def.h @@ -7,15 +7,16 @@ #ifndef SGI_BASE_PLATFORM_DEF_H #define SGI_BASE_PLATFORM_DEF_H +#include +#include +#include + #include #include #include -#include #include #include -#include #include -#include #define PLATFORM_CORE_COUNT (PLAT_ARM_CLUSTER_COUNT * \ CSS_SGI_MAX_CPUS_PER_CLUSTER * \ diff --git a/plat/arm/css/sgi/sgi_bl31_setup.c b/plat/arm/css/sgi/sgi_bl31_setup.c index b1aa089b45..617a62b775 100644 --- a/plat/arm/css/sgi/sgi_bl31_setup.c +++ b/plat/arm/css/sgi/sgi_bl31_setup.c @@ -5,12 +5,16 @@ */ #include -#include -#include + #include + +#include +#include + #include #include #include + #include "../../css/drivers/scmi/scmi.h" #include "../../css/drivers/mhu/css_mhu_doorbell.h" diff --git a/plat/arm/css/sgi/sgi_image_load.c b/plat/arm/css/sgi/sgi_image_load.c index e078bd2af0..1ed219d653 100644 --- a/plat/arm/css/sgi/sgi_image_load.c +++ b/plat/arm/css/sgi/sgi_image_load.c @@ -4,11 +4,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include #include -#include + +#include +#include +#include +#include + #include /******************************************************************************* diff --git a/plat/arm/css/sgi/sgi_interconnect.c b/plat/arm/css/sgi/sgi_interconnect.c index 074f8a2745..e86c760d16 100644 --- a/plat/arm/css/sgi/sgi_interconnect.c +++ b/plat/arm/css/sgi/sgi_interconnect.c @@ -5,7 +5,7 @@ */ #include -#include +#include /* * For SGI575 which support FCM (with automatic interconnect enter/exit), diff --git a/plat/arm/css/sgi/sgi_plat.c b/plat/arm/css/sgi/sgi_plat.c index 710430bb76..79f3e5b55d 100644 --- a/plat/arm/css/sgi/sgi_plat.c +++ b/plat/arm/css/sgi/sgi_plat.c @@ -4,16 +4,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + +#include + +#include +#include +#include +#include +#include + #include #include -#include -#include -#include -#include #include -#include -#include -#include #include "../../../../bl1/bl1_private.h" #if USE_COHERENT_MEM diff --git a/plat/arm/css/sgi/sgi_ras.c b/plat/arm/css/sgi/sgi_ras.c index ac4610d216..a6a32d150d 100644 --- a/plat/arm/css/sgi/sgi_ras.c +++ b/plat/arm/css/sgi/sgi_ras.c @@ -4,18 +4,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + static int sgi_ras_intr_handler(const struct err_record_info *err_rec, int probe_data, const struct err_handler_data *const data); 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 2178f069a5..e3fa3f30e6 100644 --- a/plat/arm/css/sgm/include/sgm_base_platform_def.h +++ b/plat/arm/css/sgm/include/sgm_base_platform_def.h @@ -7,13 +7,14 @@ #ifndef SGM_BASE_PLATFORM_DEF_H #define SGM_BASE_PLATFORM_DEF_H +#include +#include +#include + #include #include -#include #include #include -#include -#include #include /* CPU topology */ diff --git a/plat/arm/css/sgm/include/sgm_plat_config.h b/plat/arm/css/sgm/include/sgm_plat_config.h index 79e6b5c6a6..29b98d49eb 100644 --- a/plat/arm/css/sgm/include/sgm_plat_config.h +++ b/plat/arm/css/sgm/include/sgm_plat_config.h @@ -7,8 +7,8 @@ #ifndef SGM_PLAT_CONFIG_H #define SGM_PLAT_CONFIG_H -#include -#include +#include +#include /* The type of interconnect */ typedef enum { diff --git a/plat/arm/css/sgm/sgm_bl1_setup.c b/plat/arm/css/sgm/sgm_bl1_setup.c index dc3d71dd45..8b7c5dabbe 100644 --- a/plat/arm/css/sgm/sgm_bl1_setup.c +++ b/plat/arm/css/sgm/sgm_bl1_setup.c @@ -4,8 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include +#include + #include #include #include diff --git a/plat/arm/css/sgm/sgm_bl31_setup.c b/plat/arm/css/sgm/sgm_bl31_setup.c index 952572e3ad..7967cb59c4 100644 --- a/plat/arm/css/sgm/sgm_bl31_setup.c +++ b/plat/arm/css/sgm/sgm_bl31_setup.c @@ -4,10 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include +#include + #include #include + #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 6800ac3cf7..a4df9ab19a 100644 --- a/plat/arm/css/sgm/sgm_mmap_config.c +++ b/plat/arm/css/sgm/sgm_mmap_config.c @@ -4,11 +4,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + +#include +#include + #include -#include -#include #include -#include #include /* diff --git a/plat/arm/css/sgm/sgm_plat_config.c b/plat/arm/css/sgm/sgm_plat_config.c index e977e618bc..2a43487f1a 100644 --- a/plat/arm/css/sgm/sgm_plat_config.c +++ b/plat/arm/css/sgm/sgm_plat_config.c @@ -5,12 +5,15 @@ */ #include -#include -#include +#include + #include + +#include + +#include #include #include -#include static css_plat_config_t *css_plat_info; diff --git a/plat/arm/css/sgm/sgm_security.c b/plat/arm/css/sgm/sgm_security.c index 7f9806001f..548ec7bd59 100644 --- a/plat/arm/css/sgm/sgm_security.c +++ b/plat/arm/css/sgm/sgm_security.c @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include +#include + #include #include #include -#include /* Is populated with the DMC-500 controllers base addresses */ static tzc_dmc500_driver_data_t plat_driver_data; diff --git a/plat/arm/soc/common/soc_css_security.c b/plat/arm/soc/common/soc_css_security.c index f2296796c6..bbc5dcdc55 100644 --- a/plat/arm/soc/common/soc_css_security.c +++ b/plat/arm/soc/common/soc_css_security.c @@ -4,10 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include #include + +#include +#include + +#include #include #include -- cgit v1.2.3