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 --- Makefile | 14 ++++---- bl1/aarch32/bl1_context_mgmt.c | 10 +++--- bl1/aarch32/bl1_entrypoint.S | 2 +- bl1/aarch32/bl1_exceptions.S | 6 ++-- bl1/aarch64/bl1_context_mgmt.c | 10 +++--- bl1/aarch64/bl1_exceptions.S | 4 +-- bl1/bl1.ld.S | 3 +- bl1/bl1_fwu.c | 23 +++++++------ bl1/bl1_main.c | 25 ++++++++------ bl1/bl1_private.h | 3 +- bl1/tbbr/tbbr_img_desc.c | 7 ++-- bl2/aarch32/bl2_el3_entrypoint.S | 3 +- bl2/aarch32/bl2_el3_exceptions.S | 2 +- bl2/aarch32/bl2_entrypoint.S | 3 +- bl2/aarch64/bl2_el3_entrypoint.S | 2 +- bl2/aarch64/bl2_el3_exceptions.S | 4 +-- bl2/aarch64/bl2_entrypoint.S | 2 +- bl2/bl2.ld.S | 3 +- bl2/bl2_el3.ld.S | 3 +- bl2/bl2_image_load_v2.c | 20 ++++++----- bl2/bl2_main.c | 15 +++++---- bl2u/aarch32/bl2u_entrypoint.S | 3 +- bl2u/aarch64/bl2u_entrypoint.S | 3 +- bl2u/bl2u.ld.S | 3 +- bl2u/bl2u_main.c | 21 ++++++------ bl31/aarch64/bl31_entrypoint.S | 11 +++--- bl31/aarch64/crash_reporting.S | 10 +++--- bl31/aarch64/ea_delegate.S | 4 +-- bl31/aarch64/runtime_exceptions.S | 13 ++++---- bl31/bl31.ld.S | 7 ++-- bl31/bl31_context_mgmt.c | 12 +++---- bl31/bl31_main.c | 27 +++++++-------- bl31/ehf.c | 19 ++++++----- bl31/interrupt_mgmt.c | 9 ++--- bl32/sp_min/aarch32/entrypoint.S | 6 ++-- bl32/sp_min/sp_min.ld.S | 7 ++-- bl32/sp_min/sp_min_main.c | 32 +++++++++--------- bl32/tsp/aarch64/tsp_entrypoint.S | 5 +-- bl32/tsp/aarch64/tsp_exceptions.S | 5 ++- bl32/tsp/aarch64/tsp_request.S | 2 +- bl32/tsp/tsp.ld.S | 2 +- bl32/tsp/tsp_interrupt.c | 11 +++--- bl32/tsp/tsp_main.c | 14 ++++---- bl32/tsp/tsp_private.h | 9 ++--- bl32/tsp/tsp_timer.c | 7 ++-- common/aarch64/debug.S | 2 +- common/aarch64/early_exceptions.S | 2 +- common/backtrace/backtrace.c | 7 ++-- common/bl_common.c | 19 ++++++----- common/desc_image_load.c | 7 ++-- common/fdt_wrappers.c | 8 +++-- common/image_decompress.c | 9 ++--- common/runtime_svc.c | 5 +-- common/tf_log.c | 7 ++-- docs/exception-handling.rst | 4 +-- drivers/allwinner/sunxi_rsb.c | 8 +++-- drivers/arm/cci/cci.c | 11 +++--- drivers/arm/ccn/ccn.c | 12 ++++--- drivers/arm/gic/common/gic_common.c | 6 ++-- drivers/arm/gic/common/gic_common_private.h | 5 +-- drivers/arm/gic/v2/gicv2_helpers.c | 12 ++++--- drivers/arm/gic/v2/gicv2_main.c | 15 +++++---- drivers/arm/gic/v2/gicv2_private.h | 5 +-- drivers/arm/gic/v3/arm_gicv3_common.c | 7 ++-- drivers/arm/gic/v3/gic600.c | 5 +-- drivers/arm/gic/v3/gicv3_helpers.c | 10 +++--- drivers/arm/gic/v3/gicv3_main.c | 12 ++++--- drivers/arm/gic/v3/gicv3_private.h | 8 +++-- drivers/arm/pl011/aarch32/pl011_console.S | 2 +- drivers/arm/pl011/aarch64/pl011_console.S | 2 +- drivers/arm/pl061/pl061_gpio.c | 13 ++++---- drivers/arm/smmu/smmu_v3.c | 5 +-- drivers/arm/sp804/sp804_delay_timer.c | 5 +-- drivers/arm/sp805/sp805.c | 5 +-- drivers/arm/tzc/tzc380.c | 7 ++-- drivers/arm/tzc/tzc400.c | 8 +++-- drivers/arm/tzc/tzc_common_private.h | 4 +-- drivers/arm/tzc/tzc_dmc500.c | 10 +++--- drivers/arm/tzc/tzc_dmc620.c | 7 ++-- drivers/auth/auth_mod.c | 18 +++++----- drivers/auth/crypto_mod.c | 5 +-- drivers/auth/cryptocell/cryptocell_crypto.c | 26 ++++++++------- drivers/auth/cryptocell/cryptocell_crypto.mk | 4 +-- drivers/auth/img_parser_mod.c | 9 ++--- drivers/auth/mbedtls/mbedtls_common.c | 12 ++++--- drivers/auth/mbedtls/mbedtls_common.mk | 3 +- drivers/auth/mbedtls/mbedtls_crypto.c | 9 ++--- drivers/auth/mbedtls/mbedtls_x509_parser.c | 9 ++--- drivers/auth/tbbr/tbbr_cot.c | 7 ++-- drivers/cadence/uart/aarch64/cdns_console.S | 2 +- drivers/cfi/v2m/v2m_flash.c | 5 +-- drivers/console/multi_console.c | 1 + .../coreboot/cbmem_console/aarch64/cbmem_console.S | 2 +- drivers/delay_timer/delay_timer.c | 6 ++-- drivers/delay_timer/generic_delay_timer.c | 13 ++++---- drivers/gpio/gpio.c | 3 +- drivers/imx/timer/imx_gpt.c | 6 ++-- drivers/imx/uart/imx_uart.c | 8 +++-- drivers/imx/usdhc/imx_usdhc.c | 16 +++++---- drivers/imx/usdhc/imx_usdhc.h | 2 +- drivers/io/io_block.c | 14 ++++---- drivers/io/io_dummy.c | 9 ++--- drivers/io/io_fip.c | 22 ++++++------ drivers/io/io_memmap.c | 14 ++++---- drivers/io/io_semihosting.c | 10 +++--- drivers/io/io_storage.c | 7 ++-- drivers/marvell/amb_adec.c | 5 +-- drivers/marvell/ap807_clocks_init.c | 7 ++-- drivers/marvell/cache_llc.c | 10 +++--- drivers/marvell/ccu.c | 7 ++-- drivers/marvell/comphy/phy-comphy-3700.c | 11 +++--- drivers/marvell/comphy/phy-comphy-cp110.c | 10 +++--- drivers/marvell/gwin.c | 7 ++-- drivers/marvell/io_win.c | 7 ++-- drivers/marvell/iob.c | 9 ++--- drivers/marvell/mc_trustzone/mc_trustzone.c | 8 +++-- drivers/marvell/mc_trustzone/mc_trustzone.h | 2 +- drivers/marvell/mci.c | 9 ++--- drivers/marvell/mochi/ap807_setup.c | 15 +++++---- drivers/marvell/mochi/apn806_setup.c | 15 +++++---- drivers/marvell/mochi/cp110_setup.c | 11 +++--- drivers/marvell/thermal.c | 4 +-- drivers/marvell/uart/a3700_console.S | 2 +- drivers/mentor/i2c/mi2cv.c | 10 +++--- drivers/meson/console/aarch64/meson_console.S | 2 +- drivers/mmc/mmc.c | 11 +++--- drivers/partition/gpt.c | 7 ++-- drivers/partition/partition.c | 13 ++++---- drivers/renesas/rcar/auth/auth_mod.c | 12 ++++--- drivers/renesas/rcar/avs/avs_driver.c | 7 ++-- drivers/renesas/rcar/board/board.c | 5 ++- drivers/renesas/rcar/common.c | 3 +- drivers/renesas/rcar/console/rcar_printf.c | 16 +++++---- drivers/renesas/rcar/cpld/ulcb_cpld.c | 2 +- drivers/renesas/rcar/delay/micro_delay.h | 2 +- drivers/renesas/rcar/dma/dma_driver.c | 8 +++-- drivers/renesas/rcar/emmc/emmc_cmd.c | 3 +- drivers/renesas/rcar/emmc/emmc_init.c | 4 ++- drivers/renesas/rcar/emmc/emmc_interrupt.c | 6 ++-- drivers/renesas/rcar/emmc/emmc_mount.c | 5 +-- drivers/renesas/rcar/emmc/emmc_read.c | 2 ++ drivers/renesas/rcar/emmc/emmc_utility.c | 3 +- drivers/renesas/rcar/iic_dvfs/iic_dvfs.c | 5 +-- drivers/renesas/rcar/io/io_emmcdrv.c | 7 ++-- drivers/renesas/rcar/io/io_memdrv.c | 7 ++-- drivers/renesas/rcar/io/io_rcar.c | 24 +++++++------ drivers/renesas/rcar/pwrc/pwrc.c | 14 ++++---- drivers/renesas/rcar/rom/rom_api.c | 4 ++- drivers/renesas/rcar/rpc/rpc_driver.c | 6 ++-- drivers/renesas/rcar/watchdog/swdt.c | 7 ++-- drivers/st/clk/stm32mp1_clk.c | 31 +++++++++-------- drivers/st/clk/stm32mp1_clkfunc.c | 9 +++-- drivers/st/ddr/stm32mp1_ddr.c | 27 ++++++++------- drivers/st/ddr/stm32mp1_ddr_helpers.c | 7 ++-- drivers/st/ddr/stm32mp1_ram.c | 24 +++++++------ drivers/st/gpio/stm32_gpio.c | 9 ++--- drivers/st/io/io_mmc.c | 13 ++++---- drivers/st/io/io_stm32image.c | 19 ++++++----- drivers/st/mmc/stm32_sdmmc2.c | 28 ++++++++-------- drivers/st/pmic/stm32_i2c.c | 9 ++--- drivers/st/pmic/stm32mp1_pmic.c | 24 +++++++------ drivers/st/pmic/stpmu1.c | 7 ++-- drivers/st/reset/stm32mp1_reset.c | 14 ++++---- drivers/st/uart/aarch32/stm32_console.S | 4 +-- .../staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c | 4 +-- .../renesas/rcar/ddr/ddr_b/boot_init_dram.c | 6 ++-- drivers/staging/renesas/rcar/ddr/dram_sub_func.c | 5 +-- drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.c | 4 ++- .../staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.c | 4 +-- .../staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.c | 4 ++- drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.c | 4 ++- .../staging/renesas/rcar/pfc/M3N/pfc_init_m3n.c | 4 ++- drivers/staging/renesas/rcar/pfc/pfc_init.c | 6 ++-- .../staging/renesas/rcar/qos/E3/qos_init_e3_v10.c | 4 ++- .../staging/renesas/rcar/qos/H3/qos_init_h3_v10.c | 4 ++- .../staging/renesas/rcar/qos/H3/qos_init_h3_v11.c | 5 ++- .../staging/renesas/rcar/qos/H3/qos_init_h3_v20.c | 4 ++- .../staging/renesas/rcar/qos/H3/qos_init_h3_v30.c | 4 ++- .../staging/renesas/rcar/qos/H3/qos_init_h3n_v30.c | 4 ++- .../staging/renesas/rcar/qos/M3/qos_init_m3_v10.c | 4 ++- .../staging/renesas/rcar/qos/M3/qos_init_m3_v11.c | 4 ++- .../renesas/rcar/qos/M3N/qos_init_m3n_v10.c | 4 ++- drivers/staging/renesas/rcar/qos/qos_init.c | 6 ++-- drivers/synopsys/emmc/dw_mmc.c | 15 +++++---- drivers/synopsys/ufs/dw_ufs.c | 9 ++--- drivers/ti/uart/aarch64/16550_console.S | 2 +- drivers/ufs/ufs.c | 14 ++++---- include/arch/aarch32/arch.h | 2 +- include/arch/aarch32/arch_helpers.h | 3 +- include/arch/aarch32/asm_macros.S | 4 +-- include/arch/aarch32/console_macros.S | 2 +- include/arch/aarch32/smccc_helpers.h | 6 ++-- include/arch/aarch64/arch.h | 2 +- include/arch/aarch64/arch_helpers.h | 3 +- include/arch/aarch64/asm_macros.S | 4 +-- include/arch/aarch64/console_macros.S | 2 +- include/arch/aarch64/smccc_helpers.h | 6 ++-- include/bl1/bl1.h | 5 +-- include/bl1/tbbr/tbbr_img_desc.h | 2 +- include/bl31/ehf.h | 3 +- include/bl31/interrupt_mgmt.h | 2 +- include/bl32/payloads/tlk.h | 2 +- include/common/bl_common.h | 10 +++--- include/common/debug.h | 6 ++-- include/common/desc_image_load.h | 2 +- include/common/ep_info.h | 7 ++-- include/common/param_header.h | 3 +- include/common/runtime_svc.h | 6 ++-- include/common/tbbr/tbbr_img_def.h | 2 +- include/drivers/arm/cci.h | 2 +- include/drivers/arm/gic_common.h | 2 +- include/drivers/arm/gicv2.h | 5 +-- include/drivers/arm/gicv3.h | 9 ++--- include/drivers/arm/pl011.h | 2 +- include/drivers/arm/pl061_gpio.h | 2 +- include/drivers/arm/smmu_v3.h | 3 +- include/drivers/arm/sp804_delay_timer.h | 2 +- include/drivers/arm/sp805.h | 2 +- include/drivers/arm/tzc380.h | 4 +-- include/drivers/arm/tzc400.h | 4 +-- include/drivers/arm/tzc_common.h | 2 +- include/drivers/arm/tzc_dmc500.h | 4 +-- include/drivers/arm/tzc_dmc620.h | 2 +- include/drivers/auth/auth_mod.h | 8 ++--- include/drivers/auth/img_parser_mod.h | 2 +- include/drivers/cadence/cdns_uart.h | 2 +- include/drivers/console.h | 6 ++-- include/drivers/console_assertions.h | 2 +- include/drivers/coreboot/cbmem_console.h | 2 +- include/drivers/io/io_block.h | 2 +- include/drivers/io/io_driver.h | 2 +- include/drivers/io/io_storage.h | 2 +- include/drivers/marvell/ccu.h | 2 +- include/drivers/marvell/gwin.h | 2 +- include/drivers/marvell/io_win.h | 2 +- include/drivers/marvell/iob.h | 2 +- include/drivers/marvell/mochi/cp110_setup.h | 3 +- include/drivers/marvell/uart/a3700_console.h | 2 +- include/drivers/meson/meson_console.h | 2 +- include/drivers/mmc.h | 3 +- include/drivers/partition/gpt.h | 2 +- include/drivers/partition/partition.h | 3 +- include/drivers/st/io_mmc.h | 2 +- include/drivers/st/io_stm32image.h | 4 +-- include/drivers/st/stm32_console.h | 2 +- include/drivers/st/stm32_gpio.h | 2 +- include/drivers/st/stm32_i2c.h | 3 +- include/drivers/st/stm32_sdmmc2.h | 3 +- include/drivers/st/stm32_uart_regs.h | 2 +- include/drivers/st/stm32mp1_clk.h | 3 +- include/drivers/st/stm32mp1_clkfunc.h | 3 +- include/drivers/st/stm32mp1_ddr_regs.h | 2 +- include/drivers/st/stm32mp1_pmic.h | 2 ++ include/drivers/st/stm32mp1_pwr.h | 2 +- include/drivers/st/stm32mp1_rcc.h | 2 +- include/drivers/st/stpmu1.h | 4 +-- include/drivers/synopsys/dw_mmc.h | 2 +- include/drivers/ti/uart/uart_16550.h | 2 +- include/drivers/ufs.h | 2 +- include/lib/bakery_lock.h | 3 +- include/lib/cpus/aarch32/cortex_a57.h | 2 +- include/lib/cpus/aarch32/cortex_a72.h | 3 +- include/lib/cpus/aarch32/cpu_macros.S | 2 +- include/lib/cpus/aarch64/cortex_a57.h | 3 +- include/lib/cpus/aarch64/cortex_a72.h | 3 +- include/lib/cpus/aarch64/cortex_a75.h | 2 +- include/lib/cpus/aarch64/cortex_ares.h | 2 +- include/lib/cpus/aarch64/cpu_macros.S | 2 +- include/lib/cpus/aarch64/dsu_def.h | 2 +- include/lib/cpus/errata_report.h | 4 +-- include/lib/el3_runtime/aarch32/context.h | 5 +-- include/lib/el3_runtime/aarch64/context.h | 8 +++-- include/lib/el3_runtime/context_mgmt.h | 3 +- include/lib/el3_runtime/cpu_data.h | 7 ++-- include/lib/el3_runtime/pubsub.h | 3 +- include/lib/el3_runtime/pubsub_events.h | 2 +- include/lib/extensions/amu.h | 8 +++-- include/lib/extensions/ras.h | 3 +- include/lib/extensions/ras_arch.h | 2 +- include/lib/libc/assert.h | 4 ++- include/lib/object_pool.h | 5 +-- include/lib/optee_utils.h | 3 +- include/lib/pmf/pmf.h | 6 ++-- include/lib/pmf/pmf_helpers.h | 7 ++-- include/lib/psci/psci.h | 9 ++--- include/lib/psci/psci_lib.h | 3 +- include/lib/runtime_instr.h | 2 +- include/lib/smccc.h | 9 ++--- include/lib/utils.h | 1 + .../lib/xlat_tables/aarch32/xlat_tables_aarch32.h | 4 +-- .../lib/xlat_tables/aarch64/xlat_tables_aarch64.h | 4 +-- include/lib/xlat_tables/xlat_tables.h | 5 +-- include/lib/xlat_tables/xlat_tables_compat.h | 4 +-- include/lib/xlat_tables/xlat_tables_defs.h | 4 +-- include/lib/xlat_tables/xlat_tables_v2.h | 7 ++-- include/lib/xlat_tables/xlat_tables_v2_helpers.h | 10 +++--- include/plat/arm/board/common/board_css_def.h | 7 ++-- include/plat/arm/board/common/v2m_def.h | 2 +- include/plat/arm/common/aarch64/arm_macros.S | 6 ++-- include/plat/arm/common/aarch64/cci_macros.S | 2 +- include/plat/arm/common/arm_config.h | 3 +- include/plat/arm/common/arm_def.h | 14 ++++---- include/plat/arm/common/arm_sip_svc.h | 2 +- include/plat/arm/common/arm_spm_def.h | 5 +-- include/plat/arm/common/arm_tzc_dram.ld.S | 8 ++--- include/plat/arm/common/plat_arm.h | 15 +++++---- include/plat/arm/css/common/css_def.h | 7 ++-- include/plat/arm/css/common/css_pm.h | 3 +- include/plat/arm/soc/common/soc_css_def.h | 5 ++- include/plat/common/common_def.h | 7 ++-- include/plat/common/platform.h | 3 +- include/plat/marvell/a3700/common/armada_common.h | 3 +- include/plat/marvell/a3700/common/marvell_def.h | 8 ++--- include/plat/marvell/a3700/common/plat_marvell.h | 9 ++--- include/plat/marvell/a8k/common/armada_common.h | 8 ++--- include/plat/marvell/a8k/common/marvell_def.h | 8 ++--- include/plat/marvell/a8k/common/plat_marvell.h | 9 ++--- include/plat/marvell/common/aarch64/cci_macros.S | 2 +- .../plat/marvell/common/aarch64/marvell_macros.S | 8 ++--- include/plat/marvell/common/marvell_plat_priv.h | 2 +- include/services/mm_svc.h | 2 +- include/services/sdei.h | 4 +-- include/services/secure_partition.h | 3 +- include/services/sp_res_desc.h | 3 +- include/services/sp_res_desc_def.h | 2 +- include/services/spci_svc.h | 4 +-- include/services/spm_svc.h | 2 +- include/services/sprt_svc.h | 4 +-- include/tools_share/firmware_image_package.h | 3 +- lib/aarch64/misc_helpers.S | 2 +- lib/coreboot/coreboot.mk | 2 -- lib/coreboot/coreboot_table.c | 11 +++--- lib/cpus/aarch32/cortex_a53.S | 3 +- lib/cpus/aarch32/cortex_a57.S | 2 +- lib/cpus/aarch32/cortex_a72.S | 2 +- lib/cpus/aarch32/cpu_helpers.S | 2 +- lib/cpus/aarch64/cortex_a35.S | 2 +- lib/cpus/aarch64/cortex_a53.S | 6 ++-- lib/cpus/aarch64/cortex_a55.S | 2 +- lib/cpus/aarch64/cortex_a57.S | 4 +-- lib/cpus/aarch64/cortex_a73.S | 2 +- lib/cpus/aarch64/cortex_a75_pubsub.c | 2 +- lib/cpus/aarch64/cortex_a76.S | 4 +-- lib/cpus/aarch64/cortex_ares_pubsub.c | 2 +- lib/cpus/aarch64/cortex_deimos.S | 2 +- lib/cpus/aarch64/cortex_helios.S | 4 +-- lib/cpus/aarch64/cpu_helpers.S | 6 ++-- lib/cpus/aarch64/cpuamu.c | 4 +-- lib/cpus/aarch64/dsu_helpers.S | 2 +- lib/cpus/aarch64/wa_cve_2017_5715_bpiall.S | 2 +- lib/cpus/aarch64/wa_cve_2017_5715_mmu.S | 2 +- lib/cpus/errata_report.c | 13 ++++---- lib/el3_runtime/aarch32/context_mgmt.c | 20 ++++++----- lib/el3_runtime/aarch32/cpu_data.S | 2 +- lib/el3_runtime/aarch64/context_mgmt.c | 30 +++++++++-------- lib/el3_runtime/aarch64/cpu_data.S | 2 +- lib/el3_runtime/cpu_data_array.c | 5 +-- lib/extensions/amu/aarch32/amu.c | 11 +++--- lib/extensions/amu/aarch64/amu.c | 13 ++++---- lib/extensions/mpam/mpam.c | 5 +-- lib/extensions/ras/ras_common.c | 15 +++++---- lib/extensions/ras/std_err_record.c | 5 +-- lib/extensions/spe/spe.c | 7 ++-- lib/extensions/sve/sve.c | 7 ++-- lib/libc/abort.c | 3 +- lib/libc/assert.c | 7 ++-- lib/libc/printf.c | 4 ++- lib/libc/putchar.c | 3 +- lib/libc/snprintf.c | 5 +-- lib/locks/bakery/bakery_lock_coherent.c | 9 ++--- lib/locks/bakery/bakery_lock_normal.c | 11 +++--- lib/optee/optee_utils.c | 9 ++--- lib/pmf/pmf_main.c | 14 ++++---- lib/pmf/pmf_smc.c | 8 +++-- lib/psci/aarch32/psci_helpers.S | 2 +- lib/psci/aarch64/psci_helpers.S | 2 +- lib/psci/psci_common.c | 16 +++++---- lib/psci/psci_main.c | 18 +++++----- lib/psci/psci_mem_protect.c | 4 ++- lib/psci/psci_off.c | 14 ++++---- lib/psci/psci_on.c | 16 +++++---- lib/psci/psci_private.h | 13 ++++---- lib/psci/psci_setup.c | 14 ++++---- lib/psci/psci_stat.c | 7 ++-- lib/psci/psci_suspend.c | 22 ++++++------ lib/psci/psci_system_off.c | 10 +++--- lib/romlib/romlib.ld.S | 2 +- lib/semihosting/semihosting.c | 3 +- lib/stack_protector/stack_protector.c | 6 ++-- lib/utils/mem_region.c | 3 +- lib/xlat_tables/aarch32/xlat_tables.c | 13 +++++--- lib/xlat_tables/aarch64/xlat_tables.c | 19 ++++++----- lib/xlat_tables/xlat_tables_common.c | 19 ++++++----- lib/xlat_tables/xlat_tables_private.h | 5 +-- lib/xlat_tables_v2/aarch32/enable_mmu.S | 2 +- lib/xlat_tables_v2/aarch32/xlat_tables_arch.c | 15 +++++---- lib/xlat_tables_v2/aarch64/enable_mmu.S | 2 +- lib/xlat_tables_v2/aarch64/xlat_tables_arch.c | 12 ++++--- lib/xlat_tables_v2/xlat_tables_context.c | 8 +++-- lib/xlat_tables_v2/xlat_tables_core.c | 14 ++++---- lib/xlat_tables_v2/xlat_tables_private.h | 6 ++-- lib/xlat_tables_v2/xlat_tables_utils.c | 14 ++++---- lib/zlib/tf_gunzip.c | 5 +-- plat/allwinner/common/include/platform_def.h | 7 ++-- plat/allwinner/common/sunxi_bl31_setup.c | 20 ++++++----- plat/allwinner/common/sunxi_common.c | 13 +++++--- plat/allwinner/common/sunxi_cpu_ops.c | 17 ++++++---- plat/allwinner/common/sunxi_pm.c | 17 ++++++---- plat/allwinner/common/sunxi_security.c | 5 +-- plat/allwinner/common/sunxi_topology.c | 5 +-- plat/allwinner/sun50i_a64/sunxi_power.c | 14 +++++--- plat/allwinner/sun50i_h6/sunxi_power.c | 12 ++++--- 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 +++-- plat/common/aarch32/crash_console_helpers.S | 2 +- plat/common/aarch32/plat_common.c | 4 +-- plat/common/aarch32/plat_sp_min_common.c | 4 +-- plat/common/aarch64/crash_console_helpers.S | 2 +- plat/common/aarch64/plat_common.c | 11 +++--- plat/common/aarch64/platform_helpers.S | 2 +- plat/common/plat_bl1_common.c | 12 ++++--- plat/common/plat_bl_common.c | 13 ++++---- plat/common/plat_gicv2.c | 10 +++--- plat/common/plat_gicv3.c | 16 +++++---- plat/common/plat_log_common.c | 4 +-- plat/common/plat_psci_common.c | 9 ++--- plat/common/plat_spm_rd.c | 13 +++++--- plat/common/plat_spm_sp.c | 6 ++-- plat/common/tbbr/plat_tbbr.c | 9 ++--- plat/hisilicon/hikey/aarch64/hikey_common.c | 14 ++++---- plat/hisilicon/hikey/hikey_bl1_setup.c | 24 +++++++------ plat/hisilicon/hikey/hikey_bl2_mem_params_desc.c | 6 ++-- plat/hisilicon/hikey/hikey_bl2_setup.c | 34 ++++++++++--------- plat/hisilicon/hikey/hikey_bl31_setup.c | 21 +++++++----- plat/hisilicon/hikey/hikey_bl_common.c | 10 +++--- plat/hisilicon/hikey/hikey_ddr.c | 11 +++--- plat/hisilicon/hikey/hikey_image_load.c | 6 ++-- plat/hisilicon/hikey/hikey_io_storage.c | 27 ++++++++------- plat/hisilicon/hikey/hikey_pm.c | 16 +++++---- plat/hisilicon/hikey/hikey_private.h | 2 +- plat/hisilicon/hikey/hikey_security.c | 9 +++-- plat/hisilicon/hikey/hikey_tbbr.c | 2 +- plat/hisilicon/hikey/hikey_topology.c | 6 ++-- plat/hisilicon/hikey/hisi_dvfs.c | 19 ++++++----- plat/hisilicon/hikey/hisi_ipc.c | 15 +++++---- plat/hisilicon/hikey/hisi_mcu.c | 19 ++++++----- plat/hisilicon/hikey/hisi_pwrc.c | 15 +++++---- plat/hisilicon/hikey/hisi_sip_svc.c | 11 +++--- plat/hisilicon/hikey/include/hi6553.h | 3 +- plat/hisilicon/hikey/include/plat_macros.S | 4 +-- plat/hisilicon/hikey/include/platform_def.h | 7 ++-- plat/hisilicon/hikey/platform.mk | 1 - plat/hisilicon/hikey960/aarch64/hikey960_common.c | 14 ++++---- plat/hisilicon/hikey960/drivers/ipc/hisi_ipc.c | 14 ++++---- plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.c | 11 +++--- plat/hisilicon/hikey960/hikey960_bl1_setup.c | 34 ++++++++++--------- .../hikey960/hikey960_bl2_mem_params_desc.c | 6 ++-- plat/hisilicon/hikey960/hikey960_bl2_setup.c | 30 +++++++++-------- plat/hisilicon/hikey960/hikey960_bl31_setup.c | 30 +++++++++-------- plat/hisilicon/hikey960/hikey960_bl_common.c | 10 +++--- plat/hisilicon/hikey960/hikey960_boardid.c | 9 ++--- plat/hisilicon/hikey960/hikey960_def.h | 4 +-- plat/hisilicon/hikey960/hikey960_image_load.c | 6 ++-- plat/hisilicon/hikey960/hikey960_io_storage.c | 26 ++++++++------- plat/hisilicon/hikey960/hikey960_mcu_load.c | 14 ++++---- plat/hisilicon/hikey960/hikey960_pm.c | 20 ++++++----- plat/hisilicon/hikey960/hikey960_private.h | 2 +- plat/hisilicon/hikey960/hikey960_tbbr.c | 2 +- plat/hisilicon/hikey960/hikey960_topology.c | 6 ++-- plat/hisilicon/hikey960/include/plat_macros.S | 4 +-- plat/hisilicon/hikey960/include/platform_def.h | 3 +- plat/hisilicon/poplar/aarch64/platform_common.c | 16 +++++---- plat/hisilicon/poplar/bl1_plat_setup.c | 29 ++++++++-------- plat/hisilicon/poplar/bl2_plat_mem_params_desc.c | 6 ++-- plat/hisilicon/poplar/bl2_plat_setup.c | 26 ++++++++------- plat/hisilicon/poplar/bl31_plat_setup.c | 25 ++++++++------ plat/hisilicon/poplar/include/hi3798cv200.h | 2 +- plat/hisilicon/poplar/include/plat_private.h | 3 +- plat/hisilicon/poplar/include/platform_def.h | 11 +++--- plat/hisilicon/poplar/plat_pm.c | 19 ++++++----- plat/hisilicon/poplar/plat_storage.c | 32 +++++++++--------- plat/hisilicon/poplar/plat_topology.c | 6 ++-- plat/hisilicon/poplar/platform.mk | 4 +-- plat/hisilicon/poplar/poplar_gicv2.c | 5 +-- plat/hisilicon/poplar/poplar_image_load.c | 6 ++-- plat/imx/common/imx8_psci.c | 6 ++-- plat/imx/common/imx8_topology.c | 2 +- plat/imx/common/imx_aips.c | 5 +-- plat/imx/common/imx_caam.c | 5 ++- plat/imx/common/imx_clock.c | 7 ++-- plat/imx/common/imx_csu.c | 4 ++- plat/imx/common/imx_io_mux.c | 3 +- plat/imx/common/imx_snvs.c | 3 +- plat/imx/common/imx_wdog.c | 3 +- plat/imx/common/include/imx8_lpuart.h | 2 +- plat/imx/common/include/imx_snvs.h | 1 + plat/imx/common/include/imx_uart.h | 2 +- plat/imx/common/include/imx_wdog.h | 3 +- plat/imx/common/include/plat_imx8.h | 4 +-- plat/imx/common/include/sci/sci_rpc.h | 3 +- plat/imx/common/plat_imx8_gic.c | 14 ++++---- plat/imx/common/sci/imx8_mu.c | 3 +- plat/imx/common/sci/ipc.c | 6 ++-- plat/imx/common/sci/svc/pad/pad_rpc_clnt.c | 3 +- plat/imx/common/sci/svc/pm/pm_rpc_clnt.c | 4 ++- plat/imx/common/sci/svc/rm/rm_rpc_clnt.c | 4 ++- plat/imx/imx7/warp7/include/platform_def.h | 4 +-- plat/imx/imx7/warp7/warp7_bl2_el3_setup.c | 26 +++++++++------ plat/imx/imx7/warp7/warp7_bl2_mem_params_desc.c | 7 ++-- plat/imx/imx7/warp7/warp7_image_load.c | 6 ++-- plat/imx/imx7/warp7/warp7_io_storage.c | 17 ++++++---- plat/imx/imx8m/imx8mq/gpc.c | 14 ++++---- plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c | 25 ++++++++------ plat/imx/imx8m/imx8mq/imx8mq_psci.c | 10 +++--- plat/imx/imx8qm/imx8qm_bl31_setup.c | 25 ++++++++------ plat/imx/imx8qm/imx8qm_psci.c | 14 ++++---- plat/imx/imx8qm/include/platform_def.h | 2 +- plat/imx/imx8qx/imx8qx_bl31_setup.c | 25 ++++++++------ plat/imx/imx8qx/imx8qx_psci.c | 12 ++++--- plat/imx/imx8qx/include/platform_def.h | 2 +- plat/layerscape/board/ls1043/include/ls_def.h | 10 +++--- .../layerscape/board/ls1043/include/platform_def.h | 7 ++-- plat/layerscape/board/ls1043/ls1043_bl1_setup.c | 7 ++-- plat/layerscape/board/ls1043/ls1043_bl2_setup.c | 5 +-- plat/layerscape/board/ls1043/ls1043_bl31_setup.c | 5 +-- plat/layerscape/board/ls1043/ls1043_err.c | 5 +-- plat/layerscape/board/ls1043/ls1043_psci.c | 18 +++++----- .../board/ls1043/ls1043_stack_protector.c | 3 +- plat/layerscape/board/ls1043/ls1043_topology.c | 4 ++- plat/layerscape/board/ls1043/ls_gic.c | 9 +++-- plat/layerscape/board/ls1043/platform.mk | 4 +-- .../common/aarch64/ls_bl2_mem_params_desc.c | 10 +++--- plat/layerscape/common/aarch64/ls_helpers.S | 2 +- plat/layerscape/common/include/ls_16550.h | 2 +- plat/layerscape/common/include/plat_ls.h | 3 +- plat/layerscape/common/ls_bl1_setup.c | 3 +- plat/layerscape/common/ls_bl2_setup.c | 6 ++-- plat/layerscape/common/ls_bl31_setup.c | 11 +++--- plat/layerscape/common/ls_common.c | 13 +++++--- plat/layerscape/common/ls_image_load.c | 3 +- plat/layerscape/common/ls_io_storage.c | 17 ++++++---- plat/layerscape/common/ls_timer.c | 4 +-- plat/layerscape/common/ls_tzc380.c | 9 +++-- plat/layerscape/common/ns_access.c | 9 +++-- plat/layerscape/common/tsp/ls_tsp_setup.c | 6 ++-- plat/marvell/a3700/a3700/board/pm_src.c | 1 + plat/marvell/a3700/a3700/plat_bl31_setup.c | 3 +- plat/marvell/a3700/common/a3700_common.mk | 4 +-- plat/marvell/a3700/common/a3700_sip_svc.c | 8 +++-- plat/marvell/a3700/common/dram_win.c | 6 ++-- plat/marvell/a3700/common/include/dram_win.h | 3 +- plat/marvell/a3700/common/include/platform_def.h | 5 +-- plat/marvell/a3700/common/io_addr_dec.c | 6 ++-- plat/marvell/a3700/common/marvell_plat_config.c | 3 +- plat/marvell/a3700/common/plat_pm.c | 15 +++++---- plat/marvell/a8k/a70x0/board/dram_port.c | 3 +- plat/marvell/a8k/a70x0_amc/board/dram_port.c | 3 +- plat/marvell/a8k/a80x0/board/dram_port.c | 7 ++-- plat/marvell/a8k/a80x0_mcbin/board/dram_port.c | 7 ++-- .../a8k/a80x0_mcbin/board/marvell_plat_config.c | 5 +-- plat/marvell/a8k/common/a8k_common.mk | 2 -- plat/marvell/a8k/common/aarch64/plat_arch_config.c | 9 +++-- plat/marvell/a8k/common/ble/ble.mk | 2 +- plat/marvell/a8k/common/ble/ble_main.c | 11 +++--- plat/marvell/a8k/common/include/platform_def.h | 10 +++--- plat/marvell/a8k/common/mss/mss_bl2_setup.c | 14 ++++---- plat/marvell/a8k/common/mss/mss_pm_ipc.c | 7 ++-- plat/marvell/a8k/common/plat_bl1_setup.c | 3 +- plat/marvell/a8k/common/plat_bl31_setup.c | 12 +++---- plat/marvell/a8k/common/plat_ble_setup.c | 15 +++++---- plat/marvell/a8k/common/plat_pm.c | 20 ++++++----- plat/marvell/a8k/common/plat_pm_trace.c | 5 +-- plat/marvell/a8k/common/plat_thermal.c | 9 ++--- .../common/aarch64/marvell_bl2_mem_params_desc.c | 8 ++--- plat/marvell/common/aarch64/marvell_common.c | 14 ++++---- plat/marvell/common/aarch64/marvell_helpers.S | 8 ++--- plat/marvell/common/marvell_bl1_setup.c | 16 +++++---- plat/marvell/common/marvell_bl2_setup.c | 19 ++++++----- plat/marvell/common/marvell_bl31_setup.c | 17 +++++----- plat/marvell/common/marvell_cci.c | 3 +- plat/marvell/common/marvell_console.c | 13 +++++--- plat/marvell/common/marvell_ddr_info.c | 6 ++-- plat/marvell/common/marvell_gicv2.c | 16 +++++---- plat/marvell/common/marvell_gicv3.c | 12 ++++--- plat/marvell/common/marvell_image_load.c | 7 ++-- plat/marvell/common/marvell_io_storage.c | 18 +++++----- plat/marvell/common/marvell_pm.c | 6 ++-- plat/marvell/common/mrvl_sip_svc.c | 12 ++++--- plat/marvell/common/mss/mss_ipc_drv.c | 8 +++-- plat/marvell/common/mss/mss_ipc_drv.h | 2 +- plat/marvell/common/mss/mss_scp_bootloader.c | 10 +++--- plat/marvell/common/plat_delay_timer.c | 3 +- plat/mediatek/common/custom/oem_svc.c | 15 +++++---- plat/mediatek/common/mtk_plat_common.c | 16 +++++---- plat/mediatek/common/mtk_plat_common.h | 5 +-- plat/mediatek/common/mtk_sip_svc.c | 13 +++++--- plat/mediatek/mt6795/bl31.ld.S | 2 +- plat/mediatek/mt6795/bl31_plat_setup.c | 29 ++++++++-------- plat/mediatek/mt6795/drivers/timer/mt_cpuxgpt.c | 10 +++--- plat/mediatek/mt6795/include/mcucfg.h | 3 +- plat/mediatek/mt6795/include/plat_macros.S | 2 +- plat/mediatek/mt6795/include/plat_private.h | 3 +- plat/mediatek/mt6795/include/platform_def.h | 2 +- plat/mediatek/mt6795/plat_delay_timer.c | 5 +-- plat/mediatek/mt6795/plat_mt_gic.c | 7 ++-- plat/mediatek/mt6795/plat_pm.c | 19 ++++++----- plat/mediatek/mt6795/plat_topology.c | 5 +-- plat/mediatek/mt6795/power_tracer.c | 3 +- plat/mediatek/mt6795/scu.c | 3 +- plat/mediatek/mt8173/aarch64/platform_common.c | 15 +++++---- plat/mediatek/mt8173/bl31_plat_setup.c | 17 ++++++---- plat/mediatek/mt8173/drivers/crypt/crypt.c | 11 +++--- plat/mediatek/mt8173/drivers/mtcmos/mtcmos.c | 7 ++-- plat/mediatek/mt8173/drivers/pmic/pmic_wrap_init.c | 8 +++-- plat/mediatek/mt8173/drivers/rtc/rtc.c | 7 ++-- plat/mediatek/mt8173/drivers/spm/spm.c | 8 +++-- plat/mediatek/mt8173/drivers/spm/spm_hotplug.c | 6 ++-- plat/mediatek/mt8173/drivers/spm/spm_mcdi.c | 11 +++--- plat/mediatek/mt8173/drivers/spm/spm_suspend.c | 10 +++--- plat/mediatek/mt8173/drivers/timer/mt_cpuxgpt.c | 4 ++- plat/mediatek/mt8173/include/mcucfg.h | 3 +- plat/mediatek/mt8173/include/plat_macros.S | 6 ++-- plat/mediatek/mt8173/include/platform_def.h | 7 ++-- plat/mediatek/mt8173/plat_mt_gic.c | 5 +-- plat/mediatek/mt8173/plat_pm.c | 18 +++++----- plat/mediatek/mt8173/plat_sip_calls.c | 8 +++-- plat/mediatek/mt8173/plat_topology.c | 5 +-- plat/mediatek/mt8173/power_tracer.c | 3 +- plat/mediatek/mt8173/scu.c | 3 +- plat/meson/gxbb/gxbb_bl31_setup.c | 12 ++++--- plat/meson/gxbb/gxbb_common.c | 18 +++++----- plat/meson/gxbb/gxbb_def.h | 2 +- plat/meson/gxbb/gxbb_mhu.c | 5 +-- plat/meson/gxbb/gxbb_pm.c | 16 +++++---- plat/meson/gxbb/gxbb_scpi.c | 8 +++-- plat/meson/gxbb/gxbb_sip_svc.c | 10 +++--- plat/meson/gxbb/gxbb_topology.c | 6 ++-- plat/meson/gxbb/include/plat_macros.S | 2 +- plat/meson/gxbb/include/platform_def.h | 2 +- plat/meson/gxbb/platform.mk | 3 +- .../tegra/common/drivers/flowctrl/flowctrl.c | 10 +++--- .../tegra/common/drivers/memctrl/memctrl_v1.c | 14 ++++---- .../tegra/common/drivers/memctrl/memctrl_v2.c | 16 +++++---- plat/nvidia/tegra/common/drivers/pmc/pmc.c | 8 +++-- plat/nvidia/tegra/common/drivers/smmu/smmu.c | 9 +++-- plat/nvidia/tegra/common/tegra_bl31_setup.c | 29 ++++++++-------- plat/nvidia/tegra/common/tegra_delay_timer.c | 5 +-- plat/nvidia/tegra/common/tegra_fiq_glue.c | 16 +++++---- plat/nvidia/tegra/common/tegra_gicv2.c | 9 +++-- plat/nvidia/tegra/common/tegra_platform.c | 3 +- plat/nvidia/tegra/common/tegra_pm.c | 21 +++++++----- plat/nvidia/tegra/common/tegra_sip_calls.c | 14 ++++---- plat/nvidia/tegra/common/tegra_topology.c | 5 +-- plat/nvidia/tegra/include/drivers/flowctrl.h | 3 +- plat/nvidia/tegra/include/drivers/mce.h | 3 +- plat/nvidia/tegra/include/drivers/memctrl_v1.h | 3 +- plat/nvidia/tegra/include/drivers/memctrl_v2.h | 2 +- plat/nvidia/tegra/include/drivers/pmc.h | 5 +-- plat/nvidia/tegra/include/drivers/smmu.h | 3 +- plat/nvidia/tegra/include/drivers/tegra_gic.h | 2 +- plat/nvidia/tegra/include/platform_def.h | 5 +-- plat/nvidia/tegra/include/t132/tegra_def.h | 2 +- plat/nvidia/tegra/include/t186/tegra_def.h | 2 +- plat/nvidia/tegra/include/t210/tegra_def.h | 2 +- plat/nvidia/tegra/include/tegra_private.h | 8 +++-- plat/nvidia/tegra/soc/t132/plat_psci_handlers.c | 15 +++++---- plat/nvidia/tegra/soc/t132/plat_secondary.c | 12 ++++--- plat/nvidia/tegra/soc/t132/plat_setup.c | 5 +-- plat/nvidia/tegra/soc/t132/plat_sip_calls.c | 12 ++++--- .../tegra/soc/t186/drivers/include/mce_private.h | 3 +- plat/nvidia/tegra/soc/t186/drivers/mce/ari.c | 14 ++++---- plat/nvidia/tegra/soc/t186/drivers/mce/mce.c | 16 +++++---- plat/nvidia/tegra/soc/t186/drivers/mce/nvg.c | 8 +++-- plat/nvidia/tegra/soc/t186/plat_memctrl.c | 3 +- plat/nvidia/tegra/soc/t186/plat_psci_handlers.c | 16 +++++---- plat/nvidia/tegra/soc/t186/plat_secondary.c | 8 +++-- plat/nvidia/tegra/soc/t186/plat_setup.c | 26 ++++++++------- plat/nvidia/tegra/soc/t186/plat_sip_calls.c | 14 ++++---- plat/nvidia/tegra/soc/t186/plat_smmu.c | 3 +- plat/nvidia/tegra/soc/t186/plat_trampoline.S | 2 +- plat/nvidia/tegra/soc/t210/plat_psci_handlers.c | 17 ++++++---- plat/nvidia/tegra/soc/t210/plat_secondary.c | 5 +-- plat/nvidia/tegra/soc/t210/plat_setup.c | 7 ++-- plat/qemu/dt.c | 12 ++++--- plat/qemu/include/platform_def.h | 6 ++-- plat/qemu/qemu_bl1_setup.c | 9 +++-- plat/qemu/qemu_bl2_mem_params_desc.c | 5 +-- plat/qemu/qemu_bl2_setup.c | 21 +++++++----- plat/qemu/qemu_bl31_setup.c | 11 +++--- plat/qemu/qemu_common.c | 7 ++-- plat/qemu/qemu_console.c | 6 ++-- plat/qemu/qemu_image_load.c | 2 +- plat/qemu/qemu_io_storage.c | 22 ++++++------ plat/qemu/qemu_pm.c | 12 ++++--- plat/qemu/qemu_stack_protector.c | 5 +-- plat/qemu/qemu_trusted_boot.c | 2 +- plat/qemu/sp_min/sp_min_setup.c | 23 +++++++------ plat/qemu/topology.c | 7 ++-- plat/renesas/rcar/aarch64/plat_helpers.S | 5 +-- plat/renesas/rcar/aarch64/platform_common.c | 20 ++++++----- plat/renesas/rcar/bl2_cpg_init.c | 5 +-- plat/renesas/rcar/bl2_interrupt_error.c | 11 +++--- plat/renesas/rcar/bl2_plat_mem_params_desc.c | 9 ++--- plat/renesas/rcar/bl2_plat_setup.c | 23 +++++++------ plat/renesas/rcar/bl2_secure_setting.c | 5 +-- plat/renesas/rcar/bl31_plat_setup.c | 18 +++++----- plat/renesas/rcar/include/plat.ld.S | 2 +- plat/renesas/rcar/include/plat_macros.S | 7 ++-- plat/renesas/rcar/include/platform_def.h | 4 ++- plat/renesas/rcar/include/rcar_def.h | 4 +-- plat/renesas/rcar/include/rcar_private.h | 7 ++-- plat/renesas/rcar/plat_image_load.c | 6 ++-- plat/renesas/rcar/plat_pm.c | 20 ++++++----- plat/renesas/rcar/plat_storage.c | 13 +++++--- plat/renesas/rcar/plat_topology.c | 5 +-- plat/rockchip/common/aarch64/plat_helpers.S | 5 +-- plat/rockchip/common/aarch64/platform_common.c | 17 ++++++---- plat/rockchip/common/bl31_plat_setup.c | 20 ++++++----- .../common/drivers/parameter/ddr_parameter.c | 16 +++++---- .../common/drivers/parameter/ddr_parameter.h | 15 +++++---- plat/rockchip/common/include/plat_macros.S | 8 ++--- plat/rockchip/common/include/plat_private.h | 8 +++-- plat/rockchip/common/params_setup.c | 18 +++++----- plat/rockchip/common/plat_pm.c | 15 +++++---- plat/rockchip/common/plat_topology.c | 6 ++-- plat/rockchip/common/rockchip_gicv2.c | 9 ++--- plat/rockchip/common/rockchip_gicv3.c | 11 +++--- plat/rockchip/common/rockchip_sip_svc.c | 10 +++--- plat/rockchip/rk3328/drivers/pmu/pmu.c | 21 +++++++----- plat/rockchip/rk3328/drivers/soc/soc.c | 12 ++++--- plat/rockchip/rk3328/include/platform_def.h | 3 +- plat/rockchip/rk3368/drivers/ddr/ddr_rk3368.c | 13 +++++--- plat/rockchip/rk3368/drivers/pmu/pmu.c | 17 ++++++---- plat/rockchip/rk3368/drivers/soc/soc.c | 8 +++-- plat/rockchip/rk3368/include/platform_def.h | 5 +-- plat/rockchip/rk3368/plat_sip_calls.c | 7 ++-- plat/rockchip/rk3399/drivers/dp/cdn_dp.c | 6 ++-- plat/rockchip/rk3399/drivers/dram/dfs.c | 7 ++-- plat/rockchip/rk3399/drivers/dram/dram.h | 3 +- .../rk3399/drivers/dram/dram_spec_timing.c | 7 ++-- plat/rockchip/rk3399/drivers/dram/suspend.c | 6 ++-- plat/rockchip/rk3399/drivers/gpio/rk3399_gpio.c | 16 +++++---- plat/rockchip/rk3399/drivers/pmu/m0_ctl.c | 10 +++--- plat/rockchip/rk3399/drivers/pmu/pmu.c | 27 ++++++++------- plat/rockchip/rk3399/drivers/secure/secure.c | 8 +++-- plat/rockchip/rk3399/drivers/soc/soc.c | 13 +++++--- plat/rockchip/rk3399/drivers/soc/soc.h | 2 +- plat/rockchip/rk3399/include/plat.ld.S | 2 +- plat/rockchip/rk3399/include/platform_def.h | 5 +-- plat/rockchip/rk3399/plat_sip_calls.c | 7 ++-- plat/rpi3/aarch64/rpi3_bl2_mem_params_desc.c | 7 ++-- plat/rpi3/include/platform_def.h | 6 ++-- plat/rpi3/rpi3_bl1_setup.c | 11 +++--- plat/rpi3/rpi3_bl2_setup.c | 16 +++++---- plat/rpi3/rpi3_bl31_setup.c | 11 +++--- plat/rpi3/rpi3_common.c | 16 +++++---- plat/rpi3/rpi3_hw.h | 2 +- plat/rpi3/rpi3_image_load.c | 7 ++-- plat/rpi3/rpi3_io_storage.c | 16 +++++---- plat/rpi3/rpi3_mbox.c | 8 +++-- plat/rpi3/rpi3_pm.c | 14 ++++---- plat/rpi3/rpi3_rng.c | 3 +- plat/rpi3/rpi3_stack_protector.c | 3 +- plat/rpi3/rpi3_topology.c | 6 ++-- plat/rpi3/rpi3_trusted_boot.c | 2 +- plat/socionext/synquacer/drivers/mhu/sq_mhu.c | 9 +++-- plat/socionext/synquacer/drivers/scpi/sq_scpi.c | 9 +++-- plat/socionext/synquacer/include/platform_def.h | 4 +-- plat/socionext/synquacer/include/sq_common.h | 3 +- plat/socionext/synquacer/sq_bl31_setup.c | 15 +++++---- plat/socionext/synquacer/sq_ccn.c | 5 +-- plat/socionext/synquacer/sq_gicv3.c | 8 +++-- plat/socionext/synquacer/sq_psci.c | 15 +++++---- plat/socionext/synquacer/sq_topology.c | 4 ++- plat/socionext/synquacer/sq_xlat_setup.c | 5 +-- plat/socionext/uniphier/include/platform_def.h | 6 ++-- plat/socionext/uniphier/tsp/uniphier_tsp_setup.c | 3 +- plat/socionext/uniphier/uniphier_bl2_setup.c | 16 +++++---- plat/socionext/uniphier/uniphier_bl31_setup.c | 16 +++++---- plat/socionext/uniphier/uniphier_boot_device.c | 5 +-- plat/socionext/uniphier/uniphier_cci.c | 7 ++-- plat/socionext/uniphier/uniphier_emmc.c | 12 ++++--- plat/socionext/uniphier/uniphier_gicv3.c | 8 +++-- plat/socionext/uniphier/uniphier_image_desc.c | 6 ++-- plat/socionext/uniphier/uniphier_io_storage.c | 18 +++++----- plat/socionext/uniphier/uniphier_nand.c | 14 ++++---- plat/socionext/uniphier/uniphier_psci.c | 6 ++-- plat/socionext/uniphier/uniphier_scp.c | 4 +-- plat/socionext/uniphier/uniphier_soc_info.c | 2 +- plat/socionext/uniphier/uniphier_syscnt.c | 2 +- plat/socionext/uniphier/uniphier_tbbr.c | 2 +- plat/socionext/uniphier/uniphier_topology.c | 2 +- plat/socionext/uniphier/uniphier_usb.c | 12 ++++--- plat/socionext/uniphier/uniphier_xlat_setup.c | 5 +-- plat/st/stm32mp1/bl2_io_storage.c | 37 ++++++++++---------- plat/st/stm32mp1/bl2_plat_setup.c | 39 ++++++++++++---------- plat/st/stm32mp1/include/platform_def.h | 7 ++-- plat/st/stm32mp1/plat_bl2_mem_params_desc.c | 7 ++-- plat/st/stm32mp1/plat_image_load.c | 4 +-- plat/st/stm32mp1/platform.mk | 3 +- plat/st/stm32mp1/sp_min/sp_min_setup.c | 29 ++++++++-------- plat/st/stm32mp1/stm32mp1.ld.S | 2 +- plat/st/stm32mp1/stm32mp1_common.c | 17 ++++++---- plat/st/stm32mp1/stm32mp1_context.c | 9 +++-- plat/st/stm32mp1/stm32mp1_def.h | 6 ++-- plat/st/stm32mp1/stm32mp1_dt.c | 16 +++++---- plat/st/stm32mp1/stm32mp1_gic.c | 9 ++--- plat/st/stm32mp1/stm32mp1_helper.S | 9 ++--- plat/st/stm32mp1/stm32mp1_pm.c | 25 ++++++++------ plat/st/stm32mp1/stm32mp1_security.c | 17 ++++++---- plat/st/stm32mp1/stm32mp1_stack_protector.c | 5 +-- plat/st/stm32mp1/stm32mp1_topology.c | 5 +-- plat/ti/k3/board/generic/include/board_def.h | 2 +- plat/ti/k3/common/drivers/sec_proxy/sec_proxy.c | 14 ++++---- plat/ti/k3/common/drivers/ti_sci/ti_sci.c | 5 +-- plat/ti/k3/common/k3_bl31_setup.c | 15 +++++---- plat/ti/k3/common/k3_console.c | 8 +++-- plat/ti/k3/common/k3_gicv3.c | 14 ++++---- plat/ti/k3/common/k3_psci.c | 18 +++++----- plat/ti/k3/common/k3_topology.c | 3 +- plat/ti/k3/include/platform_def.h | 3 +- plat/xilinx/versal/aarch64/versal_common.c | 11 +++--- plat/xilinx/versal/aarch64/versal_helpers.S | 2 +- plat/xilinx/versal/bl31_versal_setup.c | 16 +++++---- plat/xilinx/versal/include/plat_macros.S | 7 ++-- plat/xilinx/versal/include/platform_def.h | 1 + plat/xilinx/versal/plat_psci.c | 9 ++--- plat/xilinx/versal/plat_versal.c | 4 ++- plat/xilinx/versal/sip_svc_setup.c | 6 ++-- plat/xilinx/versal/versal_def.h | 2 +- plat/xilinx/versal/versal_gicv3.c | 10 +++--- plat/xilinx/versal/versal_private.h | 2 +- plat/xilinx/zynqmp/aarch64/zynqmp_common.c | 12 ++++--- plat/xilinx/zynqmp/aarch64/zynqmp_helpers.S | 2 +- plat/xilinx/zynqmp/bl31_zynqmp_setup.c | 12 ++++--- plat/xilinx/zynqmp/include/platform_def.h | 7 ++-- .../zynqmp/ipi_mailbox_service/ipi_mailbox_svc.c | 10 +++--- plat/xilinx/zynqmp/plat_psci.c | 14 ++++---- plat/xilinx/zynqmp/plat_startup.c | 8 +++-- plat/xilinx/zynqmp/plat_zynqmp.c | 3 +- plat/xilinx/zynqmp/pm_service/pm_api_clock.c | 8 +++-- plat/xilinx/zynqmp/pm_service/pm_api_clock.h | 3 +- plat/xilinx/zynqmp/pm_service/pm_api_ioctl.c | 7 ++-- plat/xilinx/zynqmp/pm_service/pm_api_pinctrl.c | 6 ++-- plat/xilinx/zynqmp/pm_service/pm_api_sys.c | 3 +- plat/xilinx/zynqmp/pm_service/pm_api_sys.h | 1 + plat/xilinx/zynqmp/pm_service/pm_client.c | 14 ++++---- plat/xilinx/zynqmp/pm_service/pm_common.h | 4 ++- plat/xilinx/zynqmp/pm_service/pm_ipi.c | 7 ++-- plat/xilinx/zynqmp/pm_service/pm_svc_main.c | 18 +++++----- plat/xilinx/zynqmp/sip_svc_setup.c | 5 +-- plat/xilinx/zynqmp/tsp/tsp_plat_setup.c | 8 +++-- plat/xilinx/zynqmp/zynqmp_def.h | 2 +- plat/xilinx/zynqmp/zynqmp_ipi.c | 10 +++--- plat/xilinx/zynqmp/zynqmp_private.h | 5 +-- services/arm_arch_svc/arm_arch_svc_setup.c | 14 ++++---- services/spd/opteed/opteed_common.c | 10 +++--- services/spd/opteed/opteed_main.c | 19 ++++++----- services/spd/opteed/opteed_pm.c | 12 ++++--- services/spd/opteed/opteed_private.h | 10 +++--- services/spd/opteed/teesmc_opteed_macros.h | 2 +- services/spd/tlkd/tlkd_common.c | 8 +++-- services/spd/tlkd/tlkd_main.c | 16 +++++---- services/spd/tlkd/tlkd_pm.c | 11 +++--- services/spd/tlkd/tlkd_private.h | 10 +++--- services/spd/trusty/generic-arm64-smcall.c | 5 +-- services/spd/trusty/trusty.c | 19 ++++++----- services/spd/tspd/tspd_common.c | 14 ++++---- services/spd/tspd/tspd_main.c | 22 ++++++------ services/spd/tspd/tspd_pm.c | 14 ++++---- services/spd/tspd/tspd_private.h | 10 +++--- services/std_svc/sdei/sdei_event.c | 4 ++- services/std_svc/sdei/sdei_intr_mgmt.c | 18 +++++----- services/std_svc/sdei/sdei_main.c | 26 ++++++++------- services/std_svc/sdei/sdei_private.h | 21 ++++++------ services/std_svc/sdei/sdei_state.c | 4 ++- services/std_svc/spm/aarch64/spm_shim_exceptions.S | 2 +- services/std_svc/spm/spci.c | 17 +++++----- services/std_svc/spm/spm_buffers.c | 4 +-- services/std_svc/spm/spm_main.c | 29 ++++++++-------- services/std_svc/spm/spm_private.h | 7 ++-- services/std_svc/spm/spm_setup.c | 20 ++++++----- services/std_svc/spm/spm_shim_private.h | 3 +- services/std_svc/spm/spm_xlat.c | 16 +++++---- services/std_svc/spm/sprt.c | 15 +++++---- .../spm_deprecated/aarch64/spm_shim_exceptions.S | 2 +- services/std_svc/spm_deprecated/spm_main.c | 27 +++++++-------- services/std_svc/spm_deprecated/spm_private.h | 5 +-- services/std_svc/spm_deprecated/spm_setup.c | 17 +++++----- services/std_svc/spm_deprecated/spm_shim_private.h | 3 +- services/std_svc/spm_deprecated/spm_xlat.c | 8 ++--- services/std_svc/std_svc_setup.c | 23 +++++++------ 995 files changed, 4743 insertions(+), 3501 deletions(-) diff --git a/Makefile b/Makefile index 6b5b0803ef..742a3ffc8f 100644 --- a/Makefile +++ b/Makefile @@ -271,11 +271,16 @@ endif INCLUDES += -Iinclude \ -Iinclude/arch/${ARCH} \ - -Iinclude/bl1 \ + -Iinclude/lib/cpus/${ARCH} \ + -Iinclude/lib/el3_runtime/${ARCH} \ + ${PLAT_INCLUDES} \ + ${SPD_INCLUDES} + +ifeq (${ERROR_DEPRECATED},0) +INCLUDES += -Iinclude/bl1 \ -Iinclude/bl2 \ -Iinclude/bl2u \ -Iinclude/bl31 \ - -Iinclude/common \ -Iinclude/drivers \ -Iinclude/drivers/arm \ -Iinclude/drivers/auth \ @@ -283,18 +288,15 @@ INCLUDES += -Iinclude \ -Iinclude/drivers/ti/uart \ -Iinclude/lib \ -Iinclude/lib/cpus \ - -Iinclude/lib/cpus/${ARCH} \ -Iinclude/lib/el3_runtime \ - -Iinclude/lib/el3_runtime/${ARCH} \ -Iinclude/lib/extensions \ -Iinclude/lib/pmf \ -Iinclude/lib/psci \ -Iinclude/lib/xlat_tables \ -Iinclude/plat/common \ -Iinclude/services \ - ${PLAT_INCLUDES} \ - ${SPD_INCLUDES} \ -Iinclude/tools_share +endif include common/backtrace/backtrace.mk diff --git a/bl1/aarch32/bl1_context_mgmt.c b/bl1/aarch32/bl1_context_mgmt.c index d1fd3ca00b..005d046cc1 100644 --- a/bl1/aarch32/bl1_context_mgmt.c +++ b/bl1/aarch32/bl1_context_mgmt.c @@ -4,13 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include + +#include #include -#include -#include -#include +#include +#include +#include #include + #include "../bl1_private.h" /* diff --git a/bl1/aarch32/bl1_entrypoint.S b/bl1/aarch32/bl1_entrypoint.S index 16b26b9f29..3f0cbaf4be 100644 --- a/bl1/aarch32/bl1_entrypoint.S +++ b/bl1/aarch32/bl1_entrypoint.S @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include diff --git a/bl1/aarch32/bl1_exceptions.S b/bl1/aarch32/bl1_exceptions.S index 9b001a96f7..6728278f84 100644 --- a/bl1/aarch32/bl1_exceptions.S +++ b/bl1/aarch32/bl1_exceptions.S @@ -6,12 +6,12 @@ #include #include -#include -#include +#include +#include #include +#include #include #include -#include .globl bl1_aarch32_smc_handler diff --git a/bl1/aarch64/bl1_context_mgmt.c b/bl1/aarch64/bl1_context_mgmt.c index 9bfb3094b5..0326319057 100644 --- a/bl1/aarch64/bl1_context_mgmt.c +++ b/bl1/aarch64/bl1_context_mgmt.c @@ -4,12 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include + +#include #include -#include -#include -#include +#include +#include +#include + #include "../bl1_private.h" /* diff --git a/bl1/aarch64/bl1_exceptions.S b/bl1/aarch64/bl1_exceptions.S index cf8a6a79df..19a0ac27a7 100644 --- a/bl1/aarch64/bl1_exceptions.S +++ b/bl1/aarch64/bl1_exceptions.S @@ -6,8 +6,8 @@ #include #include -#include -#include +#include +#include #include /* ----------------------------------------------------------------------------- diff --git a/bl1/bl1.ld.S b/bl1/bl1.ld.S index fabe3ef66a..c4f6b99fc5 100644 --- a/bl1/bl1.ld.S +++ b/bl1/bl1.ld.S @@ -5,7 +5,8 @@ */ #include -#include + +#include OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT) OUTPUT_ARCH(PLATFORM_LINKER_ARCH) diff --git a/bl1/bl1_fwu.c b/bl1/bl1_fwu.c index 0fbdf515e0..57a86aea8e 100644 --- a/bl1/bl1_fwu.c +++ b/bl1/bl1_fwu.c @@ -4,20 +4,23 @@ * 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 + #include "bl1_private.h" /* diff --git a/bl1/bl1_main.c b/bl1/bl1_main.c index ca4369553f..d2c2b41735 100644 --- a/bl1/bl1_main.c +++ b/bl1/bl1_main.c @@ -4,20 +4,23 @@ * 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 +#include + #include "bl1_private.h" /* BL1 Service UUID */ diff --git a/bl1/bl1_private.h b/bl1/bl1_private.h index ed815853f5..bdbf80f32d 100644 --- a/bl1/bl1_private.h +++ b/bl1/bl1_private.h @@ -8,7 +8,8 @@ #define BL1_PRIVATE_H #include -#include + +#include /******************************************************************************* * Declarations of linker defined symbols which will tell us where BL1 lives diff --git a/bl1/tbbr/tbbr_img_desc.c b/bl1/tbbr/tbbr_img_desc.c index 2581d90dfa..e8df73d471 100644 --- a/bl1/tbbr/tbbr_img_desc.c +++ b/bl1/tbbr/tbbr_img_desc.c @@ -4,10 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include -#include + +#include +#include +#include image_desc_t bl1_tbbr_image_descs[] = { { diff --git a/bl2/aarch32/bl2_el3_entrypoint.S b/bl2/aarch32/bl2_el3_entrypoint.S index 0c7b064555..cc846ddf12 100644 --- a/bl2/aarch32/bl2_el3_entrypoint.S +++ b/bl2/aarch32/bl2_el3_entrypoint.S @@ -6,10 +6,9 @@ #include #include -#include +#include #include - .globl bl2_entrypoint .globl bl2_run_next_image diff --git a/bl2/aarch32/bl2_el3_exceptions.S b/bl2/aarch32/bl2_el3_exceptions.S index 11ddf371fe..087b6656dc 100644 --- a/bl2/aarch32/bl2_el3_exceptions.S +++ b/bl2/aarch32/bl2_el3_exceptions.S @@ -6,7 +6,7 @@ #include #include -#include +#include .globl bl2_vector_table diff --git a/bl2/aarch32/bl2_entrypoint.S b/bl2/aarch32/bl2_entrypoint.S index d215f484b7..e7b98af32f 100644 --- a/bl2/aarch32/bl2_entrypoint.S +++ b/bl2/aarch32/bl2_entrypoint.S @@ -6,8 +6,7 @@ #include #include -#include - +#include .globl bl2_vector_table .globl bl2_entrypoint diff --git a/bl2/aarch64/bl2_el3_entrypoint.S b/bl2/aarch64/bl2_el3_entrypoint.S index 2d3efd1fca..16b7c0d5f1 100644 --- a/bl2/aarch64/bl2_el3_entrypoint.S +++ b/bl2/aarch64/bl2_el3_entrypoint.S @@ -6,7 +6,7 @@ #include #include -#include +#include #include .globl bl2_entrypoint diff --git a/bl2/aarch64/bl2_el3_exceptions.S b/bl2/aarch64/bl2_el3_exceptions.S index 07d1040626..3d580513e6 100644 --- a/bl2/aarch64/bl2_el3_exceptions.S +++ b/bl2/aarch64/bl2_el3_exceptions.S @@ -6,8 +6,8 @@ #include #include -#include -#include +#include +#include #include /* ----------------------------------------------------------------------------- diff --git a/bl2/aarch64/bl2_entrypoint.S b/bl2/aarch64/bl2_entrypoint.S index 30a5c599a6..d938947c1c 100644 --- a/bl2/aarch64/bl2_entrypoint.S +++ b/bl2/aarch64/bl2_entrypoint.S @@ -6,7 +6,7 @@ #include #include -#include +#include .globl bl2_entrypoint diff --git a/bl2/bl2.ld.S b/bl2/bl2.ld.S index 6d26cdb226..30cdf7d78a 100644 --- a/bl2/bl2.ld.S +++ b/bl2/bl2.ld.S @@ -5,7 +5,8 @@ */ #include -#include + +#include OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT) OUTPUT_ARCH(PLATFORM_LINKER_ARCH) diff --git a/bl2/bl2_el3.ld.S b/bl2/bl2_el3.ld.S index 82ab427d17..af93a0ce9f 100644 --- a/bl2/bl2_el3.ld.S +++ b/bl2/bl2_el3.ld.S @@ -5,7 +5,8 @@ */ #include -#include + +#include OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT) OUTPUT_ARCH(PLATFORM_LINKER_ARCH) diff --git a/bl2/bl2_image_load_v2.c b/bl2/bl2_image_load_v2.c index 0f40785d4c..dd53e1d2b4 100644 --- a/bl2/bl2_image_load_v2.c +++ b/bl2/bl2_image_load_v2.c @@ -4,18 +4,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include -#include -#include -#include -#include -#include -#include #include -#include "bl2_private.h" +#include + +#include +#include +#include +#include +#include +#include +#include + +#include "bl2_private.h" /******************************************************************************* * This function loads SCP_BL2/BL3x images and returns the ep_info for diff --git a/bl2/bl2_main.c b/bl2/bl2_main.c index 101eb33d07..019088dc12 100644 --- a/bl2/bl2_main.c +++ b/bl2/bl2_main.c @@ -5,13 +5,14 @@ */ #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include + #include "bl2_private.h" #ifdef AARCH32 diff --git a/bl2u/aarch32/bl2u_entrypoint.S b/bl2u/aarch32/bl2u_entrypoint.S index 7fb64f3e4e..67566df899 100644 --- a/bl2u/aarch32/bl2u_entrypoint.S +++ b/bl2u/aarch32/bl2u_entrypoint.S @@ -6,8 +6,7 @@ #include #include -#include - +#include .globl bl2u_vector_table .globl bl2u_entrypoint diff --git a/bl2u/aarch64/bl2u_entrypoint.S b/bl2u/aarch64/bl2u_entrypoint.S index 8b9c2a6493..591f5f6065 100644 --- a/bl2u/aarch64/bl2u_entrypoint.S +++ b/bl2u/aarch64/bl2u_entrypoint.S @@ -6,8 +6,7 @@ #include #include -#include - +#include .globl bl2u_entrypoint diff --git a/bl2u/bl2u.ld.S b/bl2u/bl2u.ld.S index 3db5f89466..8d4984fbf8 100644 --- a/bl2u/bl2u.ld.S +++ b/bl2u/bl2u.ld.S @@ -5,7 +5,8 @@ */ #include -#include + +#include OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT) OUTPUT_ARCH(PLATFORM_LINKER_ARCH) diff --git a/bl2u/bl2u_main.c b/bl2u/bl2u_main.c index b29d57e9db..d3c83ccc56 100644 --- a/bl2u/bl2u_main.c +++ b/bl2u/bl2u_main.c @@ -4,19 +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 +#include +#include /******************************************************************************* * This function is responsible to: diff --git a/bl31/aarch64/bl31_entrypoint.S b/bl31/aarch64/bl31_entrypoint.S index 7c116a2e0d..c41773b886 100644 --- a/bl31/aarch64/bl31_entrypoint.S +++ b/bl31/aarch64/bl31_entrypoint.S @@ -4,13 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include .globl bl31_entrypoint .globl bl31_warm_entrypoint diff --git a/bl31/aarch64/crash_reporting.S b/bl31/aarch64/crash_reporting.S index 0986a0a19e..b3f59796c3 100644 --- a/bl31/aarch64/crash_reporting.S +++ b/bl31/aarch64/crash_reporting.S @@ -3,13 +3,15 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + +#include +#include + #include #include #include -#include -#include -#include -#include +#include +#include .globl report_unhandled_exception .globl report_unhandled_interrupt diff --git a/bl31/aarch64/ea_delegate.S b/bl31/aarch64/ea_delegate.S index 9d7c5e8a9c..0c8cfa8f92 100644 --- a/bl31/aarch64/ea_delegate.S +++ b/bl31/aarch64/ea_delegate.S @@ -8,9 +8,9 @@ #include #include #include +#include #include -#include -#include +#include .globl handle_lower_el_ea_esb diff --git a/bl31/aarch64/runtime_exceptions.S b/bl31/aarch64/runtime_exceptions.S index ab61e8ccfa..e7abd50318 100644 --- a/bl31/aarch64/runtime_exceptions.S +++ b/bl31/aarch64/runtime_exceptions.S @@ -4,15 +4,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + #include #include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include +#include +#include .globl runtime_exceptions diff --git a/bl31/bl31.ld.S b/bl31/bl31.ld.S index fd53ed82c2..5925e0ca0c 100644 --- a/bl31/bl31.ld.S +++ b/bl31/bl31.ld.S @@ -5,7 +5,8 @@ */ #include -#include + +#include OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT) OUTPUT_ARCH(PLATFORM_LINKER_ARCH) @@ -77,7 +78,7 @@ SECTIONS /* Place pubsub sections for events */ . = ALIGN(8); -#include +#include . = ALIGN(PAGE_SIZE); __RODATA_END__ = .; @@ -124,7 +125,7 @@ SECTIONS /* Place pubsub sections for events */ . = ALIGN(8); -#include +#include *(.vectors) __RO_END_UNALIGNED__ = .; diff --git a/bl31/bl31_context_mgmt.c b/bl31/bl31_context_mgmt.c index f868372a6c..d41979fa7d 100644 --- a/bl31/bl31_context_mgmt.c +++ b/bl31/bl31_context_mgmt.c @@ -5,13 +5,13 @@ */ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include /******************************************************************************* * This function returns a pointer to the most recent 'cpu_context' structure diff --git a/bl31/bl31_main.c b/bl31/bl31_main.c index 77b59ed6a8..927cda2f9f 100644 --- a/bl31/bl31_main.c +++ b/bl31/bl31_main.c @@ -4,22 +4,23 @@ * 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 +#include +#include +#include +#include + #if ENABLE_RUNTIME_INSTRUMENTATION PMF_REGISTER_SERVICE_SMC(rt_instr_svc, PMF_RT_INSTR_SVC_ID, RT_INSTR_TOTAL_IDS, PMF_STORE_ENABLE) diff --git a/bl31/ehf.c b/bl31/ehf.c index fa036cb1c9..1bcebee530 100644 --- a/bl31/ehf.c +++ b/bl31/ehf.c @@ -9,17 +9,18 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include + /* Output EHF logs as verbose */ #define EHF_LOG(...) VERBOSE("EHF: " __VA_ARGS__) diff --git a/bl31/interrupt_mgmt.c b/bl31/interrupt_mgmt.c index 0df50b6d2f..e6efad3e04 100644 --- a/bl31/interrupt_mgmt.c +++ b/bl31/interrupt_mgmt.c @@ -5,11 +5,12 @@ */ #include -#include -#include #include -#include -#include + +#include +#include +#include +#include /******************************************************************************* * Local structure and corresponding array to keep track of the state of the diff --git a/bl32/sp_min/aarch32/entrypoint.S b/bl32/sp_min/aarch32/entrypoint.S index d6853cc406..2ffef6a2ee 100644 --- a/bl32/sp_min/aarch32/entrypoint.S +++ b/bl32/sp_min/aarch32/entrypoint.S @@ -6,13 +6,13 @@ #include #include -#include +#include +#include #include #include -#include +#include #include #include -#include .globl sp_min_vector_table .globl sp_min_entrypoint diff --git a/bl32/sp_min/sp_min.ld.S b/bl32/sp_min/sp_min.ld.S index ce6c954eca..ba9d342121 100644 --- a/bl32/sp_min/sp_min.ld.S +++ b/bl32/sp_min/sp_min.ld.S @@ -5,7 +5,8 @@ */ #include -#include + +#include OUTPUT_FORMAT(elf32-littlearm) OUTPUT_ARCH(arm) @@ -62,7 +63,7 @@ SECTIONS /* Place pubsub sections for events */ . = ALIGN(8); -#include +#include . = ALIGN(PAGE_SIZE); __RODATA_END__ = .; @@ -91,7 +92,7 @@ SECTIONS /* Place pubsub sections for events */ . = ALIGN(8); -#include +#include *(.vectors) __RO_END_UNALIGNED__ = .; diff --git a/bl32/sp_min/sp_min_main.c b/bl32/sp_min/sp_min_main.c index a12a83bcf3..3cb19901f3 100644 --- a/bl32/sp_min/sp_min_main.c +++ b/bl32/sp_min/sp_min_main.c @@ -4,26 +4,28 @@ * 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 -#include -#include +#include #include -#include -#include -#include -#include -#include -#include + #include "sp_min_private.h" /* Pointers to per-core cpu contexts */ diff --git a/bl32/tsp/aarch64/tsp_entrypoint.S b/bl32/tsp/aarch64/tsp_entrypoint.S index 5d9da85788..48f6981bb2 100644 --- a/bl32/tsp/aarch64/tsp_entrypoint.S +++ b/bl32/tsp/aarch64/tsp_entrypoint.S @@ -6,8 +6,9 @@ #include #include -#include -#include +#include +#include + #include "../tsp_private.h" diff --git a/bl32/tsp/aarch64/tsp_exceptions.S b/bl32/tsp/aarch64/tsp_exceptions.S index 48e358a3a4..ad4b64887a 100644 --- a/bl32/tsp/aarch64/tsp_exceptions.S +++ b/bl32/tsp/aarch64/tsp_exceptions.S @@ -6,9 +6,8 @@ #include #include -#include -#include - +#include +#include /* ---------------------------------------------------- * The caller-saved registers x0-x18 and LR are saved diff --git a/bl32/tsp/aarch64/tsp_request.S b/bl32/tsp/aarch64/tsp_request.S index 2261f87f9c..5ad16da667 100644 --- a/bl32/tsp/aarch64/tsp_request.S +++ b/bl32/tsp/aarch64/tsp_request.S @@ -5,7 +5,7 @@ */ #include -#include +#include .globl tsp_get_magic diff --git a/bl32/tsp/tsp.ld.S b/bl32/tsp/tsp.ld.S index 97b12ce199..e9a1df1680 100644 --- a/bl32/tsp/tsp.ld.S +++ b/bl32/tsp/tsp.ld.S @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include #include -#include OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT) OUTPUT_ARCH(PLATFORM_LINKER_ARCH) diff --git a/bl32/tsp/tsp_interrupt.c b/bl32/tsp/tsp_interrupt.c index f501338143..4e500b3caa 100644 --- a/bl32/tsp/tsp_interrupt.c +++ b/bl32/tsp/tsp_interrupt.c @@ -4,12 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include + #include -#include + +#include +#include +#include +#include + #include "tsp_private.h" /******************************************************************************* diff --git a/bl32/tsp/tsp_main.c b/bl32/tsp/tsp_main.c index e41b51ebc7..24efa6189d 100644 --- a/bl32/tsp/tsp_main.c +++ b/bl32/tsp/tsp_main.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 + #include "tsp_private.h" diff --git a/bl32/tsp/tsp_private.h b/bl32/tsp/tsp_private.h index b697fa4965..e39f29166c 100644 --- a/bl32/tsp/tsp_private.h +++ b/bl32/tsp/tsp_private.h @@ -22,12 +22,13 @@ #ifndef __ASSEMBLY__ -#include -#include /* For CACHE_WRITEBACK_GRANULE */ -#include #include -#include +#include /* For CACHE_WRITEBACK_GRANULE */ + +#include +#include +#include typedef struct work_statistics { /* Number of s-el1 interrupts on this cpu */ diff --git a/bl32/tsp/tsp_timer.c b/bl32/tsp/tsp_timer.c index ebe7f0d395..35928634dc 100644 --- a/bl32/tsp/tsp_timer.c +++ b/bl32/tsp/tsp_timer.c @@ -3,9 +3,12 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include + #include -#include + +#include +#include + #include "tsp_private.h" /******************************************************************************* diff --git a/common/aarch64/debug.S b/common/aarch64/debug.S index 4478d0d038..da740ef220 100644 --- a/common/aarch64/debug.S +++ b/common/aarch64/debug.S @@ -6,7 +6,7 @@ #include #include -#include +#include .globl asm_print_str .globl asm_print_hex diff --git a/common/aarch64/early_exceptions.S b/common/aarch64/early_exceptions.S index ba94f6cb1e..36a872468c 100644 --- a/common/aarch64/early_exceptions.S +++ b/common/aarch64/early_exceptions.S @@ -5,7 +5,7 @@ */ #include -#include +#include /* ----------------------------------------------------------------------------- * Very simple stackless exception handlers used by BL2 and BL31 stages. diff --git a/common/backtrace/backtrace.c b/common/backtrace/backtrace.c index a91d065738..bf60a08a9b 100644 --- a/common/backtrace/backtrace.c +++ b/common/backtrace/backtrace.c @@ -4,13 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include #include #include +#include +#include +#include + /* Maximum number of entries in the backtrace to display */ #define UNWIND_LIMIT 20U diff --git a/common/bl_common.c b/common/bl_common.c index d12a17cf38..b2d22c19dd 100644 --- a/common/bl_common.c +++ b/common/bl_common.c @@ -4,18 +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 +#include +#include +#include #if TRUSTED_BOARD_BOOT # ifdef DYN_DISABLE_AUTH diff --git a/common/desc_image_load.c b/common/desc_image_load.c index b07fba3340..ada02f8dd6 100644 --- a/common/desc_image_load.c +++ b/common/desc_image_load.c @@ -4,12 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include - +#include +#include +#include static bl_load_info_t bl_load_info; static bl_params_t next_bl_params; diff --git a/common/fdt_wrappers.c b/common/fdt_wrappers.c index 31dafb2eb4..e67fdb0054 100644 --- a/common/fdt_wrappers.c +++ b/common/fdt_wrappers.c @@ -7,11 +7,13 @@ /* Helper functions to offer easier navigation of Device Tree Blob */ #include -#include -#include -#include #include +#include + +#include +#include + /* * Read cells from a given property of the given node. At most 2 cells of the * property are read, and pointer is updated. Returns 0 on success, and -1 upon diff --git a/common/image_decompress.c b/common/image_decompress.c index 7bd02b1da5..a4586ae624 100644 --- a/common/image_decompress.c +++ b/common/image_decompress.c @@ -4,13 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include -#include #include +#include +#include +#include +#include + static uintptr_t decompressor_buf_base; static uint32_t decompressor_buf_size; static decompressor_t *decompressor; diff --git a/common/runtime_svc.c b/common/runtime_svc.c index c30c0ecb68..09ce787d46 100644 --- a/common/runtime_svc.c +++ b/common/runtime_svc.c @@ -5,11 +5,12 @@ */ #include -#include #include -#include #include +#include +#include + /******************************************************************************* * The 'rt_svc_descs' array holds the runtime service descriptors exported by * services by placing them in the 'rt_svc_descs' linker section. diff --git a/common/tf_log.c b/common/tf_log.c index 0702185640..3e174dda08 100644 --- a/common/tf_log.c +++ b/common/tf_log.c @@ -4,9 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include #include -#include -#include +#include + +#include +#include /* Set the default maximum log level to the `LOG_LEVEL` build flag */ static unsigned int max_log_level = LOG_LEVEL; diff --git a/docs/exception-handling.rst b/docs/exception-handling.rst index e7cb09cf29..dbcd4bca8a 100644 --- a/docs/exception-handling.rst +++ b/docs/exception-handling.rst @@ -308,9 +308,9 @@ assign interrupts to fictitious dispatchers: .. code:: c + #include + #include #include - #include - #include ... diff --git a/drivers/allwinner/sunxi_rsb.c b/drivers/allwinner/sunxi_rsb.c index 7075c674d5..67f5b7ec2b 100644 --- a/drivers/allwinner/sunxi_rsb.c +++ b/drivers/allwinner/sunxi_rsb.c @@ -4,10 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include -#include + +#include +#include +#include + #include #define RSB_CTRL 0x00 diff --git a/drivers/arm/cci/cci.c b/drivers/arm/cci/cci.c index 605971cac7..a139f6cc74 100644 --- a/drivers/arm/cci/cci.c +++ b/drivers/arm/cci/cci.c @@ -4,15 +4,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include -#include -#include -#include #include #include +#include +#include +#include +#include +#include + #define MAKE_CCI_PART_NUMBER(hi, lo) (((hi) << 8) | (lo)) #define CCI_PART_LO_MASK U(0xff) #define CCI_PART_HI_MASK U(0xf) diff --git a/drivers/arm/ccn/ccn.c b/drivers/arm/ccn/ccn.c index d46e020891..64b1626970 100644 --- a/drivers/arm/ccn/ccn.c +++ b/drivers/arm/ccn/ccn.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 "ccn_private.h" static const ccn_desc_t *ccn_plat_desc; diff --git a/drivers/arm/gic/common/gic_common.c b/drivers/arm/gic/common/gic_common.c index 589de5da40..38b2f67190 100644 --- a/drivers/arm/gic/common/gic_common.c +++ b/drivers/arm/gic/common/gic_common.c @@ -5,8 +5,10 @@ */ #include -#include -#include + +#include +#include + #include "gic_common_private.h" /******************************************************************************* diff --git a/drivers/arm/gic/common/gic_common_private.h b/drivers/arm/gic/common/gic_common_private.h index 9d9e8c7bac..1ab1bdbef7 100644 --- a/drivers/arm/gic/common/gic_common_private.h +++ b/drivers/arm/gic/common/gic_common_private.h @@ -7,10 +7,11 @@ #ifndef GIC_COMMON_PRIVATE_H #define GIC_COMMON_PRIVATE_H -#include -#include #include +#include +#include + /******************************************************************************* * GIC Distributor interface register accessors that are common to GICv3 & GICv2 ******************************************************************************/ diff --git a/drivers/arm/gic/v2/gicv2_helpers.c b/drivers/arm/gic/v2/gicv2_helpers.c index bc4c1d1658..6739a782c1 100644 --- a/drivers/arm/gic/v2/gicv2_helpers.c +++ b/drivers/arm/gic/v2/gicv2_helpers.c @@ -4,13 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include + #include "../common/gic_common_private.h" #include "gicv2_private.h" diff --git a/drivers/arm/gic/v2/gicv2_main.c b/drivers/arm/gic/v2/gicv2_main.c index b8729056d5..c5d4fe1c37 100644 --- a/drivers/arm/gic/v2/gicv2_main.c +++ b/drivers/arm/gic/v2/gicv2_main.c @@ -4,16 +4,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include + #include "../common/gic_common_private.h" #include "gicv2_private.h" diff --git a/drivers/arm/gic/v2/gicv2_private.h b/drivers/arm/gic/v2/gicv2_private.h index ccfad78cd9..0fbdab0a2c 100644 --- a/drivers/arm/gic/v2/gicv2_private.h +++ b/drivers/arm/gic/v2/gicv2_private.h @@ -7,10 +7,11 @@ #ifndef GICV2_PRIVATE_H #define GICV2_PRIVATE_H -#include -#include #include +#include +#include + /******************************************************************************* * Private function prototypes ******************************************************************************/ diff --git a/drivers/arm/gic/v3/arm_gicv3_common.c b/drivers/arm/gic/v3/arm_gicv3_common.c index c809732951..4489892863 100644 --- a/drivers/arm/gic/v3/arm_gicv3_common.c +++ b/drivers/arm/gic/v3/arm_gicv3_common.c @@ -10,12 +10,13 @@ * APIs that are different to those generic ones in GICv3 driver. */ -#include #include -#include + +#include +#include +#include #include "gicv3_private.h" -#include "arm_gicv3_common.h" /* * Flush the internal GIC cache of the LPIs pending tables to memory before diff --git a/drivers/arm/gic/v3/gic600.c b/drivers/arm/gic/v3/gic600.c index eb4fc548f7..9cb2ab25ed 100644 --- a/drivers/arm/gic/v3/gic600.c +++ b/drivers/arm/gic/v3/gic600.c @@ -11,9 +11,10 @@ * GIC600 supports independently power-gating redistributor interface. */ -#include #include -#include + +#include +#include #include "gicv3_private.h" diff --git a/drivers/arm/gic/v3/gicv3_helpers.c b/drivers/arm/gic/v3/gicv3_helpers.c index c12a4b6517..39ea2a3746 100644 --- a/drivers/arm/gic/v3/gicv3_helpers.c +++ b/drivers/arm/gic/v3/gicv3_helpers.c @@ -4,12 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + #include #include -#include -#include -#include -#include +#include +#include +#include + #include "../common/gic_common_private.h" #include "gicv3_private.h" diff --git a/drivers/arm/gic/v3/gicv3_main.c b/drivers/arm/gic/v3/gicv3_main.c index 60f2e108a0..cf92f10ba7 100644 --- a/drivers/arm/gic/v3/gicv3_main.c +++ b/drivers/arm/gic/v3/gicv3_main.c @@ -4,13 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include + #include "gicv3_private.h" const gicv3_driver_data_t *gicv3_driver_data; diff --git a/drivers/arm/gic/v3/gicv3_private.h b/drivers/arm/gic/v3/gicv3_private.h index 188e711688..92066e1f2f 100644 --- a/drivers/arm/gic/v3/gicv3_private.h +++ b/drivers/arm/gic/v3/gicv3_private.h @@ -8,10 +8,12 @@ #define GICV3_PRIVATE_H #include -#include -#include -#include #include + +#include +#include +#include + #include "../common/gic_common_private.h" /******************************************************************************* diff --git a/drivers/arm/pl011/aarch32/pl011_console.S b/drivers/arm/pl011/aarch32/pl011_console.S index 5d6b95fe3e..ae613b1345 100644 --- a/drivers/arm/pl011/aarch32/pl011_console.S +++ b/drivers/arm/pl011/aarch32/pl011_console.S @@ -8,7 +8,7 @@ #include #define USE_FINISH_CONSOLE_REG_2 #include -#include +#include #if !MULTI_CONSOLE_API /* diff --git a/drivers/arm/pl011/aarch64/pl011_console.S b/drivers/arm/pl011/aarch64/pl011_console.S index 7fec0904d9..aaa39c11c6 100644 --- a/drivers/arm/pl011/aarch64/pl011_console.S +++ b/drivers/arm/pl011/aarch64/pl011_console.S @@ -8,7 +8,7 @@ #include #define USE_FINISH_CONSOLE_REG_2 #include -#include +#include #if !MULTI_CONSOLE_API /* diff --git a/drivers/arm/pl061/pl061_gpio.c b/drivers/arm/pl061/pl061_gpio.c index af980e5eb2..97013e83fb 100644 --- a/drivers/arm/pl061/pl061_gpio.c +++ b/drivers/arm/pl061/pl061_gpio.c @@ -9,13 +9,14 @@ */ #include -#include -#include #include -#include -#include -#include -#include + +#include +#include +#include +#include +#include +#include #if !PLAT_PL061_MAX_GPIOS # define PLAT_PL061_MAX_GPIOS 32 diff --git a/drivers/arm/smmu/smmu_v3.c b/drivers/arm/smmu/smmu_v3.c index 78a9ffa6df..004e81e360 100644 --- a/drivers/arm/smmu/smmu_v3.c +++ b/drivers/arm/smmu/smmu_v3.c @@ -5,10 +5,11 @@ */ #include -#include -#include #include +#include +#include + static inline uint32_t __init smmuv3_read_s_idr1(uintptr_t base) { return mmio_read_32(base + SMMU_S_IDR1); diff --git a/drivers/arm/sp804/sp804_delay_timer.c b/drivers/arm/sp804/sp804_delay_timer.c index 8f1c5c51b9..5313fbde2d 100644 --- a/drivers/arm/sp804/sp804_delay_timer.c +++ b/drivers/arm/sp804/sp804_delay_timer.c @@ -5,8 +5,9 @@ */ #include -#include -#include + +#include +#include uintptr_t sp804_base_addr; diff --git a/drivers/arm/sp805/sp805.c b/drivers/arm/sp805/sp805.c index aee90164ac..ffca1ced5b 100644 --- a/drivers/arm/sp805/sp805.c +++ b/drivers/arm/sp805/sp805.c @@ -4,10 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include +#include +#include + /* Inline register access functions */ static inline void sp805_write_wdog_load(uintptr_t base, uint32_t value) diff --git a/drivers/arm/tzc/tzc380.c b/drivers/arm/tzc/tzc380.c index 082161fe57..676df8d804 100644 --- a/drivers/arm/tzc/tzc380.c +++ b/drivers/arm/tzc/tzc380.c @@ -5,10 +5,11 @@ */ #include -#include -#include #include -#include + +#include +#include +#include struct tzc380_instance { uintptr_t base; diff --git a/drivers/arm/tzc/tzc400.c b/drivers/arm/tzc/tzc400.c index d27b010294..50d6701398 100644 --- a/drivers/arm/tzc/tzc400.c +++ b/drivers/arm/tzc/tzc400.c @@ -5,10 +5,12 @@ */ #include -#include -#include #include -#include + +#include +#include +#include + #include "tzc_common_private.h" /* diff --git a/drivers/arm/tzc/tzc_common_private.h b/drivers/arm/tzc/tzc_common_private.h index efac850712..c800536f33 100644 --- a/drivers/arm/tzc/tzc_common_private.h +++ b/drivers/arm/tzc/tzc_common_private.h @@ -9,8 +9,8 @@ #include #include -#include -#include +#include +#include #define DEFINE_TZC_COMMON_WRITE_ACTION(fn_name, macro_name) \ static inline void _tzc##fn_name##_write_action( \ diff --git a/drivers/arm/tzc/tzc_dmc500.c b/drivers/arm/tzc/tzc_dmc500.c index f0aba9c197..e45fbf8d8a 100644 --- a/drivers/arm/tzc/tzc_dmc500.c +++ b/drivers/arm/tzc/tzc_dmc500.c @@ -5,10 +5,12 @@ */ #include -#include -#include -#include -#include "tzc_common.h" + +#include +#include +#include +#include + #include "tzc_common_private.h" /* diff --git a/drivers/arm/tzc/tzc_dmc620.c b/drivers/arm/tzc/tzc_dmc620.c index 4abd0800b1..64ec5abee7 100644 --- a/drivers/arm/tzc/tzc_dmc620.c +++ b/drivers/arm/tzc/tzc_dmc620.c @@ -5,9 +5,10 @@ */ #include -#include -#include -#include + +#include +#include +#include /* Mask to extract bit 31 to 16 */ #define MASK_31_16 UINT64_C(0x0000ffff0000) diff --git a/drivers/auth/auth_mod.c b/drivers/auth/auth_mod.c index eb537b66a1..1b8ff82bca 100644 --- a/drivers/auth/auth_mod.c +++ b/drivers/auth/auth_mod.c @@ -5,17 +5,19 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include #include #include +#include + +#include +#include +#include +#include +#include +#include +#include + /* ASN.1 tags */ #define ASN1_INTEGER 0x02 diff --git a/drivers/auth/crypto_mod.c b/drivers/auth/crypto_mod.c index 4cd05506b2..5e5ac2b03d 100644 --- a/drivers/auth/crypto_mod.c +++ b/drivers/auth/crypto_mod.c @@ -5,8 +5,9 @@ */ #include -#include -#include + +#include +#include /* Variable exported by the crypto library through REGISTER_CRYPTO_LIB() */ diff --git a/drivers/auth/cryptocell/cryptocell_crypto.c b/drivers/auth/cryptocell/cryptocell_crypto.c index 80c10933e9..a507d0a421 100644 --- a/drivers/auth/cryptocell/cryptocell_crypto.c +++ b/drivers/auth/cryptocell/cryptocell_crypto.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 +#include +#include #include diff --git a/drivers/auth/cryptocell/cryptocell_crypto.mk b/drivers/auth/cryptocell/cryptocell_crypto.mk index a88dcfc579..a631829fda 100644 --- a/drivers/auth/cryptocell/cryptocell_crypto.mk +++ b/drivers/auth/cryptocell/cryptocell_crypto.mk @@ -20,9 +20,7 @@ endif TF_LDFLAGS += -L$(CCSBROM_LIB_PATH) LDLIBS += -lcc_712sbromx509 -INCLUDES += -Iinclude/drivers/arm/cryptocell - CRYPTOCELL_SOURCES := drivers/auth/cryptocell/cryptocell_crypto.c BL1_SOURCES += ${CRYPTOCELL_SOURCES} -BL2_SOURCES += ${CRYPTOCELL_SOURCES} \ No newline at end of file +BL2_SOURCES += ${CRYPTOCELL_SOURCES} diff --git a/drivers/auth/img_parser_mod.c b/drivers/auth/img_parser_mod.c index 63160141d7..c4688f8675 100644 --- a/drivers/auth/img_parser_mod.c +++ b/drivers/auth/img_parser_mod.c @@ -5,14 +5,15 @@ */ #include -#include -#include #include -#include #include #include #include -#include + +#include +#include +#include +#include IMPORT_SYM(uintptr_t, __PARSER_LIB_DESCS_START__, PARSER_LIB_DESCS_START); IMPORT_SYM(uintptr_t, __PARSER_LIB_DESCS_END__, PARSER_LIB_DESCS_END); diff --git a/drivers/auth/mbedtls/mbedtls_common.c b/drivers/auth/mbedtls/mbedtls_common.c index dbf45baebd..b6d02fd108 100644 --- a/drivers/auth/mbedtls/mbedtls_common.c +++ b/drivers/auth/mbedtls/mbedtls_common.c @@ -5,14 +5,16 @@ */ #include -#include +#include + /* mbed TLS headers */ #include #include -#include -#include -#include -#include + +#include +#include +#include +#include static void cleanup(void) { diff --git a/drivers/auth/mbedtls/mbedtls_common.mk b/drivers/auth/mbedtls/mbedtls_common.mk index cfbd86ab93..63e65bd47c 100644 --- a/drivers/auth/mbedtls/mbedtls_common.mk +++ b/drivers/auth/mbedtls/mbedtls_common.mk @@ -14,10 +14,9 @@ ifeq (${MBEDTLS_DIR},) endif MBEDTLS_INC = -I${MBEDTLS_DIR}/include -INCLUDES += -Iinclude/drivers/auth/mbedtls # Specify mbed TLS configuration file -MBEDTLS_CONFIG_FILE := "" +MBEDTLS_CONFIG_FILE := "" $(eval $(call add_define,MBEDTLS_CONFIG_FILE)) MBEDTLS_SOURCES += drivers/auth/mbedtls/mbedtls_common.c diff --git a/drivers/auth/mbedtls/mbedtls_crypto.c b/drivers/auth/mbedtls/mbedtls_crypto.c index bc9ed3a85e..33420fbbd1 100644 --- a/drivers/auth/mbedtls/mbedtls_crypto.c +++ b/drivers/auth/mbedtls/mbedtls_crypto.c @@ -4,10 +4,6 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include -#include #include #include @@ -17,6 +13,11 @@ #include #include +#include +#include +#include +#include + #define LIB_NAME "mbed TLS" /* diff --git a/drivers/auth/mbedtls/mbedtls_x509_parser.c b/drivers/auth/mbedtls/mbedtls_x509_parser.c index bda1208af9..129566bd69 100644 --- a/drivers/auth/mbedtls/mbedtls_x509_parser.c +++ b/drivers/auth/mbedtls/mbedtls_x509_parser.c @@ -12,20 +12,21 @@ * extensions field, such as an image hash or a public key. */ -#include #include -#include -#include #include #include #include -#include /* mbed TLS headers */ #include #include #include +#include +#include +#include +#include + /* Maximum OID string length ("a.b.c.d.e.f ...") */ #define MAX_OID_STR_LEN 64 diff --git a/drivers/auth/tbbr/tbbr_cot.c b/drivers/auth/tbbr/tbbr_cot.c index a950a7a8d4..ec14a185d1 100644 --- a/drivers/auth/tbbr/tbbr_cot.c +++ b/drivers/auth/tbbr/tbbr_cot.c @@ -4,12 +4,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include +#include + +#include #if USE_TBBR_DEFS -#include +#include #else #include #endif diff --git a/drivers/cadence/uart/aarch64/cdns_console.S b/drivers/cadence/uart/aarch64/cdns_console.S index 418810e15c..43d08f4545 100644 --- a/drivers/cadence/uart/aarch64/cdns_console.S +++ b/drivers/cadence/uart/aarch64/cdns_console.S @@ -6,9 +6,9 @@ #include #include #include -#include #define USE_FINISH_CONSOLE_REG_2 #include +#include /* * "core" functions are low-level implementations that don't require diff --git a/drivers/cfi/v2m/v2m_flash.c b/drivers/cfi/v2m/v2m_flash.c index 9b80e2f2a1..aadafbce23 100644 --- a/drivers/cfi/v2m/v2m_flash.c +++ b/drivers/cfi/v2m/v2m_flash.c @@ -5,8 +5,9 @@ */ #include -#include -#include + +#include +#include /* * This file supplies a low level interface to the vexpress NOR flash diff --git a/drivers/console/multi_console.c b/drivers/console/multi_console.c index c678de0989..e94de35c7c 100644 --- a/drivers/console/multi_console.c +++ b/drivers/console/multi_console.c @@ -7,6 +7,7 @@ #if MULTI_CONSOLE_API #include + #include console_t *console_list; diff --git a/drivers/coreboot/cbmem_console/aarch64/cbmem_console.S b/drivers/coreboot/cbmem_console/aarch64/cbmem_console.S index 89be349c0e..4c14b69c51 100644 --- a/drivers/coreboot/cbmem_console/aarch64/cbmem_console.S +++ b/drivers/coreboot/cbmem_console/aarch64/cbmem_console.S @@ -5,9 +5,9 @@ */ #include -#include #define USE_FINISH_CONSOLE_REG_2 #include +#include /* * This driver implements access to coreboot's in-memory console diff --git a/drivers/delay_timer/delay_timer.c b/drivers/delay_timer/delay_timer.c index feac3579fe..8c2996ec32 100644 --- a/drivers/delay_timer/delay_timer.c +++ b/drivers/delay_timer/delay_timer.c @@ -5,9 +5,11 @@ */ #include -#include + #include -#include + +#include +#include /*********************************************************** * The delay timer implementation diff --git a/drivers/delay_timer/generic_delay_timer.c b/drivers/delay_timer/generic_delay_timer.c index 03ca5321a7..4b67ed0d14 100644 --- a/drivers/delay_timer/generic_delay_timer.c +++ b/drivers/delay_timer/generic_delay_timer.c @@ -4,13 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include -#include -#include -#include + +#include +#include +#include +#include +#include +#include /* Ticks elapsed in one second by a signal of 1 MHz */ #define MHZ_TICKS_PER_SEC 1000000 diff --git a/drivers/gpio/gpio.c b/drivers/gpio/gpio.c index 62f3dc2539..76612b253e 100644 --- a/drivers/gpio/gpio.c +++ b/drivers/gpio/gpio.c @@ -11,7 +11,8 @@ #include #include -#include + +#include /* * The gpio implementation diff --git a/drivers/imx/timer/imx_gpt.c b/drivers/imx/timer/imx_gpt.c index bd364eb307..464efe93fe 100644 --- a/drivers/imx/timer/imx_gpt.c +++ b/drivers/imx/timer/imx_gpt.c @@ -5,8 +5,10 @@ */ #include -#include -#include + +#include +#include + #include #define GPTCR_SWR BIT(15) /* Software reset */ diff --git a/drivers/imx/uart/imx_uart.c b/drivers/imx/uart/imx_uart.c index 0250a41426..68d31c8870 100644 --- a/drivers/imx/uart/imx_uart.c +++ b/drivers/imx/uart/imx_uart.c @@ -3,10 +3,14 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include + #include -#include + #include + +#include +#include + #include /* TX/RX FIFO threshold */ diff --git a/drivers/imx/usdhc/imx_usdhc.c b/drivers/imx/usdhc/imx_usdhc.c index 1f9550e172..07f55b7843 100644 --- a/drivers/imx/usdhc/imx_usdhc.c +++ b/drivers/imx/usdhc/imx_usdhc.c @@ -4,17 +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 + static void imx_usdhc_initialize(void); static int imx_usdhc_send_cmd(struct mmc_cmd *cmd); static int imx_usdhc_set_ios(unsigned int clk, unsigned int width); diff --git a/drivers/imx/usdhc/imx_usdhc.h b/drivers/imx/usdhc/imx_usdhc.h index 9ff3298dfd..e063316aee 100644 --- a/drivers/imx/usdhc/imx_usdhc.h +++ b/drivers/imx/usdhc/imx_usdhc.h @@ -7,7 +7,7 @@ #ifndef IMX_USDHC_H #define IMX_USDHC_H -#include +#include typedef struct imx_usdhc_params { uintptr_t reg_base; diff --git a/drivers/io/io_block.c b/drivers/io/io_block.c index ff13113afb..f190a4307b 100644 --- a/drivers/io/io_block.c +++ b/drivers/io/io_block.c @@ -5,14 +5,16 @@ */ #include -#include #include -#include -#include -#include -#include #include -#include + +#include + +#include +#include +#include +#include +#include typedef struct { io_block_dev_spec_t *dev_spec; diff --git a/drivers/io/io_dummy.c b/drivers/io/io_dummy.c index d4020e3a6d..4f0cda6daf 100644 --- a/drivers/io/io_dummy.c +++ b/drivers/io/io_dummy.c @@ -5,12 +5,13 @@ */ #include -#include -#include -#include -#include #include +#include +#include +#include +#include + struct file_state { int in_use; size_t size; diff --git a/drivers/io/io_fip.c b/drivers/io/io_fip.c index 9d6c763e89..d4771b5147 100644 --- a/drivers/io/io_fip.c +++ b/drivers/io/io_fip.c @@ -5,19 +5,21 @@ */ #include -#include -#include #include -#include -#include -#include -#include -#include -#include #include #include -#include -#include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifndef MAX_FIP_DEVICES #define MAX_FIP_DEVICES 1 diff --git a/drivers/io/io_memmap.c b/drivers/io/io_memmap.c index 5595e60a42..96590b6c03 100644 --- a/drivers/io/io_memmap.c +++ b/drivers/io/io_memmap.c @@ -5,13 +5,15 @@ */ #include -#include -#include -#include -#include -#include #include -#include + +#include + +#include +#include +#include +#include +#include /* As we need to be able to keep state for seek, only one file can be open * at a time. Make this a structure and point to the entity->info. When we diff --git a/drivers/io/io_semihosting.c b/drivers/io/io_semihosting.c index 9ca0a9dc9c..23d09c1188 100644 --- a/drivers/io/io_semihosting.c +++ b/drivers/io/io_semihosting.c @@ -5,13 +5,13 @@ */ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /* Identify the device type as semihosting */ static io_type_t device_type_sh(void) diff --git a/drivers/io/io_storage.c b/drivers/io/io_storage.c index 948f848137..c9ff31bcc4 100644 --- a/drivers/io/io_storage.c +++ b/drivers/io/io_storage.c @@ -5,11 +5,12 @@ */ #include -#include -#include -#include #include +#include + +#include +#include /* Storage for a fixed maximum number of IO entities, definable by platform */ static io_entity_t entity_pool[MAX_IO_HANDLES]; diff --git a/drivers/marvell/amb_adec.c b/drivers/marvell/amb_adec.c index 16fe772dac..1f671058d5 100644 --- a/drivers/marvell/amb_adec.c +++ b/drivers/marvell/amb_adec.c @@ -7,9 +7,10 @@ /* AXI to M-Bridge decoding unit driver for Marvell Armada 8K and 8K+ SoCs */ +#include +#include + #include -#include -#include #include #include diff --git a/drivers/marvell/ap807_clocks_init.c b/drivers/marvell/ap807_clocks_init.c index 841e6aeb4e..04c256b614 100644 --- a/drivers/marvell/ap807_clocks_init.c +++ b/drivers/marvell/ap807_clocks_init.c @@ -5,10 +5,11 @@ * https://spdx.org/licenses */ +#include +#include +#include + #include -#include -#include -#include /* Notify bootloader on DRAM setup */ #define AP807_CPU_ARO_CTRL(cluster) \ diff --git a/drivers/marvell/cache_llc.c b/drivers/marvell/cache_llc.c index e13e6ce2f8..3df93a43ba 100644 --- a/drivers/marvell/cache_llc.c +++ b/drivers/marvell/cache_llc.c @@ -9,11 +9,13 @@ * for Marvell SoCs in AP806, AP807, and AP810 */ -#include #include -#include -#include -#include + +#include +#include +#include +#include + #include #define CCU_HTC_CR(ap_index) (MVEBU_CCU_BASE(ap_index) + 0x200) diff --git a/drivers/marvell/ccu.c b/drivers/marvell/ccu.c index acb1c00c0b..1e4ab44daf 100644 --- a/drivers/marvell/ccu.c +++ b/drivers/marvell/ccu.c @@ -7,10 +7,11 @@ /* CCU unit device driver for Marvell AP807, AP807 and AP810 SoCs */ +#include +#include +#include + #include -#include -#include -#include #include #include diff --git a/drivers/marvell/comphy/phy-comphy-3700.c b/drivers/marvell/comphy/phy-comphy-3700.c index 53a59b0f59..2e8c4128e7 100644 --- a/drivers/marvell/comphy/phy-comphy-3700.c +++ b/drivers/marvell/comphy/phy-comphy-3700.c @@ -5,13 +5,16 @@ * https://spdx.org/licenses */ -#include -#include #include -#include + +#include +#include +#include +#include + #include #include -#include + #include "phy-comphy-3700.h" #include "phy-comphy-common.h" diff --git a/drivers/marvell/comphy/phy-comphy-cp110.c b/drivers/marvell/comphy/phy-comphy-cp110.c index 86e5f1c68e..384dd39f23 100644 --- a/drivers/marvell/comphy/phy-comphy-cp110.c +++ b/drivers/marvell/comphy/phy-comphy-cp110.c @@ -7,12 +7,14 @@ /* Marvell CP110 SoC COMPHY unit driver */ -#include -#include #include -#include + +#include +#include +#include +#include + #include -#include #include "mvebu.h" #include "comphy-cp110.h" #include "phy-comphy-cp110.h" diff --git a/drivers/marvell/gwin.c b/drivers/marvell/gwin.c index a4743eb5e2..9d94308365 100644 --- a/drivers/marvell/gwin.c +++ b/drivers/marvell/gwin.c @@ -7,10 +7,11 @@ /* GWIN unit device driver for Marvell AP810 SoC */ +#include +#include +#include + #include -#include -#include -#include #include #include diff --git a/drivers/marvell/io_win.c b/drivers/marvell/io_win.c index c0424e0861..c4257fa7c1 100644 --- a/drivers/marvell/io_win.c +++ b/drivers/marvell/io_win.c @@ -7,10 +7,11 @@ /* IO Window unit device driver for Marvell AP807, AP807 and AP810 SoCs */ +#include +#include +#include + #include -#include -#include -#include #include #include diff --git a/drivers/marvell/iob.c b/drivers/marvell/iob.c index e88bc16730..87f147aa40 100644 --- a/drivers/marvell/iob.c +++ b/drivers/marvell/iob.c @@ -7,11 +7,12 @@ /* IOW unit device driver for Marvell CP110 and CP115 SoCs */ -#include #include -#include -#include -#include +#include +#include +#include + +#include #include #include diff --git a/drivers/marvell/mc_trustzone/mc_trustzone.c b/drivers/marvell/mc_trustzone/mc_trustzone.c index 0db3b8d099..52b3006769 100644 --- a/drivers/marvell/mc_trustzone/mc_trustzone.c +++ b/drivers/marvell/mc_trustzone/mc_trustzone.c @@ -5,10 +5,12 @@ * https://spdx.org/licenses */ -#include -#include -#include +#include +#include +#include + #include + #include "mc_trustzone.h" #define TZ_SIZE(x) ((x) >> 13) diff --git a/drivers/marvell/mc_trustzone/mc_trustzone.h b/drivers/marvell/mc_trustzone/mc_trustzone.h index d36dcb5c09..296dce8536 100644 --- a/drivers/marvell/mc_trustzone/mc_trustzone.h +++ b/drivers/marvell/mc_trustzone/mc_trustzone.h @@ -8,7 +8,7 @@ #ifndef MC_TRUSTZONE_H #define MC_TRUSTZONE_H -#include +#include #define MVEBU_TZ_MAX_WINS 16 diff --git a/drivers/marvell/mci.c b/drivers/marvell/mci.c index 721504e03a..3a9859c98c 100644 --- a/drivers/marvell/mci.c +++ b/drivers/marvell/mci.c @@ -7,10 +7,11 @@ /* MCI bus driver for Marvell ARMADA 8K and 8K+ SoCs */ -#include -#include -#include -#include +#include +#include +#include +#include + #include #include #include diff --git a/drivers/marvell/mochi/ap807_setup.c b/drivers/marvell/mochi/ap807_setup.c index 075ca31f83..864c9230a1 100644 --- a/drivers/marvell/mochi/ap807_setup.c +++ b/drivers/marvell/mochi/ap807_setup.c @@ -7,13 +7,14 @@ /* AP807 Marvell SoC driver */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include + #include #define SMMU_sACR (MVEBU_SMMU_BASE + 0x10) diff --git a/drivers/marvell/mochi/apn806_setup.c b/drivers/marvell/mochi/apn806_setup.c index 1d33be93a0..1e91c4317c 100644 --- a/drivers/marvell/mochi/apn806_setup.c +++ b/drivers/marvell/mochi/apn806_setup.c @@ -7,13 +7,14 @@ /* AP806 Marvell SoC driver */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include + #include #define SMMU_sACR (MVEBU_SMMU_BASE + 0x10) diff --git a/drivers/marvell/mochi/cp110_setup.c b/drivers/marvell/mochi/cp110_setup.c index 654bb62b2d..d7d7373180 100644 --- a/drivers/marvell/mochi/cp110_setup.c +++ b/drivers/marvell/mochi/cp110_setup.c @@ -7,11 +7,12 @@ /* CP110 Marvell SoC driver */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include + #include /* diff --git a/drivers/marvell/thermal.c b/drivers/marvell/thermal.c index c7ceb92918..a501ab44ea 100644 --- a/drivers/marvell/thermal.c +++ b/drivers/marvell/thermal.c @@ -7,8 +7,8 @@ /* Driver for thermal unit located in Marvell ARMADA 8K and compatible SoCs */ -#include -#include +#include +#include int marvell_thermal_init(struct tsen_config *tsen_cfg) { diff --git a/drivers/marvell/uart/a3700_console.S b/drivers/marvell/uart/a3700_console.S index 25c21cfcd8..cc3855dbb7 100644 --- a/drivers/marvell/uart/a3700_console.S +++ b/drivers/marvell/uart/a3700_console.S @@ -7,9 +7,9 @@ #include #include -#include #define USE_FINISH_CONSOLE_REG_2 #include +#include /* * "core" functions are low-level implementations that don't require diff --git a/drivers/mentor/i2c/mi2cv.c b/drivers/mentor/i2c/mi2cv.c index 8ebd9662b1..1cdcf7478c 100644 --- a/drivers/mentor/i2c/mi2cv.c +++ b/drivers/mentor/i2c/mi2cv.c @@ -11,12 +11,14 @@ * for Marvell and Allwinner SoCs in ATF. */ -#include -#include #include -#include + +#include +#include +#include +#include + #include -#include #if LOG_LEVEL >= LOG_LEVEL_VERBOSE #define DEBUG_I2C diff --git a/drivers/meson/console/aarch64/meson_console.S b/drivers/meson/console/aarch64/meson_console.S index eaee10ef1e..5cf9b88785 100644 --- a/drivers/meson/console/aarch64/meson_console.S +++ b/drivers/meson/console/aarch64/meson_console.S @@ -8,7 +8,7 @@ #include #define USE_FINISH_CONSOLE_REG_2 #include -#include +#include .globl console_meson_register .globl console_meson_init diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 4160003c8f..50e87c1db4 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -6,15 +6,16 @@ /* Define a simple and generic interface to access eMMC and SD-card devices. */ -#include #include -#include -#include #include -#include #include #include -#include + +#include +#include +#include +#include +#include #define MMC_DEFAULT_MAX_RETRIES 5 #define SEND_OP_COND_MAX_RETRIES 100 diff --git a/drivers/partition/gpt.c b/drivers/partition/gpt.c index 0c51e62a87..4577f06a20 100644 --- a/drivers/partition/gpt.c +++ b/drivers/partition/gpt.c @@ -5,11 +5,12 @@ */ #include -#include #include -#include #include -#include + +#include +#include +#include static int unicode_to_ascii(unsigned short *str_in, unsigned char *str_out) { diff --git a/drivers/partition/partition.c b/drivers/partition/partition.c index 6085b8651b..07869acf50 100644 --- a/drivers/partition/partition.c +++ b/drivers/partition/partition.c @@ -5,15 +5,16 @@ */ #include -#include -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include +#include + static uint8_t mbr_sector[PARTITION_BLOCK_SIZE]; partition_entry_list_t list; diff --git a/drivers/renesas/rcar/auth/auth_mod.c b/drivers/renesas/rcar/auth/auth_mod.c index 04ed279287..d9446d95e0 100644 --- a/drivers/renesas/rcar/auth/auth_mod.c +++ b/drivers/renesas/rcar/auth/auth_mod.c @@ -5,13 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include -#include -#include #include +#include + +#include +#include +#include +#include + #include "rom_api.h" typedef int32_t(*secure_boot_api_f) (uint32_t a, uint32_t b, void *c); diff --git a/drivers/renesas/rcar/avs/avs_driver.c b/drivers/renesas/rcar/avs/avs_driver.c index 80a7c91909..647869ede4 100644 --- a/drivers/renesas/rcar/avs/avs_driver.c +++ b/drivers/renesas/rcar/avs/avs_driver.c @@ -4,9 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include +#include +#include +#include + #include "cpg_registers.h" #include "avs_driver.h" #include "rcar_def.h" diff --git a/drivers/renesas/rcar/board/board.c b/drivers/renesas/rcar/board/board.c index 147a0b0c38..f15e06bc08 100644 --- a/drivers/renesas/rcar/board/board.c +++ b/drivers/renesas/rcar/board/board.c @@ -6,9 +6,12 @@ */ #include + +#include + #include + #include "board.h" -#include "utils_def.h" #ifndef BOARD_DEFAULT #if (RCAR_LSI == RCAR_E3) diff --git a/drivers/renesas/rcar/common.c b/drivers/renesas/rcar/common.c index e82e8b5214..42bdce5797 100644 --- a/drivers/renesas/rcar/common.c +++ b/drivers/renesas/rcar/common.c @@ -4,7 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include + #include "rcar_private.h" void diff --git a/drivers/renesas/rcar/console/rcar_printf.c b/drivers/renesas/rcar/console/rcar_printf.c index 9321b584ad..2a6e2c0032 100644 --- a/drivers/renesas/rcar/console/rcar_printf.c +++ b/drivers/renesas/rcar/console/rcar_printf.c @@ -4,16 +4,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include #include -#include -#include -#include -#include "rcar_def.h" -#include "rcar_private.h" -#include "rcar_printf.h" +#include + +#include +#include +#include + +#include "rcar_def.h" +#include "rcar_private.h" +#include "rcar_printf.h" #define INDEX_TIMER_COUNT (4U) diff --git a/drivers/renesas/rcar/cpld/ulcb_cpld.c b/drivers/renesas/rcar/cpld/ulcb_cpld.c index 92e438a4f1..d7192f48d9 100644 --- a/drivers/renesas/rcar/cpld/ulcb_cpld.c +++ b/drivers/renesas/rcar/cpld/ulcb_cpld.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include #define SCLK 8 /* GP_6_8 */ #define SSTBZ 3 /* GP_2_3 */ diff --git a/drivers/renesas/rcar/delay/micro_delay.h b/drivers/renesas/rcar/delay/micro_delay.h index 458959fd8d..4e4b28babc 100644 --- a/drivers/renesas/rcar/delay/micro_delay.h +++ b/drivers/renesas/rcar/delay/micro_delay.h @@ -10,7 +10,7 @@ #define TMU3_MEASUREMENT (0) #ifndef __ASSEMBLY__ -#include "stdint.h" +#include void rcar_micro_delay(uint32_t count_us); #if (TMU3_MEASUREMENT == 1) diff --git a/drivers/renesas/rcar/dma/dma_driver.c b/drivers/renesas/rcar/dma/dma_driver.c index d4fa65d263..fef55c477a 100644 --- a/drivers/renesas/rcar/dma/dma_driver.c +++ b/drivers/renesas/rcar/dma/dma_driver.c @@ -5,12 +5,14 @@ */ #include -#include #include -#include + +#include +#include +#include + #include "rcar_def.h" #include "cpg_registers.h" -#include "debug.h" #include "rcar_private.h" /* DMA CHANNEL setting (0/16/32) */ diff --git a/drivers/renesas/rcar/emmc/emmc_cmd.c b/drivers/renesas/rcar/emmc/emmc_cmd.c index 0f393490cc..a2e25e3394 100644 --- a/drivers/renesas/rcar/emmc/emmc_cmd.c +++ b/drivers/renesas/rcar/emmc/emmc_cmd.c @@ -4,7 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include + #include "emmc_config.h" #include "emmc_hal.h" #include "emmc_std.h" diff --git a/drivers/renesas/rcar/emmc/emmc_init.c b/drivers/renesas/rcar/emmc/emmc_init.c index 386fb1e4ec..b27e165862 100644 --- a/drivers/renesas/rcar/emmc/emmc_init.c +++ b/drivers/renesas/rcar/emmc/emmc_init.c @@ -5,7 +5,9 @@ */ #include -#include + +#include + #include "emmc_config.h" #include "emmc_hal.h" #include "emmc_std.h" diff --git a/drivers/renesas/rcar/emmc/emmc_interrupt.c b/drivers/renesas/rcar/emmc/emmc_interrupt.c index 3077db4c03..37a3cf9d43 100644 --- a/drivers/renesas/rcar/emmc/emmc_interrupt.c +++ b/drivers/renesas/rcar/emmc/emmc_interrupt.c @@ -5,6 +5,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + +#include #include "emmc_config.h" #include "emmc_def.h" @@ -13,9 +16,6 @@ #include "emmc_std.h" #include "rcar_def.h" -#include -#include - static EMMC_ERROR_CODE emmc_trans_sector(uint32_t *buff_address_virtual); uint32_t emmc_interrupt(void) diff --git a/drivers/renesas/rcar/emmc/emmc_mount.c b/drivers/renesas/rcar/emmc/emmc_mount.c index 9a7d2cad63..dd57b0c249 100644 --- a/drivers/renesas/rcar/emmc/emmc_mount.c +++ b/drivers/renesas/rcar/emmc/emmc_mount.c @@ -4,8 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include +#include + #include "emmc_config.h" #include "emmc_hal.h" #include "emmc_std.h" diff --git a/drivers/renesas/rcar/emmc/emmc_read.c b/drivers/renesas/rcar/emmc/emmc_read.c index b11c2c43ef..390d0caac1 100644 --- a/drivers/renesas/rcar/emmc/emmc_read.c +++ b/drivers/renesas/rcar/emmc/emmc_read.c @@ -3,7 +3,9 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + #include + #include "emmc_config.h" #include "emmc_hal.h" #include "emmc_std.h" diff --git a/drivers/renesas/rcar/emmc/emmc_utility.c b/drivers/renesas/rcar/emmc/emmc_utility.c index e64947ddc7..39d9ede5ac 100644 --- a/drivers/renesas/rcar/emmc/emmc_utility.c +++ b/drivers/renesas/rcar/emmc/emmc_utility.c @@ -4,7 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include + #include "emmc_config.h" #include "emmc_hal.h" #include "emmc_std.h" diff --git a/drivers/renesas/rcar/iic_dvfs/iic_dvfs.c b/drivers/renesas/rcar/iic_dvfs/iic_dvfs.c index 11d52bf76d..39b9bb4e3c 100644 --- a/drivers/renesas/rcar/iic_dvfs/iic_dvfs.c +++ b/drivers/renesas/rcar/iic_dvfs/iic_dvfs.c @@ -4,8 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include +#include + #include "rcar_def.h" #include "cpg_registers.h" #include "iic_dvfs.h" diff --git a/drivers/renesas/rcar/io/io_emmcdrv.c b/drivers/renesas/rcar/io/io_emmcdrv.c index f74bd5f4ea..4b464fb3e4 100644 --- a/drivers/renesas/rcar/io/io_emmcdrv.c +++ b/drivers/renesas/rcar/io/io_emmcdrv.c @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include #include +#include +#include +#include + #include "io_common.h" #include "io_emmcdrv.h" #include "io_private.h" diff --git a/drivers/renesas/rcar/io/io_memdrv.c b/drivers/renesas/rcar/io/io_memdrv.c index e55fd64665..3f6b4c71b1 100644 --- a/drivers/renesas/rcar/io/io_memdrv.c +++ b/drivers/renesas/rcar/io/io_memdrv.c @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include #include +#include +#include +#include + #include "io_common.h" #include "io_private.h" #include "io_memdrv.h" diff --git a/drivers/renesas/rcar/io/io_rcar.c b/drivers/renesas/rcar/io/io_rcar.c index 4293c51c58..650931bb45 100644 --- a/drivers/renesas/rcar/io/io_rcar.c +++ b/drivers/renesas/rcar/io/io_rcar.c @@ -4,23 +4,27 @@ * 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 + #include "io_rcar.h" #include "io_common.h" #include "io_private.h" + extern int32_t plat_get_drv_source(uint32_t id, uintptr_t *dev, uintptr_t *image_spec); diff --git a/drivers/renesas/rcar/pwrc/pwrc.c b/drivers/renesas/rcar/pwrc/pwrc.c index 6dfc0b69f4..8cdfe75e54 100644 --- a/drivers/renesas/rcar/pwrc/pwrc.c +++ b/drivers/renesas/rcar/pwrc/pwrc.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 + #include "iic_dvfs.h" #include "rcar_def.h" #include "rcar_private.h" diff --git a/drivers/renesas/rcar/rom/rom_api.c b/drivers/renesas/rcar/rom/rom_api.c index c14de55b6a..be38fbff3f 100644 --- a/drivers/renesas/rcar/rom/rom_api.c +++ b/drivers/renesas/rcar/rom/rom_api.c @@ -4,8 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include + +#include + #include "rcar_def.h" #include "rom_api.h" diff --git a/drivers/renesas/rcar/rpc/rpc_driver.c b/drivers/renesas/rcar/rpc/rpc_driver.c index bc7424ac61..bea2752101 100644 --- a/drivers/renesas/rcar/rpc/rpc_driver.c +++ b/drivers/renesas/rcar/rpc/rpc_driver.c @@ -4,12 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include #include + +#include +#include + #include "cpg_registers.h" #include "rpc_registers.h" -#include "debug.h" #include "rcar_private.h" #define MSTPSR9_RPC_BIT (0x00020000U) diff --git a/drivers/renesas/rcar/watchdog/swdt.c b/drivers/renesas/rcar/watchdog/swdt.c index f9dbf86fe4..42f8653495 100644 --- a/drivers/renesas/rcar/watchdog/swdt.c +++ b/drivers/renesas/rcar/watchdog/swdt.c @@ -5,9 +5,10 @@ */ #include -#include -#include -#include +#include +#include +#include + #include "rcar_def.h" extern void gicd_set_icenabler(uintptr_t base, unsigned int id); diff --git a/drivers/st/clk/stm32mp1_clk.c b/drivers/st/clk/stm32mp1_clk.c index b8457cb37b..7a8898672d 100644 --- a/drivers/st/clk/stm32mp1_clk.c +++ b/drivers/st/clk/stm32mp1_clk.c @@ -4,26 +4,29 @@ * SPDX-License-Identifier: GPL-2.0+ OR 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 +#include +#include +#include +#include +#include +#include + #include #include -#include -#include #define MAX_HSI_HZ 64000000 diff --git a/drivers/st/clk/stm32mp1_clkfunc.c b/drivers/st/clk/stm32mp1_clkfunc.c index 078d803e70..179191945f 100644 --- a/drivers/st/clk/stm32mp1_clkfunc.c +++ b/drivers/st/clk/stm32mp1_clkfunc.c @@ -4,11 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include + #include -#include -#include + +#include +#include +#include + #include #define DT_RCC_NODE_NAME "rcc@50000000" diff --git a/drivers/st/ddr/stm32mp1_ddr.c b/drivers/st/ddr/stm32mp1_ddr.c index eed1d7613d..a2b0e9ec05 100644 --- a/drivers/st/ddr/stm32mp1_ddr.c +++ b/drivers/st/ddr/stm32mp1_ddr.c @@ -4,22 +4,25 @@ * SPDX-License-Identifier: GPL-2.0+ OR 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 #include -#include -#include -#include -#include struct reg_desc { const char *name; diff --git a/drivers/st/ddr/stm32mp1_ddr_helpers.c b/drivers/st/ddr/stm32mp1_ddr_helpers.c index 325c0b897a..a8c1b7769a 100644 --- a/drivers/st/ddr/stm32mp1_ddr_helpers.c +++ b/drivers/st/ddr/stm32mp1_ddr_helpers.c @@ -4,10 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include + +#include +#include +#include void ddr_enable_clock(void) { diff --git a/drivers/st/ddr/stm32mp1_ram.c b/drivers/st/ddr/stm32mp1_ram.c index 6d515ec76a..1c82179179 100644 --- a/drivers/st/ddr/stm32mp1_ram.c +++ b/drivers/st/ddr/stm32mp1_ram.c @@ -4,21 +4,25 @@ * SPDX-License-Identifier: GPL-2.0+ OR 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 -#include #define DDR_PATTERN 0xAAAAAAAAU #define DDR_ANTIPATTERN 0x55555555U diff --git a/drivers/st/gpio/stm32_gpio.c b/drivers/st/gpio/stm32_gpio.c index 200b47340a..9591e3738d 100644 --- a/drivers/st/gpio/stm32_gpio.c +++ b/drivers/st/gpio/stm32_gpio.c @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include #include -#include + +#include +#include +#include +#include static bool check_gpio(uint32_t bank, uint32_t pin) { diff --git a/drivers/st/io/io_mmc.c b/drivers/st/io/io_mmc.c index 1ed2620576..a239b5f3ad 100644 --- a/drivers/st/io/io_mmc.c +++ b/drivers/st/io/io_mmc.c @@ -5,15 +5,16 @@ */ #include -#include #include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include + /* SDMMC device functions */ static int mmc_dev_open(const uintptr_t init_params, io_dev_info_t **dev_info); static int mmc_block_open(io_dev_info_t *dev_info, const uintptr_t spec, diff --git a/drivers/st/io/io_stm32image.c b/drivers/st/io/io_stm32image.c index e6798e0479..ba612e2e93 100644 --- a/drivers/st/io/io_stm32image.c +++ b/drivers/st/io/io_stm32image.c @@ -5,17 +5,20 @@ */ #include -#include -#include #include -#include -#include -#include -#include -#include #include #include -#include + +#include + +#include +#include +#include +#include +#include +#include + +#include static uintptr_t backend_dev_handle; static uintptr_t backend_image_spec; diff --git a/drivers/st/mmc/stm32_sdmmc2.c b/drivers/st/mmc/stm32_sdmmc2.c index db51581568..787241d597 100644 --- a/drivers/st/mmc/stm32_sdmmc2.c +++ b/drivers/st/mmc/stm32_sdmmc2.c @@ -4,25 +4,27 @@ * 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 +#include +#include +#include + #include -#include -#include -#include -#include /* Registers offsets */ #define SDMMC_POWER 0x00U diff --git a/drivers/st/pmic/stm32_i2c.c b/drivers/st/pmic/stm32_i2c.c index 0980139479..f861ba2963 100644 --- a/drivers/st/pmic/stm32_i2c.c +++ b/drivers/st/pmic/stm32_i2c.c @@ -4,13 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include -#include #include #include -#include + +#include +#include +#include +#include /* STM32 I2C registers offsets */ #define I2C_CR1 0x00U diff --git a/drivers/st/pmic/stm32mp1_pmic.c b/drivers/st/pmic/stm32mp1_pmic.c index 958de08d97..ee4402762f 100644 --- a/drivers/st/pmic/stm32mp1_pmic.c +++ b/drivers/st/pmic/stm32mp1_pmic.c @@ -4,20 +4,24 @@ * 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 /* I2C Timing hard-coded value, for I2C clock source is HSI at 64MHz */ #define I2C_TIMING 0x10D07DB5 diff --git a/drivers/st/pmic/stpmu1.c b/drivers/st/pmic/stpmu1.c index 5951899a1a..9c36bf64a7 100644 --- a/drivers/st/pmic/stpmu1.c +++ b/drivers/st/pmic/stpmu1.c @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include #include +#include +#include +#include + struct regul_struct { const char *dt_node_name; const uint16_t *voltage_table; diff --git a/drivers/st/reset/stm32mp1_reset.c b/drivers/st/reset/stm32mp1_reset.c index 106bbfe624..f58e10b27b 100644 --- a/drivers/st/reset/stm32mp1_reset.c +++ b/drivers/st/reset/stm32mp1_reset.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 #define RST_CLR_OFFSET 4U diff --git a/drivers/st/uart/aarch32/stm32_console.S b/drivers/st/uart/aarch32/stm32_console.S index 303d6bac75..4d00e68ab3 100644 --- a/drivers/st/uart/aarch32/stm32_console.S +++ b/drivers/st/uart/aarch32/stm32_console.S @@ -7,8 +7,8 @@ #include #define USE_FINISH_CONSOLE_REG_2 #include -#include -#include +#include +#include #define USART_TIMEOUT 0x1000 diff --git a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c b/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c index 716d15d18d..74677f64c3 100644 --- a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c +++ b/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ - #include -#include + +#include #include "boot_init_dram_regdef_e3.h" #include "ddr_init_e3.h" diff --git a/drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram.c b/drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram.c index d7291315f6..841eeb4732 100644 --- a/drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram.c +++ b/drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram.c @@ -7,8 +7,10 @@ #include #include #include -#include -#include + +#include +#include + #include "ddr_regdef.h" #include "init_dram_tbl_h3.h" #include "init_dram_tbl_m3.h" diff --git a/drivers/staging/renesas/rcar/ddr/dram_sub_func.c b/drivers/staging/renesas/rcar/ddr/dram_sub_func.c index 4bf6942e03..82aa7f84d0 100644 --- a/drivers/staging/renesas/rcar/ddr/dram_sub_func.c +++ b/drivers/staging/renesas/rcar/ddr/dram_sub_func.c @@ -4,8 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include +#include + #include "dram_sub_func.h" #define PRR (0xFFF00044U) diff --git a/drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.c b/drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.c index d75aa7c346..47fa837b3f 100644 --- a/drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.c +++ b/drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.c @@ -5,7 +5,9 @@ */ #include /* for uint32_t */ -#include + +#include + #include "pfc_init_e3.h" #include "rcar_def.h" diff --git a/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.c b/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.c index 1c38f0600d..f31d99e569 100644 --- a/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.c +++ b/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.c @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include /* for uint32_t */ -#include +#include +#include /* GPIO base address */ #define GPIO_BASE (0xE6050000U) diff --git a/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.c b/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.c index 3ed0cd3e41..e53235a20e 100644 --- a/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.c +++ b/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.c @@ -5,7 +5,9 @@ */ #include /* for uint32_t */ -#include + +#include + #include "pfc_init_h3_v2.h" #include "rcar_def.h" diff --git a/drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.c b/drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.c index 911ee8cc9c..f7e66f2458 100644 --- a/drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.c +++ b/drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.c @@ -5,7 +5,9 @@ */ #include /* for uint32_t */ -#include + +#include + #include "pfc_init_m3.h" #include "rcar_def.h" #include "rcar_private.h" diff --git a/drivers/staging/renesas/rcar/pfc/M3N/pfc_init_m3n.c b/drivers/staging/renesas/rcar/pfc/M3N/pfc_init_m3n.c index a2b6b34a10..e6b8a4f284 100644 --- a/drivers/staging/renesas/rcar/pfc/M3N/pfc_init_m3n.c +++ b/drivers/staging/renesas/rcar/pfc/M3N/pfc_init_m3n.c @@ -5,7 +5,9 @@ */ #include /* for uint32_t */ -#include + +#include + #include "pfc_init_m3n.h" #include "rcar_def.h" diff --git a/drivers/staging/renesas/rcar/pfc/pfc_init.c b/drivers/staging/renesas/rcar/pfc/pfc_init.c index fceff3dddc..f20e8b0b55 100644 --- a/drivers/staging/renesas/rcar/pfc/pfc_init.c +++ b/drivers/staging/renesas/rcar/pfc/pfc_init.c @@ -5,8 +5,10 @@ */ #include -#include -#include + +#include +#include + #include "rcar_def.h" #if RCAR_LSI == RCAR_AUTO #include "H3/pfc_init_h3_v1.h" diff --git a/drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10.c b/drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10.c index efe0c754d3..593fefb624 100644 --- a/drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10.c +++ b/drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10.c @@ -5,7 +5,9 @@ */ #include -#include + +#include + #include "../qos_common.h" #include "../qos_reg.h" #include "qos_init_e3_v10.h" diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v10.c b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v10.c index fd81187c88..21aa3df039 100644 --- a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v10.c +++ b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v10.c @@ -5,7 +5,9 @@ */ #include -#include + +#include + #include "../qos_common.h" #include "qos_init_h3_v10.h" diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v11.c b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v11.c index 1f65600506..5b7348ce0a 100644 --- a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v11.c +++ b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v11.c @@ -5,8 +5,11 @@ */ #include -#include + +#include + #include + #include "../qos_common.h" #include "qos_init_h3_v11.h" diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20.c b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20.c index 6922360655..f27a7dce64 100644 --- a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20.c +++ b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20.c @@ -5,7 +5,9 @@ */ #include -#include + +#include + #include "../qos_common.h" #include "../qos_reg.h" #include "qos_init_h3_v20.h" diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30.c b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30.c index 5986a39483..b3e65df940 100644 --- a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30.c +++ b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30.c @@ -5,7 +5,9 @@ */ #include -#include + +#include + #include "../qos_common.h" #include "../qos_reg.h" #include "qos_init_h3_v30.h" diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30.c b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30.c index 58c37160ed..e4909b9c1d 100644 --- a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30.c +++ b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30.c @@ -5,7 +5,9 @@ */ #include -#include + +#include + #include "../qos_common.h" #include "../qos_reg.h" #include "qos_init_h3n_v30.h" diff --git a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v10.c b/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v10.c index a0d1e14733..c0846d2e25 100644 --- a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v10.c +++ b/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v10.c @@ -5,7 +5,9 @@ */ #include -#include + +#include + #include "../qos_common.h" #include "qos_init_m3_v10.h" diff --git a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11.c b/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11.c index fc0d2cce1e..3186cf68f9 100644 --- a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11.c +++ b/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11.c @@ -5,7 +5,9 @@ */ #include -#include + +#include + #include "../qos_common.h" #include "../qos_reg.h" #include "qos_init_m3_v11.h" diff --git a/drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.c b/drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.c index e9d66761ed..0be68c3cd6 100644 --- a/drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.c +++ b/drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.c @@ -5,7 +5,9 @@ */ #include -#include + +#include + #include "../qos_common.h" #include "../qos_reg.h" #include "qos_init_m3n_v10.h" diff --git a/drivers/staging/renesas/rcar/qos/qos_init.c b/drivers/staging/renesas/rcar/qos/qos_init.c index 54c880309c..1d1bcd59f1 100644 --- a/drivers/staging/renesas/rcar/qos/qos_init.c +++ b/drivers/staging/renesas/rcar/qos/qos_init.c @@ -5,8 +5,10 @@ */ #include -#include -#include + +#include +#include + #include "qos_init.h" #include "qos_common.h" #if RCAR_LSI == RCAR_AUTO diff --git a/drivers/synopsys/emmc/dw_mmc.c b/drivers/synopsys/emmc/dw_mmc.c index eb428198ff..0c5c645701 100644 --- a/drivers/synopsys/emmc/dw_mmc.c +++ b/drivers/synopsys/emmc/dw_mmc.c @@ -4,17 +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 + #define DWMMC_CTRL (0x00) #define CTRL_IDMAC_EN (1 << 25) #define CTRL_DMA_EN (1 << 5) diff --git a/drivers/synopsys/ufs/dw_ufs.c b/drivers/synopsys/ufs/dw_ufs.c index b0ea3e7377..c7c8fc22d2 100644 --- a/drivers/synopsys/ufs/dw_ufs.c +++ b/drivers/synopsys/ufs/dw_ufs.c @@ -5,12 +5,13 @@ */ #include -#include -#include -#include #include #include -#include + +#include +#include +#include +#include static int dwufs_phy_init(ufs_params_t *params) { diff --git a/drivers/ti/uart/aarch64/16550_console.S b/drivers/ti/uart/aarch64/16550_console.S index 785b640dd2..3180593ad9 100644 --- a/drivers/ti/uart/aarch64/16550_console.S +++ b/drivers/ti/uart/aarch64/16550_console.S @@ -9,7 +9,7 @@ #include #define USE_FINISH_CONSOLE_REG_2 #include -#include +#include /* * "core" functions are low-level implementations that don't require diff --git a/drivers/ufs/ufs.c b/drivers/ufs/ufs.c index 515fc2785e..2351c9b04e 100644 --- a/drivers/ufs/ufs.c +++ b/drivers/ufs/ufs.c @@ -4,17 +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 #define CDB_ADDR_MASK 127 #define ALIGN_CDB(x) (((x) + CDB_ADDR_MASK) & ~CDB_ADDR_MASK) diff --git a/include/arch/aarch32/arch.h b/include/arch/aarch32/arch.h index 8260c54919..cbe272c23e 100644 --- a/include/arch/aarch32/arch.h +++ b/include/arch/aarch32/arch.h @@ -7,7 +7,7 @@ #ifndef ARCH_H #define ARCH_H -#include +#include /******************************************************************************* * MIDR bit definitions diff --git a/include/arch/aarch32/arch_helpers.h b/include/arch/aarch32/arch_helpers.h index a6fe14fb89..c2773c1392 100644 --- a/include/arch/aarch32/arch_helpers.h +++ b/include/arch/aarch32/arch_helpers.h @@ -7,11 +7,12 @@ #ifndef ARCH_HELPERS_H #define ARCH_HELPERS_H -#include #include #include #include +#include + /********************************************************************** * Macros which create inline functions to read or write CPU system * registers diff --git a/include/arch/aarch32/asm_macros.S b/include/arch/aarch32/asm_macros.S index c54f75c2d9..8408804fbd 100644 --- a/include/arch/aarch32/asm_macros.S +++ b/include/arch/aarch32/asm_macros.S @@ -7,8 +7,8 @@ #define ASM_MACROS_S #include -#include -#include +#include +#include /* * TLBI instruction with type specifier that implements the workaround for diff --git a/include/arch/aarch32/console_macros.S b/include/arch/aarch32/console_macros.S index ba6e7d050b..ed5088d5a2 100644 --- a/include/arch/aarch32/console_macros.S +++ b/include/arch/aarch32/console_macros.S @@ -6,7 +6,7 @@ #ifndef CONSOLE_MACROS_S #define CONSOLE_MACROS_S -#include +#include /* * This macro encapsulates the common setup that has to be done at the end of diff --git a/include/arch/aarch32/smccc_helpers.h b/include/arch/aarch32/smccc_helpers.h index 67952ec509..d3e5e59c53 100644 --- a/include/arch/aarch32/smccc_helpers.h +++ b/include/arch/aarch32/smccc_helpers.h @@ -7,7 +7,7 @@ #ifndef SMCCC_HELPERS_H #define SMCCC_HELPERS_H -#include +#include /* These are offsets to registers in smc_ctx_t */ #define SMC_CTX_GPREG_R0 U(0x0) @@ -25,9 +25,11 @@ #define SMC_CTX_SIZE U(0x90) #ifndef __ASSEMBLY__ -#include + #include +#include + /* * The generic structure to save arguments and callee saved registers during * an SMC. Also this structure is used to store the result return values after diff --git a/include/arch/aarch64/arch.h b/include/arch/aarch64/arch.h index 72a14dcfa8..8a44d83f0c 100644 --- a/include/arch/aarch64/arch.h +++ b/include/arch/aarch64/arch.h @@ -7,7 +7,7 @@ #ifndef ARCH_H #define ARCH_H -#include +#include /******************************************************************************* * MIDR bit definitions diff --git a/include/arch/aarch64/arch_helpers.h b/include/arch/aarch64/arch_helpers.h index 7222b9dc74..b912b4223a 100644 --- a/include/arch/aarch64/arch_helpers.h +++ b/include/arch/aarch64/arch_helpers.h @@ -7,12 +7,13 @@ #ifndef ARCH_HELPERS_H #define ARCH_HELPERS_H -#include #include #include #include #include +#include + /********************************************************************** * Macros which create inline functions to read or write CPU system * registers diff --git a/include/arch/aarch64/asm_macros.S b/include/arch/aarch64/asm_macros.S index dea3021377..387be4ca3e 100644 --- a/include/arch/aarch64/asm_macros.S +++ b/include/arch/aarch64/asm_macros.S @@ -7,8 +7,8 @@ #define ASM_MACROS_S #include -#include -#include +#include +#include /* * TLBI instruction with type specifier that implements the workaround for diff --git a/include/arch/aarch64/console_macros.S b/include/arch/aarch64/console_macros.S index 5c88d4f229..90ef420487 100644 --- a/include/arch/aarch64/console_macros.S +++ b/include/arch/aarch64/console_macros.S @@ -6,7 +6,7 @@ #ifndef CONSOLE_MACROS_S #define CONSOLE_MACROS_S -#include +#include /* * This macro encapsulates the common setup that has to be done at the end of diff --git a/include/arch/aarch64/smccc_helpers.h b/include/arch/aarch64/smccc_helpers.h index efab18b0c4..e28697d7ef 100644 --- a/include/arch/aarch64/smccc_helpers.h +++ b/include/arch/aarch64/smccc_helpers.h @@ -7,12 +7,14 @@ #ifndef SMCCC_HELPERS_H #define SMCCC_HELPERS_H -#include +#include #ifndef __ASSEMBLY__ -#include + #include +#include + /* Convenience macros to return from SMC handler */ #define SMC_RET0(_h) { \ return (uint64_t) (_h); \ diff --git a/include/bl1/bl1.h b/include/bl1/bl1.h index 39b8d1ede9..7b5d87572b 100644 --- a/include/bl1/bl1.h +++ b/include/bl1/bl1.h @@ -7,7 +7,7 @@ #ifndef BL1_H #define BL1_H -#include +#include /* * Defines for BL1 SMC function ids. @@ -62,7 +62,8 @@ ((_fid >= FWU_SMC_FID_START) && (_fid <= FWU_SMC_FID_END)) #ifndef __ASSEMBLY__ -#include + +#include struct entry_point_info; diff --git a/include/bl1/tbbr/tbbr_img_desc.h b/include/bl1/tbbr/tbbr_img_desc.h index bb36eb50ca..db15cdbfc4 100644 --- a/include/bl1/tbbr/tbbr_img_desc.h +++ b/include/bl1/tbbr/tbbr_img_desc.h @@ -7,7 +7,7 @@ #ifndef TBBR_IMG_DESC_H #define TBBR_IMG_DESC_H -#include +#include extern image_desc_t bl1_tbbr_image_descs[]; diff --git a/include/bl31/ehf.h b/include/bl31/ehf.h index f35d810028..ee00d09361 100644 --- a/include/bl31/ehf.h +++ b/include/bl31/ehf.h @@ -11,7 +11,8 @@ #include #include -#include + +#include /* Valid priorities set bit 0 of the priority handler. */ #define EHF_PRI_VALID_ BIT(0) diff --git a/include/bl31/interrupt_mgmt.h b/include/bl31/interrupt_mgmt.h index 6a49fb6dd9..b1683cc11c 100644 --- a/include/bl31/interrupt_mgmt.h +++ b/include/bl31/interrupt_mgmt.h @@ -8,7 +8,7 @@ #define INTERRUPT_MGMT_H #include -#include +#include /******************************************************************************* * Constants for the types of interrupts recognised by the IM framework diff --git a/include/bl32/payloads/tlk.h b/include/bl32/payloads/tlk.h index 0234cbe4db..2c12633ea1 100644 --- a/include/bl32/payloads/tlk.h +++ b/include/bl32/payloads/tlk.h @@ -7,7 +7,7 @@ #ifndef TLK_H #define TLK_H -#include +#include /* * Generate function IDs for the Trusted OS/Apps diff --git a/include/common/bl_common.h b/include/common/bl_common.h index 56c89fcc4a..c12b08bb7d 100644 --- a/include/common/bl_common.h +++ b/include/common/bl_common.h @@ -7,9 +7,9 @@ #ifndef BL_COMMON_H #define BL_COMMON_H -#include -#include -#include +#include +#include +#include #define UP U(1) #define DOWN U(0) @@ -58,11 +58,11 @@ #define SERROR_AARCH32 U(0xf) #ifndef __ASSEMBLY__ -#include + #include #include -#include /* To retain compatibility */ +#include /* * Declarations of linker defined symbols to help determine memory layout of diff --git a/include/common/debug.h b/include/common/debug.h index a14a66e859..f8faf6835f 100644 --- a/include/common/debug.h +++ b/include/common/debug.h @@ -7,7 +7,7 @@ #ifndef DEBUG_H #define DEBUG_H -#include +#include /* * The log output macros print output to the console. These macros produce @@ -28,12 +28,14 @@ #define LOG_LEVEL_VERBOSE U(50) #ifndef __ASSEMBLY__ + #include -#include #include #include #include +#include + /* * Define Log Markers corresponding to each log level which will * be embedded in the format string and is expected by tf_log() to determine diff --git a/include/common/desc_image_load.h b/include/common/desc_image_load.h index 6254895195..f2f26ea995 100644 --- a/include/common/desc_image_load.h +++ b/include/common/desc_image_load.h @@ -6,7 +6,7 @@ #ifndef DESC_IMAGE_LOAD_H #define DESC_IMAGE_LOAD_H -#include +#include /* Following structure is used to store BL ep/image info. */ typedef struct bl_mem_params_node { diff --git a/include/common/ep_info.h b/include/common/ep_info.h index 0f67687e4a..a09d03ba08 100644 --- a/include/common/ep_info.h +++ b/include/common/ep_info.h @@ -7,8 +7,8 @@ #ifndef EP_INFO_H #define EP_INFO_H -#include -#include +#include +#include #define SECURE U(0x0) #define NON_SECURE U(0x1) @@ -64,9 +64,10 @@ #ifndef __ASSEMBLY__ -#include #include +#include + typedef struct aapcs64_params { u_register_t arg0; u_register_t arg1; diff --git a/include/common/param_header.h b/include/common/param_header.h index e9717cbca7..0c1503f1bb 100644 --- a/include/common/param_header.h +++ b/include/common/param_header.h @@ -8,7 +8,8 @@ #define PARAM_HEADER_H #include -#include + +#include /* Param header types */ #define PARAM_EP U(0x01) diff --git a/include/common/runtime_svc.h b/include/common/runtime_svc.h index e32c2870ae..59bf158b43 100644 --- a/include/common/runtime_svc.h +++ b/include/common/runtime_svc.h @@ -7,10 +7,10 @@ #ifndef RUNTIME_SVC_H #define RUNTIME_SVC_H -#include /* to include exception types */ -#include +#include /* to include exception types */ +#include +#include #include /* to include SMCCC definitions */ -#include /******************************************************************************* * Structure definition, typedefs & constants for the runtime service framework diff --git a/include/common/tbbr/tbbr_img_def.h b/include/common/tbbr/tbbr_img_def.h index bd8f5dc58a..672886dedf 100644 --- a/include/common/tbbr/tbbr_img_def.h +++ b/include/common/tbbr/tbbr_img_def.h @@ -7,7 +7,7 @@ #ifndef TBBR_IMG_DEF_H #define TBBR_IMG_DEF_H -#include +#include /* Firmware Image Package */ #define FIP_IMAGE_ID U(0) diff --git a/include/drivers/arm/cci.h b/include/drivers/arm/cci.h index 24b76dab8a..c5ddcfd448 100644 --- a/include/drivers/arm/cci.h +++ b/include/drivers/arm/cci.h @@ -7,7 +7,7 @@ #ifndef CCI_H #define CCI_H -#include +#include /* Slave interface offsets from PERIPHBASE */ #define SLAVE_IFACE6_OFFSET UL(0x7000) diff --git a/include/drivers/arm/gic_common.h b/include/drivers/arm/gic_common.h index a9ec7b7645..3ac1b43fff 100644 --- a/include/drivers/arm/gic_common.h +++ b/include/drivers/arm/gic_common.h @@ -7,7 +7,7 @@ #ifndef GIC_COMMON_H #define GIC_COMMON_H -#include +#include /******************************************************************************* * GIC Distributor interface general definitions diff --git a/include/drivers/arm/gicv2.h b/include/drivers/arm/gicv2.h index 705077ce3d..6bc5101d13 100644 --- a/include/drivers/arm/gicv2.h +++ b/include/drivers/arm/gicv2.h @@ -7,7 +7,7 @@ #ifndef GICV2_H #define GICV2_H -#include +#include /******************************************************************************* * GICv2 miscellaneous definitions @@ -119,9 +119,10 @@ #ifndef __ASSEMBLY__ #include -#include #include +#include + /******************************************************************************* * This structure describes some of the implementation defined attributes of * the GICv2 IP. It is used by the platform port to specify these attributes diff --git a/include/drivers/arm/gicv3.h b/include/drivers/arm/gicv3.h index c26f2975ab..2382697748 100644 --- a/include/drivers/arm/gicv3.h +++ b/include/drivers/arm/gicv3.h @@ -209,12 +209,13 @@ #ifndef __ASSEMBLY__ -#include -#include -#include #include #include -#include + +#include +#include +#include +#include static inline bool gicv3_is_intr_id_special_identifier(unsigned int id) { diff --git a/include/drivers/arm/pl011.h b/include/drivers/arm/pl011.h index 6216a61fc5..f201f0048f 100644 --- a/include/drivers/arm/pl011.h +++ b/include/drivers/arm/pl011.h @@ -7,7 +7,7 @@ #ifndef PL011_H #define PL011_H -#include +#include /* PL011 Registers */ #define UARTDR 0x000 diff --git a/include/drivers/arm/pl061_gpio.h b/include/drivers/arm/pl061_gpio.h index 6c4a9f5a50..68238c9abe 100644 --- a/include/drivers/arm/pl061_gpio.h +++ b/include/drivers/arm/pl061_gpio.h @@ -7,7 +7,7 @@ #ifndef PL061_GPIO_H #define PL061_GPIO_H -#include +#include void pl061_gpio_register(uintptr_t base_addr, int gpio_dev); void pl061_gpio_init(void); diff --git a/include/drivers/arm/smmu_v3.h b/include/drivers/arm/smmu_v3.h index 1b7ffb8db0..33f3d6fcfc 100644 --- a/include/drivers/arm/smmu_v3.h +++ b/include/drivers/arm/smmu_v3.h @@ -8,7 +8,8 @@ #define SMMU_V3_H #include -#include + +#include /* SMMUv3 register offsets from device base */ #define SMMU_S_IDR1 U(0x8004) diff --git a/include/drivers/arm/sp804_delay_timer.h b/include/drivers/arm/sp804_delay_timer.h index 8eb8715ae8..f8769e8369 100644 --- a/include/drivers/arm/sp804_delay_timer.h +++ b/include/drivers/arm/sp804_delay_timer.h @@ -7,9 +7,9 @@ #ifndef SP804_DELAY_TIMER_H #define SP804_DELAY_TIMER_H -#include #include +#include uint32_t sp804_get_timer_value(void); diff --git a/include/drivers/arm/sp805.h b/include/drivers/arm/sp805.h index e7714a3932..551bfe4bae 100644 --- a/include/drivers/arm/sp805.h +++ b/include/drivers/arm/sp805.h @@ -7,7 +7,7 @@ #ifndef SP805_H #define SP805_H -#include +#include /* SP805 register offset */ #define SP805_WDOG_LOAD_OFF UL(0x000) diff --git a/include/drivers/arm/tzc380.h b/include/drivers/arm/tzc380.h index 19cf988313..03b9b054e7 100644 --- a/include/drivers/arm/tzc380.h +++ b/include/drivers/arm/tzc380.h @@ -7,8 +7,8 @@ #ifndef TZC380_H #define TZC380_H -#include -#include +#include +#include #define TZC380_CONFIGURATION_OFF U(0x000) #define ACTION_OFF U(0x004) diff --git a/include/drivers/arm/tzc400.h b/include/drivers/arm/tzc400.h index a7bb3f6484..98ef0ec1e0 100644 --- a/include/drivers/arm/tzc400.h +++ b/include/drivers/arm/tzc400.h @@ -7,8 +7,8 @@ #ifndef TZC400_H #define TZC400_H -#include -#include +#include +#include #define BUILD_CONFIG_OFF U(0x000) #define GATE_KEEPER_OFF U(0x008) diff --git a/include/drivers/arm/tzc_common.h b/include/drivers/arm/tzc_common.h index 4b8154788a..4820baa1a0 100644 --- a/include/drivers/arm/tzc_common.h +++ b/include/drivers/arm/tzc_common.h @@ -7,7 +7,7 @@ #ifndef TZC_COMMON_H #define TZC_COMMON_H -#include +#include /* * Offset of core registers from the start of the base of configuration diff --git a/include/drivers/arm/tzc_dmc500.h b/include/drivers/arm/tzc_dmc500.h index df6e7f9494..24bfaeb145 100644 --- a/include/drivers/arm/tzc_dmc500.h +++ b/include/drivers/arm/tzc_dmc500.h @@ -7,8 +7,8 @@ #ifndef TZC_DMC500_H #define TZC_DMC500_H -#include -#include +#include +#include #define SI_STATUS_OFFSET U(0x000) #define SI_STATE_CTRL_OFFSET U(0x030) diff --git a/include/drivers/arm/tzc_dmc620.h b/include/drivers/arm/tzc_dmc620.h index 074bbc1224..e0e6760b28 100644 --- a/include/drivers/arm/tzc_dmc620.h +++ b/include/drivers/arm/tzc_dmc620.h @@ -7,7 +7,7 @@ #ifndef TZC_DMC620_H #define TZC_DMC620_H -#include +#include /* DMC-620 memc register offsets */ #define DMC620_MEMC_STATUS U(0x0000) diff --git a/include/drivers/auth/auth_mod.h b/include/drivers/auth/auth_mod.h index 19bc2f135a..908995391d 100644 --- a/include/drivers/auth/auth_mod.h +++ b/include/drivers/auth/auth_mod.h @@ -9,10 +9,10 @@ #if TRUSTED_BOARD_BOOT -#include -#include -#include -#include +#include +#include +#include +#include /* * Image flags diff --git a/include/drivers/auth/img_parser_mod.h b/include/drivers/auth/img_parser_mod.h index 43796935a6..b2fb60ed11 100644 --- a/include/drivers/auth/img_parser_mod.h +++ b/include/drivers/auth/img_parser_mod.h @@ -7,7 +7,7 @@ #ifndef IMG_PARSER_MOD_H #define IMG_PARSER_MOD_H -#include +#include /* * Return values diff --git a/include/drivers/cadence/cdns_uart.h b/include/drivers/cadence/cdns_uart.h index 490be108e5..0a1cf77819 100644 --- a/include/drivers/cadence/cdns_uart.h +++ b/include/drivers/cadence/cdns_uart.h @@ -7,7 +7,7 @@ #ifndef CDNS_UART_H #define CDNS_UART_H -#include +#include /* This is very minimalistic and will only work in QEMU. */ diff --git a/include/drivers/console.h b/include/drivers/console.h index 02f2f8a2dd..24887f9083 100644 --- a/include/drivers/console.h +++ b/include/drivers/console.h @@ -7,7 +7,7 @@ #ifndef CONSOLE_H #define CONSOLE_H -#include +#include #define CONSOLE_T_NEXT (U(0) * REGSZ) #define CONSOLE_T_FLAGS (U(1) * REGSZ) @@ -44,7 +44,9 @@ typedef struct console { int (*const flush)(struct console *console); /* Additional private driver data may follow here. */ } console_t; -#include /* offset macro assertions for console_t */ + +/* offset macro assertions for console_t */ +#include /* * NOTE: There is no publicly accessible console_register() function. Consoles diff --git a/include/drivers/console_assertions.h b/include/drivers/console_assertions.h index 559bb5096f..00caa31416 100644 --- a/include/drivers/console_assertions.h +++ b/include/drivers/console_assertions.h @@ -7,7 +7,7 @@ #ifndef CONSOLE_ASSERTIONS_H #define CONSOLE_ASSERTIONS_H -#include +#include /* * This file contains some separate assertions about console_t, moved here to diff --git a/include/drivers/coreboot/cbmem_console.h b/include/drivers/coreboot/cbmem_console.h index 7fe7a72dac..40c90e6bbf 100644 --- a/include/drivers/coreboot/cbmem_console.h +++ b/include/drivers/coreboot/cbmem_console.h @@ -7,7 +7,7 @@ #ifndef CBMEM_CONSOLE_H #define CBMEM_CONSOLE_H -#include +#include #define CONSOLE_T_CBMC_BASE CONSOLE_T_DRVDATA #define CONSOLE_T_CBMC_SIZE (CONSOLE_T_DRVDATA + REGSZ) diff --git a/include/drivers/io/io_block.h b/include/drivers/io/io_block.h index d6d32f9b74..c99e8c7c6a 100644 --- a/include/drivers/io/io_block.h +++ b/include/drivers/io/io_block.h @@ -7,7 +7,7 @@ #ifndef IO_BLOCK_H #define IO_BLOCK_H -#include +#include /* block devices ops */ typedef struct io_block_ops { diff --git a/include/drivers/io/io_driver.h b/include/drivers/io/io_driver.h index 587f137c55..2b704f491e 100644 --- a/include/drivers/io/io_driver.h +++ b/include/drivers/io/io_driver.h @@ -7,9 +7,9 @@ #ifndef IO_DRIVER_H #define IO_DRIVER_H -#include #include +#include /* Generic IO entity structure,representing an accessible IO construct on the * device, such as a file */ diff --git a/include/drivers/io/io_storage.h b/include/drivers/io/io_storage.h index c496d487e4..ec6db3f2ad 100644 --- a/include/drivers/io/io_storage.h +++ b/include/drivers/io/io_storage.h @@ -10,8 +10,8 @@ #include #include #include /* For ssize_t */ -#include +#include /* Device type which can be used to enable policy decisions about which device * to access */ diff --git a/include/drivers/marvell/ccu.h b/include/drivers/marvell/ccu.h index 2757765bc6..546d9f13bc 100644 --- a/include/drivers/marvell/ccu.h +++ b/include/drivers/marvell/ccu.h @@ -11,7 +11,7 @@ #define CCU_H #ifndef __ASSEMBLY__ -#include +#include #endif /* CCU registers definitions */ diff --git a/include/drivers/marvell/gwin.h b/include/drivers/marvell/gwin.h index 6b7f1752f8..1b874a7450 100644 --- a/include/drivers/marvell/gwin.h +++ b/include/drivers/marvell/gwin.h @@ -10,7 +10,7 @@ #ifndef GWIN_H #define GWIN_H -#include +#include int init_gwin(int ap_index); void gwin_temp_win_insert(int ap_index, struct addr_map_win *win, int size); diff --git a/include/drivers/marvell/io_win.h b/include/drivers/marvell/io_win.h index 45e86666aa..7438d6b4b8 100644 --- a/include/drivers/marvell/io_win.h +++ b/include/drivers/marvell/io_win.h @@ -10,7 +10,7 @@ #ifndef IO_WIN_H #define IO_WIN_H -#include +#include int init_io_win(int ap_index); void iow_temp_win_insert(int ap_index, struct addr_map_win *win, int size); diff --git a/include/drivers/marvell/iob.h b/include/drivers/marvell/iob.h index ccbdf960d6..9b5e515a4f 100644 --- a/include/drivers/marvell/iob.h +++ b/include/drivers/marvell/iob.h @@ -10,7 +10,7 @@ #ifndef IOB_H #define IOB_H -#include +#include enum target_ids_iob { INTERNAL_TID = 0x0, diff --git a/include/drivers/marvell/mochi/cp110_setup.h b/include/drivers/marvell/mochi/cp110_setup.h index 18d9f18100..3686257d3d 100644 --- a/include/drivers/marvell/mochi/cp110_setup.h +++ b/include/drivers/marvell/mochi/cp110_setup.h @@ -10,7 +10,8 @@ #ifndef CP110_SETUP_H #define CP110_SETUP_H -#include +#include + #include #define MVEBU_DEVICE_ID_REG (MVEBU_CP_DFX_OFFSET + 0x40) diff --git a/include/drivers/marvell/uart/a3700_console.h b/include/drivers/marvell/uart/a3700_console.h index 01335a2a3a..5511d96c44 100644 --- a/include/drivers/marvell/uart/a3700_console.h +++ b/include/drivers/marvell/uart/a3700_console.h @@ -8,7 +8,7 @@ #ifndef A3700_CONSOLE_H #define A3700_CONSOLE_H -#include +#include /* MVEBU UART Registers */ #define UART_RX_REG 0x00 diff --git a/include/drivers/meson/meson_console.h b/include/drivers/meson/meson_console.h index 759571ddac..5da1e3fd45 100644 --- a/include/drivers/meson/meson_console.h +++ b/include/drivers/meson/meson_console.h @@ -7,7 +7,7 @@ #ifndef MESON_CONSOLE_H #define MESON_CONSOLE_H -#include +#include #define CONSOLE_T_MESON_BASE CONSOLE_T_DRVDATA diff --git a/include/drivers/mmc.h b/include/drivers/mmc.h index a62928bc68..2aaa28d689 100644 --- a/include/drivers/mmc.h +++ b/include/drivers/mmc.h @@ -8,7 +8,8 @@ #define MMC_H #include -#include + +#include #define MMC_BLOCK_SIZE U(512) #define MMC_BLOCK_MASK (MMC_BLOCK_SIZE - U(1)) diff --git a/include/drivers/partition/gpt.h b/include/drivers/partition/gpt.h index 7984e4d801..3ae160fdc1 100644 --- a/include/drivers/partition/gpt.h +++ b/include/drivers/partition/gpt.h @@ -7,7 +7,7 @@ #ifndef GPT_H #define GPT_H -#include +#include #define PARTITION_TYPE_GPT 0xee #define GPT_HEADER_OFFSET PARTITION_BLOCK_SIZE diff --git a/include/drivers/partition/partition.h b/include/drivers/partition/partition.h index 2aeaace9f6..d94c7824a6 100644 --- a/include/drivers/partition/partition.h +++ b/include/drivers/partition/partition.h @@ -7,9 +7,10 @@ #ifndef PARTITION_H #define PARTITION_H -#include #include +#include + #if !PLAT_PARTITION_MAX_ENTRIES # define PLAT_PARTITION_MAX_ENTRIES 128 #endif /* PLAT_PARTITION_MAX_ENTRIES */ diff --git a/include/drivers/st/io_mmc.h b/include/drivers/st/io_mmc.h index de71e7d8a0..b35b4b5d0d 100644 --- a/include/drivers/st/io_mmc.h +++ b/include/drivers/st/io_mmc.h @@ -7,7 +7,7 @@ #ifndef IO_MMC_H #define IO_MMC_H -#include +#include int register_io_dev_mmc(const io_dev_connector_t **dev_con); diff --git a/include/drivers/st/io_stm32image.h b/include/drivers/st/io_stm32image.h index b668219601..68060558ba 100644 --- a/include/drivers/st/io_stm32image.h +++ b/include/drivers/st/io_stm32image.h @@ -7,8 +7,8 @@ #ifndef IO_STM32IMAGE_H #define IO_STM32IMAGE_H -#include -#include +#include +#include #define MAX_LBA_SIZE 512 #define MAX_PART_NAME_SIZE (EFI_NAMELEN + 1) diff --git a/include/drivers/st/stm32_console.h b/include/drivers/st/stm32_console.h index 57e6d7409a..b30376828f 100644 --- a/include/drivers/st/stm32_console.h +++ b/include/drivers/st/stm32_console.h @@ -7,7 +7,7 @@ #ifndef STM32_CONSOLE_H #define STM32_CONSOLE_H -#include +#include #define CONSOLE_T_STM32_BASE CONSOLE_T_DRVDATA diff --git a/include/drivers/st/stm32_gpio.h b/include/drivers/st/stm32_gpio.h index 938922b480..acd95ecabf 100644 --- a/include/drivers/st/stm32_gpio.h +++ b/include/drivers/st/stm32_gpio.h @@ -7,7 +7,7 @@ #ifndef STM32_GPIO_H #define STM32_GPIO_H -#include +#include #define STM32_GPIOA_BANK U(0x50002000) #define STM32_GPIOZ_BANK U(0x54004000) diff --git a/include/drivers/st/stm32_i2c.h b/include/drivers/st/stm32_i2c.h index 4760c00fe5..de2ca59c80 100644 --- a/include/drivers/st/stm32_i2c.h +++ b/include/drivers/st/stm32_i2c.h @@ -8,7 +8,8 @@ #define STM32_I2C_H #include -#include + +#include /* Bit definition for I2C_CR1 register */ #define I2C_CR1_PE BIT(0) diff --git a/include/drivers/st/stm32_sdmmc2.h b/include/drivers/st/stm32_sdmmc2.h index b172659263..aa9472c830 100644 --- a/include/drivers/st/stm32_sdmmc2.h +++ b/include/drivers/st/stm32_sdmmc2.h @@ -7,9 +7,10 @@ #ifndef STM32_SDMMC2_H #define STM32_SDMMC2_H -#include #include +#include + struct stm32_sdmmc2_params { uintptr_t reg_base; unsigned int clk_rate; diff --git a/include/drivers/st/stm32_uart_regs.h b/include/drivers/st/stm32_uart_regs.h index e78d3d481c..14b296c4bc 100644 --- a/include/drivers/st/stm32_uart_regs.h +++ b/include/drivers/st/stm32_uart_regs.h @@ -7,7 +7,7 @@ #ifndef STM32_UART_REGS_H #define STM32_UART_REGS_H -#include +#include #define USART_CR1 U(0x00) #define USART_CR2 U(0x04) diff --git a/include/drivers/st/stm32mp1_clk.h b/include/drivers/st/stm32mp1_clk.h index c895517252..5594e23276 100644 --- a/include/drivers/st/stm32mp1_clk.h +++ b/include/drivers/st/stm32mp1_clk.h @@ -7,9 +7,10 @@ #ifndef STM32MP1_CLK_H #define STM32MP1_CLK_H -#include #include +#include + int stm32mp1_clk_probe(void); int stm32mp1_clk_init(void); bool stm32mp1_clk_is_enabled(unsigned long id); diff --git a/include/drivers/st/stm32mp1_clkfunc.h b/include/drivers/st/stm32mp1_clkfunc.h index 2467af9bb2..106dcae016 100644 --- a/include/drivers/st/stm32mp1_clkfunc.h +++ b/include/drivers/st/stm32mp1_clkfunc.h @@ -7,9 +7,10 @@ #ifndef STM32MP1_CLKFUNC_H #define STM32MP1_CLKFUNC_H -#include #include +#include + enum stm32mp_osc_id { _HSI, _HSE, diff --git a/include/drivers/st/stm32mp1_ddr_regs.h b/include/drivers/st/stm32mp1_ddr_regs.h index 288e072d21..bfcd5e2104 100644 --- a/include/drivers/st/stm32mp1_ddr_regs.h +++ b/include/drivers/st/stm32mp1_ddr_regs.h @@ -7,7 +7,7 @@ #ifndef STM32MP1_DDR_REGS_H #define STM32MP1_DDR_REGS_H -#include +#include /* DDR3/LPDDR2/LPDDR3 Controller (DDRCTRL) registers */ struct stm32mp1_ddrctl { diff --git a/include/drivers/st/stm32mp1_pmic.h b/include/drivers/st/stm32mp1_pmic.h index cc80b25ab4..256e340bec 100644 --- a/include/drivers/st/stm32mp1_pmic.h +++ b/include/drivers/st/stm32mp1_pmic.h @@ -9,6 +9,8 @@ #include +#include + bool dt_check_pmic(void); int dt_pmic_enable_boot_on_regulators(void); void initialize_pmic_i2c(void); diff --git a/include/drivers/st/stm32mp1_pwr.h b/include/drivers/st/stm32mp1_pwr.h index b34536eaee..e17df44fb7 100644 --- a/include/drivers/st/stm32mp1_pwr.h +++ b/include/drivers/st/stm32mp1_pwr.h @@ -7,7 +7,7 @@ #ifndef STM32MP1_PWR_H #define STM32MP1_PWR_H -#include +#include #define PWR_CR1 U(0x00) #define PWR_CR2 U(0x08) diff --git a/include/drivers/st/stm32mp1_rcc.h b/include/drivers/st/stm32mp1_rcc.h index 87f4d7f73e..fd406c57e7 100644 --- a/include/drivers/st/stm32mp1_rcc.h +++ b/include/drivers/st/stm32mp1_rcc.h @@ -7,7 +7,7 @@ #ifndef STM32MP1_RCC_H #define STM32MP1_RCC_H -#include +#include #define RCC_TZCR U(0x00) #define RCC_OCENSETR U(0x0C) diff --git a/include/drivers/st/stpmu1.h b/include/drivers/st/stpmu1.h index 4bbcebbec5..e75d9a66b2 100644 --- a/include/drivers/st/stpmu1.h +++ b/include/drivers/st/stpmu1.h @@ -7,8 +7,8 @@ #ifndef STPMU1_H #define STPMU1_H -#include -#include +#include +#include #define TURN_ON_REG 0x1U #define TURN_OFF_REG 0x2U diff --git a/include/drivers/synopsys/dw_mmc.h b/include/drivers/synopsys/dw_mmc.h index 533a876fc4..7031e0f46f 100644 --- a/include/drivers/synopsys/dw_mmc.h +++ b/include/drivers/synopsys/dw_mmc.h @@ -7,7 +7,7 @@ #ifndef DW_MMC_H #define DW_MMC_H -#include +#include typedef struct dw_mmc_params { uintptr_t reg_base; diff --git a/include/drivers/ti/uart/uart_16550.h b/include/drivers/ti/uart/uart_16550.h index ad80c57724..92b1ea8c3a 100644 --- a/include/drivers/ti/uart/uart_16550.h +++ b/include/drivers/ti/uart/uart_16550.h @@ -7,7 +7,7 @@ #ifndef UART_16550_H #define UART_16550_H -#include +#include /* UART16550 Registers */ #define UARTTX 0x0 diff --git a/include/drivers/ufs.h b/include/drivers/ufs.h index 414649bd4b..a10cd80341 100644 --- a/include/drivers/ufs.h +++ b/include/drivers/ufs.h @@ -7,7 +7,7 @@ #ifndef UFS_H #define UFS_H -#include +#include /* register map of UFSHCI */ /* Controller Capabilities */ diff --git a/include/lib/bakery_lock.h b/include/lib/bakery_lock.h index 2d1612e17b..a2f540c627 100644 --- a/include/lib/bakery_lock.h +++ b/include/lib/bakery_lock.h @@ -15,7 +15,8 @@ #include #include #include -#include + +#include /***************************************************************************** * Internal helpers used by the bakery lock implementation. diff --git a/include/lib/cpus/aarch32/cortex_a57.h b/include/lib/cpus/aarch32/cortex_a57.h index 6f60c1146a..2ac1e17d8d 100644 --- a/include/lib/cpus/aarch32/cortex_a57.h +++ b/include/lib/cpus/aarch32/cortex_a57.h @@ -7,7 +7,7 @@ #ifndef CORTEX_A57_H #define CORTEX_A57_H -#include +#include /* Cortex-A57 midr for revision 0 */ #define CORTEX_A57_MIDR 0x410FD070 diff --git a/include/lib/cpus/aarch32/cortex_a72.h b/include/lib/cpus/aarch32/cortex_a72.h index f45865a399..95402d0a72 100644 --- a/include/lib/cpus/aarch32/cortex_a72.h +++ b/include/lib/cpus/aarch32/cortex_a72.h @@ -6,7 +6,8 @@ #ifndef CORTEX_A72_H #define CORTEX_A72_H -#include + +#include /* Cortex-A72 midr for revision 0 */ #define CORTEX_A72_MIDR 0x410FD080 diff --git a/include/lib/cpus/aarch32/cpu_macros.S b/include/lib/cpus/aarch32/cpu_macros.S index 1c0da0f2b0..a5ae6a486f 100644 --- a/include/lib/cpus/aarch32/cpu_macros.S +++ b/include/lib/cpus/aarch32/cpu_macros.S @@ -7,7 +7,7 @@ #define CPU_MACROS_S #include -#include +#include #if defined(IMAGE_BL1) || defined(IMAGE_BL32) || (defined(IMAGE_BL2) && BL2_AT_EL3) #define IMAGE_AT_EL3 diff --git a/include/lib/cpus/aarch64/cortex_a57.h b/include/lib/cpus/aarch64/cortex_a57.h index 71d07db5f0..5b6c9dd292 100644 --- a/include/lib/cpus/aarch64/cortex_a57.h +++ b/include/lib/cpus/aarch64/cortex_a57.h @@ -6,7 +6,8 @@ #ifndef CORTEX_A57_H #define CORTEX_A57_H -#include + +#include /* Cortex-A57 midr for revision 0 */ #define CORTEX_A57_MIDR U(0x410FD070) diff --git a/include/lib/cpus/aarch64/cortex_a72.h b/include/lib/cpus/aarch64/cortex_a72.h index 4eafc11e1a..60b6c61901 100644 --- a/include/lib/cpus/aarch64/cortex_a72.h +++ b/include/lib/cpus/aarch64/cortex_a72.h @@ -6,7 +6,8 @@ #ifndef CORTEX_A72_H #define CORTEX_A72_H -#include + +#include /* Cortex-A72 midr for revision 0 */ #define CORTEX_A72_MIDR 0x410FD080 diff --git a/include/lib/cpus/aarch64/cortex_a75.h b/include/lib/cpus/aarch64/cortex_a75.h index f68f98f634..fabc1afdc4 100644 --- a/include/lib/cpus/aarch64/cortex_a75.h +++ b/include/lib/cpus/aarch64/cortex_a75.h @@ -7,7 +7,7 @@ #ifndef CORTEX_A75_H #define CORTEX_A75_H -#include +#include /* Cortex-A75 MIDR */ #define CORTEX_A75_MIDR U(0x410fd0a0) diff --git a/include/lib/cpus/aarch64/cortex_ares.h b/include/lib/cpus/aarch64/cortex_ares.h index 4f3e812962..cfc36e4738 100644 --- a/include/lib/cpus/aarch64/cortex_ares.h +++ b/include/lib/cpus/aarch64/cortex_ares.h @@ -7,7 +7,7 @@ #ifndef CORTEX_ARES_H #define CORTEX_ARES_H -#include +#include /* Cortex-ARES MIDR for revision 0 */ #define CORTEX_ARES_MIDR U(0x410fd0c0) diff --git a/include/lib/cpus/aarch64/cpu_macros.S b/include/lib/cpus/aarch64/cpu_macros.S index 2875700541..b907668b3b 100644 --- a/include/lib/cpus/aarch64/cpu_macros.S +++ b/include/lib/cpus/aarch64/cpu_macros.S @@ -7,7 +7,7 @@ #define CPU_MACROS_S #include -#include +#include #define CPU_IMPL_PN_MASK (MIDR_IMPL_MASK << MIDR_IMPL_SHIFT) | \ (MIDR_PN_MASK << MIDR_PN_SHIFT) diff --git a/include/lib/cpus/aarch64/dsu_def.h b/include/lib/cpus/aarch64/dsu_def.h index 0e2d93a8c3..aa8b1b1ab5 100644 --- a/include/lib/cpus/aarch64/dsu_def.h +++ b/include/lib/cpus/aarch64/dsu_def.h @@ -7,7 +7,7 @@ #ifndef DSU_DEF_H #define DSU_DEF_H -#include +#include /******************************************************************** * DSU control registers definitions * diff --git a/include/lib/cpus/errata_report.h b/include/lib/cpus/errata_report.h index c97d4c2473..17b2c30f85 100644 --- a/include/lib/cpus/errata_report.h +++ b/include/lib/cpus/errata_report.h @@ -11,8 +11,8 @@ #include #include -#include -#include +#include +#include #if DEBUG void print_errata_status(void); diff --git a/include/lib/el3_runtime/aarch32/context.h b/include/lib/el3_runtime/aarch32/context.h index 1ea19ca7c5..86ff53a673 100644 --- a/include/lib/el3_runtime/aarch32/context.h +++ b/include/lib/el3_runtime/aarch32/context.h @@ -7,7 +7,7 @@ #ifndef CONTEXT_H #define CONTEXT_H -#include +#include /******************************************************************************* * Constants that allow assembler code to access members of and the 'regs' @@ -26,9 +26,10 @@ #ifndef __ASSEMBLY__ -#include #include +#include + /* * Common constants to help define the 'cpu_context' structure and its * members below. diff --git a/include/lib/el3_runtime/aarch64/context.h b/include/lib/el3_runtime/aarch64/context.h index 8c5f4c68d7..70c50aae27 100644 --- a/include/lib/el3_runtime/aarch64/context.h +++ b/include/lib/el3_runtime/aarch64/context.h @@ -7,7 +7,7 @@ #ifndef CONTEXT_H #define CONTEXT_H -#include +#include /******************************************************************************* * Constants that allow assembler code to access members of and the 'gp_regs' @@ -180,10 +180,12 @@ #ifndef __ASSEMBLY__ -#include -#include /* for CACHE_WRITEBACK_GRANULE */ #include +#include /* for CACHE_WRITEBACK_GRANULE */ + +#include + /* * Common constants to help define the 'cpu_context' structure and its * members below. diff --git a/include/lib/el3_runtime/context_mgmt.h b/include/lib/el3_runtime/context_mgmt.h index 149ac3ffd1..f23f9cd44d 100644 --- a/include/lib/el3_runtime/context_mgmt.h +++ b/include/lib/el3_runtime/context_mgmt.h @@ -7,11 +7,12 @@ #ifndef CONTEXT_MGMT_H #define CONTEXT_MGMT_H -#include #include #include #include +#include + /******************************************************************************* * Forward declarations ******************************************************************************/ diff --git a/include/lib/el3_runtime/cpu_data.h b/include/lib/el3_runtime/cpu_data.h index 561f8beedb..9e1d7f16c7 100644 --- a/include/lib/el3_runtime/cpu_data.h +++ b/include/lib/el3_runtime/cpu_data.h @@ -7,9 +7,10 @@ #ifndef CPU_DATA_H #define CPU_DATA_H -#include #include /* CACHE_WRITEBACK_GRANULE required */ +#include + #ifdef AARCH32 #if CRASH_REPORTING @@ -51,9 +52,9 @@ #ifndef __ASSEMBLY__ #include -#include +#include +#include #include -#include #include /* Offsets for the cpu_data structure */ diff --git a/include/lib/el3_runtime/pubsub.h b/include/lib/el3_runtime/pubsub.h index 930952ff82..eb91286564 100644 --- a/include/lib/el3_runtime/pubsub.h +++ b/include/lib/el3_runtime/pubsub.h @@ -30,11 +30,12 @@ /* For the compiler ... */ -#include #include #include #include +#include + #define __pubsub_section(event) __section("__pubsub_" #event) /* diff --git a/include/lib/el3_runtime/pubsub_events.h b/include/lib/el3_runtime/pubsub_events.h index 64b3f630c9..8e4a87afd4 100644 --- a/include/lib/el3_runtime/pubsub_events.h +++ b/include/lib/el3_runtime/pubsub_events.h @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include /* * This file defines a list of pubsub events, declared using diff --git a/include/lib/extensions/amu.h b/include/lib/extensions/amu.h index 1836fe5ae6..99ecfccbbf 100644 --- a/include/lib/extensions/amu.h +++ b/include/lib/extensions/amu.h @@ -7,11 +7,13 @@ #ifndef AMU_H #define AMU_H -#include -#include #include #include -#include + +#include + +#include +#include /* All group 0 counters */ #define AMU_GROUP0_COUNTERS_MASK U(0xf) diff --git a/include/lib/extensions/ras.h b/include/lib/extensions/ras.h index 62fd63f93d..9f6b2905f1 100644 --- a/include/lib/extensions/ras.h +++ b/include/lib/extensions/ras.h @@ -71,7 +71,8 @@ #ifndef __ASSEMBLY__ #include -#include + +#include struct err_record_info; diff --git a/include/lib/extensions/ras_arch.h b/include/lib/extensions/ras_arch.h index e6cd736aee..e9375a3560 100644 --- a/include/lib/extensions/ras_arch.h +++ b/include/lib/extensions/ras_arch.h @@ -184,7 +184,7 @@ #include #include #include -#include +#include #include /* diff --git a/include/lib/libc/assert.h b/include/lib/libc/assert.h index 2cca6a0b28..d04f9dc043 100644 --- a/include/lib/libc/assert.h +++ b/include/lib/libc/assert.h @@ -8,9 +8,11 @@ #define ASSERT_H #include -#include + #include +#include + #ifndef PLAT_LOG_LEVEL_ASSERT #define PLAT_LOG_LEVEL_ASSERT LOG_LEVEL #endif diff --git a/include/lib/object_pool.h b/include/lib/object_pool.h index 7d40b41d81..0f85331a87 100644 --- a/include/lib/object_pool.h +++ b/include/lib/object_pool.h @@ -7,9 +7,10 @@ #ifndef OBJECT_POOL_H #define OBJECT_POOL_H -#include #include -#include + +#include +#include /* * Pool of statically allocated objects. diff --git a/include/lib/optee_utils.h b/include/lib/optee_utils.h index b13c4504fd..6067caff42 100644 --- a/include/lib/optee_utils.h +++ b/include/lib/optee_utils.h @@ -3,10 +3,11 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + #ifndef OPTEE_UTILS_H #define OPTEE_UTILS_H -#include +#include int parse_optee_header(entry_point_info_t *header_ep, image_info_t *pager_image_info, diff --git a/include/lib/pmf/pmf.h b/include/lib/pmf/pmf.h index 18ef0a5598..df7c9ff310 100644 --- a/include/lib/pmf/pmf.h +++ b/include/lib/pmf/pmf.h @@ -7,9 +7,9 @@ #ifndef PMF_H #define PMF_H -#include -#include -#include +#include +#include +#include /* * Constants used for/by PMF services. diff --git a/include/lib/pmf/pmf_helpers.h b/include/lib/pmf/pmf_helpers.h index c535b222d3..e6798a7ce7 100644 --- a/include/lib/pmf/pmf_helpers.h +++ b/include/lib/pmf/pmf_helpers.h @@ -7,13 +7,14 @@ #ifndef PMF_HELPERS_H #define PMF_HELPERS_H -#include #include -#include -#include #include #include +#include +#include +#include + /* * Prototype for PMF service functions. */ diff --git a/include/lib/psci/psci.h b/include/lib/psci/psci.h index b7febc38f0..fe279d4f2c 100644 --- a/include/lib/psci/psci.h +++ b/include/lib/psci/psci.h @@ -7,11 +7,12 @@ #ifndef PSCI_H #define PSCI_H -#include -#include #include /* for PLAT_NUM_PWR_DOMAINS */ -#include /* To maintain compatibility for SPDs */ -#include + +#include +#include +#include /* To maintain compatibility for SPDs */ +#include /******************************************************************************* * Number of power domains whose state this PSCI implementation can track diff --git a/include/lib/psci/psci_lib.h b/include/lib/psci/psci_lib.h index 134cad9e0e..53d7711b12 100644 --- a/include/lib/psci/psci_lib.h +++ b/include/lib/psci/psci_lib.h @@ -7,9 +7,10 @@ #ifndef PSCI_LIB_H #define PSCI_LIB_H -#include +#include #ifndef __ASSEMBLY__ + #include #include diff --git a/include/lib/runtime_instr.h b/include/lib/runtime_instr.h index cb648391ee..f5a3f13865 100644 --- a/include/lib/runtime_instr.h +++ b/include/lib/runtime_instr.h @@ -7,7 +7,7 @@ #ifndef RUNTIME_INSTR_H #define RUNTIME_INSTR_H -#include +#include #define RT_INSTR_ENTER_PSCI U(0) #define RT_INSTR_EXIT_PSCI U(1) diff --git a/include/lib/smccc.h b/include/lib/smccc.h index 6ee8aa07d3..b10c52ce9c 100644 --- a/include/lib/smccc.h +++ b/include/lib/smccc.h @@ -7,7 +7,7 @@ #ifndef SMCCC_H #define SMCCC_H -#include +#include #define SMCCC_VERSION_MAJOR_SHIFT U(16) #define SMCCC_VERSION_MAJOR_MASK U(0x7FFF) @@ -21,10 +21,10 @@ #if SMCCC_MAJOR_VERSION == 1 # define SMCCC_MINOR_VERSION U(1) -# include +# include #elif SMCCC_MAJOR_VERSION == 2 # define SMCCC_MINOR_VERSION U(0) -# include +# include #else # error "Unsupported version of SMCCC." #endif @@ -35,9 +35,10 @@ #ifndef __ASSEMBLY__ -#include #include +#include + #define is_caller_non_secure(_f) (((_f) & SMC_FROM_NON_SECURE) != U(0)) #define is_caller_secure(_f) (!is_caller_non_secure(_f)) diff --git a/include/lib/utils.h b/include/lib/utils.h index b6ab26ec79..6748454044 100644 --- a/include/lib/utils.h +++ b/include/lib/utils.h @@ -13,6 +13,7 @@ */ #if !(defined(__LINKER__) || defined(__ASSEMBLY__)) +#include #include typedef struct mem_region { diff --git a/include/lib/xlat_tables/aarch32/xlat_tables_aarch32.h b/include/lib/xlat_tables/aarch32/xlat_tables_aarch32.h index 37f3b53b70..a333d1e4e3 100644 --- a/include/lib/xlat_tables/aarch32/xlat_tables_aarch32.h +++ b/include/lib/xlat_tables/aarch32/xlat_tables_aarch32.h @@ -8,8 +8,8 @@ #define XLAT_TABLES_AARCH32_H #include -#include -#include +#include +#include #if !defined(PAGE_SIZE) #error "PAGE_SIZE is not defined." diff --git a/include/lib/xlat_tables/aarch64/xlat_tables_aarch64.h b/include/lib/xlat_tables/aarch64/xlat_tables_aarch64.h index 91ca8e477e..cc5624c91e 100644 --- a/include/lib/xlat_tables/aarch64/xlat_tables_aarch64.h +++ b/include/lib/xlat_tables/aarch64/xlat_tables_aarch64.h @@ -8,8 +8,8 @@ #define XLAT_TABLES_AARCH64_H #include -#include -#include +#include +#include #if !defined(PAGE_SIZE) #error "PAGE_SIZE is not defined." diff --git a/include/lib/xlat_tables/xlat_tables.h b/include/lib/xlat_tables/xlat_tables.h index 050679d94f..9e2543fbbc 100644 --- a/include/lib/xlat_tables/xlat_tables.h +++ b/include/lib/xlat_tables/xlat_tables.h @@ -7,12 +7,13 @@ #ifndef XLAT_TABLES_H #define XLAT_TABLES_H -#include +#include #ifndef __ASSEMBLY__ #include #include -#include + +#include /* Helper macro to define entries for mmap_region_t. It creates * identity mappings for each region. diff --git a/include/lib/xlat_tables/xlat_tables_compat.h b/include/lib/xlat_tables/xlat_tables_compat.h index 4650a8c6f4..90768db5db 100644 --- a/include/lib/xlat_tables/xlat_tables_compat.h +++ b/include/lib/xlat_tables/xlat_tables_compat.h @@ -5,7 +5,7 @@ */ #if XLAT_TABLES_LIB_V2 -#include +#include #else -#include +#include #endif diff --git a/include/lib/xlat_tables/xlat_tables_defs.h b/include/lib/xlat_tables/xlat_tables_defs.h index 09baae9bf7..6d0fb7896f 100644 --- a/include/lib/xlat_tables/xlat_tables_defs.h +++ b/include/lib/xlat_tables/xlat_tables_defs.h @@ -8,8 +8,8 @@ #define XLAT_TABLES_DEFS_H #include -#include -#include +#include +#include /* Miscellaneous MMU related constants */ #define NUM_2MB_IN_GB (U(1) << 9) diff --git a/include/lib/xlat_tables/xlat_tables_v2.h b/include/lib/xlat_tables/xlat_tables_v2.h index 5c4edc31a8..5551426838 100644 --- a/include/lib/xlat_tables/xlat_tables_v2.h +++ b/include/lib/xlat_tables/xlat_tables_v2.h @@ -7,13 +7,14 @@ #ifndef XLAT_TABLES_V2_H #define XLAT_TABLES_V2_H -#include -#include +#include +#include #ifndef __ASSEMBLY__ #include #include -#include + +#include /* * Default granularity size for an mmap_region_t. diff --git a/include/lib/xlat_tables/xlat_tables_v2_helpers.h b/include/lib/xlat_tables/xlat_tables_v2_helpers.h index fa8995886e..ce5cf820a0 100644 --- a/include/lib/xlat_tables/xlat_tables_v2_helpers.h +++ b/include/lib/xlat_tables/xlat_tables_v2_helpers.h @@ -18,12 +18,14 @@ #ifndef __ASSEMBLY__ -#include -#include #include #include -#include -#include + +#include + +#include +#include +#include /* Forward declaration */ struct mmap_region; diff --git a/include/plat/arm/board/common/board_css_def.h b/include/plat/arm/board/common/board_css_def.h index 29211be2a6..6cca38909a 100644 --- a/include/plat/arm/board/common/board_css_def.h +++ b/include/plat/arm/board/common/board_css_def.h @@ -7,9 +7,10 @@ #ifndef BOARD_CSS_DEF_H #define BOARD_CSS_DEF_H -#include +#include +#include + #include -#include #include /* @@ -31,7 +32,7 @@ #ifndef __ASSEMBLY__ -#include +#include #define BOARD_CSS_GET_PLAT_TYPE(addr) \ ((mmio_read_32(addr) & BOARD_CSS_PLAT_ID_REG_ID_MASK) \ diff --git a/include/plat/arm/board/common/v2m_def.h b/include/plat/arm/board/common/v2m_def.h index ed57fc9a0d..c5de407af5 100644 --- a/include/plat/arm/board/common/v2m_def.h +++ b/include/plat/arm/board/common/v2m_def.h @@ -6,7 +6,7 @@ #ifndef V2M_DEF_H #define V2M_DEF_H -#include +#include /* V2M motherboard system registers & offsets */ #define V2M_SYSREGS_BASE UL(0x1c010000) diff --git a/include/plat/arm/common/aarch64/arm_macros.S b/include/plat/arm/common/aarch64/arm_macros.S index c2ba7db9fd..0bd0daf53b 100644 --- a/include/plat/arm/common/aarch64/arm_macros.S +++ b/include/plat/arm/common/aarch64/arm_macros.S @@ -6,9 +6,9 @@ #ifndef ARM_MACROS_S #define ARM_MACROS_S -#include -#include -#include +#include +#include +#include #include .section .rodata.gic_reg_name, "aS" diff --git a/include/plat/arm/common/aarch64/cci_macros.S b/include/plat/arm/common/aarch64/cci_macros.S index 069dc854f1..07f7cd39a5 100644 --- a/include/plat/arm/common/aarch64/cci_macros.S +++ b/include/plat/arm/common/aarch64/cci_macros.S @@ -6,7 +6,7 @@ #ifndef CCI_MACROS_S #define CCI_MACROS_S -#include +#include #include .section .rodata.cci_reg_name, "aS" diff --git a/include/plat/arm/common/arm_config.h b/include/plat/arm/common/arm_config.h index 4dda350604..c2b28df5bd 100644 --- a/include/plat/arm/common/arm_config.h +++ b/include/plat/arm/common/arm_config.h @@ -7,7 +7,8 @@ #define ARM_CONFIG_H #include -#include + +#include /* Whether Base memory map is in use */ #define ARM_CONFIG_BASE_MMAP BIT(1) diff --git a/include/plat/arm/common/arm_def.h b/include/plat/arm/common/arm_def.h index 4ab3a80867..c63fddb3f3 100644 --- a/include/plat/arm/common/arm_def.h +++ b/include/plat/arm/common/arm_def.h @@ -6,15 +6,15 @@ #ifndef ARM_DEF_H #define ARM_DEF_H -#include -#include -#include -#include #include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include /****************************************************************************** * Definitions common to all ARM standard platforms diff --git a/include/plat/arm/common/arm_sip_svc.h b/include/plat/arm/common/arm_sip_svc.h index 3e25cbc6ad..16573ce6a6 100644 --- a/include/plat/arm/common/arm_sip_svc.h +++ b/include/plat/arm/common/arm_sip_svc.h @@ -7,7 +7,7 @@ #ifndef ARM_SIP_SVC_H #define ARM_SIP_SVC_H -#include +#include /* SMC function IDs for SiP Service queries */ diff --git a/include/plat/arm/common/arm_spm_def.h b/include/plat/arm/common/arm_spm_def.h index bf3cb8fa03..bdcbc96aff 100644 --- a/include/plat/arm/common/arm_spm_def.h +++ b/include/plat/arm/common/arm_spm_def.h @@ -6,9 +6,10 @@ #ifndef ARM_SPM_DEF_H #define ARM_SPM_DEF_H +#include +#include + #include -#include -#include /* * Reserve 4 MiB for binaries of Secure Partitions and Resource Description diff --git a/include/plat/arm/common/arm_tzc_dram.ld.S b/include/plat/arm/common/arm_tzc_dram.ld.S index df951e117f..6dcea0b6e3 100644 --- a/include/plat/arm/common/arm_tzc_dram.ld.S +++ b/include/plat/arm/common/arm_tzc_dram.ld.S @@ -3,10 +3,10 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef ARM_TZC_DRAM_LD_S__ -#define ARM_TZC_DRAM_LD_S__ +#ifndef ARM_TZC_DRAM_LD_S +#define ARM_TZC_DRAM_LD_S -#include +#include MEMORY { EL3_SEC_DRAM (rw): ORIGIN = ARM_EL3_TZC_DRAM1_BASE, LENGTH = ARM_EL3_TZC_DRAM1_SIZE @@ -27,4 +27,4 @@ SECTIONS } >EL3_SEC_DRAM } -#endif /* ARM_TZC_DRAM_LD_S__ */ +#endif /* ARM_TZC_DRAM_LD_S */ diff --git a/include/plat/arm/common/plat_arm.h b/include/plat/arm/common/plat_arm.h index 9b459841ce..6281608245 100644 --- a/include/plat/arm/common/plat_arm.h +++ b/include/plat/arm/common/plat_arm.h @@ -6,14 +6,15 @@ #ifndef PLAT_ARM_H #define PLAT_ARM_H -#include -#include -#include #include -#include -#include -#include -#include + +#include +#include +#include +#include +#include +#include +#include /******************************************************************************* * Forward declarations diff --git a/include/plat/arm/css/common/css_def.h b/include/plat/arm/css/common/css_def.h index 4a7d314c95..6b355a4e9e 100644 --- a/include/plat/arm/css/common/css_def.h +++ b/include/plat/arm/css/common/css_def.h @@ -7,10 +7,11 @@ #ifndef CSS_DEF_H #define CSS_DEF_H +#include +#include +#include + #include -#include -#include -#include /************************************************************************* * Definitions common to all ARM Compute SubSystems (CSS) diff --git a/include/plat/arm/css/common/css_pm.h b/include/plat/arm/css/common/css_pm.h index ff75c69164..b82ff47e7b 100644 --- a/include/plat/arm/css/common/css_pm.h +++ b/include/plat/arm/css/common/css_pm.h @@ -8,9 +8,10 @@ #define CSS_PM_H #include -#include #include +#include + /* Macros to read the CSS power domain state */ #define CSS_CORE_PWR_STATE(state) (state)->pwr_domain_state[ARM_PWR_LVL0] #define CSS_CLUSTER_PWR_STATE(state) (state)->pwr_domain_state[ARM_PWR_LVL1] diff --git a/include/plat/arm/soc/common/soc_css_def.h b/include/plat/arm/soc/common/soc_css_def.h index 263313a9a7..b4b6ba8e4e 100644 --- a/include/plat/arm/soc/common/soc_css_def.h +++ b/include/plat/arm/soc/common/soc_css_def.h @@ -7,9 +7,8 @@ #ifndef SOC_CSS_DEF_H #define SOC_CSS_DEF_H -#include -#include - +#include +#include /* * Definitions common to all ARM CSS SoCs diff --git a/include/plat/common/common_def.h b/include/plat/common/common_def.h index 66074ac17c..66c88ba8cc 100644 --- a/include/plat/common/common_def.h +++ b/include/plat/common/common_def.h @@ -6,10 +6,11 @@ #ifndef COMMON_DEF_H #define COMMON_DEF_H -#include #include -#include -#include + +#include +#include +#include /****************************************************************************** * Required platform porting definitions that are expected to be common to diff --git a/include/plat/common/platform.h b/include/plat/common/platform.h index 04272b1b58..13767ff0a4 100644 --- a/include/plat/common/platform.h +++ b/include/plat/common/platform.h @@ -7,9 +7,10 @@ #ifndef PLATFORM_H #define PLATFORM_H -#include #include +#include + /******************************************************************************* * Forward declarations ******************************************************************************/ diff --git a/include/plat/marvell/a3700/common/armada_common.h b/include/plat/marvell/a3700/common/armada_common.h index fdcc02a66a..c6953fb713 100644 --- a/include/plat/marvell/a3700/common/armada_common.h +++ b/include/plat/marvell/a3700/common/armada_common.h @@ -8,9 +8,10 @@ #ifndef ARMADA_COMMON_H #define ARMADA_COMMON_H -#include #include +#include + int marvell_get_io_dec_win_conf(struct dec_win_config **win, uint32_t *size); #endif /* ARMADA_COMMON_H */ diff --git a/include/plat/marvell/a3700/common/marvell_def.h b/include/plat/marvell/a3700/common/marvell_def.h index 3c105fca74..229b8b0295 100644 --- a/include/plat/marvell/a3700/common/marvell_def.h +++ b/include/plat/marvell/a3700/common/marvell_def.h @@ -8,12 +8,12 @@ #ifndef MARVELL_DEF_H #define MARVELL_DEF_H -#include -#include #include -#include -#include +#include +#include +#include +#include /**************************************************************************** * Definitions common to all MARVELL standard platforms diff --git a/include/plat/marvell/a3700/common/plat_marvell.h b/include/plat/marvell/a3700/common/plat_marvell.h index 01e42c545d..8b8b53ffe8 100644 --- a/include/plat/marvell/a3700/common/plat_marvell.h +++ b/include/plat/marvell/a3700/common/plat_marvell.h @@ -8,11 +8,12 @@ #ifndef PLAT_MARVELL_H #define PLAT_MARVELL_H -#include -#include -#include #include -#include + +#include +#include +#include +#include /* * Extern declarations common to Marvell standard platforms diff --git a/include/plat/marvell/a8k/common/armada_common.h b/include/plat/marvell/a8k/common/armada_common.h index 64d9adf964..dd2a24abca 100644 --- a/include/plat/marvell/a8k/common/armada_common.h +++ b/include/plat/marvell/a8k/common/armada_common.h @@ -8,10 +8,10 @@ #ifndef ARMADA_COMMON_H #define ARMADA_COMMON_H -#include -#include -#include -#include +#include +#include +#include +#include /* * This struct supports skip image request diff --git a/include/plat/marvell/a8k/common/marvell_def.h b/include/plat/marvell/a8k/common/marvell_def.h index c67b3cd872..5ba90f711e 100644 --- a/include/plat/marvell/a8k/common/marvell_def.h +++ b/include/plat/marvell/a8k/common/marvell_def.h @@ -8,12 +8,12 @@ #ifndef MARVELL_DEF_H #define MARVELL_DEF_H -#include -#include #include -#include -#include +#include +#include +#include +#include /****************************************************************************** * Definitions common to all MARVELL standard platforms diff --git a/include/plat/marvell/a8k/common/plat_marvell.h b/include/plat/marvell/a8k/common/plat_marvell.h index 037548da06..65d4de8a6c 100644 --- a/include/plat/marvell/a8k/common/plat_marvell.h +++ b/include/plat/marvell/a8k/common/plat_marvell.h @@ -8,11 +8,12 @@ #ifndef PLAT_MARVELL_H #define PLAT_MARVELL_H -#include -#include #include -#include -#include + +#include +#include +#include +#include /* * Extern declarations common to Marvell standard platforms diff --git a/include/plat/marvell/common/aarch64/cci_macros.S b/include/plat/marvell/common/aarch64/cci_macros.S index 96b364eebd..b0a909bb63 100644 --- a/include/plat/marvell/common/aarch64/cci_macros.S +++ b/include/plat/marvell/common/aarch64/cci_macros.S @@ -8,7 +8,7 @@ #ifndef CCI_MACROS_S #define CCI_MACROS_S -#include +#include #include .section .rodata.cci_reg_name, "aS" diff --git a/include/plat/marvell/common/aarch64/marvell_macros.S b/include/plat/marvell/common/aarch64/marvell_macros.S index c2a8bd0559..bfe2d41273 100644 --- a/include/plat/marvell/common/aarch64/marvell_macros.S +++ b/include/plat/marvell/common/aarch64/marvell_macros.S @@ -8,10 +8,10 @@ #ifndef MARVELL_MACROS_S #define MARVELL_MACROS_S -#include -#include -#include -#include +#include +#include +#include +#include #include /* diff --git a/include/plat/marvell/common/marvell_plat_priv.h b/include/plat/marvell/common/marvell_plat_priv.h index 6f0b588a7f..78b5331e43 100644 --- a/include/plat/marvell/common/marvell_plat_priv.h +++ b/include/plat/marvell/common/marvell_plat_priv.h @@ -8,7 +8,7 @@ #ifndef MARVELL_PLAT_PRIV_H #define MARVELL_PLAT_PRIV_H -#include +#include /***************************************************************************** * Function and variable prototypes diff --git a/include/services/mm_svc.h b/include/services/mm_svc.h index e2ce90fda4..c81e904814 100644 --- a/include/services/mm_svc.h +++ b/include/services/mm_svc.h @@ -9,7 +9,7 @@ #if SPM_DEPRECATED -#include +#include #define MM_VERSION_MAJOR U(1) #define MM_VERSION_MAJOR_SHIFT 16 diff --git a/include/services/sdei.h b/include/services/sdei.h index 4d0fd3fd34..ae8c7e42fd 100644 --- a/include/services/sdei.h +++ b/include/services/sdei.h @@ -7,8 +7,8 @@ #ifndef SDEI_H #define SDEI_H -#include -#include +#include +#include /* Range 0xC4000020 - 0xC400003F reserved for SDE 64bit smc calls */ #define SDEI_VERSION 0xC4000020U diff --git a/include/services/secure_partition.h b/include/services/secure_partition.h index 0ae6cf9919..47f63684f3 100644 --- a/include/services/secure_partition.h +++ b/include/services/secure_partition.h @@ -10,7 +10,8 @@ #if SPM_DEPRECATED #include -#include + +#include /* * Flags used by the secure_partition_mp_info structure to describe the diff --git a/include/services/sp_res_desc.h b/include/services/sp_res_desc.h index dc0022128c..b8be72eeb5 100644 --- a/include/services/sp_res_desc.h +++ b/include/services/sp_res_desc.h @@ -8,7 +8,8 @@ #define SPM_RES_DESC_H #include -#include + +#include /******************************************************************************* * Attribute Section diff --git a/include/services/sp_res_desc_def.h b/include/services/sp_res_desc_def.h index 68df297a88..5a3c50d7f9 100644 --- a/include/services/sp_res_desc_def.h +++ b/include/services/sp_res_desc_def.h @@ -7,7 +7,7 @@ #ifndef SPM_RES_DESC_DEFS_H #define SPM_RES_DESC_DEFS_H -#include +#include /******************************************************************************* * Attribute Section diff --git a/include/services/spci_svc.h b/include/services/spci_svc.h index eae4fb7fef..b82cf1e304 100644 --- a/include/services/spci_svc.h +++ b/include/services/spci_svc.h @@ -7,8 +7,8 @@ #ifndef SPCI_SVC_H #define SPCI_SVC_H -#include -#include +#include +#include /* SPCI_VERSION helpers */ diff --git a/include/services/spm_svc.h b/include/services/spm_svc.h index 763b24eacd..fcb409b293 100644 --- a/include/services/spm_svc.h +++ b/include/services/spm_svc.h @@ -9,7 +9,7 @@ #if SPM_DEPRECATED -#include +#include #define SPM_VERSION_MAJOR U(0) #define SPM_VERSION_MAJOR_SHIFT 16 diff --git a/include/services/sprt_svc.h b/include/services/sprt_svc.h index b6b51dd438..bd695e58aa 100644 --- a/include/services/sprt_svc.h +++ b/include/services/sprt_svc.h @@ -7,8 +7,8 @@ #ifndef SPRT_SVC_H #define SPRT_SVC_H -#include -#include +#include +#include /* SPRT_VERSION helpers */ diff --git a/include/tools_share/firmware_image_package.h b/include/tools_share/firmware_image_package.h index 9f586b0aa7..598d5c2587 100644 --- a/include/tools_share/firmware_image_package.h +++ b/include/tools_share/firmware_image_package.h @@ -8,7 +8,8 @@ #define FIRMWARE_IMAGE_PACKAGE_H #include -#include + +#include "uuid.h" /* This is used as a signature to validate the blob header */ #define TOC_HEADER_NAME 0xAA640001 diff --git a/lib/aarch64/misc_helpers.S b/lib/aarch64/misc_helpers.S index 8920f7297e..9aac8cfb94 100644 --- a/lib/aarch64/misc_helpers.S +++ b/lib/aarch64/misc_helpers.S @@ -7,7 +7,7 @@ #include #include #include -#include +#include #if !ERROR_DEPRECATED .globl get_afflvl_shift diff --git a/lib/coreboot/coreboot.mk b/lib/coreboot/coreboot.mk index bbaa33294e..4201823502 100644 --- a/lib/coreboot/coreboot.mk +++ b/lib/coreboot/coreboot.mk @@ -19,6 +19,4 @@ BL31_SOURCES += $(addprefix lib/coreboot/, \ BL31_SOURCES += drivers/coreboot/cbmem_console/${ARCH}/cbmem_console.S -INCLUDES += -Iinclude/drivers/coreboot - endif # COREBOOT diff --git a/lib/coreboot/coreboot_table.c b/lib/coreboot/coreboot_table.c index 64f8879e4f..63bdc63594 100644 --- a/lib/coreboot/coreboot_table.c +++ b/lib/coreboot/coreboot_table.c @@ -5,12 +5,13 @@ */ #include -#include -#include -#include -#include #include -#include + +#include +#include +#include +#include +#include /* * Structures describing coreboot's in-memory descriptor tables. See diff --git a/lib/cpus/aarch32/cortex_a53.S b/lib/cpus/aarch32/cortex_a53.S index 1647e169f6..4975ec60df 100644 --- a/lib/cpus/aarch32/cortex_a53.S +++ b/lib/cpus/aarch32/cortex_a53.S @@ -3,12 +3,13 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + #include #include #include +#include #include #include -#include #if A53_DISABLE_NON_TEMPORAL_HINT #undef ERRATA_A53_836870 diff --git a/lib/cpus/aarch32/cortex_a57.S b/lib/cpus/aarch32/cortex_a57.S index dff86be768..04942d3092 100644 --- a/lib/cpus/aarch32/cortex_a57.S +++ b/lib/cpus/aarch32/cortex_a57.S @@ -6,9 +6,9 @@ #include #include #include +#include #include #include -#include /* --------------------------------------------- * Disable intra-cluster coherency diff --git a/lib/cpus/aarch32/cortex_a72.S b/lib/cpus/aarch32/cortex_a72.S index 3bc3388bc3..ff2b0e66e0 100644 --- a/lib/cpus/aarch32/cortex_a72.S +++ b/lib/cpus/aarch32/cortex_a72.S @@ -6,9 +6,9 @@ #include #include #include +#include #include #include -#include /* --------------------------------------------- * Disable all types of L2 prefetches. diff --git a/lib/cpus/aarch32/cpu_helpers.S b/lib/cpus/aarch32/cpu_helpers.S index ddc0808421..f84cd0dfac 100644 --- a/lib/cpus/aarch32/cpu_helpers.S +++ b/lib/cpus/aarch32/cpu_helpers.S @@ -7,8 +7,8 @@ #include #include #include -#include #include +#include #if defined(IMAGE_BL1) || defined(IMAGE_BL32) || (defined(IMAGE_BL2) && BL2_AT_EL3) /* diff --git a/lib/cpus/aarch64/cortex_a35.S b/lib/cpus/aarch64/cortex_a35.S index 2e0d63161a..96e5dd3838 100644 --- a/lib/cpus/aarch64/cortex_a35.S +++ b/lib/cpus/aarch64/cortex_a35.S @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/cpus/aarch64/cortex_a53.S b/lib/cpus/aarch64/cortex_a53.S index 108509f1f0..332bad75f3 100644 --- a/lib/cpus/aarch64/cortex_a53.S +++ b/lib/cpus/aarch64/cortex_a53.S @@ -5,11 +5,11 @@ */ #include #include -#include +#include +#include #include #include -#include -#include +#include #include #if A53_DISABLE_NON_TEMPORAL_HINT diff --git a/lib/cpus/aarch64/cortex_a55.S b/lib/cpus/aarch64/cortex_a55.S index 4e9bd9f6f7..b347e299cb 100644 --- a/lib/cpus/aarch64/cortex_a55.S +++ b/lib/cpus/aarch64/cortex_a55.S @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/cpus/aarch64/cortex_a57.S b/lib/cpus/aarch64/cortex_a57.S index 8e60445516..a862671660 100644 --- a/lib/cpus/aarch64/cortex_a57.S +++ b/lib/cpus/aarch64/cortex_a57.S @@ -6,10 +6,10 @@ #include #include #include -#include +#include +#include #include #include -#include #include /* --------------------------------------------- diff --git a/lib/cpus/aarch64/cortex_a73.S b/lib/cpus/aarch64/cortex_a73.S index b796561359..772b0be79d 100644 --- a/lib/cpus/aarch64/cortex_a73.S +++ b/lib/cpus/aarch64/cortex_a73.S @@ -5,7 +5,7 @@ */ #include #include -#include +#include #include #include #include diff --git a/lib/cpus/aarch64/cortex_a75_pubsub.c b/lib/cpus/aarch64/cortex_a75_pubsub.c index f4ca486064..bd2c6974ed 100644 --- a/lib/cpus/aarch64/cortex_a75_pubsub.c +++ b/lib/cpus/aarch64/cortex_a75_pubsub.c @@ -6,7 +6,7 @@ #include #include -#include +#include static void *cortex_a75_context_save(const void *arg) { diff --git a/lib/cpus/aarch64/cortex_a76.S b/lib/cpus/aarch64/cortex_a76.S index 4def143737..27db74e418 100644 --- a/lib/cpus/aarch64/cortex_a76.S +++ b/lib/cpus/aarch64/cortex_a76.S @@ -5,13 +5,13 @@ */ #include -#include #include -#include +#include #include #include #include #include +#include #if !DYNAMIC_WORKAROUND_CVE_2018_3639 #error Cortex A76 requires DYNAMIC_WORKAROUND_CVE_2018_3639=1 diff --git a/lib/cpus/aarch64/cortex_ares_pubsub.c b/lib/cpus/aarch64/cortex_ares_pubsub.c index 9566223f2a..4a4f33386b 100644 --- a/lib/cpus/aarch64/cortex_ares_pubsub.c +++ b/lib/cpus/aarch64/cortex_ares_pubsub.c @@ -6,7 +6,7 @@ #include #include -#include +#include static void *cortex_ares_context_save(const void *arg) { diff --git a/lib/cpus/aarch64/cortex_deimos.S b/lib/cpus/aarch64/cortex_deimos.S index cad906f65c..0e72fba5a1 100644 --- a/lib/cpus/aarch64/cortex_deimos.S +++ b/lib/cpus/aarch64/cortex_deimos.S @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/cpus/aarch64/cortex_helios.S b/lib/cpus/aarch64/cortex_helios.S index 4812ac47ca..7d3d7e45c2 100644 --- a/lib/cpus/aarch64/cortex_helios.S +++ b/lib/cpus/aarch64/cortex_helios.S @@ -5,10 +5,10 @@ */ #include #include -#include +#include +#include #include #include -#include #include func cortex_helios_cpu_pwr_dwn diff --git a/lib/cpus/aarch64/cpu_helpers.S b/lib/cpus/aarch64/cpu_helpers.S index 69ece8fffe..74d7bb2406 100644 --- a/lib/cpus/aarch64/cpu_helpers.S +++ b/lib/cpus/aarch64/cpu_helpers.S @@ -7,10 +7,10 @@ #include #include #include -#include +#include #include -#include -#include +#include +#include /* Reset fn is needed in BL at reset vector */ #if defined(IMAGE_BL1) || defined(IMAGE_BL31) || (defined(IMAGE_BL2) && BL2_AT_EL3) diff --git a/lib/cpus/aarch64/cpuamu.c b/lib/cpus/aarch64/cpuamu.c index 5ad5bf8392..3a2fa819f8 100644 --- a/lib/cpus/aarch64/cpuamu.c +++ b/lib/cpus/aarch64/cpuamu.c @@ -5,8 +5,8 @@ */ #include -#include -#include +#include +#include #define CPUAMU_NR_COUNTERS 5U diff --git a/lib/cpus/aarch64/dsu_helpers.S b/lib/cpus/aarch64/dsu_helpers.S index 152a3da263..eb84daacfa 100644 --- a/lib/cpus/aarch64/dsu_helpers.S +++ b/lib/cpus/aarch64/dsu_helpers.S @@ -6,7 +6,7 @@ #include #include -#include +#include /* ----------------------------------------------------------------------- * DSU erratum 936184 check function diff --git a/lib/cpus/aarch64/wa_cve_2017_5715_bpiall.S b/lib/cpus/aarch64/wa_cve_2017_5715_bpiall.S index c613ebdf6c..c9a9544968 100644 --- a/lib/cpus/aarch64/wa_cve_2017_5715_bpiall.S +++ b/lib/cpus/aarch64/wa_cve_2017_5715_bpiall.S @@ -5,9 +5,9 @@ */ #include -#include #include #include +#include .globl wa_cve_2017_5715_bpiall_vbar diff --git a/lib/cpus/aarch64/wa_cve_2017_5715_mmu.S b/lib/cpus/aarch64/wa_cve_2017_5715_mmu.S index d7b6e26e40..9277cc624c 100644 --- a/lib/cpus/aarch64/wa_cve_2017_5715_mmu.S +++ b/lib/cpus/aarch64/wa_cve_2017_5715_mmu.S @@ -5,9 +5,9 @@ */ #include -#include #include #include +#include .globl wa_cve_2017_5715_mmu_vbar diff --git a/lib/cpus/errata_report.c b/lib/cpus/errata_report.c index 42603cb6d9..aeb3560059 100644 --- a/lib/cpus/errata_report.c +++ b/lib/cpus/errata_report.c @@ -6,14 +6,15 @@ /* Runtime firmware routines to report errata status for the current CPU. */ -#include #include -#include -#include -#include -#include #include -#include + +#include +#include +#include +#include +#include +#include #ifdef IMAGE_BL1 # define BL_STRING "BL1" diff --git a/lib/el3_runtime/aarch32/context_mgmt.c b/lib/el3_runtime/aarch32/context_mgmt.c index ad0a1206d0..a4702fcc60 100644 --- a/lib/el3_runtime/aarch32/context_mgmt.c +++ b/lib/el3_runtime/aarch32/context_mgmt.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 /******************************************************************************* * Context management library initialisation routine. This library is used by diff --git a/lib/el3_runtime/aarch32/cpu_data.S b/lib/el3_runtime/aarch32/cpu_data.S index 68d64151fc..bdad2c145a 100644 --- a/lib/el3_runtime/aarch32/cpu_data.S +++ b/lib/el3_runtime/aarch32/cpu_data.S @@ -5,7 +5,7 @@ */ #include -#include +#include .globl _cpu_data .globl _cpu_data_by_index diff --git a/lib/el3_runtime/aarch64/context_mgmt.c b/lib/el3_runtime/aarch64/context_mgmt.c index 39c27d0eca..8a5764ce23 100644 --- a/lib/el3_runtime/aarch64/context_mgmt.c +++ b/lib/el3_runtime/aarch64/context_mgmt.c @@ -4,24 +4,26 @@ * 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 +#include +#include #include -#include -#include -#include -#include -#include /******************************************************************************* diff --git a/lib/el3_runtime/aarch64/cpu_data.S b/lib/el3_runtime/aarch64/cpu_data.S index 96be0813cf..2edf225596 100644 --- a/lib/el3_runtime/aarch64/cpu_data.S +++ b/lib/el3_runtime/aarch64/cpu_data.S @@ -5,7 +5,7 @@ */ #include -#include +#include .globl init_cpu_data_ptr .globl _cpu_data_by_index diff --git a/lib/el3_runtime/cpu_data_array.c b/lib/el3_runtime/cpu_data_array.c index 10b1a7c5b6..13d464c974 100644 --- a/lib/el3_runtime/cpu_data_array.c +++ b/lib/el3_runtime/cpu_data_array.c @@ -4,9 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include +#include +#include + /* The per_cpu_ptr_cache_t space allocation */ cpu_data_t percpu_data[PLATFORM_CORE_COUNT]; diff --git a/lib/extensions/amu/aarch32/amu.c b/lib/extensions/amu/aarch32/amu.c index 585d908f77..82d2e18640 100644 --- a/lib/extensions/amu/aarch32/amu.c +++ b/lib/extensions/amu/aarch32/amu.c @@ -4,13 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include + #include #include -#include -#include -#include +#include +#include +#include +#include #define AMU_GROUP0_NR_COUNTERS 4 diff --git a/lib/extensions/amu/aarch64/amu.c b/lib/extensions/amu/aarch64/amu.c index 1564e84024..85f7007aac 100644 --- a/lib/extensions/amu/aarch64/amu.c +++ b/lib/extensions/amu/aarch64/amu.c @@ -4,15 +4,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include -#include #include -#include -#include #include +#include +#include +#include +#include +#include +#include + #define AMU_GROUP0_NR_COUNTERS 4 struct amu_ctx { diff --git a/lib/extensions/mpam/mpam.c b/lib/extensions/mpam/mpam.c index d57bb470bf..0166707901 100644 --- a/lib/extensions/mpam/mpam.c +++ b/lib/extensions/mpam/mpam.c @@ -4,10 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + #include #include -#include -#include +#include bool mpam_supported(void) { diff --git a/lib/extensions/ras/ras_common.c b/lib/extensions/ras/ras_common.c index f39e5f5f1b..be8beceeb4 100644 --- a/lib/extensions/ras/ras_common.c +++ b/lib/extensions/ras/ras_common.c @@ -4,15 +4,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include + #ifndef PLAT_RAS_PRI # error Platform must define RAS priority value #endif diff --git a/lib/extensions/ras/std_err_record.c b/lib/extensions/ras/std_err_record.c index 9fdfd6b60f..c03fbbe43a 100644 --- a/lib/extensions/ras/std_err_record.c +++ b/lib/extensions/ras/std_err_record.c @@ -3,8 +3,9 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include + +#include +#include /* * Probe for error in memory-mapped registers containing error records diff --git a/lib/extensions/spe/spe.c b/lib/extensions/spe/spe.c index e5df015b06..78876c66b8 100644 --- a/lib/extensions/spe/spe.c +++ b/lib/extensions/spe/spe.c @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + #include #include -#include -#include -#include +#include +#include static inline void psb_csync(void) { diff --git a/lib/extensions/sve/sve.c b/lib/extensions/sve/sve.c index e031bf61b9..fa4ac77582 100644 --- a/lib/extensions/sve/sve.c +++ b/lib/extensions/sve/sve.c @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + #include #include -#include -#include -#include +#include +#include bool sve_supported(void) { diff --git a/lib/libc/abort.c b/lib/libc/abort.c index c9d16cccc6..432b1d075a 100644 --- a/lib/libc/abort.c +++ b/lib/libc/abort.c @@ -4,9 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include +#include + void abort(void) { ERROR("ABORT\n"); diff --git a/lib/libc/assert.c b/lib/libc/assert.c index 8fa8f72123..60f1a86605 100644 --- a/lib/libc/assert.c +++ b/lib/libc/assert.c @@ -6,11 +6,12 @@ #include #include -#include -#include -#include #include +#include +#include +#include + /* * Only print the output if PLAT_LOG_LEVEL_ASSERT is higher or equal to * LOG_LEVEL_INFO, which is the default value for builds with DEBUG=1. diff --git a/lib/libc/printf.c b/lib/libc/printf.c index d50876d750..2715a72d4f 100644 --- a/lib/libc/printf.c +++ b/lib/libc/printf.c @@ -3,12 +3,14 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + #include -#include #include #include #include +#include + #define get_num_va_args(_args, _lcount) \ (((_lcount) > 1) ? va_arg(_args, long long int) : \ (((_lcount) == 1) ? va_arg(_args, long int) : \ diff --git a/lib/libc/putchar.c b/lib/libc/putchar.c index 0beb625b2d..037e28ac42 100644 --- a/lib/libc/putchar.c +++ b/lib/libc/putchar.c @@ -5,7 +5,8 @@ */ #include -#include + +#include int putchar(int c) { diff --git a/lib/libc/snprintf.c b/lib/libc/snprintf.c index 66a2fa2f53..38ad1c71ab 100644 --- a/lib/libc/snprintf.c +++ b/lib/libc/snprintf.c @@ -5,10 +5,11 @@ */ #include -#include -#include #include +#include +#include + static void string_print(char **s, size_t n, size_t *chars_printed, const char *str) { diff --git a/lib/locks/bakery/bakery_lock_coherent.c b/lib/locks/bakery/bakery_lock_coherent.c index 8e86790ab5..1634e3af6a 100644 --- a/lib/locks/bakery/bakery_lock_coherent.c +++ b/lib/locks/bakery/bakery_lock_coherent.c @@ -4,13 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include -#include #include +#include +#include +#include +#include + /* * Functions in this file implement Bakery Algorithm for mutual exclusion with the * bakery lock data structures in coherent memory. diff --git a/lib/locks/bakery/bakery_lock_normal.c b/lib/locks/bakery/bakery_lock_normal.c index beae63c722..867da929a3 100644 --- a/lib/locks/bakery/bakery_lock_normal.c +++ b/lib/locks/bakery/bakery_lock_normal.c @@ -4,13 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include -#include #include -#include + +#include +#include +#include +#include +#include /* * Functions in this file implement Bakery Algorithm for mutual exclusion with the diff --git a/lib/optee/optee_utils.c b/lib/optee/optee_utils.c index 34d095b0db..f7392fda81 100644 --- a/lib/optee/optee_utils.c +++ b/lib/optee/optee_utils.c @@ -4,12 +4,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include #include -#include + +#include +#include +#include +#include /* * load_addr_hi and load_addr_lo: image load address. diff --git a/lib/pmf/pmf_main.c b/lib/pmf/pmf_main.c index fe7bb7423b..131a055789 100644 --- a/lib/pmf/pmf_main.c +++ b/lib/pmf/pmf_main.c @@ -3,15 +3,17 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include + #include -#include #include -#include -#include #include -#include + +#include +#include +#include +#include +#include +#include /******************************************************************************* * The 'pmf_svc_descs' array holds the PMF service descriptors exported by diff --git a/lib/pmf/pmf_smc.c b/lib/pmf/pmf_smc.c index 4c5b14f93b..6d79502995 100644 --- a/lib/pmf/pmf_smc.c +++ b/lib/pmf/pmf_smc.c @@ -3,10 +3,12 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + #include -#include -#include -#include + +#include +#include +#include #include /* diff --git a/lib/psci/aarch32/psci_helpers.S b/lib/psci/aarch32/psci_helpers.S index 63d7e70887..5cc192e66b 100644 --- a/lib/psci/aarch32/psci_helpers.S +++ b/lib/psci/aarch32/psci_helpers.S @@ -5,8 +5,8 @@ */ #include +#include #include -#include .globl psci_do_pwrdown_cache_maintenance .globl psci_do_pwrup_cache_maintenance diff --git a/lib/psci/aarch64/psci_helpers.S b/lib/psci/aarch64/psci_helpers.S index 88db1c9689..add968a7be 100644 --- a/lib/psci/aarch64/psci_helpers.S +++ b/lib/psci/aarch64/psci_helpers.S @@ -6,8 +6,8 @@ #include #include +#include #include -#include .globl psci_do_pwrdown_cache_maintenance .globl psci_do_pwrup_cache_maintenance diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c index 97aeb8323a..2928c33e59 100644 --- a/lib/psci/psci_common.c +++ b/lib/psci/psci_common.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 + #include "psci_private.h" /* diff --git a/lib/psci/psci_main.c b/lib/psci/psci_main.c index b4a25fb0a7..5c0e952a99 100644 --- a/lib/psci/psci_main.c +++ b/lib/psci/psci_main.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 +#include + #include "psci_private.h" /******************************************************************************* diff --git a/lib/psci/psci_mem_protect.c b/lib/psci/psci_mem_protect.c index 857146b67f..481051f95d 100644 --- a/lib/psci/psci_mem_protect.c +++ b/lib/psci/psci_mem_protect.c @@ -6,7 +6,9 @@ #include #include -#include + +#include + #include "psci_private.h" u_register_t psci_mem_protect(unsigned int enable) diff --git a/lib/psci/psci_off.c b/lib/psci/psci_off.c index 944f8bff9f..ac03e0596d 100644 --- a/lib/psci/psci_off.c +++ b/lib/psci/psci_off.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 + #include "psci_private.h" /****************************************************************************** diff --git a/lib/psci/psci_on.c b/lib/psci/psci_on.c index f38900cf54..aa6b324ed6 100644 --- a/lib/psci/psci_on.c +++ b/lib/psci/psci_on.c @@ -4,15 +4,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include -#include -#include -#include -#include -#include #include + +#include +#include +#include +#include +#include +#include +#include + #include "psci_private.h" /* diff --git a/lib/psci/psci_private.h b/lib/psci/psci_private.h index 82b951db6d..68ec7fb661 100644 --- a/lib/psci/psci_private.h +++ b/lib/psci/psci_private.h @@ -7,14 +7,15 @@ #ifndef PSCI_PRIVATE_H #define PSCI_PRIVATE_H +#include + #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /* * The PSCI capability which are provided by the generic code but does not diff --git a/lib/psci/psci_setup.c b/lib/psci/psci_setup.c index 6b3081eb58..b9467d3e00 100644 --- a/lib/psci/psci_setup.c +++ b/lib/psci/psci_setup.c @@ -4,15 +4,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include +#include + #include #include -#include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include + #include "psci_private.h" /******************************************************************************* diff --git a/lib/psci/psci_stat.c b/lib/psci/psci_stat.c index 6f6a7d4f84..772a1840a1 100644 --- a/lib/psci/psci_stat.c +++ b/lib/psci/psci_stat.c @@ -5,9 +5,12 @@ */ #include -#include -#include + #include + +#include +#include + #include "psci_private.h" #ifndef PLAT_MAX_PWR_LVL_STATES diff --git a/lib/psci/psci_suspend.c b/lib/psci/psci_suspend.c index e00819de70..8a752c1a15 100644 --- a/lib/psci/psci_suspend.c +++ b/lib/psci/psci_suspend.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 +#include + #include "psci_private.h" /******************************************************************************* diff --git a/lib/psci/psci_system_off.c b/lib/psci/psci_system_off.c index 7cac4e9376..141d69ef2b 100644 --- a/lib/psci/psci_system_off.c +++ b/lib/psci/psci_system_off.c @@ -4,12 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include -#include #include + +#include +#include +#include +#include + #include "psci_private.h" void __dead2 psci_system_off(void) diff --git a/lib/romlib/romlib.ld.S b/lib/romlib/romlib.ld.S index 8f0bc62bce..2aac4adf6f 100644 --- a/lib/romlib/romlib.ld.S +++ b/lib/romlib/romlib.ld.S @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include #include -#include MEMORY { ROM (rx): ORIGIN = ROMLIB_RO_BASE, LENGTH = ROMLIB_RO_LIMIT - ROMLIB_RO_BASE diff --git a/lib/semihosting/semihosting.c b/lib/semihosting/semihosting.c index 2ba43f343e..ee48dbc1f7 100644 --- a/lib/semihosting/semihosting.c +++ b/lib/semihosting/semihosting.c @@ -6,9 +6,10 @@ #include #include -#include #include +#include + #ifndef SEMIHOSTING_SUPPORTED #define SEMIHOSTING_SUPPORTED 1 #endif diff --git a/lib/stack_protector/stack_protector.c b/lib/stack_protector/stack_protector.c index fba5e1ffa0..3ff74fc8a3 100644 --- a/lib/stack_protector/stack_protector.c +++ b/lib/stack_protector/stack_protector.c @@ -3,10 +3,12 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include + #include +#include +#include + /* * Canary value used by the compiler runtime checks to detect stack corruption. * diff --git a/lib/utils/mem_region.c b/lib/utils/mem_region.c index a5c3c61700..662f6a05ae 100644 --- a/lib/utils/mem_region.c +++ b/lib/utils/mem_region.c @@ -5,7 +5,8 @@ */ #include -#include + +#include /* * All the regions defined in mem_region_t must have the following properties diff --git a/lib/xlat_tables/aarch32/xlat_tables.c b/lib/xlat_tables/aarch32/xlat_tables.c index 55957031fa..468a9e7dd6 100644 --- a/lib/xlat_tables/aarch32/xlat_tables.c +++ b/lib/xlat_tables/aarch32/xlat_tables.c @@ -4,13 +4,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include + #include -#include -#include -#include + +#include +#include +#include +#include +#include + #include "../xlat_tables_private.h" #if (ARM_ARCH_MAJOR == 7) && !defined(ARMV7_SUPPORTS_LARGE_PAGE_ADDRESSING) diff --git a/lib/xlat_tables/aarch64/xlat_tables.c b/lib/xlat_tables/aarch64/xlat_tables.c index 4afdeed066..71f491a219 100644 --- a/lib/xlat_tables/aarch64/xlat_tables.c +++ b/lib/xlat_tables/aarch64/xlat_tables.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 + #include "../xlat_tables_private.h" #define XLAT_TABLE_LEVEL_BASE \ diff --git a/lib/xlat_tables/xlat_tables_common.c b/lib/xlat_tables/xlat_tables_common.c index 2ee77c7aeb..23fe3f0b40 100644 --- a/lib/xlat_tables/xlat_tables_common.c +++ b/lib/xlat_tables/xlat_tables_common.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 "xlat_tables_private.h" #if LOG_LEVEL >= LOG_LEVEL_VERBOSE diff --git a/lib/xlat_tables/xlat_tables_private.h b/lib/xlat_tables/xlat_tables_private.h index fad967ebfb..4390f34ead 100644 --- a/lib/xlat_tables/xlat_tables_private.h +++ b/lib/xlat_tables/xlat_tables_private.h @@ -7,9 +7,10 @@ #ifndef XLAT_TABLES_PRIVATE_H #define XLAT_TABLES_PRIVATE_H -#include #include -#include + +#include +#include #if HW_ASSISTED_COHERENCY #error xlat tables v2 must be used with HW_ASSISTED_COHERENCY diff --git a/lib/xlat_tables_v2/aarch32/enable_mmu.S b/lib/xlat_tables_v2/aarch32/enable_mmu.S index 4a4ac30f51..f2fff36c2a 100644 --- a/lib/xlat_tables_v2/aarch32/enable_mmu.S +++ b/lib/xlat_tables_v2/aarch32/enable_mmu.S @@ -6,7 +6,7 @@ #include #include -#include +#include .global enable_mmu_direct_svc_mon .global enable_mmu_direct_hyp diff --git a/lib/xlat_tables_v2/aarch32/xlat_tables_arch.c b/lib/xlat_tables_v2/aarch32/xlat_tables_arch.c index 66938e5f1b..349b6c4d50 100644 --- a/lib/xlat_tables_v2/aarch32/xlat_tables_arch.c +++ b/lib/xlat_tables_v2/aarch32/xlat_tables_arch.c @@ -4,14 +4,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include -#include -#include #include -#include -#include + +#include + +#include +#include +#include +#include +#include + #include "../xlat_tables_private.h" #if (ARM_ARCH_MAJOR == 7) && !defined(ARMV7_SUPPORTS_LARGE_PAGE_ADDRESSING) diff --git a/lib/xlat_tables_v2/aarch64/enable_mmu.S b/lib/xlat_tables_v2/aarch64/enable_mmu.S index 504c03c152..07e7be1ec2 100644 --- a/lib/xlat_tables_v2/aarch64/enable_mmu.S +++ b/lib/xlat_tables_v2/aarch64/enable_mmu.S @@ -6,7 +6,7 @@ #include #include -#include +#include .global enable_mmu_direct_el1 .global enable_mmu_direct_el2 diff --git a/lib/xlat_tables_v2/aarch64/xlat_tables_arch.c b/lib/xlat_tables_v2/aarch64/xlat_tables_arch.c index 269adc7ef4..a803d8357f 100644 --- a/lib/xlat_tables_v2/aarch64/xlat_tables_arch.c +++ b/lib/xlat_tables_v2/aarch64/xlat_tables_arch.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 "../xlat_tables_private.h" /* diff --git a/lib/xlat_tables_v2/xlat_tables_context.c b/lib/xlat_tables_v2/xlat_tables_context.c index b887427a2e..bf3ae1e7de 100644 --- a/lib/xlat_tables_v2/xlat_tables_context.c +++ b/lib/xlat_tables_v2/xlat_tables_context.c @@ -5,10 +5,12 @@ */ #include -#include + #include -#include -#include + +#include +#include +#include #include "xlat_tables_private.h" diff --git a/lib/xlat_tables_v2/xlat_tables_core.c b/lib/xlat_tables_v2/xlat_tables_core.c index 53fc874d87..c49554f1f1 100644 --- a/lib/xlat_tables_v2/xlat_tables_core.c +++ b/lib/xlat_tables_v2/xlat_tables_core.c @@ -4,17 +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 "xlat_tables_private.h" diff --git a/lib/xlat_tables_v2/xlat_tables_private.h b/lib/xlat_tables_v2/xlat_tables_private.h index 528996a29a..fc709554bb 100644 --- a/lib/xlat_tables_v2/xlat_tables_private.h +++ b/lib/xlat_tables_v2/xlat_tables_private.h @@ -7,9 +7,11 @@ #ifndef XLAT_TABLES_PRIVATE_H #define XLAT_TABLES_PRIVATE_H -#include #include -#include + +#include + +#include #if PLAT_XLAT_TABLES_DYNAMIC /* diff --git a/lib/xlat_tables_v2/xlat_tables_utils.c b/lib/xlat_tables_v2/xlat_tables_utils.c index 41c01aee7b..f5848a255e 100644 --- a/lib/xlat_tables_v2/xlat_tables_utils.c +++ b/lib/xlat_tables_v2/xlat_tables_utils.c @@ -4,17 +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 "xlat_tables_private.h" diff --git a/lib/zlib/tf_gunzip.c b/lib/zlib/tf_gunzip.c index 574d871b06..fd56dfc7c7 100644 --- a/lib/zlib/tf_gunzip.c +++ b/lib/zlib/tf_gunzip.c @@ -5,11 +5,12 @@ */ #include -#include #include #include + +#include +#include #include -#include #include "zutil.h" diff --git a/plat/allwinner/common/include/platform_def.h b/plat/allwinner/common/include/platform_def.h index 08eb5cf2b9..ede3881a7d 100644 --- a/plat/allwinner/common/include/platform_def.h +++ b/plat/allwinner/common/include/platform_def.h @@ -7,10 +7,11 @@ #ifndef PLATFORM_DEF_H #define PLATFORM_DEF_H -#include +#include +#include +#include + #include -#include -#include #define BL31_BASE SUNXI_SRAM_A2_BASE #define BL31_LIMIT (SUNXI_SRAM_A2_BASE + SUNXI_SRAM_A2_SIZE) diff --git a/plat/allwinner/common/sunxi_bl31_setup.c b/plat/allwinner/common/sunxi_bl31_setup.c index 2c66329123..7ffa658210 100644 --- a/plat/allwinner/common/sunxi_bl31_setup.c +++ b/plat/allwinner/common/sunxi_bl31_setup.c @@ -4,20 +4,24 @@ * 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 static entry_point_info_t bl32_image_ep_info; diff --git a/plat/allwinner/common/sunxi_common.c b/plat/allwinner/common/sunxi_common.c index 2eb26a91bc..6bb8968cee 100644 --- a/plat/allwinner/common/sunxi_common.c +++ b/plat/allwinner/common/sunxi_common.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 static mmap_region_t sunxi_mmap[PLATFORM_MMAP_REGIONS + 1] = { MAP_REGION_FLAT(SUNXI_SRAM_BASE, SUNXI_SRAM_SIZE, diff --git a/plat/allwinner/common/sunxi_cpu_ops.c b/plat/allwinner/common/sunxi_cpu_ops.c index 3b732b5d13..8c086030ae 100644 --- a/plat/allwinner/common/sunxi_cpu_ops.c +++ b/plat/allwinner/common/sunxi_cpu_ops.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 static void sunxi_cpu_disable_power(unsigned int cluster, unsigned int core) { diff --git a/plat/allwinner/common/sunxi_pm.c b/plat/allwinner/common/sunxi_pm.c index 7d13cdad15..8cc715c27a 100644 --- a/plat/allwinner/common/sunxi_pm.c +++ b/plat/allwinner/common/sunxi_pm.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 + #include #include #include diff --git a/plat/allwinner/common/sunxi_security.c b/plat/allwinner/common/sunxi_security.c index 9053728872..1f16a0b724 100644 --- a/plat/allwinner/common/sunxi_security.c +++ b/plat/allwinner/common/sunxi_security.c @@ -4,8 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include +#include + #include #include diff --git a/plat/allwinner/common/sunxi_topology.c b/plat/allwinner/common/sunxi_topology.c index 98cf63c8cd..7acc77a9a6 100644 --- a/plat/allwinner/common/sunxi_topology.c +++ b/plat/allwinner/common/sunxi_topology.c @@ -4,10 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include +#include +#include + static unsigned char plat_power_domain_tree_desc[PLAT_MAX_PWR_LVL + 1] = { /* One root node for the SoC */ 1, diff --git a/plat/allwinner/sun50i_a64/sunxi_power.c b/plat/allwinner/sun50i_a64/sunxi_power.c index 59feed7891..706bfcecbe 100644 --- a/plat/allwinner/sun50i_a64/sunxi_power.c +++ b/plat/allwinner/sun50i_a64/sunxi_power.c @@ -5,14 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include -#include #include + #include -#include + #include + +#include +#include +#include +#include +#include + #include #include #include diff --git a/plat/allwinner/sun50i_h6/sunxi_power.c b/plat/allwinner/sun50i_h6/sunxi_power.c index 7bdac8ab0b..5b5bad1771 100644 --- a/plat/allwinner/sun50i_h6/sunxi_power.c +++ b/plat/allwinner/sun50i_h6/sunxi_power.c @@ -5,13 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include #include -#include -#include #include + +#include +#include +#include +#include +#include + #include #include #include 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 diff --git a/plat/common/aarch32/crash_console_helpers.S b/plat/common/aarch32/crash_console_helpers.S index fc37c08fa4..c9ad12cc4f 100644 --- a/plat/common/aarch32/crash_console_helpers.S +++ b/plat/common/aarch32/crash_console_helpers.S @@ -10,7 +10,7 @@ */ #include -#include +#include .globl plat_crash_console_init .globl plat_crash_console_putc diff --git a/plat/common/aarch32/plat_common.c b/plat/common/aarch32/plat_common.c index 16c2b5c952..2c1a8fa09b 100644 --- a/plat/common/aarch32/plat_common.c +++ b/plat/common/aarch32/plat_common.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include +#include /* * The following platform setup functions are weakly defined. They diff --git a/plat/common/aarch32/plat_sp_min_common.c b/plat/common/aarch32/plat_sp_min_common.c index f1b1e9c9f7..3bc84b1ad2 100644 --- a/plat/common/aarch32/plat_sp_min_common.c +++ b/plat/common/aarch32/plat_sp_min_common.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include +#include #include /* diff --git a/plat/common/aarch64/crash_console_helpers.S b/plat/common/aarch64/crash_console_helpers.S index 8f8ca11245..491a99d360 100644 --- a/plat/common/aarch64/crash_console_helpers.S +++ b/plat/common/aarch64/crash_console_helpers.S @@ -10,7 +10,7 @@ */ #include -#include +#include .globl plat_crash_console_init .globl plat_crash_console_putc diff --git a/plat/common/aarch64/plat_common.c b/plat/common/aarch64/plat_common.c index e6f5f2045e..1424c7894a 100644 --- a/plat/common/aarch64/plat_common.c +++ b/plat/common/aarch64/plat_common.c @@ -4,14 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include + +#include +#include #if RAS_EXTENSION -#include +#include #endif -#include +#include +#include /* * The following platform setup functions are weakly defined. They diff --git a/plat/common/aarch64/platform_helpers.S b/plat/common/aarch64/platform_helpers.S index 89523194d2..b5788fba2d 100644 --- a/plat/common/aarch64/platform_helpers.S +++ b/plat/common/aarch64/platform_helpers.S @@ -6,7 +6,7 @@ #include #include -#include +#include #include .weak plat_report_exception diff --git a/plat/common/plat_bl1_common.c b/plat/common/plat_bl1_common.c index 824f9e551f..5733781ac4 100644 --- a/plat/common/plat_bl1_common.c +++ b/plat/common/plat_bl1_common.c @@ -4,15 +4,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include -#include #include -#include + #include +#include +#include +#include +#include +#include + /* * The following platform functions are weakly defined. They * are default implementations that allow BL1 to compile in diff --git a/plat/common/plat_bl_common.c b/plat/common/plat_bl_common.c index 4cf1cc5735..2357edfa93 100644 --- a/plat/common/plat_bl_common.c +++ b/plat/common/plat_bl_common.c @@ -4,16 +4,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include #include + +#include +#include +#include #if TRUSTED_BOARD_BOOT -#include +#include #endif -#include -#include +#include +#include /* * The following platform functions are weakly defined. The Platforms diff --git a/plat/common/plat_gicv2.c b/plat/common/plat_gicv2.c index 4b6687371f..4c76f1bd15 100644 --- a/plat/common/plat_gicv2.c +++ b/plat/common/plat_gicv2.c @@ -3,13 +3,15 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + #include -#include -#include -#include -#include #include +#include +#include +#include +#include + /* * The following platform GIC functions are weakly defined. They * provide typical implementations that may be re-used by multiple diff --git a/plat/common/plat_gicv3.c b/plat/common/plat_gicv3.c index f8277fe54a..f5ed6fc96f 100644 --- a/plat/common/plat_gicv3.c +++ b/plat/common/plat_gicv3.c @@ -3,16 +3,18 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include + #include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include + #ifdef IMAGE_BL31 /* diff --git a/plat/common/plat_log_common.c b/plat/common/plat_log_common.c index c757c6bf1a..66b9758bca 100644 --- a/plat/common/plat_log_common.c +++ b/plat/common/plat_log_common.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include +#include /* Allow platforms to override the log prefix string */ #pragma weak plat_log_get_prefix diff --git a/plat/common/plat_psci_common.c b/plat/common/plat_psci_common.c index fab3c770b7..1a29d9ca42 100644 --- a/plat/common/plat_psci_common.c +++ b/plat/common/plat_psci_common.c @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include -#include + +#include +#include +#include +#include #if ENABLE_PSCI_STAT && ENABLE_PMF #pragma weak plat_psci_stat_accounting_start diff --git a/plat/common/plat_spm_rd.c b/plat/common/plat_spm_rd.c index 69b9a23fb5..0c72cb7aa8 100644 --- a/plat/common/plat_spm_rd.c +++ b/plat/common/plat_spm_rd.c @@ -5,13 +5,16 @@ */ #include -#include -#include +#include + #include + #include -#include -#include -#include + +#include +#include +#include +#include /******************************************************************************* * Resource pool diff --git a/plat/common/plat_spm_sp.c b/plat/common/plat_spm_sp.c index 7b7fbd987e..ce48279923 100644 --- a/plat/common/plat_spm_sp.c +++ b/plat/common/plat_spm_sp.c @@ -5,9 +5,11 @@ */ #include -#include + #include -#include + +#include +#include static unsigned int sp_next; diff --git a/plat/common/tbbr/plat_tbbr.c b/plat/common/tbbr/plat_tbbr.c index f5a4f315c9..12ab0a9e0d 100644 --- a/plat/common/tbbr/plat_tbbr.c +++ b/plat/common/tbbr/plat_tbbr.c @@ -5,14 +5,15 @@ */ #include -#include -#include +#include + +#include +#include #if USE_TBBR_DEFS -#include +#include #else #include #endif -#include /* * Store a new non-volatile counter value. This implementation diff --git a/plat/hisilicon/hikey/aarch64/hikey_common.c b/plat/hisilicon/hikey/aarch64/hikey_common.c index 60e4d867ff..702fc2d865 100644 --- a/plat/hisilicon/hikey/aarch64/hikey_common.c +++ b/plat/hisilicon/hikey/aarch64/hikey_common.c @@ -4,15 +4,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include + +#include +#include +#include +#include +#include +#include + #include #include -#include -#include -#include #define MAP_DDR MAP_REGION_FLAT(DDR_BASE, \ DDR_SIZE - DDR_SEC_SIZE, \ diff --git a/plat/hisilicon/hikey/hikey_bl1_setup.c b/plat/hisilicon/hikey/hikey_bl1_setup.c index 6fcb597329..a08bdfa72b 100644 --- a/plat/hisilicon/hikey/hikey_bl1_setup.c +++ b/plat/hisilicon/hikey/hikey_bl1_setup.c @@ -4,23 +4,25 @@ * 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 -#include -#include "../../bl1/bl1_private.h" +#include "../../../bl1/bl1_private.h" #include "hikey_private.h" /* Data structure which holds the extents of the trusted RAM for BL1 */ diff --git a/plat/hisilicon/hikey/hikey_bl2_mem_params_desc.c b/plat/hisilicon/hikey/hikey_bl2_mem_params_desc.c index 23c16ed99d..4e013a0f3b 100644 --- a/plat/hisilicon/hikey/hikey_bl2_mem_params_desc.c +++ b/plat/hisilicon/hikey/hikey_bl2_mem_params_desc.c @@ -4,11 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include #include /* also includes hikey_def.h and hikey_layout.h*/ +#include +#include +#include /******************************************************************************* * Following descriptor provides BL image/ep information that gets used diff --git a/plat/hisilicon/hikey/hikey_bl2_setup.c b/plat/hisilicon/hikey/hikey_bl2_setup.c index 125d6654c9..b872373736 100644 --- a/plat/hisilicon/hikey/hikey_bl2_setup.c +++ b/plat/hisilicon/hikey/hikey_bl2_setup.c @@ -4,27 +4,29 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include +#include + +#include /* also includes hikey_def.h and hikey_layout.h*/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef SPD_opteed -#include +#include #endif -#include -#include -#include /* also includes hikey_def.h and hikey_layout.h*/ -#include +#include +#include +#include +#include #include "hikey_private.h" /* diff --git a/plat/hisilicon/hikey/hikey_bl31_setup.c b/plat/hisilicon/hikey/hikey_bl31_setup.c index 0e061e9273..b2dcb61964 100644 --- a/plat/hisilicon/hikey/hikey_bl31_setup.c +++ b/plat/hisilicon/hikey/hikey_bl31_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 +#include +#include + #include #include #include #include -#include -#include -#include -#include #include "hikey_private.h" diff --git a/plat/hisilicon/hikey/hikey_bl_common.c b/plat/hisilicon/hikey/hikey_bl_common.c index b254a900d1..d062de4556 100644 --- a/plat/hisilicon/hikey/hikey_bl_common.c +++ b/plat/hisilicon/hikey/hikey_bl_common.c @@ -5,13 +5,13 @@ */ #include -#include +#include +#include +#include +#include + #include #include -#include -#include -#include - #include "hikey_private.h" void hikey_sp804_init(void) diff --git a/plat/hisilicon/hikey/hikey_ddr.c b/plat/hisilicon/hikey/hikey_ddr.c index 43cece001d..e688c157b8 100644 --- a/plat/hisilicon/hikey/hikey_ddr.c +++ b/plat/hisilicon/hikey/hikey_ddr.c @@ -4,16 +4,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include #include + +#include +#include +#include +#include + #include #include #include -#include -#include - #include "hikey_private.h" static void init_pll(void) diff --git a/plat/hisilicon/hikey/hikey_image_load.c b/plat/hisilicon/hikey/hikey_image_load.c index 32ca36db0d..0ab1ca4966 100644 --- a/plat/hisilicon/hikey/hikey_image_load.c +++ b/plat/hisilicon/hikey/hikey_image_load.c @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include +#include +#include +#include /******************************************************************************* * This function flushes the data structures so that they are visible diff --git a/plat/hisilicon/hikey/hikey_io_storage.c b/plat/hisilicon/hikey/hikey_io_storage.c index 3efbefe8c6..11dd97334c 100644 --- a/plat/hisilicon/hikey/hikey_io_storage.c +++ b/plat/hisilicon/hikey/hikey_io_storage.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 /* For FOPEN_MODE_... */ #include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "hikey_private.h" #define EMMC_BLOCK_SHIFT 9 diff --git a/plat/hisilicon/hikey/hikey_pm.c b/plat/hisilicon/hikey/hikey_pm.c index 3128a3d125..05c1e7f225 100644 --- a/plat/hisilicon/hikey/hikey_pm.c +++ b/plat/hisilicon/hikey/hikey_pm.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 #define CORE_PWR_STATE(state) \ ((state)->pwr_domain_state[MPIDR_AFFLVL0]) diff --git a/plat/hisilicon/hikey/hikey_private.h b/plat/hisilicon/hikey/hikey_private.h index ca1baa3f5f..d82a0794a0 100644 --- a/plat/hisilicon/hikey/hikey_private.h +++ b/plat/hisilicon/hikey/hikey_private.h @@ -7,7 +7,7 @@ #ifndef HIKEY_PRIVATE_H #define HIKEY_PRIVATE_H -#include +#include #define RANDOM_MAX 0x7fffffffffffffff #define RANDOM_MAGIC 0x9a4dbeaf diff --git a/plat/hisilicon/hikey/hikey_security.c b/plat/hisilicon/hikey/hikey_security.c index 43d7b7ad78..4b95939418 100644 --- a/plat/hisilicon/hikey/hikey_security.c +++ b/plat/hisilicon/hikey/hikey_security.c @@ -5,11 +5,14 @@ */ #include -#include -#include #include #include -#include + +#include + +#include +#include + #include "hikey_private.h" #define PORTNUM_MAX 5 diff --git a/plat/hisilicon/hikey/hikey_tbbr.c b/plat/hisilicon/hikey/hikey_tbbr.c index 20eda36192..1f05d18ea0 100644 --- a/plat/hisilicon/hikey/hikey_tbbr.c +++ b/plat/hisilicon/hikey/hikey_tbbr.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include extern char hikey_rotpk_hash[], hikey_rotpk_hash_end[]; diff --git a/plat/hisilicon/hikey/hikey_topology.c b/plat/hisilicon/hikey/hikey_topology.c index 95948b8d2e..7890eb7ede 100644 --- a/plat/hisilicon/hikey/hikey_topology.c +++ b/plat/hisilicon/hikey/hikey_topology.c @@ -3,9 +3,11 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include + #include -#include + +#include +#include /* * The HiKey power domain tree descriptor. The cluster power domains diff --git a/plat/hisilicon/hikey/hisi_dvfs.c b/plat/hisilicon/hikey/hisi_dvfs.c index 0d4f893b91..22a67fdcae 100644 --- a/plat/hisilicon/hikey/hisi_dvfs.c +++ b/plat/hisilicon/hikey/hisi_dvfs.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 #define ACPU_FREQ_MAX_NUM 5 #define ACPU_OPP_NUM 7 diff --git a/plat/hisilicon/hikey/hisi_ipc.c b/plat/hisilicon/hikey/hisi_ipc.c index 7e02f3ae1d..43ee0b2abc 100644 --- a/plat/hisilicon/hikey/hisi_ipc.c +++ b/plat/hisilicon/hikey/hisi_ipc.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 + static int ipc_init; static unsigned int cpu_ipc_num[PLATFORM_CLUSTER_COUNT][PLATFORM_CORE_COUNT_PER_CLUSTER] = { diff --git a/plat/hisilicon/hikey/hisi_mcu.c b/plat/hisilicon/hikey/hisi_mcu.c index 359b94d7b1..ac83bd8544 100644 --- a/plat/hisilicon/hikey/hisi_mcu.c +++ b/plat/hisilicon/hikey/hisi_mcu.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 + #define MCU_SECTION_MAX 30 enum MCU_IMAGE_SEC_TYPE_ENUM { diff --git a/plat/hisilicon/hikey/hisi_pwrc.c b/plat/hisilicon/hikey/hisi_pwrc.c index b635fb16fa..e2e3db752f 100644 --- a/plat/hisilicon/hikey/hisi_pwrc.c +++ b/plat/hisilicon/hikey/hisi_pwrc.c @@ -4,8 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include +#include +#include + +#include + +#include +#include #include #include @@ -13,11 +19,6 @@ #include #include -#include -#include -#include -#include - #define CLUSTER_CORE_COUNT (4) #define CLUSTER_CORE_MASK ((1 << CLUSTER_CORE_COUNT) - 1) diff --git a/plat/hisilicon/hikey/hisi_sip_svc.c b/plat/hisilicon/hikey/hisi_sip_svc.c index ffa4903769..3cd1bd0921 100644 --- a/plat/hisilicon/hikey/hisi_sip_svc.c +++ b/plat/hisilicon/hikey/hisi_sip_svc.c @@ -4,13 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include -#include #include -#include +#include +#include +#include +#include + +#include /* Hisi SiP Service UUID */ DEFINE_SVC_UUID2(hisi_sip_svc_uid, diff --git a/plat/hisilicon/hikey/include/hi6553.h b/plat/hisilicon/hikey/include/hi6553.h index 55ce91cafc..fc991f8427 100644 --- a/plat/hisilicon/hikey/include/hi6553.h +++ b/plat/hisilicon/hikey/include/hi6553.h @@ -7,8 +7,9 @@ #ifndef HI6553_H #define HI6553_H +#include + #include -#include #define HI6553_DISABLE6_XO_CLK (PMUSSI_BASE + (0x036 << 2)) diff --git a/plat/hisilicon/hikey/include/plat_macros.S b/plat/hisilicon/hikey/include/plat_macros.S index de38bd50ba..9cd276a3e7 100644 --- a/plat/hisilicon/hikey/include/plat_macros.S +++ b/plat/hisilicon/hikey/include/plat_macros.S @@ -7,8 +7,8 @@ #ifndef PLAT_MACROS_S #define PLAT_MACROS_S -#include -#include +#include +#include #include #include diff --git a/plat/hisilicon/hikey/include/platform_def.h b/plat/hisilicon/hikey/include/platform_def.h index 485eb38004..2537ac66bf 100644 --- a/plat/hisilicon/hikey/include/platform_def.h +++ b/plat/hisilicon/hikey/include/platform_def.h @@ -8,11 +8,12 @@ #define PLATFORM_DEF_H #include -#include +#include +#include +#include + #include #include /* BL memory region sizes, etc */ -#include -#include /* Special value used to verify platform parameters from BL2 to BL3-1 */ #define HIKEY_BL31_PLAT_PARAM_VAL 0x0f1e2d3c4b5a6978ULL diff --git a/plat/hisilicon/hikey/platform.mk b/plat/hisilicon/hikey/platform.mk index 398b224cf7..6d077f7464 100644 --- a/plat/hisilicon/hikey/platform.mk +++ b/plat/hisilicon/hikey/platform.mk @@ -46,7 +46,6 @@ endif USE_COHERENT_MEM := 1 PLAT_INCLUDES := -Iinclude/common/tbbr \ - -Iinclude/drivers/synopsys \ -Iplat/hisilicon/hikey/include PLAT_BL_COMMON_SOURCES := drivers/arm/pl011/aarch64/pl011_console.S \ diff --git a/plat/hisilicon/hikey960/aarch64/hikey960_common.c b/plat/hisilicon/hikey960/aarch64/hikey960_common.c index 1ed3eaa677..612a7f21b1 100644 --- a/plat/hisilicon/hikey960/aarch64/hikey960_common.c +++ b/plat/hisilicon/hikey960/aarch64/hikey960_common.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 #include "../hikey960_def.h" #include "../hikey960_private.h" diff --git a/plat/hisilicon/hikey960/drivers/ipc/hisi_ipc.c b/plat/hisilicon/hikey960/drivers/ipc/hisi_ipc.c index 4c664d1127..a6a4949347 100644 --- a/plat/hisilicon/hikey960/drivers/ipc/hisi_ipc.c +++ b/plat/hisilicon/hikey960/drivers/ipc/hisi_ipc.c @@ -4,15 +4,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include -#include -#include -#include + #include +#include +#include +#include +#include + +#include +#include #include "../../hikey960_private.h" #define IPC_MBX_SOURCE_REG(m) (IPC_BASE + ((m) << 6)) diff --git a/plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.c b/plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.c index 45fcd42b40..659a1c4ad2 100644 --- a/plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.c +++ b/plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.c @@ -4,15 +4,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <../hikey960_def.h> -#include #include -#include -#include -#include + #include +#include +#include +#include +#include <../hikey960_def.h> +#include #include "hisi_pwrc.h" diff --git a/plat/hisilicon/hikey960/hikey960_bl1_setup.c b/plat/hisilicon/hikey960/hikey960_bl1_setup.c index ff2c77a60d..38bdbe4176 100644 --- a/plat/hisilicon/hikey960/hikey960_bl1_setup.c +++ b/plat/hisilicon/hikey960/hikey960_bl1_setup.c @@ -4,26 +4,28 @@ * 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 "../../bl1/bl1_private.h" +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include "../../../bl1/bl1_private.h" #include "hikey960_def.h" #include "hikey960_private.h" diff --git a/plat/hisilicon/hikey960/hikey960_bl2_mem_params_desc.c b/plat/hisilicon/hikey960/hikey960_bl2_mem_params_desc.c index 2944b1f7cd..ba236d22f1 100644 --- a/plat/hisilicon/hikey960/hikey960_bl2_mem_params_desc.c +++ b/plat/hisilicon/hikey960/hikey960_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/hisilicon/hikey960/hikey960_bl2_setup.c b/plat/hisilicon/hikey960/hikey960_bl2_setup.c index 552356f1cc..788392db70 100644 --- a/plat/hisilicon/hikey960/hikey960_bl2_setup.c +++ b/plat/hisilicon/hikey960/hikey960_bl2_setup.c @@ -4,25 +4,27 @@ * 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 #ifdef SPD_opteed -#include +#include #endif -#include -#include -#include -#include +#include #include "hikey960_def.h" #include "hikey960_private.h" diff --git a/plat/hisilicon/hikey960/hikey960_bl31_setup.c b/plat/hisilicon/hikey960/hikey960_bl31_setup.c index 2261470617..67b06f498c 100644 --- a/plat/hisilicon/hikey960/hikey960_bl31_setup.c +++ b/plat/hisilicon/hikey960/hikey960_bl31_setup.c @@ -4,24 +4,26 @@ * 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 +#include +#include +#include +#include +#include + +#include +#include #include "hikey960_def.h" #include "hikey960_private.h" diff --git a/plat/hisilicon/hikey960/hikey960_bl_common.c b/plat/hisilicon/hikey960/hikey960_bl_common.c index 0cee69f94d..89adccb2bb 100644 --- a/plat/hisilicon/hikey960/hikey960_bl_common.c +++ b/plat/hisilicon/hikey960/hikey960_bl_common.c @@ -4,12 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "hikey960_private.h" void hikey960_clk_init(void) diff --git a/plat/hisilicon/hikey960/hikey960_boardid.c b/plat/hisilicon/hikey960/hikey960_boardid.c index f39c153851..1e1126fb1a 100644 --- a/plat/hisilicon/hikey960/hikey960_boardid.c +++ b/plat/hisilicon/hikey960/hikey960_boardid.c @@ -5,12 +5,13 @@ */ #include -#include -#include #include -#include -#include +#include +#include +#include + +#include #include "hikey960_private.h" #define ADC_ADCIN0 0 diff --git a/plat/hisilicon/hikey960/hikey960_def.h b/plat/hisilicon/hikey960/hikey960_def.h index 91d0af3c08..d977c7989c 100644 --- a/plat/hisilicon/hikey960/hikey960_def.h +++ b/plat/hisilicon/hikey960/hikey960_def.h @@ -7,8 +7,8 @@ #ifndef HIKEY960_DEF_H #define HIKEY960_DEF_H -#include -#include +#include +#include #define DDR_BASE 0x0 #define DDR_SIZE 0xC0000000 diff --git a/plat/hisilicon/hikey960/hikey960_image_load.c b/plat/hisilicon/hikey960/hikey960_image_load.c index ad7be5081d..57cb1b228e 100644 --- a/plat/hisilicon/hikey960/hikey960_image_load.c +++ b/plat/hisilicon/hikey960/hikey960_image_load.c @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include +#include +#include +#include /******************************************************************************* * This function flushes the data structures so that they are visible diff --git a/plat/hisilicon/hikey960/hikey960_io_storage.c b/plat/hisilicon/hikey960/hikey960_io_storage.c index cff3b0d235..a4e83897ed 100644 --- a/plat/hisilicon/hikey960/hikey960_io_storage.c +++ b/plat/hisilicon/hikey960/hikey960_io_storage.c @@ -4,21 +4,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include /* For FOPEN_MODE_... */ #include -#include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include struct plat_io_policy { uintptr_t *dev_handle; diff --git a/plat/hisilicon/hikey960/hikey960_mcu_load.c b/plat/hisilicon/hikey960/hikey960_mcu_load.c index 7bf9a3d06b..b9ae31368a 100644 --- a/plat/hisilicon/hikey960/hikey960_mcu_load.c +++ b/plat/hisilicon/hikey960/hikey960_mcu_load.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 + #define ADDR_CONVERT(addr) ((addr) < 0x40000 ? \ (addr) + 0xFFF30000 : \ (addr) + 0x40000000) diff --git a/plat/hisilicon/hikey960/hikey960_pm.c b/plat/hisilicon/hikey960/hikey960_pm.c index f1873eecdb..676cfa3f3c 100644 --- a/plat/hisilicon/hikey960/hikey960_pm.c +++ b/plat/hisilicon/hikey960/hikey960_pm.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 "drivers/pwrc/hisi_pwrc.h" +#include "drivers/pwrc/hisi_pwrc.h" #include "hikey960_def.h" #include "hikey960_private.h" diff --git a/plat/hisilicon/hikey960/hikey960_private.h b/plat/hisilicon/hikey960/hikey960_private.h index 31d3a4ae39..9a18dd620c 100644 --- a/plat/hisilicon/hikey960/hikey960_private.h +++ b/plat/hisilicon/hikey960/hikey960_private.h @@ -7,7 +7,7 @@ #ifndef HIKEY960_PRIVATE_H #define HIKEY960_PRIVATE_H -#include +#include /* * Function and variable prototypes diff --git a/plat/hisilicon/hikey960/hikey960_tbbr.c b/plat/hisilicon/hikey960/hikey960_tbbr.c index e9f28b3bc9..e435ec2e5d 100644 --- a/plat/hisilicon/hikey960/hikey960_tbbr.c +++ b/plat/hisilicon/hikey960/hikey960_tbbr.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include extern char hikey960_rotpk_hash[], hikey960_rotpk_hash_end[]; diff --git a/plat/hisilicon/hikey960/hikey960_topology.c b/plat/hisilicon/hikey960/hikey960_topology.c index 3363724698..a242bb1d38 100644 --- a/plat/hisilicon/hikey960/hikey960_topology.c +++ b/plat/hisilicon/hikey960/hikey960_topology.c @@ -3,9 +3,11 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include + #include -#include + +#include +#include /* * The HiKey power domain tree descriptor. The cluster power domains diff --git a/plat/hisilicon/hikey960/include/plat_macros.S b/plat/hisilicon/hikey960/include/plat_macros.S index 3b126f6529..8765562a02 100644 --- a/plat/hisilicon/hikey960/include/plat_macros.S +++ b/plat/hisilicon/hikey960/include/plat_macros.S @@ -7,8 +7,8 @@ #ifndef PLAT_MACROS_S #define PLAT_MACROS_S -#include -#include +#include +#include #include #include diff --git a/plat/hisilicon/hikey960/include/platform_def.h b/plat/hisilicon/hikey960/include/platform_def.h index 427a1e7596..3e2d79daaf 100644 --- a/plat/hisilicon/hikey960/include/platform_def.h +++ b/plat/hisilicon/hikey960/include/platform_def.h @@ -8,7 +8,8 @@ #define PLATFORM_DEF_H #include -#include +#include + #include "../hikey960_def.h" /* Special value used to verify platform parameters from BL2 to BL3-1 */ diff --git a/plat/hisilicon/poplar/aarch64/platform_common.c b/plat/hisilicon/poplar/aarch64/platform_common.c index d408209d89..fcd0a8bcf8 100644 --- a/plat/hisilicon/poplar/aarch64/platform_common.c +++ b/plat/hisilicon/poplar/aarch64/platform_common.c @@ -4,15 +4,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include -#include #include -#include -#include -#include + +#include +#include +#include +#include +#include +#include +#include + #include "hi3798cv200.h" #include "platform_def.h" diff --git a/plat/hisilicon/poplar/bl1_plat_setup.c b/plat/hisilicon/poplar/bl1_plat_setup.c index d0b12ad2bc..eb8ffe4fd0 100644 --- a/plat/hisilicon/poplar/bl1_plat_setup.c +++ b/plat/hisilicon/poplar/bl1_plat_setup.c @@ -4,22 +4,25 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include #include -#include -#include "../../bl1/bl1_private.h" + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "../../../bl1/bl1_private.h" #include "hi3798cv200.h" #include "plat_private.h" diff --git a/plat/hisilicon/poplar/bl2_plat_mem_params_desc.c b/plat/hisilicon/poplar/bl2_plat_mem_params_desc.c index c73ead8d75..f683d750dc 100644 --- a/plat/hisilicon/poplar/bl2_plat_mem_params_desc.c +++ b/plat/hisilicon/poplar/bl2_plat_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/hisilicon/poplar/bl2_plat_setup.c b/plat/hisilicon/poplar/bl2_plat_setup.c index 3a3ed6a46f..ff8e107dbf 100644 --- a/plat/hisilicon/poplar/bl2_plat_setup.c +++ b/plat/hisilicon/poplar/bl2_plat_setup.c @@ -4,21 +4,23 @@ * 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 +#include +#include +#include + #include "hi3798cv200.h" #include "plat_private.h" diff --git a/plat/hisilicon/poplar/bl31_plat_setup.c b/plat/hisilicon/poplar/bl31_plat_setup.c index e2079f9ee6..69911e8d5e 100644 --- a/plat/hisilicon/poplar/bl31_plat_setup.c +++ b/plat/hisilicon/poplar/bl31_plat_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 #include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "hi3798cv200.h" #include "plat_private.h" diff --git a/plat/hisilicon/poplar/include/hi3798cv200.h b/plat/hisilicon/poplar/include/hi3798cv200.h index ddb43964cf..e31f4b3e1c 100644 --- a/plat/hisilicon/poplar/include/hi3798cv200.h +++ b/plat/hisilicon/poplar/include/hi3798cv200.h @@ -7,7 +7,7 @@ #ifndef HI3798CV200_H #define HI3798CV200_H -#include +#include /* PL011 */ #define PL011_UART0_BASE (0xF8B00000) diff --git a/plat/hisilicon/poplar/include/plat_private.h b/plat/hisilicon/poplar/include/plat_private.h index 3aeccc4241..a34f138467 100644 --- a/plat/hisilicon/poplar/include/plat_private.h +++ b/plat/hisilicon/poplar/include/plat_private.h @@ -7,7 +7,8 @@ #ifndef PLAT_PRIVATE_H #define PLAT_PRIVATE_H -#include +#include + #include "hi3798cv200.h" void plat_configure_mmu_el3(unsigned long total_base, diff --git a/plat/hisilicon/poplar/include/platform_def.h b/plat/hisilicon/poplar/include/platform_def.h index e39d94471a..8f7a1559b2 100644 --- a/plat/hisilicon/poplar/include/platform_def.h +++ b/plat/hisilicon/poplar/include/platform_def.h @@ -8,11 +8,12 @@ #define PLATFORM_DEF_H #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include + #include "hi3798cv200.h" #include "poplar_layout.h" /* BL memory region sizes, etc */ diff --git a/plat/hisilicon/poplar/plat_pm.c b/plat/hisilicon/poplar/plat_pm.c index eccb0b0d8c..67ebca1ca1 100644 --- a/plat/hisilicon/poplar/plat_pm.c +++ b/plat/hisilicon/poplar/plat_pm.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 + #include "hi3798cv200.h" #include "plat_private.h" diff --git a/plat/hisilicon/poplar/plat_storage.c b/plat/hisilicon/poplar/plat_storage.c index 925274ce4e..a17e0f1a22 100644 --- a/plat/hisilicon/poplar/plat_storage.c +++ b/plat/hisilicon/poplar/plat_storage.c @@ -4,23 +4,25 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include -#include -#include "platform_def.h" + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #if !POPLAR_RECOVERY static const io_dev_connector_t *emmc_dev_con; diff --git a/plat/hisilicon/poplar/plat_topology.c b/plat/hisilicon/poplar/plat_topology.c index bb53c6b1fa..764008e9e1 100644 --- a/plat/hisilicon/poplar/plat_topology.c +++ b/plat/hisilicon/poplar/plat_topology.c @@ -4,9 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + #include -#include -#include "platform_def.h" +#include + #include "plat_private.h" const unsigned char hisi_power_domain_tree_desc[] = { diff --git a/plat/hisilicon/poplar/platform.mk b/plat/hisilicon/poplar/platform.mk index 0aaa7074ae..eca14125e1 100644 --- a/plat/hisilicon/poplar/platform.mk +++ b/plat/hisilicon/poplar/platform.mk @@ -54,9 +54,7 @@ $(eval $(call add_define,PLAT_PL061_MAX_GPIOS)) PLAT_INCLUDES := -Iplat/hisilicon/poplar/include \ -Iplat/hisilicon/poplar \ - -Iinclude/common/tbbr \ - -Iinclude/drivers/synopsys \ - -Iinclude/drivers/io + -Iinclude/common/tbbr PLAT_BL_COMMON_SOURCES := \ lib/xlat_tables/aarch64/xlat_tables.c \ diff --git a/plat/hisilicon/poplar/poplar_gicv2.c b/plat/hisilicon/poplar/poplar_gicv2.c index 1c1be47fb8..59f7b76ee7 100644 --- a/plat/hisilicon/poplar/poplar_gicv2.c +++ b/plat/hisilicon/poplar/poplar_gicv2.c @@ -4,10 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include +#include +#include + /****************************************************************************** * On a GICv2 system, the Group 1 secure interrupts are treated as Group 0 * interrupts. diff --git a/plat/hisilicon/poplar/poplar_image_load.c b/plat/hisilicon/poplar/poplar_image_load.c index 32ca36db0d..0ab1ca4966 100644 --- a/plat/hisilicon/poplar/poplar_image_load.c +++ b/plat/hisilicon/poplar/poplar_image_load.c @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include +#include +#include +#include /******************************************************************************* * This function flushes the data structures so that they are visible diff --git a/plat/imx/common/imx8_psci.c b/plat/imx/common/imx8_psci.c index 22a531bf83..588d8b4e25 100644 --- a/plat/imx/common/imx8_psci.c +++ b/plat/imx/common/imx8_psci.c @@ -4,12 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + #include #include -#include +#include + #include #include -#include void __dead2 imx_system_off(void) { diff --git a/plat/imx/common/imx8_topology.c b/plat/imx/common/imx8_topology.c index 64145c4ca8..5e14d17fa2 100644 --- a/plat/imx/common/imx8_topology.c +++ b/plat/imx/common/imx8_topology.c @@ -6,7 +6,7 @@ #include #include -#include +#include const unsigned char imx_power_domain_tree_desc[] = { PWR_DOMAIN_AT_MAX_LVL, diff --git a/plat/imx/common/imx_aips.c b/plat/imx/common/imx_aips.c index 991c262bc4..532d9c0eb1 100644 --- a/plat/imx/common/imx_aips.c +++ b/plat/imx/common/imx_aips.c @@ -4,8 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include +#include + #include #include diff --git a/plat/imx/common/imx_caam.c b/plat/imx/common/imx_caam.c index 335e1ed8ec..d9c141f562 100644 --- a/plat/imx/common/imx_caam.c +++ b/plat/imx/common/imx_caam.c @@ -3,8 +3,11 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + #include -#include + +#include + #include void imx_caam_init(void) diff --git a/plat/imx/common/imx_clock.c b/plat/imx/common/imx_clock.c index ccf2aeb138..743de553ab 100644 --- a/plat/imx/common/imx_clock.c +++ b/plat/imx/common/imx_clock.c @@ -3,10 +3,13 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include + #include #include + +#include +#include + #include #include diff --git a/plat/imx/common/imx_csu.c b/plat/imx/common/imx_csu.c index 7c6a63e8a2..7e165d9281 100644 --- a/plat/imx/common/imx_csu.c +++ b/plat/imx/common/imx_csu.c @@ -3,7 +3,9 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include + +#include + #include #include diff --git a/plat/imx/common/imx_io_mux.c b/plat/imx/common/imx_io_mux.c index 723064716a..75de5d14e4 100644 --- a/plat/imx/common/imx_io_mux.c +++ b/plat/imx/common/imx_io_mux.c @@ -4,7 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include + #include #include diff --git a/plat/imx/common/imx_snvs.c b/plat/imx/common/imx_snvs.c index 4a2a7d7250..9b3a737768 100644 --- a/plat/imx/common/imx_snvs.c +++ b/plat/imx/common/imx_snvs.c @@ -4,7 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include + #include #include diff --git a/plat/imx/common/imx_wdog.c b/plat/imx/common/imx_wdog.c index 86813dd017..af6d7678e9 100644 --- a/plat/imx/common/imx_wdog.c +++ b/plat/imx/common/imx_wdog.c @@ -4,7 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include + #include #include diff --git a/plat/imx/common/include/imx8_lpuart.h b/plat/imx/common/include/imx8_lpuart.h index 8e1184f959..63449e7def 100644 --- a/plat/imx/common/include/imx8_lpuart.h +++ b/plat/imx/common/include/imx8_lpuart.h @@ -7,7 +7,7 @@ #ifndef IMX8_LPUART_H #define IMX8_LPUART_H -#include +#include #define VERID 0x0 #define PARAM 0x4 diff --git a/plat/imx/common/include/imx_snvs.h b/plat/imx/common/include/imx_snvs.h index 0aed1e142f..0b3d1085f7 100644 --- a/plat/imx/common/include/imx_snvs.h +++ b/plat/imx/common/include/imx_snvs.h @@ -7,6 +7,7 @@ #define IMX_SNVS_H #include + #include struct snvs { diff --git a/plat/imx/common/include/imx_uart.h b/plat/imx/common/include/imx_uart.h index d2c3968886..a251024f16 100644 --- a/plat/imx/common/include/imx_uart.h +++ b/plat/imx/common/include/imx_uart.h @@ -7,7 +7,7 @@ #ifndef IMX_UART_H #define IMX_UART_H -#include +#include #ifndef __ASSEMBLY__ diff --git a/plat/imx/common/include/imx_wdog.h b/plat/imx/common/include/imx_wdog.h index 7b3037dfea..75a729a99d 100644 --- a/plat/imx/common/include/imx_wdog.h +++ b/plat/imx/common/include/imx_wdog.h @@ -7,9 +7,10 @@ #ifndef IMX_WDOG_H #define IMX_WDOG_H -#include #include +#include + struct wdog_regs { uint16_t wcr; uint16_t wsr; diff --git a/plat/imx/common/include/plat_imx8.h b/plat/imx/common/include/plat_imx8.h index 03799c459b..8d83173fdb 100644 --- a/plat/imx/common/include/plat_imx8.h +++ b/plat/imx/common/include/plat_imx8.h @@ -7,8 +7,8 @@ #ifndef PLAT_IMX8_H #define PLAT_IMX8_H -#include -#include +#include +#include unsigned int plat_calc_core_pos(uint64_t mpidr); void imx_mailbox_init(uintptr_t base_addr); diff --git a/plat/imx/common/include/sci/sci_rpc.h b/plat/imx/common/include/sci/sci_rpc.h index 1771baed37..60dbc27b6b 100644 --- a/plat/imx/common/include/sci/sci_rpc.h +++ b/plat/imx/common/include/sci/sci_rpc.h @@ -13,9 +13,10 @@ /* Includes */ +#include + #include #include -#include /* Defines */ diff --git a/plat/imx/common/plat_imx8_gic.c b/plat/imx/common/plat_imx8_gic.c index 2da9cc0d98..aec0b6c9b1 100644 --- a/plat/imx/common/plat_imx8_gic.c +++ b/plat/imx/common/plat_imx8_gic.c @@ -4,13 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include -#include -#include #include -#include + +#include +#include +#include +#include +#include + +#include /* the GICv3 driver only needs to be initialized in EL3 */ uintptr_t rdistif_base_addrs[PLATFORM_CORE_COUNT]; diff --git a/plat/imx/common/sci/imx8_mu.c b/plat/imx/common/sci/imx8_mu.c index 8028c76d62..26d9bdfef9 100644 --- a/plat/imx/common/sci/imx8_mu.c +++ b/plat/imx/common/sci/imx8_mu.c @@ -4,7 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include + #include "imx8_mu.h" void MU_EnableRxFullInt(uint32_t base, uint32_t index) diff --git a/plat/imx/common/sci/ipc.c b/plat/imx/common/sci/ipc.c index 2af2567828..6491ca575f 100644 --- a/plat/imx/common/sci/ipc.c +++ b/plat/imx/common/sci/ipc.c @@ -4,11 +4,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include + +#include + #include #include #include -#include #include "imx8_mu.h" DEFINE_BAKERY_LOCK(sc_ipc_bakery_lock); diff --git a/plat/imx/common/sci/svc/pad/pad_rpc_clnt.c b/plat/imx/common/sci/svc/pad/pad_rpc_clnt.c index 555e7047a8..319d4696d8 100644 --- a/plat/imx/common/sci/svc/pad/pad_rpc_clnt.c +++ b/plat/imx/common/sci/svc/pad/pad_rpc_clnt.c @@ -14,11 +14,12 @@ /* Includes */ +#include + #include #include #include #include -#include #include "sci_pad_rpc.h" /* Local Defines */ diff --git a/plat/imx/common/sci/svc/pm/pm_rpc_clnt.c b/plat/imx/common/sci/svc/pm/pm_rpc_clnt.c index b108c499b5..66a57a13d5 100644 --- a/plat/imx/common/sci/svc/pm/pm_rpc_clnt.c +++ b/plat/imx/common/sci/svc/pm/pm_rpc_clnt.c @@ -14,11 +14,13 @@ /* Includes */ +#include + #include #include #include #include -#include + #include "sci_pm_rpc.h" /* Local Defines */ diff --git a/plat/imx/common/sci/svc/rm/rm_rpc_clnt.c b/plat/imx/common/sci/svc/rm/rm_rpc_clnt.c index 230956c7cc..16771a5836 100644 --- a/plat/imx/common/sci/svc/rm/rm_rpc_clnt.c +++ b/plat/imx/common/sci/svc/rm/rm_rpc_clnt.c @@ -14,10 +14,12 @@ /* Includes */ +#include + #include #include #include -#include + #include "sci_rm_rpc.h" /* Local Defines */ diff --git a/plat/imx/imx7/warp7/include/platform_def.h b/plat/imx/imx7/warp7/include/platform_def.h index 4ee6fd37de..a931c8062e 100644 --- a/plat/imx/imx7/warp7/include/platform_def.h +++ b/plat/imx/imx7/warp7/include/platform_def.h @@ -8,8 +8,8 @@ #define PLATFORM_DEF_H #include -#include -#include +#include +#include #define PLATFORM_STACK_SIZE 0x1000 diff --git a/plat/imx/imx7/warp7/warp7_bl2_el3_setup.c b/plat/imx/imx7/warp7/warp7_bl2_el3_setup.c index 10c4160cf7..032ed7b194 100644 --- a/plat/imx/imx7/warp7/warp7_bl2_el3_setup.c +++ b/plat/imx/imx7/warp7/warp7_bl2_el3_setup.c @@ -4,19 +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 + #include #include #include @@ -27,6 +30,7 @@ #include #include #include + #include "warp7_private.h" #define UART1_CLK_SELECT (CCM_TARGET_ROOT_ENABLE |\ diff --git a/plat/imx/imx7/warp7/warp7_bl2_mem_params_desc.c b/plat/imx/imx7/warp7/warp7_bl2_mem_params_desc.c index 12254d46ce..a29e14198f 100644 --- a/plat/imx/imx7/warp7/warp7_bl2_mem_params_desc.c +++ b/plat/imx/imx7/warp7/warp7_bl2_mem_params_desc.c @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include #include +#include +#include +#include + static bl_mem_params_node_t bl2_mem_params_descs[] = { { .image_id = BL32_IMAGE_ID, diff --git a/plat/imx/imx7/warp7/warp7_image_load.c b/plat/imx/imx7/warp7/warp7_image_load.c index 1e3a2b0b5f..c3e47b9d7d 100644 --- a/plat/imx/imx7/warp7/warp7_image_load.c +++ b/plat/imx/imx7/warp7/warp7_image_load.c @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include +#include +#include +#include void plat_flush_next_bl_params(void) { diff --git a/plat/imx/imx7/warp7/warp7_io_storage.c b/plat/imx/imx7/warp7/warp7_io_storage.c index 8354766ae4..b9cace0906 100644 --- a/plat/imx/imx7/warp7/warp7_io_storage.c +++ b/plat/imx/imx7/warp7/warp7_io_storage.c @@ -3,16 +3,19 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + #include -#include -#include -#include -#include -#include -#include -#include + #include +#include +#include +#include +#include +#include +#include +#include + static const io_dev_connector_t *fip_dev_con; static uintptr_t fip_dev_handle; diff --git a/plat/imx/imx8m/imx8mq/gpc.c b/plat/imx/imx8m/imx8mq/gpc.c index 187a4ad1f4..7fa5a3d1b1 100644 --- a/plat/imx/imx8m/imx8mq/gpc.c +++ b/plat/imx/imx8m/imx8mq/gpc.c @@ -4,15 +4,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include -#include -#include #include #include #include -#include + +#include +#include +#include +#include +#include + +#include void imx_set_cpu_secure_entry(unsigned int core_id, uintptr_t sec_entrypoint) { diff --git a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c index 45d2a40f67..f4e6ee746e 100644 --- a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c +++ b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c @@ -4,22 +4,25 @@ * 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 #include -#include -#include IMPORT_SYM(uintptr_t, __COHERENT_RAM_START__, BL31_COHERENT_RAM_START); IMPORT_SYM(uintptr_t, __COHERENT_RAM_END__, BL31_COHERENT_RAM_END); diff --git a/plat/imx/imx8m/imx8mq/imx8mq_psci.c b/plat/imx/imx8m/imx8mq/imx8mq_psci.c index 7afe52d3d4..ee588656ea 100644 --- a/plat/imx/imx8m/imx8mq/imx8mq_psci.c +++ b/plat/imx/imx8m/imx8mq/imx8mq_psci.c @@ -4,14 +4,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + #include #include -#include +#include +#include +#include + #include -#include #include -#include -#include #define CORE_PWR_STATE(state) ((state)->pwr_domain_state[MPIDR_AFFLVL0]) #define CLUSTER_PWR_STATE(state) ((state)->pwr_domain_state[MPIDR_AFFLVL1]) diff --git a/plat/imx/imx8qm/imx8qm_bl31_setup.c b/plat/imx/imx8qm/imx8qm_bl31_setup.c index 7410ac136e..a00695cc3e 100644 --- a/plat/imx/imx8qm/imx8qm_bl31_setup.c +++ b/plat/imx/imx8qm/imx8qm_bl31_setup.c @@ -4,25 +4,28 @@ * 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 -#include #include #include #include -#include -#include IMPORT_SYM(unsigned long, __COHERENT_RAM_START__, BL31_COHERENT_RAM_START); IMPORT_SYM(unsigned long, __COHERENT_RAM_END__, BL31_COHERENT_RAM_END); diff --git a/plat/imx/imx8qm/imx8qm_psci.c b/plat/imx/imx8qm/imx8qm_psci.c index 8166546d46..833048dcfd 100644 --- a/plat/imx/imx8qm/imx8qm_psci.c +++ b/plat/imx/imx8qm/imx8qm_psci.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 #define CORE_PWR_STATE(state) \ ((state)->pwr_domain_state[MPIDR_AFFLVL0]) diff --git a/plat/imx/imx8qm/include/platform_def.h b/plat/imx/imx8qm/include/platform_def.h index 1cf7511a82..1d0bdf9a71 100644 --- a/plat/imx/imx8qm/include/platform_def.h +++ b/plat/imx/imx8qm/include/platform_def.h @@ -7,7 +7,7 @@ #ifndef PLATFORM_DEF_H #define PLATFORM_DEF_H -#include +#include #define PLATFORM_LINKER_FORMAT "elf64-littleaarch64" #define PLATFORM_LINKER_ARCH aarch64 diff --git a/plat/imx/imx8qx/imx8qx_bl31_setup.c b/plat/imx/imx8qx/imx8qx_bl31_setup.c index 6384a85661..c90794a893 100644 --- a/plat/imx/imx8qx/imx8qx_bl31_setup.c +++ b/plat/imx/imx8qx/imx8qx_bl31_setup.c @@ -4,25 +4,28 @@ * 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 -#include #include #include #include -#include -#include IMPORT_SYM(unsigned long, __COHERENT_RAM_START__, BL31_COHERENT_RAM_START); IMPORT_SYM(unsigned long, __COHERENT_RAM_END__, BL31_COHERENT_RAM_END); diff --git a/plat/imx/imx8qx/imx8qx_psci.c b/plat/imx/imx8qx/imx8qx_psci.c index 46ea72486b..94c2e2b1e1 100644 --- a/plat/imx/imx8qx/imx8qx_psci.c +++ b/plat/imx/imx8qx/imx8qx_psci.c @@ -4,15 +4,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + #include #include -#include -#include -#include +#include +#include +#include +#include + #include -#include #include -#include const static int ap_core_index[PLATFORM_CORE_COUNT] = { SC_R_A35_0, SC_R_A35_1, SC_R_A35_2, SC_R_A35_3 diff --git a/plat/imx/imx8qx/include/platform_def.h b/plat/imx/imx8qx/include/platform_def.h index b9fd96c0ce..1239340d02 100644 --- a/plat/imx/imx8qx/include/platform_def.h +++ b/plat/imx/imx8qx/include/platform_def.h @@ -7,7 +7,7 @@ #ifndef PLATFORM_DEF_H #define PLATFORM_DEF_H -#include +#include #define PLATFORM_LINKER_FORMAT "elf64-littleaarch64" #define PLATFORM_LINKER_ARCH aarch64 diff --git a/plat/layerscape/board/ls1043/include/ls_def.h b/plat/layerscape/board/ls1043/include/ls_def.h index 9c837204e0..d8c66e3118 100644 --- a/plat/layerscape/board/ls1043/include/ls_def.h +++ b/plat/layerscape/board/ls1043/include/ls_def.h @@ -7,13 +7,13 @@ #ifndef LS_DEF_H #define LS_DEF_H -#include -#include #include -#include -#include -#include +#include +#include +#include +#include +#include /****************************************************************************** * Definitions common to all ARM standard platforms diff --git a/plat/layerscape/board/ls1043/include/platform_def.h b/plat/layerscape/board/ls1043/include/platform_def.h index 46b2031e13..b6130001c4 100644 --- a/plat/layerscape/board/ls1043/include/platform_def.h +++ b/plat/layerscape/board/ls1043/include/platform_def.h @@ -7,9 +7,10 @@ #ifndef PLATFORM_DEF_H #define PLATFORM_DEF_H -#include -#include -#include +#include +#include +#include + #include "ls_def.h" #define FIRMWARE_WELCOME_STR_LS1043 "Welcome to LS1043 BL1 Phase\n" diff --git a/plat/layerscape/board/ls1043/ls1043_bl1_setup.c b/plat/layerscape/board/ls1043/ls1043_bl1_setup.c index e82a1fb86b..dfa4725431 100644 --- a/plat/layerscape/board/ls1043/ls1043_bl1_setup.c +++ b/plat/layerscape/board/ls1043/ls1043_bl1_setup.c @@ -4,9 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include +#include +#include +#include + #include "plat_ls.h" static const int cci_map[] = { diff --git a/plat/layerscape/board/ls1043/ls1043_bl2_setup.c b/plat/layerscape/board/ls1043/ls1043_bl2_setup.c index b529aa50f9..c9db814776 100644 --- a/plat/layerscape/board/ls1043/ls1043_bl2_setup.c +++ b/plat/layerscape/board/ls1043/ls1043_bl2_setup.c @@ -4,8 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include +#include + #include "plat_ls.h" void bl2_early_platform_setup2(u_register_t arg0, u_register_t arg1, diff --git a/plat/layerscape/board/ls1043/ls1043_bl31_setup.c b/plat/layerscape/board/ls1043/ls1043_bl31_setup.c index 3473d98831..6d15c11394 100644 --- a/plat/layerscape/board/ls1043/ls1043_bl31_setup.c +++ b/plat/layerscape/board/ls1043/ls1043_bl31_setup.c @@ -4,8 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include +#include + #include "plat_ls.h" #include "fsl_csu.h" diff --git a/plat/layerscape/board/ls1043/ls1043_err.c b/plat/layerscape/board/ls1043/ls1043_err.c index e4a2cae4e3..37077d4d8d 100644 --- a/plat/layerscape/board/ls1043/ls1043_err.c +++ b/plat/layerscape/board/ls1043/ls1043_err.c @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include #include +#include +#include + /* * Error handler */ diff --git a/plat/layerscape/board/ls1043/ls1043_psci.c b/plat/layerscape/board/ls1043/ls1043_psci.c index b402e7f772..d6429c3261 100644 --- a/plat/layerscape/board/ls1043/ls1043_psci.c +++ b/plat/layerscape/board/ls1043/ls1043_psci.c @@ -4,17 +4,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include #include #include -#include -#include -#include -#include -#include "platform_def.h" + +#include + +#include +#include +#include +#include +#include +#include +#include #define LS_SCFG_BASE 0x01570000 /* register to store warm boot entry, big endian, higher 32bit */ diff --git a/plat/layerscape/board/ls1043/ls1043_stack_protector.c b/plat/layerscape/board/ls1043/ls1043_stack_protector.c index 50f463b9a0..8a1a4e57d4 100644 --- a/plat/layerscape/board/ls1043/ls1043_stack_protector.c +++ b/plat/layerscape/board/ls1043/ls1043_stack_protector.c @@ -4,9 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include +#include + #define RANDOM_CANARY_VALUE ((u_register_t) 3288484550995823360ULL) u_register_t plat_get_stack_protector_canary(void) diff --git a/plat/layerscape/board/ls1043/ls1043_topology.c b/plat/layerscape/board/ls1043/ls1043_topology.c index 12d2830fe3..c9c6a9cc5a 100644 --- a/plat/layerscape/board/ls1043/ls1043_topology.c +++ b/plat/layerscape/board/ls1043/ls1043_topology.c @@ -5,7 +5,9 @@ */ #include -#include + +#include + #include "plat_ls.h" #include "platform_def.h" diff --git a/plat/layerscape/board/ls1043/ls_gic.c b/plat/layerscape/board/ls1043/ls_gic.c index 3986153a28..3d8b262d29 100644 --- a/plat/layerscape/board/ls1043/ls_gic.c +++ b/plat/layerscape/board/ls1043/ls_gic.c @@ -4,10 +4,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include -#include "platform_def.h" + +#include + +#include +#include + #include "soc.h" /* diff --git a/plat/layerscape/board/ls1043/platform.mk b/plat/layerscape/board/ls1043/platform.mk index 795d924828..91a14a445c 100644 --- a/plat/layerscape/board/ls1043/platform.mk +++ b/plat/layerscape/board/ls1043/platform.mk @@ -23,9 +23,7 @@ LS1043_SECURITY_SOURCES := plat/layerscape/common/ls_tzc380.c \ PLAT_INCLUDES := -Iplat/layerscape/board/ls1043/include \ -Iplat/layerscape/common/include \ - -Iinclude/drivers/arm \ - -Iinclude/lib \ - -Iinclude/drivers/io + -Iinclude/lib PLAT_BL_COMMON_SOURCES := plat/layerscape/common/aarch64/ls_console.S diff --git a/plat/layerscape/common/aarch64/ls_bl2_mem_params_desc.c b/plat/layerscape/common/aarch64/ls_bl2_mem_params_desc.c index a96e3901b2..94107400ad 100644 --- a/plat/layerscape/common/aarch64/ls_bl2_mem_params_desc.c +++ b/plat/layerscape/common/aarch64/ls_bl2_mem_params_desc.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/layerscape/common/aarch64/ls_helpers.S b/plat/layerscape/common/aarch64/ls_helpers.S index 7d71f48266..bbddd0b510 100644 --- a/plat/layerscape/common/aarch64/ls_helpers.S +++ b/plat/layerscape/common/aarch64/ls_helpers.S @@ -5,7 +5,7 @@ */ #include -#include +#include #include .weak plat_my_core_pos diff --git a/plat/layerscape/common/include/ls_16550.h b/plat/layerscape/common/include/ls_16550.h index 94694eef78..b0b1856f03 100644 --- a/plat/layerscape/common/include/ls_16550.h +++ b/plat/layerscape/common/include/ls_16550.h @@ -7,7 +7,7 @@ #ifndef LS_16550_H #define LS_16550_H -#include +#include /* UART16550 Registers */ #define UARTTX 0x0 diff --git a/plat/layerscape/common/include/plat_ls.h b/plat/layerscape/common/include/plat_ls.h index 49526ca8b6..e56670bf0a 100644 --- a/plat/layerscape/common/include/plat_ls.h +++ b/plat/layerscape/common/include/plat_ls.h @@ -7,9 +7,10 @@ #ifndef PLAT_LS_H #define PLAT_LS_H -#include #include +#include + /* BL1 utility functions */ void ls_bl1_platform_setup(void); void ls_bl1_early_platform_setup(void); diff --git a/plat/layerscape/common/ls_bl1_setup.c b/plat/layerscape/common/ls_bl1_setup.c index 0642b5ef7d..fb929fef1f 100644 --- a/plat/layerscape/common/ls_bl1_setup.c +++ b/plat/layerscape/common/ls_bl1_setup.c @@ -4,7 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include + #include "ls_16550.h" #include "plat_ls.h" #include "../../../bl1/bl1_private.h" diff --git a/plat/layerscape/common/ls_bl2_setup.c b/plat/layerscape/common/ls_bl2_setup.c index 4b2dc72454..192eaec46b 100644 --- a/plat/layerscape/common/ls_bl2_setup.c +++ b/plat/layerscape/common/ls_bl2_setup.c @@ -5,8 +5,10 @@ */ #include -#include -#include + +#include +#include + #include "ls_16550.h" #include "plat_ls.h" #include "ls_def.h" diff --git a/plat/layerscape/common/ls_bl31_setup.c b/plat/layerscape/common/ls_bl31_setup.c index 2067b90251..03e5807688 100644 --- a/plat/layerscape/common/ls_bl31_setup.c +++ b/plat/layerscape/common/ls_bl31_setup.c @@ -5,11 +5,12 @@ */ #include -#include -#include -#include -#include -#include + +#include +#include +#include +#include +#include #include "ls_16550.h" #include "plat_ls.h" diff --git a/plat/layerscape/common/ls_common.c b/plat/layerscape/common/ls_common.c index afd5927cdb..3b42909c72 100644 --- a/plat/layerscape/common/ls_common.c +++ b/plat/layerscape/common/ls_common.c @@ -3,13 +3,16 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + +#include + +#include + #include #include -#include -#include -#include -#include -#include "platform_def.h" +#include +#include +#include const mmap_region_t *plat_ls_get_mmap(void); diff --git a/plat/layerscape/common/ls_image_load.c b/plat/layerscape/common/ls_image_load.c index 909bec2fa6..70c01f2b2a 100644 --- a/plat/layerscape/common/ls_image_load.c +++ b/plat/layerscape/common/ls_image_load.c @@ -4,7 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include + #include "ls_def.h" /******************************************************************************* diff --git a/plat/layerscape/common/ls_io_storage.c b/plat/layerscape/common/ls_io_storage.c index 7402366371..71c2f45b3f 100644 --- a/plat/layerscape/common/ls_io_storage.c +++ b/plat/layerscape/common/ls_io_storage.c @@ -3,14 +3,17 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + #include -#include -#include -#include -#include -#include -#include -#include "platform_def.h" + +#include + +#include +#include +#include +#include +#include +#include /* IO devices */ static const io_dev_connector_t *fip_dev_con; diff --git a/plat/layerscape/common/ls_timer.c b/plat/layerscape/common/ls_timer.c index 25b5e63051..021890bb6f 100644 --- a/plat/layerscape/common/ls_timer.c +++ b/plat/layerscape/common/ls_timer.c @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include +#include +#include #define TIMER_BASE_ADDR 0x02B00000 diff --git a/plat/layerscape/common/ls_tzc380.c b/plat/layerscape/common/ls_tzc380.c index b9f32ac367..44f3fcd94d 100644 --- a/plat/layerscape/common/ls_tzc380.c +++ b/plat/layerscape/common/ls_tzc380.c @@ -4,10 +4,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include -#include "platform_def.h" + +#include + +#include +#include + #include "soc_tzasc.h" int tzc380_set_region(unsigned int tzasc_base, unsigned int region_id, diff --git a/plat/layerscape/common/ns_access.c b/plat/layerscape/common/ns_access.c index e1daaed92a..b84fdbd7e0 100644 --- a/plat/layerscape/common/ns_access.c +++ b/plat/layerscape/common/ns_access.c @@ -4,11 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include + +#include + +#include +#include + #include "ns_access.h" -#include "platform_def.h" static void enable_devices_ns_access(struct csu_ns_dev *ns_dev, uint32_t num) { diff --git a/plat/layerscape/common/tsp/ls_tsp_setup.c b/plat/layerscape/common/tsp/ls_tsp_setup.c index a046e2f2dd..c6073619a7 100644 --- a/plat/layerscape/common/tsp/ls_tsp_setup.c +++ b/plat/layerscape/common/tsp/ls_tsp_setup.c @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include +#include +#include +#include #include "ls_16550.h" #include "plat_ls.h" diff --git a/plat/marvell/a3700/a3700/board/pm_src.c b/plat/marvell/a3700/a3700/board/pm_src.c index bc48ce8ca3..d6eca5d167 100644 --- a/plat/marvell/a3700/a3700/board/pm_src.c +++ b/plat/marvell/a3700/a3700/board/pm_src.c @@ -4,6 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause * https://spdx.org/licenses */ + #include #include diff --git a/plat/marvell/a3700/a3700/plat_bl31_setup.c b/plat/marvell/a3700/a3700/plat_bl31_setup.c index 83db06f9d0..6862a86706 100644 --- a/plat/marvell/a3700/a3700/plat_bl31_setup.c +++ b/plat/marvell/a3700/a3700/plat_bl31_setup.c @@ -5,10 +5,11 @@ * https://spdx.org/licenses */ +#include + #include #include #include -#include #include #include diff --git a/plat/marvell/a3700/common/a3700_common.mk b/plat/marvell/a3700/common/a3700_common.mk index e2ac97ffc9..a4727d2ea7 100644 --- a/plat/marvell/a3700/common/a3700_common.mk +++ b/plat/marvell/a3700/common/a3700_common.mk @@ -84,14 +84,12 @@ MARVELL_GIC_SOURCES := drivers/arm/gic/common/gic_common.c \ plat/common/plat_gicv3.c \ drivers/arm/gic/v3/gic500.c -ATF_INCLUDES := -Iinclude/common/tbbr \ - -Iinclude/drivers +ATF_INCLUDES := -Iinclude/common/tbbr PLAT_INCLUDES := -I$(PLAT_FAMILY_BASE)/$(PLAT) \ -I$(PLAT_COMMON_BASE)/include \ -I$(PLAT_INCLUDE_BASE)/common \ -I$(MARVELL_DRV_BASE) \ - -Iinclude/drivers/marvell/uart \ -I$/drivers/arm/gic/common/ \ $(ATF_INCLUDES) diff --git a/plat/marvell/a3700/common/a3700_sip_svc.c b/plat/marvell/a3700/common/a3700_sip_svc.c index 88d1fc2f7e..e8ac5fc08d 100644 --- a/plat/marvell/a3700/common/a3700_sip_svc.c +++ b/plat/marvell/a3700/common/a3700_sip_svc.c @@ -5,11 +5,13 @@ * https://spdx.org/licenses */ -#include +#include +#include +#include + #include #include -#include -#include + #include "comphy/phy-comphy-3700.h" /* Comphy related FID's */ diff --git a/plat/marvell/a3700/common/dram_win.c b/plat/marvell/a3700/common/dram_win.c index fb236d82d6..694f6d480e 100644 --- a/plat/marvell/a3700/common/dram_win.c +++ b/plat/marvell/a3700/common/dram_win.c @@ -5,12 +5,14 @@ * https://spdx.org/licenses */ +#include + +#include + #include #include -#include #include #include -#include /* Armada 3700 has 5 configurable windows */ #define MV_CPU_WIN_NUM 5 diff --git a/plat/marvell/a3700/common/include/dram_win.h b/plat/marvell/a3700/common/include/dram_win.h index 6f345f9453..26a013784a 100644 --- a/plat/marvell/a3700/common/include/dram_win.h +++ b/plat/marvell/a3700/common/include/dram_win.h @@ -8,7 +8,8 @@ #ifndef DRAM_WIN_H #define DRAM_WIN_H -#include +#include + #include void dram_win_map_build(struct dram_win_map *win_map); diff --git a/plat/marvell/a3700/common/include/platform_def.h b/plat/marvell/a3700/common/include/platform_def.h index ca2553c99d..16865c4d23 100644 --- a/plat/marvell/a3700/common/include/platform_def.h +++ b/plat/marvell/a3700/common/include/platform_def.h @@ -8,12 +8,13 @@ #ifndef PLATFORM_DEF_H #define PLATFORM_DEF_H -#include -#include #ifndef __ASSEMBLY__ #include #endif /* __ASSEMBLY__ */ +#include +#include + /* * Most platform porting definitions provided by included headers */ diff --git a/plat/marvell/a3700/common/io_addr_dec.c b/plat/marvell/a3700/common/io_addr_dec.c index f00959433a..b27633cf25 100644 --- a/plat/marvell/a3700/common/io_addr_dec.c +++ b/plat/marvell/a3700/common/io_addr_dec.c @@ -4,9 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause * https://spdx.org/licenses */ -#include + +#include +#include + #include -#include #include #define MVEBU_DEC_WIN_CTRL_REG(base, win, off) (MVEBU_REGS_BASE + (base) + \ diff --git a/plat/marvell/a3700/common/marvell_plat_config.c b/plat/marvell/a3700/common/marvell_plat_config.c index 85a420130f..3bf3d96bdb 100644 --- a/plat/marvell/a3700/common/marvell_plat_config.c +++ b/plat/marvell/a3700/common/marvell_plat_config.c @@ -5,7 +5,8 @@ * https://spdx.org/licenses */ -#include +#include + #include #include diff --git a/plat/marvell/a3700/common/plat_pm.c b/plat/marvell/a3700/common/plat_pm.c index dce484168d..f8ce6fe29e 100644 --- a/plat/marvell/a3700/common/plat_pm.c +++ b/plat/marvell/a3700/common/plat_pm.c @@ -5,22 +5,23 @@ * https://spdx.org/licenses */ +#include +#ifdef USE_CCI +#include +#endif +#include +#include +#include + #include #include #include -#include #include #include -#include #include #include #include -#include #include -#include -#ifdef USE_CCI -#include -#endif /* Warm reset register */ #define MVEBU_WARM_RESET_REG (MVEBU_NB_REGS_BASE + 0x840) diff --git a/plat/marvell/a8k/a70x0/board/dram_port.c b/plat/marvell/a8k/a70x0/board/dram_port.c index c67025899e..4fca7e3837 100644 --- a/plat/marvell/a8k/a70x0/board/dram_port.c +++ b/plat/marvell/a8k/a70x0/board/dram_port.c @@ -6,7 +6,8 @@ */ #include -#include +#include + #include #include diff --git a/plat/marvell/a8k/a70x0_amc/board/dram_port.c b/plat/marvell/a8k/a70x0_amc/board/dram_port.c index ab1df465ed..aecf6c5672 100644 --- a/plat/marvell/a8k/a70x0_amc/board/dram_port.c +++ b/plat/marvell/a8k/a70x0_amc/board/dram_port.c @@ -6,7 +6,8 @@ */ #include -#include +#include + #include #include diff --git a/plat/marvell/a8k/a80x0/board/dram_port.c b/plat/marvell/a8k/a80x0/board/dram_port.c index a99bf7c21f..02f4ffb0a3 100644 --- a/plat/marvell/a8k/a80x0/board/dram_port.c +++ b/plat/marvell/a8k/a80x0/board/dram_port.c @@ -6,9 +6,10 @@ */ #include -#include -#include -#include +#include +#include +#include + #include #include #include diff --git a/plat/marvell/a8k/a80x0_mcbin/board/dram_port.c b/plat/marvell/a8k/a80x0_mcbin/board/dram_port.c index fa222eecfe..25808523c5 100644 --- a/plat/marvell/a8k/a80x0_mcbin/board/dram_port.c +++ b/plat/marvell/a8k/a80x0_mcbin/board/dram_port.c @@ -6,9 +6,10 @@ */ #include -#include -#include -#include +#include +#include +#include + #include #include #include diff --git a/plat/marvell/a8k/a80x0_mcbin/board/marvell_plat_config.c b/plat/marvell/a8k/a80x0_mcbin/board/marvell_plat_config.c index 384d0f54b9..fa4e144c91 100644 --- a/plat/marvell/a8k/a80x0_mcbin/board/marvell_plat_config.c +++ b/plat/marvell/a8k/a80x0_mcbin/board/marvell_plat_config.c @@ -5,9 +5,10 @@ * https://spdx.org/licenses */ +#include +#include + #include -#include -#include /* * If bootrom is currently at BLE there's no need to include the memory diff --git a/plat/marvell/a8k/common/a8k_common.mk b/plat/marvell/a8k/common/a8k_common.mk index e350d6ac96..efb05b8e24 100644 --- a/plat/marvell/a8k/common/a8k_common.mk +++ b/plat/marvell/a8k/common/a8k_common.mk @@ -50,8 +50,6 @@ ATF_INCLUDES := -Iinclude/common/tbbr PLAT_INCLUDES := -I$(PLAT_FAMILY_BASE)/$(PLAT) \ -I$(PLAT_COMMON_BASE)/include \ -I$(PLAT_INCLUDE_BASE)/common \ - -Iinclude/drivers/marvell \ - -Iinclude/drivers/marvell/mochi \ $(ATF_INCLUDES) PLAT_BL_COMMON_SOURCES := $(PLAT_COMMON_BASE)/aarch64/a8k_common.c \ diff --git a/plat/marvell/a8k/common/aarch64/plat_arch_config.c b/plat/marvell/a8k/common/aarch64/plat_arch_config.c index 8667331451..06dc841157 100644 --- a/plat/marvell/a8k/common/aarch64/plat_arch_config.c +++ b/plat/marvell/a8k/common/aarch64/plat_arch_config.c @@ -5,12 +5,11 @@ * https://spdx.org/licenses */ -#include #include -#include -#include -#include - +#include +#include +#include +#include #define CCU_HTC_ASET (MVEBU_CCU_BASE(MVEBU_AP0) + 0x264) #define MVEBU_IO_AFFINITY (0xF00) diff --git a/plat/marvell/a8k/common/ble/ble.mk b/plat/marvell/a8k/common/ble/ble.mk index 5f24ced23b..ed4ff3af29 100644 --- a/plat/marvell/a8k/common/ble/ble.mk +++ b/plat/marvell/a8k/common/ble/ble.mk @@ -13,12 +13,12 @@ PLAT_MARVELL = plat/marvell BLE_SOURCES += $(BLE_PATH)/ble_main.c \ $(BLE_PATH)/ble_mem.S \ drivers/delay_timer/delay_timer.c \ + $(PLAT_MARVELL)/common/aarch64/marvell_helpers.S \ $(PLAT_MARVELL)/common/plat_delay_timer.c \ $(PLAT_MARVELL)/common/marvell_console.c PLAT_INCLUDES += -I$(MV_DDR_PATH) \ -I$(CURDIR)/include/ \ - -I$(CURDIR)/include/drivers \ -I$(CURDIR)/include/lib \ -I$(CURDIR)/include/lib/libc \ -I$(CURDIR)/include/lib/libc/aarch64 \ diff --git a/plat/marvell/a8k/common/ble/ble_main.c b/plat/marvell/a8k/common/ble/ble_main.c index b04e8b7a66..5b3acec2d1 100644 --- a/plat/marvell/a8k/common/ble/ble_main.c +++ b/plat/marvell/a8k/common/ble/ble_main.c @@ -5,14 +5,17 @@ * https://spdx.org/licenses */ +#include + +#include + #include -#include -#include +#include +#include + #include #include -#include #include -#include #define BR_FLAG_SILENT 0x1 #define SKIP_IMAGE_CODE 0xDEADB002 diff --git a/plat/marvell/a8k/common/include/platform_def.h b/plat/marvell/a8k/common/include/platform_def.h index 4c3e7a9ead..3f6154e75e 100644 --- a/plat/marvell/a8k/common/include/platform_def.h +++ b/plat/marvell/a8k/common/include/platform_def.h @@ -8,14 +8,16 @@ #ifndef PLATFORM_DEF_H #define PLATFORM_DEF_H -#include -#include -#include -#include #ifndef __ASSEMBLY__ #include #endif /* __ASSEMBLY__ */ +#include +#include + +#include +#include + /* * Most platform porting definitions provided by included headers */ diff --git a/plat/marvell/a8k/common/mss/mss_bl2_setup.c b/plat/marvell/a8k/common/mss/mss_bl2_setup.c index 973c56dc83..728ee54a05 100644 --- a/plat/marvell/a8k/common/mss/mss_bl2_setup.c +++ b/plat/marvell/a8k/common/mss/mss_bl2_setup.c @@ -5,14 +5,16 @@ * https://spdx.org/licenses */ +#include + +#include +#include +#include +#include +#include + #include -#include -#include -#include -#include #include /* timer functionality */ -#include -#include #include "mss_scp_bootloader.h" diff --git a/plat/marvell/a8k/common/mss/mss_pm_ipc.c b/plat/marvell/a8k/common/mss/mss_pm_ipc.c index d1297b07b0..a0705832fb 100644 --- a/plat/marvell/a8k/common/mss/mss_pm_ipc.c +++ b/plat/marvell/a8k/common/mss/mss_pm_ipc.c @@ -5,11 +5,12 @@ * https://spdx.org/licenses */ -#include -#include -#include #include +#include +#include +#include + #include /* diff --git a/plat/marvell/a8k/common/plat_bl1_setup.c b/plat/marvell/a8k/common/plat_bl1_setup.c index 5d8510279f..f9521c871e 100644 --- a/plat/marvell/a8k/common/plat_bl1_setup.c +++ b/plat/marvell/a8k/common/plat_bl1_setup.c @@ -5,7 +5,8 @@ * https://spdx.org/licenses */ -#include +#include + #include void marvell_bl1_setup_mpps(void) diff --git a/plat/marvell/a8k/common/plat_bl31_setup.c b/plat/marvell/a8k/common/plat_bl31_setup.c index 6dfbcbb20d..98b3966ae3 100644 --- a/plat/marvell/a8k/common/plat_bl31_setup.c +++ b/plat/marvell/a8k/common/plat_bl31_setup.c @@ -5,17 +5,17 @@ * https://spdx.org/licenses */ +#include +#include +#include +#include +#include + #include -#include -#include -#include #include #include #include -#include -#include #include - #include #include diff --git a/plat/marvell/a8k/common/plat_ble_setup.c b/plat/marvell/a8k/common/plat_ble_setup.c index dbadeb768b..0590cc0aef 100644 --- a/plat/marvell/a8k/common/plat_ble_setup.c +++ b/plat/marvell/a8k/common/plat_ble_setup.c @@ -5,17 +5,18 @@ * https://spdx.org/licenses */ -#include +#include +#include +#include +#include +#include +#include +#include + #include -#include -#include -#include -#include -#include #include #include #include -#include "ap807_clocks_init.h" /* Register for skip image use */ #define SCRATCH_PAD_REG2 0xF06F00A8 diff --git a/plat/marvell/a8k/common/plat_pm.c b/plat/marvell/a8k/common/plat_pm.c index 285441691f..e2575b13c1 100644 --- a/plat/marvell/a8k/common/plat_pm.c +++ b/plat/marvell/a8k/common/plat_pm.c @@ -5,19 +5,21 @@ * https://spdx.org/licenses */ -#include #include -#include -#include -#include -#include -#include -#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include #include -#include #include #include -#include #include #define MVEBU_PRIVATE_UID_REG 0x30 diff --git a/plat/marvell/a8k/common/plat_pm_trace.c b/plat/marvell/a8k/common/plat_pm_trace.c index 683e56f6a1..f589ff31b8 100644 --- a/plat/marvell/a8k/common/plat_pm_trace.c +++ b/plat/marvell/a8k/common/plat_pm_trace.c @@ -5,9 +5,10 @@ * https://spdx.org/licenses */ -#include +#include +#include + #include -#include #include #ifdef PM_TRACE_ENABLE diff --git a/plat/marvell/a8k/common/plat_thermal.c b/plat/marvell/a8k/common/plat_thermal.c index 02fe82097d..a2fc0d0ab5 100644 --- a/plat/marvell/a8k/common/plat_thermal.c +++ b/plat/marvell/a8k/common/plat_thermal.c @@ -5,11 +5,12 @@ * https://spdx.org/licenses */ -#include -#include -#include +#include +#include +#include +#include + #include -#include #define THERMAL_TIMEOUT 1200 diff --git a/plat/marvell/common/aarch64/marvell_bl2_mem_params_desc.c b/plat/marvell/common/aarch64/marvell_bl2_mem_params_desc.c index 17f8771238..6a8e11c90f 100644 --- a/plat/marvell/common/aarch64/marvell_bl2_mem_params_desc.c +++ b/plat/marvell/common/aarch64/marvell_bl2_mem_params_desc.c @@ -4,12 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include -#include #include +#include +#include +#include +#include /******************************************************************************* * Following descriptor provides BL image/ep information that gets used diff --git a/plat/marvell/common/aarch64/marvell_common.c b/plat/marvell/common/aarch64/marvell_common.c index abc501a90d..ea0902cc07 100644 --- a/plat/marvell/common/aarch64/marvell_common.c +++ b/plat/marvell/common/aarch64/marvell_common.c @@ -5,15 +5,17 @@ * https://spdx.org/licenses */ -#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/marvell/common/aarch64/marvell_helpers.S b/plat/marvell/common/aarch64/marvell_helpers.S index fbd19cb612..6f625b95d5 100644 --- a/plat/marvell/common/aarch64/marvell_helpers.S +++ b/plat/marvell/common/aarch64/marvell_helpers.S @@ -7,12 +7,12 @@ #include #include -#include -#include #ifndef PLAT_a3700 -#include -#include +#include +#include #endif +#include +#include .weak plat_marvell_calc_core_pos .weak plat_my_core_pos diff --git a/plat/marvell/common/marvell_bl1_setup.c b/plat/marvell/common/marvell_bl1_setup.c index c96f00679d..8f72210250 100644 --- a/plat/marvell/common/marvell_bl1_setup.c +++ b/plat/marvell/common/marvell_bl1_setup.c @@ -5,15 +5,17 @@ * https://spdx.org/licenses */ -#include -#include -#include -#include -#include -#include #include + +#include +#include +#include +#include +#include +#include +#include + #include -#include /* Weak definitions may be overridden in specific Marvell standard platform */ #pragma weak bl1_early_platform_setup diff --git a/plat/marvell/common/marvell_bl2_setup.c b/plat/marvell/common/marvell_bl2_setup.c index 883336f0da..3c1c39112b 100644 --- a/plat/marvell/common/marvell_bl2_setup.c +++ b/plat/marvell/common/marvell_bl2_setup.c @@ -5,17 +5,20 @@ * https://spdx.org/licenses */ -#include #include -#include -#include -#include -#include -#include +#include + #include + +#include +#include +#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/marvell/common/marvell_bl31_setup.c b/plat/marvell/common/marvell_bl31_setup.c index 3b1a6f130c..802c01383b 100644 --- a/plat/marvell/common/marvell_bl31_setup.c +++ b/plat/marvell/common/marvell_bl31_setup.c @@ -5,18 +5,19 @@ * https://spdx.org/licenses */ -#include #include -#include -#include -#include -#include -#include -#include +#include +#include #ifdef USE_CCI -#include +#include #endif +#include +#include + +#include +#include +#include /* * The next 3 constants identify the extents of the code, RO data region and the diff --git a/plat/marvell/common/marvell_cci.c b/plat/marvell/common/marvell_cci.c index 2df480243e..80351aedcd 100644 --- a/plat/marvell/common/marvell_cci.c +++ b/plat/marvell/common/marvell_cci.c @@ -5,7 +5,8 @@ * https://spdx.org/licenses */ -#include +#include + #include static const int cci_map[] = { diff --git a/plat/marvell/common/marvell_console.c b/plat/marvell/common/marvell_console.c index eba106dc1a..22c5eb3afd 100644 --- a/plat/marvell/common/marvell_console.c +++ b/plat/marvell/common/marvell_console.c @@ -4,18 +4,21 @@ * SPDX-License-Identifier: BSD-3-Clause */ #include -#include -#include -#include + #include +#include +#include + +#include + #ifdef PLAT_a3700 -#include +#include static console_a3700_t marvell_boot_console; static console_a3700_t marvell_runtime_console; #else -#include +#include static console_16550_t marvell_boot_console; static console_16550_t marvell_runtime_console; diff --git a/plat/marvell/common/marvell_ddr_info.c b/plat/marvell/common/marvell_ddr_info.c index 68bff998b1..734099652f 100644 --- a/plat/marvell/common/marvell_ddr_info.c +++ b/plat/marvell/common/marvell_ddr_info.c @@ -5,10 +5,12 @@ * https://spdx.org/licenses */ -#include #include + +#include +#include + #include -#include #define DRAM_CH0_MMAP_LOW_REG(iface, cs, base) \ (base + DRAM_CH0_MMAP_LOW_OFFSET + (iface) * 0x10000 + (cs) * 0x8) diff --git a/plat/marvell/common/marvell_gicv2.c b/plat/marvell/common/marvell_gicv2.c index 19e1ec0f53..2505c9f84d 100644 --- a/plat/marvell/common/marvell_gicv2.c +++ b/plat/marvell/common/marvell_gicv2.c @@ -5,15 +5,17 @@ * https://spdx.org/licenses */ -#include -#include -#include -#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 * the way the GICv2 driver is initialised and used. diff --git a/plat/marvell/common/marvell_gicv3.c b/plat/marvell/common/marvell_gicv3.c index 7cfefaf5cf..0bd5545708 100644 --- a/plat/marvell/common/marvell_gicv3.c +++ b/plat/marvell/common/marvell_gicv3.c @@ -5,13 +5,15 @@ * https://spdx.org/licenses */ -#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/marvell/common/marvell_image_load.c b/plat/marvell/common/marvell_image_load.c index d69b1b1214..be16b08989 100644 --- a/plat/marvell/common/marvell_image_load.c +++ b/plat/marvell/common/marvell_image_load.c @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include #include +#include +#include +#include + /******************************************************************************* * This function flushes the data structures so that they are visible * in memory for the next BL image. diff --git a/plat/marvell/common/marvell_io_storage.c b/plat/marvell/common/marvell_io_storage.c index cb9ece2475..065f956885 100644 --- a/plat/marvell/common/marvell_io_storage.c +++ b/plat/marvell/common/marvell_io_storage.c @@ -6,16 +6,18 @@ */ #include -#include /* For ARRAY_SIZE */ -#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; static uintptr_t fip_dev_handle; diff --git a/plat/marvell/common/marvell_pm.c b/plat/marvell/common/marvell_pm.c index 2a75790093..3c675b296b 100644 --- a/plat/marvell/common/marvell_pm.c +++ b/plat/marvell/common/marvell_pm.c @@ -5,9 +5,11 @@ * https://spdx.org/licenses */ -#include #include -#include + +#include +#include + #include /* Standard ARM platforms are expected to export plat_arm_psci_pm_ops */ diff --git a/plat/marvell/common/mrvl_sip_svc.c b/plat/marvell/common/mrvl_sip_svc.c index bc4b621132..df211059b9 100644 --- a/plat/marvell/common/mrvl_sip_svc.c +++ b/plat/marvell/common/mrvl_sip_svc.c @@ -5,13 +5,15 @@ * https://spdx.org/licenses */ -#include -#include -#include +#include +#include +#include +#include +#include + #include #include -#include -#include + #include "comphy/phy-comphy-cp110.h" /* #define DEBUG_COMPHY */ diff --git a/plat/marvell/common/mss/mss_ipc_drv.c b/plat/marvell/common/mss/mss_ipc_drv.c index 731c315bf0..70ccfa5acc 100644 --- a/plat/marvell/common/mss/mss_ipc_drv.c +++ b/plat/marvell/common/mss/mss_ipc_drv.c @@ -5,11 +5,13 @@ * https://spdx.org/licenses */ -#include -#include #include + +#include +#include + +#include #include -#include #define IPC_MSG_BASE_MASK MVEBU_REGS_BASE_MASK diff --git a/plat/marvell/common/mss/mss_ipc_drv.h b/plat/marvell/common/mss/mss_ipc_drv.h index 7bb15d3f28..bcb4b2d8f9 100644 --- a/plat/marvell/common/mss/mss_ipc_drv.h +++ b/plat/marvell/common/mss/mss_ipc_drv.h @@ -8,7 +8,7 @@ #ifndef MSS_IPC_DRV_H #define MSS_IPC_DRV_H -#include +#include #define MV_PM_FW_IPC_VERSION_MAGIC (0xCA530000) /* Do NOT change */ /* Increament for each version */ diff --git a/plat/marvell/common/mss/mss_scp_bootloader.c b/plat/marvell/common/mss/mss_scp_bootloader.c index 334fcfc614..7e442c6154 100644 --- a/plat/marvell/common/mss/mss_scp_bootloader.c +++ b/plat/marvell/common/mss/mss_scp_bootloader.c @@ -6,11 +6,13 @@ */ #include -#include -#include -#include /* for cache maintanance operations */ + #include -#include + +#include +#include +#include +#include #include #include diff --git a/plat/marvell/common/plat_delay_timer.c b/plat/marvell/common/plat_delay_timer.c index dfc77c7fef..253975264b 100644 --- a/plat/marvell/common/plat_delay_timer.c +++ b/plat/marvell/common/plat_delay_timer.c @@ -6,7 +6,8 @@ */ #include -#include +#include + #include #define SYS_COUNTER_FREQ_IN_MHZ (COUNTER_FREQUENCY/1000000) diff --git a/plat/mediatek/common/custom/oem_svc.c b/plat/mediatek/common/custom/oem_svc.c index 18bda515a4..27ee6aa7bb 100644 --- a/plat/mediatek/common/custom/oem_svc.c +++ b/plat/mediatek/common/custom/oem_svc.c @@ -3,15 +3,18 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + +#include +#include + #include #include -#include -#include +#include +#include +#include +#include + #include -#include -#include -#include -#include /* OEM Service UUID */ DEFINE_SVC_UUID2(oem_svc_uid, diff --git a/plat/mediatek/common/mtk_plat_common.c b/plat/mediatek/common/mtk_plat_common.c index bff83c7343..a07a2981ac 100644 --- a/plat/mediatek/common/mtk_plat_common.c +++ b/plat/mediatek/common/mtk_plat_common.c @@ -3,17 +3,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 struct atf_arg_t gteearg; diff --git a/plat/mediatek/common/mtk_plat_common.h b/plat/mediatek/common/mtk_plat_common.h index ff8e8c0374..55f4c516eb 100644 --- a/plat/mediatek/common/mtk_plat_common.h +++ b/plat/mediatek/common/mtk_plat_common.h @@ -6,10 +6,11 @@ #ifndef MTK_PLAT_COMMON_H #define MTK_PLAT_COMMON_H -#include -#include #include +#include +#include + /******************************************************************************* * Function and variable prototypes ******************************************************************************/ diff --git a/plat/mediatek/common/mtk_sip_svc.c b/plat/mediatek/common/mtk_sip_svc.c index 71eddca310..dab0d4541c 100644 --- a/plat/mediatek/common/mtk_sip_svc.c +++ b/plat/mediatek/common/mtk_sip_svc.c @@ -3,15 +3,18 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + #include -#include -#include -#include + +#include +#include +#include +#include +#include + #include #include #include -#include -#include /* Mediatek SiP Service UUID */ DEFINE_SVC_UUID2(mtk_sip_svc_uid, diff --git a/plat/mediatek/mt6795/bl31.ld.S b/plat/mediatek/mt6795/bl31.ld.S index 8f391df7e8..6ec7a1ab4a 100644 --- a/plat/mediatek/mt6795/bl31.ld.S +++ b/plat/mediatek/mt6795/bl31.ld.S @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include #include -#include OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT) OUTPUT_ARCH(PLATFORM_LINKER_ARCH) diff --git a/plat/mediatek/mt6795/bl31_plat_setup.c b/plat/mediatek/mt6795/bl31_plat_setup.c index 8df7dada89..2051fe7630 100644 --- a/plat/mediatek/mt6795/bl31_plat_setup.c +++ b/plat/mediatek/mt6795/bl31_plat_setup.c @@ -3,25 +3,28 @@ * * 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 #include #include #include #include -#include -#include -#include -#include /******************************************************************************* * Declarations of linker defined symbols which will help us find the layout diff --git a/plat/mediatek/mt6795/drivers/timer/mt_cpuxgpt.c b/plat/mediatek/mt6795/drivers/timer/mt_cpuxgpt.c index b357972e41..3696f8eec7 100644 --- a/plat/mediatek/mt6795/drivers/timer/mt_cpuxgpt.c +++ b/plat/mediatek/mt6795/drivers/timer/mt_cpuxgpt.c @@ -4,13 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include #include -#include -#include +#include +#include +#include + #include -#include -#include + #define CPUXGPT_BASE 0x10200000 #define INDEX_BASE (CPUXGPT_BASE+0x0674) #define CTL_BASE (CPUXGPT_BASE+0x0670) diff --git a/plat/mediatek/mt6795/include/mcucfg.h b/plat/mediatek/mt6795/include/mcucfg.h index 7f6a786555..21c539462e 100644 --- a/plat/mediatek/mt6795/include/mcucfg.h +++ b/plat/mediatek/mt6795/include/mcucfg.h @@ -7,9 +7,10 @@ #ifndef MCUCFG_H #define MCUCFG_H -#include #include +#include + struct mt6795_mcucfg_regs { uint32_t mp0_ca7l_cache_config; struct { diff --git a/plat/mediatek/mt6795/include/plat_macros.S b/plat/mediatek/mt6795/include/plat_macros.S index 7485647f3f..d198fdc11f 100644 --- a/plat/mediatek/mt6795/include/plat_macros.S +++ b/plat/mediatek/mt6795/include/plat_macros.S @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include #include .section .rodata.gic_reg_name, "aS" diff --git a/plat/mediatek/mt6795/include/plat_private.h b/plat/mediatek/mt6795/include/plat_private.h index 10baa23d98..f7450ca1ce 100644 --- a/plat/mediatek/mt6795/include/plat_private.h +++ b/plat/mediatek/mt6795/include/plat_private.h @@ -8,7 +8,8 @@ #define PLAT_PRIVATE_H #include -#include + +#include void plat_configure_mmu_el3(unsigned long total_base, unsigned long total_size, diff --git a/plat/mediatek/mt6795/include/platform_def.h b/plat/mediatek/mt6795/include/platform_def.h index 0110e192dc..301610d4cf 100644 --- a/plat/mediatek/mt6795/include/platform_def.h +++ b/plat/mediatek/mt6795/include/platform_def.h @@ -7,7 +7,7 @@ #ifndef PLATFORM_DEF_H #define PLATFORM_DEF_H -#include +#include #define PLAT_PRIMARY_CPU 0x0 diff --git a/plat/mediatek/mt6795/plat_delay_timer.c b/plat/mediatek/mt6795/plat_delay_timer.c index 9df286771f..965b653488 100644 --- a/plat/mediatek/mt6795/plat_delay_timer.c +++ b/plat/mediatek/mt6795/plat_delay_timer.c @@ -4,10 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include +#include +#include + static uint32_t plat_get_timer_value(void) { /* diff --git a/plat/mediatek/mt6795/plat_mt_gic.c b/plat/mediatek/mt6795/plat_mt_gic.c index 11282fc546..20cb26d5ee 100644 --- a/plat/mediatek/mt6795/plat_mt_gic.c +++ b/plat/mediatek/mt6795/plat_mt_gic.c @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include #include +#include +#include +#include + static const interrupt_prop_t g0_interrupt_props[] = { INTR_PROP_DESC(FIQ_SMP_CALL_SGI, GIC_HIGHEST_SEC_PRIORITY, GICV2_INTR_GROUP0, GIC_INTR_CFG_LEVEL), diff --git a/plat/mediatek/mt6795/plat_pm.c b/plat/mediatek/mt6795/plat_pm.c index d0506645f4..0dfbd1846a 100644 --- a/plat/mediatek/mt6795/plat_pm.c +++ b/plat/mediatek/mt6795/plat_pm.c @@ -4,19 +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 struct core_context { diff --git a/plat/mediatek/mt6795/plat_topology.c b/plat/mediatek/mt6795/plat_topology.c index 0a0cf8d78b..7425d2667e 100644 --- a/plat/mediatek/mt6795/plat_topology.c +++ b/plat/mediatek/mt6795/plat_topology.c @@ -4,9 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include + +#include +#include unsigned int plat_get_aff_count(unsigned int aff_lvl, unsigned long mpidr) { diff --git a/plat/mediatek/mt6795/power_tracer.c b/plat/mediatek/mt6795/power_tracer.c index 56e22402f9..64d086d800 100644 --- a/plat/mediatek/mt6795/power_tracer.c +++ b/plat/mediatek/mt6795/power_tracer.c @@ -5,7 +5,8 @@ */ #include -#include +#include + #include #define trace_log(...) INFO("psci: " __VA_ARGS__) diff --git a/plat/mediatek/mt6795/scu.c b/plat/mediatek/mt6795/scu.c index 9add19e5af..3b7452787d 100644 --- a/plat/mediatek/mt6795/scu.c +++ b/plat/mediatek/mt6795/scu.c @@ -5,8 +5,9 @@ */ #include +#include + #include -#include void disable_scu(unsigned long mpidr) { diff --git a/plat/mediatek/mt8173/aarch64/platform_common.c b/plat/mediatek/mt8173/aarch64/platform_common.c index a7619926a1..a2dbe3e479 100644 --- a/plat/mediatek/mt8173/aarch64/platform_common.c +++ b/plat/mediatek/mt8173/aarch64/platform_common.c @@ -3,14 +3,17 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + +#include + #include -#include -#include -#include +#include +#include +#include +#include +#include + #include -#include -#include -#include static const int cci_map[] = { PLAT_MT_CCI_CLUSTER0_SL_IFACE_IX, diff --git a/plat/mediatek/mt8173/bl31_plat_setup.c b/plat/mediatek/mt8173/bl31_plat_setup.c index c27de8295d..bd384a1d41 100644 --- a/plat/mediatek/mt8173/bl31_plat_setup.c +++ b/plat/mediatek/mt8173/bl31_plat_setup.c @@ -3,19 +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 static entry_point_info_t bl32_ep_info; diff --git a/plat/mediatek/mt8173/drivers/crypt/crypt.c b/plat/mediatek/mt8173/drivers/crypt/crypt.c index 74d7702ad3..bfb3082ba0 100644 --- a/plat/mediatek/mt8173/drivers/crypt/crypt.c +++ b/plat/mediatek/mt8173/drivers/crypt/crypt.c @@ -3,12 +3,15 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + +#include + #include #include -#include -#include -#include -#include +#include +#include +#include + #include #include diff --git a/plat/mediatek/mt8173/drivers/mtcmos/mtcmos.c b/plat/mediatek/mt8173/drivers/mtcmos/mtcmos.c index 25f25097ed..452ac224c6 100644 --- a/plat/mediatek/mt8173/drivers/mtcmos/mtcmos.c +++ b/plat/mediatek/mt8173/drivers/mtcmos/mtcmos.c @@ -4,9 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include +#include +#include +#include + #include #include #include diff --git a/plat/mediatek/mt8173/drivers/pmic/pmic_wrap_init.c b/plat/mediatek/mt8173/drivers/pmic/pmic_wrap_init.c index c64fdf7c21..8120d99626 100644 --- a/plat/mediatek/mt8173/drivers/pmic/pmic_wrap_init.c +++ b/plat/mediatek/mt8173/drivers/pmic/pmic_wrap_init.c @@ -3,9 +3,11 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include + +#include +#include +#include + #include #include diff --git a/plat/mediatek/mt8173/drivers/rtc/rtc.c b/plat/mediatek/mt8173/drivers/rtc/rtc.c index 22fed9e640..2b9033ed91 100644 --- a/plat/mediatek/mt8173/drivers/rtc/rtc.c +++ b/plat/mediatek/mt8173/drivers/rtc/rtc.c @@ -3,9 +3,12 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + #include -#include -#include + +#include +#include + #include #include #include diff --git a/plat/mediatek/mt8173/drivers/spm/spm.c b/plat/mediatek/mt8173/drivers/spm/spm.c index eb40072b9b..1caab3bdf1 100644 --- a/plat/mediatek/mt8173/drivers/spm/spm.c +++ b/plat/mediatek/mt8173/drivers/spm/spm.c @@ -3,9 +3,11 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include + +#include +#include +#include + #include #include #include diff --git a/plat/mediatek/mt8173/drivers/spm/spm_hotplug.c b/plat/mediatek/mt8173/drivers/spm/spm_hotplug.c index 6d275d0438..b2b9adafe3 100644 --- a/plat/mediatek/mt8173/drivers/spm/spm_hotplug.c +++ b/plat/mediatek/mt8173/drivers/spm/spm_hotplug.c @@ -3,10 +3,12 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + #include -#include +#include #include -#include +#include + #include #include #include diff --git a/plat/mediatek/mt8173/drivers/spm/spm_mcdi.c b/plat/mediatek/mt8173/drivers/spm/spm_mcdi.c index de8d73a517..ea5f2bb14b 100644 --- a/plat/mediatek/mt8173/drivers/spm/spm_mcdi.c +++ b/plat/mediatek/mt8173/drivers/spm/spm_mcdi.c @@ -3,12 +3,15 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + +#include + #include -#include -#include +#include +#include +#include + #include -#include -#include #include #include #include diff --git a/plat/mediatek/mt8173/drivers/spm/spm_suspend.c b/plat/mediatek/mt8173/drivers/spm/spm_suspend.c index 8c79b3b4e7..5021695db1 100644 --- a/plat/mediatek/mt8173/drivers/spm/spm_suspend.c +++ b/plat/mediatek/mt8173/drivers/spm/spm_suspend.c @@ -3,10 +3,12 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include -#include + +#include +#include +#include +#include + #include #include #include diff --git a/plat/mediatek/mt8173/drivers/timer/mt_cpuxgpt.c b/plat/mediatek/mt8173/drivers/timer/mt_cpuxgpt.c index 8a30d8aefa..174a24d88f 100644 --- a/plat/mediatek/mt8173/drivers/timer/mt_cpuxgpt.c +++ b/plat/mediatek/mt8173/drivers/timer/mt_cpuxgpt.c @@ -3,9 +3,11 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + #include +#include + #include -#include #include #include diff --git a/plat/mediatek/mt8173/include/mcucfg.h b/plat/mediatek/mt8173/include/mcucfg.h index 49d7c3e180..dedbc082fd 100644 --- a/plat/mediatek/mt8173/include/mcucfg.h +++ b/plat/mediatek/mt8173/include/mcucfg.h @@ -6,9 +6,10 @@ #ifndef MCUCFG_H #define MCUCFG_H -#include #include +#include + struct mt8173_mcucfg_regs { uint32_t mp0_ca7l_cache_config; struct { diff --git a/plat/mediatek/mt8173/include/plat_macros.S b/plat/mediatek/mt8173/include/plat_macros.S index 5eb4913f1f..ac9fb160d4 100644 --- a/plat/mediatek/mt8173/include/plat_macros.S +++ b/plat/mediatek/mt8173/include/plat_macros.S @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include +#include +#include +#include #include .section .rodata.gic_reg_name, "aS" diff --git a/plat/mediatek/mt8173/include/platform_def.h b/plat/mediatek/mt8173/include/platform_def.h index 9bbed3c3b9..205e263870 100644 --- a/plat/mediatek/mt8173/include/platform_def.h +++ b/plat/mediatek/mt8173/include/platform_def.h @@ -7,9 +7,10 @@ #ifndef PLATFORM_DEF_H #define PLATFORM_DEF_H -#include -#include -#include +#include +#include +#include + #include "mt8173_def.h" /******************************************************************************* diff --git a/plat/mediatek/mt8173/plat_mt_gic.c b/plat/mediatek/mt8173/plat_mt_gic.c index 16e36afbf7..80b9010c1a 100644 --- a/plat/mediatek/mt8173/plat_mt_gic.c +++ b/plat/mediatek/mt8173/plat_mt_gic.c @@ -4,9 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include +#include + #include -#include const unsigned int mt_irq_sec_array[] = { MT_IRQ_SEC_SGI_0, diff --git a/plat/mediatek/mt8173/plat_pm.c b/plat/mediatek/mt8173/plat_pm.c index b19d3f307c..9673d2c289 100644 --- a/plat/mediatek/mt8173/plat_pm.c +++ b/plat/mediatek/mt8173/plat_pm.c @@ -4,22 +4,24 @@ * 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 /* generic_timer_backup() */ #include #include #include -#include #include #include #include diff --git a/plat/mediatek/mt8173/plat_sip_calls.c b/plat/mediatek/mt8173/plat_sip_calls.c index 1d51cb592f..102feb22a6 100644 --- a/plat/mediatek/mt8173/plat_sip_calls.c +++ b/plat/mediatek/mt8173/plat_sip_calls.c @@ -3,13 +3,15 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + +#include +#include +#include + #include -#include -#include #include #include #include -#include /* Authorized secure register list */ enum { diff --git a/plat/mediatek/mt8173/plat_topology.c b/plat/mediatek/mt8173/plat_topology.c index d70fea5229..23e7d2d3b6 100644 --- a/plat/mediatek/mt8173/plat_topology.c +++ b/plat/mediatek/mt8173/plat_topology.c @@ -3,10 +3,11 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include + #include -#include +#include +#include const unsigned char mtk_power_domain_tree_desc[] = { /* No of root nodes */ diff --git a/plat/mediatek/mt8173/power_tracer.c b/plat/mediatek/mt8173/power_tracer.c index 787dad13fa..d1fcf9f269 100644 --- a/plat/mediatek/mt8173/power_tracer.c +++ b/plat/mediatek/mt8173/power_tracer.c @@ -5,7 +5,8 @@ */ #include -#include +#include + #include #define trace_log(...) INFO("psci: " __VA_ARGS__) diff --git a/plat/mediatek/mt8173/scu.c b/plat/mediatek/mt8173/scu.c index 4daa9e5ff9..2524d72e12 100644 --- a/plat/mediatek/mt8173/scu.c +++ b/plat/mediatek/mt8173/scu.c @@ -5,8 +5,9 @@ */ #include +#include + #include -#include void disable_scu(unsigned long mpidr) { diff --git a/plat/meson/gxbb/gxbb_bl31_setup.c b/plat/meson/gxbb/gxbb_bl31_setup.c index 3e176f9a0c..b867a58469 100644 --- a/plat/meson/gxbb/gxbb_bl31_setup.c +++ b/plat/meson/gxbb/gxbb_bl31_setup.c @@ -5,12 +5,14 @@ */ #include -#include -#include -#include -#include + #include -#include + +#include +#include +#include +#include +#include #include "gxbb_private.h" diff --git a/plat/meson/gxbb/gxbb_common.c b/plat/meson/gxbb/gxbb_common.c index 349d02f9e0..0ca15e8606 100644 --- a/plat/meson/gxbb/gxbb_common.c +++ b/plat/meson/gxbb/gxbb_common.c @@ -5,15 +5,17 @@ */ #include -#include -#include -#include -#include -#include -#include -#include #include -#include + +#include + +#include +#include +#include +#include +#include +#include +#include /******************************************************************************* * Platform memory map regions diff --git a/plat/meson/gxbb/gxbb_def.h b/plat/meson/gxbb/gxbb_def.h index 0c73ac0820..3e27097c34 100644 --- a/plat/meson/gxbb/gxbb_def.h +++ b/plat/meson/gxbb/gxbb_def.h @@ -7,7 +7,7 @@ #ifndef GXBB_DEF_H #define GXBB_DEF_H -#include +#include /******************************************************************************* * System oscillator diff --git a/plat/meson/gxbb/gxbb_mhu.c b/plat/meson/gxbb/gxbb_mhu.c index 78b895c523..903ef411c0 100644 --- a/plat/meson/gxbb/gxbb_mhu.c +++ b/plat/meson/gxbb/gxbb_mhu.c @@ -4,10 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include +#include +#include + static DEFINE_BAKERY_LOCK(mhu_lock); void mhu_secure_message_start(void) diff --git a/plat/meson/gxbb/gxbb_pm.c b/plat/meson/gxbb/gxbb_pm.c index 930b5e1688..59b9436fe3 100644 --- a/plat/meson/gxbb/gxbb_pm.c +++ b/plat/meson/gxbb/gxbb_pm.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 #include "gxbb_private.h" diff --git a/plat/meson/gxbb/gxbb_scpi.c b/plat/meson/gxbb/gxbb_scpi.c index 2390bcad8a..83eeda29d4 100644 --- a/plat/meson/gxbb/gxbb_scpi.c +++ b/plat/meson/gxbb/gxbb_scpi.c @@ -5,11 +5,13 @@ */ #include -#include -#include -#include #include +#include + +#include +#include + #include "gxbb_private.h" #define SIZE_SHIFT 20 diff --git a/plat/meson/gxbb/gxbb_sip_svc.c b/plat/meson/gxbb/gxbb_sip_svc.c index 82ed449357..63c7dba15b 100644 --- a/plat/meson/gxbb/gxbb_sip_svc.c +++ b/plat/meson/gxbb/gxbb_sip_svc.c @@ -4,12 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include -#include #include +#include + +#include +#include +#include + #include "gxbb_private.h" /******************************************************************************* diff --git a/plat/meson/gxbb/gxbb_topology.c b/plat/meson/gxbb/gxbb_topology.c index 49bb2dcad7..eec2d34d4d 100644 --- a/plat/meson/gxbb/gxbb_topology.c +++ b/plat/meson/gxbb/gxbb_topology.c @@ -4,10 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include +#include + +#include + #include "gxbb_private.h" /* The power domain tree descriptor */ diff --git a/plat/meson/gxbb/include/plat_macros.S b/plat/meson/gxbb/include/plat_macros.S index 948b5f98f8..c721c21b68 100644 --- a/plat/meson/gxbb/include/plat_macros.S +++ b/plat/meson/gxbb/include/plat_macros.S @@ -7,7 +7,7 @@ #ifndef PLAT_MACROS_S #define PLAT_MACROS_S -#include +#include #include .section .rodata.gic_reg_name, "aS" diff --git a/plat/meson/gxbb/include/platform_def.h b/plat/meson/gxbb/include/platform_def.h index a85637fe26..da4aedde85 100644 --- a/plat/meson/gxbb/include/platform_def.h +++ b/plat/meson/gxbb/include/platform_def.h @@ -8,7 +8,7 @@ #define PLATFORM_DEF_H #include -#include +#include #include "../gxbb_def.h" diff --git a/plat/meson/gxbb/platform.mk b/plat/meson/gxbb/platform.mk index 68ff400751..9669bf9590 100644 --- a/plat/meson/gxbb/platform.mk +++ b/plat/meson/gxbb/platform.mk @@ -6,8 +6,7 @@ include lib/xlat_tables_v2/xlat_tables.mk -PLAT_INCLUDES := -Iinclude/drivers/meson/ \ - -Iplat/meson/gxbb/include +PLAT_INCLUDES := -Iplat/meson/gxbb/include GXBB_GIC_SOURCES := drivers/arm/gic/common/gic_common.c \ drivers/arm/gic/v2/gicv2_main.c \ diff --git a/plat/nvidia/tegra/common/drivers/flowctrl/flowctrl.c b/plat/nvidia/tegra/common/drivers/flowctrl/flowctrl.c index 2d827da81a..775ad30f6b 100644 --- a/plat/nvidia/tegra/common/drivers/flowctrl/flowctrl.c +++ b/plat/nvidia/tegra/common/drivers/flowctrl/flowctrl.c @@ -4,13 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include + +#include #include -#include -#include +#include +#include +#include + #include -#include #include #include diff --git a/plat/nvidia/tegra/common/drivers/memctrl/memctrl_v1.c b/plat/nvidia/tegra/common/drivers/memctrl/memctrl_v1.c index 9944e729dd..58f49d05f6 100644 --- a/plat/nvidia/tegra/common/drivers/memctrl/memctrl_v1.c +++ b/plat/nvidia/tegra/common/drivers/memctrl/memctrl_v1.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 /* Video Memory base and size (live values) */ static uint64_t video_mem_base; diff --git a/plat/nvidia/tegra/common/drivers/memctrl/memctrl_v2.c b/plat/nvidia/tegra/common/drivers/memctrl/memctrl_v2.c index 92fdadcfae..55b9152232 100644 --- a/plat/nvidia/tegra/common/drivers/memctrl/memctrl_v2.c +++ b/plat/nvidia/tegra/common/drivers/memctrl/memctrl_v2.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 /* Video Memory base and size (live values) */ static uint64_t video_mem_base; diff --git a/plat/nvidia/tegra/common/drivers/pmc/pmc.c b/plat/nvidia/tegra/common/drivers/pmc/pmc.c index d8827e101f..b9ff5116d6 100644 --- a/plat/nvidia/tegra/common/drivers/pmc/pmc.c +++ b/plat/nvidia/tegra/common/drivers/pmc/pmc.c @@ -4,10 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include + +#include +#include +#include + #include #include diff --git a/plat/nvidia/tegra/common/drivers/smmu/smmu.c b/plat/nvidia/tegra/common/drivers/smmu/smmu.c index 4b9edb622f..610f32f1eb 100644 --- a/plat/nvidia/tegra/common/drivers/smmu/smmu.c +++ b/plat/nvidia/tegra/common/drivers/smmu/smmu.c @@ -5,11 +5,14 @@ */ #include -#include -#include +#include + #include + +#include +#include + #include -#include #include extern void memcpy16(void *dest, const void *src, unsigned int length); diff --git a/plat/nvidia/tegra/common/tegra_bl31_setup.c b/plat/nvidia/tegra/common/tegra_bl31_setup.c index 9410d44fc9..b496650271 100644 --- a/plat/nvidia/tegra/common/tegra_bl31_setup.c +++ b/plat/nvidia/tegra/common/tegra_bl31_setup.c @@ -4,27 +4,30 @@ * 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 + #include -#include -#include -#include -#include -#include #include #include -#include -#include /* length of Trusty's input parameters (in bytes) */ #define TRUSTY_PARAMS_LEN_BYTES (4096*2) diff --git a/plat/nvidia/tegra/common/tegra_delay_timer.c b/plat/nvidia/tegra/common/tegra_delay_timer.c index 3bd2b0e245..63dcf410c2 100644 --- a/plat/nvidia/tegra/common/tegra_delay_timer.c +++ b/plat/nvidia/tegra/common/tegra_delay_timer.c @@ -4,8 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include +#include + #include #include diff --git a/plat/nvidia/tegra/common/tegra_fiq_glue.c b/plat/nvidia/tegra/common/tegra_fiq_glue.c index bc6d30546e..0b663cef42 100644 --- a/plat/nvidia/tegra/common/tegra_fiq_glue.c +++ b/plat/nvidia/tegra/common/tegra_fiq_glue.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 + #include #include diff --git a/plat/nvidia/tegra/common/tegra_gicv2.c b/plat/nvidia/tegra/common/tegra_gicv2.c index c42c5ec3f7..293df8d4f3 100644 --- a/plat/nvidia/tegra/common/tegra_gicv2.c +++ b/plat/nvidia/tegra/common/tegra_gicv2.c @@ -5,12 +5,15 @@ */ #include -#include -#include + #include + +#include +#include +#include + #include #include -#include /****************************************************************************** * Tegra common helper to setup the GICv2 driver data. diff --git a/plat/nvidia/tegra/common/tegra_platform.c b/plat/nvidia/tegra/common/tegra_platform.c index 6a906ae0b7..10edf9229c 100644 --- a/plat/nvidia/tegra/common/tegra_platform.c +++ b/plat/nvidia/tegra/common/tegra_platform.c @@ -5,7 +5,8 @@ */ #include -#include +#include + #include #include #include diff --git a/plat/nvidia/tegra/common/tegra_pm.c b/plat/nvidia/tegra/common/tegra_pm.c index 86021ba94f..8361ddd3d3 100644 --- a/plat/nvidia/tegra/common/tegra_pm.c +++ b/plat/nvidia/tegra/common/tegra_pm.c @@ -4,19 +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 diff --git a/plat/nvidia/tegra/common/tegra_sip_calls.c b/plat/nvidia/tegra/common/tegra_sip_calls.c index a8184531f7..e50d12faf8 100644 --- a/plat/nvidia/tegra/common/tegra_sip_calls.c +++ b/plat/nvidia/tegra/common/tegra_sip_calls.c @@ -4,15 +4,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include -#include -#include #include + +#include +#include +#include +#include +#include +#include + #include -#include -#include #include #include diff --git a/plat/nvidia/tegra/common/tegra_topology.c b/plat/nvidia/tegra/common/tegra_topology.c index 0593053512..893f28ff24 100644 --- a/plat/nvidia/tegra/common/tegra_topology.c +++ b/plat/nvidia/tegra/common/tegra_topology.c @@ -4,9 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include + +#include +#include extern const unsigned char tegra_power_domain_tree_desc[]; #pragma weak plat_core_pos_by_mpidr diff --git a/plat/nvidia/tegra/include/drivers/flowctrl.h b/plat/nvidia/tegra/include/drivers/flowctrl.h index d604c970d2..31221810b1 100644 --- a/plat/nvidia/tegra/include/drivers/flowctrl.h +++ b/plat/nvidia/tegra/include/drivers/flowctrl.h @@ -7,7 +7,8 @@ #ifndef FLOWCTRL_H #define FLOWCTRL_H -#include +#include + #include #define FLOWCTRL_HALT_CPU0_EVENTS 0x0U diff --git a/plat/nvidia/tegra/include/drivers/mce.h b/plat/nvidia/tegra/include/drivers/mce.h index 81408702f9..4470b6b8b6 100644 --- a/plat/nvidia/tegra/include/drivers/mce.h +++ b/plat/nvidia/tegra/include/drivers/mce.h @@ -7,7 +7,8 @@ #ifndef MCE_H #define MCE_H -#include +#include + #include /******************************************************************************* diff --git a/plat/nvidia/tegra/include/drivers/memctrl_v1.h b/plat/nvidia/tegra/include/drivers/memctrl_v1.h index 2553a1fd5f..8e9f198e86 100644 --- a/plat/nvidia/tegra/include/drivers/memctrl_v1.h +++ b/plat/nvidia/tegra/include/drivers/memctrl_v1.h @@ -7,7 +7,8 @@ #ifndef MEMCTRL_V1_H #define MEMCTRL_V1_H -#include +#include + #include /* SMMU registers */ diff --git a/plat/nvidia/tegra/include/drivers/memctrl_v2.h b/plat/nvidia/tegra/include/drivers/memctrl_v2.h index 9ae4302320..957ff54c12 100644 --- a/plat/nvidia/tegra/include/drivers/memctrl_v2.h +++ b/plat/nvidia/tegra/include/drivers/memctrl_v2.h @@ -407,7 +407,7 @@ typedef struct tegra_mc_settings { #ifndef __ASSEMBLY__ -#include +#include static inline uint32_t tegra_mc_read_32(uint32_t off) { diff --git a/plat/nvidia/tegra/include/drivers/pmc.h b/plat/nvidia/tegra/include/drivers/pmc.h index 14c9225447..a01a4b64f3 100644 --- a/plat/nvidia/tegra/include/drivers/pmc.h +++ b/plat/nvidia/tegra/include/drivers/pmc.h @@ -7,9 +7,10 @@ #ifndef PMC_H #define PMC_H -#include +#include +#include + #include -#include #define PMC_CONFIG U(0x0) #define PMC_PWRGATE_STATUS U(0x38) diff --git a/plat/nvidia/tegra/include/drivers/smmu.h b/plat/nvidia/tegra/include/drivers/smmu.h index 974aa35004..9582a67ed3 100644 --- a/plat/nvidia/tegra/include/drivers/smmu.h +++ b/plat/nvidia/tegra/include/drivers/smmu.h @@ -7,8 +7,9 @@ #ifndef SMMU_H #define SMMU_H +#include + #include -#include #include /******************************************************************************* diff --git a/plat/nvidia/tegra/include/drivers/tegra_gic.h b/plat/nvidia/tegra/include/drivers/tegra_gic.h index 2fe316d2b2..6106b40a72 100644 --- a/plat/nvidia/tegra/include/drivers/tegra_gic.h +++ b/plat/nvidia/tegra/include/drivers/tegra_gic.h @@ -7,7 +7,7 @@ #ifndef __TEGRA_GIC_H__ #define __TEGRA_GIC_H__ -#include +#include /******************************************************************************* * Per-CPU struct describing FIQ state to be stored diff --git a/plat/nvidia/tegra/include/platform_def.h b/plat/nvidia/tegra/include/platform_def.h index 6a507d481a..d10dc262aa 100644 --- a/plat/nvidia/tegra/include/platform_def.h +++ b/plat/nvidia/tegra/include/platform_def.h @@ -8,9 +8,10 @@ #define PLATFORM_DEF_H #include -#include +#include +#include + #include -#include /******************************************************************************* * Generic platform constants diff --git a/plat/nvidia/tegra/include/t132/tegra_def.h b/plat/nvidia/tegra/include/t132/tegra_def.h index 277f91b639..1f58caabb5 100644 --- a/plat/nvidia/tegra/include/t132/tegra_def.h +++ b/plat/nvidia/tegra/include/t132/tegra_def.h @@ -7,7 +7,7 @@ #ifndef TEGRA_DEF_H #define TEGRA_DEF_H -#include +#include /******************************************************************************* * This value is used by the PSCI implementation during the `SYSTEM_SUSPEND` diff --git a/plat/nvidia/tegra/include/t186/tegra_def.h b/plat/nvidia/tegra/include/t186/tegra_def.h index 79aff59700..3abba55165 100644 --- a/plat/nvidia/tegra/include/t186/tegra_def.h +++ b/plat/nvidia/tegra/include/t186/tegra_def.h @@ -7,7 +7,7 @@ #ifndef TEGRA_DEF_H #define TEGRA_DEF_H -#include +#include /******************************************************************************* * MCE apertures used by the ARI interface diff --git a/plat/nvidia/tegra/include/t210/tegra_def.h b/plat/nvidia/tegra/include/t210/tegra_def.h index 5d86224f9f..14cdfd59db 100644 --- a/plat/nvidia/tegra/include/t210/tegra_def.h +++ b/plat/nvidia/tegra/include/t210/tegra_def.h @@ -7,7 +7,7 @@ #ifndef TEGRA_DEF_H #define TEGRA_DEF_H -#include +#include /******************************************************************************* * Power down state IDs diff --git a/plat/nvidia/tegra/include/tegra_private.h b/plat/nvidia/tegra/include/tegra_private.h index 7ca32c3d3b..93223cc241 100644 --- a/plat/nvidia/tegra/include/tegra_private.h +++ b/plat/nvidia/tegra/include/tegra_private.h @@ -7,12 +7,14 @@ #ifndef TEGRA_PRIVATE_H #define TEGRA_PRIVATE_H +#include + #include #include -#include -#include +#include +#include + #include -#include /******************************************************************************* * Tegra DRAM memory base address diff --git a/plat/nvidia/tegra/soc/t132/plat_psci_handlers.c b/plat/nvidia/tegra/soc/t132/plat_psci_handlers.c index 1cffb741a9..7226120b04 100644 --- a/plat/nvidia/tegra/soc/t132/plat_psci_handlers.c +++ b/plat/nvidia/tegra/soc/t132/plat_psci_handlers.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 diff --git a/plat/nvidia/tegra/soc/t132/plat_secondary.c b/plat/nvidia/tegra/soc/t132/plat_secondary.c index d5ca30c976..f46ad3bb6f 100644 --- a/plat/nvidia/tegra/soc/t132/plat_secondary.c +++ b/plat/nvidia/tegra/soc/t132/plat_secondary.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 #define SB_CSR 0x0 diff --git a/plat/nvidia/tegra/soc/t132/plat_setup.c b/plat/nvidia/tegra/soc/t132/plat_setup.c index 4cbb3cc853..f72b73ed52 100644 --- a/plat/nvidia/tegra/soc/t132/plat_setup.c +++ b/plat/nvidia/tegra/soc/t132/plat_setup.c @@ -5,10 +5,11 @@ */ #include -#include +#include +#include + #include #include -#include /******************************************************************************* * The Tegra power domain tree has a single system level power domain i.e. a diff --git a/plat/nvidia/tegra/soc/t132/plat_sip_calls.c b/plat/nvidia/tegra/soc/t132/plat_sip_calls.c index adc1c7125b..02dd1cd56c 100644 --- a/plat/nvidia/tegra/soc/t132/plat_sip_calls.c +++ b/plat/nvidia/tegra/soc/t132/plat_sip_calls.c @@ -4,13 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include -#include -#include -#include #include + +#include +#include +#include +#include +#include + #include #define NS_SWITCH_AARCH32 1 diff --git a/plat/nvidia/tegra/soc/t186/drivers/include/mce_private.h b/plat/nvidia/tegra/soc/t186/drivers/include/mce_private.h index 27baab6d64..96a5525a6b 100644 --- a/plat/nvidia/tegra/soc/t186/drivers/include/mce_private.h +++ b/plat/nvidia/tegra/soc/t186/drivers/include/mce_private.h @@ -7,7 +7,8 @@ #ifndef MCE_PRIVATE_H #define MCE_PRIVATE_H -#include +#include + #include /******************************************************************************* diff --git a/plat/nvidia/tegra/soc/t186/drivers/mce/ari.c b/plat/nvidia/tegra/soc/t186/drivers/mce/ari.c index 7126c3ba7e..1429a6158d 100644 --- a/plat/nvidia/tegra/soc/t186/drivers/mce/ari.c +++ b/plat/nvidia/tegra/soc/t186/drivers/mce/ari.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 /******************************************************************************* diff --git a/plat/nvidia/tegra/soc/t186/drivers/mce/mce.c b/plat/nvidia/tegra/soc/t186/drivers/mce/mce.c index 712519f9fc..828ad3cbdd 100644 --- a/plat/nvidia/tegra/soc/t186/drivers/mce/mce.c +++ b/plat/nvidia/tegra/soc/t186/drivers/mce/mce.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 #include diff --git a/plat/nvidia/tegra/soc/t186/drivers/mce/nvg.c b/plat/nvidia/tegra/soc/t186/drivers/mce/nvg.c index 857cfbb53d..1ac3710daf 100644 --- a/plat/nvidia/tegra/soc/t186/drivers/mce/nvg.c +++ b/plat/nvidia/tegra/soc/t186/drivers/mce/nvg.c @@ -4,13 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + #include #include -#include +#include #include -#include +#include + #include -#include #include int32_t nvg_enter_cstate(uint32_t ari_base, uint32_t state, uint32_t wake_time) diff --git a/plat/nvidia/tegra/soc/t186/plat_memctrl.c b/plat/nvidia/tegra/soc/t186/plat_memctrl.c index 957ecf1874..38dffb22e5 100644 --- a/plat/nvidia/tegra/soc/t186/plat_memctrl.c +++ b/plat/nvidia/tegra/soc/t186/plat_memctrl.c @@ -4,7 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include + #include /******************************************************************************* diff --git a/plat/nvidia/tegra/soc/t186/plat_psci_handlers.c b/plat/nvidia/tegra/soc/t186/plat_psci_handlers.c index 6eb18fa6c7..fb94bcedf9 100644 --- a/plat/nvidia/tegra/soc/t186/plat_psci_handlers.c +++ b/plat/nvidia/tegra/soc/t186/plat_psci_handlers.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 diff --git a/plat/nvidia/tegra/soc/t186/plat_secondary.c b/plat/nvidia/tegra/soc/t186/plat_secondary.c index ebc2b46a2b..4485e2733a 100644 --- a/plat/nvidia/tegra/soc/t186/plat_secondary.c +++ b/plat/nvidia/tegra/soc/t186/plat_secondary.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/nvidia/tegra/soc/t186/plat_setup.c b/plat/nvidia/tegra/soc/t186/plat_setup.c index da5530f0b7..15dbd16390 100644 --- a/plat/nvidia/tegra/soc/t186/plat_setup.c +++ b/plat/nvidia/tegra/soc/t186/plat_setup.c @@ -4,26 +4,28 @@ * 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 +#include +#include + #include -#include #include #include #include -#include DEFINE_RENAME_SYSREG_RW_FUNCS(l2ctlr_el1, CORTEX_A57_L2CTLR_EL1) extern uint64_t tegra_enable_l2_ecc_parity_prot; diff --git a/plat/nvidia/tegra/soc/t186/plat_sip_calls.c b/plat/nvidia/tegra/soc/t186/plat_sip_calls.c index dfe1c7dbd7..bf98fcf648 100644 --- a/plat/nvidia/tegra/soc/t186/plat_sip_calls.c +++ b/plat/nvidia/tegra/soc/t186/plat_sip_calls.c @@ -4,17 +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 #include diff --git a/plat/nvidia/tegra/soc/t186/plat_smmu.c b/plat/nvidia/tegra/soc/t186/plat_smmu.c index ead4c22b8b..19e065c18d 100644 --- a/plat/nvidia/tegra/soc/t186/plat_smmu.c +++ b/plat/nvidia/tegra/soc/t186/plat_smmu.c @@ -4,7 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include + #include #include diff --git a/plat/nvidia/tegra/soc/t186/plat_trampoline.S b/plat/nvidia/tegra/soc/t186/plat_trampoline.S index 6a17c3328b..69ca798f9c 100644 --- a/plat/nvidia/tegra/soc/t186/plat_trampoline.S +++ b/plat/nvidia/tegra/soc/t186/plat_trampoline.S @@ -6,8 +6,8 @@ #include #include -#include #include +#include #include #define TEGRA186_SMMU_CTX_SIZE 0x420 diff --git a/plat/nvidia/tegra/soc/t210/plat_psci_handlers.c b/plat/nvidia/tegra/soc/t210/plat_psci_handlers.c index f77746cae1..27786d3ca6 100644 --- a/plat/nvidia/tegra/soc/t210/plat_psci_handlers.c +++ b/plat/nvidia/tegra/soc/t210/plat_psci_handlers.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 #include diff --git a/plat/nvidia/tegra/soc/t210/plat_secondary.c b/plat/nvidia/tegra/soc/t210/plat_secondary.c index ecb258b918..e0242cf0ee 100644 --- a/plat/nvidia/tegra/soc/t210/plat_secondary.c +++ b/plat/nvidia/tegra/soc/t210/plat_secondary.c @@ -4,8 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include +#include + #include #include diff --git a/plat/nvidia/tegra/soc/t210/plat_setup.c b/plat/nvidia/tegra/soc/t210/plat_setup.c index c3fc7b4a58..c7f7165c0a 100644 --- a/plat/nvidia/tegra/soc/t210/plat_setup.c +++ b/plat/nvidia/tegra/soc/t210/plat_setup.c @@ -5,11 +5,12 @@ */ #include -#include -#include +#include +#include +#include + #include #include -#include /******************************************************************************* * The Tegra power domain tree has a single system level power domain i.e. a diff --git a/plat/qemu/dt.c b/plat/qemu/dt.c index c544d9f446..b1cd368cb5 100644 --- a/plat/qemu/dt.c +++ b/plat/qemu/dt.c @@ -3,11 +3,15 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include -#include + #include + +#include + +#include +#include +#include + #include "qemu_private.h" static int append_psci_compatible(void *fdt, int offs, const char *str) diff --git a/plat/qemu/include/platform_def.h b/plat/qemu/include/platform_def.h index c2289bc560..2dd10ad832 100644 --- a/plat/qemu/include/platform_def.h +++ b/plat/qemu/include/platform_def.h @@ -8,9 +8,9 @@ #define PLATFORM_DEF_H #include -#include -#include -#include +#include +#include +#include /* Special value used to verify platform parameters from BL2 to BL3-1 */ #define QEMU_BL31_PLAT_PARAM_VAL 0x0f1e2d3c4b5a6978ULL diff --git a/plat/qemu/qemu_bl1_setup.c b/plat/qemu/qemu_bl1_setup.c index fd53495a64..b5821517a0 100644 --- a/plat/qemu/qemu_bl1_setup.c +++ b/plat/qemu/qemu_bl1_setup.c @@ -4,11 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include -#include + #include + +#include +#include +#include + #include "qemu_private.h" /* Data structure which holds the extents of the trusted SRAM for BL1*/ diff --git a/plat/qemu/qemu_bl2_mem_params_desc.c b/plat/qemu/qemu_bl2_mem_params_desc.c index 9965cfdb57..ba6a4db2dd 100644 --- a/plat/qemu/qemu_bl2_mem_params_desc.c +++ b/plat/qemu/qemu_bl2_mem_params_desc.c @@ -4,10 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include +#include +#include + /******************************************************************************* * Following descriptor provides BL image/ep information that gets used * by BL2 to load the images and also subset of this information is diff --git a/plat/qemu/qemu_bl2_setup.c b/plat/qemu/qemu_bl2_setup.c index b3c39605f7..b8ca895f8c 100644 --- a/plat/qemu/qemu_bl2_setup.c +++ b/plat/qemu/qemu_bl2_setup.c @@ -3,17 +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 "qemu_private.h" diff --git a/plat/qemu/qemu_bl31_setup.c b/plat/qemu/qemu_bl31_setup.c index 7542674ec5..97468114a1 100644 --- a/plat/qemu/qemu_bl31_setup.c +++ b/plat/qemu/qemu_bl31_setup.c @@ -5,11 +5,14 @@ */ #include -#include -#include -#include + #include -#include + +#include +#include +#include +#include + #include "qemu_private.h" /* diff --git a/plat/qemu/qemu_common.c b/plat/qemu/qemu_common.c index 43a3f7012b..aee8321cb1 100644 --- a/plat/qemu/qemu_common.c +++ b/plat/qemu/qemu_common.c @@ -4,10 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include -#include + +#include +#include +#include #include "qemu_private.h" diff --git a/plat/qemu/qemu_console.c b/plat/qemu/qemu_console.c index a90c9a18cc..759f997dcb 100644 --- a/plat/qemu/qemu_console.c +++ b/plat/qemu/qemu_console.c @@ -3,10 +3,12 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include + #include +#include +#include + #if MULTI_CONSOLE_API static console_pl011_t console; #endif /* MULTI_CONSOLE_API */ diff --git a/plat/qemu/qemu_image_load.c b/plat/qemu/qemu_image_load.c index 8e246477c9..9970d1de71 100644 --- a/plat/qemu/qemu_image_load.c +++ b/plat/qemu/qemu_image_load.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include /******************************************************************************* * This function is a wrapper of a common function which flushes the data diff --git a/plat/qemu/qemu_io_storage.c b/plat/qemu/qemu_io_storage.c index 1918f21d5d..0e81cd1997 100644 --- a/plat/qemu/qemu_io_storage.c +++ b/plat/qemu/qemu_io_storage.c @@ -5,18 +5,20 @@ */ #include -#include /* For ARRAY_SIZE */ -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + /* Semihosting filenames */ #define BL2_IMAGE_NAME "bl2.bin" #define BL31_IMAGE_NAME "bl31.bin" diff --git a/plat/qemu/qemu_pm.c b/plat/qemu/qemu_pm.c index c184f1c35d..3249d6e277 100644 --- a/plat/qemu/qemu_pm.c +++ b/plat/qemu/qemu_pm.c @@ -4,13 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include -#include + #include -#include + +#include +#include +#include +#include +#include /* * The secure entry point to be used on warm reset. diff --git a/plat/qemu/qemu_stack_protector.c b/plat/qemu/qemu_stack_protector.c index 5b19828336..c226158ad6 100644 --- a/plat/qemu/qemu_stack_protector.c +++ b/plat/qemu/qemu_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/qemu/qemu_trusted_boot.c b/plat/qemu/qemu_trusted_boot.c index 7d8fed209a..17666b99e7 100644 --- a/plat/qemu/qemu_trusted_boot.c +++ b/plat/qemu/qemu_trusted_boot.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include extern char qemu_rotpk_hash[], qemu_rotpk_hash_end[]; diff --git a/plat/qemu/sp_min/sp_min_setup.c b/plat/qemu/sp_min/sp_min_setup.c index 5b98079bc7..88decdf4dd 100644 --- a/plat/qemu/sp_min/sp_min_setup.c +++ b/plat/qemu/sp_min/sp_min_setup.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 +#include + #include "../qemu_private.h" #if RESET_TO_SP_MIN diff --git a/plat/qemu/topology.c b/plat/qemu/topology.c index 569d15f8ca..6352706e9f 100644 --- a/plat/qemu/topology.c +++ b/plat/qemu/topology.c @@ -4,9 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include + +#include + +#include + #include "qemu_private.h" /* The power domain tree descriptor */ diff --git a/plat/renesas/rcar/aarch64/plat_helpers.S b/plat/renesas/rcar/aarch64/plat_helpers.S index 7e1ff8ddac..d40f8f2e3d 100644 --- a/plat/renesas/rcar/aarch64/plat_helpers.S +++ b/plat/renesas/rcar/aarch64/plat_helpers.S @@ -7,10 +7,11 @@ #include #include -#include +#include +#include #include #include -#include + #include "rcar_def.h" .globl plat_get_my_entrypoint diff --git a/plat/renesas/rcar/aarch64/platform_common.c b/plat/renesas/rcar/aarch64/platform_common.c index f344b3752b..647a562ce1 100644 --- a/plat/renesas/rcar/aarch64/platform_common.c +++ b/plat/renesas/rcar/aarch64/platform_common.c @@ -5,17 +5,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 +#include +#include + #include "rcar_def.h" #include "rcar_private.h" #include "rcar_version.h" diff --git a/plat/renesas/rcar/bl2_cpg_init.c b/plat/renesas/rcar/bl2_cpg_init.c index 880ad36045..883fc9a16b 100644 --- a/plat/renesas/rcar/bl2_cpg_init.c +++ b/plat/renesas/rcar/bl2_cpg_init.c @@ -4,8 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include +#include + #include "rcar_def.h" #include "cpg_registers.h" #include "rcar_private.h" diff --git a/plat/renesas/rcar/bl2_interrupt_error.c b/plat/renesas/rcar/bl2_interrupt_error.c index c50c603767..2346017d83 100644 --- a/plat/renesas/rcar/bl2_interrupt_error.c +++ b/plat/renesas/rcar/bl2_interrupt_error.c @@ -5,11 +5,12 @@ */ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include + #include "rcar_def.h" #define SWDT_ERROR_ID (1024U) diff --git a/plat/renesas/rcar/bl2_plat_mem_params_desc.c b/plat/renesas/rcar/bl2_plat_mem_params_desc.c index 3dc9eff59f..3b124c7893 100644 --- a/plat/renesas/rcar/bl2_plat_mem_params_desc.c +++ b/plat/renesas/rcar/bl2_plat_mem_params_desc.c @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include #include -#include + +#include +#include +#include +#include #if (RCAR_BL33_EXECUTION_EL != 0) && (RCAR_BL33_EXECUTION_EL != 1) #error diff --git a/plat/renesas/rcar/bl2_plat_setup.c b/plat/renesas/rcar/bl2_plat_setup.c index 7567813ca6..77a5ed1706 100644 --- a/plat/renesas/rcar/bl2_plat_setup.c +++ b/plat/renesas/rcar/bl2_plat_setup.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 +#include #include "avs_driver.h" #include "boot_init_dram.h" diff --git a/plat/renesas/rcar/bl2_secure_setting.c b/plat/renesas/rcar/bl2_secure_setting.c index c0d49debc7..cbda1eb381 100644 --- a/plat/renesas/rcar/bl2_secure_setting.c +++ b/plat/renesas/rcar/bl2_secure_setting.c @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include +#include + #include "axi_registers.h" #include "lifec_registers.h" #include "micro_delay.h" -#include "mmio.h" -#include "utils_def.h" static void lifec_security_setting(void); static void axi_security_setting(void); diff --git a/plat/renesas/rcar/bl31_plat_setup.c b/plat/renesas/rcar/bl31_plat_setup.c index 00f6d100be..6f31417ba5 100644 --- a/plat/renesas/rcar/bl31_plat_setup.c +++ b/plat/renesas/rcar/bl31_plat_setup.c @@ -5,16 +5,18 @@ * 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 "pwrc.h" #include "rcar_def.h" #include "rcar_private.h" diff --git a/plat/renesas/rcar/include/plat.ld.S b/plat/renesas/rcar/include/plat.ld.S index 0461141fd5..7aef324c4f 100644 --- a/plat/renesas/rcar/include/plat.ld.S +++ b/plat/renesas/rcar/include/plat.ld.S @@ -6,8 +6,8 @@ #ifndef RCAR_PLAT_LD_S #define RCAR_PLAT_LD_S +#include #include -#include MEMORY { SRAM (rwx): ORIGIN = BL31_SRAM_BASE, LENGTH = DEVICE_SRAM_SIZE diff --git a/plat/renesas/rcar/include/plat_macros.S b/plat/renesas/rcar/include/plat_macros.S index eb109287c8..927cd39e8f 100644 --- a/plat/renesas/rcar/include/plat_macros.S +++ b/plat/renesas/rcar/include/plat_macros.S @@ -4,9 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include +#include +#include +#include + #include "rcar_def.h" .section .rodata.gic_reg_name, "aS" diff --git a/plat/renesas/rcar/include/platform_def.h b/plat/renesas/rcar/include/platform_def.h index fa6e474c44..20fd712301 100644 --- a/plat/renesas/rcar/include/platform_def.h +++ b/plat/renesas/rcar/include/platform_def.h @@ -7,10 +7,12 @@ #ifndef PLATFORM_DEF_H #define PLATFORM_DEF_H -#include #ifndef __ASSEMBLY__ #include #endif + +#include + #include "rcar_def.h" /******************************************************************************* diff --git a/plat/renesas/rcar/include/rcar_def.h b/plat/renesas/rcar/include/rcar_def.h index 61b95a4367..242e007b5f 100644 --- a/plat/renesas/rcar/include/rcar_def.h +++ b/plat/renesas/rcar/include/rcar_def.h @@ -7,8 +7,8 @@ #ifndef RCAR_DEF_H #define RCAR_DEF_H -#include -#include +#include +#include #define RCAR_PRIMARY_CPU 0x0 #define RCAR_TRUSTED_SRAM_BASE 0x44000000 diff --git a/plat/renesas/rcar/include/rcar_private.h b/plat/renesas/rcar/include/rcar_private.h index e90fa08ad7..def327605c 100644 --- a/plat/renesas/rcar/include/rcar_private.h +++ b/plat/renesas/rcar/include/rcar_private.h @@ -7,11 +7,12 @@ #ifndef RCAR_PRIVATE_H #define RCAR_PRIVATE_H -#include -#include -#include #include +#include +#include +#include + typedef volatile struct mailbox { unsigned long value __aligned(CACHE_WRITEBACK_GRANULE); } mailbox_t; diff --git a/plat/renesas/rcar/plat_image_load.c b/plat/renesas/rcar/plat_image_load.c index 469ac29c59..9d814a6e59 100644 --- a/plat/renesas/rcar/plat_image_load.c +++ b/plat/renesas/rcar/plat_image_load.c @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include +#include +#include +#include extern void bl2_plat_flush_bl31_params(void); diff --git a/plat/renesas/rcar/plat_pm.c b/plat/renesas/rcar/plat_pm.c index 84cc47e0d1..7086613f82 100644 --- a/plat/renesas/rcar/plat_pm.c +++ b/plat/renesas/rcar/plat_pm.c @@ -4,17 +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 +#include +#include #include "iic_dvfs.h" #include "pwrc.h" diff --git a/plat/renesas/rcar/plat_storage.c b/plat/renesas/rcar/plat_storage.c index 3b5d620dd7..05e3d9f0dd 100644 --- a/plat/renesas/rcar/plat_storage.c +++ b/plat/renesas/rcar/plat_storage.c @@ -4,12 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include -#include -#include #include + +#include + +#include +#include +#include +#include + #include "io_common.h" #include "io_rcar.h" #include "io_memdrv.h" diff --git a/plat/renesas/rcar/plat_topology.c b/plat/renesas/rcar/plat_topology.c index 3582c2bde3..0d5880d7a2 100644 --- a/plat/renesas/rcar/plat_topology.c +++ b/plat/renesas/rcar/plat_topology.c @@ -4,9 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include + +#include +#include static const unsigned char rcar_power_domain_tree_desc[] = { 1, diff --git a/plat/rockchip/common/aarch64/plat_helpers.S b/plat/rockchip/common/aarch64/plat_helpers.S index f0136b0d91..4af052b574 100644 --- a/plat/rockchip/common/aarch64/plat_helpers.S +++ b/plat/rockchip/common/aarch64/plat_helpers.S @@ -4,13 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + #include #include -#include +#include #include #include #include -#include #include .globl cpuson_entry_point diff --git a/plat/rockchip/common/aarch64/platform_common.c b/plat/rockchip/common/aarch64/platform_common.c index 9a74314c94..81e8520626 100644 --- a/plat/rockchip/common/aarch64/platform_common.c +++ b/plat/rockchip/common/aarch64/platform_common.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 #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 7a9f7a9d10..2c970eb8a6 100644 --- a/plat/rockchip/common/bl31_plat_setup.c +++ b/plat/rockchip/common/bl31_plat_setup.c @@ -5,16 +5,18 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include + #include -#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include /* * The next 2 constants identify the extents of the code & RO data region. diff --git a/plat/rockchip/common/drivers/parameter/ddr_parameter.c b/plat/rockchip/common/drivers/parameter/ddr_parameter.c index ea77757f7b..e89fe1e029 100644 --- a/plat/rockchip/common/drivers/parameter/ddr_parameter.c +++ b/plat/rockchip/common/drivers/parameter/ddr_parameter.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 "ddr_parameter.h" /* diff --git a/plat/rockchip/common/drivers/parameter/ddr_parameter.h b/plat/rockchip/common/drivers/parameter/ddr_parameter.h index 69c4e18bdc..61349c44cf 100644 --- a/plat/rockchip/common/drivers/parameter/ddr_parameter.h +++ b/plat/rockchip/common/drivers/parameter/ddr_parameter.h @@ -7,15 +7,18 @@ #ifndef DDR_PARAMETER_H #define DDR_PARAMETER_H +#include + +#include + #include -#include -#include -#include -#include +#include +#include +#include +#include + #include -#include #include -#include #define DDR_REGION_NR_MAX 10 #define REGION_NR_OFFSET 0 diff --git a/plat/rockchip/common/include/plat_macros.S b/plat/rockchip/common/include/plat_macros.S index 9ee4e83e19..691beeb448 100644 --- a/plat/rockchip/common/include/plat_macros.S +++ b/plat/rockchip/common/include/plat_macros.S @@ -6,10 +6,10 @@ #ifndef ROCKCHIP_PLAT_MACROS_S #define ROCKCHIP_PLAT_MACROS_S -#include -#include -#include -#include +#include +#include +#include +#include #include .section .rodata.gic_reg_name, "aS" diff --git a/plat/rockchip/common/include/plat_private.h b/plat/rockchip/common/include/plat_private.h index 955ca647c5..e8750a5e9f 100644 --- a/plat/rockchip/common/include/plat_private.h +++ b/plat/rockchip/common/include/plat_private.h @@ -8,10 +8,12 @@ #define PLAT_PRIVATE_H #ifndef __ASSEMBLY__ -#include -#include + #include -#include + +#include +#include +#include #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 a7ba83e5ac..3d1b40b3ff 100644 --- a/plat/rockchip/common/params_setup.c +++ b/plat/rockchip/common/params_setup.c @@ -5,16 +5,18 @@ */ #include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include + #include #include -#include -#include static struct gpio_info param_reset; static struct gpio_info param_poweroff; diff --git a/plat/rockchip/common/plat_pm.c b/plat/rockchip/common/plat_pm.c index 352dbc842f..c9563c9ed9 100644 --- a/plat/rockchip/common/plat_pm.c +++ b/plat/rockchip/common/plat_pm.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 /* 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 49d063cf57..a31e4103ec 100644 --- a/plat/rockchip/common/plat_topology.c +++ b/plat/rockchip/common/plat_topology.c @@ -4,10 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + #include +#include + #include -#include -#include /******************************************************************************* * This function returns the RockChip default topology tree information. diff --git a/plat/rockchip/common/rockchip_gicv2.c b/plat/rockchip/common/rockchip_gicv2.c index 4705042baa..222a88261a 100644 --- a/plat/rockchip/common/rockchip_gicv2.c +++ b/plat/rockchip/common/rockchip_gicv2.c @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#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/rockchip/common/rockchip_gicv3.c b/plat/rockchip/common/rockchip_gicv3.c index efbf1d167c..edae2efd04 100644 --- a/plat/rockchip/common/rockchip_gicv3.c +++ b/plat/rockchip/common/rockchip_gicv3.c @@ -4,12 +4,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#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/rockchip/common/rockchip_sip_svc.c b/plat/rockchip/common/rockchip_sip_svc.c index d690e92fc9..27ef042c3f 100644 --- a/plat/rockchip/common/rockchip_sip_svc.c +++ b/plat/rockchip/common/rockchip_sip_svc.c @@ -5,12 +5,14 @@ */ #include -#include -#include + +#include +#include +#include +#include + #include #include -#include -#include /* Rockchip SiP Service UUID */ DEFINE_SVC_UUID2(rk_sip_svc_uid, diff --git a/plat/rockchip/rk3328/drivers/pmu/pmu.c b/plat/rockchip/rk3328/drivers/pmu/pmu.c index 835c3a6b68..c215ee2400 100644 --- a/plat/rockchip/rk3328/drivers/pmu/pmu.c +++ b/plat/rockchip/rk3328/drivers/pmu/pmu.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 #include #include #include diff --git a/plat/rockchip/rk3328/drivers/soc/soc.c b/plat/rockchip/rk3328/drivers/soc/soc.c index ce344d66d5..d216020c58 100644 --- a/plat/rockchip/rk3328/drivers/soc/soc.c +++ b/plat/rockchip/rk3328/drivers/soc/soc.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 #include diff --git a/plat/rockchip/rk3328/include/platform_def.h b/plat/rockchip/rk3328/include/platform_def.h index 9b20b41d3f..b62c868693 100644 --- a/plat/rockchip/rk3328/include/platform_def.h +++ b/plat/rockchip/rk3328/include/platform_def.h @@ -8,7 +8,8 @@ #define PLATFORM_DEF_H #include -#include +#include + #include /******************************************************************************* diff --git a/plat/rockchip/rk3368/drivers/ddr/ddr_rk3368.c b/plat/rockchip/rk3368/drivers/ddr/ddr_rk3368.c index 1c33763f31..84d2654769 100644 --- a/plat/rockchip/rk3368/drivers/ddr/ddr_rk3368.c +++ b/plat/rockchip/rk3368/drivers/ddr/ddr_rk3368.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 /* 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 cb323e6ee9..e277a18ba4 100644 --- a/plat/rockchip/rk3368/drivers/pmu/pmu.c +++ b/plat/rockchip/rk3368/drivers/pmu/pmu.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 #include #include diff --git a/plat/rockchip/rk3368/drivers/soc/soc.c b/plat/rockchip/rk3368/drivers/soc/soc.c index d6979a8449..0c34554187 100644 --- a/plat/rockchip/rk3368/drivers/soc/soc.c +++ b/plat/rockchip/rk3368/drivers/soc/soc.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/rockchip/rk3368/include/platform_def.h b/plat/rockchip/rk3368/include/platform_def.h index 4083938ef1..815650fd3a 100644 --- a/plat/rockchip/rk3368/include/platform_def.h +++ b/plat/rockchip/rk3368/include/platform_def.h @@ -8,9 +8,10 @@ #define PLATFORM_DEF_H #include -#include +#include +#include + #include -#include /******************************************************************************* * Platform binary types for linking diff --git a/plat/rockchip/rk3368/plat_sip_calls.c b/plat/rockchip/rk3368/plat_sip_calls.c index c0f43dbfc0..5918d58ce0 100644 --- a/plat/rockchip/rk3368/plat_sip_calls.c +++ b/plat/rockchip/rk3368/plat_sip_calls.c @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include +#include +#include + #include #include -#include uintptr_t rockchip_plat_sip_handler(uint32_t smc_fid, u_register_t x1, diff --git a/plat/rockchip/rk3399/drivers/dp/cdn_dp.c b/plat/rockchip/rk3399/drivers/dp/cdn_dp.c index 73a75bb7c4..aa71fdea6f 100644 --- a/plat/rockchip/rk3399/drivers/dp/cdn_dp.c +++ b/plat/rockchip/rk3399/drivers/dp/cdn_dp.c @@ -6,11 +6,13 @@ #include #include -#include -#include #include #include +#include + +#include + __asm__( ".pushsection .text.hdcp_handler, \"ax\", %progbits\n" ".global hdcp_handler\n" diff --git a/plat/rockchip/rk3399/drivers/dram/dfs.c b/plat/rockchip/rk3399/drivers/dram/dfs.c index e6d39a1dd8..45fd9240ed 100644 --- a/plat/rockchip/rk3399/drivers/dram/dfs.c +++ b/plat/rockchip/rk3399/drivers/dram/dfs.c @@ -5,10 +5,11 @@ */ #include -#include -#include +#include +#include +#include + #include -#include #include #include "dfs.h" #include "dram.h" diff --git a/plat/rockchip/rk3399/drivers/dram/dram.h b/plat/rockchip/rk3399/drivers/dram/dram.h index ded511e02d..0eb12cf299 100644 --- a/plat/rockchip/rk3399/drivers/dram/dram.h +++ b/plat/rockchip/rk3399/drivers/dram/dram.h @@ -7,9 +7,10 @@ #ifndef DRAM_H #define DRAM_H +#include + #include #include -#include enum { DDR3 = 3, diff --git a/plat/rockchip/rk3399/drivers/dram/dram_spec_timing.c b/plat/rockchip/rk3399/drivers/dram/dram_spec_timing.c index 3527f0e5ec..3cdb7a2963 100644 --- a/plat/rockchip/rk3399/drivers/dram/dram_spec_timing.c +++ b/plat/rockchip/rk3399/drivers/dram/dram_spec_timing.c @@ -4,10 +4,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include #include -#include + +#include + +#include + #include "dram_spec_timing.h" static const uint8_t ddr3_cl_cwl[][7] = { diff --git a/plat/rockchip/rk3399/drivers/dram/suspend.c b/plat/rockchip/rk3399/drivers/dram/suspend.c index dd97581db1..8bc66e1bca 100644 --- a/plat/rockchip/rk3399/drivers/dram/suspend.c +++ b/plat/rockchip/rk3399/drivers/dram/suspend.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/rockchip/rk3399/drivers/gpio/rk3399_gpio.c b/plat/rockchip/rk3399/drivers/gpio/rk3399_gpio.c index e74c4d91a7..b8cba6dd93 100644 --- a/plat/rockchip/rk3399/drivers/gpio/rk3399_gpio.c +++ b/plat/rockchip/rk3399/drivers/gpio/rk3399_gpio.c @@ -3,15 +3,19 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + #include -#include -#include #include -#include -#include -#include -#include + #include + +#include +#include +#include +#include +#include + +#include #include 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 3f258b7894..d919fa1d2a 100644 --- a/plat/rockchip/rk3399/drivers/pmu/m0_ctl.c +++ b/plat/rockchip/rk3399/drivers/pmu/m0_ctl.c @@ -4,12 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include + +#include +#include +#include +#include + #include -#include #include #include #include diff --git a/plat/rockchip/rk3399/drivers/pmu/pmu.c b/plat/rockchip/rk3399/drivers/pmu/pmu.c index 04446d6062..42589b9b97 100644 --- a/plat/rockchip/rk3399/drivers/pmu/pmu.c +++ b/plat/rockchip/rk3399/drivers/pmu/pmu.c @@ -4,29 +4,32 @@ * 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 #include #include -#include -#include #include #include #include #include #include #include -#include #include DEFINE_BAKERY_LOCK(rockchip_pd_lock); diff --git a/plat/rockchip/rk3399/drivers/secure/secure.c b/plat/rockchip/rk3399/drivers/secure/secure.c index 1937b13808..8286f17c64 100644 --- a/plat/rockchip/rk3399/drivers/secure/secure.c +++ b/plat/rockchip/rk3399/drivers/secure/secure.c @@ -4,10 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include + +#include +#include +#include + #include #include #include diff --git a/plat/rockchip/rk3399/drivers/soc/soc.c b/plat/rockchip/rk3399/drivers/soc/soc.c index 741adde66d..c877dbde84 100644 --- a/plat/rockchip/rk3399/drivers/soc/soc.c +++ b/plat/rockchip/rk3399/drivers/soc/soc.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 diff --git a/plat/rockchip/rk3399/drivers/soc/soc.h b/plat/rockchip/rk3399/drivers/soc/soc.h index 1f7ec07f0f..853933715e 100644 --- a/plat/rockchip/rk3399/drivers/soc/soc.h +++ b/plat/rockchip/rk3399/drivers/soc/soc.h @@ -7,7 +7,7 @@ #ifndef SOC_H #define SOC_H -#include +#include #define GLB_SRST_FST_CFG_VAL 0xfdb9 #define GLB_SRST_SND_CFG_VAL 0xeca8 diff --git a/plat/rockchip/rk3399/include/plat.ld.S b/plat/rockchip/rk3399/include/plat.ld.S index 5045ba8c2f..cfa912f72f 100644 --- a/plat/rockchip/rk3399/include/plat.ld.S +++ b/plat/rockchip/rk3399/include/plat.ld.S @@ -6,7 +6,7 @@ #ifndef ROCKCHIP_PLAT_LD_S #define ROCKCHIP_PLAT_LD_S -#include +#include MEMORY { SRAM (rwx): ORIGIN = SRAM_BASE, LENGTH = SRAM_SIZE diff --git a/plat/rockchip/rk3399/include/platform_def.h b/plat/rockchip/rk3399/include/platform_def.h index cb798fbcbf..2861a7dd4b 100644 --- a/plat/rockchip/rk3399/include/platform_def.h +++ b/plat/rockchip/rk3399/include/platform_def.h @@ -8,10 +8,11 @@ #define PLATFORM_DEF_H #include +#include +#include + #include -#include #include -#include /******************************************************************************* * Platform binary types for linking diff --git a/plat/rockchip/rk3399/plat_sip_calls.c b/plat/rockchip/rk3399/plat_sip_calls.c index 3f0f619f26..c2cc5b11c3 100644 --- a/plat/rockchip/rk3399/plat_sip_calls.c +++ b/plat/rockchip/rk3399/plat_sip_calls.c @@ -4,13 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include +#include +#include + #include -#include #include -#include #include #include -#include #define RK_SIP_DDR_CFG 0x82000008 #define DRAM_INIT 0x00 diff --git a/plat/rpi3/aarch64/rpi3_bl2_mem_params_desc.c b/plat/rpi3/aarch64/rpi3_bl2_mem_params_desc.c index 6a3c1d6046..715aec4101 100644 --- a/plat/rpi3/aarch64/rpi3_bl2_mem_params_desc.c +++ b/plat/rpi3/aarch64/rpi3_bl2_mem_params_desc.c @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include #include +#include +#include +#include + /******************************************************************************* * Following descriptor provides BL image/ep information that gets used * by BL2 to load the images and also subset of this information is diff --git a/plat/rpi3/include/platform_def.h b/plat/rpi3/include/platform_def.h index 3b12c30d6e..69ebdb372e 100644 --- a/plat/rpi3/include/platform_def.h +++ b/plat/rpi3/include/platform_def.h @@ -8,9 +8,9 @@ #define PLATFORM_DEF_H #include -#include -#include -#include +#include +#include +#include #include "../rpi3_hw.h" diff --git a/plat/rpi3/rpi3_bl1_setup.c b/plat/rpi3/rpi3_bl1_setup.c index 39bb332565..ea4215d83e 100644 --- a/plat/rpi3/rpi3_bl1_setup.c +++ b/plat/rpi3/rpi3_bl1_setup.c @@ -4,13 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include #include "../../bl1/bl1_private.h" #include "rpi3_private.h" diff --git a/plat/rpi3/rpi3_bl2_setup.c b/plat/rpi3/rpi3_bl2_setup.c index c78024eaa6..53a2c72b8c 100644 --- a/plat/rpi3/rpi3_bl2_setup.c +++ b/plat/rpi3/rpi3_bl2_setup.c @@ -4,15 +4,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include -#include -#include + #include -#include -#include + +#include +#include +#include +#include +#include +#include +#include #include "rpi3_private.h" diff --git a/plat/rpi3/rpi3_bl31_setup.c b/plat/rpi3/rpi3_bl31_setup.c index 483d150f0a..af7f806cd1 100644 --- a/plat/rpi3/rpi3_bl31_setup.c +++ b/plat/rpi3/rpi3_bl31_setup.c @@ -5,12 +5,15 @@ */ #include -#include + #include -#include + #include -#include -#include + +#include +#include +#include +#include #include "rpi3_private.h" diff --git a/plat/rpi3/rpi3_common.c b/plat/rpi3/rpi3_common.c index c7e8b3a755..9b10974adb 100644 --- a/plat/rpi3/rpi3_common.c +++ b/plat/rpi3/rpi3_common.c @@ -4,15 +4,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include -#include -#include + #include -#include -#include + +#include +#include +#include +#include +#include +#include +#include #include "rpi3_hw.h" #include "rpi3_private.h" diff --git a/plat/rpi3/rpi3_hw.h b/plat/rpi3/rpi3_hw.h index 822644cd3b..9d86eb8809 100644 --- a/plat/rpi3/rpi3_hw.h +++ b/plat/rpi3/rpi3_hw.h @@ -7,7 +7,7 @@ #ifndef RPI3_HW_H #define RPI3_HW_H -#include +#include /* * Peripherals diff --git a/plat/rpi3/rpi3_image_load.c b/plat/rpi3/rpi3_image_load.c index fad9e4f34a..5394c6f7c8 100644 --- a/plat/rpi3/rpi3_image_load.c +++ b/plat/rpi3/rpi3_image_load.c @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include #include +#include +#include +#include + /******************************************************************************* * This function flushes the data structures so that they are visible * in memory for the next BL image. diff --git a/plat/rpi3/rpi3_io_storage.c b/plat/rpi3/rpi3_io_storage.c index cafcf6dd55..7e66deb72e 100644 --- a/plat/rpi3/rpi3_io_storage.c +++ b/plat/rpi3/rpi3_io_storage.c @@ -5,15 +5,17 @@ */ #include -#include -#include -#include -#include -#include -#include -#include #include +#include + +#include +#include +#include +#include +#include +#include + /* Semihosting filenames */ #define BL2_IMAGE_NAME "bl2.bin" #define BL31_IMAGE_NAME "bl31.bin" diff --git a/plat/rpi3/rpi3_mbox.c b/plat/rpi3/rpi3_mbox.c index 77e17af6b0..2db605edf0 100644 --- a/plat/rpi3/rpi3_mbox.c +++ b/plat/rpi3/rpi3_mbox.c @@ -5,11 +5,13 @@ */ #include -#include -#include -#include + #include +#include +#include +#include + #include "rpi3_hw.h" /* This struct must be aligned to 16 bytes */ diff --git a/plat/rpi3/rpi3_pm.c b/plat/rpi3/rpi3_pm.c index b6adc8a530..3a077d37aa 100644 --- a/plat/rpi3/rpi3_pm.c +++ b/plat/rpi3/rpi3_pm.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 #include "rpi3_hw.h" diff --git a/plat/rpi3/rpi3_rng.c b/plat/rpi3/rpi3_rng.c index 111b3b6c61..fd69adbf31 100644 --- a/plat/rpi3/rpi3_rng.c +++ b/plat/rpi3/rpi3_rng.c @@ -5,9 +5,10 @@ */ #include -#include #include +#include + #include "rpi3_hw.h" /* Initial amount of values to discard */ diff --git a/plat/rpi3/rpi3_stack_protector.c b/plat/rpi3/rpi3_stack_protector.c index 812f6edfa9..815f73135d 100644 --- a/plat/rpi3/rpi3_stack_protector.c +++ b/plat/rpi3/rpi3_stack_protector.c @@ -5,7 +5,8 @@ */ #include -#include + +#include #include "rpi3_private.h" diff --git a/plat/rpi3/rpi3_topology.c b/plat/rpi3/rpi3_topology.c index 31a22a469b..200d41dd16 100644 --- a/plat/rpi3/rpi3_topology.c +++ b/plat/rpi3/rpi3_topology.c @@ -4,10 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include +#include + +#include + #include "rpi3_private.h" /* The power domain tree descriptor */ diff --git a/plat/rpi3/rpi3_trusted_boot.c b/plat/rpi3/rpi3_trusted_boot.c index 2f528fc41d..b306c45c23 100644 --- a/plat/rpi3/rpi3_trusted_boot.c +++ b/plat/rpi3/rpi3_trusted_boot.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include extern char rpi3_rotpk_hash[], rpi3_rotpk_hash_end[]; diff --git a/plat/socionext/synquacer/drivers/mhu/sq_mhu.c b/plat/socionext/synquacer/drivers/mhu/sq_mhu.c index 5c2a635bb9..925ed97042 100644 --- a/plat/socionext/synquacer/drivers/mhu/sq_mhu.c +++ b/plat/socionext/synquacer/drivers/mhu/sq_mhu.c @@ -4,11 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include + #include + +#include +#include +#include + #include #include "sq_mhu.h" diff --git a/plat/socionext/synquacer/drivers/scpi/sq_scpi.c b/plat/socionext/synquacer/drivers/scpi/sq_scpi.c index 170b7e1846..0cb75a02df 100644 --- a/plat/socionext/synquacer/drivers/scpi/sq_scpi.c +++ b/plat/socionext/synquacer/drivers/scpi/sq_scpi.c @@ -4,12 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include +#include + #include + +#include +#include #include -#include -#include + #include "sq_mhu.h" #include "sq_scpi.h" diff --git a/plat/socionext/synquacer/include/platform_def.h b/plat/socionext/synquacer/include/platform_def.h index bde73485bf..de6be7d231 100644 --- a/plat/socionext/synquacer/include/platform_def.h +++ b/plat/socionext/synquacer/include/platform_def.h @@ -7,8 +7,8 @@ #ifndef PLATFORM_DEF_H #define PLATFORM_DEF_H -#include -#include +#include +#include /* CPU topology */ #define PLAT_MAX_CORES_PER_CLUSTER 2 diff --git a/plat/socionext/synquacer/include/sq_common.h b/plat/socionext/synquacer/include/sq_common.h index c395640347..abd90904d7 100644 --- a/plat/socionext/synquacer/include/sq_common.h +++ b/plat/socionext/synquacer/include/sq_common.h @@ -8,7 +8,8 @@ #define SQ_COMMON_H #include -#include + +#include struct draminfo { uint32_t num_regions; diff --git a/plat/socionext/synquacer/sq_bl31_setup.c b/plat/socionext/synquacer/sq_bl31_setup.c index 07c1f89970..f8d252622c 100644 --- a/plat/socionext/synquacer/sq_bl31_setup.c +++ b/plat/socionext/synquacer/sq_bl31_setup.c @@ -4,14 +4,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + +#include + #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include + #include static console_pl011_t console; diff --git a/plat/socionext/synquacer/sq_ccn.c b/plat/socionext/synquacer/sq_ccn.c index bb70d5d801..fa6ea87b2d 100644 --- a/plat/socionext/synquacer/sq_ccn.c +++ b/plat/socionext/synquacer/sq_ccn.c @@ -4,10 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + #include #include -#include -#include +#include static const unsigned char master_to_rn_id_map[] = { PLAT_SQ_CLUSTER_TO_CCN_ID_MAP diff --git a/plat/socionext/synquacer/sq_gicv3.c b/plat/socionext/synquacer/sq_gicv3.c index 94e5a66b69..05318e3723 100644 --- a/plat/socionext/synquacer/sq_gicv3.c +++ b/plat/socionext/synquacer/sq_gicv3.c @@ -5,11 +5,13 @@ */ #include -#include -#include -#include + #include +#include +#include +#include + #include "sq_common.h" static uintptr_t sq_rdistif_base_addrs[PLATFORM_CORE_COUNT]; diff --git a/plat/socionext/synquacer/sq_psci.c b/plat/socionext/synquacer/sq_psci.c index c327f1d483..134224dce6 100644 --- a/plat/socionext/synquacer/sq_psci.c +++ b/plat/socionext/synquacer/sq_psci.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 "sq_scpi.h" -#include /* Macros to read the SQ power domain state */ #define SQ_PWR_LVL0 MPIDR_AFFLVL0 diff --git a/plat/socionext/synquacer/sq_topology.c b/plat/socionext/synquacer/sq_topology.c index aa20355999..359997aaef 100644 --- a/plat/socionext/synquacer/sq_topology.c +++ b/plat/socionext/synquacer/sq_topology.c @@ -4,9 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + #include + #include -#include unsigned char sq_pd_tree_desc[PLAT_CLUSTER_COUNT + 1]; diff --git a/plat/socionext/synquacer/sq_xlat_setup.c b/plat/socionext/synquacer/sq_xlat_setup.c index ae147003a3..5d1669d03e 100644 --- a/plat/socionext/synquacer/sq_xlat_setup.c +++ b/plat/socionext/synquacer/sq_xlat_setup.c @@ -4,9 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include + +#include +#include #define SQ_REG_REGION_BASE 0x20000000ULL #define SQ_REG_REGION_SIZE 0x60000000ULL diff --git a/plat/socionext/uniphier/include/platform_def.h b/plat/socionext/uniphier/include/platform_def.h index 6e9b98edb1..d4db3f5b0b 100644 --- a/plat/socionext/uniphier/include/platform_def.h +++ b/plat/socionext/uniphier/include/platform_def.h @@ -7,9 +7,9 @@ #ifndef PLATFORM_DEF_H #define PLATFORM_DEF_H -#include -#include -#include +#include +#include +#include #define PLATFORM_STACK_SIZE 0x1000 diff --git a/plat/socionext/uniphier/tsp/uniphier_tsp_setup.c b/plat/socionext/uniphier/tsp/uniphier_tsp_setup.c index 7df17d3cdf..e7dcc652db 100644 --- a/plat/socionext/uniphier/tsp/uniphier_tsp_setup.c +++ b/plat/socionext/uniphier/tsp/uniphier_tsp_setup.c @@ -5,7 +5,8 @@ */ #include -#include + +#include #include "../uniphier.h" diff --git a/plat/socionext/uniphier/uniphier_bl2_setup.c b/plat/socionext/uniphier/uniphier_bl2_setup.c index fb7997c891..7109d21fef 100644 --- a/plat/socionext/uniphier/uniphier_bl2_setup.c +++ b/plat/socionext/uniphier/uniphier_bl2_setup.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 #ifdef UNIPHIER_DECOMPRESS_GZIP #include #endif -#include #include "uniphier.h" diff --git a/plat/socionext/uniphier/uniphier_bl31_setup.c b/plat/socionext/uniphier/uniphier_bl31_setup.c index c5acdbd70f..ce32d89c01 100644 --- a/plat/socionext/uniphier/uniphier_bl31_setup.c +++ b/plat/socionext/uniphier/uniphier_bl31_setup.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 #include "uniphier.h" diff --git a/plat/socionext/uniphier/uniphier_boot_device.c b/plat/socionext/uniphier/uniphier_boot_device.c index 78ca8ef06c..462c0859ce 100644 --- a/plat/socionext/uniphier/uniphier_boot_device.c +++ b/plat/socionext/uniphier/uniphier_boot_device.c @@ -5,10 +5,11 @@ */ #include -#include #include #include -#include + +#include +#include #include "uniphier.h" diff --git a/plat/socionext/uniphier/uniphier_cci.c b/plat/socionext/uniphier/uniphier_cci.c index 9e00c56e30..3ca176895b 100644 --- a/plat/socionext/uniphier/uniphier_cci.c +++ b/plat/socionext/uniphier/uniphier_cci.c @@ -4,10 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include -#include + +#include +#include +#include #include "uniphier.h" diff --git a/plat/socionext/uniphier/uniphier_emmc.c b/plat/socionext/uniphier/uniphier_emmc.c index db87637b74..4ac1f5108c 100644 --- a/plat/socionext/uniphier/uniphier_emmc.c +++ b/plat/socionext/uniphier/uniphier_emmc.c @@ -4,13 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include -#include #include -#include + +#include + +#include +#include +#include +#include #include "uniphier.h" diff --git a/plat/socionext/uniphier/uniphier_gicv3.c b/plat/socionext/uniphier/uniphier_gicv3.c index 93bc73ac2c..5148e8f910 100644 --- a/plat/socionext/uniphier/uniphier_gicv3.c +++ b/plat/socionext/uniphier/uniphier_gicv3.c @@ -5,11 +5,13 @@ */ #include -#include -#include -#include + #include +#include +#include +#include + #include "uniphier.h" static uintptr_t uniphier_rdistif_base_addrs[PLATFORM_CORE_COUNT]; diff --git a/plat/socionext/uniphier/uniphier_image_desc.c b/plat/socionext/uniphier/uniphier_image_desc.c index f4651db05d..9e171e073c 100644 --- a/plat/socionext/uniphier/uniphier_image_desc.c +++ b/plat/socionext/uniphier/uniphier_image_desc.c @@ -4,11 +4,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include + #include +#include +#include + #include "uniphier.h" static struct bl_mem_params_node uniphier_image_descs[] = { diff --git a/plat/socionext/uniphier/uniphier_io_storage.c b/plat/socionext/uniphier/uniphier_io_storage.c index 5d841ac00e..451e84f9e0 100644 --- a/plat/socionext/uniphier/uniphier_io_storage.c +++ b/plat/socionext/uniphier/uniphier_io_storage.c @@ -6,15 +6,17 @@ #include #include -#include -#include -#include -#include -#include -#include #include -#include -#include + +#include + +#include +#include +#include +#include +#include +#include +#include #include "uniphier.h" diff --git a/plat/socionext/uniphier/uniphier_nand.c b/plat/socionext/uniphier/uniphier_nand.c index c8e825d6ae..271aa0f49a 100644 --- a/plat/socionext/uniphier/uniphier_nand.c +++ b/plat/socionext/uniphier/uniphier_nand.c @@ -4,13 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include -#include -#include #include -#include + +#include + +#include +#include +#include +#include +#include #include "uniphier.h" diff --git a/plat/socionext/uniphier/uniphier_psci.c b/plat/socionext/uniphier/uniphier_psci.c index 82081a0516..ce11aa7cbb 100644 --- a/plat/socionext/uniphier/uniphier_psci.c +++ b/plat/socionext/uniphier/uniphier_psci.c @@ -5,9 +5,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include "uniphier.h" diff --git a/plat/socionext/uniphier/uniphier_scp.c b/plat/socionext/uniphier/uniphier_scp.c index 58eb72eff0..c608a255a8 100644 --- a/plat/socionext/uniphier/uniphier_scp.c +++ b/plat/socionext/uniphier/uniphier_scp.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include +#include #include "uniphier.h" diff --git a/plat/socionext/uniphier/uniphier_soc_info.c b/plat/socionext/uniphier/uniphier_soc_info.c index 55688f319d..377532deba 100644 --- a/plat/socionext/uniphier/uniphier_soc_info.c +++ b/plat/socionext/uniphier/uniphier_soc_info.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include #include "uniphier.h" diff --git a/plat/socionext/uniphier/uniphier_syscnt.c b/plat/socionext/uniphier/uniphier_syscnt.c index d7bcaf86fb..19378430ff 100644 --- a/plat/socionext/uniphier/uniphier_syscnt.c +++ b/plat/socionext/uniphier/uniphier_syscnt.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include unsigned int plat_get_syscnt_freq2(void) { diff --git a/plat/socionext/uniphier/uniphier_tbbr.c b/plat/socionext/uniphier/uniphier_tbbr.c index 1c83411191..962a8d288e 100644 --- a/plat/socionext/uniphier/uniphier_tbbr.c +++ b/plat/socionext/uniphier/uniphier_tbbr.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include extern char uniphier_rotpk_hash[], uniphier_rotpk_hash_end[]; diff --git a/plat/socionext/uniphier/uniphier_topology.c b/plat/socionext/uniphier/uniphier_topology.c index 1f96f5851a..c106c98b39 100644 --- a/plat/socionext/uniphier/uniphier_topology.c +++ b/plat/socionext/uniphier/uniphier_topology.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include "uniphier.h" diff --git a/plat/socionext/uniphier/uniphier_usb.c b/plat/socionext/uniphier/uniphier_usb.c index b51b601208..ef7079a5f9 100644 --- a/plat/socionext/uniphier/uniphier_usb.c +++ b/plat/socionext/uniphier/uniphier_usb.c @@ -4,13 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include -#include #include -#include + +#include + +#include +#include +#include +#include #include "uniphier.h" diff --git a/plat/socionext/uniphier/uniphier_xlat_setup.c b/plat/socionext/uniphier/uniphier_xlat_setup.c index 3112ecd9d9..0faebc9939 100644 --- a/plat/socionext/uniphier/uniphier_xlat_setup.c +++ b/plat/socionext/uniphier/uniphier_xlat_setup.c @@ -4,9 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include + +#include +#include #define UNIPHIER_REG_REGION_BASE 0x50000000ULL #define UNIPHIER_REG_REGION_SIZE 0x20000000ULL diff --git a/plat/st/stm32mp1/bl2_io_storage.c b/plat/st/stm32mp1/bl2_io_storage.c index b1125d15db..45a352e0c5 100644 --- a/plat/st/stm32mp1/bl2_io_storage.c +++ b/plat/st/stm32mp1/bl2_io_storage.c @@ -4,26 +4,29 @@ * 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 +#include +#include +#include +#include +#include +#include +#include +#include + +#include #include -#include -#include -#include /* IO devices */ static const io_dev_connector_t *dummy_dev_con; diff --git a/plat/st/stm32mp1/bl2_plat_setup.c b/plat/st/stm32mp1/bl2_plat_setup.c index d85ae96efd..6af65fd26e 100644 --- a/plat/st/stm32mp1/bl2_plat_setup.c +++ b/plat/st/stm32mp1/bl2_plat_setup.c @@ -4,29 +4,32 @@ * 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 +#include +#include +#include +#include +#include +#include + +#include #include #include -#include #include -#include -#include -#include -#include -#include -#include static struct console_stm32 console; diff --git a/plat/st/stm32mp1/include/platform_def.h b/plat/st/stm32mp1/include/platform_def.h index 2ba6cc64a2..1b4df163bb 100644 --- a/plat/st/stm32mp1/include/platform_def.h +++ b/plat/st/stm32mp1/include/platform_def.h @@ -8,9 +8,10 @@ #define PLATFORM_DEF_H #include -#include -#include -#include +#include +#include +#include + #include "../stm32mp1_def.h" /******************************************************************************* diff --git a/plat/st/stm32mp1/plat_bl2_mem_params_desc.c b/plat/st/stm32mp1/plat_bl2_mem_params_desc.c index 6f5bc4cc13..6214194393 100644 --- a/plat/st/stm32mp1/plat_bl2_mem_params_desc.c +++ b/plat/st/stm32mp1/plat_bl2_mem_params_desc.c @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include #include +#include +#include +#include + /******************************************************************************* * Following descriptor provides BL image/ep information that gets used * by BL2 to load the images and also subset of this information is diff --git a/plat/st/stm32mp1/plat_image_load.c b/plat/st/stm32mp1/plat_image_load.c index d5b328e3c1..a52db6cac5 100644 --- a/plat/st/stm32mp1/plat_image_load.c +++ b/plat/st/stm32mp1/plat_image_load.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include +#include /******************************************************************************* * This function flushes the data structures so that they are visible diff --git a/plat/st/stm32mp1/platform.mk b/plat/st/stm32mp1/platform.mk index 8890e82254..8bb7a80e1a 100644 --- a/plat/st/stm32mp1/platform.mk +++ b/plat/st/stm32mp1/platform.mk @@ -22,9 +22,8 @@ PLAT_PARTITION_MAX_ENTRIES := $(shell echo $$(($(STM32_TF_A_COPIES) + 1))) $(eval $(call add_define,PLAT_PARTITION_MAX_ENTRIES)) PLAT_INCLUDES := -Iplat/st/stm32mp1/include/ +PLAT_INCLUDES += -Iplat/st/stm32mp1/ PLAT_INCLUDES += -Iinclude/common/tbbr -PLAT_INCLUDES += -Iinclude/drivers/partition -PLAT_INCLUDES += -Iinclude/drivers/st # Device tree STM32_DTB_FILE_NAME ?= stm32mp157c-ev1.dtb diff --git a/plat/st/stm32mp1/sp_min/sp_min_setup.c b/plat/st/stm32mp1/sp_min/sp_min_setup.c index bd4f2ec01e..f5413797cf 100644 --- a/plat/st/stm32mp1/sp_min/sp_min_setup.c +++ b/plat/st/stm32mp1/sp_min/sp_min_setup.c @@ -4,25 +4,28 @@ * 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 + #include -#include -#include #include #include -#include -#include -#include /****************************************************************************** * Placeholder variables for copying the arguments that have been passed to diff --git a/plat/st/stm32mp1/stm32mp1.ld.S b/plat/st/stm32mp1/stm32mp1.ld.S index 50c926fb9c..a8e8220630 100644 --- a/plat/st/stm32mp1/stm32mp1.ld.S +++ b/plat/st/stm32mp1/stm32mp1.ld.S @@ -7,8 +7,8 @@ #ifndef STM32MP1_LD_S #define STM32MP1_LD_S +#include #include -#include OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT) OUTPUT_ARCH(PLATFORM_LINKER_ARCH) diff --git a/plat/st/stm32mp1/stm32mp1_common.c b/plat/st/stm32mp1/stm32mp1_common.c index 7d84da1f87..b54f313ffe 100644 --- a/plat/st/stm32mp1/stm32mp1_common.c +++ b/plat/st/stm32mp1/stm32mp1_common.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 #define MAP_SRAM MAP_REGION_FLAT(STM32MP1_SRAM_BASE, \ STM32MP1_SRAM_SIZE, \ diff --git a/plat/st/stm32mp1/stm32mp1_context.c b/plat/st/stm32mp1/stm32mp1_context.c index 245fd17d75..a8f9bf46d5 100644 --- a/plat/st/stm32mp1/stm32mp1_context.c +++ b/plat/st/stm32mp1/stm32mp1_context.c @@ -4,11 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include + #include -#include + +#include +#include +#include + #include #define TAMP_BOOT_ITF_BACKUP_REG_ID U(20) diff --git a/plat/st/stm32mp1/stm32mp1_def.h b/plat/st/stm32mp1/stm32mp1_def.h index 2224498370..fb21acceca 100644 --- a/plat/st/stm32mp1/stm32mp1_def.h +++ b/plat/st/stm32mp1/stm32mp1_def.h @@ -7,9 +7,9 @@ #ifndef STM32MP1_DEF_H #define STM32MP1_DEF_H -#include -#include -#include +#include +#include +#include /******************************************************************************* * STM32MP1 memory map related constants diff --git a/plat/st/stm32mp1/stm32mp1_dt.c b/plat/st/stm32mp1/stm32mp1_dt.c index bde968a0bb..29e936aff8 100644 --- a/plat/st/stm32mp1/stm32mp1_dt.c +++ b/plat/st/stm32mp1/stm32mp1_dt.c @@ -5,15 +5,19 @@ */ #include -#include + #include + #include -#include -#include -#include -#include + +#include +#include +#include +#include +#include +#include + #include -#include #define DT_GPIO_BANK_SHIFT 12 #define DT_GPIO_BANK_MASK 0x1F000U diff --git a/plat/st/stm32mp1/stm32mp1_gic.c b/plat/st/stm32mp1/stm32mp1_gic.c index 11eb0a3e2c..fabed370f0 100644 --- a/plat/st/stm32mp1/stm32mp1_gic.c +++ b/plat/st/stm32mp1/stm32mp1_gic.c @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include #include -#include + +#include +#include +#include +#include #include diff --git a/plat/st/stm32mp1/stm32mp1_helper.S b/plat/st/stm32mp1/stm32mp1_helper.S index 673706eed0..61c587f4f1 100644 --- a/plat/st/stm32mp1/stm32mp1_helper.S +++ b/plat/st/stm32mp1/stm32mp1_helper.S @@ -4,12 +4,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + #include #include -#include -#include -#include -#include +#include +#include +#include #define GPIO_BANK_G_ADDRESS 0x50008000 #define GPIO_TX_PORT 11 diff --git a/plat/st/stm32mp1/stm32mp1_pm.c b/plat/st/stm32mp1/stm32mp1_pm.c index e24af0e553..85189ff21d 100644 --- a/plat/st/stm32mp1/stm32mp1_pm.c +++ b/plat/st/stm32mp1/stm32mp1_pm.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 +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include #include -#include static uint32_t stm32_sec_entrypoint; static uint32_t cntfrq_core0; diff --git a/plat/st/stm32mp1/stm32mp1_security.c b/plat/st/stm32mp1/stm32mp1_security.c index e783c14e45..39927040a8 100644 --- a/plat/st/stm32mp1/stm32mp1_security.c +++ b/plat/st/stm32mp1/stm32mp1_security.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 "platform_def.h" /******************************************************************************* * Initialize the TrustZone Controller. Configure Region 0 with Secure RW access diff --git a/plat/st/stm32mp1/stm32mp1_stack_protector.c b/plat/st/stm32mp1/stm32mp1_stack_protector.c index c681300979..14e8e16121 100644 --- a/plat/st/stm32mp1/stm32mp1_stack_protector.c +++ b/plat/st/stm32mp1/stm32mp1_stack_protector.c @@ -4,10 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include +#include +#include + #define RANDOM_CANARY_VALUE 2144346116U u_register_t plat_get_stack_protector_canary(void) diff --git a/plat/st/stm32mp1/stm32mp1_topology.c b/plat/st/stm32mp1/stm32mp1_topology.c index 405aa33eb3..59a0c17cf2 100644 --- a/plat/st/stm32mp1/stm32mp1_topology.c +++ b/plat/st/stm32mp1/stm32mp1_topology.c @@ -5,8 +5,9 @@ */ #include -#include -#include + +#include +#include /* 1 cluster, all cores into */ static const unsigned char stm32mp1_power_domain_tree_desc[] = { diff --git a/plat/ti/k3/board/generic/include/board_def.h b/plat/ti/k3/board/generic/include/board_def.h index 1bf58eda82..4c8f882204 100644 --- a/plat/ti/k3/board/generic/include/board_def.h +++ b/plat/ti/k3/board/generic/include/board_def.h @@ -7,7 +7,7 @@ #ifndef BOARD_DEF_H #define BOARD_DEF_H -#include +#include /* The ports must be in order and contiguous */ #define K3_CLUSTER0_CORE_COUNT 2 diff --git a/plat/ti/k3/common/drivers/sec_proxy/sec_proxy.c b/plat/ti/k3/common/drivers/sec_proxy/sec_proxy.c index 92414b9050..5dd54d4ff3 100644 --- a/plat/ti/k3/common/drivers/sec_proxy/sec_proxy.c +++ b/plat/ti/k3/common/drivers/sec_proxy/sec_proxy.c @@ -7,14 +7,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include -#include -#include #include -#include -#include + +#include + +#include +#include +#include +#include +#include #include "sec_proxy.h" diff --git a/plat/ti/k3/common/drivers/ti_sci/ti_sci.c b/plat/ti/k3/common/drivers/ti_sci/ti_sci.c index 7ba0267dcc..b211bdf60b 100644 --- a/plat/ti/k3/common/drivers/ti_sci/ti_sci.c +++ b/plat/ti/k3/common/drivers/ti_sci/ti_sci.c @@ -7,13 +7,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include #include #include #include +#include + +#include #include #include "ti_sci_protocol.h" diff --git a/plat/ti/k3/common/k3_bl31_setup.c b/plat/ti/k3/common/k3_bl31_setup.c index c0cf5e2a87..3fa11b2318 100644 --- a/plat/ti/k3/common/k3_bl31_setup.c +++ b/plat/ti/k3/common/k3_bl31_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 /* Table of regions to map using the MMU */ const mmap_region_t plat_k3_mmap[] = { diff --git a/plat/ti/k3/common/k3_console.c b/plat/ti/k3/common/k3_console.c index ff3ca61ce6..31c963245d 100644 --- a/plat/ti/k3/common/k3_console.c +++ b/plat/ti/k3/common/k3_console.c @@ -4,10 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include -#include + +#include +#include + +#include void bl31_console_setup(void) { diff --git a/plat/ti/k3/common/k3_gicv3.c b/plat/ti/k3/common/k3_gicv3.c index 3253130f6e..b7c7880141 100644 --- a/plat/ti/k3/common/k3_gicv3.c +++ b/plat/ti/k3/common/k3_gicv3.c @@ -4,13 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include -#include -#include #include -#include + +#include +#include +#include +#include +#include + +#include /* The GICv3 driver only needs to be initialized in EL3 */ uintptr_t rdistif_base_addrs[PLATFORM_CORE_COUNT]; diff --git a/plat/ti/k3/common/k3_psci.c b/plat/ti/k3/common/k3_psci.c index 787cc82fda..cb75bf6544 100644 --- a/plat/ti/k3/common/k3_psci.c +++ b/plat/ti/k3/common/k3_psci.c @@ -4,19 +4,21 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include -#include -#include -/* Need to flush psci internal locks before shutdown or their values are lost */ -#include <../../lib/psci/psci_private.h> -#include #include +#include +#include +#include +#include +#include + +#include #include +/* Need to flush psci internal locks before shutdown or their values are lost */ +#include "../../../../lib/psci/psci_private.h" + #define STUB() ERROR("stub %s called\n", __func__) uintptr_t k3_sec_entrypoint; diff --git a/plat/ti/k3/common/k3_topology.c b/plat/ti/k3/common/k3_topology.c index d7ac0a5894..2b98acb278 100644 --- a/plat/ti/k3/common/k3_topology.c +++ b/plat/ti/k3/common/k3_topology.c @@ -5,7 +5,8 @@ */ #include -#include + +#include /* The power domain tree descriptor */ static unsigned char power_domain_tree_desc[] = { diff --git a/plat/ti/k3/include/platform_def.h b/plat/ti/k3/include/platform_def.h index 7d1df0aef7..5d563b6f0a 100644 --- a/plat/ti/k3/include/platform_def.h +++ b/plat/ti/k3/include/platform_def.h @@ -8,8 +8,9 @@ #define PLATFORM_DEF_H #include +#include + #include -#include /******************************************************************************* * Generic platform constants diff --git a/plat/xilinx/versal/aarch64/versal_common.c b/plat/xilinx/versal/aarch64/versal_common.c index c13b1b52a0..587b797d76 100644 --- a/plat/xilinx/versal/aarch64/versal_common.c +++ b/plat/xilinx/versal/aarch64/versal_common.c @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include + #include "../versal_def.h" #include "../versal_private.h" diff --git a/plat/xilinx/versal/aarch64/versal_helpers.S b/plat/xilinx/versal/aarch64/versal_helpers.S index 1b7f95596c..26eb05221f 100644 --- a/plat/xilinx/versal/aarch64/versal_helpers.S +++ b/plat/xilinx/versal/aarch64/versal_helpers.S @@ -6,7 +6,7 @@ #include #include -#include +#include #include .globl plat_secondary_cold_boot_setup diff --git a/plat/xilinx/versal/bl31_versal_setup.c b/plat/xilinx/versal/bl31_versal_setup.c index 9f71a1cc3a..d7e07e036a 100644 --- a/plat/xilinx/versal/bl31_versal_setup.c +++ b/plat/xilinx/versal/bl31_versal_setup.c @@ -5,14 +5,16 @@ */ #include -#include -#include -#include -#include #include -#include -#include -#include + +#include +#include +#include +#include +#include +#include +#include + #include "versal_private.h" static entry_point_info_t bl32_image_ep_info; diff --git a/plat/xilinx/versal/include/plat_macros.S b/plat/xilinx/versal/include/plat_macros.S index 4fc1315bee..3a52212251 100644 --- a/plat/xilinx/versal/include/plat_macros.S +++ b/plat/xilinx/versal/include/plat_macros.S @@ -7,10 +7,11 @@ #ifndef PLAT_MACROS_S #define PLAT_MACROS_S +#include +#include +#include + #include "../include/platform_def.h" -#include -#include -#include .section .rodata.gic_reg_name, "aS" /* Applicable only to GICv2 and GICv3 with SRE disabled (legacy mode) */ diff --git a/plat/xilinx/versal/include/platform_def.h b/plat/xilinx/versal/include/platform_def.h index 45aaa84be0..0c4b9544f2 100644 --- a/plat/xilinx/versal/include/platform_def.h +++ b/plat/xilinx/versal/include/platform_def.h @@ -8,6 +8,7 @@ #define PLATFORM_DEF_H #include + #include "../versal_def.h" /******************************************************************************* diff --git a/plat/xilinx/versal/plat_psci.c b/plat/xilinx/versal/plat_psci.c index 37d00f66c8..4a443697f0 100644 --- a/plat/xilinx/versal/plat_psci.c +++ b/plat/xilinx/versal/plat_psci.c @@ -4,10 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include -#include +#include +#include +#include +#include + #include "versal_private.h" static uintptr_t versal_sec_entry; diff --git a/plat/xilinx/versal/plat_versal.c b/plat/xilinx/versal/plat_versal.c index 152cb3626d..642867da29 100644 --- a/plat/xilinx/versal/plat_versal.c +++ b/plat/xilinx/versal/plat_versal.c @@ -3,7 +3,9 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include + +#include + #include "versal_private.h" int plat_core_pos_by_mpidr(u_register_t mpidr) diff --git a/plat/xilinx/versal/sip_svc_setup.c b/plat/xilinx/versal/sip_svc_setup.c index 4007d5c8f7..8f2180b211 100644 --- a/plat/xilinx/versal/sip_svc_setup.c +++ b/plat/xilinx/versal/sip_svc_setup.c @@ -6,9 +6,9 @@ /* Top level SMC handler for SiP calls. Dispatch PM calls to PM SMC handler. */ -#include -#include -#include +#include +#include +#include /* SMC function IDs for SiP Service queries */ #define VERSAL_SIP_SVC_CALL_COUNT 0x8200ff00 diff --git a/plat/xilinx/versal/versal_def.h b/plat/xilinx/versal/versal_def.h index 5e42bd7840..41c65b94de 100644 --- a/plat/xilinx/versal/versal_def.h +++ b/plat/xilinx/versal/versal_def.h @@ -7,7 +7,7 @@ #ifndef VERSAL_DEF_H #define VERSAL_DEF_H -#include +#include /* List all consoles */ #define VERSAL_CONSOLE_ID_pl011 1 diff --git a/plat/xilinx/versal/versal_gicv3.c b/plat/xilinx/versal/versal_gicv3.c index 72374b53b1..dcf23b4253 100644 --- a/plat/xilinx/versal/versal_gicv3.c +++ b/plat/xilinx/versal/versal_gicv3.c @@ -4,11 +4,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include #include -#include + +#include +#include +#include +#include + #include "versal_private.h" /****************************************************************************** diff --git a/plat/xilinx/versal/versal_private.h b/plat/xilinx/versal/versal_private.h index 1e30ebc28e..5d98d080c5 100644 --- a/plat/xilinx/versal/versal_private.h +++ b/plat/xilinx/versal/versal_private.h @@ -7,7 +7,7 @@ #ifndef VERSAL_PRIVATE_H #define VERSAL_PRIVATE_H -#include +#include void versal_config_setup(void); diff --git a/plat/xilinx/zynqmp/aarch64/zynqmp_common.c b/plat/xilinx/zynqmp/aarch64/zynqmp_common.c index 2f4228fea4..23c02e068b 100644 --- a/plat/xilinx/zynqmp/aarch64/zynqmp_common.c +++ b/plat/xilinx/zynqmp/aarch64/zynqmp_common.c @@ -4,13 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include -#include #include #include -#include + +#include +#include +#include +#include +#include + #include "../zynqmp_private.h" #include "pm_api_sys.h" diff --git a/plat/xilinx/zynqmp/aarch64/zynqmp_helpers.S b/plat/xilinx/zynqmp/aarch64/zynqmp_helpers.S index 969d8faa1f..8d81665387 100644 --- a/plat/xilinx/zynqmp/aarch64/zynqmp_helpers.S +++ b/plat/xilinx/zynqmp/aarch64/zynqmp_helpers.S @@ -5,7 +5,7 @@ */ #include -#include +#include #include .globl plat_secondary_cold_boot_setup diff --git a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c index 01634500af..01cd781ff6 100644 --- a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c +++ b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c @@ -5,13 +5,15 @@ */ #include -#include -#include -#include -#include #include + +#include +#include +#include +#include #include -#include +#include + #include "zynqmp_private.h" #define BL31_END (unsigned long)(&__BL31_END__) diff --git a/plat/xilinx/zynqmp/include/platform_def.h b/plat/xilinx/zynqmp/include/platform_def.h index d721778d30..e3c9fcc172 100644 --- a/plat/xilinx/zynqmp/include/platform_def.h +++ b/plat/xilinx/zynqmp/include/platform_def.h @@ -8,9 +8,10 @@ #define PLATFORM_DEF_H #include -#include -#include -#include +#include +#include +#include + #include "../zynqmp_def.h" /******************************************************************************* diff --git a/plat/xilinx/zynqmp/ipi_mailbox_service/ipi_mailbox_svc.c b/plat/xilinx/zynqmp/ipi_mailbox_service/ipi_mailbox_svc.c index bfc19d3397..11f382a053 100644 --- a/plat/xilinx/zynqmp/ipi_mailbox_service/ipi_mailbox_svc.c +++ b/plat/xilinx/zynqmp/ipi_mailbox_service/ipi_mailbox_svc.c @@ -8,12 +8,14 @@ * Top-level SMC handler for ZynqMP IPI Mailbox doorbell functions. */ -#include -#include #include -#include -#include #include + +#include +#include +#include +#include + #include "ipi_mailbox_svc.h" #include "../zynqmp_ipi.h" #include "../zynqmp_private.h" diff --git a/plat/xilinx/zynqmp/plat_psci.c b/plat/xilinx/zynqmp/plat_psci.c index a82f69677d..4183979a2c 100644 --- a/plat/xilinx/zynqmp/plat_psci.c +++ b/plat/xilinx/zynqmp/plat_psci.c @@ -4,15 +4,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include #include -#include -#include + +#include +#include +#include +#include +#include +#include + #include -#include -#include #include "pm_api_sys.h" #include "pm_client.h" #include "zynqmp_private.h" diff --git a/plat/xilinx/zynqmp/plat_startup.c b/plat/xilinx/zynqmp/plat_startup.c index d3e182cac5..03f0e3d82d 100644 --- a/plat/xilinx/zynqmp/plat_startup.c +++ b/plat/xilinx/zynqmp/plat_startup.c @@ -4,10 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include + +#include +#include +#include + #include "zynqmp_def.h" #include "zynqmp_private.h" diff --git a/plat/xilinx/zynqmp/plat_zynqmp.c b/plat/xilinx/zynqmp/plat_zynqmp.c index 2441630bd5..ad18aafc30 100644 --- a/plat/xilinx/zynqmp/plat_zynqmp.c +++ b/plat/xilinx/zynqmp/plat_zynqmp.c @@ -4,7 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include + #include "zynqmp_private.h" int plat_core_pos_by_mpidr(u_register_t mpidr) diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_clock.c b/plat/xilinx/zynqmp/pm_service/pm_api_clock.c index b175b78b3e..04a58b488d 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_api_clock.c +++ b/plat/xilinx/zynqmp/pm_service/pm_api_clock.c @@ -8,11 +8,13 @@ * ZynqMP system level PM-API functions for clock control. */ -#include -#include -#include #include #include + +#include +#include +#include + #include "pm_api_clock.h" #include "pm_api_sys.h" #include "pm_client.h" diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_clock.h b/plat/xilinx/zynqmp/pm_service/pm_api_clock.h index f7cbdbaf08..44e9773d09 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_api_clock.h +++ b/plat/xilinx/zynqmp/pm_service/pm_api_clock.h @@ -11,7 +11,8 @@ #ifndef PM_API_CLOCK_H #define PM_API_CLOCK_H -#include +#include + #include "pm_common.h" #define CLK_NAME_LEN U(15) diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_ioctl.c b/plat/xilinx/zynqmp/pm_service/pm_api_ioctl.c index 16c08ae6d2..fd9d7c0700 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_api_ioctl.c +++ b/plat/xilinx/zynqmp/pm_service/pm_api_ioctl.c @@ -9,9 +9,10 @@ */ #include -#include -#include -#include +#include +#include +#include + #include "pm_api_clock.h" #include "pm_api_ioctl.h" #include "pm_api_sys.h" diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_pinctrl.c b/plat/xilinx/zynqmp/pm_service/pm_api_pinctrl.c index 12b9c2d29c..a900057e81 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_api_pinctrl.c +++ b/plat/xilinx/zynqmp/pm_service/pm_api_pinctrl.c @@ -8,9 +8,11 @@ * ZynqMP system level PM-API functions for pin control. */ -#include -#include #include + +#include +#include + #include "pm_api_pinctrl.h" #include "pm_api_sys.h" #include "pm_client.h" diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_sys.c b/plat/xilinx/zynqmp/pm_service/pm_api_sys.c index e85b2cee33..974dbb3d7d 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_api_sys.c +++ b/plat/xilinx/zynqmp/pm_service/pm_api_sys.c @@ -10,7 +10,8 @@ */ #include -#include +#include + #include "pm_api_clock.h" #include "pm_api_ioctl.h" #include "pm_api_pinctrl.h" diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_sys.h b/plat/xilinx/zynqmp/pm_service/pm_api_sys.h index fee91cdd99..a0040cf8dd 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_api_sys.h +++ b/plat/xilinx/zynqmp/pm_service/pm_api_sys.h @@ -8,6 +8,7 @@ #define PM_API_SYS_H #include + #include "pm_defs.h" enum pm_query_id { diff --git a/plat/xilinx/zynqmp/pm_service/pm_client.c b/plat/xilinx/zynqmp/pm_service/pm_client.c index 874b8a9eac..bebb74ce7f 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_client.c +++ b/plat/xilinx/zynqmp/pm_service/pm_client.c @@ -10,13 +10,15 @@ */ #include -#include -#include -#include -#include -#include #include -#include + +#include +#include +#include +#include +#include +#include + #include "../zynqmp_def.h" #include "pm_api_sys.h" #include "pm_client.h" diff --git a/plat/xilinx/zynqmp/pm_service/pm_common.h b/plat/xilinx/zynqmp/pm_service/pm_common.h index 54746271f6..94e0568f60 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_common.h +++ b/plat/xilinx/zynqmp/pm_service/pm_common.h @@ -12,8 +12,10 @@ #ifndef PM_COMMON_H #define PM_COMMON_H -#include #include + +#include + #include "pm_defs.h" #define PAYLOAD_ARG_CNT 6U diff --git a/plat/xilinx/zynqmp/pm_service/pm_ipi.c b/plat/xilinx/zynqmp/pm_service/pm_ipi.c index dc1ea4d122..b3d833dfe2 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_ipi.c +++ b/plat/xilinx/zynqmp/pm_service/pm_ipi.c @@ -5,9 +5,10 @@ */ #include -#include -#include -#include +#include +#include +#include + #include "../zynqmp_ipi.h" #include "../zynqmp_private.h" #include "pm_ipi.h" diff --git a/plat/xilinx/zynqmp/pm_service/pm_svc_main.c b/plat/xilinx/zynqmp/pm_service/pm_svc_main.c index 7790c979df..c885915528 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_svc_main.c +++ b/plat/xilinx/zynqmp/pm_service/pm_svc_main.c @@ -10,18 +10,20 @@ */ #include -#include + +#include +#if ZYNQMP_WDT_RESTART +#include +#include +#include +#include +#include +#endif + #include "../zynqmp_private.h" #include "pm_api_sys.h" #include "pm_client.h" #include "pm_ipi.h" -#if ZYNQMP_WDT_RESTART -#include -#include -#include -#include -#include -#endif #define PM_SET_SUSPEND_MODE 0xa02 #define PM_GET_TRUSTZONE_VERSION 0xa03 diff --git a/plat/xilinx/zynqmp/sip_svc_setup.c b/plat/xilinx/zynqmp/sip_svc_setup.c index 9fe709db90..8d23a014c5 100644 --- a/plat/xilinx/zynqmp/sip_svc_setup.c +++ b/plat/xilinx/zynqmp/sip_svc_setup.c @@ -6,8 +6,9 @@ /* Top level SMC handler for SiP calls. Dispatch PM calls to PM SMC handler. */ -#include -#include +#include +#include + #include "ipi_mailbox_svc.h" #include "pm_svc_main.h" #include "zynqmp_ipi.h" diff --git a/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c b/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c index a27f34b45b..25359f91aa 100644 --- a/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c +++ b/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c @@ -4,11 +4,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include +#include +#include +#include + #include #include + #include "../zynqmp_private.h" #define BL32_END (unsigned long)(&__BL32_END__) diff --git a/plat/xilinx/zynqmp/zynqmp_def.h b/plat/xilinx/zynqmp/zynqmp_def.h index ba382dd8b2..f75530e7fa 100644 --- a/plat/xilinx/zynqmp/zynqmp_def.h +++ b/plat/xilinx/zynqmp/zynqmp_def.h @@ -7,7 +7,7 @@ #ifndef ZYNQMP_DEF_H #define ZYNQMP_DEF_H -#include +#include #define ZYNQMP_CONSOLE_ID_cadence 1 #define ZYNQMP_CONSOLE_ID_cadence0 1 diff --git a/plat/xilinx/zynqmp/zynqmp_ipi.c b/plat/xilinx/zynqmp/zynqmp_ipi.c index 5038f8477a..54b18380de 100644 --- a/plat/xilinx/zynqmp/zynqmp_ipi.c +++ b/plat/xilinx/zynqmp/zynqmp_ipi.c @@ -8,12 +8,14 @@ * Zynq UltraScale+ MPSoC IPI agent registers access management */ -#include -#include #include -#include -#include #include + +#include +#include +#include +#include + #include "zynqmp_ipi.h" #include "../zynqmp_private.h" diff --git a/plat/xilinx/zynqmp/zynqmp_private.h b/plat/xilinx/zynqmp/zynqmp_private.h index 8a8d38abfe..a8ebcebeeb 100644 --- a/plat/xilinx/zynqmp/zynqmp_private.h +++ b/plat/xilinx/zynqmp/zynqmp_private.h @@ -7,10 +7,11 @@ #ifndef ZYNQMP_PRIVATE_H #define ZYNQMP_PRIVATE_H -#include -#include #include +#include +#include + void zynqmp_config_setup(void); unsigned int zynqmp_calc_core_pos(u_register_t mpidr); diff --git a/services/arm_arch_svc/arm_arch_svc_setup.c b/services/arm_arch_svc/arm_arch_svc_setup.c index 3a5299fdf3..dfbe02cd3c 100644 --- a/services/arm_arch_svc/arm_arch_svc_setup.c +++ b/services/arm_arch_svc/arm_arch_svc_setup.c @@ -4,14 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include static int32_t smccc_version(void) { diff --git a/services/spd/opteed/opteed_common.c b/services/spd/opteed/opteed_common.c index e5e2be77ef..9aa19c5b9c 100644 --- a/services/spd/opteed/opteed_common.c +++ b/services/spd/opteed/opteed_common.c @@ -4,12 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include #include -#include + +#include +#include +#include +#include + #include "opteed_private.h" /******************************************************************************* diff --git a/services/spd/opteed/opteed_main.c b/services/spd/opteed/opteed_main.c index 59d6ed2941..160a693b2c 100644 --- a/services/spd/opteed/opteed_main.c +++ b/services/spd/opteed/opteed_main.c @@ -14,22 +14,23 @@ * handle the request locally or delegate it to the Secure Payload. It is also * responsible for initialising and maintaining communication with the SP. ******************************************************************************/ -#include #include -#include -#include -#include -#include #include -#include -#include #include -#include + +#include +#include +#include +#include +#include +#include +#include +#include + #include "opteed_private.h" #include "teesmc_opteed.h" #include "teesmc_opteed_macros.h" - /******************************************************************************* * Address of the entrypoint vector table in OPTEE. It is * initialised once on the primary core after a cold boot. diff --git a/services/spd/opteed/opteed_pm.c b/services/spd/opteed/opteed_pm.c index b1336517e7..719eeb748d 100644 --- a/services/spd/opteed/opteed_pm.c +++ b/services/spd/opteed/opteed_pm.c @@ -4,12 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include -#include -#include + +#include +#include +#include +#include +#include + #include "opteed_private.h" /******************************************************************************* diff --git a/services/spd/opteed/opteed_private.h b/services/spd/opteed/opteed_private.h index 1a67fce7f6..847b9c5c1a 100644 --- a/services/spd/opteed/opteed_private.h +++ b/services/spd/opteed/opteed_private.h @@ -7,11 +7,12 @@ #ifndef OPTEED_PRIVATE_H #define OPTEED_PRIVATE_H +#include + #include +#include #include -#include -#include -#include +#include /******************************************************************************* * OPTEE PM state information e.g. OPTEE is suspended, uninitialised etc @@ -80,9 +81,10 @@ #ifndef __ASSEMBLY__ -#include #include +#include + typedef uint32_t optee_vector_isn_t; typedef struct optee_vectors { diff --git a/services/spd/opteed/teesmc_opteed_macros.h b/services/spd/opteed/teesmc_opteed_macros.h index 0068dc7316..9d8a1697f9 100644 --- a/services/spd/opteed/teesmc_opteed_macros.h +++ b/services/spd/opteed/teesmc_opteed_macros.h @@ -6,7 +6,7 @@ #ifndef TEESMC_OPTEED_MACROS_H #define TEESMC_OPTEED_MACROS_H -#include +#include #define TEESMC_OPTEED_RV(func_num) \ ((SMC_TYPE_FAST << FUNCID_TYPE_SHIFT) | \ diff --git a/services/spd/tlkd/tlkd_common.c b/services/spd/tlkd/tlkd_common.c index 6fec91bca7..2f0194eb2f 100644 --- a/services/spd/tlkd/tlkd_common.c +++ b/services/spd/tlkd/tlkd_common.c @@ -4,11 +4,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include #include + +#include +#include +#include + #include "tlkd_private.h" #define AT_MASK 3 diff --git a/services/spd/tlkd/tlkd_main.c b/services/spd/tlkd/tlkd_main.c index cee7ef865d..ffe3319ec6 100644 --- a/services/spd/tlkd/tlkd_main.c +++ b/services/spd/tlkd/tlkd_main.c @@ -15,16 +15,18 @@ ******************************************************************************/ #include #include -#include -#include -#include -#include #include -#include -#include #include + +#include +#include +#include +#include +#include +#include +#include + #include -#include #include "tlkd_private.h" extern const spd_pm_ops_t tlkd_pm_ops; diff --git a/services/spd/tlkd/tlkd_pm.c b/services/spd/tlkd/tlkd_pm.c index 2cd2fbbe79..de34bf6b51 100644 --- a/services/spd/tlkd/tlkd_pm.c +++ b/services/spd/tlkd/tlkd_pm.c @@ -4,12 +4,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include -#include -#include + +#include +#include +#include +#include +#include #include #include "tlkd_private.h" diff --git a/services/spd/tlkd/tlkd_private.h b/services/spd/tlkd/tlkd_private.h index 525cc3aec2..53f9e20c30 100644 --- a/services/spd/tlkd/tlkd_private.h +++ b/services/spd/tlkd/tlkd_private.h @@ -7,11 +7,12 @@ #ifndef TLKD_PRIVATE_H #define TLKD_PRIVATE_H +#include + #include +#include #include -#include -#include -#include +#include /* * This flag is used by the TLKD to determine if the SP is servicing a yielding @@ -72,9 +73,10 @@ #ifndef __ASSEMBLY__ -#include #include +#include + /* AArch64 callee saved general purpose register context structure. */ DEFINE_REG_STRUCT(c_rt_regs, TLKD_C_RT_CTX_ENTRIES); diff --git a/services/spd/trusty/generic-arm64-smcall.c b/services/spd/trusty/generic-arm64-smcall.c index 6f766c4db9..771e2cfb60 100644 --- a/services/spd/trusty/generic-arm64-smcall.c +++ b/services/spd/trusty/generic-arm64-smcall.c @@ -4,10 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include +#include +#include + #include "generic-arm64-smcall.h" int trusty_disable_serial_debug; diff --git a/services/spd/trusty/trusty.c b/services/spd/trusty/trusty.c index 3335836225..b6ebeeba4e 100644 --- a/services/spd/trusty/trusty.c +++ b/services/spd/trusty/trusty.c @@ -4,18 +4,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include /* for context_mgmt.h */ -#include -#include -#include -#include -#include -#include -#include +#include #include #include +#include +#include +#include +#include +#include +#include +#include +#include + #include "sm_err.h" #include "smcall.h" diff --git a/services/spd/tspd/tspd_common.c b/services/spd/tspd/tspd_common.c index de54dbe94d..063fd01ff1 100644 --- a/services/spd/tspd/tspd_common.c +++ b/services/spd/tspd/tspd_common.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 + #include "tspd_private.h" /******************************************************************************* diff --git a/services/spd/tspd/tspd_main.c b/services/spd/tspd/tspd_main.c index d2acda8d9e..d2bd43f765 100644 --- a/services/spd/tspd/tspd_main.c +++ b/services/spd/tspd/tspd_main.c @@ -14,20 +14,22 @@ * handle the request locally or delegate it to the Secure Payload. It is also * responsible for initialising and maintaining communication with the SP. ******************************************************************************/ -#include #include -#include -#include -#include -#include -#include #include -#include -#include #include #include -#include -#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "tspd_private.h" /******************************************************************************* diff --git a/services/spd/tspd/tspd_pm.c b/services/spd/tspd/tspd_pm.c index 9414c154e5..b95ee8fbae 100644 --- a/services/spd/tspd/tspd_pm.c +++ b/services/spd/tspd/tspd_pm.c @@ -4,13 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include -#include -#include -#include + +#include +#include +#include +#include +#include +#include + #include "tspd_private.h" /******************************************************************************* diff --git a/services/spd/tspd/tspd_private.h b/services/spd/tspd/tspd_private.h index e2e333d09b..50f3b875e5 100644 --- a/services/spd/tspd/tspd_private.h +++ b/services/spd/tspd/tspd_private.h @@ -7,11 +7,12 @@ #ifndef TSPD_PRIVATE_H #define TSPD_PRIVATE_H +#include + #include +#include #include -#include -#include -#include +#include /******************************************************************************* * Secure Payload PM state information e.g. SP is suspended, uninitialised etc @@ -127,9 +128,10 @@ #ifndef __ASSEMBLY__ -#include #include +#include + /* * The number of arguments to save during a SMC call for TSP. * Currently only x1 and x2 are used by TSP. diff --git a/services/std_svc/sdei/sdei_event.c b/services/std_svc/sdei/sdei_event.c index ec69b9d274..0b608e1b64 100644 --- a/services/std_svc/sdei/sdei_event.c +++ b/services/std_svc/sdei/sdei_event.c @@ -5,7 +5,9 @@ */ #include -#include + +#include + #include "sdei_private.h" #define MAP_OFF(_map, _mapping) ((_map) - (_mapping)->map) diff --git a/services/std_svc/sdei/sdei_intr_mgmt.c b/services/std_svc/sdei/sdei_intr_mgmt.c index fa778c04e9..b8799cd49f 100644 --- a/services/std_svc/sdei/sdei_intr_mgmt.c +++ b/services/std_svc/sdei/sdei_intr_mgmt.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 +#include + #include "sdei_private.h" /* x0-x17 GPREGS context */ diff --git a/services/std_svc/sdei/sdei_main.c b/services/std_svc/sdei/sdei_main.c index 990d028763..0424177641 100644 --- a/services/std_svc/sdei/sdei_main.c +++ b/services/std_svc/sdei/sdei_main.c @@ -6,20 +6,22 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include -#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "sdei_private.h" #define MAJOR_VERSION 1ULL diff --git a/services/std_svc/sdei/sdei_private.h b/services/std_svc/sdei/sdei_private.h index 821266740c..b945394dcf 100644 --- a/services/std_svc/sdei/sdei_private.h +++ b/services/std_svc/sdei/sdei_private.h @@ -7,19 +7,20 @@ #ifndef SDEI_PRIVATE_H #define SDEI_PRIVATE_H -#include -#include -#include -#include #include -#include -#include -#include -#include -#include #include #include -#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef AARCH32 # error SDEI is implemented only for AArch64 systems diff --git a/services/std_svc/sdei/sdei_state.c b/services/std_svc/sdei/sdei_state.c index 66657862d3..1b448e62e8 100644 --- a/services/std_svc/sdei/sdei_state.c +++ b/services/std_svc/sdei/sdei_state.c @@ -5,8 +5,10 @@ */ #include -#include #include + +#include + #include "sdei_private.h" /* Aliases for SDEI handler states: 'R'unning, 'E'nabled, and re'G'istered */ diff --git a/services/std_svc/spm/aarch64/spm_shim_exceptions.S b/services/std_svc/spm/aarch64/spm_shim_exceptions.S index 9c218dfe85..dab6150129 100644 --- a/services/std_svc/spm/aarch64/spm_shim_exceptions.S +++ b/services/std_svc/spm/aarch64/spm_shim_exceptions.S @@ -6,7 +6,7 @@ #include #include -#include +#include #include /* ----------------------------------------------------------------------------- diff --git a/services/std_svc/spm/spci.c b/services/std_svc/spm/spci.c index 5e4ff91839..44a0acd6f9 100644 --- a/services/std_svc/spm/spci.c +++ b/services/std_svc/spm/spci.c @@ -5,17 +5,18 @@ */ #include -#include -#include #include -#include +#include + +#include +#include +#include +#include +#include +#include +#include #include -#include -#include #include -#include -#include -#include #include "spm_private.h" diff --git a/services/std_svc/spm/spm_buffers.c b/services/std_svc/spm/spm_buffers.c index 747337af38..0c26a74bac 100644 --- a/services/std_svc/spm/spm_buffers.c +++ b/services/std_svc/spm/spm_buffers.c @@ -5,9 +5,9 @@ */ #include +#include +#include #include -#include -#include /******************************************************************************* * Secure Service response global array. All the responses to the requests done diff --git a/services/std_svc/spm/spm_main.c b/services/std_svc/spm/spm_main.c index 460d1fb31c..adfffd58c5 100644 --- a/services/std_svc/spm/spm_main.c +++ b/services/std_svc/spm/spm_main.c @@ -4,23 +4,24 @@ * 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 +#include +#include +#include +#include +#include +#include +#include #include "spm_private.h" diff --git a/services/std_svc/spm/spm_private.h b/services/std_svc/spm/spm_private.h index c1aad933a0..1d5a88e88c 100644 --- a/services/std_svc/spm/spm_private.h +++ b/services/std_svc/spm/spm_private.h @@ -34,10 +34,11 @@ #ifndef __ASSEMBLY__ -#include -#include #include -#include + +#include +#include +#include typedef enum sp_state { SP_STATE_RESET = 0, diff --git a/services/std_svc/spm/spm_setup.c b/services/std_svc/spm/spm_setup.c index aca779f5df..3aabc20072 100644 --- a/services/std_svc/spm/spm_setup.c +++ b/services/std_svc/spm/spm_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 #include "spm_private.h" #include "spm_shim_private.h" diff --git a/services/std_svc/spm/spm_shim_private.h b/services/std_svc/spm/spm_shim_private.h index f2a7e052cd..7fe9692b45 100644 --- a/services/std_svc/spm/spm_shim_private.h +++ b/services/std_svc/spm/spm_shim_private.h @@ -8,7 +8,8 @@ #define SPM_SHIM_PRIVATE_H #include -#include + +#include /* Assembly source */ IMPORT_SYM(uintptr_t, spm_shim_exceptions_ptr, SPM_SHIM_EXCEPTIONS_PTR); diff --git a/services/std_svc/spm/spm_xlat.c b/services/std_svc/spm/spm_xlat.c index bbe392ddd3..57ad742453 100644 --- a/services/std_svc/spm/spm_xlat.c +++ b/services/std_svc/spm/spm_xlat.c @@ -8,14 +8,16 @@ #include #include #include -#include -#include -#include -#include #include -#include -#include -#include + +#include + +#include +#include +#include +#include +#include +#include #include "spm_private.h" #include "spm_shim_private.h" diff --git a/services/std_svc/spm/sprt.c b/services/std_svc/spm/sprt.c index 034dced7eb..f6af49fc48 100644 --- a/services/std_svc/spm/sprt.c +++ b/services/std_svc/spm/sprt.c @@ -4,17 +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 -#include #include "spm_private.h" diff --git a/services/std_svc/spm_deprecated/aarch64/spm_shim_exceptions.S b/services/std_svc/spm_deprecated/aarch64/spm_shim_exceptions.S index 9c218dfe85..dab6150129 100644 --- a/services/std_svc/spm_deprecated/aarch64/spm_shim_exceptions.S +++ b/services/std_svc/spm_deprecated/aarch64/spm_shim_exceptions.S @@ -6,7 +6,7 @@ #include #include -#include +#include #include /* ----------------------------------------------------------------------------- diff --git a/services/std_svc/spm_deprecated/spm_main.c b/services/std_svc/spm_deprecated/spm_main.c index 880e86e496..540f257bd3 100644 --- a/services/std_svc/spm_deprecated/spm_main.c +++ b/services/std_svc/spm_deprecated/spm_main.c @@ -6,21 +6,22 @@ #include #include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include -#include -#include #include "spm_private.h" diff --git a/services/std_svc/spm_deprecated/spm_private.h b/services/std_svc/spm_deprecated/spm_private.h index ec3f48ea28..8e94a28246 100644 --- a/services/std_svc/spm_deprecated/spm_private.h +++ b/services/std_svc/spm_deprecated/spm_private.h @@ -31,9 +31,10 @@ #ifndef __ASSEMBLY__ -#include #include -#include + +#include +#include typedef enum sp_state { SP_STATE_RESET = 0, diff --git a/services/std_svc/spm_deprecated/spm_setup.c b/services/std_svc/spm_deprecated/spm_setup.c index 0d61306faf..d458f4a6a2 100644 --- a/services/std_svc/spm_deprecated/spm_setup.c +++ b/services/std_svc/spm_deprecated/spm_setup.c @@ -4,18 +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 +#include +#include #include "spm_private.h" #include "spm_shim_private.h" diff --git a/services/std_svc/spm_deprecated/spm_shim_private.h b/services/std_svc/spm_deprecated/spm_shim_private.h index f2a7e052cd..7fe9692b45 100644 --- a/services/std_svc/spm_deprecated/spm_shim_private.h +++ b/services/std_svc/spm_deprecated/spm_shim_private.h @@ -8,7 +8,8 @@ #define SPM_SHIM_PRIVATE_H #include -#include + +#include /* Assembly source */ IMPORT_SYM(uintptr_t, spm_shim_exceptions_ptr, SPM_SHIM_EXCEPTIONS_PTR); diff --git a/services/std_svc/spm_deprecated/spm_xlat.c b/services/std_svc/spm_deprecated/spm_xlat.c index 3527138600..f54168e334 100644 --- a/services/std_svc/spm_deprecated/spm_xlat.c +++ b/services/std_svc/spm_deprecated/spm_xlat.c @@ -8,11 +8,11 @@ #include #include #include +#include #include -#include -#include -#include -#include +#include +#include +#include #include "spm_private.h" #include "spm_shim_private.h" diff --git a/services/std_svc/std_svc_setup.c b/services/std_svc/std_svc_setup.c index 86ecdf7b89..7a34655fd7 100644 --- a/services/std_svc/std_svc_setup.c +++ b/services/std_svc/std_svc_setup.c @@ -5,18 +5,19 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* Standard Service UUID */ static uuid_t arm_svc_uid = { -- cgit v1.2.3