diff options
93 files changed, 147 insertions, 141 deletions
diff --git a/bl1/aarch64/bl1_exceptions.S b/bl1/aarch64/bl1_exceptions.S index b0902fd5..eb98ffa0 100644 --- a/bl1/aarch64/bl1_exceptions.S +++ b/bl1/aarch64/bl1_exceptions.S @@ -6,8 +6,8 @@ #include <arch.h> #include <asm_macros.S> -#include <bl_common.h> #include <bl1.h> +#include <bl_common.h> #include <context.h> /* ----------------------------------------------------------------------------- diff --git a/bl1/bl1_fwu.c b/bl1/bl1_fwu.c index 8dfc55f6..07a7fc81 100644 --- a/bl1/bl1_fwu.c +++ b/bl1/bl1_fwu.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <assert.h> #include <arch_helpers.h> +#include <assert.h> #include <auth_mod.h> #include <bl1.h> #include <bl_common.h> diff --git a/bl1/bl1_main.c b/bl1/bl1_main.c index fa4f3a4c..821b6a35 100644 --- a/bl1/bl1_main.c +++ b/bl1/bl1_main.c @@ -17,8 +17,8 @@ #include <platform_def.h> #include <smcc_helpers.h> #include <utils.h> -#include "bl1_private.h" #include <uuid.h> +#include "bl1_private.h" /* BL1 Service UUID */ DEFINE_SVC_UUID(bl1_svc_uid, diff --git a/bl2u/bl2u_main.c b/bl2u/bl2u_main.c index 820da100..09ad4683 100644 --- a/bl2u/bl2u_main.c +++ b/bl2u/bl2u_main.c @@ -8,8 +8,8 @@ #include <arch_helpers.h> #include <assert.h> #include <auth_mod.h> -#include <bl_common.h> #include <bl1.h> +#include <bl_common.h> #include <console.h> #include <debug.h> #include <platform.h> diff --git a/bl31/bl31_main.c b/bl31/bl31_main.c index c53f8a22..4a88bd7b 100644 --- a/bl31/bl31_main.c +++ b/bl31/bl31_main.c @@ -7,8 +7,8 @@ #include <arch.h> #include <arch_helpers.h> #include <assert.h> -#include <bl_common.h> #include <bl31.h> +#include <bl_common.h> #include <console.h> #include <context_mgmt.h> #include <debug.h> diff --git a/drivers/auth/cryptocell/cryptocell_crypto.c b/drivers/auth/cryptocell/cryptocell_crypto.c index 05462bea..80c10933 100644 --- a/drivers/auth/cryptocell/cryptocell_crypto.c +++ b/drivers/auth/cryptocell/cryptocell_crypto.c @@ -5,8 +5,8 @@ */ #include <arch_helpers.h> -#include <crypto_mod.h> #include <crypto_driver.h> +#include <crypto_mod.h> #include <debug.h> #include <mbedtls_common.h> #include <platform_def.h> @@ -16,8 +16,8 @@ #include <secureboot_gen_defs.h> #include <stddef.h> #include <string.h> -#include <utils.h> #include <util.h> +#include <utils.h> #include <mbedtls/oid.h> diff --git a/drivers/auth/mbedtls/mbedtls_crypto.c b/drivers/auth/mbedtls/mbedtls_crypto.c index b157a32e..d8810d6d 100644 --- a/drivers/auth/mbedtls/mbedtls_crypto.c +++ b/drivers/auth/mbedtls/mbedtls_crypto.c @@ -4,7 +4,6 @@ * SPDX-License-Identifier: BSD-3-Clause */ - #include <crypto_mod.h> #include <debug.h> #include <mbedtls_common.h> diff --git a/drivers/auth/tbbr/tbbr_cot.c b/drivers/auth/tbbr/tbbr_cot.c index e88c7c26..a9a4b37f 100644 --- a/drivers/auth/tbbr/tbbr_cot.c +++ b/drivers/auth/tbbr/tbbr_cot.c @@ -6,12 +6,14 @@ #include <auth_mod.h> #include <platform_def.h> +#include <stddef.h> + #if USE_TBBR_DEFS #include <tbbr_oid.h> #else #include <platform_oid.h> #endif -#include <stddef.h> + /* * Maximum key and hash sizes (in DER format) diff --git a/drivers/partition/partition.c b/drivers/partition/partition.c index 190ac38d..e2b46836 100644 --- a/drivers/partition/partition.c +++ b/drivers/partition/partition.c @@ -6,8 +6,8 @@ #include <assert.h> #include <debug.h> -#include <io_storage.h> #include <gpt.h> +#include <io_storage.h> #include <mbr.h> #include <partition.h> #include <platform.h> diff --git a/include/drivers/arm/cryptocell/cc_pal_types_plat.h b/include/drivers/arm/cryptocell/cc_pal_types_plat.h index d8ed3e1d..84100245 100644 --- a/include/drivers/arm/cryptocell/cc_pal_types_plat.h +++ b/include/drivers/arm/cryptocell/cc_pal_types_plat.h @@ -11,8 +11,8 @@ #define _CC_PAL_TYPES_PLAT_H /* Host specific types for standard (ISO-C99) compilant platforms */ -#include <stdint.h> #include <stddef.h> +#include <stdint.h> typedef uint32_t CCStatus; diff --git a/include/drivers/arm/cryptocell/nvm.h b/include/drivers/arm/cryptocell/nvm.h index f806d3d4..a70289fb 100644 --- a/include/drivers/arm/cryptocell/nvm.h +++ b/include/drivers/arm/cryptocell/nvm.h @@ -13,8 +13,8 @@ extern "C" #endif #include "cc_crypto_boot_defs.h" -#include "cc_sec_defs.h" #include "cc_pal_types.h" +#include "cc_sec_defs.h" /*------------------------------------ DEFINES diff --git a/include/drivers/auth/mbedtls/mbedtls_config.h b/include/drivers/auth/mbedtls/mbedtls_config.h index 0a058862..fdeb52bb 100644 --- a/include/drivers/auth/mbedtls/mbedtls_config.h +++ b/include/drivers/auth/mbedtls/mbedtls_config.h @@ -69,12 +69,12 @@ #define MBEDTLS_MPI_WINDOW_SIZE 2 #define MBEDTLS_MPI_MAX_SIZE 256 +/* System headers required to build mbed TLS with the current configuration */ +#include <stdlib.h> + /* Memory buffer allocator options */ #define MBEDTLS_MEMORY_ALIGN_MULTIPLE 8 #include "mbedtls/check_config.h" -/* System headers required to build mbed TLS with the current configuration */ -#include <stdlib.h> - #endif /* __MBEDTLS_CONFIG_H__ */ diff --git a/include/lib/pmf/pmf_helpers.h b/include/lib/pmf/pmf_helpers.h index 286262a4..9984d691 100644 --- a/include/lib/pmf/pmf_helpers.h +++ b/include/lib/pmf/pmf_helpers.h @@ -12,8 +12,8 @@ #include <bl_common.h> #include <platform.h> #include <pmf.h> -#include <stdint.h> #include <stddef.h> +#include <stdint.h> /* * Prototype for PMF service functions. diff --git a/lib/cpus/aarch64/cortex_a55.S b/lib/cpus/aarch64/cortex_a55.S index f1031591..741c7734 100644 --- a/lib/cpus/aarch64/cortex_a55.S +++ b/lib/cpus/aarch64/cortex_a55.S @@ -4,10 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <cortex_a55.h> #include <arch.h> #include <asm_macros.S> #include <bl_common.h> +#include <cortex_a55.h> #include <cpu_macros.S> #include <plat_macros.S> diff --git a/lib/psci/psci_on.c b/lib/psci/psci_on.c index d5c9843a..16b22c2a 100644 --- a/lib/psci/psci_on.c +++ b/lib/psci/psci_on.c @@ -8,8 +8,8 @@ #include <arch_helpers.h> #include <assert.h> #include <bl_common.h> -#include <debug.h> #include <context_mgmt.h> +#include <debug.h> #include <platform.h> #include <stddef.h> #include "psci_private.h" diff --git a/lib/psci/psci_suspend.c b/lib/psci/psci_suspend.c index 47988926..0d1589ee 100644 --- a/lib/psci/psci_suspend.c +++ b/lib/psci/psci_suspend.c @@ -4,10 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <assert.h> -#include <bl_common.h> #include <arch.h> #include <arch_helpers.h> +#include <assert.h> +#include <bl_common.h> #include <context.h> #include <context_mgmt.h> #include <cpu_data.h> diff --git a/lib/psci/psci_system_off.c b/lib/psci/psci_system_off.c index 4a55248d..ef5d3d1d 100644 --- a/lib/psci/psci_system_off.c +++ b/lib/psci/psci_system_off.c @@ -4,12 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stddef.h> #include <arch_helpers.h> #include <assert.h> #include <console.h> #include <debug.h> #include <platform.h> +#include <stddef.h> #include "psci_private.h" void __dead2 psci_system_off(void) diff --git a/plat/arm/board/fvp/fvp_io_storage.c b/plat/arm/board/fvp/fvp_io_storage.c index 27bab800..aa2ee305 100644 --- a/plat/arm/board/fvp/fvp_io_storage.c +++ b/plat/arm/board/fvp/fvp_io_storage.c @@ -8,8 +8,8 @@ #include <common_def.h> #include <debug.h> #include <io_driver.h> -#include <io_storage.h> #include <io_semihosting.h> +#include <io_storage.h> #include <plat_arm.h> #include <semihosting.h> /* For FOPEN_MODE_... */ diff --git a/plat/arm/board/fvp/fvp_pm.c b/plat/arm/board/fvp/fvp_pm.c index e39a4d50..9a02089e 100644 --- a/plat/arm/board/fvp/fvp_pm.c +++ b/plat/arm/board/fvp/fvp_pm.c @@ -10,8 +10,8 @@ #include <debug.h> #include <errno.h> #include <mmio.h> -#include <platform.h> #include <plat_arm.h> +#include <platform.h> #include <psci.h> #include <v2m_def.h> #include "drivers/pwrc/fvp_pwrc.h" diff --git a/plat/arm/board/juno/juno_bl1_setup.c b/plat/arm/board/juno/juno_bl1_setup.c index 65b956d0..7c026bcb 100644 --- a/plat/arm/board/juno/juno_bl1_setup.c +++ b/plat/arm/board/juno/juno_bl1_setup.c @@ -6,8 +6,8 @@ #include <bl_common.h> #include <errno.h> -#include <platform.h> #include <plat_arm.h> +#include <platform.h> #include <sp805.h> #include <tbbr_img_def.h> #include <v2m_def.h> diff --git a/plat/arm/common/arm_bl1_setup.c b/plat/arm/common/arm_bl1_setup.c index ba95d253..6860e36b 100644 --- a/plat/arm/common/arm_bl1_setup.c +++ b/plat/arm/common/arm_bl1_setup.c @@ -9,8 +9,8 @@ #include <arm_xlat_tables.h> #include <bl_common.h> #include <console.h> -#include <platform_def.h> #include <plat_arm.h> +#include <platform_def.h> #include <sp805.h> #include <utils.h> #include "../../../bl1/bl1_private.h" diff --git a/plat/arm/common/arm_bl2_setup.c b/plat/arm/common/arm_bl2_setup.c index e5619b7f..b7621b85 100644 --- a/plat/arm/common/arm_bl2_setup.c +++ b/plat/arm/common/arm_bl2_setup.c @@ -12,8 +12,8 @@ #include <debug.h> #include <desc_image_load.h> #include <plat_arm.h> -#include <platform_def.h> #include <platform.h> +#include <platform_def.h> #include <string.h> #include <utils.h> diff --git a/plat/arm/common/arm_bl2u_setup.c b/plat/arm/common/arm_bl2u_setup.c index 5dc9eea0..03d908b1 100644 --- a/plat/arm/common/arm_bl2u_setup.c +++ b/plat/arm/common/arm_bl2u_setup.c @@ -8,8 +8,8 @@ #include <arm_def.h> #include <bl_common.h> #include <console.h> -#include <platform_def.h> #include <plat_arm.h> +#include <platform_def.h> #include <string.h> /* 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 2eed1878..abeaea0b 100644 --- a/plat/arm/common/tsp/arm_tsp_setup.c +++ b/plat/arm/common/tsp/arm_tsp_setup.c @@ -7,9 +7,9 @@ #include <arm_def.h> #include <bl_common.h> #include <console.h> +#include <plat_arm.h> #include <platform_def.h> #include <platform_tsp.h> -#include <plat_arm.h> #define BL32_END (unsigned long)(&__BL32_END__) diff --git a/plat/hisilicon/hikey/hisi_pwrc.c b/plat/hisilicon/hikey/hisi_pwrc.c index fcc9bd89..ade408d4 100644 --- a/plat/hisilicon/hikey/hisi_pwrc.c +++ b/plat/hisilicon/hikey/hisi_pwrc.c @@ -6,11 +6,13 @@ #include <debug.h> #include <mmio.h> + +#include <hi6220_regs_acpu.h> +#include <hi6220_regs_ao.h> #include <hisi_ipc.h> #include <hisi_pwrc.h> #include <hisi_sram_map.h> -#include <hi6220_regs_acpu.h> -#include <hi6220_regs_ao.h> + #include <stdarg.h> #include <stdio.h> #include <string.h> diff --git a/plat/hisilicon/hikey/hisi_sip_svc.c b/plat/hisilicon/hikey/hisi_sip_svc.c index 15953af0..b3109d61 100644 --- a/plat/hisilicon/hikey/hisi_sip_svc.c +++ b/plat/hisilicon/hikey/hisi_sip_svc.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <hisi_sip_svc.h> #include <debug.h> +#include <hisi_sip_svc.h> #include <pmf.h> #include <runtime_svc.h> #include <stdint.h> diff --git a/plat/hisilicon/hikey960/drivers/ipc/hisi_ipc.c b/plat/hisilicon/hikey960/drivers/ipc/hisi_ipc.c index 8ce1e4ff..4c664d11 100644 --- a/plat/hisilicon/hikey960/drivers/ipc/hisi_ipc.c +++ b/plat/hisilicon/hikey960/drivers/ipc/hisi_ipc.c @@ -6,12 +6,12 @@ #include <arch_helpers.h> #include <assert.h> +#include <debug.h> #include <hi3660.h> +#include <hisi_ipc.h> #include <mmio.h> #include <platform.h> #include <platform_def.h> -#include <hisi_ipc.h> -#include <debug.h> #include "../../hikey960_private.h" diff --git a/plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.c b/plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.c index f82144a4..9fdc3e74 100644 --- a/plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.c +++ b/plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.c @@ -4,13 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <../hikey960_def.h> #include <arch_helpers.h> #include <assert.h> +#include <hisi_ipc.h> #include <mmio.h> #include <platform.h> #include <platform_def.h> -#include <../hikey960_def.h> -#include <hisi_ipc.h> + + #include "hisi_pwrc.h" diff --git a/plat/hisilicon/hikey960/hikey960_bl1_setup.c b/plat/hisilicon/hikey960/hikey960_bl1_setup.c index f9666df1..54e73478 100644 --- a/plat/hisilicon/hikey960/hikey960_bl1_setup.c +++ b/plat/hisilicon/hikey960/hikey960_bl1_setup.c @@ -13,10 +13,10 @@ #include <delay_timer.h> #include <dw_ufs.h> #include <errno.h> +#include <generic_delay_timer.h> #include <gicv2.h> #include <hi3660.h> #include <mmio.h> -#include <generic_delay_timer.h> #include <platform.h> #include <platform_def.h> #include <string.h> diff --git a/plat/hisilicon/hikey960/include/plat_macros.S b/plat/hisilicon/hikey960/include/plat_macros.S index 9f1befdc..5137f9eb 100644 --- a/plat/hisilicon/hikey960/include/plat_macros.S +++ b/plat/hisilicon/hikey960/include/plat_macros.S @@ -8,8 +8,8 @@ #define __PLAT_MACROS_S__ #include <cci.h> -#include <hi3660.h> #include <gic_v2.h> +#include <hi3660.h> #include <platform_def.h> .section .rodata.gic_reg_name, "aS" diff --git a/plat/mediatek/common/mtk_plat_common.c b/plat/mediatek/common/mtk_plat_common.c index 4e8aaec3..6a13192c 100644 --- a/plat/mediatek/common/mtk_plat_common.c +++ b/plat/mediatek/common/mtk_plat_common.c @@ -12,8 +12,8 @@ #include <mmio.h> #include <mtk_plat_common.h> #include <mtk_sip_svc.h> -#include <platform.h> #include <plat_private.h> +#include <platform.h> #include <xlat_tables.h> struct atf_arg_t gteearg; diff --git a/plat/mediatek/mt6795/bl31_plat_setup.c b/plat/mediatek/mt6795/bl31_plat_setup.c index a70d1031..803f1ed8 100644 --- a/plat/mediatek/mt6795/bl31_plat_setup.c +++ b/plat/mediatek/mt6795/bl31_plat_setup.c @@ -3,9 +3,9 @@ * * SPDX-License-Identifier: BSD-3-Clause */ +#include <arch_helpers.h> #include <arm_gic.h> #include <assert.h> -#include <arch_helpers.h> #include <bl_common.h> #include <cci.h> #include <common_def.h> @@ -15,11 +15,11 @@ #include <generic_delay_timer.h> #include <mcucfg.h> #include <mmio.h> -#include <mtk_sip_svc.h> -#include <mtk_plat_common.h> #include <mt_cpuxgpt.h> -#include <platform.h> +#include <mtk_plat_common.h> +#include <mtk_sip_svc.h> #include <plat_private.h> +#include <platform.h> #include <string.h> #include <xlat_tables.h> /******************************************************************************* diff --git a/plat/mediatek/mt6795/drivers/timer/mt_cpuxgpt.c b/plat/mediatek/mt6795/drivers/timer/mt_cpuxgpt.c index 1f64558f..b357972e 100644 --- a/plat/mediatek/mt6795/drivers/timer/mt_cpuxgpt.c +++ b/plat/mediatek/mt6795/drivers/timer/mt_cpuxgpt.c @@ -4,13 +4,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> + #include <arch_helpers.h> +#include <debug.h> #include <mmio.h> #include <mt_cpuxgpt.h> -#include <stdint.h> #include <platform.h> -#include <debug.h> +#include <stdint.h> #define CPUXGPT_BASE 0x10200000 #define INDEX_BASE (CPUXGPT_BASE+0x0674) #define CTL_BASE (CPUXGPT_BASE+0x0670) diff --git a/plat/mediatek/mt6795/plat_pm.c b/plat/mediatek/mt6795/plat_pm.c index a0b77753..bd47bd8b 100644 --- a/plat/mediatek/mt6795/plat_pm.c +++ b/plat/mediatek/mt6795/plat_pm.c @@ -14,8 +14,8 @@ #include <errno.h> #include <mcucfg.h> #include <mmio.h> -#include <platform_def.h> #include <plat_private.h> +#include <platform_def.h> #include <power_tracer.h> #include <psci.h> #include <scu.h> diff --git a/plat/mediatek/mt8173/drivers/mtcmos/mtcmos.c b/plat/mediatek/mt8173/drivers/mtcmos/mtcmos.c index 6330b7ba..25f25097 100644 --- a/plat/mediatek/mt8173/drivers/mtcmos/mtcmos.c +++ b/plat/mediatek/mt8173/drivers/mtcmos/mtcmos.c @@ -3,13 +3,14 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + +#include <debug.h> +#include <delay_timer.h> #include <mmio.h> #include <mt8173_def.h> -#include <debug.h> #include <mtcmos.h> #include <spm.h> #include <spm_mcdi.h> -#include <delay_timer.h> enum { SRAM_ISOINT_B = 1U << 6, diff --git a/plat/mediatek/mt8173/plat_sip_calls.c b/plat/mediatek/mt8173/plat_sip_calls.c index 76200eca..1d51cb59 100644 --- a/plat/mediatek/mt8173/plat_sip_calls.c +++ b/plat/mediatek/mt8173/plat_sip_calls.c @@ -6,8 +6,8 @@ #include <crypt.h> #include <debug.h> #include <mmio.h> -#include <mtk_sip_svc.h> #include <mtcmos.h> +#include <mtk_sip_svc.h> #include <plat_sip_calls.h> #include <runtime_svc.h> diff --git a/plat/nvidia/tegra/common/aarch64/tegra_helpers.S b/plat/nvidia/tegra/common/aarch64/tegra_helpers.S index 22389f27..e5e51268 100644 --- a/plat/nvidia/tegra/common/aarch64/tegra_helpers.S +++ b/plat/nvidia/tegra/common/aarch64/tegra_helpers.S @@ -7,8 +7,8 @@ #include <asm_macros.S> #include <assert_macros.S> #include <cpu_macros.S> -#include <cortex_a57.h> #include <cortex_a53.h> +#include <cortex_a57.h> #include <platform_def.h> #include <tegra_def.h> diff --git a/plat/nvidia/tegra/common/drivers/flowctrl/flowctrl.c b/plat/nvidia/tegra/common/drivers/flowctrl/flowctrl.c index 585c1155..2d827da8 100644 --- a/plat/nvidia/tegra/common/drivers/flowctrl/flowctrl.c +++ b/plat/nvidia/tegra/common/drivers/flowctrl/flowctrl.c @@ -6,12 +6,12 @@ #include <arch_helpers.h> #include <assert.h> +#include <cortex_a53.h> #include <debug.h> #include <delay_timer.h> +#include <flowctrl.h> #include <mmio.h> #include <pmc.h> -#include <cortex_a53.h> -#include <flowctrl.h> #include <tegra_def.h> #define CLK_RST_DEV_L_SET 0x300 diff --git a/plat/nvidia/tegra/common/tegra_bl31_setup.c b/plat/nvidia/tegra/common/tegra_bl31_setup.c index bc168574..d5d3d530 100644 --- a/plat/nvidia/tegra/common/tegra_bl31_setup.c +++ b/plat/nvidia/tegra/common/tegra_bl31_setup.c @@ -10,8 +10,8 @@ #include <bl31.h> #include <bl_common.h> #include <console.h> -#include <cortex_a57.h> #include <cortex_a53.h> +#include <cortex_a57.h> #include <debug.h> #include <denver.h> #include <errno.h> diff --git a/plat/nvidia/tegra/common/tegra_gic.c b/plat/nvidia/tegra/common/tegra_gic.c index ae56d55a..e480e772 100644 --- a/plat/nvidia/tegra/common/tegra_gic.c +++ b/plat/nvidia/tegra/common/tegra_gic.c @@ -5,16 +5,16 @@ */ #include <arch_helpers.h> -#include <assert.h> #include <arm_gic.h> +#include <assert.h> #include <bl_common.h> #include <debug.h> #include <gic_v2.h> #include <interrupt_mgmt.h> #include <platform.h> #include <stdint.h> -#include <tegra_private.h> #include <tegra_def.h> +#include <tegra_private.h> /* Value used to initialize Non-Secure IRQ priorities four at a time */ #define GICD_IPRIORITYR_DEF_VAL \ diff --git a/plat/nvidia/tegra/common/tegra_pm.c b/plat/nvidia/tegra/common/tegra_pm.c index 6f841ef0..0c25934c 100644 --- a/plat/nvidia/tegra/common/tegra_pm.c +++ b/plat/nvidia/tegra/common/tegra_pm.c @@ -7,9 +7,9 @@ #include <arch_helpers.h> #include <assert.h> #include <bl_common.h> +#include <console.h> #include <context.h> #include <context_mgmt.h> -#include <console.h> #include <debug.h> #include <memctrl.h> #include <mmio.h> diff --git a/plat/nvidia/tegra/common/tegra_sip_calls.c b/plat/nvidia/tegra/common/tegra_sip_calls.c index dcad21e0..d96ce7a0 100644 --- a/plat/nvidia/tegra/common/tegra_sip_calls.c +++ b/plat/nvidia/tegra/common/tegra_sip_calls.c @@ -13,8 +13,8 @@ #include <memctrl.h> #include <mmio.h> #include <runtime_svc.h> -#include <tegra_private.h> #include <tegra_platform.h> +#include <tegra_private.h> /******************************************************************************* * Common Tegra SiP SMCs diff --git a/plat/nvidia/tegra/soc/t132/plat_psci_handlers.c b/plat/nvidia/tegra/soc/t132/plat_psci_handlers.c index 9b7dc853..1cffb741 100644 --- a/plat/nvidia/tegra/soc/t132/plat_psci_handlers.c +++ b/plat/nvidia/tegra/soc/t132/plat_psci_handlers.c @@ -7,9 +7,9 @@ #include <arch.h> #include <arch_helpers.h> #include <assert.h> -#include <denver.h> #include <debug.h> #include <delay_timer.h> +#include <denver.h> #include <flowctrl.h> #include <mmio.h> #include <platform_def.h> diff --git a/plat/nvidia/tegra/soc/t132/plat_secondary.c b/plat/nvidia/tegra/soc/t132/plat_secondary.c index 96f514d8..d5ca30c9 100644 --- a/plat/nvidia/tegra/soc/t132/plat_secondary.c +++ b/plat/nvidia/tegra/soc/t132/plat_secondary.c @@ -10,8 +10,8 @@ #include <denver.h> #include <mmio.h> #include <platform.h> -#include <psci.h> #include <pmc.h> +#include <psci.h> #include <tegra_def.h> #define SB_CSR 0x0 diff --git a/plat/nvidia/tegra/soc/t186/drivers/mce/ari.c b/plat/nvidia/tegra/soc/t186/drivers/mce/ari.c index 2803f4ea..d34f7e28 100644 --- a/plat/nvidia/tegra/soc/t186/drivers/mce/ari.c +++ b/plat/nvidia/tegra/soc/t186/drivers/mce/ari.c @@ -10,8 +10,8 @@ #include <debug.h> #include <delay_timer.h> #include <denver.h> -#include <mmio.h> #include <mce_private.h> +#include <mmio.h> #include <platform.h> #include <sys/errno.h> #include <t18x_ari.h> diff --git a/plat/nvidia/tegra/soc/t186/drivers/mce/nvg.c b/plat/nvidia/tegra/soc/t186/drivers/mce/nvg.c index 9c115bdd..243c8f3a 100644 --- a/plat/nvidia/tegra/soc/t186/drivers/mce/nvg.c +++ b/plat/nvidia/tegra/soc/t186/drivers/mce/nvg.c @@ -8,8 +8,8 @@ #include <arch_helpers.h> #include <debug.h> #include <denver.h> -#include <mmio.h> #include <mce_private.h> +#include <mmio.h> #include <sys/errno.h> #include <t18x_ari.h> diff --git a/plat/nvidia/tegra/soc/t210/plat_psci_handlers.c b/plat/nvidia/tegra/soc/t210/plat_psci_handlers.c index 3dff6539..f77746ca 100644 --- a/plat/nvidia/tegra/soc/t210/plat_psci_handlers.c +++ b/plat/nvidia/tegra/soc/t210/plat_psci_handlers.c @@ -8,12 +8,12 @@ #include <assert.h> #include <debug.h> #include <delay_timer.h> +#include <flowctrl.h> #include <mmio.h> #include <platform.h> #include <platform_def.h> -#include <psci.h> #include <pmc.h> -#include <flowctrl.h> +#include <psci.h> #include <tegra_def.h> #include <tegra_private.h> diff --git a/plat/qemu/dt.c b/plat/qemu/dt.c index f732a6d5..c544d9f4 100644 --- a/plat/qemu/dt.c +++ b/plat/qemu/dt.c @@ -7,8 +7,8 @@ #include <debug.h> #include <libfdt.h> #include <psci.h> -#include "qemu_private.h" #include <string.h> +#include "qemu_private.h" static int append_psci_compatible(void *fdt, int offs, const char *str) { diff --git a/plat/qemu/qemu_bl2_setup.c b/plat/qemu/qemu_bl2_setup.c index 2557a711..f928b105 100644 --- a/plat/qemu/qemu_bl2_setup.c +++ b/plat/qemu/qemu_bl2_setup.c @@ -9,9 +9,9 @@ #include <debug.h> #include <libfdt.h> #include <platform_def.h> -#include "qemu_private.h" #include <string.h> #include <utils.h> +#include "qemu_private.h" /* * The next 2 constants identify the extents of the code & RO data region. diff --git a/plat/qemu/qemu_common.c b/plat/qemu/qemu_common.c index 39df1f13..daa9fc14 100644 --- a/plat/qemu/qemu_common.c +++ b/plat/qemu/qemu_common.c @@ -7,8 +7,8 @@ #include <arch_helpers.h> #include <bl_common.h> #include <platform_def.h> -#include "qemu_private.h" #include <xlat_tables.h> +#include "qemu_private.h" #define MAP_DEVICE0 MAP_REGION_FLAT(DEVICE0_BASE, \ DEVICE0_SIZE, \ diff --git a/plat/qemu/qemu_pm.c b/plat/qemu/qemu_pm.c index f7353912..c184f1c3 100644 --- a/plat/qemu/qemu_pm.c +++ b/plat/qemu/qemu_pm.c @@ -8,8 +8,8 @@ #include <assert.h> #include <debug.h> #include <gicv2.h> -#include <platform_def.h> #include <platform.h> +#include <platform_def.h> #include <psci.h> /* diff --git a/plat/qemu/topology.c b/plat/qemu/topology.c index 05ff4e1f..d7ba9b7e 100644 --- a/plat/qemu/topology.c +++ b/plat/qemu/topology.c @@ -6,8 +6,8 @@ #include <arch.h> #include <platform_def.h> -#include "qemu_private.h" #include <sys/types.h> +#include "qemu_private.h" /* The power domain tree descriptor */ static unsigned char power_domain_tree_desc[] = { diff --git a/plat/rockchip/common/aarch64/platform_common.c b/plat/rockchip/common/aarch64/platform_common.c index a756f40d..25eab434 100644 --- a/plat/rockchip/common/aarch64/platform_common.c +++ b/plat/rockchip/common/aarch64/platform_common.c @@ -9,11 +9,11 @@ #include <bl_common.h> #include <cci.h> #include <debug.h> -#include <string.h> -#include <xlat_tables.h> -#include <platform_def.h> #include <plat_private.h> +#include <platform_def.h> +#include <string.h> #include <utils.h> +#include <xlat_tables.h> #ifdef PLAT_RK_CCI_BASE static const int cci_map[] = { diff --git a/plat/rockchip/common/bl31_plat_setup.c b/plat/rockchip/common/bl31_plat_setup.c index f7564e81..292f0dd7 100644 --- a/plat/rockchip/common/bl31_plat_setup.c +++ b/plat/rockchip/common/bl31_plat_setup.c @@ -11,8 +11,8 @@ #include <debug.h> #include <generic_delay_timer.h> #include <mmio.h> -#include <platform.h> #include <plat_private.h> +#include <platform.h> #include <platform_def.h> /******************************************************************************* diff --git a/plat/rockchip/common/drivers/parameter/ddr_parameter.c b/plat/rockchip/common/drivers/parameter/ddr_parameter.c index 5069a929..ea77757f 100644 --- a/plat/rockchip/common/drivers/parameter/ddr_parameter.c +++ b/plat/rockchip/common/drivers/parameter/ddr_parameter.c @@ -9,8 +9,8 @@ #include <debug.h> #include <delay_timer.h> #include <mmio.h> -#include <platform_def.h> #include <plat_private.h> +#include <platform_def.h> #include <soc.h> #include <string.h> #include "ddr_parameter.h" diff --git a/plat/rockchip/common/drivers/parameter/ddr_parameter.h b/plat/rockchip/common/drivers/parameter/ddr_parameter.h index f8eacd4b..f8e3be93 100644 --- a/plat/rockchip/common/drivers/parameter/ddr_parameter.h +++ b/plat/rockchip/common/drivers/parameter/ddr_parameter.h @@ -12,8 +12,8 @@ #include <debug.h> #include <delay_timer.h> #include <mmio.h> -#include <platform_def.h> #include <plat_private.h> +#include <platform_def.h> #include <soc.h> #include <string.h> diff --git a/plat/rockchip/common/include/plat_private.h b/plat/rockchip/common/include/plat_private.h index b9540f23..290811a2 100644 --- a/plat/rockchip/common/include/plat_private.h +++ b/plat/rockchip/common/include/plat_private.h @@ -9,9 +9,9 @@ #ifndef __ASSEMBLY__ #include <mmio.h> +#include <psci.h> #include <stdint.h> #include <xlat_tables.h> -#include <psci.h> #define __sramdata __attribute__((section(".sram.data"))) #define __sramconst __attribute__((section(".sram.rodata"))) diff --git a/plat/rockchip/common/params_setup.c b/plat/rockchip/common/params_setup.c index ad4ef7f3..b37acb76 100644 --- a/plat/rockchip/common/params_setup.c +++ b/plat/rockchip/common/params_setup.c @@ -11,9 +11,9 @@ #include <debug.h> #include <gpio.h> #include <mmio.h> -#include <platform.h> #include <plat_params.h> #include <plat_private.h> +#include <platform.h> #include <string.h> static struct gpio_info param_reset; diff --git a/plat/rockchip/common/plat_pm.c b/plat/rockchip/common/plat_pm.c index 4133fd04..cd88f60c 100644 --- a/plat/rockchip/common/plat_pm.c +++ b/plat/rockchip/common/plat_pm.c @@ -7,12 +7,12 @@ #include <arch_helpers.h> #include <assert.h> #include <console.h> -#include <errno.h> #include <debug.h> -#include <psci.h> #include <delay_timer.h> -#include <platform_def.h> +#include <errno.h> #include <plat_private.h> +#include <platform_def.h> +#include <psci.h> /* Macros to read the rk power domain state */ #define RK_CORE_PWR_STATE(state) \ diff --git a/plat/rockchip/common/plat_topology.c b/plat/rockchip/common/plat_topology.c index 3d0f2081..49d063cf 100644 --- a/plat/rockchip/common/plat_topology.c +++ b/plat/rockchip/common/plat_topology.c @@ -5,8 +5,8 @@ */ #include <arch.h> -#include <platform_def.h> #include <plat_private.h> +#include <platform_def.h> #include <psci.h> /******************************************************************************* diff --git a/plat/rockchip/rk3328/drivers/pmu/pmu.c b/plat/rockchip/rk3328/drivers/pmu/pmu.c index 60f36d31..f576fe41 100644 --- a/plat/rockchip/rk3328/drivers/pmu/pmu.c +++ b/plat/rockchip/rk3328/drivers/pmu/pmu.c @@ -5,20 +5,20 @@ */ #include <arch_helpers.h> -#include <debug.h> #include <assert.h> #include <bakery_lock.h> #include <bl31.h> #include <console.h> +#include <debug.h> #include <delay_timer.h> #include <errno.h> #include <mmio.h> +#include <plat_private.h> #include <platform.h> #include <platform_def.h> -#include <plat_private.h> #include <pmu.h> -#include <rk3328_def.h> #include <pmu_com.h> +#include <rk3328_def.h> DEFINE_BAKERY_LOCK(rockchip_pd_lock); diff --git a/plat/rockchip/rk3328/drivers/soc/soc.c b/plat/rockchip/rk3328/drivers/soc/soc.c index d4cba998..ce344d66 100644 --- a/plat/rockchip/rk3328/drivers/soc/soc.c +++ b/plat/rockchip/rk3328/drivers/soc/soc.c @@ -6,12 +6,12 @@ #include <arch_helpers.h> #include <console.h> +#include <ddr_parameter.h> #include <debug.h> #include <delay_timer.h> #include <mmio.h> -#include <platform_def.h> #include <plat_private.h> -#include <ddr_parameter.h> +#include <platform_def.h> #include <rk3328_def.h> #include <soc.h> diff --git a/plat/rockchip/rk3368/drivers/ddr/ddr_rk3368.c b/plat/rockchip/rk3368/drivers/ddr/ddr_rk3368.c index b902bba9..1c33763f 100644 --- a/plat/rockchip/rk3368/drivers/ddr/ddr_rk3368.c +++ b/plat/rockchip/rk3368/drivers/ddr/ddr_rk3368.c @@ -7,12 +7,12 @@ #include <mmio.h> #include <ddr_rk3368.h> #include <debug.h> -#include <stdint.h> -#include <string.h> #include <platform_def.h> #include <pmu.h> #include <rk3368_def.h> #include <soc.h> +#include <stdint.h> +#include <string.h> /* GRF_SOC_STATUS0 */ #define DPLL_LOCK (0x1 << 2) diff --git a/plat/rockchip/rk3368/drivers/pmu/pmu.c b/plat/rockchip/rk3368/drivers/pmu/pmu.c index 1767967f..cb323e6e 100644 --- a/plat/rockchip/rk3368/drivers/pmu/pmu.c +++ b/plat/rockchip/rk3368/drivers/pmu/pmu.c @@ -6,18 +6,18 @@ #include <arch_helpers.h> #include <assert.h> +#include <ddr_rk3368.h> #include <debug.h> #include <delay_timer.h> #include <errno.h> #include <mmio.h> +#include <plat_private.h> #include <platform.h> #include <platform_def.h> -#include <plat_private.h> -#include <rk3368_def.h> -#include <soc.h> #include <pmu.h> -#include <ddr_rk3368.h> #include <pmu_com.h> +#include <rk3368_def.h> +#include <soc.h> DEFINE_BAKERY_LOCK(rockchip_pd_lock); diff --git a/plat/rockchip/rk3368/drivers/soc/soc.c b/plat/rockchip/rk3368/drivers/soc/soc.c index 9e1e583b..d6979a84 100644 --- a/plat/rockchip/rk3368/drivers/soc/soc.c +++ b/plat/rockchip/rk3368/drivers/soc/soc.c @@ -7,8 +7,8 @@ #include <arch_helpers.h> #include <debug.h> #include <mmio.h> -#include <platform_def.h> #include <plat_private.h> +#include <platform_def.h> #include <rk3368_def.h> #include <soc.h> diff --git a/plat/rockchip/rk3399/drivers/dram/dfs.c b/plat/rockchip/rk3399/drivers/dram/dfs.c index 481dcc64..d629e4bf 100644 --- a/plat/rockchip/rk3399/drivers/dram/dfs.c +++ b/plat/rockchip/rk3399/drivers/dram/dfs.c @@ -6,17 +6,16 @@ #include <arch_helpers.h> #include <debug.h> -#include <mmio.h> +#include <delay_timer.h> #include <m0_ctl.h> +#include <mmio.h> #include <plat_private.h> #include "dfs.h" #include "dram.h" #include "dram_spec_timing.h" -#include "string.h" -#include "soc.h" #include "pmu.h" - -#include <delay_timer.h> +#include "soc.h" +#include "string.h" #define ENPER_CS_TRAINING_FREQ (666) #define TDFI_LAT_THRESHOLD_FREQ (928) diff --git a/plat/rockchip/rk3399/drivers/dram/dram.c b/plat/rockchip/rk3399/drivers/dram/dram.c index ad79f9ef..42b62945 100644 --- a/plat/rockchip/rk3399/drivers/dram/dram.c +++ b/plat/rockchip/rk3399/drivers/dram/dram.c @@ -6,9 +6,9 @@ #include <dram.h> #include <plat_private.h> +#include <rk3399_def.h> #include <secure.h> #include <soc.h> -#include <rk3399_def.h> __pmusramdata struct rk3399_sdram_params sdram_config; diff --git a/plat/rockchip/rk3399/drivers/dram/dram_spec_timing.c b/plat/rockchip/rk3399/drivers/dram/dram_spec_timing.c index a2b28b7e..2e196b54 100644 --- a/plat/rockchip/rk3399/drivers/dram/dram_spec_timing.c +++ b/plat/rockchip/rk3399/drivers/dram/dram_spec_timing.c @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <string.h> -#include <stdint.h> #include <dram.h> +#include <stdint.h> +#include <string.h> #include <utils.h> #include "dram_spec_timing.h" diff --git a/plat/rockchip/rk3399/drivers/dram/suspend.c b/plat/rockchip/rk3399/drivers/dram/suspend.c index 617e39ba..68677449 100644 --- a/plat/rockchip/rk3399/drivers/dram/suspend.c +++ b/plat/rockchip/rk3399/drivers/dram/suspend.c @@ -3,11 +3,12 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include <debug.h> + #include <arch_helpers.h> -#include <platform_def.h> -#include <plat_private.h> +#include <debug.h> #include <dram.h> +#include <plat_private.h> +#include <platform_def.h> #include <pmu_regs.h> #include <rk3399_def.h> #include <secure.h> diff --git a/plat/rockchip/rk3399/drivers/gpio/rk3399_gpio.c b/plat/rockchip/rk3399/drivers/gpio/rk3399_gpio.c index 2d8b439c..d5a26609 100644 --- a/plat/rockchip/rk3399/drivers/gpio/rk3399_gpio.c +++ b/plat/rockchip/rk3399/drivers/gpio/rk3399_gpio.c @@ -9,9 +9,9 @@ #include <errno.h> #include <gpio.h> #include <mmio.h> +#include <plat_private.h> #include <platform.h> #include <platform_def.h> -#include <plat_private.h> #include <soc.h> uint32_t gpio_port[] = { diff --git a/plat/rockchip/rk3399/drivers/pmu/m0_ctl.c b/plat/rockchip/rk3399/drivers/pmu/m0_ctl.c index 99a5b639..61849e50 100644 --- a/plat/rockchip/rk3399/drivers/pmu/m0_ctl.c +++ b/plat/rockchip/rk3399/drivers/pmu/m0_ctl.c @@ -8,8 +8,8 @@ #include <assert.h> #include <debug.h> #include <delay_timer.h> -#include <mmio.h> #include <m0_ctl.h> +#include <mmio.h> #include <plat_private.h> #include <rk3399_def.h> #include <secure.h> diff --git a/plat/rockchip/rk3399/drivers/pmu/pmu.c b/plat/rockchip/rk3399/drivers/pmu/pmu.c index 37977e14..6b420c24 100644 --- a/plat/rockchip/rk3399/drivers/pmu/pmu.c +++ b/plat/rockchip/rk3399/drivers/pmu/pmu.c @@ -7,25 +7,25 @@ #include <arch_helpers.h> #include <assert.h> #include <bakery_lock.h> +#include <bl31.h> #include <debug.h> #include <delay_timer.h> #include <dfs.h> #include <errno.h> #include <gpio.h> -#include <mmio.h> #include <m0_ctl.h> -#include <platform.h> -#include <platform_def.h> +#include <mmio.h> #include <plat_params.h> #include <plat_private.h> +#include <platform.h> +#include <platform_def.h> +#include <pmu.h> +#include <pmu_com.h> +#include <pwm.h> #include <rk3399_def.h> #include <secure.h> #include <soc.h> #include <string.h> -#include <pmu.h> -#include <pmu_com.h> -#include <pwm.h> -#include <bl31.h> #include <suspend.h> DEFINE_BAKERY_LOCK(rockchip_pd_lock); diff --git a/plat/rockchip/rk3399/drivers/soc/soc.c b/plat/rockchip/rk3399/drivers/soc/soc.c index b3e9e953..993b80ad 100644 --- a/plat/rockchip/rk3399/drivers/soc/soc.c +++ b/plat/rockchip/rk3399/drivers/soc/soc.c @@ -10,10 +10,10 @@ #include <delay_timer.h> #include <dfs.h> #include <dram.h> -#include <mmio.h> #include <m0_ctl.h> -#include <platform_def.h> +#include <mmio.h> #include <plat_private.h> +#include <platform_def.h> #include <rk3399_def.h> #include <secure.h> #include <soc.h> diff --git a/plat/rockchip/rk3399/plat_sip_calls.c b/plat/rockchip/rk3399/plat_sip_calls.c index 1a016042..074dc193 100644 --- a/plat/rockchip/rk3399/plat_sip_calls.c +++ b/plat/rockchip/rk3399/plat_sip_calls.c @@ -6,11 +6,11 @@ #include <cdn_dp.h> #include <debug.h> +#include <dfs.h> #include <mmio.h> #include <plat_sip_calls.h> #include <rockchip_sip_svc.h> #include <runtime_svc.h> -#include <dfs.h> #define RK_SIP_DDR_CFG 0x82000008 #define DRAM_INIT 0x00 diff --git a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c index 61372291..1edbd0f6 100644 --- a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c +++ b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c @@ -5,8 +5,8 @@ */ #include <assert.h> -#include <bl_common.h> #include <bl31.h> +#include <bl_common.h> #include <console.h> #include <debug.h> #include <errno.h> diff --git a/plat/xilinx/zynqmp/plat_psci.c b/plat/xilinx/zynqmp/plat_psci.c index d334a104..c9fd3611 100644 --- a/plat/xilinx/zynqmp/plat_psci.c +++ b/plat/xilinx/zynqmp/plat_psci.c @@ -5,9 +5,9 @@ */ #include <arch_helpers.h> -#include <errno.h> #include <assert.h> #include <debug.h> +#include <errno.h> #include <gicv2.h> #include <mmio.h> #include <plat_arm.h> diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_sys.c b/plat/xilinx/zynqmp/pm_service/pm_api_sys.c index 40f4da73..90c670d1 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_api_sys.c +++ b/plat/xilinx/zynqmp/pm_service/pm_api_sys.c @@ -11,10 +11,10 @@ #include <arch_helpers.h> #include <platform.h> +#include "pm_api_sys.h" #include "pm_client.h" -#include "pm_ipi.h" #include "pm_common.h" -#include "pm_api_sys.h" +#include "pm_ipi.h" /** * Assigning of argument values into array elements. diff --git a/plat/xilinx/zynqmp/pm_service/pm_client.c b/plat/xilinx/zynqmp/pm_service/pm_client.c index 08369b99..9016fd6f 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_client.c +++ b/plat/xilinx/zynqmp/pm_service/pm_client.c @@ -11,16 +11,16 @@ #include <assert.h> #include <bakery_lock.h> -#include <gicv2.h> -#include <gic_common.h> #include <bl_common.h> +#include <gic_common.h> +#include <gicv2.h> #include <mmio.h> #include <string.h> #include <utils.h> +#include "../zynqmp_def.h" #include "pm_api_sys.h" #include "pm_client.h" #include "pm_ipi.h" -#include "../zynqmp_def.h" #define IRQ_MAX 84 #define NUM_GICD_ISENABLER ((IRQ_MAX >> 5) + 1) diff --git a/plat/xilinx/zynqmp/pm_service/pm_client.h b/plat/xilinx/zynqmp/pm_service/pm_client.h index 03dec4c4..16e37d59 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_client.h +++ b/plat/xilinx/zynqmp/pm_service/pm_client.h @@ -12,8 +12,8 @@ #ifndef _PM_CLIENT_H_ #define _PM_CLIENT_H_ -#include "pm_defs.h" #include "pm_common.h" +#include "pm_defs.h" /* Functions to be implemented by each PU */ void pm_client_suspend(const struct pm_proc *proc, unsigned int state); diff --git a/plat/xilinx/zynqmp/pm_service/pm_ipi.c b/plat/xilinx/zynqmp/pm_service/pm_ipi.c index ba72491c..fdffde77 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_ipi.c +++ b/plat/xilinx/zynqmp/pm_service/pm_ipi.c @@ -4,12 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <arch_helpers.h> #include <bakery_lock.h> #include <mmio.h> #include <platform.h> -#include <arch_helpers.h> -#include "pm_ipi.h" #include "../zynqmp_private.h" +#include "pm_ipi.h" /* IPI message buffers */ #define IPI_BUFFER_BASEADDR 0xFF990000U diff --git a/plat/xilinx/zynqmp/pm_service/pm_svc_main.c b/plat/xilinx/zynqmp/pm_service/pm_svc_main.c index b8381712..f4e679bc 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_svc_main.c +++ b/plat/xilinx/zynqmp/pm_service/pm_svc_main.c @@ -13,10 +13,10 @@ #include <gic_common.h> #include <runtime_svc.h> #include <string.h> +#include "../zynqmp_private.h" #include "pm_api_sys.h" #include "pm_client.h" #include "pm_ipi.h" -#include "../zynqmp_private.h" #define PM_GET_CALLBACK_DATA 0xa01 diff --git a/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c b/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c index 27736f75..ecc4d0a9 100644 --- a/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c +++ b/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c @@ -7,8 +7,8 @@ #include <bl_common.h> #include <console.h> #include <debug.h> -#include <platform_tsp.h> #include <plat_arm.h> +#include <platform_tsp.h> #include "../zynqmp_private.h" #define BL32_END (unsigned long)(&__BL32_END__) diff --git a/services/spd/opteed/opteed_main.c b/services/spd/opteed/opteed_main.c index 418e4820..e2a20352 100644 --- a/services/spd/opteed/opteed_main.c +++ b/services/spd/opteed/opteed_main.c @@ -16,8 +16,8 @@ ******************************************************************************/ #include <arch_helpers.h> #include <assert.h> -#include <bl_common.h> #include <bl31.h> +#include <bl_common.h> #include <context_mgmt.h> #include <debug.h> #include <errno.h> @@ -26,8 +26,9 @@ #include <stddef.h> #include <uuid.h> #include "opteed_private.h" -#include "teesmc_opteed_macros.h" #include "teesmc_opteed.h" +#include "teesmc_opteed_macros.h" + /******************************************************************************* * Address of the entrypoint vector table in OPTEE. It is diff --git a/services/spd/tlkd/tlkd_main.c b/services/spd/tlkd/tlkd_main.c index 948be5df..78e98535 100644 --- a/services/spd/tlkd/tlkd_main.c +++ b/services/spd/tlkd/tlkd_main.c @@ -15,8 +15,8 @@ ******************************************************************************/ #include <arch_helpers.h> #include <assert.h> -#include <bl_common.h> #include <bl31.h> +#include <bl_common.h> #include <context_mgmt.h> #include <debug.h> #include <errno.h> diff --git a/services/spd/trusty/trusty.c b/services/spd/trusty/trusty.c index a95141bf..e386f71c 100644 --- a/services/spd/trusty/trusty.c +++ b/services/spd/trusty/trusty.c @@ -6,8 +6,8 @@ #include <arch_helpers.h> #include <assert.h> /* for context_mgmt.h */ -#include <bl_common.h> #include <bl31.h> +#include <bl_common.h> #include <context_mgmt.h> #include <debug.h> #include <interrupt_mgmt.h> @@ -15,8 +15,8 @@ #include <runtime_svc.h> #include <string.h> -#include "smcall.h" #include "sm_err.h" +#include "smcall.h" /* macro to check if Hypervisor is enabled in the HCR_EL2 register */ #define HYP_ENABLE_FLAG 0x286001 diff --git a/services/spd/tspd/tspd_main.c b/services/spd/tspd/tspd_main.c index afa7e2ae..2ba9f84c 100644 --- a/services/spd/tspd/tspd_main.c +++ b/services/spd/tspd/tspd_main.c @@ -16,8 +16,8 @@ ******************************************************************************/ #include <arch_helpers.h> #include <assert.h> -#include <bl_common.h> #include <bl31.h> +#include <bl_common.h> #include <context_mgmt.h> #include <debug.h> #include <errno.h> diff --git a/tools/cert_create/include/ext.h b/tools/cert_create/include/ext.h index 2aa17e25..d432e639 100644 --- a/tools/cert_create/include/ext.h +++ b/tools/cert_create/include/ext.h @@ -7,8 +7,8 @@ #ifndef EXT_H_ #define EXT_H_ -#include "key.h" #include <openssl/x509v3.h> +#include "key.h" /* Extension types supported */ enum ext_type_e { diff --git a/tools/cert_create/src/cmd_opt.c b/tools/cert_create/src/cmd_opt.c index 0d47872e..64180d1f 100644 --- a/tools/cert_create/src/cmd_opt.c +++ b/tools/cert_create/src/cmd_opt.c @@ -5,10 +5,10 @@ */ #include <assert.h> +#include <cmd_opt.h> #include <getopt.h> #include <stddef.h> #include <stdlib.h> -#include <cmd_opt.h> #include "debug.h" /* Command line options */ diff --git a/tools/cert_create/src/main.c b/tools/cert_create/src/main.c index 99236370..f14601c8 100644 --- a/tools/cert_create/src/main.c +++ b/tools/cert_create/src/main.c @@ -30,8 +30,8 @@ #include "ext.h" #include "key.h" #include "sha.h" -#include "tbbr/tbb_ext.h" #include "tbbr/tbb_cert.h" +#include "tbbr/tbb_ext.h" #include "tbbr/tbb_key.h" /* diff --git a/tools/cert_create/src/sha.c b/tools/cert_create/src/sha.c index 5d5e9e21..29715930 100644 --- a/tools/cert_create/src/sha.c +++ b/tools/cert_create/src/sha.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdio.h> #include <openssl/sha.h> +#include <stdio.h> #include "debug.h" diff --git a/tools/fiptool/fiptool.c b/tools/fiptool/fiptool.c index 4d80f2f1..65e4a25c 100644 --- a/tools/fiptool/fiptool.c +++ b/tools/fiptool/fiptool.c @@ -19,7 +19,6 @@ #include <unistd.h> #include <openssl/sha.h> - #include <firmware_image_package.h> #include "fiptool.h" diff --git a/tools/fiptool/fiptool.h b/tools/fiptool/fiptool.h index 4b5cdd91..889b0fde 100644 --- a/tools/fiptool/fiptool.h +++ b/tools/fiptool/fiptool.h @@ -7,10 +7,11 @@ #ifndef __FIPTOOL_H__ #define __FIPTOOL_H__ +#include <firmware_image_package.h> + #include <stddef.h> #include <stdint.h> -#include <firmware_image_package.h> #include <uuid.h> #define NELEM(x) (sizeof (x) / sizeof *(x)) diff --git a/tools/fiptool/tbbr_config.c b/tools/fiptool/tbbr_config.c index 7c6c24be..6231cd4e 100644 --- a/tools/fiptool/tbbr_config.c +++ b/tools/fiptool/tbbr_config.c @@ -4,9 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stddef.h> - #include <firmware_image_package.h> +#include <stddef.h> #include "tbbr_config.h" |