Sanitise includes across codebase
authorAntonio Nino Diaz <antonio.ninodiaz@arm.com>
Fri, 14 Dec 2018 00:18:21 +0000 (00:18 +0000)
committerAntonio Nino Diaz <antonio.ninodiaz@arm.com>
Fri, 4 Jan 2019 10:43:17 +0000 (10:43 +0000)
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 <antonio.ninodiaz@arm.com>
995 files changed:
Makefile
bl1/aarch32/bl1_context_mgmt.c
bl1/aarch32/bl1_entrypoint.S
bl1/aarch32/bl1_exceptions.S
bl1/aarch64/bl1_context_mgmt.c
bl1/aarch64/bl1_exceptions.S
bl1/bl1.ld.S
bl1/bl1_fwu.c
bl1/bl1_main.c
bl1/bl1_private.h
bl1/tbbr/tbbr_img_desc.c
bl2/aarch32/bl2_el3_entrypoint.S
bl2/aarch32/bl2_el3_exceptions.S
bl2/aarch32/bl2_entrypoint.S
bl2/aarch64/bl2_el3_entrypoint.S
bl2/aarch64/bl2_el3_exceptions.S
bl2/aarch64/bl2_entrypoint.S
bl2/bl2.ld.S
bl2/bl2_el3.ld.S
bl2/bl2_image_load_v2.c
bl2/bl2_main.c
bl2u/aarch32/bl2u_entrypoint.S
bl2u/aarch64/bl2u_entrypoint.S
bl2u/bl2u.ld.S
bl2u/bl2u_main.c
bl31/aarch64/bl31_entrypoint.S
bl31/aarch64/crash_reporting.S
bl31/aarch64/ea_delegate.S
bl31/aarch64/runtime_exceptions.S
bl31/bl31.ld.S
bl31/bl31_context_mgmt.c
bl31/bl31_main.c
bl31/ehf.c
bl31/interrupt_mgmt.c
bl32/sp_min/aarch32/entrypoint.S
bl32/sp_min/sp_min.ld.S
bl32/sp_min/sp_min_main.c
bl32/tsp/aarch64/tsp_entrypoint.S
bl32/tsp/aarch64/tsp_exceptions.S
bl32/tsp/aarch64/tsp_request.S
bl32/tsp/tsp.ld.S
bl32/tsp/tsp_interrupt.c
bl32/tsp/tsp_main.c
bl32/tsp/tsp_private.h
bl32/tsp/tsp_timer.c
common/aarch64/debug.S
common/aarch64/early_exceptions.S
common/backtrace/backtrace.c
common/bl_common.c
common/desc_image_load.c
common/fdt_wrappers.c
common/image_decompress.c
common/runtime_svc.c
common/tf_log.c
docs/exception-handling.rst
drivers/allwinner/sunxi_rsb.c
drivers/arm/cci/cci.c
drivers/arm/ccn/ccn.c
drivers/arm/gic/common/gic_common.c
drivers/arm/gic/common/gic_common_private.h
drivers/arm/gic/v2/gicv2_helpers.c
drivers/arm/gic/v2/gicv2_main.c
drivers/arm/gic/v2/gicv2_private.h
drivers/arm/gic/v3/arm_gicv3_common.c
drivers/arm/gic/v3/gic600.c
drivers/arm/gic/v3/gicv3_helpers.c
drivers/arm/gic/v3/gicv3_main.c
drivers/arm/gic/v3/gicv3_private.h
drivers/arm/pl011/aarch32/pl011_console.S
drivers/arm/pl011/aarch64/pl011_console.S
drivers/arm/pl061/pl061_gpio.c
drivers/arm/smmu/smmu_v3.c
drivers/arm/sp804/sp804_delay_timer.c
drivers/arm/sp805/sp805.c
drivers/arm/tzc/tzc380.c
drivers/arm/tzc/tzc400.c
drivers/arm/tzc/tzc_common_private.h
drivers/arm/tzc/tzc_dmc500.c
drivers/arm/tzc/tzc_dmc620.c
drivers/auth/auth_mod.c
drivers/auth/crypto_mod.c
drivers/auth/cryptocell/cryptocell_crypto.c
drivers/auth/cryptocell/cryptocell_crypto.mk
drivers/auth/img_parser_mod.c
drivers/auth/mbedtls/mbedtls_common.c
drivers/auth/mbedtls/mbedtls_common.mk
drivers/auth/mbedtls/mbedtls_crypto.c
drivers/auth/mbedtls/mbedtls_x509_parser.c
drivers/auth/tbbr/tbbr_cot.c
drivers/cadence/uart/aarch64/cdns_console.S
drivers/cfi/v2m/v2m_flash.c
drivers/console/multi_console.c
drivers/coreboot/cbmem_console/aarch64/cbmem_console.S
drivers/delay_timer/delay_timer.c
drivers/delay_timer/generic_delay_timer.c
drivers/gpio/gpio.c
drivers/imx/timer/imx_gpt.c
drivers/imx/uart/imx_uart.c
drivers/imx/usdhc/imx_usdhc.c
drivers/imx/usdhc/imx_usdhc.h
drivers/io/io_block.c
drivers/io/io_dummy.c
drivers/io/io_fip.c
drivers/io/io_memmap.c
drivers/io/io_semihosting.c
drivers/io/io_storage.c
drivers/marvell/amb_adec.c
drivers/marvell/ap807_clocks_init.c
drivers/marvell/cache_llc.c
drivers/marvell/ccu.c
drivers/marvell/comphy/phy-comphy-3700.c
drivers/marvell/comphy/phy-comphy-cp110.c
drivers/marvell/gwin.c
drivers/marvell/io_win.c
drivers/marvell/iob.c
drivers/marvell/mc_trustzone/mc_trustzone.c
drivers/marvell/mc_trustzone/mc_trustzone.h
drivers/marvell/mci.c
drivers/marvell/mochi/ap807_setup.c
drivers/marvell/mochi/apn806_setup.c
drivers/marvell/mochi/cp110_setup.c
drivers/marvell/thermal.c
drivers/marvell/uart/a3700_console.S
drivers/mentor/i2c/mi2cv.c
drivers/meson/console/aarch64/meson_console.S
drivers/mmc/mmc.c
drivers/partition/gpt.c
drivers/partition/partition.c
drivers/renesas/rcar/auth/auth_mod.c
drivers/renesas/rcar/avs/avs_driver.c
drivers/renesas/rcar/board/board.c
drivers/renesas/rcar/common.c
drivers/renesas/rcar/console/rcar_printf.c
drivers/renesas/rcar/cpld/ulcb_cpld.c
drivers/renesas/rcar/delay/micro_delay.h
drivers/renesas/rcar/dma/dma_driver.c
drivers/renesas/rcar/emmc/emmc_cmd.c
drivers/renesas/rcar/emmc/emmc_init.c
drivers/renesas/rcar/emmc/emmc_interrupt.c
drivers/renesas/rcar/emmc/emmc_mount.c
drivers/renesas/rcar/emmc/emmc_read.c
drivers/renesas/rcar/emmc/emmc_utility.c
drivers/renesas/rcar/iic_dvfs/iic_dvfs.c
drivers/renesas/rcar/io/io_emmcdrv.c
drivers/renesas/rcar/io/io_memdrv.c
drivers/renesas/rcar/io/io_rcar.c
drivers/renesas/rcar/pwrc/pwrc.c
drivers/renesas/rcar/rom/rom_api.c
drivers/renesas/rcar/rpc/rpc_driver.c
drivers/renesas/rcar/watchdog/swdt.c
drivers/st/clk/stm32mp1_clk.c
drivers/st/clk/stm32mp1_clkfunc.c
drivers/st/ddr/stm32mp1_ddr.c
drivers/st/ddr/stm32mp1_ddr_helpers.c
drivers/st/ddr/stm32mp1_ram.c
drivers/st/gpio/stm32_gpio.c
drivers/st/io/io_mmc.c
drivers/st/io/io_stm32image.c
drivers/st/mmc/stm32_sdmmc2.c
drivers/st/pmic/stm32_i2c.c
drivers/st/pmic/stm32mp1_pmic.c
drivers/st/pmic/stpmu1.c
drivers/st/reset/stm32mp1_reset.c
drivers/st/uart/aarch32/stm32_console.S
drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c
drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram.c
drivers/staging/renesas/rcar/ddr/dram_sub_func.c
drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.c
drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.c
drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.c
drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.c
drivers/staging/renesas/rcar/pfc/M3N/pfc_init_m3n.c
drivers/staging/renesas/rcar/pfc/pfc_init.c
drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10.c
drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v10.c
drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v11.c
drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20.c
drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30.c
drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30.c
drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v10.c
drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11.c
drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.c
drivers/staging/renesas/rcar/qos/qos_init.c
drivers/synopsys/emmc/dw_mmc.c
drivers/synopsys/ufs/dw_ufs.c
drivers/ti/uart/aarch64/16550_console.S
drivers/ufs/ufs.c
include/arch/aarch32/arch.h
include/arch/aarch32/arch_helpers.h
include/arch/aarch32/asm_macros.S
include/arch/aarch32/console_macros.S
include/arch/aarch32/smccc_helpers.h
include/arch/aarch64/arch.h
include/arch/aarch64/arch_helpers.h
include/arch/aarch64/asm_macros.S
include/arch/aarch64/console_macros.S
include/arch/aarch64/smccc_helpers.h
include/bl1/bl1.h
include/bl1/tbbr/tbbr_img_desc.h
include/bl31/ehf.h
include/bl31/interrupt_mgmt.h
include/bl32/payloads/tlk.h
include/common/bl_common.h
include/common/debug.h
include/common/desc_image_load.h
include/common/ep_info.h
include/common/param_header.h
include/common/runtime_svc.h
include/common/tbbr/tbbr_img_def.h
include/drivers/arm/cci.h
include/drivers/arm/gic_common.h
include/drivers/arm/gicv2.h
include/drivers/arm/gicv3.h
include/drivers/arm/pl011.h
include/drivers/arm/pl061_gpio.h
include/drivers/arm/smmu_v3.h
include/drivers/arm/sp804_delay_timer.h
include/drivers/arm/sp805.h
include/drivers/arm/tzc380.h
include/drivers/arm/tzc400.h
include/drivers/arm/tzc_common.h
include/drivers/arm/tzc_dmc500.h
include/drivers/arm/tzc_dmc620.h
include/drivers/auth/auth_mod.h
include/drivers/auth/img_parser_mod.h
include/drivers/cadence/cdns_uart.h
include/drivers/console.h
include/drivers/console_assertions.h
include/drivers/coreboot/cbmem_console.h
include/drivers/io/io_block.h
include/drivers/io/io_driver.h
include/drivers/io/io_storage.h
include/drivers/marvell/ccu.h
include/drivers/marvell/gwin.h
include/drivers/marvell/io_win.h
include/drivers/marvell/iob.h
include/drivers/marvell/mochi/cp110_setup.h
include/drivers/marvell/uart/a3700_console.h
include/drivers/meson/meson_console.h
include/drivers/mmc.h
include/drivers/partition/gpt.h
include/drivers/partition/partition.h
include/drivers/st/io_mmc.h
include/drivers/st/io_stm32image.h
include/drivers/st/stm32_console.h
include/drivers/st/stm32_gpio.h
include/drivers/st/stm32_i2c.h
include/drivers/st/stm32_sdmmc2.h
include/drivers/st/stm32_uart_regs.h
include/drivers/st/stm32mp1_clk.h
include/drivers/st/stm32mp1_clkfunc.h
include/drivers/st/stm32mp1_ddr_regs.h
include/drivers/st/stm32mp1_pmic.h
include/drivers/st/stm32mp1_pwr.h
include/drivers/st/stm32mp1_rcc.h
include/drivers/st/stpmu1.h
include/drivers/synopsys/dw_mmc.h
include/drivers/ti/uart/uart_16550.h
include/drivers/ufs.h
include/lib/bakery_lock.h
include/lib/cpus/aarch32/cortex_a57.h
include/lib/cpus/aarch32/cortex_a72.h
include/lib/cpus/aarch32/cpu_macros.S
include/lib/cpus/aarch64/cortex_a57.h
include/lib/cpus/aarch64/cortex_a72.h
include/lib/cpus/aarch64/cortex_a75.h
include/lib/cpus/aarch64/cortex_ares.h
include/lib/cpus/aarch64/cpu_macros.S
include/lib/cpus/aarch64/dsu_def.h
include/lib/cpus/errata_report.h
include/lib/el3_runtime/aarch32/context.h
include/lib/el3_runtime/aarch64/context.h
include/lib/el3_runtime/context_mgmt.h
include/lib/el3_runtime/cpu_data.h
include/lib/el3_runtime/pubsub.h
include/lib/el3_runtime/pubsub_events.h
include/lib/extensions/amu.h
include/lib/extensions/ras.h
include/lib/extensions/ras_arch.h
include/lib/libc/assert.h
include/lib/object_pool.h
include/lib/optee_utils.h
include/lib/pmf/pmf.h
include/lib/pmf/pmf_helpers.h
include/lib/psci/psci.h
include/lib/psci/psci_lib.h
include/lib/runtime_instr.h
include/lib/smccc.h
include/lib/utils.h
include/lib/xlat_tables/aarch32/xlat_tables_aarch32.h
include/lib/xlat_tables/aarch64/xlat_tables_aarch64.h
include/lib/xlat_tables/xlat_tables.h
include/lib/xlat_tables/xlat_tables_compat.h
include/lib/xlat_tables/xlat_tables_defs.h
include/lib/xlat_tables/xlat_tables_v2.h
include/lib/xlat_tables/xlat_tables_v2_helpers.h
include/plat/arm/board/common/board_css_def.h
include/plat/arm/board/common/v2m_def.h
include/plat/arm/common/aarch64/arm_macros.S
include/plat/arm/common/aarch64/cci_macros.S
include/plat/arm/common/arm_config.h
include/plat/arm/common/arm_def.h
include/plat/arm/common/arm_sip_svc.h
include/plat/arm/common/arm_spm_def.h
include/plat/arm/common/arm_tzc_dram.ld.S
include/plat/arm/common/plat_arm.h
include/plat/arm/css/common/css_def.h
include/plat/arm/css/common/css_pm.h
include/plat/arm/soc/common/soc_css_def.h
include/plat/common/common_def.h
include/plat/common/platform.h
include/plat/marvell/a3700/common/armada_common.h
include/plat/marvell/a3700/common/marvell_def.h
include/plat/marvell/a3700/common/plat_marvell.h
include/plat/marvell/a8k/common/armada_common.h
include/plat/marvell/a8k/common/marvell_def.h
include/plat/marvell/a8k/common/plat_marvell.h
include/plat/marvell/common/aarch64/cci_macros.S
include/plat/marvell/common/aarch64/marvell_macros.S
include/plat/marvell/common/marvell_plat_priv.h
include/services/mm_svc.h
include/services/sdei.h
include/services/secure_partition.h
include/services/sp_res_desc.h
include/services/sp_res_desc_def.h
include/services/spci_svc.h
include/services/spm_svc.h
include/services/sprt_svc.h
include/tools_share/firmware_image_package.h
lib/aarch64/misc_helpers.S
lib/coreboot/coreboot.mk
lib/coreboot/coreboot_table.c
lib/cpus/aarch32/cortex_a53.S
lib/cpus/aarch32/cortex_a57.S
lib/cpus/aarch32/cortex_a72.S
lib/cpus/aarch32/cpu_helpers.S
lib/cpus/aarch64/cortex_a35.S
lib/cpus/aarch64/cortex_a53.S
lib/cpus/aarch64/cortex_a55.S
lib/cpus/aarch64/cortex_a57.S
lib/cpus/aarch64/cortex_a73.S
lib/cpus/aarch64/cortex_a75_pubsub.c
lib/cpus/aarch64/cortex_a76.S
lib/cpus/aarch64/cortex_ares_pubsub.c
lib/cpus/aarch64/cortex_deimos.S
lib/cpus/aarch64/cortex_helios.S
lib/cpus/aarch64/cpu_helpers.S
lib/cpus/aarch64/cpuamu.c
lib/cpus/aarch64/dsu_helpers.S
lib/cpus/aarch64/wa_cve_2017_5715_bpiall.S
lib/cpus/aarch64/wa_cve_2017_5715_mmu.S
lib/cpus/errata_report.c
lib/el3_runtime/aarch32/context_mgmt.c
lib/el3_runtime/aarch32/cpu_data.S
lib/el3_runtime/aarch64/context_mgmt.c
lib/el3_runtime/aarch64/cpu_data.S
lib/el3_runtime/cpu_data_array.c
lib/extensions/amu/aarch32/amu.c
lib/extensions/amu/aarch64/amu.c
lib/extensions/mpam/mpam.c
lib/extensions/ras/ras_common.c
lib/extensions/ras/std_err_record.c
lib/extensions/spe/spe.c
lib/extensions/sve/sve.c
lib/libc/abort.c
lib/libc/assert.c
lib/libc/printf.c
lib/libc/putchar.c
lib/libc/snprintf.c
lib/locks/bakery/bakery_lock_coherent.c
lib/locks/bakery/bakery_lock_normal.c
lib/optee/optee_utils.c
lib/pmf/pmf_main.c
lib/pmf/pmf_smc.c
lib/psci/aarch32/psci_helpers.S
lib/psci/aarch64/psci_helpers.S
lib/psci/psci_common.c
lib/psci/psci_main.c
lib/psci/psci_mem_protect.c
lib/psci/psci_off.c
lib/psci/psci_on.c
lib/psci/psci_private.h
lib/psci/psci_setup.c
lib/psci/psci_stat.c
lib/psci/psci_suspend.c
lib/psci/psci_system_off.c
lib/romlib/romlib.ld.S
lib/semihosting/semihosting.c
lib/stack_protector/stack_protector.c
lib/utils/mem_region.c
lib/xlat_tables/aarch32/xlat_tables.c
lib/xlat_tables/aarch64/xlat_tables.c
lib/xlat_tables/xlat_tables_common.c
lib/xlat_tables/xlat_tables_private.h
lib/xlat_tables_v2/aarch32/enable_mmu.S
lib/xlat_tables_v2/aarch32/xlat_tables_arch.c
lib/xlat_tables_v2/aarch64/enable_mmu.S
lib/xlat_tables_v2/aarch64/xlat_tables_arch.c
lib/xlat_tables_v2/xlat_tables_context.c
lib/xlat_tables_v2/xlat_tables_core.c
lib/xlat_tables_v2/xlat_tables_private.h
lib/xlat_tables_v2/xlat_tables_utils.c
lib/zlib/tf_gunzip.c
plat/allwinner/common/include/platform_def.h
plat/allwinner/common/sunxi_bl31_setup.c
plat/allwinner/common/sunxi_common.c
plat/allwinner/common/sunxi_cpu_ops.c
plat/allwinner/common/sunxi_pm.c
plat/allwinner/common/sunxi_security.c
plat/allwinner/common/sunxi_topology.c
plat/allwinner/sun50i_a64/sunxi_power.c
plat/allwinner/sun50i_h6/sunxi_power.c
plat/arm/board/common/aarch32/board_arm_helpers.S
plat/arm/board/common/aarch64/board_arm_helpers.S
plat/arm/board/common/board_arm_trusted_boot.c
plat/arm/board/common/board_common.mk
plat/arm/board/fvp/aarch64/fvp_helpers.S
plat/arm/board/fvp/aarch64/fvp_ras.c
plat/arm/board/fvp/drivers/pwrc/fvp_pwrc.c
plat/arm/board/fvp/fvp_bl1_setup.c
plat/arm/board/fvp/fvp_bl2_setup.c
plat/arm/board/fvp/fvp_bl2u_setup.c
plat/arm/board/fvp/fvp_bl31_setup.c
plat/arm/board/fvp/fvp_common.c
plat/arm/board/fvp/fvp_def.h
plat/arm/board/fvp/fvp_io_storage.c
plat/arm/board/fvp/fvp_pm.c
plat/arm/board/fvp/fvp_stack_protector.c
plat/arm/board/fvp/fvp_topology.c
plat/arm/board/fvp/fvp_trusted_boot.c
plat/arm/board/fvp/include/platform_def.h
plat/arm/board/juno/aarch32/juno_helpers.S
plat/arm/board/juno/aarch64/juno_helpers.S
plat/arm/board/juno/include/platform_def.h
plat/arm/board/juno/juno_bl1_setup.c
plat/arm/board/juno/juno_bl2_setup.c
plat/arm/board/juno/juno_def.h
plat/arm/board/juno/juno_err.c
plat/arm/board/juno/juno_security.c
plat/arm/board/juno/juno_stack_protector.c
plat/arm/board/juno/juno_topology.c
plat/arm/board/juno/juno_trng.c
plat/arm/board/n1sdp/n1sdp_bl31_setup.c
plat/arm/board/n1sdp/n1sdp_plat.c
plat/arm/board/sgi575/include/platform_def.h
plat/arm/board/sgi575/sgi575_plat.c
plat/arm/board/sgi575/sgi575_security.c
plat/arm/board/sgiclarka/include/platform_def.h
plat/arm/board/sgiclarka/sgiclarka_plat.c
plat/arm/board/sgiclarka/sgiclarka_security.c
plat/arm/board/sgiclarkh/include/platform_def.h
plat/arm/board/sgiclarkh/sgiclarkh_plat.c
plat/arm/board/sgiclarkh/sgiclarkh_security.c
plat/arm/common/aarch32/arm_bl2_mem_params_desc.c
plat/arm/common/aarch64/arm_bl2_mem_params_desc.c
plat/arm/common/aarch64/arm_ehf.c
plat/arm/common/aarch64/arm_sdei.c
plat/arm/common/arm_bl1_fwu.c
plat/arm/common/arm_bl1_setup.c
plat/arm/common/arm_bl2_el3_setup.c
plat/arm/common/arm_bl2_setup.c
plat/arm/common/arm_bl2u_setup.c
plat/arm/common/arm_bl31_setup.c
plat/arm/common/arm_cci.c
plat/arm/common/arm_ccn.c
plat/arm/common/arm_common.c
plat/arm/common/arm_console.c
plat/arm/common/arm_dyn_cfg.c
plat/arm/common/arm_dyn_cfg_helpers.c
plat/arm/common/arm_err.c
plat/arm/common/arm_gicv2.c
plat/arm/common/arm_gicv3.c
plat/arm/common/arm_image_load.c
plat/arm/common/arm_io_storage.c
plat/arm/common/arm_nor_psci_mem_protect.c
plat/arm/common/arm_pm.c
plat/arm/common/arm_sip_svc.c
plat/arm/common/arm_topology.c
plat/arm/common/arm_tzc400.c
plat/arm/common/arm_tzc_dmc500.c
plat/arm/common/execution_state_switch.c
plat/arm/common/sp_min/arm_sp_min_setup.c
plat/arm/common/tsp/arm_tsp_setup.c
plat/arm/css/common/css_bl1_setup.c
plat/arm/css/common/css_bl2_setup.c
plat/arm/css/common/css_bl2u_setup.c
plat/arm/css/common/css_pm.c
plat/arm/css/common/css_topology.c
plat/arm/css/drivers/mhu/css_mhu.c
plat/arm/css/drivers/mhu/css_mhu_doorbell.c
plat/arm/css/drivers/mhu/css_mhu_doorbell.h
plat/arm/css/drivers/scmi/scmi.h
plat/arm/css/drivers/scmi/scmi_ap_core_proto.c
plat/arm/css/drivers/scmi/scmi_common.c
plat/arm/css/drivers/scmi/scmi_pwr_dmn_proto.c
plat/arm/css/drivers/scmi/scmi_sys_pwr_proto.c
plat/arm/css/drivers/scp/css_bom_bootloader.c
plat/arm/css/drivers/scp/css_pm_scmi.c
plat/arm/css/drivers/scp/css_pm_scpi.c
plat/arm/css/drivers/scp/css_scp.h
plat/arm/css/drivers/scp/css_sds.c
plat/arm/css/drivers/scpi/css_scpi.c
plat/arm/css/drivers/sds/sds.c
plat/arm/css/sgi/include/sgi_base_platform_def.h
plat/arm/css/sgi/sgi_bl31_setup.c
plat/arm/css/sgi/sgi_image_load.c
plat/arm/css/sgi/sgi_interconnect.c
plat/arm/css/sgi/sgi_plat.c
plat/arm/css/sgi/sgi_ras.c
plat/arm/css/sgm/include/sgm_base_platform_def.h
plat/arm/css/sgm/include/sgm_plat_config.h
plat/arm/css/sgm/sgm_bl1_setup.c
plat/arm/css/sgm/sgm_bl31_setup.c
plat/arm/css/sgm/sgm_mmap_config.c
plat/arm/css/sgm/sgm_plat_config.c
plat/arm/css/sgm/sgm_security.c
plat/arm/soc/common/soc_css_security.c
plat/common/aarch32/crash_console_helpers.S
plat/common/aarch32/plat_common.c
plat/common/aarch32/plat_sp_min_common.c
plat/common/aarch64/crash_console_helpers.S
plat/common/aarch64/plat_common.c
plat/common/aarch64/platform_helpers.S
plat/common/plat_bl1_common.c
plat/common/plat_bl_common.c
plat/common/plat_gicv2.c
plat/common/plat_gicv3.c
plat/common/plat_log_common.c
plat/common/plat_psci_common.c
plat/common/plat_spm_rd.c
plat/common/plat_spm_sp.c
plat/common/tbbr/plat_tbbr.c
plat/hisilicon/hikey/aarch64/hikey_common.c
plat/hisilicon/hikey/hikey_bl1_setup.c
plat/hisilicon/hikey/hikey_bl2_mem_params_desc.c
plat/hisilicon/hikey/hikey_bl2_setup.c
plat/hisilicon/hikey/hikey_bl31_setup.c
plat/hisilicon/hikey/hikey_bl_common.c
plat/hisilicon/hikey/hikey_ddr.c
plat/hisilicon/hikey/hikey_image_load.c
plat/hisilicon/hikey/hikey_io_storage.c
plat/hisilicon/hikey/hikey_pm.c
plat/hisilicon/hikey/hikey_private.h
plat/hisilicon/hikey/hikey_security.c
plat/hisilicon/hikey/hikey_tbbr.c
plat/hisilicon/hikey/hikey_topology.c
plat/hisilicon/hikey/hisi_dvfs.c
plat/hisilicon/hikey/hisi_ipc.c
plat/hisilicon/hikey/hisi_mcu.c
plat/hisilicon/hikey/hisi_pwrc.c
plat/hisilicon/hikey/hisi_sip_svc.c
plat/hisilicon/hikey/include/hi6553.h
plat/hisilicon/hikey/include/plat_macros.S
plat/hisilicon/hikey/include/platform_def.h
plat/hisilicon/hikey/platform.mk
plat/hisilicon/hikey960/aarch64/hikey960_common.c
plat/hisilicon/hikey960/drivers/ipc/hisi_ipc.c
plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.c
plat/hisilicon/hikey960/hikey960_bl1_setup.c
plat/hisilicon/hikey960/hikey960_bl2_mem_params_desc.c
plat/hisilicon/hikey960/hikey960_bl2_setup.c
plat/hisilicon/hikey960/hikey960_bl31_setup.c
plat/hisilicon/hikey960/hikey960_bl_common.c
plat/hisilicon/hikey960/hikey960_boardid.c
plat/hisilicon/hikey960/hikey960_def.h
plat/hisilicon/hikey960/hikey960_image_load.c
plat/hisilicon/hikey960/hikey960_io_storage.c
plat/hisilicon/hikey960/hikey960_mcu_load.c
plat/hisilicon/hikey960/hikey960_pm.c
plat/hisilicon/hikey960/hikey960_private.h
plat/hisilicon/hikey960/hikey960_tbbr.c
plat/hisilicon/hikey960/hikey960_topology.c
plat/hisilicon/hikey960/include/plat_macros.S
plat/hisilicon/hikey960/include/platform_def.h
plat/hisilicon/poplar/aarch64/platform_common.c
plat/hisilicon/poplar/bl1_plat_setup.c
plat/hisilicon/poplar/bl2_plat_mem_params_desc.c
plat/hisilicon/poplar/bl2_plat_setup.c
plat/hisilicon/poplar/bl31_plat_setup.c
plat/hisilicon/poplar/include/hi3798cv200.h
plat/hisilicon/poplar/include/plat_private.h
plat/hisilicon/poplar/include/platform_def.h
plat/hisilicon/poplar/plat_pm.c
plat/hisilicon/poplar/plat_storage.c
plat/hisilicon/poplar/plat_topology.c
plat/hisilicon/poplar/platform.mk
plat/hisilicon/poplar/poplar_gicv2.c
plat/hisilicon/poplar/poplar_image_load.c
plat/imx/common/imx8_psci.c
plat/imx/common/imx8_topology.c
plat/imx/common/imx_aips.c
plat/imx/common/imx_caam.c
plat/imx/common/imx_clock.c
plat/imx/common/imx_csu.c
plat/imx/common/imx_io_mux.c
plat/imx/common/imx_snvs.c
plat/imx/common/imx_wdog.c
plat/imx/common/include/imx8_lpuart.h
plat/imx/common/include/imx_snvs.h
plat/imx/common/include/imx_uart.h
plat/imx/common/include/imx_wdog.h
plat/imx/common/include/plat_imx8.h
plat/imx/common/include/sci/sci_rpc.h
plat/imx/common/plat_imx8_gic.c
plat/imx/common/sci/imx8_mu.c
plat/imx/common/sci/ipc.c
plat/imx/common/sci/svc/pad/pad_rpc_clnt.c
plat/imx/common/sci/svc/pm/pm_rpc_clnt.c
plat/imx/common/sci/svc/rm/rm_rpc_clnt.c
plat/imx/imx7/warp7/include/platform_def.h
plat/imx/imx7/warp7/warp7_bl2_el3_setup.c
plat/imx/imx7/warp7/warp7_bl2_mem_params_desc.c
plat/imx/imx7/warp7/warp7_image_load.c
plat/imx/imx7/warp7/warp7_io_storage.c
plat/imx/imx8m/imx8mq/gpc.c
plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c
plat/imx/imx8m/imx8mq/imx8mq_psci.c
plat/imx/imx8qm/imx8qm_bl31_setup.c
plat/imx/imx8qm/imx8qm_psci.c
plat/imx/imx8qm/include/platform_def.h
plat/imx/imx8qx/imx8qx_bl31_setup.c
plat/imx/imx8qx/imx8qx_psci.c
plat/imx/imx8qx/include/platform_def.h
plat/layerscape/board/ls1043/include/ls_def.h
plat/layerscape/board/ls1043/include/platform_def.h
plat/layerscape/board/ls1043/ls1043_bl1_setup.c
plat/layerscape/board/ls1043/ls1043_bl2_setup.c
plat/layerscape/board/ls1043/ls1043_bl31_setup.c
plat/layerscape/board/ls1043/ls1043_err.c
plat/layerscape/board/ls1043/ls1043_psci.c
plat/layerscape/board/ls1043/ls1043_stack_protector.c
plat/layerscape/board/ls1043/ls1043_topology.c
plat/layerscape/board/ls1043/ls_gic.c
plat/layerscape/board/ls1043/platform.mk
plat/layerscape/common/aarch64/ls_bl2_mem_params_desc.c
plat/layerscape/common/aarch64/ls_helpers.S
plat/layerscape/common/include/ls_16550.h
plat/layerscape/common/include/plat_ls.h
plat/layerscape/common/ls_bl1_setup.c
plat/layerscape/common/ls_bl2_setup.c
plat/layerscape/common/ls_bl31_setup.c
plat/layerscape/common/ls_common.c
plat/layerscape/common/ls_image_load.c
plat/layerscape/common/ls_io_storage.c
plat/layerscape/common/ls_timer.c
plat/layerscape/common/ls_tzc380.c
plat/layerscape/common/ns_access.c
plat/layerscape/common/tsp/ls_tsp_setup.c
plat/marvell/a3700/a3700/board/pm_src.c
plat/marvell/a3700/a3700/plat_bl31_setup.c
plat/marvell/a3700/common/a3700_common.mk
plat/marvell/a3700/common/a3700_sip_svc.c
plat/marvell/a3700/common/dram_win.c
plat/marvell/a3700/common/include/dram_win.h
plat/marvell/a3700/common/include/platform_def.h
plat/marvell/a3700/common/io_addr_dec.c
plat/marvell/a3700/common/marvell_plat_config.c
plat/marvell/a3700/common/plat_pm.c
plat/marvell/a8k/a70x0/board/dram_port.c
plat/marvell/a8k/a70x0_amc/board/dram_port.c
plat/marvell/a8k/a80x0/board/dram_port.c
plat/marvell/a8k/a80x0_mcbin/board/dram_port.c
plat/marvell/a8k/a80x0_mcbin/board/marvell_plat_config.c
plat/marvell/a8k/common/a8k_common.mk
plat/marvell/a8k/common/aarch64/plat_arch_config.c
plat/marvell/a8k/common/ble/ble.mk
plat/marvell/a8k/common/ble/ble_main.c
plat/marvell/a8k/common/include/platform_def.h
plat/marvell/a8k/common/mss/mss_bl2_setup.c
plat/marvell/a8k/common/mss/mss_pm_ipc.c
plat/marvell/a8k/common/plat_bl1_setup.c
plat/marvell/a8k/common/plat_bl31_setup.c
plat/marvell/a8k/common/plat_ble_setup.c
plat/marvell/a8k/common/plat_pm.c
plat/marvell/a8k/common/plat_pm_trace.c
plat/marvell/a8k/common/plat_thermal.c
plat/marvell/common/aarch64/marvell_bl2_mem_params_desc.c
plat/marvell/common/aarch64/marvell_common.c
plat/marvell/common/aarch64/marvell_helpers.S
plat/marvell/common/marvell_bl1_setup.c
plat/marvell/common/marvell_bl2_setup.c
plat/marvell/common/marvell_bl31_setup.c
plat/marvell/common/marvell_cci.c
plat/marvell/common/marvell_console.c
plat/marvell/common/marvell_ddr_info.c
plat/marvell/common/marvell_gicv2.c
plat/marvell/common/marvell_gicv3.c
plat/marvell/common/marvell_image_load.c
plat/marvell/common/marvell_io_storage.c
plat/marvell/common/marvell_pm.c
plat/marvell/common/mrvl_sip_svc.c
plat/marvell/common/mss/mss_ipc_drv.c
plat/marvell/common/mss/mss_ipc_drv.h
plat/marvell/common/mss/mss_scp_bootloader.c
plat/marvell/common/plat_delay_timer.c
plat/mediatek/common/custom/oem_svc.c
plat/mediatek/common/mtk_plat_common.c
plat/mediatek/common/mtk_plat_common.h
plat/mediatek/common/mtk_sip_svc.c
plat/mediatek/mt6795/bl31.ld.S
plat/mediatek/mt6795/bl31_plat_setup.c
plat/mediatek/mt6795/drivers/timer/mt_cpuxgpt.c
plat/mediatek/mt6795/include/mcucfg.h
plat/mediatek/mt6795/include/plat_macros.S
plat/mediatek/mt6795/include/plat_private.h
plat/mediatek/mt6795/include/platform_def.h
plat/mediatek/mt6795/plat_delay_timer.c
plat/mediatek/mt6795/plat_mt_gic.c
plat/mediatek/mt6795/plat_pm.c
plat/mediatek/mt6795/plat_topology.c
plat/mediatek/mt6795/power_tracer.c
plat/mediatek/mt6795/scu.c
plat/mediatek/mt8173/aarch64/platform_common.c
plat/mediatek/mt8173/bl31_plat_setup.c
plat/mediatek/mt8173/drivers/crypt/crypt.c
plat/mediatek/mt8173/drivers/mtcmos/mtcmos.c
plat/mediatek/mt8173/drivers/pmic/pmic_wrap_init.c
plat/mediatek/mt8173/drivers/rtc/rtc.c
plat/mediatek/mt8173/drivers/spm/spm.c
plat/mediatek/mt8173/drivers/spm/spm_hotplug.c
plat/mediatek/mt8173/drivers/spm/spm_mcdi.c
plat/mediatek/mt8173/drivers/spm/spm_suspend.c
plat/mediatek/mt8173/drivers/timer/mt_cpuxgpt.c
plat/mediatek/mt8173/include/mcucfg.h
plat/mediatek/mt8173/include/plat_macros.S
plat/mediatek/mt8173/include/platform_def.h
plat/mediatek/mt8173/plat_mt_gic.c
plat/mediatek/mt8173/plat_pm.c
plat/mediatek/mt8173/plat_sip_calls.c
plat/mediatek/mt8173/plat_topology.c
plat/mediatek/mt8173/power_tracer.c
plat/mediatek/mt8173/scu.c
plat/meson/gxbb/gxbb_bl31_setup.c
plat/meson/gxbb/gxbb_common.c
plat/meson/gxbb/gxbb_def.h
plat/meson/gxbb/gxbb_mhu.c
plat/meson/gxbb/gxbb_pm.c
plat/meson/gxbb/gxbb_scpi.c
plat/meson/gxbb/gxbb_sip_svc.c
plat/meson/gxbb/gxbb_topology.c
plat/meson/gxbb/include/plat_macros.S
plat/meson/gxbb/include/platform_def.h
plat/meson/gxbb/platform.mk
plat/nvidia/tegra/common/drivers/flowctrl/flowctrl.c
plat/nvidia/tegra/common/drivers/memctrl/memctrl_v1.c
plat/nvidia/tegra/common/drivers/memctrl/memctrl_v2.c
plat/nvidia/tegra/common/drivers/pmc/pmc.c
plat/nvidia/tegra/common/drivers/smmu/smmu.c
plat/nvidia/tegra/common/tegra_bl31_setup.c
plat/nvidia/tegra/common/tegra_delay_timer.c
plat/nvidia/tegra/common/tegra_fiq_glue.c
plat/nvidia/tegra/common/tegra_gicv2.c
plat/nvidia/tegra/common/tegra_platform.c
plat/nvidia/tegra/common/tegra_pm.c
plat/nvidia/tegra/common/tegra_sip_calls.c
plat/nvidia/tegra/common/tegra_topology.c
plat/nvidia/tegra/include/drivers/flowctrl.h
plat/nvidia/tegra/include/drivers/mce.h
plat/nvidia/tegra/include/drivers/memctrl_v1.h
plat/nvidia/tegra/include/drivers/memctrl_v2.h
plat/nvidia/tegra/include/drivers/pmc.h
plat/nvidia/tegra/include/drivers/smmu.h
plat/nvidia/tegra/include/drivers/tegra_gic.h
plat/nvidia/tegra/include/platform_def.h
plat/nvidia/tegra/include/t132/tegra_def.h
plat/nvidia/tegra/include/t186/tegra_def.h
plat/nvidia/tegra/include/t210/tegra_def.h
plat/nvidia/tegra/include/tegra_private.h
plat/nvidia/tegra/soc/t132/plat_psci_handlers.c
plat/nvidia/tegra/soc/t132/plat_secondary.c
plat/nvidia/tegra/soc/t132/plat_setup.c
plat/nvidia/tegra/soc/t132/plat_sip_calls.c
plat/nvidia/tegra/soc/t186/drivers/include/mce_private.h
plat/nvidia/tegra/soc/t186/drivers/mce/ari.c
plat/nvidia/tegra/soc/t186/drivers/mce/mce.c
plat/nvidia/tegra/soc/t186/drivers/mce/nvg.c
plat/nvidia/tegra/soc/t186/plat_memctrl.c
plat/nvidia/tegra/soc/t186/plat_psci_handlers.c
plat/nvidia/tegra/soc/t186/plat_secondary.c
plat/nvidia/tegra/soc/t186/plat_setup.c
plat/nvidia/tegra/soc/t186/plat_sip_calls.c
plat/nvidia/tegra/soc/t186/plat_smmu.c
plat/nvidia/tegra/soc/t186/plat_trampoline.S
plat/nvidia/tegra/soc/t210/plat_psci_handlers.c
plat/nvidia/tegra/soc/t210/plat_secondary.c
plat/nvidia/tegra/soc/t210/plat_setup.c
plat/qemu/dt.c
plat/qemu/include/platform_def.h
plat/qemu/qemu_bl1_setup.c
plat/qemu/qemu_bl2_mem_params_desc.c
plat/qemu/qemu_bl2_setup.c
plat/qemu/qemu_bl31_setup.c
plat/qemu/qemu_common.c
plat/qemu/qemu_console.c
plat/qemu/qemu_image_load.c
plat/qemu/qemu_io_storage.c
plat/qemu/qemu_pm.c
plat/qemu/qemu_stack_protector.c
plat/qemu/qemu_trusted_boot.c
plat/qemu/sp_min/sp_min_setup.c
plat/qemu/topology.c
plat/renesas/rcar/aarch64/plat_helpers.S
plat/renesas/rcar/aarch64/platform_common.c
plat/renesas/rcar/bl2_cpg_init.c
plat/renesas/rcar/bl2_interrupt_error.c
plat/renesas/rcar/bl2_plat_mem_params_desc.c
plat/renesas/rcar/bl2_plat_setup.c
plat/renesas/rcar/bl2_secure_setting.c
plat/renesas/rcar/bl31_plat_setup.c
plat/renesas/rcar/include/plat.ld.S
plat/renesas/rcar/include/plat_macros.S
plat/renesas/rcar/include/platform_def.h
plat/renesas/rcar/include/rcar_def.h
plat/renesas/rcar/include/rcar_private.h
plat/renesas/rcar/plat_image_load.c
plat/renesas/rcar/plat_pm.c
plat/renesas/rcar/plat_storage.c
plat/renesas/rcar/plat_topology.c
plat/rockchip/common/aarch64/plat_helpers.S
plat/rockchip/common/aarch64/platform_common.c
plat/rockchip/common/bl31_plat_setup.c
plat/rockchip/common/drivers/parameter/ddr_parameter.c
plat/rockchip/common/drivers/parameter/ddr_parameter.h
plat/rockchip/common/include/plat_macros.S
plat/rockchip/common/include/plat_private.h
plat/rockchip/common/params_setup.c
plat/rockchip/common/plat_pm.c
plat/rockchip/common/plat_topology.c
plat/rockchip/common/rockchip_gicv2.c
plat/rockchip/common/rockchip_gicv3.c
plat/rockchip/common/rockchip_sip_svc.c
plat/rockchip/rk3328/drivers/pmu/pmu.c
plat/rockchip/rk3328/drivers/soc/soc.c
plat/rockchip/rk3328/include/platform_def.h
plat/rockchip/rk3368/drivers/ddr/ddr_rk3368.c
plat/rockchip/rk3368/drivers/pmu/pmu.c
plat/rockchip/rk3368/drivers/soc/soc.c
plat/rockchip/rk3368/include/platform_def.h
plat/rockchip/rk3368/plat_sip_calls.c
plat/rockchip/rk3399/drivers/dp/cdn_dp.c
plat/rockchip/rk3399/drivers/dram/dfs.c
plat/rockchip/rk3399/drivers/dram/dram.h
plat/rockchip/rk3399/drivers/dram/dram_spec_timing.c
plat/rockchip/rk3399/drivers/dram/suspend.c
plat/rockchip/rk3399/drivers/gpio/rk3399_gpio.c
plat/rockchip/rk3399/drivers/pmu/m0_ctl.c
plat/rockchip/rk3399/drivers/pmu/pmu.c
plat/rockchip/rk3399/drivers/secure/secure.c
plat/rockchip/rk3399/drivers/soc/soc.c
plat/rockchip/rk3399/drivers/soc/soc.h
plat/rockchip/rk3399/include/plat.ld.S
plat/rockchip/rk3399/include/platform_def.h
plat/rockchip/rk3399/plat_sip_calls.c
plat/rpi3/aarch64/rpi3_bl2_mem_params_desc.c
plat/rpi3/include/platform_def.h
plat/rpi3/rpi3_bl1_setup.c
plat/rpi3/rpi3_bl2_setup.c
plat/rpi3/rpi3_bl31_setup.c
plat/rpi3/rpi3_common.c
plat/rpi3/rpi3_hw.h
plat/rpi3/rpi3_image_load.c
plat/rpi3/rpi3_io_storage.c
plat/rpi3/rpi3_mbox.c
plat/rpi3/rpi3_pm.c
plat/rpi3/rpi3_rng.c
plat/rpi3/rpi3_stack_protector.c
plat/rpi3/rpi3_topology.c
plat/rpi3/rpi3_trusted_boot.c
plat/socionext/synquacer/drivers/mhu/sq_mhu.c
plat/socionext/synquacer/drivers/scpi/sq_scpi.c
plat/socionext/synquacer/include/platform_def.h
plat/socionext/synquacer/include/sq_common.h
plat/socionext/synquacer/sq_bl31_setup.c
plat/socionext/synquacer/sq_ccn.c
plat/socionext/synquacer/sq_gicv3.c
plat/socionext/synquacer/sq_psci.c
plat/socionext/synquacer/sq_topology.c
plat/socionext/synquacer/sq_xlat_setup.c
plat/socionext/uniphier/include/platform_def.h
plat/socionext/uniphier/tsp/uniphier_tsp_setup.c
plat/socionext/uniphier/uniphier_bl2_setup.c
plat/socionext/uniphier/uniphier_bl31_setup.c
plat/socionext/uniphier/uniphier_boot_device.c
plat/socionext/uniphier/uniphier_cci.c
plat/socionext/uniphier/uniphier_emmc.c
plat/socionext/uniphier/uniphier_gicv3.c
plat/socionext/uniphier/uniphier_image_desc.c
plat/socionext/uniphier/uniphier_io_storage.c
plat/socionext/uniphier/uniphier_nand.c
plat/socionext/uniphier/uniphier_psci.c
plat/socionext/uniphier/uniphier_scp.c
plat/socionext/uniphier/uniphier_soc_info.c
plat/socionext/uniphier/uniphier_syscnt.c
plat/socionext/uniphier/uniphier_tbbr.c
plat/socionext/uniphier/uniphier_topology.c
plat/socionext/uniphier/uniphier_usb.c
plat/socionext/uniphier/uniphier_xlat_setup.c
plat/st/stm32mp1/bl2_io_storage.c
plat/st/stm32mp1/bl2_plat_setup.c
plat/st/stm32mp1/include/platform_def.h
plat/st/stm32mp1/plat_bl2_mem_params_desc.c
plat/st/stm32mp1/plat_image_load.c
plat/st/stm32mp1/platform.mk
plat/st/stm32mp1/sp_min/sp_min_setup.c
plat/st/stm32mp1/stm32mp1.ld.S
plat/st/stm32mp1/stm32mp1_common.c
plat/st/stm32mp1/stm32mp1_context.c
plat/st/stm32mp1/stm32mp1_def.h
plat/st/stm32mp1/stm32mp1_dt.c
plat/st/stm32mp1/stm32mp1_gic.c
plat/st/stm32mp1/stm32mp1_helper.S
plat/st/stm32mp1/stm32mp1_pm.c
plat/st/stm32mp1/stm32mp1_security.c
plat/st/stm32mp1/stm32mp1_stack_protector.c
plat/st/stm32mp1/stm32mp1_topology.c
plat/ti/k3/board/generic/include/board_def.h
plat/ti/k3/common/drivers/sec_proxy/sec_proxy.c
plat/ti/k3/common/drivers/ti_sci/ti_sci.c
plat/ti/k3/common/k3_bl31_setup.c
plat/ti/k3/common/k3_console.c
plat/ti/k3/common/k3_gicv3.c
plat/ti/k3/common/k3_psci.c
plat/ti/k3/common/k3_topology.c
plat/ti/k3/include/platform_def.h
plat/xilinx/versal/aarch64/versal_common.c
plat/xilinx/versal/aarch64/versal_helpers.S
plat/xilinx/versal/bl31_versal_setup.c
plat/xilinx/versal/include/plat_macros.S
plat/xilinx/versal/include/platform_def.h
plat/xilinx/versal/plat_psci.c
plat/xilinx/versal/plat_versal.c
plat/xilinx/versal/sip_svc_setup.c
plat/xilinx/versal/versal_def.h
plat/xilinx/versal/versal_gicv3.c
plat/xilinx/versal/versal_private.h
plat/xilinx/zynqmp/aarch64/zynqmp_common.c
plat/xilinx/zynqmp/aarch64/zynqmp_helpers.S
plat/xilinx/zynqmp/bl31_zynqmp_setup.c
plat/xilinx/zynqmp/include/platform_def.h
plat/xilinx/zynqmp/ipi_mailbox_service/ipi_mailbox_svc.c
plat/xilinx/zynqmp/plat_psci.c
plat/xilinx/zynqmp/plat_startup.c
plat/xilinx/zynqmp/plat_zynqmp.c
plat/xilinx/zynqmp/pm_service/pm_api_clock.c
plat/xilinx/zynqmp/pm_service/pm_api_clock.h
plat/xilinx/zynqmp/pm_service/pm_api_ioctl.c
plat/xilinx/zynqmp/pm_service/pm_api_pinctrl.c
plat/xilinx/zynqmp/pm_service/pm_api_sys.c
plat/xilinx/zynqmp/pm_service/pm_api_sys.h
plat/xilinx/zynqmp/pm_service/pm_client.c
plat/xilinx/zynqmp/pm_service/pm_common.h
plat/xilinx/zynqmp/pm_service/pm_ipi.c
plat/xilinx/zynqmp/pm_service/pm_svc_main.c
plat/xilinx/zynqmp/sip_svc_setup.c
plat/xilinx/zynqmp/tsp/tsp_plat_setup.c
plat/xilinx/zynqmp/zynqmp_def.h
plat/xilinx/zynqmp/zynqmp_ipi.c
plat/xilinx/zynqmp/zynqmp_private.h
services/arm_arch_svc/arm_arch_svc_setup.c
services/spd/opteed/opteed_common.c
services/spd/opteed/opteed_main.c
services/spd/opteed/opteed_pm.c
services/spd/opteed/opteed_private.h
services/spd/opteed/teesmc_opteed_macros.h
services/spd/tlkd/tlkd_common.c
services/spd/tlkd/tlkd_main.c
services/spd/tlkd/tlkd_pm.c
services/spd/tlkd/tlkd_private.h
services/spd/trusty/generic-arm64-smcall.c
services/spd/trusty/trusty.c
services/spd/tspd/tspd_common.c
services/spd/tspd/tspd_main.c
services/spd/tspd/tspd_pm.c
services/spd/tspd/tspd_private.h
services/std_svc/sdei/sdei_event.c
services/std_svc/sdei/sdei_intr_mgmt.c
services/std_svc/sdei/sdei_main.c
services/std_svc/sdei/sdei_private.h
services/std_svc/sdei/sdei_state.c
services/std_svc/spm/aarch64/spm_shim_exceptions.S
services/std_svc/spm/spci.c
services/std_svc/spm/spm_buffers.c
services/std_svc/spm/spm_main.c
services/std_svc/spm/spm_private.h
services/std_svc/spm/spm_setup.c
services/std_svc/spm/spm_shim_private.h
services/std_svc/spm/spm_xlat.c
services/std_svc/spm/sprt.c
services/std_svc/spm_deprecated/aarch64/spm_shim_exceptions.S
services/std_svc/spm_deprecated/spm_main.c
services/std_svc/spm_deprecated/spm_private.h
services/std_svc/spm_deprecated/spm_setup.c
services/std_svc/spm_deprecated/spm_shim_private.h
services/std_svc/spm_deprecated/spm_xlat.c
services/std_svc/std_svc_setup.c

index 6b5b0803ef37474d52a19339561240cbbcf39ad3..742a3ffc8f7acee8ae8d7f9d7032e1d428fc9963 100644 (file)
--- 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
 
index d1fd3ca00b8976fbff7981b1bce980393bcaf5d7..005d046cc13a5f115bb509a5efc971f28ded51a4 100644 (file)
@@ -4,13 +4,15 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
+
+#include <arch_helpers.h>
 #include <context.h>
-#include <context_mgmt.h>
-#include <debug.h>
-#include <platform.h>
+#include <common/debug.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <plat/common/platform.h>
 #include <smccc_helpers.h>
+
 #include "../bl1_private.h"
 
 /*
index 16b26b9f29f1fdd15d874505769ff1233083b198..3f0cbaf4be9f244a156b8fd382c040d4cfe7652f 100644 (file)
@@ -6,7 +6,7 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <bl_common.h>
+#include <common/bl_common.h>
 #include <context.h>
 #include <el3_common_macros.S>
 #include <smccc_helpers.h>
index 9b001a96f71c6f199ec423ac25ca4906474b05ca..6728278f84a02df241fec848466a07ca062e52b6 100644 (file)
@@ -6,12 +6,12 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <bl1.h>
-#include <bl_common.h>
+#include <bl1/bl1.h>
+#include <common/bl_common.h>
 #include <context.h>
+#include <lib/xlat_tables/xlat_tables.h>
 #include <smccc_helpers.h>
 #include <smccc_macros.S>
-#include <xlat_tables.h>
 
        .globl  bl1_aarch32_smc_handler
 
index 9bfb3094b56f8623832a9b08453f695d7401d8a1..0326319057b2fdbcb762e3a450d55a20936c5b7a 100644 (file)
@@ -4,12 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
+
+#include <arch_helpers.h>
 #include <context.h>
-#include <context_mgmt.h>
-#include <debug.h>
-#include <platform.h>
+#include <common/debug.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <plat/common/platform.h>
+
 #include "../bl1_private.h"
 
 /*
index cf8a6a79df0e23e952dabcdc323fc7f9e325c407..19a0ac27a77e803a69fb51f1e5afd655ad3307fd 100644 (file)
@@ -6,8 +6,8 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <bl1.h>
-#include <bl_common.h>
+#include <bl1/bl1.h>
+#include <common/bl_common.h>
 #include <context.h>
 
 /* -----------------------------------------------------------------------------
index fabe3ef66a217dd0ebd76b3aa814785e4bf59677..c4f6b99fc50e0c63dba327846e7d3b1671e475e1 100644 (file)
@@ -5,7 +5,8 @@
  */
 
 #include <platform_def.h>
-#include <xlat_tables_defs.h>
+
+#include <lib/xlat_tables/xlat_tables_defs.h>
 
 OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT)
 OUTPUT_ARCH(PLATFORM_LINKER_ARCH)
index 0fbdf515e0da41b938cf17dcfde99b2fc22cecea..57a86aea8eb7d1cf37871380a1aa1dbce227849c 100644 (file)
@@ -4,20 +4,23 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <auth_mod.h>
-#include <bl1.h>
-#include <bl_common.h>
-#include <context.h>
-#include <context_mgmt.h>
-#include <debug.h>
 #include <errno.h>
-#include <platform.h>
+#include <string.h>
+
 #include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <bl1/bl1.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <context.h>
+#include <drivers/auth/auth_mod.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/utils.h>
+#include <plat/common/platform.h>
 #include <smccc_helpers.h>
-#include <string.h>
-#include <utils.h>
+
 #include "bl1_private.h"
 
 /*
index ca4369553f97dc66427d0bc9a9f079b550253612..d2c2b417358d26450bcf985ae3cadf810c613d2e 100644 (file)
@@ -4,20 +4,23 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
-#include <arch_helpers.h>
 #include <assert.h>
-#include <auth_mod.h>
-#include <bl1.h>
-#include <bl_common.h>
-#include <console.h>
-#include <debug.h>
-#include <errata_report.h>
-#include <platform.h>
+
 #include <platform_def.h>
+
+#include <arch.h>
+#include <arch_helpers.h>
+#include <bl1/bl1.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/auth/auth_mod.h>
+#include <drivers/console.h>
+#include <lib/cpus/errata_report.h>
+#include <lib/utils.h>
+#include <plat/common/platform.h>
 #include <smccc_helpers.h>
-#include <utils.h>
-#include <uuid.h>
+#include <tools_share/uuid.h>
+
 #include "bl1_private.h"
 
 /* BL1 Service UUID */
index ed815853f5673a80b6c8c8a1e2ce95f81bdf3c55..bdbf80f32d1e4edc98db28bcfec7ed0c5c6b4a4d 100644 (file)
@@ -8,7 +8,8 @@
 #define BL1_PRIVATE_H
 
 #include <stdint.h>
-#include <utils_def.h>
+
+#include <lib/utils_def.h>
 
 /*******************************************************************************
  * Declarations of linker defined symbols which will tell us where BL1 lives
index 2581d90dfa24713dbcb53d6d5bf895ce4e800590..e8df73d4715d6c35d9211ae5f00d132870f5253b 100644 (file)
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl1.h>
-#include <bl_common.h>
 #include <platform_def.h>
-#include <tbbr/tbbr_img_desc.h>
+
+#include <bl1/bl1.h>
+#include <bl1/tbbr/tbbr_img_desc.h>
+#include <common/bl_common.h>
 
 image_desc_t bl1_tbbr_image_descs[] = {
     {
index 0c7b064555a47c8eee6575fe85e87e5900deab4e..cc846ddf12d0acd9f4d5f0925824630c31b2b6e6 100644 (file)
@@ -6,10 +6,9 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <bl_common.h>
+#include <common/bl_common.h>
 #include <el3_common_macros.S>
 
-
        .globl  bl2_entrypoint
        .globl  bl2_run_next_image
 
index 11ddf371fec6f597e5b7219f988a7a0c784ec32a..087b6656dc64813c849ed7ca219ffe96c8b6ee50 100644 (file)
@@ -6,7 +6,7 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <bl_common.h>
+#include <common/bl_common.h>
 
        .globl  bl2_vector_table
 
index d215f484b72574334e93f8eab8aebc809a4623b5..e7b98af32fe77fef41fcbf7b6e5032711fc93032 100644 (file)
@@ -6,8 +6,7 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <bl_common.h>
-
+#include <common/bl_common.h>
 
        .globl  bl2_vector_table
        .globl  bl2_entrypoint
index 2d3efd1fcad753b3425d35c5d5da72002e30fc8c..16b7c0d5f1abce68389af3a745d74ce84b99a68d 100644 (file)
@@ -6,7 +6,7 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <bl_common.h>
+#include <common/bl_common.h>
 #include <el3_common_macros.S>
 
        .globl  bl2_entrypoint
index 07d104062691615f409b9231b2f310607c4b3f26..3d580513e6afabd65e603cd0a737f03d65aaa8bd 100644 (file)
@@ -6,8 +6,8 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <bl1.h>
-#include <bl_common.h>
+#include <bl1/bl1.h>
+#include <common/bl_common.h>
 #include <context.h>
 
 /* -----------------------------------------------------------------------------
index 30a5c599a676aedf236602f2c05b5df239517ed4..d938947c1c55b0e8fc42a766cb012f4b4cb51137 100644 (file)
@@ -6,7 +6,7 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <bl_common.h>
+#include <common/bl_common.h>
 
 
        .globl  bl2_entrypoint
index 6d26cdb226855a8cab44ea40180b76c4644d6a2e..30cdf7d78ae781359362f99a75dd74d264b108a1 100644 (file)
@@ -5,7 +5,8 @@
  */
 
 #include <platform_def.h>
-#include <xlat_tables_defs.h>
+
+#include <lib/xlat_tables/xlat_tables_defs.h>
 
 OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT)
 OUTPUT_ARCH(PLATFORM_LINKER_ARCH)
index 82ab427d1716723fc42d38ecf7564fc36a7cd5bf..af93a0ce9ff8b7dc31dd83f16ccff54f7a2646f9 100644 (file)
@@ -5,7 +5,8 @@
  */
 
 #include <platform_def.h>
-#include <xlat_tables_defs.h>
+
+#include <lib/xlat_tables/xlat_tables_defs.h>
 
 OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT)
 OUTPUT_ARCH(PLATFORM_LINKER_ARCH)
index 0f40785d4cb7831d5318623e9e9bc908950e2ee1..dd53e1d2b4c2da03c307282347e033466412d491 100644 (file)
@@ -4,18 +4,20 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
-#include <arch_helpers.h>
 #include <assert.h>
-#include <auth_mod.h>
-#include <bl_common.h>
-#include <debug.h>
-#include <desc_image_load.h>
-#include <platform.h>
-#include <platform_def.h>
 #include <stdint.h>
-#include "bl2_private.h"
 
+#include <platform_def.h>
+
+#include <arch.h>
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/desc_image_load.h>
+#include <drivers/auth/auth_mod.h>
+#include <plat/common/platform.h>
+
+#include "bl2_private.h"
 
 /*******************************************************************************
  * This function loads SCP_BL2/BL3x images and returns the ep_info for
index 101eb33d07da5e30496e6669f967f13c703760fa..019088dc128f2279e8ef655798cd748cdc932e11 100644 (file)
@@ -5,13 +5,14 @@
  */
 
 #include <arch_helpers.h>
-#include <auth_mod.h>
-#include <bl1.h>
-#include <bl2.h>
-#include <bl_common.h>
-#include <console.h>
-#include <debug.h>
-#include <platform.h>
+#include <bl1/bl1.h>
+#include <bl2/bl2.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/auth/auth_mod.h>
+#include <drivers/console.h>
+#include <plat/common/platform.h>
+
 #include "bl2_private.h"
 
 #ifdef AARCH32
index 7fb64f3e4e68728e92c9c66aad1615e5862b216e..67566df89979ceb51104045b24821cbad2eaa905 100644 (file)
@@ -6,8 +6,7 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <bl_common.h>
-
+#include <common/bl_common.h>
 
        .globl  bl2u_vector_table
        .globl  bl2u_entrypoint
index 8b9c2a6493233ed74ab5f746764abfc261afee6c..591f5f60651fc5f013b11ac150c74a571a3bf921 100644 (file)
@@ -6,8 +6,7 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <bl_common.h>
-
+#include <common/bl_common.h>
 
        .globl  bl2u_entrypoint
 
index 3db5f894666cd4efc522a0ea0f42b996cd0d49bb..8d4984fbf87c4c30179d7d9067296df819d9bb3c 100644 (file)
@@ -5,7 +5,8 @@
  */
 
 #include <platform_def.h>
-#include <xlat_tables_defs.h>
+
+#include <lib/xlat_tables/xlat_tables_defs.h>
 
 OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT)
 OUTPUT_ARCH(PLATFORM_LINKER_ARCH)
index b29d57e9db6fd5ffd2fd0ec28663112880718699..d3c83ccc568c4a22cd99814b6c769d32927f714d 100644 (file)
@@ -4,19 +4,20 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
-#include <arch_helpers.h>
 #include <assert.h>
-#include <auth_mod.h>
-#include <bl1.h>
-#include <bl2u.h>
-#include <bl_common.h>
-#include <console.h>
-#include <debug.h>
-#include <platform.h>
-#include <platform_def.h>
 #include <stdint.h>
 
+#include <platform_def.h>
+
+#include <arch.h>
+#include <arch_helpers.h>
+#include <bl1/bl1.h>
+#include <bl2u/bl2u.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/auth/auth_mod.h>
+#include <drivers/console.h>
+#include <plat/common/platform.h>
 
 /*******************************************************************************
  * This function is responsible to:
index 7c116a2e0d21e0ebe8ef95a6600e7f017611bea4..c41773b886eb02af643542cd672cf73ab8300f37 100644 (file)
@@ -4,13 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <platform_def.h>
+
 #include <arch.h>
-#include <bl_common.h>
+#include <common/bl_common.h>
 #include <el3_common_macros.S>
-#include <platform_def.h>
-#include <pmf_asm_macros.S>
-#include <runtime_instr.h>
-#include <xlat_mmu_helpers.h>
+#include <lib/pmf/pmf_asm_macros.S>
+#include <lib/runtime_instr.h>
+#include <lib/xlat_tables/xlat_mmu_helpers.h>
 
        .globl  bl31_entrypoint
        .globl  bl31_warm_entrypoint
index 0986a0a19eca7093ab714e0a1a2dcaca5d1c32e6..b3f59796c376afea69d25e96334e38d75da1a3f1 100644 (file)
@@ -3,13 +3,15 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
+
+#include <plat_macros.S>
+#include <platform_def.h>
+
 #include <arch.h>
 #include <asm_macros.S>
 #include <context.h>
-#include <cpu_data.h>
-#include <plat_macros.S>
-#include <platform_def.h>
-#include <utils_def.h>
+#include <lib/el3_runtime/cpu_data.h>
+#include <lib/utils_def.h>
 
        .globl  report_unhandled_exception
        .globl  report_unhandled_interrupt
index 9d7c5e8a9c368e26fd3845758bdb42baf345877d..0c8cfa8f92ae3c7f3b02bd491a6d02d69156ff89 100644 (file)
@@ -8,9 +8,9 @@
 #include <assert_macros.S>
 #include <asm_macros.S>
 #include <assert_macros.S>
+#include <bl31/ea_handle.h>
 #include <context.h>
-#include <ea_handle.h>
-#include <ras_arch.h>
+#include <lib/extensions/ras_arch.h>
 
 
        .globl  handle_lower_el_ea_esb
index ab61e8ccfab25e1f3e361c35ba175f4c2d6163df..e7abd50318a77aa3da59efa9c5055426369e013d 100644 (file)
@@ -4,15 +4,16 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <platform_def.h>
+
 #include <arch.h>
 #include <asm_macros.S>
+#include <bl31/ea_handle.h>
+#include <bl31/interrupt_mgmt.h>
+#include <common/runtime_svc.h>
 #include <context.h>
-#include <cpu_data.h>
-#include <ea_handle.h>
-#include <interrupt_mgmt.h>
-#include <platform_def.h>
-#include <runtime_svc.h>
-#include <smccc.h>
+#include <lib/el3_runtime/cpu_data.h>
+#include <lib/smccc.h>
 
        .globl  runtime_exceptions
 
index fd53ed82c286e5227ac1eba19b652bb2a4fc9f75..5925e0ca0ce16ab03abefabd53f4e8337f52b30f 100644 (file)
@@ -5,7 +5,8 @@
  */
 
 #include <platform_def.h>
-#include <xlat_tables_defs.h>
+
+#include <lib/xlat_tables/xlat_tables_defs.h>
 
 OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT)
 OUTPUT_ARCH(PLATFORM_LINKER_ARCH)
@@ -77,7 +78,7 @@ SECTIONS
 
         /* Place pubsub sections for events */
         . = ALIGN(8);
-#include <pubsub_events.h>
+#include <lib/el3_runtime/pubsub_events.h>
 
         . = ALIGN(PAGE_SIZE);
         __RODATA_END__ = .;
@@ -124,7 +125,7 @@ SECTIONS
 
         /* Place pubsub sections for events */
         . = ALIGN(8);
-#include <pubsub_events.h>
+#include <lib/el3_runtime/pubsub_events.h>
 
         *(.vectors)
         __RO_END_UNALIGNED__ = .;
index f868372a6cb5ee56a6f1730ae1da1be816825dd0..d41979fa7d1230da8884472cba0f42f58052d0b4 100644 (file)
@@ -5,13 +5,13 @@
  */
 
 #include <assert.h>
-#include <bl31.h>
-#include <bl_common.h>
-#include <context.h>
-#include <context_mgmt.h>
-#include <cpu_data.h>
-#include <platform.h>
 
+#include <bl31/bl31.h>
+#include <common/bl_common.h>
+#include <context.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/el3_runtime/cpu_data.h>
+#include <plat/common/platform.h>
 
 /*******************************************************************************
  * This function returns a pointer to the most recent 'cpu_context' structure
index 77b59ed6a86f70748d96dee3e0df0d935cfc9166..927cda2f9f0d548d646ef71eb7e6d721b299b8ae 100644 (file)
@@ -4,22 +4,23 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl31.h>
-#include <bl_common.h>
-#include <console.h>
-#include <context_mgmt.h>
-#include <debug.h>
-#include <ehf.h>
-#include <platform.h>
-#include <pmf.h>
-#include <runtime_instr.h>
-#include <runtime_svc.h>
-#include <std_svc.h>
 #include <string.h>
 
+#include <arch.h>
+#include <arch_helpers.h>
+#include <bl31/bl31.h>
+#include <bl31/ehf.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/runtime_svc.h>
+#include <drivers/console.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/pmf/pmf.h>
+#include <lib/runtime_instr.h>
+#include <plat/common/platform.h>
+#include <services/std_svc.h>
+
 #if ENABLE_RUNTIME_INSTRUMENTATION
 PMF_REGISTER_SERVICE_SMC(rt_instr_svc, PMF_RT_INSTR_SVC_ID,
        RT_INSTR_TOTAL_IDS, PMF_STORE_ENABLE)
index fa036cb1c99873242a2c1261b05b1901a0931c22..1bcebee530fd6dcc93f8d1f9f1cc7360b257ded0 100644 (file)
@@ -9,17 +9,18 @@
  */
 
 #include <assert.h>
-#include <context.h>
-#include <context_mgmt.h>
-#include <cpu_data.h>
-#include <debug.h>
-#include <ehf.h>
-#include <gic_common.h>
-#include <interrupt_mgmt.h>
-#include <platform.h>
-#include <pubsub_events.h>
 #include <stdbool.h>
 
+#include <bl31/ehf.h>
+#include <bl31/interrupt_mgmt.h>
+#include <context.h>
+#include <common/debug.h>
+#include <drivers/arm/gic_common.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/el3_runtime/cpu_data.h>
+#include <lib/el3_runtime/pubsub_events.h>
+#include <plat/common/platform.h>
+
 /* Output EHF logs as verbose */
 #define EHF_LOG(...)   VERBOSE("EHF: " __VA_ARGS__)
 
index 0df50b6d2f621cab4cdcfeb6ea6ef46c970504af..e6efad3e04a99f5148c65a54725487d8d7e8cc5f 100644 (file)
@@ -5,11 +5,12 @@
  */
 
 #include <assert.h>
-#include <bl_common.h>
-#include <context_mgmt.h>
 #include <errno.h>
-#include <interrupt_mgmt.h>
-#include <platform.h>
+
+#include <common/bl_common.h>
+#include <bl31/interrupt_mgmt.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <plat/common/platform.h>
 
 /*******************************************************************************
  * Local structure and corresponding array to keep track of the state of the
index d6853cc406886036a16ec24e0c5340f405cc0550..2ffef6a2ee52f3f7b201c765d6893f1a1143de78 100644 (file)
@@ -6,13 +6,13 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <bl_common.h>
+#include <common/bl_common.h>
+#include <common/runtime_svc.h>
 #include <context.h>
 #include <el3_common_macros.S>
-#include <runtime_svc.h>
+#include <lib/xlat_tables/xlat_tables_defs.h>
 #include <smccc_helpers.h>
 #include <smccc_macros.S>
-#include <xlat_tables_defs.h>
 
        .globl  sp_min_vector_table
        .globl  sp_min_entrypoint
index ce6c954eca54d95d4eb2e01c333092c985c3b8cc..ba9d3421213cf21b89328e3b873bb695a91f657a 100644 (file)
@@ -5,7 +5,8 @@
  */
 
 #include <platform_def.h>
-#include <xlat_tables_defs.h>
+
+#include <lib/xlat_tables/xlat_tables_defs.h>
 
 OUTPUT_FORMAT(elf32-littlearm)
 OUTPUT_ARCH(arm)
@@ -62,7 +63,7 @@ SECTIONS
 
         /* Place pubsub sections for events */
         . = ALIGN(8);
-#include <pubsub_events.h>
+#include <lib/el3_runtime/pubsub_events.h>
 
         . = ALIGN(PAGE_SIZE);
         __RODATA_END__ = .;
@@ -91,7 +92,7 @@ SECTIONS
 
         /* Place pubsub sections for events */
         . = ALIGN(8);
-#include <pubsub_events.h>
+#include <lib/el3_runtime/pubsub_events.h>
 
         *(.vectors)
         __RO_END_UNALIGNED__ = .;
index a12a83bcf3d19ee717506a3695bb21d285797b1a..3cb19901f33cde93e270eff2b4ebcd516677ad1d 100644 (file)
@@ -4,26 +4,28 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <assert.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+
+#include <platform_def.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <assert.h>
-#include <bl_common.h>
-#include <console.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/runtime_svc.h>
 #include <context.h>
-#include <context_mgmt.h>
-#include <debug.h>
-#include <platform.h>
-#include <platform_def.h>
+#include <drivers/console.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/psci/psci.h>
+#include <lib/utils.h>
+#include <plat/common/platform.h>
 #include <platform_sp_min.h>
-#include <psci.h>
-#include <runtime_svc.h>
+#include <services/std_svc.h>
 #include <smccc_helpers.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <std_svc.h>
-#include <stdint.h>
-#include <string.h>
-#include <utils.h>
+
 #include "sp_min_private.h"
 
 /* Pointers to per-core cpu contexts */
index 5d9da857882ac527d19faa9387f1c13fcff61403..48f6981bb2190d6ba9a4df230a77ebb0e38ebf01 100644 (file)
@@ -6,8 +6,9 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <tsp.h>
-#include <xlat_tables_defs.h>
+#include <bl32/tsp/tsp.h>
+#include <lib/xlat_tables/xlat_tables_defs.h>
+
 #include "../tsp_private.h"
 
 
index 48e358a3a4b3d7527a7ba9716fc54359d36b5fa1..ad4b64887a5aa1f27d25f4dc6490a872d0250c97 100644 (file)
@@ -6,9 +6,8 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <bl_common.h>
-#include <tsp.h>
-
+#include <bl32/tsp/tsp.h>
+#include <common/bl_common.h>
 
        /* ----------------------------------------------------
         * The caller-saved registers x0-x18 and LR are saved
index 2261f87f9cde746b85fbe3691661e5651f1c447d..5ad16da6676c3092044b96e0e10abcd55d059b01 100644 (file)
@@ -5,7 +5,7 @@
  */
 
 #include <asm_macros.S>
-#include <tsp.h>
+#include <bl32/tsp/tsp.h>
 
        .globl tsp_get_magic
 
index 97b12ce199e615be4b3151348e84785a2672c30d..e9a1df16806f78b627dfb5865181e5943f9cce2d 100644 (file)
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <lib/xlat_tables/xlat_tables_defs.h>
 #include <platform_def.h>
-#include <xlat_tables_defs.h>
 
 OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT)
 OUTPUT_ARCH(PLATFORM_LINKER_ARCH)
index f501338143ea9550c979941cd1ec8ee16178810a..4e500b3caa20be05157bb9437e9e290a2da2c527 100644 (file)
@@ -4,12 +4,15 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
-#include <platform.h>
+
 #include <platform_def.h>
-#include <tsp.h>
+
+#include <arch_helpers.h>
+#include <bl32/tsp/tsp.h>
+#include <common/debug.h>
+#include <plat/common/platform.h>
+
 #include "tsp_private.h"
 
 /*******************************************************************************
index e41b51ebc7220be7d81f0a935219d2fadd4ab14e..24efa6189d93c9e61eb4102788228c1332a107df 100644 (file)
@@ -4,14 +4,16 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
-#include <bl_common.h>
-#include <debug.h>
-#include <platform.h>
 #include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <bl32/tsp/tsp.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <lib/spinlock.h>
+#include <plat/common/platform.h>
 #include <platform_tsp.h>
-#include <spinlock.h>
-#include <tsp.h>
+
 #include "tsp_private.h"
 
 
index b697fa49653c972096913a4f957b754f427334e7..e39f29166cf036e2ed5af516ec2c85d01f2b0adc 100644 (file)
 
 #ifndef __ASSEMBLY__
 
-#include <cassert.h>
-#include <platform_def.h> /* For CACHE_WRITEBACK_GRANULE */
-#include <spinlock.h>
 #include <stdint.h>
-#include <tsp.h>
 
+#include <platform_def.h> /* For CACHE_WRITEBACK_GRANULE */
+
+#include <bl32/tsp/tsp.h>
+#include <lib/cassert.h>
+#include <lib/spinlock.h>
 
 typedef struct work_statistics {
        /* Number of s-el1 interrupts on this cpu */
index ebe7f0d3958a55276995dfa9efa3994a24060727..35928634dcedb0f9b8996e20f580f69d0939fba9 100644 (file)
@@ -3,9 +3,12 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include <arch_helpers.h>
+
 #include <assert.h>
-#include <platform.h>
+
+#include <arch_helpers.h>
+#include <plat/common/platform.h>
+
 #include "tsp_private.h"
 
 /*******************************************************************************
index 4478d0d038ecab40c609f05301407e2821b4f80a..da740ef2201c3cadd3214e026e46e31c1179af8f 100644 (file)
@@ -6,7 +6,7 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <debug.h>
+#include <common/debug.h>
 
        .globl  asm_print_str
        .globl  asm_print_hex
index ba94f6cb1eea4175b1e3b0c4512eb167798eaaa3..36a872468cf5d60b05835cb2498b6c7cdb28b97d 100644 (file)
@@ -5,7 +5,7 @@
  */
 
 #include <asm_macros.S>
-#include <bl_common.h>
+#include <common/bl_common.h>
 
 /* -----------------------------------------------------------------------------
  * Very simple stackless exception handlers used by BL2 and BL31 stages.
index a91d065738bd9078d012a544f1fbe8204991d119..bf60a08a9bb2d883f31cac74cf5d055cd9ba4444 100644 (file)
@@ -4,13 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <console.h>
-#include <debug.h>
 #include <stdbool.h>
 #include <stdint.h>
 
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/console.h>
+
 /* Maximum number of entries in the backtrace to display */
 #define UNWIND_LIMIT   20U
 
index d12a17cf38f1d455671cf059a96628a8b7e343cf..b2d22c19ddccfded8608ce6c84532a5dddeea2c1 100644 (file)
@@ -4,18 +4,19 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
-#include <arch_helpers.h>
 #include <assert.h>
-#include <auth_mod.h>
-#include <bl_common.h>
-#include <debug.h>
 #include <errno.h>
-#include <io_storage.h>
-#include <platform.h>
 #include <string.h>
-#include <utils.h>
-#include <xlat_tables_defs.h>
+
+#include <arch.h>
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/auth/auth_mod.h>
+#include <drivers/io/io_storage.h>
+#include <lib/utils.h>
+#include <lib/xlat_tables/xlat_tables_defs.h>
+#include <plat/common/platform.h>
 
 #if TRUSTED_BOARD_BOOT
 # ifdef DYN_DISABLE_AUTH
index b07fba3340b26fb7323648db4a6da33f5cb78e43..ada02f8dd66945969a230251c4d4bd07a6f64931 100644 (file)
@@ -4,12 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <desc_image_load.h>
-
 
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/desc_image_load.h>
 
 static bl_load_info_t bl_load_info;
 static bl_params_t next_bl_params;
index 31dafb2eb483640730f6cee4bcfa67c6d46813b0..e67fdb00548074f1cd04255e0e17aff355f9c31d 100644 (file)
@@ -7,11 +7,13 @@
 /* Helper functions to offer easier navigation of Device Tree Blob */
 
 #include <assert.h>
-#include <debug.h>
-#include <fdt_wrappers.h>
-#include <libfdt.h>
 #include <string.h>
 
+#include <libfdt.h>
+
+#include <common/debug.h>
+#include <common/fdt_wrappers.h>
+
 /*
  * 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
index 7bd02b1da5a6d1f7ab98154760b4f7ba51db3266..a4586ae6244c58deabcc72fb43895b6707e10ca8 100644 (file)
@@ -4,13 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <debug.h>
-#include <image_decompress.h>
 #include <stdint.h>
 
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/image_decompress.h>
+
 static uintptr_t decompressor_buf_base;
 static uint32_t decompressor_buf_size;
 static decompressor_t *decompressor;
index c30c0ecb68efcb0df3b70e87a96310cdd9aeaecc..09ce787d466912350d578e85bf0930b93f2cee28 100644 (file)
@@ -5,11 +5,12 @@
  */
 
 #include <assert.h>
-#include <debug.h>
 #include <errno.h>
-#include <runtime_svc.h>
 #include <string.h>
 
+#include <common/debug.h>
+#include <common/runtime_svc.h>
+
 /*******************************************************************************
  * The 'rt_svc_descs' array holds the runtime service descriptors exported by
  * services by placing them in the 'rt_svc_descs' linker section.
index 070218564086a44663d855c88d78bc21c2b2d09f..3e174dda089265d92d49a0cf0ef88c557007e261 100644 (file)
@@ -4,9 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <stdarg.h>
 #include <assert.h>
-#include <debug.h>
-#include <platform.h>
+#include <stdio.h>
+
+#include <common/debug.h>
+#include <plat/common/platform.h>
 
 /* Set the default maximum log level to the `LOG_LEVEL` build flag */
 static unsigned int max_log_level = LOG_LEVEL;
index e7cb09cf298d354c204bbeb4c398dd7fab1be1e7..dbcd4bca8ab9a594cc4eacf4ac25fa78715cff63 100644 (file)
@@ -308,9 +308,9 @@ assign interrupts to fictitious dispatchers:
 
 .. code:: c
 
+   #include <common/interrupt_props.h>
+   #include <drivers/arm/gic_common.h>
    #include <exception_mgmt.h>
-   #include <gic_common.h>
-   #include <interrupt_props.h>
 
    ...
 
index 7075c674d50510be276b4258ba63043780adfe36..67f5b7ec2b94d57a20f7049b80ce2e9a9d79b9ad 100644 (file)
@@ -4,10 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
-#include <delay_timer.h>
 #include <errno.h>
-#include <mmio.h>
+
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <lib/mmio.h>
+
 #include <sunxi_mmap.h>
 
 #define RSB_CTRL       0x00
index 605971cac72199740c4eae8c8dfc9cb8540538b5..a139f6cc74283302591b288e8fcc9b4872a6e74e 100644 (file)
@@ -4,15 +4,16 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
-#include <arch_helpers.h>
 #include <assert.h>
-#include <cci.h>
-#include <debug.h>
-#include <mmio.h>
 #include <stdbool.h>
 #include <stdint.h>
 
+#include <arch.h>
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/arm/cci.h>
+#include <lib/mmio.h>
+
 #define MAKE_CCI_PART_NUMBER(hi, lo)   (((hi) << 8) | (lo))
 #define CCI_PART_LO_MASK               U(0xff)
 #define CCI_PART_HI_MASK               U(0xf)
index d46e02089168ecda6c3231d9a3234566f0d870b3..64b1626970f473043f333e9f72938d0cd930e5e9 100644 (file)
@@ -4,14 +4,16 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
 #include <assert.h>
-#include <bakery_lock.h>
-#include <ccn.h>
-#include <debug.h>
 #include <errno.h>
-#include <mmio.h>
 #include <stdbool.h>
+
+#include <arch.h>
+#include <common/debug.h>
+#include <drivers/arm/ccn.h>
+#include <lib/bakery_lock.h>
+#include <lib/mmio.h>
+
 #include "ccn_private.h"
 
 static const ccn_desc_t *ccn_plat_desc;
index 589de5da40b50e89914dfee6a2f4ca38ababf596..38b2f67190117bc63e26d56b927740adcefd4422 100644 (file)
@@ -5,8 +5,10 @@
  */
 
 #include <assert.h>
-#include <gic_common.h>
-#include <mmio.h>
+
+#include <drivers/arm/gic_common.h>
+#include <lib/mmio.h>
+
 #include "gic_common_private.h"
 
 /*******************************************************************************
index 9d9e8c7bac4ee5342532ca4043b1aa691d137088..1ab1bdbef7cd9f563f220679dadd8e2beee34166 100644 (file)
@@ -7,10 +7,11 @@
 #ifndef GIC_COMMON_PRIVATE_H
 #define GIC_COMMON_PRIVATE_H
 
-#include <gic_common.h>
-#include <mmio.h>
 #include <stdint.h>
 
+#include <drivers/arm/gic_common.h>
+#include <lib/mmio.h>
+
 /*******************************************************************************
  * GIC Distributor interface register accessors that are common to GICv3 & GICv2
  ******************************************************************************/
index bc4c1d165884b6b94d61c81da960214b1c6a8399..6739a782c1e934319e9ae140029ae0437b02fcf4 100644 (file)
@@ -4,13 +4,15 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <assert.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <assert.h>
-#include <debug.h>
-#include <gic_common.h>
-#include <gicv2.h>
-#include <interrupt_props.h>
+#include <common/debug.h>
+#include <common/interrupt_props.h>
+#include <drivers/arm/gic_common.h>
+#include <drivers/arm/gicv2.h>
+
 #include "../common/gic_common_private.h"
 #include "gicv2_private.h"
 
index b8729056d575def3596fe7017d427e4de7041362..c5d4fe1c37e26b9b087fd1fc83d8fbe32bf773a2 100644 (file)
@@ -4,16 +4,17 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
-#include <gic_common.h>
-#include <gicv2.h>
-#include <interrupt_props.h>
-#include <spinlock.h>
 #include <stdbool.h>
 
+#include <arch.h>
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <common/interrupt_props.h>
+#include <drivers/arm/gic_common.h>
+#include <drivers/arm/gicv2.h>
+#include <lib/spinlock.h>
+
 #include "../common/gic_common_private.h"
 #include "gicv2_private.h"
 
index ccfad78cd9ec963e632454543d23b7be3bd6647e..0fbdab0a2c1fe11f3622c52ba0729fd05c3da644 100644 (file)
@@ -7,10 +7,11 @@
 #ifndef GICV2_PRIVATE_H
 #define GICV2_PRIVATE_H
 
-#include <gicv2.h>
-#include <mmio.h>
 #include <stdint.h>
 
+#include <drivers/arm/gicv2.h>
+#include <lib/mmio.h>
+
 /*******************************************************************************
  * Private function prototypes
  ******************************************************************************/
index c8097329517cfb03bdfc77cad9ea46e96ab0346b..448989286304c55d14221bf39f8ac35494671c2d 100644 (file)
 * APIs that are different to those generic ones in GICv3 driver.
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <gicv3.h>
+
+#include <arch_helpers.h>
+#include <drivers/arm/arm_gicv3_common.h>
+#include <drivers/arm/gicv3.h>
 
 #include "gicv3_private.h"
-#include "arm_gicv3_common.h"
 
 /*
  * Flush the internal GIC cache of the LPIs pending tables to memory before
index eb4fc548f77faa463aa8961425ecf885b76e324c..9cb2ab25ed58c94f09005f4f860160e8533fe354 100644 (file)
  * GIC600 supports independently power-gating redistributor interface.
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <gicv3.h>
+
+#include <arch_helpers.h>
+#include <drivers/arm/gicv3.h>
 
 #include "gicv3_private.h"
 
index c12a4b6517a458304676e4ff145180edc5e937b3..39ea2a374659eac5ed9da9a07922afb76d66ce05 100644 (file)
@@ -4,12 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <assert.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <assert.h>
-#include <debug.h>
-#include <gic_common.h>
-#include <interrupt_props.h>
+#include <common/debug.h>
+#include <common/interrupt_props.h>
+#include <drivers/arm/gic_common.h>
+
 #include "../common/gic_common_private.h"
 #include "gicv3_private.h"
 
index 60f2e108a0f73ab4417eec1c4ffea78236c25482..cf92f10ba7b907c33eb56d0d984bbaf6631e24e4 100644 (file)
@@ -4,13 +4,15 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <assert.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <assert.h>
-#include <debug.h>
-#include <gicv3.h>
-#include <interrupt_props.h>
-#include <spinlock.h>
+#include <common/debug.h>
+#include <common/interrupt_props.h>
+#include <drivers/arm/gicv3.h>
+#include <lib/spinlock.h>
+
 #include "gicv3_private.h"
 
 const gicv3_driver_data_t *gicv3_driver_data;
index 188e711688cdfd1b224cd348b4c1e000a42ed84e..92066e1f2f9f9e2a7defce6583dfbdd64842f2d3 100644 (file)
@@ -8,10 +8,12 @@
 #define GICV3_PRIVATE_H
 
 #include <assert.h>
-#include <gic_common.h>
-#include <gicv3.h>
-#include <mmio.h>
 #include <stdint.h>
+
+#include <drivers/arm/gic_common.h>
+#include <drivers/arm/gicv3.h>
+#include <lib/mmio.h>
+
 #include "../common/gic_common_private.h"
 
 /*******************************************************************************
index 5d6b95fe3ea5e4e9afd25e2a164762db8594158b..ae613b1345bc3da2da79f970f4a1f56cab4a7633 100644 (file)
@@ -8,7 +8,7 @@
 #include <assert_macros.S>
 #define USE_FINISH_CONSOLE_REG_2
 #include <console_macros.S>
-#include <pl011.h>
+#include <drivers/arm/pl011.h>
 
 #if !MULTI_CONSOLE_API
 /*
index 7fec0904d9189c3a01c9682fe6ae9abcd3d088e2..aaa39c11c6cbe715cdebce0eda4177bc7d0423dd 100644 (file)
@@ -8,7 +8,7 @@
 #include <assert_macros.S>
 #define USE_FINISH_CONSOLE_REG_2
 #include <console_macros.S>
-#include <pl011.h>
+#include <drivers/arm/pl011.h>
 
 #if !MULTI_CONSOLE_API
 /*
index af980e5eb2d9cc392cbf10770fe8fe867588af57..97013e83fbd86d7a2915d3de89ca0b9282a37afc 100644 (file)
@@ -9,13 +9,14 @@
  */
 
 #include <assert.h>
-#include <cassert.h>
-#include <debug.h>
 #include <errno.h>
-#include <gpio.h>
-#include <mmio.h>
-#include <pl061_gpio.h>
-#include <utils.h>
+
+#include <common/debug.h>
+#include <drivers/arm/pl061_gpio.h>
+#include <drivers/gpio.h>
+#include <lib/cassert.h>
+#include <lib/mmio.h>
+#include <lib/utils.h>
 
 #if !PLAT_PL061_MAX_GPIOS
 # define PLAT_PL061_MAX_GPIOS  32
index 78a9ffa6dfa9880b0d362c862f519c4657748750..004e81e3602b3450671035e3f1d76b16e7f6c0db 100644 (file)
@@ -5,10 +5,11 @@
  */
 
 #include <cdefs.h>
-#include <mmio.h>
-#include <smmu_v3.h>
 #include <stdbool.h>
 
+#include <drivers/arm/smmu_v3.h>
+#include <lib/mmio.h>
+
 static inline uint32_t __init smmuv3_read_s_idr1(uintptr_t base)
 {
        return mmio_read_32(base + SMMU_S_IDR1);
index 8f1c5c51b94ef0f4de52114902e5c8a68cec224a..5313fbde2d54edd256f7a0c5abbd27abfee00b0d 100644 (file)
@@ -5,8 +5,9 @@
  */
 
 #include <assert.h>
-#include <delay_timer.h>
-#include <mmio.h>
+
+#include <drivers/delay_timer.h>
+#include <lib/mmio.h>
 
 uintptr_t sp804_base_addr;
 
index aee90164acd07182618d8c484af0d9156af71924..ffca1ced5b87195b0cc06fb149525e1140a15dd8 100644 (file)
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <mmio.h>
-#include <sp805.h>
 #include <stdint.h>
 
+#include <drivers/arm/sp805.h>
+#include <lib/mmio.h>
+
 /* Inline register access functions */
 
 static inline void sp805_write_wdog_load(uintptr_t base, uint32_t value)
index 082161fe5724b9f2cb608b0dfa6d01df7e15c113..676df8d804b10068823b0307085fc3ce651efa9e 100644 (file)
@@ -5,10 +5,11 @@
  */
 
 #include <assert.h>
-#include <debug.h>
-#include <mmio.h>
 #include <stddef.h>
-#include <tzc380.h>
+
+#include <common/debug.h>
+#include <drivers/arm/tzc380.h>
+#include <lib/mmio.h>
 
 struct tzc380_instance {
        uintptr_t base;
index d27b010294220d0f69aff24bacc4ac6c3ab6563b..50d67013982ade1a14e7334a58f598de5f92113c 100644 (file)
@@ -5,10 +5,12 @@
  */
 
 #include <assert.h>
-#include <debug.h>
-#include <mmio.h>
 #include <stddef.h>
-#include <tzc400.h>
+
+#include <common/debug.h>
+#include <drivers/arm/tzc400.h>
+#include <lib/mmio.h>
+
 #include "tzc_common_private.h"
 
 /*
index efac85071256bc7f055d8a520e3e9efd9125699d..c800536f335459bf4b3e7909e2877e415b341d11 100644 (file)
@@ -9,8 +9,8 @@
 
 #include <arch.h>
 #include <arch_helpers.h>
-#include <mmio.h>
-#include <tzc_common.h>
+#include <drivers/arm/tzc_common.h>
+#include <lib/mmio.h>
 
 #define DEFINE_TZC_COMMON_WRITE_ACTION(fn_name, macro_name)            \
        static inline void _tzc##fn_name##_write_action(                \
index f0aba9c197e16a3f11e58f1feb1b005ac828aa35..e45fbf8d8ad269a8c1972394ac7db3b9fe6e2be2 100644 (file)
@@ -5,10 +5,12 @@
  */
 
 #include <assert.h>
-#include <debug.h>
-#include <mmio.h>
-#include <tzc_dmc500.h>
-#include "tzc_common.h"
+
+#include <common/debug.h>
+#include <drivers/arm/tzc_dmc500.h>
+#include <drivers/arm/tzc_common.h>
+#include <lib/mmio.h>
+
 #include "tzc_common_private.h"
 
 /*
index 4abd0800b1dc5b034b3f0c7ac15cf746e8a1664c..64ec5abee736d68f9dac8381b3a548a6276c490a 100644 (file)
@@ -5,9 +5,10 @@
  */
 
 #include <assert.h>
-#include <debug.h>
-#include <mmio.h>
-#include <tzc_dmc620.h>
+
+#include <common/debug.h>
+#include <drivers/arm/tzc_dmc620.h>
+#include <lib/mmio.h>
 
 /* Mask to extract bit 31 to 16 */
 #define MASK_31_16 UINT64_C(0x0000ffff0000)
index eb537b66a1065343f066d8d92d8888137d81b7ae..1b8ff82bcad33d0d2a1cf51db7367a49858d9190 100644 (file)
@@ -5,17 +5,19 @@
  */
 
 #include <assert.h>
-#include <auth_common.h>
-#include <auth_mod.h>
-#include <cot_def.h>
-#include <crypto_mod.h>
-#include <debug.h>
-#include <img_parser_mod.h>
-#include <platform.h>
-#include <platform_def.h>
 #include <stdint.h>
 #include <string.h>
 
+#include <platform_def.h>
+
+#include <common/debug.h>
+#include <common/tbbr/cot_def.h>
+#include <drivers/auth/auth_common.h>
+#include <drivers/auth/auth_mod.h>
+#include <drivers/auth/crypto_mod.h>
+#include <drivers/auth/img_parser_mod.h>
+#include <plat/common/platform.h>
+
 /* ASN.1 tags */
 #define ASN1_INTEGER                 0x02
 
index 4cd05506b2cfb0d9a92b2bb56e16ab8bf369517f..5e5ac2b03d100c20250459d10e38f28a953871d9 100644 (file)
@@ -5,8 +5,9 @@
  */
 
 #include <assert.h>
-#include <crypto_mod.h>
-#include <debug.h>
+
+#include <common/debug.h>
+#include <drivers/auth/crypto_mod.h>
 
 /* Variable exported by the crypto library through REGISTER_CRYPTO_LIB() */
 
index 80c10933e9aa83e241f53b0e5e89fda827700761..a507d0a421ad21c72610ff886b3b60d037eb8613 100644 (file)
@@ -4,20 +4,22 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
-#include <crypto_driver.h>
-#include <crypto_mod.h>
-#include <debug.h>
-#include <mbedtls_common.h>
-#include <platform_def.h>
-#include <rsa.h>
-#include <sbrom_bsv_api.h>
-#include <secureboot_base_func.h>
-#include <secureboot_gen_defs.h>
 #include <stddef.h>
 #include <string.h>
-#include <util.h>
-#include <utils.h>
+
+#include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/arm/cryptocell/crypto_driver.h>
+#include <drivers/arm/cryptocell/rsa.h>
+#include <drivers/arm/cryptocell/sbrom_bsv_api.h>
+#include <drivers/arm/cryptocell/secureboot_base_func.h>
+#include <drivers/arm/cryptocell/secureboot_gen_defs.h>
+#include <drivers/arm/cryptocell/util.h>
+#include <drivers/auth/crypto_mod.h>
+#include <drivers/auth/mbedtls/mbedtls_common.h>
+#include <lib/utils.h>
 
 #include <mbedtls/oid.h>
 
index a88dcfc5798af9004ac3a211ae6240ed93d224da..a631829fdaff61f3a5c91fd6d8b6ba5df7edfc0f 100644 (file)
@@ -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}
index 63160141d732f952c5f45f303a837b6053677de2..c4688f86758b84599119118e87866a71b15bce65 100644 (file)
@@ -5,14 +5,15 @@
  */
 
 #include <assert.h>
-#include <auth_common.h>
-#include <debug.h>
 #include <errno.h>
-#include <img_parser_mod.h>
 #include <limits.h>
 #include <stdint.h>
 #include <string.h>
-#include <utils_def.h>
+
+#include <common/debug.h>
+#include <drivers/auth/auth_common.h>
+#include <drivers/auth/img_parser_mod.h>
+#include <lib/utils_def.h>
 
 IMPORT_SYM(uintptr_t, __PARSER_LIB_DESCS_START__,      PARSER_LIB_DESCS_START);
 IMPORT_SYM(uintptr_t, __PARSER_LIB_DESCS_END__,                PARSER_LIB_DESCS_END);
index dbf45baebd12bc216f3ea069d115590392f5fe17..b6d02fd108cb42be605dff876ab03f4345d9e252 100644 (file)
@@ -5,14 +5,16 @@
  */
 
 #include <assert.h>
-#include <debug.h>
+#include <stddef.h>
+
 /* mbed TLS headers */
 #include <mbedtls/memory_buffer_alloc.h>
 #include <mbedtls/platform.h>
-#include <mbedtls_common.h>
-#include <mbedtls_config.h>
-#include <platform.h>
-#include <stddef.h>
+
+#include <common/debug.h>
+#include <drivers/auth/mbedtls/mbedtls_common.h>
+#include <drivers/auth/mbedtls/mbedtls_config.h>
+#include <plat/common/platform.h>
 
 static void cleanup(void)
 {
index cfbd86ab931bd1dbe385a9042bf40bc0d7645433..63e65bd47cb9e16079de23ece41c150583545df9 100644 (file)
@@ -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.h>"
+MBEDTLS_CONFIG_FILE    :=      "<drivers/auth/mbedtls/mbedtls_config.h>"
 $(eval $(call add_define,MBEDTLS_CONFIG_FILE))
 
 MBEDTLS_SOURCES        +=              drivers/auth/mbedtls/mbedtls_common.c
index bc9ed3a85e30f831f0734d1bc96632ffb4918159..33420fbbd1b0c59ca7f954b8c193a6ac1ba14e85 100644 (file)
@@ -4,10 +4,6 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <crypto_mod.h>
-#include <debug.h>
-#include <mbedtls_common.h>
-#include <mbedtls_config.h>
 #include <stddef.h>
 #include <string.h>
 
 #include <mbedtls/oid.h>
 #include <mbedtls/platform.h>
 
+#include <common/debug.h>
+#include <drivers/auth/crypto_mod.h>
+#include <drivers/auth/mbedtls/mbedtls_common.h>
+#include <drivers/auth/mbedtls/mbedtls_config.h>
+
 #define LIB_NAME               "mbed TLS"
 
 /*
index bda1208af935adee4555206cc913cb9d2d5ca6df..129566bd6914cf8740c858b4e760419c3fd9329c 100644 (file)
  * extensions field, such as an image hash or a public key.
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <img_parser_mod.h>
-#include <mbedtls_common.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
-#include <utils.h>
 
 /* mbed TLS headers */
 #include <mbedtls/asn1.h>
 #include <mbedtls/oid.h>
 #include <mbedtls/platform.h>
 
+#include <arch_helpers.h>
+#include <drivers/auth/img_parser_mod.h>
+#include <drivers/auth/mbedtls/mbedtls_common.h>
+#include <lib/utils.h>
+
 /* Maximum OID string length ("a.b.c.d.e.f ...") */
 #define MAX_OID_STR_LEN                        64
 
index a950a7a8d4c9de0fb3b6d1c0eb55b86431221b3a..ec14a185d17aebcb396b96564bfd89175e48091f 100644 (file)
@@ -4,12 +4,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <auth_mod.h>
-#include <platform_def.h>
 #include <stddef.h>
 
+#include <platform_def.h>
+
+#include <drivers/auth/auth_mod.h>
 #if USE_TBBR_DEFS
-#include <tbbr_oid.h>
+#include <tools_share/tbbr_oid.h>
 #else
 #include <platform_oid.h>
 #endif
index 418810e15caa50b5a7ccfe4bf90c288f1b6ae738..43d08f45452b2f7b1346f6d78241ccd701e6dbd6 100644 (file)
@@ -6,9 +6,9 @@
 #include <arch.h>
 #include <asm_macros.S>
 #include <assert_macros.S>
-#include <cadence/cdns_uart.h>
 #define USE_FINISH_CONSOLE_REG_2
 #include <console_macros.S>
+#include <drivers/cadence/cdns_uart.h>
 
        /*
         * "core" functions are low-level implementations that don't require
index 9b80e2f2a18d579d8c32bf33dab76ca485bc8e0a..aadafbce23ce9f0baba9864f1a0d6c007e025d03 100644 (file)
@@ -5,8 +5,9 @@
  */
 
 #include <errno.h>
-#include <mmio.h>
-#include <v2m_flash.h>
+
+#include <drivers/cfi/v2m_flash.h>
+#include <lib/mmio.h>
 
 /*
  * This file supplies a low level interface to the vexpress NOR flash
index c678de09895feb5ab731ab8de41f49742e106b93..e94de35c7ce27d287a397c16c2ec0c16477bc1dc 100644 (file)
@@ -7,6 +7,7 @@
 #if MULTI_CONSOLE_API
 
 #include <assert.h>
+
 #include <drivers/console.h>
 
 console_t *console_list;
index 89be349c0eb790aee41edf4e6dfb637fffa714a1..4c14b69c5162ad4a7fff5ab5e7bbd1abc2dd9cec 100644 (file)
@@ -5,9 +5,9 @@
  */
 
 #include <asm_macros.S>
-#include <cbmem_console.h>
 #define USE_FINISH_CONSOLE_REG_2
 #include <console_macros.S>
+#include <drivers/coreboot/cbmem_console.h>
 
 /*
  * This driver implements access to coreboot's in-memory console
index feac3579fec5abcf9adbc41e392018126aa760e5..8c2996ec32cc2565f7b7bd7b3a00434bd14a1558 100644 (file)
@@ -5,9 +5,11 @@
  */
 
 #include <assert.h>
-#include <delay_timer.h>
+
 #include <platform_def.h>
-#include <utils_def.h>
+
+#include <drivers/delay_timer.h>
+#include <lib/utils_def.h>
 
 /***********************************************************
  * The delay timer implementation
index 03ca5321a73ffc833bbbd7ecbb941afc12cd8fa7..4b67ed0d148bec3b47ad91d44850a8514ef6d8d6 100644 (file)
@@ -4,13 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <debug.h>
-#include <delay_timer.h>
-#include <generic_delay_timer.h>
-#include <platform.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <drivers/generic_delay_timer.h>
+#include <plat/common/platform.h>
 
 /* Ticks elapsed in one second by a signal of 1 MHz */
 #define MHZ_TICKS_PER_SEC 1000000
index 62f3dc2539777236b7ecbed9dec0b6ba7db7ccb4..76612b253e1dbdaf2992546718ce2eb68bb68a12 100644 (file)
@@ -11,7 +11,8 @@
 
 #include <assert.h>
 #include <errno.h>
-#include <gpio.h>
+
+#include <drivers/gpio.h>
 
 /*
  * The gpio implementation
index bd364eb3075eac6866e3b1df677c5eb515e9fa36..464efe93fed83588c2c89c18d94a409eb6e4c1d6 100644 (file)
@@ -5,8 +5,10 @@
  */
 
 #include <assert.h>
-#include <delay_timer.h>
-#include <mmio.h>
+
+#include <drivers/delay_timer.h>
+#include <lib/mmio.h>
+
 #include <imx_gpt.h>
 
 #define GPTCR_SWR              BIT(15)         /* Software reset */
index 0250a41426569fe30b2083ee32bb79ea2e05a792..68d31c88702353bbe1c3ac8e87d8f0262b0b41fb 100644 (file)
@@ -3,10 +3,14 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include <arch.h>
+
 #include <stdint.h>
-#include <mmio.h>
+
 #include <platform_def.h>
+
+#include <arch.h>
+#include <lib/mmio.h>
+
 #include <imx_uart.h>
 
 /* TX/RX FIFO threshold */
index 1f9550e172945ef53af8600698a1ffde0dbb80c1..07f55b7843d8cdb8795b381d605d20d8821db177 100644 (file)
@@ -4,17 +4,19 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
-#include <delay_timer.h>
-#include <imx_usdhc.h>
-#include <mmc.h>
 #include <errno.h>
-#include <mmio.h>
 #include <string.h>
 
+#include <arch.h>
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <drivers/mmc.h>
+#include <lib/mmio.h>
+
+#include <imx_usdhc.h>
+
 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);
index 9ff3298dfdea9f0b92a50291ab6f90ab7dde69d4..e063316aeeb70e3311e1b8e8cf18a4e909985780 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef IMX_USDHC_H
 #define IMX_USDHC_H
 
-#include <mmc.h>
+#include <drivers/mmc.h>
 
 typedef struct imx_usdhc_params {
        uintptr_t       reg_base;
index ff13113afb45a5fdd37c5e9264a2fbfd1d1edb5f..f190a4307bd10119afd619eb8b2d24ec71885286 100644 (file)
@@ -5,14 +5,16 @@
  */
 
 #include <assert.h>
-#include <debug.h>
 #include <errno.h>
-#include <io_block.h>
-#include <io_driver.h>
-#include <io_storage.h>
-#include <platform_def.h>
 #include <string.h>
-#include <utils.h>
+
+#include <platform_def.h>
+
+#include <common/debug.h>
+#include <drivers/io/io_block.h>
+#include <drivers/io/io_driver.h>
+#include <drivers/io/io_storage.h>
+#include <lib/utils.h>
 
 typedef struct {
        io_block_dev_spec_t     *dev_spec;
index d4020e3a6dad4b5828f495aa105a862837f34077..4f0cda6daf18b5fd9cc942a0327e0db898a1f941 100644 (file)
@@ -5,12 +5,13 @@
  */
 
 #include <assert.h>
-#include <debug.h>
-#include <io_driver.h>
-#include <io_dummy.h>
-#include <io_storage.h>
 #include <string.h>
 
+#include <common/debug.h>
+#include <drivers/io/io_driver.h>
+#include <drivers/io/io_dummy.h>
+#include <drivers/io/io_storage.h>
+
 struct file_state {
        int in_use;
        size_t size;
index 9d6c763e8969bb92597a6c59fba4c25d76c05050..d4771b5147598700a513e21b7d847f2e62f86094 100644 (file)
@@ -5,19 +5,21 @@
  */
 
 #include <assert.h>
-#include <bl_common.h>
-#include <debug.h>
 #include <errno.h>
-#include <firmware_image_package.h>
-#include <io_driver.h>
-#include <io_fip.h>
-#include <io_storage.h>
-#include <platform.h>
-#include <platform_def.h>
 #include <stdint.h>
 #include <string.h>
-#include <utils.h>
-#include <uuid.h>
+
+#include <platform_def.h>
+
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/io/io_driver.h>
+#include <drivers/io/io_fip.h>
+#include <drivers/io/io_storage.h>
+#include <lib/utils.h>
+#include <plat/common/platform.h>
+#include <tools_share/firmware_image_package.h>
+#include <tools_share/uuid.h>
 
 #ifndef MAX_FIP_DEVICES
 #define MAX_FIP_DEVICES                1
index 5595e60a424909a8a7b295b0bbbdaa17c98ddcc4..96590b6c03a05486b8d4da6d8fee7d1dc0228ed2 100644 (file)
@@ -5,13 +5,15 @@
  */
 
 #include <assert.h>
-#include <debug.h>
-#include <io_driver.h>
-#include <io_memmap.h>
-#include <io_storage.h>
-#include <platform_def.h>
 #include <string.h>
-#include <utils.h>
+
+#include <platform_def.h>
+
+#include <common/debug.h>
+#include <drivers/io/io_driver.h>
+#include <drivers/io/io_memmap.h>
+#include <drivers/io/io_storage.h>
+#include <lib/utils.h>
 
 /* 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
index 9ca0a9dc9c2262dd3e0db38ef603f453045fc12f..23d09c1188911dde9c2cbd61bb80ffd57d1171bc 100644 (file)
@@ -5,13 +5,13 @@
  */
 
 #include <assert.h>
-#include <io_driver.h>
-#include <io_semihosting.h>
-#include <io_storage.h>
-#include <platform_def.h>
-#include <semihosting.h>
 
+#include <platform_def.h>
 
+#include <drivers/io/io_driver.h>
+#include <drivers/io/io_semihosting.h>
+#include <drivers/io/io_storage.h>
+#include <lib/semihosting.h>
 
 /* Identify the device type as semihosting */
 static io_type_t device_type_sh(void)
index 948f84813768d8c2204d4496cacd7adf9c1dbe4c..c9ff31bcc44b9afc6b1ef0efe7e2558628b2ec39 100644 (file)
@@ -5,11 +5,12 @@
  */
 
 #include <assert.h>
-#include <io_driver.h>
-#include <io_storage.h>
-#include <platform_def.h>
 #include <stddef.h>
 
+#include <platform_def.h>
+
+#include <drivers/io/io_driver.h>
+#include <drivers/io/io_storage.h>
 
 /* Storage for a fixed maximum number of IO entities, definable by platform */
 static io_entity_t entity_pool[MAX_IO_HANDLES];
index 16fe772dac788e0d545116c93f223d7cabbc34dd..1f671058d58edd54e8c3428887c5381b5f6ecffc 100644 (file)
@@ -7,9 +7,10 @@
 
 /* AXI to M-Bridge decoding unit driver for Marvell Armada 8K and 8K+ SoCs */
 
+#include <common/debug.h>
+#include <lib/mmio.h>
+
 #include <armada_common.h>
-#include <debug.h>
-#include <mmio.h>
 #include <mvebu.h>
 #include <mvebu_def.h>
 
index 841e6aeb4e07e310ddfec184d17038b6eba8c041..04c256b6145c274fe62d88a11e69887ae4627bd2 100644 (file)
@@ -5,10 +5,11 @@
  * https://spdx.org/licenses
  */
 
+#include <drivers/delay_timer.h>
+#include <drivers/marvell/aro.h>
+#include <lib/mmio.h>
+
 #include <a8k_plat_def.h>
-#include <aro.h>
-#include <delay_timer.h>
-#include <mmio.h>
 
 /* Notify bootloader on DRAM setup */
 #define AP807_CPU_ARO_CTRL(cluster)    \
index e13e6ce2f81930e6c741439430b2d442769f35a7..3df93a43ba45717a9d233b181b6c920efde4d5c1 100644 (file)
@@ -9,11 +9,13 @@
  * for Marvell SoCs in AP806, AP807, and AP810
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <cache_llc.h>
-#include <ccu.h>
-#include <mmio.h>
+
+#include <arch_helpers.h>
+#include <drivers/marvell/cache_llc.h>
+#include <drivers/marvell/ccu.h>
+#include <lib/mmio.h>
+
 #include <mvebu_def.h>
 
 #define CCU_HTC_CR(ap_index)           (MVEBU_CCU_BASE(ap_index) + 0x200)
index acb1c00c0bf053e0f8216c8bff731f8546273181..1e4ab44dafc66a9f6ad1067eec3c79e33ef3470c 100644 (file)
@@ -7,10 +7,11 @@
 
 /* CCU unit device driver for Marvell AP807, AP807 and AP810 SoCs */
 
+#include <common/debug.h>
+#include <drivers/marvell/ccu.h>
+#include <lib/mmio.h>
+
 #include <armada_common.h>
-#include <ccu.h>
-#include <debug.h>
-#include <mmio.h>
 #include <mvebu.h>
 #include <mvebu_def.h>
 
index 53a59b0f59569655a37c8bf2c660eba0d2663073..2e8c4128e757fb671875de097dbcc21bbe22a838 100644 (file)
@@ -5,13 +5,16 @@
  * https://spdx.org/licenses
  */
 
-#include <debug.h>
-#include <delay_timer.h>
 #include <errno.h>
-#include <mmio.h>
+
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <lib/mmio.h>
+#include <lib/spinlock.h>
+
 #include <mvebu.h>
 #include <mvebu_def.h>
-#include <spinlock.h>
+
 #include "phy-comphy-3700.h"
 #include "phy-comphy-common.h"
 
index 86e5f1c68e0748a888d318ebbd1a1caf7856402f..384dd39f23158ffd3e41f295754b81459b192ae9 100644 (file)
@@ -7,12 +7,14 @@
 
 /* Marvell CP110 SoC COMPHY unit driver */
 
-#include <debug.h>
-#include <delay_timer.h>
 #include <errno.h>
-#include <mmio.h>
+
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <lib/mmio.h>
+#include <lib/spinlock.h>
+
 #include <mvebu_def.h>
-#include <spinlock.h>
 #include "mvebu.h"
 #include "comphy-cp110.h"
 #include "phy-comphy-cp110.h"
index a4743eb5e22b3fcbf9882240afb624649e63ccbb..9d9430836519b2e2591e1d767f4332669f0131b6 100644 (file)
@@ -7,10 +7,11 @@
 
 /* GWIN unit device driver for Marvell AP810 SoC */
 
+#include <common/debug.h>
+#include <drivers/marvell/gwin.h>
+#include <lib/mmio.h>
+
 #include <armada_common.h>
-#include <debug.h>
-#include <gwin.h>
-#include <mmio.h>
 #include <mvebu.h>
 #include <mvebu_def.h>
 
index c0424e08617351b40fca3d6592ba0fd2d8dfbc29..c4257fa7c19558269bc70e353722b9da5b70af02 100644 (file)
@@ -7,10 +7,11 @@
 
 /* IO Window unit device driver for Marvell AP807, AP807 and AP810 SoCs */
 
+#include <common/debug.h>
+#include <drivers/marvell/io_win.h>
+#include <lib/mmio.h>
+
 #include <armada_common.h>
-#include <debug.h>
-#include <io_win.h>
-#include <mmio.h>
 #include <mvebu.h>
 #include <mvebu_def.h>
 
index e88bc16730a256a9e822e341da2bb7c624c58b4c..87f147aa40c105107b081cf63f08bbaa48bec02e 100644 (file)
@@ -7,11 +7,12 @@
 
 /* IOW unit device driver for Marvell CP110 and CP115 SoCs */
 
-#include <armada_common.h>
 #include <arch_helpers.h>
-#include <debug.h>
-#include <iob.h>
-#include <mmio.h>
+#include <common/debug.h>
+#include <drivers/marvell/iob.h>
+#include <lib/mmio.h>
+
+#include <armada_common.h>
 #include <mvebu.h>
 #include <mvebu_def.h>
 
index 0db3b8d0991e724705ea06aad721357aba90fdb9..52b300676922c1940a58d6096acb69415f351ff2 100644 (file)
@@ -5,10 +5,12 @@
  * https://spdx.org/licenses
  */
 
-#include <addr_map.h>
-#include <debug.h>
-#include <mmio.h>
+#include <common/debug.h>
+#include <drivers/marvell/addr_map.h>
+#include <lib/mmio.h>
+
 #include <mvebu_def.h>
+
 #include "mc_trustzone.h"
 
 #define TZ_SIZE(x)             ((x) >> 13)
index d36dcb5c09fcbfd72f2456e5ec5fcd2fac818b06..296dce8536a76b78a2d2c162242b2ff1571969f1 100644 (file)
@@ -8,7 +8,7 @@
 #ifndef MC_TRUSTZONE_H
 #define MC_TRUSTZONE_H
 
-#include <addr_map.h>
+#include <drivers/marvell/addr_map.h>
 
 #define MVEBU_TZ_MAX_WINS      16
 
index 721504e03af161305105aeb0e5b3addf35e57297..3a9859c98c79af9a2fe373cc6de41644ccea0d74 100644 (file)
@@ -7,10 +7,11 @@
 
 /* MCI bus driver for Marvell ARMADA 8K and 8K+ SoCs */
 
-#include <debug.h>
-#include <delay_timer.h>
-#include <mmio.h>
-#include <mci.h>
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <drivers/marvell/mci.h>
+#include <lib/mmio.h>
+
 #include <mvebu.h>
 #include <mvebu_def.h>
 #include <plat_marvell.h>
index 075ca31f833c9c1fc55a3d992c34f0652108011c..864c9230a1752cf52997d397bf25016a4966beaf 100644 (file)
@@ -7,13 +7,14 @@
 
 /* AP807 Marvell SoC driver */
 
-#include <ap_setup.h>
-#include <cache_llc.h>
-#include <ccu.h>
-#include <debug.h>
-#include <io_win.h>
-#include <mci.h>
-#include <mmio.h>
+#include <common/debug.h>
+#include <drivers/marvell/cache_llc.h>
+#include <drivers/marvell/ccu.h>
+#include <drivers/marvell/io_win.h>
+#include <drivers/marvell/mci.h>
+#include <drivers/marvell/mochi/ap_setup.h>
+#include <lib/mmio.h>
+
 #include <mvebu_def.h>
 
 #define SMMU_sACR                              (MVEBU_SMMU_BASE + 0x10)
index 1d33be93a07b244aade1eced8cfa7847193b899f..1e91c4317c071a5d394c310308d87a98cc4170db 100644 (file)
@@ -7,13 +7,14 @@
 
 /* AP806 Marvell SoC driver */
 
-#include <ap_setup.h>
-#include <ccu.h>
-#include <cache_llc.h>
-#include <debug.h>
-#include <io_win.h>
-#include <mci.h>
-#include <mmio.h>
+#include <common/debug.h>
+#include <drivers/marvell/ccu.h>
+#include <drivers/marvell/cache_llc.h>
+#include <drivers/marvell/io_win.h>
+#include <drivers/marvell/mci.h>
+#include <drivers/marvell/mochi/ap_setup.h>
+#include <lib/mmio.h>
+
 #include <mvebu_def.h>
 
 #define SMMU_sACR                              (MVEBU_SMMU_BASE + 0x10)
index 654bb62b2d1a33aa4a3a6221196bbfb0b8af16a0..d7d7373180bcf87bb26615dd41e38b61e41afa01 100644 (file)
@@ -7,11 +7,12 @@
 
 /* CP110 Marvell SoC driver */
 
-#include <amb_adec.h>
-#include <cp110_setup.h>
-#include <debug.h>
-#include <delay_timer.h>
-#include <iob.h>
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <drivers/marvell/amb_adec.h>
+#include <drivers/marvell/iob.h>
+#include <drivers/marvell/mochi/cp110_setup.h>
+
 #include <plat_marvell.h>
 
 /*
index c7ceb92918ac9b71a90d3853850c5c7a82db6ca9..a501ab44eab2403327529732c6dcc57b9fdaad2e 100644 (file)
@@ -7,8 +7,8 @@
 
 /* Driver for thermal unit located in Marvell ARMADA 8K and compatible SoCs */
 
-#include <debug.h>
-#include <thermal.h>
+#include <common/debug.h>
+#include <drivers/marvell/thermal.h>
 
 int marvell_thermal_init(struct tsen_config *tsen_cfg)
 {
index 25c21cfcd8e1491ed86fc5647a15aa9d0c213e48..cc3855dbb796a51ae5083619eec5d000694e0b2d 100644 (file)
@@ -7,9 +7,9 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <a3700_console.h>
 #define USE_FINISH_CONSOLE_REG_2
 #include <console_macros.S>
+#include <drivers/marvell/uart/a3700_console.h>
 
        /*
         * "core" functions are low-level implementations that don't require
index 8ebd9662b14e353070c9466151ee84e878a1fac1..1cdcf7478cb2699bd1c58531d681db65d0900bc9 100644 (file)
  * for Marvell and Allwinner SoCs in ATF.
  */
 
-#include <debug.h>
-#include <delay_timer.h>
 #include <errno.h>
-#include <mentor/mi2cv.h>
+
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <drivers/mentor/mi2cv.h>
+#include <lib/mmio.h>
+
 #include <mentor_i2c_plat.h>
-#include <mmio.h>
 
 #if LOG_LEVEL >= LOG_LEVEL_VERBOSE
 #define DEBUG_I2C
index eaee10ef1e8888edc5417aa8e6971c4c817a6bea..5cf9b8878584570938c3b4a5e38491e7f33187c2 100644 (file)
@@ -8,7 +8,7 @@
 #include <assert_macros.S>
 #define USE_FINISH_CONSOLE_REG_2
 #include <console_macros.S>
-#include <meson_console.h>
+#include <drivers/meson/meson_console.h>
 
        .globl console_meson_register
        .globl console_meson_init
index 4160003c8f6150dfbe69bcbef89b2d16d1a3320c..50e87c1db4f29beceb626a21f6b4a0b2e7ed32bd 100644 (file)
@@ -6,15 +6,16 @@
 
 /* Define a simple and generic interface to access eMMC and SD-card devices. */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
-#include <delay_timer.h>
 #include <errno.h>
-#include <mmc.h>
 #include <stdbool.h>
 #include <string.h>
-#include <utils.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <drivers/mmc.h>
+#include <lib/utils.h>
 
 #define MMC_DEFAULT_MAX_RETRIES                5
 #define SEND_OP_COND_MAX_RETRIES       100
index 0c51e62a87864b223fa163f9d1c6ee720ec0113b..4577f06a20bf468e359e9eba31fe4bde9b9eb32c 100644 (file)
@@ -5,11 +5,12 @@
  */
 
 #include <assert.h>
-#include <debug.h>
 #include <errno.h>
-#include <gpt.h>
 #include <string.h>
-#include <utils.h>
+
+#include <common/debug.h>
+#include <drivers/partition/gpt.h>
+#include <lib/utils.h>
 
 static int unicode_to_ascii(unsigned short *str_in, unsigned char *str_out)
 {
index 6085b8651ba2ae4d5584ee8da2b8376bed358304..07869acf50789f95c47b51663b05294b69186deb 100644 (file)
@@ -5,15 +5,16 @@
  */
 
 #include <assert.h>
-#include <debug.h>
-#include <gpt.h>
-#include <io_storage.h>
-#include <mbr.h>
-#include <partition.h>
-#include <platform.h>
 #include <stdio.h>
 #include <string.h>
 
+#include <common/debug.h>
+#include <drivers/io/io_storage.h>
+#include <drivers/partition/partition.h>
+#include <drivers/partition/gpt.h>
+#include <drivers/partition/mbr.h>
+#include <plat/common/platform.h>
+
 static uint8_t mbr_sector[PARTITION_BLOCK_SIZE];
 partition_entry_list_t list;
 
index 04ed2792877e03edd922267340bcd6f48d2afb5e..d9446d95e0a309792c797464f39eca858dad6fd7 100644 (file)
@@ -5,13 +5,15 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
-#include <debug.h>
-#include <mmio.h>
-#include <platform.h>
-#include <platform_def.h>
 #include <stddef.h>
 
+#include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
+
 #include "rom_api.h"
 
 typedef int32_t(*secure_boot_api_f) (uint32_t a, uint32_t b, void *c);
index 80a7c91909b2a1aa4929756bc8546d93245e72e7..647869ede4ff2dc367d17a7b2dd877f103439aa8 100644 (file)
@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <mmio.h>
-#include <debug.h>
-#include <utils_def.h>
+#include <common/debug.h>
+#include <lib/mmio.h>
+#include <lib/utils_def.h>
+
 #include "cpg_registers.h"
 #include "avs_driver.h"
 #include "rcar_def.h"
index 147a0b0c38aefccae3eba3c987771157106d81f6..f15e06bc08c3d3329deb060bc9737e6e15cecbab 100644 (file)
@@ -6,9 +6,12 @@
  */
 
 #include <stdint.h>
+
+#include <lib/utils_def.h>
+
 #include <iic_dvfs.h>
+
 #include "board.h"
-#include "utils_def.h"
 
 #ifndef BOARD_DEFAULT
 #if (RCAR_LSI == RCAR_E3)
index e82e8b52142ba3e7ed877dcc4cd18b70f3f2cfec..42bdce5797d17f88faad2a025026bb435229c8aa 100644 (file)
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <mmio.h>
+#include <lib/mmio.h>
+
 #include "rcar_private.h"
 
 void
index 9321b584ad54431b2db04689c7c32dcd9eef1734..2a6e2c00324122fc8e9acd51220c176b92600004 100644 (file)
@@ -4,16 +4,18 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
 #include <stdarg.h>
 #include <stdint.h>
 
-#include       <arch_helpers.h>
-#include       <platform_def.h>
-#include       <bakery_lock.h>
-#include       "rcar_def.h"
-#include       "rcar_private.h"
-#include       "rcar_printf.h"
+#include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <lib/bakery_lock.h>
+
+#include "rcar_def.h"
+#include "rcar_private.h"
+#include "rcar_printf.h"
 
 #define INDEX_TIMER_COUNT      (4U)
 
index 92e438a4f13c7c9a9e42eaaefa0c58cc9dc30808..d7192f48d94be7f22fe0c41f7ab4b4dfa62eee26 100644 (file)
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <mmio.h>
+#include <lib/mmio.h>
 
 #define SCLK                   8       /* GP_6_8 */
 #define SSTBZ                  3       /* GP_2_3 */
index 458959fd8d08a198ba06e550d09e91a0bb8ae62c..4e4b28babc8e143803edb3bc1a9ef6bb5ede2fa7 100644 (file)
@@ -10,7 +10,7 @@
 #define TMU3_MEASUREMENT       (0)
 
 #ifndef __ASSEMBLY__
-#include "stdint.h"
+#include <stdint.h>
 void rcar_micro_delay(uint32_t count_us);
 
 #if (TMU3_MEASUREMENT == 1)
index d4fa65d2633aeee347b931688690b29004e17cbf..fef55c477abdc9fd5868b23df8a9b84fa8130c1e 100644 (file)
@@ -5,12 +5,14 @@
  */
 
 #include <stdint.h>
-#include <arch_helpers.h>
 #include <string.h>
-#include <mmio.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <lib/mmio.h>
+
 #include "rcar_def.h"
 #include "cpg_registers.h"
-#include "debug.h"
 #include "rcar_private.h"
 
 /* DMA CHANNEL setting (0/16/32) */
index 0f393490ccdb34a660f4c0b2369037b08832c6b1..a2e25e3394951cf3a66793e15d5e181032a233ba 100644 (file)
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
+#include <common/debug.h>
+
 #include "emmc_config.h"
 #include "emmc_hal.h"
 #include "emmc_std.h"
index 386fb1e4ec1159949af170bbb1b6e1195f4d6d68..b27e165862b189550c27be883477034c18bac09f 100644 (file)
@@ -5,7 +5,9 @@
  */
 
 #include <stddef.h>
-#include <mmio.h>
+
+#include <lib/mmio.h>
+
 #include "emmc_config.h"
 #include "emmc_hal.h"
 #include "emmc_std.h"
index 3077db4c0366247c91327ea4bdb115e4a28e9893..37a3cf9d43fa19e6078c0b665d2844f2de2650d5 100644 (file)
@@ -5,6 +5,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <stddef.h>
+
+#include <lib/mmio.h>
 
 #include "emmc_config.h"
 #include "emmc_def.h"
@@ -13,9 +16,6 @@
 #include "emmc_std.h"
 #include "rcar_def.h"
 
-#include <mmio.h>
-#include <stddef.h>
-
 static EMMC_ERROR_CODE emmc_trans_sector(uint32_t *buff_address_virtual);
 
 uint32_t emmc_interrupt(void)
index 9a7d2cad63a6ddb93a2b3c9e83d19503fec64a8e..dd57b0c24929ed98c8e0223521ca7debe0db9d74 100644 (file)
@@ -4,8 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
-#include <mmio.h>
+#include <common/debug.h>
+#include <lib/mmio.h>
+
 #include "emmc_config.h"
 #include "emmc_hal.h"
 #include "emmc_std.h"
index b11c2c43efa208c98836361cce966abc42416c95..390d0caac1e7477b61915bda57a2772c50ae49a5 100644 (file)
@@ -3,7 +3,9 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
+
 #include <arch_helpers.h>
+
 #include "emmc_config.h"
 #include "emmc_hal.h"
 #include "emmc_std.h"
index e64947ddc76f5674044613077b1b5c336ad6cafb..39d9ede5ac8657c04708080b04f803e937b61507 100644 (file)
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
+#include <common/debug.h>
+
 #include "emmc_config.h"
 #include "emmc_hal.h"
 #include "emmc_std.h"
index 11d52bf76d25113ebd90b8986ee48bda54749551..39b9bb4e3c6fba7eaaa7e0ebef690e8589b73434 100644 (file)
@@ -4,8 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <mmio.h>
-#include <debug.h>
+#include <common/debug.h>
+#include <lib/mmio.h>
+
 #include "rcar_def.h"
 #include "cpg_registers.h"
 #include "iic_dvfs.h"
index f74bd5f4ead1a39acf61d662c2b6712c464f3c68..4b464fb3e40aa1fa277daf2ee5a4952b88507b77 100644 (file)
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
-#include <io_driver.h>
-#include <io_storage.h>
 #include <string.h>
 
+#include <common/debug.h>
+#include <drivers/io/io_driver.h>
+#include <drivers/io/io_storage.h>
+
 #include "io_common.h"
 #include "io_emmcdrv.h"
 #include "io_private.h"
index e55fd64665eeacc91c1a43013d7bd68683e8362c..3f6b4c71b1a18dc359e051a6103e4918334bdc72 100644 (file)
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
-#include <io_driver.h>
-#include <io_storage.h>
 #include <string.h>
 
+#include <common/debug.h>
+#include <drivers/io/io_driver.h>
+#include <drivers/io/io_storage.h>
+
 #include "io_common.h"
 #include "io_private.h"
 #include "io_memdrv.h"
index 4293c51c583c730ab8e85c3574e4ff03a0d5e0f4..650931bb4517a6269c1b77b916568386477029bb 100644 (file)
@@ -4,23 +4,27 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <auth_mod.h>
-#include <bl_common.h>
-#include <debug.h>
 #include <errno.h>
-#include <firmware_image_package.h>
-#include <io_driver.h>
-#include <io_storage.h>
-#include <platform.h>
-#include <platform_def.h>
 #include <stdint.h>
 #include <string.h>
-#include <uuid.h>
-#include <mmio.h>
+
+#include <platform_def.h>
+
 #include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/auth/auth_mod.h>
+#include <drivers/io/io_driver.h>
+#include <drivers/io/io_storage.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
+#include <tools_share/firmware_image_package.h>
+#include <tools_share/uuid.h>
+
 #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);
 
index 6dfc0b69f4adc5e642764ed4ec13ea5d6ac42e5a..8cdfe75e54079e90ffb965d1f4fb15ecadfde717 100644 (file)
@@ -4,14 +4,16 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bakery_lock.h>
-#include <debug.h>
-#include <mmio.h>
 #include <string.h>
-#include <xlat_tables_v2.h>
+
+#include <arch.h>
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <lib/bakery_lock.h>
+#include <lib/mmio.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
+
 #include "iic_dvfs.h"
 #include "rcar_def.h"
 #include "rcar_private.h"
index c14de55b6a314b614c4efab13d4deee6dcc6f408..be38fbff3f993a7fc4b81ffec42f1832c8aa6445 100644 (file)
@@ -4,8 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <mmio.h>
 #include <stdint.h>
+
+#include <lib/mmio.h>
+
 #include "rcar_def.h"
 #include "rom_api.h"
 
index bc7424ac6131f3e5cff9864f70beaa0b65672f0f..bea27521013f2e8cf381b3e290356f6b29a5edb0 100644 (file)
@@ -4,12 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <mmio.h>
 #include <stdint.h>
 #include <string.h>
+
+#include <common/debug.h>
+#include <lib/mmio.h>
+
 #include "cpg_registers.h"
 #include "rpc_registers.h"
-#include "debug.h"
 #include "rcar_private.h"
 
 #define MSTPSR9_RPC_BIT                (0x00020000U)
index f9dbf86fe40b9dff65ce63d44ff109b8203e6f06..42f865349566547ca8830d6823fcb05eafcba817 100644 (file)
@@ -5,9 +5,10 @@
  */
 
 #include <arch_helpers.h>
-#include <debug.h>
-#include <gicv2.h>
-#include <mmio.h>
+#include <common/debug.h>
+#include <drivers/arm/gicv2.h>
+#include <lib/mmio.h>
+
 #include "rcar_def.h"
 
 extern void gicd_set_icenabler(uintptr_t base, unsigned int id);
index b8457cb37b6cfc912b89a852209cd942b6b6f010..7a8898672dd5b540f7c48b2d76853b0b3164c4e7 100644 (file)
@@ -4,26 +4,29 @@
  * SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
  */
 
-#include <arch.h>
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
-#include <delay_timer.h>
-#include <dt-bindings/clock/stm32mp1-clks.h>
-#include <dt-bindings/clock/stm32mp1-clksrc.h>
 #include <errno.h>
-#include <generic_delay_timer.h>
-#include <libfdt.h>
-#include <mmio.h>
-#include <platform.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <stm32mp1_clk.h>
-#include <stm32mp1_clkfunc.h>
+
+#include <libfdt.h>
+
+#include <arch.h>
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <drivers/generic_delay_timer.h>
+#include <drivers/st/stm32mp1_clk.h>
+#include <drivers/st/stm32mp1_clkfunc.h>
+#include <drivers/st/stm32mp1_rcc.h>
+#include <dt-bindings/clock/stm32mp1-clks.h>
+#include <dt-bindings/clock/stm32mp1-clksrc.h>
+#include <lib/mmio.h>
+#include <lib/utils_def.h>
+#include <plat/common/platform.h>
+
 #include <stm32mp1_dt.h>
 #include <stm32mp1_private.h>
-#include <stm32mp1_rcc.h>
-#include <utils_def.h>
 
 #define MAX_HSI_HZ     64000000
 
index 078d803e700ee30f3e77041654831358541f2ae7..179191945f9ee49e3c99dde13ec8e5c729a7823b 100644 (file)
@@ -4,11 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <dt-bindings/clock/stm32mp1-clksrc.h>
 #include <errno.h>
+
 #include <libfdt.h>
-#include <stm32mp1_clk.h>
-#include <stm32mp1_clkfunc.h>
+
+#include <drivers/st/stm32mp1_clk.h>
+#include <drivers/st/stm32mp1_clkfunc.h>
+#include <dt-bindings/clock/stm32mp1-clksrc.h>
+
 #include <stm32mp1_dt.h>
 
 #define DT_RCC_NODE_NAME       "rcc@50000000"
index eed1d7613d4a4d6e43239f9c2b76c2033d570214..a2b0e9ec05b48a57d0a57a99ba04dd64dc720f94 100644 (file)
@@ -4,22 +4,25 @@
  * SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
  */
 
+#include <stddef.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <debug.h>
-#include <delay_timer.h>
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <drivers/st/stm32mp1_clk.h>
+#include <drivers/st/stm32mp1_ddr.h>
+#include <drivers/st/stm32mp1_ddr_regs.h>
+#include <drivers/st/stm32mp1_pmic.h>
+#include <drivers/st/stm32mp1_pwr.h>
+#include <drivers/st/stm32mp1_ram.h>
+#include <drivers/st/stm32mp1_rcc.h>
 #include <dt-bindings/clock/stm32mp1-clks.h>
-#include <mmio.h>
-#include <platform.h>
-#include <stddef.h>
-#include <stm32mp1_clk.h>
-#include <stm32mp1_ddr.h>
-#include <stm32mp1_ddr_regs.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
+
+#include <stm32mp1_def.h>
 #include <stm32mp1_dt.h>
-#include <stm32mp1_pmic.h>
-#include <stm32mp1_pwr.h>
-#include <stm32mp1_ram.h>
-#include <stm32mp1_rcc.h>
 
 struct reg_desc {
        const char *name;
index 325c0b897a016b9929c27ac61558a3a6597d112e..a8c1b7769a50c324fae4f37f056adaa61157d48c 100644 (file)
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <mmio.h>
 #include <platform_def.h>
-#include <stm32mp1_ddr_helpers.h>
-#include <stm32mp1_rcc.h>
+
+#include <drivers/st/stm32mp1_ddr_helpers.h>
+#include <drivers/st/stm32mp1_rcc.h>
+#include <lib/mmio.h>
 
 void ddr_enable_clock(void)
 {
index 6d515ec76a982623cfc6085ea06627c7bb788fee..1c821791799c75eb1240a024ed2026cc77cff00b 100644 (file)
@@ -4,21 +4,25 @@
  * SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
  */
 
-#include <arch_helpers.h>
-#include <boot_api.h>
-#include <debug.h>
-#include <dt-bindings/clock/stm32mp1-clks.h>
 #include <errno.h>
+
 #include <libfdt.h>
-#include <mmio.h>
+
 #include <platform_def.h>
-#include <stm32mp1_clk.h>
-#include <stm32mp1_ddr.h>
-#include <stm32mp1_ddr_helpers.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/st/stm32mp1_clk.h>
+#include <drivers/st/stm32mp1_ddr.h>
+#include <drivers/st/stm32mp1_ddr_helpers.h>
+#include <drivers/st/stm32mp1_ram.h>
+#include <drivers/st/stm32mp1_rcc.h>
+#include <dt-bindings/clock/stm32mp1-clks.h>
+#include <lib/mmio.h>
+
+#include <boot_api.h>
 #include <stm32mp1_dt.h>
 #include <stm32mp1_private.h>
-#include <stm32mp1_ram.h>
-#include <stm32mp1_rcc.h>
 
 #define DDR_PATTERN    0xAAAAAAAAU
 #define DDR_ANTIPATTERN        0x55555555U
index 200b47340a2e167bcef94a8a92b230c94678af77..9591e3738d3d922ce450dbbd50c62e78ee3731b6 100644 (file)
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
-#include <debug.h>
-#include <mmio.h>
 #include <stdbool.h>
-#include <stm32_gpio.h>
+
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/st/stm32_gpio.h>
+#include <lib/mmio.h>
 
 static bool check_gpio(uint32_t bank, uint32_t pin)
 {
index 1ed2620576f139ad8d04b511e89472c85265b391..a239b5f3ad8e3cb4129f909327e2bc4ac6f21fae 100644 (file)
@@ -5,15 +5,16 @@
  */
 
 #include <assert.h>
-#include <debug.h>
 #include <errno.h>
-#include <io_driver.h>
-#include <io_mmc.h>
-#include <io_storage.h>
-#include <mmc.h>
-#include <stm32_sdmmc2.h>
 #include <string.h>
 
+#include <common/debug.h>
+#include <drivers/io/io_driver.h>
+#include <drivers/io/io_storage.h>
+#include <drivers/mmc.h>
+#include <drivers/st/io_mmc.h>
+#include <drivers/st/stm32_sdmmc2.h>
+
 /* 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,
index e6798e04799ecd946f85f3b81115e365013b7ff7..ba612e2e9333a08539bea99944bc91036e745212 100644 (file)
@@ -5,17 +5,20 @@
  */
 
 #include <assert.h>
-#include <boot_api.h>
-#include <debug.h>
 #include <errno.h>
-#include <io_driver.h>
-#include <io_stm32image.h>
-#include <io_storage.h>
-#include <platform.h>
-#include <platform_def.h>
 #include <stdint.h>
 #include <string.h>
-#include <utils.h>
+
+#include <platform_def.h>
+
+#include <common/debug.h>
+#include <drivers/io/io_driver.h>
+#include <drivers/io/io_storage.h>
+#include <drivers/st/io_stm32image.h>
+#include <lib/utils.h>
+#include <plat/common/platform.h>
+
+#include <boot_api.h>
 
 static uintptr_t backend_dev_handle;
 static uintptr_t backend_image_spec;
index db5158156803b055812974a6f9977fb9e1967ad7..787241d597486c98e1664bde7846639cd9b8aee5 100644 (file)
@@ -4,25 +4,27 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <assert.h>
+#include <errno.h>
+#include <string.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <assert.h>
-#include <debug.h>
-#include <delay_timer.h>
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <drivers/mmc.h>
+#include <drivers/st/stm32_sdmmc2.h>
+#include <drivers/st/stm32mp1_clk.h>
+#include <drivers/st/stm32mp1_rcc.h>
+#include <drivers/st/stm32mp1_reset.h>
 #include <dt-bindings/clock/stm32mp1-clks.h>
 #include <dt-bindings/reset/stm32mp1-resets.h>
-#include <errno.h>
 #include <libfdt.h>
-#include <mmc.h>
-#include <mmio.h>
-#include <platform.h>
-#include <stm32_sdmmc2.h>
-#include <stm32mp1_clk.h>
+#include <lib/mmio.h>
+#include <lib/utils.h>
+#include <plat/common/platform.h>
+
 #include <stm32mp1_dt.h>
-#include <stm32mp1_rcc.h>
-#include <stm32mp1_reset.h>
-#include <string.h>
-#include <utils.h>
 
 /* Registers offsets */
 #define SDMMC_POWER                    0x00U
index 09801394795509fb474c84232ba7aeaa58f05c91..f861ba29634a42fd47a56e2258aedbfb385a3d00 100644 (file)
@@ -4,13 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
-#include <delay_timer.h>
 #include <errno.h>
-#include <mmio.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <stm32_i2c.h>
+
+#include <arch_helpers.h>
+#include <drivers/delay_timer.h>
+#include <drivers/st/stm32_i2c.h>
+#include <lib/mmio.h>
 
 /* STM32 I2C registers offsets */
 #define I2C_CR1                        0x00U
index 958de08d97f1a1f9f83c44391db025794145a073..ee4402762f010fdd6a62215c6713d20b89d6f6b8 100644 (file)
@@ -4,20 +4,24 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
-#include <delay_timer.h>
 #include <errno.h>
+#include <stdbool.h>
+
 #include <libfdt.h>
-#include <mmio.h>
-#include <mmio.h>
+
 #include <platform_def.h>
-#include <stdbool.h>
-#include <stm32_gpio.h>
-#include <stm32mp1_clk.h>
+
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <drivers/st/stm32_gpio.h>
+#include <drivers/st/stm32mp1_clk.h>
+#include <drivers/st/stm32mp1_pmic.h>
+#include <drivers/st/stpmu1.h>
+#include <lib/mmio.h>
+#include <lib/utils_def.h>
+
+#include <stm32mp1_def.h>
 #include <stm32mp1_dt.h>
-#include <stm32mp1_pmic.h>
-#include <stpmu1.h>
-#include <utils_def.h>
 
 /* I2C Timing hard-coded value, for I2C clock source is HSI at 64MHz */
 #define I2C_TIMING                     0x10D07DB5
index 5951899a1a6b92e627ee2d2036a17eec6f3f6951..9c36bf64a72cc0299cd1e780149ec4d6eefceee1 100644 (file)
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
-#include <platform.h>
-#include <stpmu1.h>
 #include <string.h>
 
+#include <common/debug.h>
+#include <drivers/st/stpmu1.h>
+#include <plat/common/platform.h>
+
 struct regul_struct {
        const char *dt_node_name;
        const uint16_t *voltage_table;
index 106bbfe624c5486e7e8b7577cc94fe1013ad6207..f58e10b27b2fe28ddb47524adf1bb09d69ba63fe 100644 (file)
@@ -4,14 +4,16 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
-#include <debug.h>
 #include <limits.h>
-#include <mmio.h>
+
 #include <platform_def.h>
-#include <stm32mp1_rcc.h>
-#include <stm32mp1_reset.h>
-#include <utils_def.h>
+
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/st/stm32mp1_rcc.h>
+#include <drivers/st/stm32mp1_reset.h>
+#include <lib/mmio.h>
+#include <lib/utils_def.h>
 
 #define RST_CLR_OFFSET 4U
 
index 303d6bac7551fe8bd6f7b2fb349f76ef847d8f2e..4d00e68ab3c04a77227307bc30e4ad30d7d28ca7 100644 (file)
@@ -7,8 +7,8 @@
 #include <assert_macros.S>
 #define USE_FINISH_CONSOLE_REG_2
 #include <console_macros.S>
-#include <stm32_console.h>
-#include <stm32_uart_regs.h>
+#include <drivers/st/stm32_console.h>
+#include <drivers/st/stm32_uart_regs.h>
 
 #define USART_TIMEOUT          0x1000
 
index 716d15d18dc5041abcdd8eb77b0f7a7f24f1eda8..74677f64c3aa50cb1125801cd8b2b1d19443c8c0 100644 (file)
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-
 #include <stdint.h>
-#include <debug.h>
+
+#include <common/debug.h>
 
 #include "boot_init_dram_regdef_e3.h"
 #include "ddr_init_e3.h"
index d7291315f6117ab76f352e288fad1b881a78254f..841eeb4732059a664bbe7f260238086d2ac031d5 100644 (file)
@@ -7,8 +7,10 @@
 #include <stdint.h>
 #include <string.h>
 #include <stdio.h>
-#include <mmio.h>
-#include <debug.h>
+
+#include <common/debug.h>
+#include <lib/mmio.h>
+
 #include "ddr_regdef.h"
 #include "init_dram_tbl_h3.h"
 #include "init_dram_tbl_m3.h"
index 4bf6942e0336ee99a48639ea3b5d430c8814740c..82aa7f84d057f4e90b01851ac25dfcc7e65d6fac 100644 (file)
@@ -4,8 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <mmio.h>
-#include <debug.h>
+#include <common/debug.h>
+#include <lib/mmio.h>
+
 #include "dram_sub_func.h"
 
 #define PRR                            (0xFFF00044U)
index d75aa7c346e92b09d1062d0bcab411fe1716f6c8..47fa837b3ff070f0697d8ad19d2bfabf4e12389b 100644 (file)
@@ -5,7 +5,9 @@
  */
 
 #include <stdint.h>            /* for uint32_t */
-#include <mmio.h>
+
+#include <lib/mmio.h>
+
 #include "pfc_init_e3.h"
 #include "rcar_def.h"
 
index 1c38f0600dccf86a71204dc7bd420a4d5a470e03..f31d99e5696e2c02f2bc245ffd980571be1109bf 100644 (file)
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <stdint.h>            /* for uint32_t */
-#include <mmio.h>
+#include <stdint.h>
 
+#include <lib/mmio.h>
 
 /* GPIO base address */
 #define        GPIO_BASE               (0xE6050000U)
index 3ed0cd3e415ae102bf989325cf0dd9412e29eeee..e53235a20edb14d842e482f3524554a3c5d4657f 100644 (file)
@@ -5,7 +5,9 @@
  */
 
 #include <stdint.h>            /* for uint32_t */
-#include <mmio.h>
+
+#include <lib/mmio.h>
+
 #include "pfc_init_h3_v2.h"
 #include "rcar_def.h"
 
index 911ee8cc9cd16a72fb787590c6c5136490c1abd7..f7e66f24585ef46e34a9e08d306e7d13d08485f1 100644 (file)
@@ -5,7 +5,9 @@
  */
 
 #include <stdint.h>            /* for uint32_t */
-#include <mmio.h>
+
+#include <lib/mmio.h>
+
 #include "pfc_init_m3.h"
 #include "rcar_def.h"
 #include "rcar_private.h"
index a2b6b34a102c7b184e26f2d859adce95117ab74e..e6b8a4f2842e9cb8be3d37e7fafe890efb9b40c4 100644 (file)
@@ -5,7 +5,9 @@
  */
 
 #include <stdint.h>            /* for uint32_t */
-#include <mmio.h>
+
+#include <lib/mmio.h>
+
 #include "pfc_init_m3n.h"
 #include "rcar_def.h"
 
index fceff3dddc9b4d01e21ddc1f160322e3f74ca94e..f20e8b0b556cb9ca94d8cf43a6638868c0a780b8 100644 (file)
@@ -5,8 +5,10 @@
  */
 
 #include <stdint.h>
-#include <debug.h>
-#include <mmio.h>
+
+#include <common/debug.h>
+#include <lib/mmio.h>
+
 #include "rcar_def.h"
 #if RCAR_LSI == RCAR_AUTO
 #include "H3/pfc_init_h3_v1.h"
index efe0c754d3a64e6d5e8d8ada2047f7e3829d93f1..593fefb6249d5fc2e912eb4dd35b987709c3c168 100644 (file)
@@ -5,7 +5,9 @@
  */
 
 #include <stdint.h>
-#include <debug.h>
+
+#include <common/debug.h>
+
 #include "../qos_common.h"
 #include "../qos_reg.h"
 #include "qos_init_e3_v10.h"
index fd81187c88a176ec6485a9ba5b1bf0ca8af77309..21aa3df039f02b19ecea56f9dc09260e85b67372 100644 (file)
@@ -5,7 +5,9 @@
  */
 
 #include <stdint.h>
-#include <debug.h>
+
+#include <common/debug.h>
+
 #include "../qos_common.h"
 #include "qos_init_h3_v10.h"
 
index 1f656005067d65c69d9a76fdeb5debf05ceea5ed..5b7348ce0ae8230af1ce6596f5161602cc43b41a 100644 (file)
@@ -5,8 +5,11 @@
  */
 
 #include <stdint.h>
-#include <debug.h>
+
+#include <common/debug.h>
+
 #include <rcar_def.h>
+
 #include "../qos_common.h"
 #include "qos_init_h3_v11.h"
 
index 6922360655cc54fe94fcabf35f147ed71394960d..f27a7dce6416dfeb176e49d25375e07f0544cb24 100644 (file)
@@ -5,7 +5,9 @@
  */
 
 #include <stdint.h>
-#include <debug.h>
+
+#include <common/debug.h>
+
 #include "../qos_common.h"
 #include "../qos_reg.h"
 #include "qos_init_h3_v20.h"
index 5986a3948363b4b1f1231193d07b9fa8e8c184df..b3e65df9402adbdaf9005d4a37df6e442087eb77 100644 (file)
@@ -5,7 +5,9 @@
  */
 
 #include <stdint.h>
-#include <debug.h>
+
+#include <common/debug.h>
+
 #include "../qos_common.h"
 #include "../qos_reg.h"
 #include "qos_init_h3_v30.h"
index 58c37160ed6a61d02822e4c8e2ab148d973f88d4..e4909b9c1d7e51768d2f419087f537c6d372bd7b 100644 (file)
@@ -5,7 +5,9 @@
  */
 
 #include <stdint.h>
-#include <debug.h>
+
+#include <common/debug.h>
+
 #include "../qos_common.h"
 #include "../qos_reg.h"
 #include "qos_init_h3n_v30.h"
index a0d1e147335a98b59183f9daa7e27a81c455e702..c0846d2e2550cf8dbf885c5f0e1cb35876f55976 100644 (file)
@@ -5,7 +5,9 @@
  */
 
 #include <stdint.h>
-#include <debug.h>
+
+#include <common/debug.h>
+
 #include "../qos_common.h"
 #include "qos_init_m3_v10.h"
 
index fc0d2cce1ef4b89d8bc1e08d731387c2377d10d6..3186cf68f9bb849487c6941fd7da77a14721e32d 100644 (file)
@@ -5,7 +5,9 @@
  */
 
 #include <stdint.h>
-#include <debug.h>
+
+#include <common/debug.h>
+
 #include "../qos_common.h"
 #include "../qos_reg.h"
 #include "qos_init_m3_v11.h"
index e9d66761ed4c0eaf2c1ba155d33e3cf685973c9b..0be68c3cd601869f5d878f4bd37109fbba9507b3 100644 (file)
@@ -5,7 +5,9 @@
  */
 
 #include <stdint.h>
-#include <debug.h>
+
+#include <common/debug.h>
+
 #include "../qos_common.h"
 #include "../qos_reg.h"
 #include "qos_init_m3n_v10.h"
index 54c880309c51a058d1a30361d206b898cc7b47fc..1d1bcd59f15c2f6019650d2ffd3ccce0156e179e 100644 (file)
@@ -5,8 +5,10 @@
  */
 
 #include <stdint.h>
-#include <debug.h>
-#include <mmio.h>
+
+#include <common/debug.h>
+#include <lib/mmio.h>
+
 #include "qos_init.h"
 #include "qos_common.h"
 #if RCAR_LSI == RCAR_AUTO
index eb428198ffc59ebe50179f96db3c89ff7f17debe..0c5c645701c76219bc4103b9149fe9b826f754e9 100644 (file)
@@ -4,17 +4,18 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
-#include <delay_timer.h>
-#include <dw_mmc.h>
 #include <errno.h>
-#include <mmc.h>
-#include <mmio.h>
 #include <string.h>
 
+#include <arch.h>
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <drivers/mmc.h>
+#include <drivers/synopsys/dw_mmc.h>
+#include <lib/mmio.h>
+
 #define DWMMC_CTRL                     (0x00)
 #define CTRL_IDMAC_EN                  (1 << 25)
 #define CTRL_DMA_EN                    (1 << 5)
index b0ea3e7377ab8eceb8b7e5ee0fcd7c17309d8b4b..c7c8fc22d2491d6120bff5e4a496e169a1cceeac 100644 (file)
@@ -5,12 +5,13 @@
  */
 
 #include <assert.h>
-#include <debug.h>
-#include <dw_ufs.h>
-#include <mmio.h>
 #include <stdint.h>
 #include <string.h>
-#include <ufs.h>
+
+#include <common/debug.h>
+#include <drivers/dw_ufs.h>
+#include <drivers/ufs.h>
+#include <lib/mmio.h>
 
 static int dwufs_phy_init(ufs_params_t *params)
 {
index 785b640dd21c463f278a3f62aa70b6ce92b81287..3180593ad96234c00039e56c5d59a63be266d127 100644 (file)
@@ -9,7 +9,7 @@
 #include <assert_macros.S>
 #define USE_FINISH_CONSOLE_REG_2
 #include <console_macros.S>
-#include <uart_16550.h>
+#include <drivers/ti/uart/uart_16550.h>
 
        /*
         * "core" functions are low-level implementations that don't require
index 515fc2785ef7a2fb3842f48bd020dfb92c4c1902..2351c9b04e90dbe407e03ab933659b4d22051e7c 100644 (file)
@@ -4,17 +4,19 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
-#include <delay_timer.h>
 #include <endian.h>
 #include <errno.h>
-#include <mmio.h>
-#include <platform_def.h>
 #include <stdint.h>
 #include <string.h>
-#include <ufs.h>
+
+#include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <drivers/ufs.h>
+#include <lib/mmio.h>
 
 #define CDB_ADDR_MASK                  127
 #define ALIGN_CDB(x)                   (((x) + CDB_ADDR_MASK) & ~CDB_ADDR_MASK)
index 8260c549196bde2d7f6d66bfc43e60b21b90c2fe..cbe272c23ecda07af1a1b16891635756e7a2b492 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef ARCH_H
 #define ARCH_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 /*******************************************************************************
  * MIDR bit definitions
index a6fe14fb897748bba37aa5833df0359bd7ca9b5f..c2773c139262d26a8ed28f3824de49f8dee28c77 100644 (file)
@@ -7,11 +7,12 @@
 #ifndef ARCH_HELPERS_H
 #define ARCH_HELPERS_H
 
-#include <arch.h>
 #include <cdefs.h>
 #include <stdint.h>
 #include <string.h>
 
+#include <arch.h>
+
 /**********************************************************************
  * Macros which create inline functions to read or write CPU system
  * registers
index c54f75c2d914d29dd7e29b3e660484e39fd43ea5..8408804fbd91df7622a8cf43ee2b6c8f824aae6b 100644 (file)
@@ -7,8 +7,8 @@
 #define ASM_MACROS_S
 
 #include <arch.h>
-#include <asm_macros_common.S>
-#include <spinlock.h>
+#include <common/asm_macros_common.S>
+#include <lib/spinlock.h>
 
 /*
  * TLBI instruction with type specifier that implements the workaround for
index ba6e7d050b7039213a50f977c97d329473bf0b50..ed5088d5a2b4538af190054d8749db652367917b 100644 (file)
@@ -6,7 +6,7 @@
 #ifndef CONSOLE_MACROS_S
 #define CONSOLE_MACROS_S
 
-#include <console.h>
+#include <drivers/console.h>
 
 /*
  * This macro encapsulates the common setup that has to be done at the end of
index 67952ec5093b8bc96f70e91083dbdce96fdf83aa..d3e5e59c5327b6e3b716369d7200651fb980f81d 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef SMCCC_HELPERS_H
 #define SMCCC_HELPERS_H
 
-#include <smccc.h>
+#include <lib/smccc.h>
 
 /* These are offsets to registers in smc_ctx_t */
 #define SMC_CTX_GPREG_R0       U(0x0)
 #define SMC_CTX_SIZE           U(0x90)
 
 #ifndef __ASSEMBLY__
-#include <cassert.h>
+
 #include <stdint.h>
 
+#include <lib/cassert.h>
+
 /*
  * 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
index 72a14dcfa811d3bab08511439d2a5e7ba60270e0..8a44d83f0c679b648e3d76c080373e3a5d33f577 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef ARCH_H
 #define ARCH_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 /*******************************************************************************
  * MIDR bit definitions
index 7222b9dc741098cc23ef8a4863cbc0d2c1e2cbd3..b912b4223afb0ec069521d1d360f43d71d3eb115 100644 (file)
@@ -7,12 +7,13 @@
 #ifndef ARCH_HELPERS_H
 #define ARCH_HELPERS_H
 
-#include <arch.h>
 #include <cdefs.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
 
+#include <arch.h>
+
 /**********************************************************************
  * Macros which create inline functions to read or write CPU system
  * registers
index dea302137715cdbcc36cfff4120b2359a7ed33da..387be4ca3e95140ed302ff5819ee536f361a8f3f 100644 (file)
@@ -7,8 +7,8 @@
 #define ASM_MACROS_S
 
 #include <arch.h>
-#include <asm_macros_common.S>
-#include <spinlock.h>
+#include <common/asm_macros_common.S>
+#include <lib/spinlock.h>
 
 /*
  * TLBI instruction with type specifier that implements the workaround for
index 5c88d4f229be9919da8fac3c3c5065d3192df510..90ef4204877f81a726474f431b9bd120391257a1 100644 (file)
@@ -6,7 +6,7 @@
 #ifndef CONSOLE_MACROS_S
 #define CONSOLE_MACROS_S
 
-#include <console.h>
+#include <drivers/console.h>
 
 /*
  * This macro encapsulates the common setup that has to be done at the end of
index efab18b0c48e5661305bfc960d5de5880bbb8fed..e28697d7ef0885a6b891f1f2549bb5e4a56ae7fe 100644 (file)
@@ -7,12 +7,14 @@
 #ifndef SMCCC_HELPERS_H
 #define SMCCC_HELPERS_H
 
-#include <smccc.h>
+#include <lib/smccc.h>
 
 #ifndef __ASSEMBLY__
-#include <context.h>
+
 #include <stdbool.h>
 
+#include <context.h>
+
 /* Convenience macros to return from SMC handler */
 #define SMC_RET0(_h)   {                                       \
        return (uint64_t) (_h);                                 \
index 39b8d1ede9279a37d145aab84fab219cf69cde17..7b5d87572b3b7d81a1597bf64ce4b281cbce726a 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef BL1_H
 #define BL1_H
 
-#include <bl_common.h>
+#include <common/bl_common.h>
 
 /*
  * Defines for BL1 SMC function ids.
@@ -62,7 +62,8 @@
     ((_fid >= FWU_SMC_FID_START) && (_fid <= FWU_SMC_FID_END))
 
 #ifndef __ASSEMBLY__
-#include <cassert.h>
+
+#include <lib/cassert.h>
 
 struct entry_point_info;
 
index bb36eb50caae124e90b7290b296e536cc4d7092a..db15cdbfc483e689b545cb3a2e7260df0fb78c96 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef TBBR_IMG_DESC_H
 #define TBBR_IMG_DESC_H
 
-#include <bl_common.h>
+#include <common/bl_common.h>
 
 extern image_desc_t bl1_tbbr_image_descs[];
 
index f35d8100287dd237891ed590ccb6b5304ab9451b..ee00d09361b7a35fcc4f557b74bb4b78243cf343 100644 (file)
@@ -11,7 +11,8 @@
 
 #include <cdefs.h>
 #include <stdint.h>
-#include <utils_def.h>
+
+#include <lib/utils_def.h>
 
 /* Valid priorities set bit 0 of the priority handler. */
 #define EHF_PRI_VALID_ BIT(0)
index 6a49fb6dd9a68db5d89a1cb715e80ed7958810c6..b1683cc11cd8bd80ce16ea492a992050fdcbe86b 100644 (file)
@@ -8,7 +8,7 @@
 #define INTERRUPT_MGMT_H
 
 #include <arch.h>
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 /*******************************************************************************
  * Constants for the types of interrupts recognised by the IM framework
index 0234cbe4dbfd54e3cd8588473f7bf5940850d7bd..2c12633ea1e81764fe95b68ae109b8b5778ec531 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef TLK_H
 #define TLK_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 /*
  * Generate function IDs for the Trusted OS/Apps
index 56c89fcc4adbfafa87871b8ca204cc5844d74909..c12b08bb7db510ead862ee98af41e35f297778dd 100644 (file)
@@ -7,9 +7,9 @@
 #ifndef BL_COMMON_H
 #define BL_COMMON_H
 
-#include <ep_info.h>
-#include <param_header.h>
-#include <utils_def.h>
+#include <common/ep_info.h>
+#include <common/param_header.h>
+#include <lib/utils_def.h>
 
 #define UP     U(1)
 #define DOWN   U(0)
 #define SERROR_AARCH32                 U(0xf)
 
 #ifndef __ASSEMBLY__
-#include <cassert.h>
+
 #include <stddef.h>
 #include <stdint.h>
-#include <utils_def.h> /* To retain compatibility */
 
+#include <lib/cassert.h>
 
 /*
  * Declarations of linker defined symbols to help determine memory layout of
index a14a66e859e1e883dbad1f3f35a820dce26f172d..f8faf6835fd6d31a6560fa4a6521534aebfabbd8 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef DEBUG_H
 #define DEBUG_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 /*
  * The log output macros print output to the console. These macros produce
 #define LOG_LEVEL_VERBOSE              U(50)
 
 #ifndef __ASSEMBLY__
+
 #include <cdefs.h>
-#include <console.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
 
+#include <drivers/console.h>
+
 /*
  * Define Log Markers corresponding to each log level which will
  * be embedded in the format string and is expected by tf_log() to determine
index 62548951953e351997e3f5ce750e479affafe992..f2f26ea9959ab6b78ed1c335f7f3d9a1b9d70b59 100644 (file)
@@ -6,7 +6,7 @@
 #ifndef DESC_IMAGE_LOAD_H
 #define DESC_IMAGE_LOAD_H
 
-#include <bl_common.h>
+#include <common/bl_common.h>
 
 /* Following structure is used to store BL ep/image info. */
 typedef struct bl_mem_params_node {
index 0f67687e4ad09e296005e876962338a9ebc28a08..a09d03ba081b7d20607cf8f8ef5e064fac2c707b 100644 (file)
@@ -7,8 +7,8 @@
 #ifndef EP_INFO_H
 #define EP_INFO_H
 
-#include <param_header.h>
-#include <utils_def.h>
+#include <common/param_header.h>
+#include <lib/utils_def.h>
 
 #define SECURE         U(0x0)
 #define NON_SECURE     U(0x1)
 
 #ifndef __ASSEMBLY__
 
-#include <cassert.h>
 #include <stdint.h>
 
+#include <lib/cassert.h>
+
 typedef struct aapcs64_params {
        u_register_t arg0;
        u_register_t arg1;
index e9717cbca7fadf12410a5efd20c8631fbf62120e..0c1503f1bbd88652f526e7344420a23f971f5217 100644 (file)
@@ -8,7 +8,8 @@
 #define PARAM_HEADER_H
 
 #include <stdbool.h>
-#include <utils_def.h>
+
+#include <lib/utils_def.h>
 
 /* Param header types */
 #define PARAM_EP                       U(0x01)
index e32c2870aee31fc4f237969febfb6c6300862d64..59bf158b4367d009b822c8256c6522d302a7c419 100644 (file)
@@ -7,10 +7,10 @@
 #ifndef RUNTIME_SVC_H
 #define RUNTIME_SVC_H
 
-#include <bl_common.h>         /* to include exception types */
-#include <cassert.h>
+#include <common/bl_common.h>          /* to include exception types */
+#include <lib/cassert.h>
+#include <lib/utils_def.h>
 #include <smccc_helpers.h>     /* to include SMCCC definitions */
-#include <utils_def.h>
 
 /*******************************************************************************
  * Structure definition, typedefs & constants for the runtime service framework
index bd8f5dc58a3c8deffcf2f3b9dd33ed6209a97914..672886dedfcb5048ae5042bfd50c5cd92be0f34b 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef TBBR_IMG_DEF_H
 #define TBBR_IMG_DEF_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 /* Firmware Image Package */
 #define FIP_IMAGE_ID                   U(0)
index 24b76dab8a86e1c07a27207d7a015b1bff037150..c5ddcfd448b731da41a3b6eed6f01ac7ccc2ed47 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef CCI_H
 #define CCI_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 /* Slave interface offsets from PERIPHBASE */
 #define SLAVE_IFACE6_OFFSET            UL(0x7000)
index a9ec7b76457266a90b69386016851dd8fdfc2358..3ac1b43fffaf58c41145ef44c1ba8160d5d258a5 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef GIC_COMMON_H
 #define GIC_COMMON_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 /*******************************************************************************
  * GIC Distributor interface general definitions
index 705077ce3dcc87f576eb6e66a62712c78b6dd6bc..6bc5101d13f7007e1fab7d54fc1baf0e95466e1c 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef GICV2_H
 #define GICV2_H
 
-#include <gic_common.h>
+#include <drivers/arm/gic_common.h>
 
 /*******************************************************************************
  * GICv2 miscellaneous definitions
 #ifndef __ASSEMBLY__
 
 #include <cdefs.h>
-#include <interrupt_props.h>
 #include <stdint.h>
 
+#include <common/interrupt_props.h>
+
 /*******************************************************************************
  * This structure describes some of the implementation defined attributes of
  * the GICv2 IP. It is used by the platform port to specify these attributes
index c26f2975abe5945cdbb456f4e6e21a67b2342ae0..2382697748b585e3e85972efcc0c36aaedceb04f 100644 (file)
 
 #ifndef __ASSEMBLY__
 
-#include <arch_helpers.h>
-#include <gic_common.h>
-#include <interrupt_props.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <utils_def.h>
+
+#include <arch_helpers.h>
+#include <common/interrupt_props.h>
+#include <drivers/arm/gic_common.h>
+#include <lib/utils_def.h>
 
 static inline bool gicv3_is_intr_id_special_identifier(unsigned int id)
 {
index 6216a61fc5e03c6b8d53e438c862cfadc669c0a0..f201f0048fb5a5c6025cf20dc0007f7f84d28aee 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef PL011_H
 #define PL011_H
 
-#include <console.h>
+#include <drivers/console.h>
 
 /* PL011 Registers */
 #define UARTDR                    0x000
index 6c4a9f5a502327110fd7da632437577924daa9bf..68238c9abe1a9d6a6025d1c25d59cb32d8078fea 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef PL061_GPIO_H
 #define PL061_GPIO_H
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 void pl061_gpio_register(uintptr_t base_addr, int gpio_dev);
 void pl061_gpio_init(void);
index 1b7ffb8db099d0f508f836fc01d344aafb8d89ed..33f3d6fcfc107b2bacddd186f9b43928f346bc1e 100644 (file)
@@ -8,7 +8,8 @@
 #define SMMU_V3_H
 
 #include <stdint.h>
-#include <utils_def.h>
+
+#include <lib/utils_def.h>
 
 /* SMMUv3 register offsets from device base */
 #define SMMU_S_IDR1    U(0x8004)
index 8eb8715ae8fbd12007073c0d6e5f8f2545ded59b..f8769e8369d1c93b275dfd80122df6f07a466533 100644 (file)
@@ -7,9 +7,9 @@
 #ifndef SP804_DELAY_TIMER_H
 #define SP804_DELAY_TIMER_H
 
-#include <delay_timer.h>
 #include <stdint.h>
 
+#include <drivers/delay_timer.h>
 
 uint32_t sp804_get_timer_value(void);
 
index e7714a393275546af66e3b98ff2d0efcc4b66453..551bfe4bae90abfcc99ba60c645339667572d7e8 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef SP805_H
 #define SP805_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 /* SP805 register offset */
 #define SP805_WDOG_LOAD_OFF            UL(0x000)
index 19cf9883130f2874ac968bc0faef80bf85d66b79..03b9b054e75005ce5df47ca98e76f97c30310478 100644 (file)
@@ -7,8 +7,8 @@
 #ifndef TZC380_H
 #define TZC380_H
 
-#include <tzc_common.h>
-#include <utils_def.h>
+#include <drivers/arm/tzc_common.h>
+#include <lib/utils_def.h>
 
 #define TZC380_CONFIGURATION_OFF       U(0x000)
 #define ACTION_OFF                     U(0x004)
index a7bb3f6484cba599207cb7ad54ea0f5adc5cfb3a..98ef0ec1e0e13f01bec6a81b4575dbd447318b82 100644 (file)
@@ -7,8 +7,8 @@
 #ifndef TZC400_H
 #define TZC400_H
 
-#include <tzc_common.h>
-#include <utils_def.h>
+#include <drivers/arm/tzc_common.h>
+#include <lib/utils_def.h>
 
 #define BUILD_CONFIG_OFF                       U(0x000)
 #define GATE_KEEPER_OFF                                U(0x008)
index 4b8154788a9e7d65cd762c67d65e925f8000ea3e..4820baa1a062437c25a8f9f6de8562f2bd01a743 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef TZC_COMMON_H
 #define TZC_COMMON_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 /*
  * Offset of core registers from the start of the base of configuration
index df6e7f9494844d431835a43043698786ad90d31d..24bfaeb145571e5fc49377c406e51f28697e3e6a 100644 (file)
@@ -7,8 +7,8 @@
 #ifndef TZC_DMC500_H
 #define TZC_DMC500_H
 
-#include <tzc_common.h>
-#include <utils_def.h>
+#include <drivers/arm/tzc_common.h>
+#include <lib/utils_def.h>
 
 #define SI_STATUS_OFFSET                               U(0x000)
 #define SI_STATE_CTRL_OFFSET                           U(0x030)
index 074bbc1224108f2170c0280c7b85999d35b30081..e0e6760b289abb2dcc04c7166092e978dabe28c4 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef TZC_DMC620_H
 #define TZC_DMC620_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 /* DMC-620 memc register offsets */
 #define DMC620_MEMC_STATUS     U(0x0000)
index 19bc2f135a7a1f6fbdd7c607c260c3d2d24625ad..908995391de8575422607a5f7d6ff1b3967dd89f 100644 (file)
@@ -9,10 +9,10 @@
 
 #if TRUSTED_BOARD_BOOT
 
-#include <auth_common.h>
-#include <cot_def.h>
-#include <img_parser_mod.h>
-#include <tbbr_img_def.h>
+#include <common/tbbr/cot_def.h>
+#include <common/tbbr/tbbr_img_def.h>
+#include <drivers/auth/auth_common.h>
+#include <drivers/auth/img_parser_mod.h>
 
 /*
  * Image flags
index 43796935a65e9fa09e982f2660ff21b1e3b0bc5a..b2fb60ed1170cf63810546851fb6dd50342af5ce 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef IMG_PARSER_MOD_H
 #define IMG_PARSER_MOD_H
 
-#include <auth_common.h>
+#include <drivers/auth/auth_common.h>
 
 /*
  * Return values
index 490be108e532de4fb4a472162c23b47e08e86409..0a1cf77819355fd0222d4c4406937c382aea56cb 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef CDNS_UART_H
 #define CDNS_UART_H
 
-#include <console.h>
+#include <drivers/console.h>
 
 /* This is very minimalistic and will only work in QEMU.  */
 
index 02f2f8a2ddf6dee2544f37be9dc53feea7273308..24887f9083e19b6015b849ee8a01fc956a8268c0 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef CONSOLE_H
 #define CONSOLE_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 #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 <console_assertions.h> /* offset macro assertions for console_t */
+
+/* offset macro assertions for console_t */
+#include <drivers/console_assertions.h>
 
 /*
  * NOTE: There is no publicly accessible console_register() function. Consoles
index 559bb5096f7bc469453a3e48f212fb44bc11cb91..00caa31416372aae25b22729f4f01996e57625a8 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef CONSOLE_ASSERTIONS_H
 #define CONSOLE_ASSERTIONS_H
 
-#include <cassert.h>
+#include <lib/cassert.h>
 
 /*
  * This file contains some separate assertions about console_t, moved here to
index 7fe7a72daca5184457522c52d64752319fd336ca..40c90e6bbfdbbb195c96d2bb8026ee1b29279886 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef CBMEM_CONSOLE_H
 #define CBMEM_CONSOLE_H
 
-#include <console.h>
+#include <drivers/console.h>
 
 #define CONSOLE_T_CBMC_BASE    CONSOLE_T_DRVDATA
 #define CONSOLE_T_CBMC_SIZE    (CONSOLE_T_DRVDATA + REGSZ)
index d6d32f9b74ae19d50a3ad62756a660a76c64ff98..c99e8c7c6a1a84bf470861c6152d6b156e24acef 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef IO_BLOCK_H
 #define IO_BLOCK_H
 
-#include <io_storage.h>
+#include <drivers/io/io_storage.h>
 
 /* block devices ops */
 typedef struct io_block_ops {
index 587f137c55c0e79ed3ee224133417dd6e0aa3d55..2b704f491e0d47c5de34007a3d436edd65f00b93 100644 (file)
@@ -7,9 +7,9 @@
 #ifndef IO_DRIVER_H
 #define IO_DRIVER_H
 
-#include <io_storage.h>
 #include <stdint.h>
 
+#include <drivers/io/io_storage.h>
 
 /* Generic IO entity structure,representing an accessible IO construct on the
  * device, such as a file */
index c496d487e43909503e724c852cf7bb91d2c8b304..ec6db3f2ade7d9be8878a6934bd0f23c864d6d0c 100644 (file)
@@ -10,8 +10,8 @@
 #include <errno.h>
 #include <stdint.h>
 #include <stdio.h> /* For ssize_t */
-#include <uuid.h>
 
+#include <tools_share/uuid.h>
 
 /* Device type which can be used to enable policy decisions about which device
  * to access */
index 2757765bc6e26d2ff2b126968b0b7f218bca4598..546d9f13bce3f055ca5a38092cdca31808dd11c7 100644 (file)
@@ -11,7 +11,7 @@
 #define CCU_H
 
 #ifndef __ASSEMBLY__
-#include <addr_map.h>
+#include <drivers/marvell/addr_map.h>
 #endif
 
 /* CCU registers definitions */
index 6b7f1752f80175ec5a711fd91a6ba8d6dece3cb0..1b874a7450a6db8324d5b83e0addea385d6a3988 100644 (file)
@@ -10,7 +10,7 @@
 #ifndef GWIN_H
 #define GWIN_H
 
-#include <addr_map.h>
+#include <drivers/marvell/addr_map.h>
 
 int init_gwin(int ap_index);
 void gwin_temp_win_insert(int ap_index, struct addr_map_win *win, int size);
index 45e86666aa7e224b1503b17b9249456d89566375..7438d6b4b84dbccce95d6b84bbd4d1fb8d427505 100644 (file)
@@ -10,7 +10,7 @@
 #ifndef IO_WIN_H
 #define IO_WIN_H
 
-#include <addr_map.h>
+#include <drivers/marvell/addr_map.h>
 
 int init_io_win(int ap_index);
 void iow_temp_win_insert(int ap_index, struct addr_map_win *win, int size);
index ccbdf960d635550b3e698f659ce45aae4ed39381..9b5e515a4fbfecbd145f18cd10f20353995f468d 100644 (file)
@@ -10,7 +10,7 @@
 #ifndef IOB_H
 #define IOB_H
 
-#include <addr_map.h>
+#include <drivers/marvell/addr_map.h>
 
 enum target_ids_iob {
        INTERNAL_TID    = 0x0,
index 18d9f1810030a1c2fc600f1427e0c92b7a16723c..3686257d3d537f2af7d5b3dda8d9c01b3734b3b4 100644 (file)
@@ -10,7 +10,8 @@
 #ifndef CP110_SETUP_H
 #define CP110_SETUP_H
 
-#include <mmio.h>
+#include <lib/mmio.h>
+
 #include <mvebu_def.h>
 
 #define MVEBU_DEVICE_ID_REG            (MVEBU_CP_DFX_OFFSET + 0x40)
index 01335a2a3a4fa8c3c87fbc3fd9c55ddc0b253a40..5511d96c44dbfc299b825f5803c57862d1bc3a71 100644 (file)
@@ -8,7 +8,7 @@
 #ifndef A3700_CONSOLE_H
 #define A3700_CONSOLE_H
 
-#include <console.h>
+#include <drivers/console.h>
 
 /* MVEBU UART Registers */
 #define UART_RX_REG            0x00
index 759571ddac50d20af9f1ecaa29c8ded83424ac4a..5da1e3fd457d94df818c8bb115d08d1799709e10 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef MESON_CONSOLE_H
 #define MESON_CONSOLE_H
 
-#include <console.h>
+#include <drivers/console.h>
 
 #define CONSOLE_T_MESON_BASE   CONSOLE_T_DRVDATA
 
index a62928bc687dc8d1c011d891ec4d37eedb07feaa..2aaa28d6896bebb3d3e52132d1023c530acc9121 100644 (file)
@@ -8,7 +8,8 @@
 #define MMC_H
 
 #include <stdint.h>
-#include <utils_def.h>
+
+#include <lib/utils_def.h>
 
 #define MMC_BLOCK_SIZE                 U(512)
 #define MMC_BLOCK_MASK                 (MMC_BLOCK_SIZE - U(1))
index 7984e4d801b367126d8abfb0067e954e8b3b421c..3ae160fdc1e1bd28465c0f072c13748bd67d6b0f 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef GPT_H
 #define GPT_H
 
-#include <partition.h>
+#include <drivers/partition/partition.h>
 
 #define PARTITION_TYPE_GPT             0xee
 #define GPT_HEADER_OFFSET              PARTITION_BLOCK_SIZE
index 2aeaace9f619cf79a7de4589ab86c57078d8d580..d94c7824a63f6cba6c233e7195c736be982566fa 100644 (file)
@@ -7,9 +7,10 @@
 #ifndef PARTITION_H
 #define PARTITION_H
 
-#include <cassert.h>
 #include <stdint.h>
 
+#include <lib/cassert.h>
+
 #if !PLAT_PARTITION_MAX_ENTRIES
 # define PLAT_PARTITION_MAX_ENTRIES    128
 #endif /* PLAT_PARTITION_MAX_ENTRIES */
index de71e7d8a093c946cca5160b8e9eb0d2f19c149d..b35b4b5d0d900fe8070521bb4d189f8ada2b3a37 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef IO_MMC_H
 #define IO_MMC_H
 
-#include <io_driver.h>
+#include <drivers/io/io_driver.h>
 
 int register_io_dev_mmc(const io_dev_connector_t **dev_con);
 
index b6682196012e5950169a6d123ce775f4793fd6f7..68060558ba5b7286321f8f3860ed587cf3d0e34e 100644 (file)
@@ -7,8 +7,8 @@
 #ifndef IO_STM32IMAGE_H
 #define IO_STM32IMAGE_H
 
-#include <io_driver.h>
-#include <partition.h>
+#include <drivers/io/io_driver.h>
+#include <drivers/partition/partition.h>
 
 #define MAX_LBA_SIZE           512
 #define MAX_PART_NAME_SIZE     (EFI_NAMELEN + 1)
index 57e6d7409a98000e0581dfa86d4061c6407dfc81..b30376828f09e57063368d559a6cf39cba37a794 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef STM32_CONSOLE_H
 #define STM32_CONSOLE_H
 
-#include <console.h>
+#include <drivers/console.h>
 
 #define CONSOLE_T_STM32_BASE   CONSOLE_T_DRVDATA
 
index 938922b48020287b228a753d3410d78c1f17c495..acd95ecabf8bfe6b70baf920ba650196e049a064 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef STM32_GPIO_H
 #define STM32_GPIO_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 #define STM32_GPIOA_BANK       U(0x50002000)
 #define STM32_GPIOZ_BANK       U(0x54004000)
index 4760c00fe5f443e3601a85997e52cced9f773f23..de2ca59c80d75016bfdb916f1cd96a0f87146bb1 100644 (file)
@@ -8,7 +8,8 @@
 #define STM32_I2C_H
 
 #include <stdint.h>
-#include <utils_def.h>
+
+#include <lib/utils_def.h>
 
 /* Bit definition for I2C_CR1 register */
 #define I2C_CR1_PE                     BIT(0)
index b17265926338042c31517005555cd81b750f11b5..aa9472c8303d7f92e9fa9518a5610d08c3fdc419 100644 (file)
@@ -7,9 +7,10 @@
 #ifndef STM32_SDMMC2_H
 #define STM32_SDMMC2_H
 
-#include <mmc.h>
 #include <stdbool.h>
 
+#include <drivers/mmc.h>
+
 struct stm32_sdmmc2_params {
        uintptr_t               reg_base;
        unsigned int            clk_rate;
index e78d3d481c8d1cd6e9f4bf2dfb903f8966e7eec0..14b296c4bceb25219255e774eac78191a3a73c80 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef STM32_UART_REGS_H
 #define STM32_UART_REGS_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 #define USART_CR1              U(0x00)
 #define USART_CR2              U(0x04)
index c8955172520203c38adf452de1ee91e459eb1efa..5594e2327648f4220bbefd8a394e3993ad4c6f88 100644 (file)
@@ -7,9 +7,10 @@
 #ifndef STM32MP1_CLK_H
 #define STM32MP1_CLK_H
 
-#include <arch_helpers.h>
 #include <stdbool.h>
 
+#include <arch_helpers.h>
+
 int stm32mp1_clk_probe(void);
 int stm32mp1_clk_init(void);
 bool stm32mp1_clk_is_enabled(unsigned long id);
index 2467af9bb26a6790b599603b7a40be76277154e3..106dcae01687f291652315a2a7b52f274484dafc 100644 (file)
@@ -7,9 +7,10 @@
 #ifndef STM32MP1_CLKFUNC_H
 #define STM32MP1_CLKFUNC_H
 
-#include <libfdt.h>
 #include <stdbool.h>
 
+#include <libfdt.h>
+
 enum stm32mp_osc_id {
        _HSI,
        _HSE,
index 288e072d211a0c1c6ac603051db7f50f393a3bb4..bfcd5e21042d94091665c3d6f422c2a85436ac10 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef STM32MP1_DDR_REGS_H
 #define STM32MP1_DDR_REGS_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 /* DDR3/LPDDR2/LPDDR3 Controller (DDRCTRL) registers */
 struct stm32mp1_ddrctl {
index cc80b25ab4ef7d8529955af9b79a911c43c10964..256e340bec109a824bd4f283cefb6b9bab6be53e 100644 (file)
@@ -9,6 +9,8 @@
 
 #include <stdbool.h>
 
+#include <stm32mp1_def.h>
+
 bool dt_check_pmic(void);
 int dt_pmic_enable_boot_on_regulators(void);
 void initialize_pmic_i2c(void);
index b34536eaee73dbd7333c74a0f853f920685f09aa..e17df44fb7d96bf03ba45d37ebec6a3c154aea1f 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef STM32MP1_PWR_H
 #define STM32MP1_PWR_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 #define PWR_CR1                        U(0x00)
 #define PWR_CR2                        U(0x08)
index 87f4d7f73ef1f57b81928e86e0205db9c021179a..fd406c57e76c3649ebfea32352bd3655c281b965 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef STM32MP1_RCC_H
 #define STM32MP1_RCC_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 #define RCC_TZCR                       U(0x00)
 #define RCC_OCENSETR                   U(0x0C)
index 4bbcebbec584ceff189d49a0531b0e0acb5e0f83..e75d9a66b2f0c842d0df5b00fefd998d810bc414 100644 (file)
@@ -7,8 +7,8 @@
 #ifndef STPMU1_H
 #define STPMU1_H
 
-#include <stm32_i2c.h>
-#include <utils_def.h>
+#include <drivers/st/stm32_i2c.h>
+#include <lib/utils_def.h>
 
 #define TURN_ON_REG                    0x1U
 #define TURN_OFF_REG                   0x2U
index 533a876fc402807fa1346031ea810ba4fa100a17..7031e0f46ff934cd6bde6fe48173060a64357d88 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef DW_MMC_H
 #define DW_MMC_H
 
-#include <mmc.h>
+#include <drivers/mmc.h>
 
 typedef struct dw_mmc_params {
        uintptr_t       reg_base;
index ad80c57724c6e8cdd3364a88890afe6616ee237b..92b1ea8c3a29fcd5255f133566187e6b6ab0de19 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef UART_16550_H
 #define UART_16550_H
 
-#include <console.h>
+#include <drivers/console.h>
 
 /* UART16550 Registers */
 #define UARTTX                 0x0
index 414649bd4bc6ff6d96f8681a0b959394fc10511c..a10cd8034122ad82be6fd3f901d90ec6de915927 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef UFS_H
 #define UFS_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 /* register map of UFSHCI */
 /* Controller Capabilities */
index 2d1612e17b43b19caad606481032b43a27ccc6f7..a2f540c6274e5858aaed485a7863c0d058932bca 100644 (file)
@@ -15,7 +15,8 @@
 #include <cdefs.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <utils_def.h>
+
+#include <lib/utils_def.h>
 
 /*****************************************************************************
  * Internal helpers used by the bakery lock implementation.
index 6f60c1146a902c4db471e0b48ff6514144e5530c..2ac1e17d8d12c8bf0df82eff26dd40cc3603bc2a 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef CORTEX_A57_H
 #define CORTEX_A57_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 /* Cortex-A57 midr for revision 0 */
 #define CORTEX_A57_MIDR 0x410FD070
index f45865a39953a3ef15b28ff6b37265ffc2b04ccc..95402d0a727d3bd41cd4eda4fef2ed15deb632ed 100644 (file)
@@ -6,7 +6,8 @@
 
 #ifndef CORTEX_A72_H
 #define CORTEX_A72_H
-#include <utils_def.h>
+
+#include <lib/utils_def.h>
 
 /* Cortex-A72 midr for revision 0 */
 #define CORTEX_A72_MIDR 0x410FD080
index 1c0da0f2b0cfe5ef251e6879425f0f6e56a10085..a5ae6a486facc8279f2a9f1c5cee51606e683a4a 100644 (file)
@@ -7,7 +7,7 @@
 #define CPU_MACROS_S
 
 #include <arch.h>
-#include <errata_report.h>
+#include <lib/cpus/errata_report.h>
 
 #if defined(IMAGE_BL1) || defined(IMAGE_BL32)  || (defined(IMAGE_BL2) && BL2_AT_EL3)
 #define IMAGE_AT_EL3
index 71d07db5f0c9b477e941b3aa2008871db23f0717..5b6c9dd292a69d480dd52a8f9528e58760145aa6 100644 (file)
@@ -6,7 +6,8 @@
 
 #ifndef CORTEX_A57_H
 #define CORTEX_A57_H
-#include <utils_def.h>
+
+#include <lib/utils_def.h>
 
 /* Cortex-A57 midr for revision 0 */
 #define CORTEX_A57_MIDR                        U(0x410FD070)
index 4eafc11e1a023af51fc7ae4acfda1f33de79b4d0..60b6c619011eb31287d489e4f3834272394ac33e 100644 (file)
@@ -6,7 +6,8 @@
 
 #ifndef CORTEX_A72_H
 #define CORTEX_A72_H
-#include <utils_def.h>
+
+#include <lib/utils_def.h>
 
 /* Cortex-A72 midr for revision 0 */
 #define CORTEX_A72_MIDR                                0x410FD080
index f68f98f6342de453c27ee82696564f887abf9e01..fabc1afdc4a716025afb87e934038c09953763ad 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef CORTEX_A75_H
 #define CORTEX_A75_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 /* Cortex-A75 MIDR */
 #define CORTEX_A75_MIDR                U(0x410fd0a0)
index 4f3e812962d159ed364b5a8d4e303f8d6b6c4072..cfc36e47383c2941e82debd96b90aad448beee81 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef CORTEX_ARES_H
 #define CORTEX_ARES_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 /* Cortex-ARES MIDR for revision 0 */
 #define CORTEX_ARES_MIDR               U(0x410fd0c0)
index 28757005419507dd378844773c6bfceab62e416b..b907668b3b3ef26c2f733b9239076b7c5d15e708 100644 (file)
@@ -7,7 +7,7 @@
 #define CPU_MACROS_S
 
 #include <arch.h>
-#include <errata_report.h>
+#include <lib/cpus/errata_report.h>
 
 #define CPU_IMPL_PN_MASK       (MIDR_IMPL_MASK << MIDR_IMPL_SHIFT) | \
                                (MIDR_PN_MASK << MIDR_PN_SHIFT)
index 0e2d93a8c386f12c83b837549729c3b5064b8289..aa8b1b1ab5c7f5a432e2374aaab00a8c2b8ee42b 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef DSU_DEF_H
 #define DSU_DEF_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 /********************************************************************
  * DSU control registers definitions                               *
index c97d4c2473e8b366a7a97d515725a783e6771ef1..17b2c30f852588055940fa9a2b4ea1530e04cf7d 100644 (file)
@@ -11,8 +11,8 @@
 
 #include <arch.h>
 #include <arch_helpers.h>
-#include <spinlock.h>
-#include <utils_def.h>
+#include <lib/spinlock.h>
+#include <lib/utils_def.h>
 
 #if DEBUG
 void print_errata_status(void);
index 1ea19ca7c53c3123fe3786d02e9b64af076eefb0..86ff53a67344d7c52891adf7460fcdd1ad4386e4 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef CONTEXT_H
 #define CONTEXT_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 /*******************************************************************************
  * Constants that allow assembler code to access members of and the 'regs'
 
 #ifndef __ASSEMBLY__
 
-#include <cassert.h>
 #include <stdint.h>
 
+#include <lib/cassert.h>
+
 /*
  * Common constants to help define the 'cpu_context' structure and its
  * members below.
index 8c5f4c68d73a3c39523c9679832d65dd5634e4a7..70c50aae27e1850ae3bffb57a17f412b4cd508d9 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef CONTEXT_H
 #define CONTEXT_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 /*******************************************************************************
  * Constants that allow assembler code to access members of and the 'gp_regs'
 
 #ifndef __ASSEMBLY__
 
-#include <cassert.h>
-#include <platform_def.h>      /* for CACHE_WRITEBACK_GRANULE */
 #include <stdint.h>
 
+#include <platform_def.h>      /* for CACHE_WRITEBACK_GRANULE */
+
+#include <lib/cassert.h>
+
 /*
  * Common constants to help define the 'cpu_context' structure and its
  * members below.
index 149ac3ffd1fed98142a81e7fda702abd32dbebfd..f23f9cd44daf8a729d02473c625bd4dcd13639b3 100644 (file)
@@ -7,11 +7,12 @@
 #ifndef CONTEXT_MGMT_H
 #define CONTEXT_MGMT_H
 
-#include <arch.h>
 #include <assert.h>
 #include <context.h>
 #include <stdint.h>
 
+#include <arch.h>
+
 /*******************************************************************************
  * Forward declarations
  ******************************************************************************/
index 561f8beedb0b5c69a5007f029505a2c94aabd312..9e1d7f16c79e4dd2223be150682f32afa4eb0b2b 100644 (file)
@@ -7,9 +7,10 @@
 #ifndef CPU_DATA_H
 #define CPU_DATA_H
 
-#include <ehf.h>
 #include <platform_def.h>      /* CACHE_WRITEBACK_GRANULE required */
 
+#include <bl31/ehf.h>
+
 #ifdef AARCH32
 
 #if CRASH_REPORTING
@@ -51,9 +52,9 @@
 #ifndef __ASSEMBLY__
 
 #include <arch_helpers.h>
-#include <cassert.h>
+#include <lib/cassert.h>
+#include <lib/psci/psci.h>
 #include <platform_def.h>
-#include <psci.h>
 #include <stdint.h>
 
 /* Offsets for the cpu_data structure */
index 930952ff828093a28d1c742653be21b734021de8..eb91286564c7c516de851fa9728d4a6b53c37e1a 100644 (file)
 
 /* For the compiler ... */
 
-#include <arch_helpers.h>
 #include <assert.h>
 #include <cdefs.h>
 #include <stddef.h>
 
+#include <arch_helpers.h>
+
 #define __pubsub_section(event)                __section("__pubsub_" #event)
 
 /*
index 64b3f630c98ada4e1b7d309d0a22b87c97c98428..8e4a87afd44fc84e8b73b856afdc2e5d4e895385 100644 (file)
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <pubsub.h>
+#include <lib/el3_runtime/pubsub.h>
 
 /*
  * This file defines a list of pubsub events, declared using
index 1836fe5ae60c97a74f26311f0462035bb0c9e028..99ecfccbbfbd37a6032690be8e54d5d2dfb089f8 100644 (file)
@@ -7,11 +7,13 @@
 #ifndef AMU_H
 #define AMU_H
 
-#include <cassert.h>
-#include <platform_def.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <utils_def.h>
+
+#include <platform_def.h>
+
+#include <lib/cassert.h>
+#include <lib/utils_def.h>
 
 /* All group 0 counters */
 #define AMU_GROUP0_COUNTERS_MASK       U(0xf)
index 62fd63f93d7ea25d102b4c7c6450eac9bc024175..9f6b2905f1d443e993e222a312f23e9975fa5c59 100644 (file)
@@ -71,7 +71,8 @@
 #ifndef __ASSEMBLY__
 
 #include <assert.h>
-#include <ras_arch.h>
+
+#include <lib/extensions/ras_arch.h>
 
 struct err_record_info;
 
index e6cd736aee17daed30291d8fda6744cc7e46fde9..e9375a35607e9671de4c895086c27edf4d759918 100644 (file)
 #include <arch_helpers.h>
 #include <assert.h>
 #include <context.h>
-#include <mmio.h>
+#include <lib/mmio.h>
 #include <stdint.h>
 
 /*
index 2cca6a0b28181ac7a8160d34724e805f0782196d..d04f9dc043066c39a7a41839d8a0ad5a598b921c 100644 (file)
@@ -8,9 +8,11 @@
 #define ASSERT_H
 
 #include <cdefs.h>
-#include <debug.h>
+
 #include <platform_def.h>
 
+#include <common/debug.h>
+
 #ifndef PLAT_LOG_LEVEL_ASSERT
 #define PLAT_LOG_LEVEL_ASSERT  LOG_LEVEL
 #endif
index 7d40b41d816a2d76fa72295744e19557603dc7d8..0f85331a87cebfaf4b1104d55b924fe4df97ed4d 100644 (file)
@@ -7,9 +7,10 @@
 #ifndef OBJECT_POOL_H
 #define OBJECT_POOL_H
 
-#include <debug.h>
 #include <stdlib.h>
-#include <utils_def.h>
+
+#include <common/debug.h>
+#include <lib/utils_def.h>
 
 /*
  * Pool of statically allocated objects.
index b13c4504fddc4efac6eeed890f22b8b09148b235..6067caff42e7e9f91257e481df800a32e0598d5a 100644 (file)
@@ -3,10 +3,11 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
+
 #ifndef OPTEE_UTILS_H
 #define OPTEE_UTILS_H
 
-#include <bl_common.h>
+#include <common/bl_common.h>
 
 int parse_optee_header(entry_point_info_t *header_ep,
        image_info_t *pager_image_info,
index 18ef0a5598ea87ad1c8ae058416063b826b5b1e9..df7c9ff31079654b15d01ef43f2904155bc491c2 100644 (file)
@@ -7,9 +7,9 @@
 #ifndef PMF_H
 #define PMF_H
 
-#include <cassert.h>
-#include <pmf_helpers.h>
-#include <utils_def.h>
+#include <lib/cassert.h>
+#include <lib/pmf/pmf_helpers.h>
+#include <lib/utils_def.h>
 
 /*
  * Constants used for/by PMF services.
index c535b222d3eece64fc73e4a830be6a85c5082a83..e6798a7ce79abb8e9429fbf37d2a4b9dbc329f35 100644 (file)
@@ -7,13 +7,14 @@
 #ifndef PMF_HELPERS_H
 #define PMF_HELPERS_H
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <plat/common/platform.h>
+
 /*
  * Prototype for PMF service functions.
  */
index b7febc38f0de95a2c9d3a639d5356f17aa78f2d7..fe279d4f2c510d1420ee8d4f81014e4140111de5 100644 (file)
@@ -7,11 +7,12 @@
 #ifndef PSCI_H
 #define PSCI_H
 
-#include <bakery_lock.h>
-#include <bl_common.h>
 #include <platform_def.h>      /* for PLAT_NUM_PWR_DOMAINS */
-#include <psci_lib.h>          /* To maintain compatibility for SPDs */
-#include <utils_def.h>
+
+#include <common/bl_common.h>
+#include <lib/bakery_lock.h>
+#include <lib/psci/psci_lib.h> /* To maintain compatibility for SPDs */
+#include <lib/utils_def.h>
 
 /*******************************************************************************
  * Number of power domains whose state this PSCI implementation can track
index 134cad9e0e1e4f90861840e8ccf37db8aeeae165..53d7711b1208fda262ddb37c7174950a4abb0c2c 100644 (file)
@@ -7,9 +7,10 @@
 #ifndef PSCI_LIB_H
 #define PSCI_LIB_H
 
-#include <ep_info.h>
+#include <common/ep_info.h>
 
 #ifndef __ASSEMBLY__
+
 #include <cdefs.h>
 #include <stdint.h>
 
index cb648391eefbaac15b441bc3ea6c2683fedcc88d..f5a3f1386515008b6fa132f013edd76996b7bd92 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef RUNTIME_INSTR_H
 #define RUNTIME_INSTR_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 #define RT_INSTR_ENTER_PSCI            U(0)
 #define RT_INSTR_EXIT_PSCI             U(1)
index 6ee8aa07d38c232986f74453afe69133fcbb9194..b10c52ce9c8886cceeb0045340734209318f080f 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef SMCCC_H
 #define SMCCC_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 #define SMCCC_VERSION_MAJOR_SHIFT      U(16)
 #define SMCCC_VERSION_MAJOR_MASK       U(0x7FFF)
 
 #if SMCCC_MAJOR_VERSION == 1
 # define SMCCC_MINOR_VERSION U(1)
-# include <smccc_v1.h>
+# include <lib/smccc_v1.h>
 #elif SMCCC_MAJOR_VERSION == 2
 # define SMCCC_MINOR_VERSION U(0)
-# include <smccc_v2.h>
+# include <lib/smccc_v2.h>
 #else
 # error "Unsupported version of SMCCC."
 #endif
 
 #ifndef __ASSEMBLY__
 
-#include <cassert.h>
 #include <stdint.h>
 
+#include <lib/cassert.h>
+
 #define is_caller_non_secure(_f)       (((_f) & SMC_FROM_NON_SECURE) != U(0))
 #define is_caller_secure(_f)           (!is_caller_non_secure(_f))
 
index b6ab26ec79c03d98a50f9ad26a4b54799653d589..674845404467b2e1df6823d0e07e2af483a83e00 100644 (file)
@@ -13,6 +13,7 @@
  */
 #if !(defined(__LINKER__) || defined(__ASSEMBLY__))
 
+#include <stddef.h>
 #include <stdint.h>
 
 typedef struct mem_region {
index 37f3b53b70195caf873a41dd4800a187cf1ef04e..a333d1e4e3a3462100ae5493823aa9b276fcc8b8 100644 (file)
@@ -8,8 +8,8 @@
 #define XLAT_TABLES_AARCH32_H
 
 #include <arch.h>
-#include <utils_def.h>
-#include <xlat_tables_defs.h>
+#include <lib/utils_def.h>
+#include <lib/xlat_tables/xlat_tables_defs.h>
 
 #if !defined(PAGE_SIZE)
 #error "PAGE_SIZE is not defined."
index 91ca8e477e2657838810c8d48979f54017323537..cc5624c91e3a95eeee5d6d4d7793d4578e8792ad 100644 (file)
@@ -8,8 +8,8 @@
 #define XLAT_TABLES_AARCH64_H
 
 #include <arch.h>
-#include <utils_def.h>
-#include <xlat_tables_defs.h>
+#include <lib/utils_def.h>
+#include <lib/xlat_tables/xlat_tables_defs.h>
 
 #if !defined(PAGE_SIZE)
 #error "PAGE_SIZE is not defined."
index 050679d94f91d4d2659de2fd7d11412106be1bd6..9e2543fbbc21ff2fcce0afef865e42187badc160 100644 (file)
@@ -7,12 +7,13 @@
 #ifndef XLAT_TABLES_H
 #define XLAT_TABLES_H
 
-#include <xlat_tables_defs.h>
+#include <lib/xlat_tables/xlat_tables_defs.h>
 
 #ifndef __ASSEMBLY__
 #include <stddef.h>
 #include <stdint.h>
-#include <xlat_mmu_helpers.h>
+
+#include <lib/xlat_tables/xlat_mmu_helpers.h>
 
 /* Helper macro to define entries for mmap_region_t. It creates
  * identity mappings for each region.
index 4650a8c6f41cce8321b298dea60aaeea5fec8f1c..90768db5dbfbbc7d12cf7181aa13fba50132bee0 100644 (file)
@@ -5,7 +5,7 @@
  */
 
 #if XLAT_TABLES_LIB_V2
-#include <xlat_tables_v2.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
 #else
-#include <xlat_tables.h>
+#include <lib/xlat_tables/xlat_tables.h>
 #endif
index 09baae9bf7413eda7d65d63f4066d9cacc760d80..6d0fb7896f9f6bfbd39261a93f11ecc2793d6e32 100644 (file)
@@ -8,8 +8,8 @@
 #define XLAT_TABLES_DEFS_H
 
 #include <arch.h>
-#include <utils_def.h>
-#include <xlat_mmu_helpers.h>
+#include <lib/utils_def.h>
+#include <lib/xlat_tables/xlat_mmu_helpers.h>
 
 /* Miscellaneous MMU related constants */
 #define NUM_2MB_IN_GB          (U(1) << 9)
index 5c4edc31a8f20d67cd5e04fae75de47c7e21ca20..55514268380242807903aaeebc31dc5346d63d33 100644 (file)
@@ -7,13 +7,14 @@
 #ifndef XLAT_TABLES_V2_H
 #define XLAT_TABLES_V2_H
 
-#include <xlat_tables_defs.h>
-#include <xlat_tables_v2_helpers.h>
+#include <lib/xlat_tables/xlat_tables_defs.h>
+#include <lib/xlat_tables/xlat_tables_v2_helpers.h>
 
 #ifndef __ASSEMBLY__
 #include <stddef.h>
 #include <stdint.h>
-#include <xlat_mmu_helpers.h>
+
+#include <lib/xlat_tables/xlat_mmu_helpers.h>
 
 /*
  * Default granularity size for an mmap_region_t.
index fa8995886ec41698ac3458a795fa1b124052ac12..ce5cf820a0e5132c06d639d47fd4bc0b05dc0a28 100644 (file)
 
 #ifndef __ASSEMBLY__
 
-#include <cassert.h>
-#include <platform_def.h>
 #include <stdbool.h>
 #include <stddef.h>
-#include <xlat_tables_arch.h>
-#include <xlat_tables_defs.h>
+
+#include <platform_def.h>
+
+#include <lib/cassert.h>
+#include <lib/xlat_tables/xlat_tables_arch.h>
+#include <lib/xlat_tables/xlat_tables_defs.h>
 
 /* Forward declaration */
 struct mmap_region;
index 29211be2a6ac8f4377d4b7e1f3905b6ea1199ee7..6cca38909ac2a291ef418bcf173a737e0049c868 100644 (file)
@@ -7,9 +7,10 @@
 #ifndef BOARD_CSS_DEF_H
 #define BOARD_CSS_DEF_H
 
-#include <common_def.h>
+#include <lib/utils_def.h>
+#include <plat/common/common_def.h>
+
 #include <soc_css_def.h>
-#include <utils_def.h>
 #include <v2m_def.h>
 
 /*
@@ -31,7 +32,7 @@
 
 #ifndef __ASSEMBLY__
 
-#include <mmio.h>
+#include <lib/mmio.h>
 
 #define BOARD_CSS_GET_PLAT_TYPE(addr)                                  \
        ((mmio_read_32(addr) & BOARD_CSS_PLAT_ID_REG_ID_MASK)           \
index ed57fc9a0ded7cdf41b58b0c48b5c5034e67d7d4..c5de407af511bf1f04fca23f310cb3282c38dc8e 100644 (file)
@@ -6,7 +6,7 @@
 #ifndef V2M_DEF_H
 #define V2M_DEF_H
 
-#include <xlat_tables_compat.h>
+#include <lib/xlat_tables/xlat_tables_compat.h>
 
 /* V2M motherboard system registers & offsets */
 #define V2M_SYSREGS_BASE               UL(0x1c010000)
index c2ba7db9fdc66a202cc90c7b525821ec20ff27d3..0bd0daf53b69334fa3c3722f8037736d88c2dc59 100644 (file)
@@ -6,9 +6,9 @@
 #ifndef ARM_MACROS_S
 #define ARM_MACROS_S
 
-#include <gic_common.h>
-#include <gicv2.h>
-#include <gicv3.h>
+#include <drivers/arm/gic_common.h>
+#include <drivers/arm/gicv2.h>
+#include <drivers/arm/gicv3.h>
 #include <platform_def.h>
 
 .section .rodata.gic_reg_name, "aS"
index 069dc854f174cb1458c8389a1a5145ff28e4fa4d..07f7cd39a5627b46bc6c71deaea64e10f2066bbf 100644 (file)
@@ -6,7 +6,7 @@
 #ifndef CCI_MACROS_S
 #define CCI_MACROS_S
 
-#include <cci.h>
+#include <drivers/arm/cci.h>
 #include <platform_def.h>
 
 .section .rodata.cci_reg_name, "aS"
index 4dda350604b9cec1665d3063df3d751466ad5587..c2b28df5bddbd0470db493cf2dcda709c7775b0d 100644 (file)
@@ -7,7 +7,8 @@
 #define ARM_CONFIG_H
 
 #include <stdint.h>
-#include <utils_def.h>
+
+#include <lib/utils_def.h>
 
 /* Whether Base memory map is in use */
 #define ARM_CONFIG_BASE_MMAP           BIT(1)
index 4ab3a8086797ddb58cd3aef9177877e7f61d7a84..c63fddb3f36e2a75e0709218be9badb0bc36582c 100644 (file)
@@ -6,15 +6,15 @@
 #ifndef ARM_DEF_H
 #define ARM_DEF_H
 
-#include <arch.h>
-#include <common_def.h>
-#include <gic_common.h>
-#include <interrupt_props.h>
 #include <platform_def.h>
-#include <tbbr_img_def.h>
-#include <utils_def.h>
-#include <xlat_tables_defs.h>
 
+#include <arch.h>
+#include <common/interrupt_props.h>
+#include <common/tbbr/tbbr_img_def.h>
+#include <drivers/arm/gic_common.h>
+#include <lib/utils_def.h>
+#include <lib/xlat_tables/xlat_tables_defs.h>
+#include <plat/common/common_def.h>
 
 /******************************************************************************
  * Definitions common to all ARM standard platforms
index 3e25cbc6adc71783e70fd32afc50cf69278644be..16573ce6a6f91c68bdf83619af7ee9f1293d0d5b 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef ARM_SIP_SVC_H
 #define ARM_SIP_SVC_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 /* SMC function IDs for SiP Service queries */
 
index bf3cb8fa03343bc5d6607333d00689d9bf2f5d07..bdcbc96aff31d5eecd7dfab0c7740fb7d839bf36 100644 (file)
@@ -6,9 +6,10 @@
 #ifndef ARM_SPM_DEF_H
 #define ARM_SPM_DEF_H
 
+#include <lib/utils_def.h>
+#include <lib/xlat_tables/xlat_tables_defs.h>
+
 #include <arm_def.h>
-#include <utils_def.h>
-#include <xlat_tables_defs.h>
 
 /*
  * Reserve 4 MiB for binaries of Secure Partitions and Resource Description
index df951e117f47447f2ea94da8a68ec42e3404f29d..6dcea0b6e321695e2203f0a0822a714ec56eb642 100644 (file)
@@ -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 <xlat_tables_defs.h>
+#include <lib/xlat_tables/xlat_tables_defs.h>
 
 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 */
index 9b459841ce003a8fe666917a27b22b7ba5e01623..628160824535d458065d864c2c89ea67bfb88ce8 100644 (file)
@@ -6,14 +6,15 @@
 #ifndef PLAT_ARM_H
 #define PLAT_ARM_H
 
-#include <bakery_lock.h>
-#include <cassert.h>
-#include <cpu_data.h>
 #include <stdint.h>
-#include <spinlock.h>
-#include <tzc_common.h>
-#include <utils_def.h>
-#include <xlat_tables_compat.h>
+
+#include <drivers/arm/tzc_common.h>
+#include <lib/bakery_lock.h>
+#include <lib/cassert.h>
+#include <lib/el3_runtime/cpu_data.h>
+#include <lib/spinlock.h>
+#include <lib/utils_def.h>
+#include <lib/xlat_tables/xlat_tables_compat.h>
 
 /*******************************************************************************
  * Forward declarations
index 4a7d314c955dc0b6f50974580b48919883e50986..6b355a4e9e6fdcbcbf2d4ac4b3a6c8e60f16c98e 100644 (file)
@@ -7,10 +7,11 @@
 #ifndef CSS_DEF_H
 #define CSS_DEF_H
 
+#include <common/interrupt_props.h>
+#include <drivers/arm/gic_common.h>
+#include <drivers/arm/tzc400.h>
+
 #include <arm_def.h>
-#include <gic_common.h>
-#include <interrupt_props.h>
-#include <tzc400.h>
 
 /*************************************************************************
  * Definitions common to all ARM Compute SubSystems (CSS)
index ff75c6916442d6a02a3204ee3bf112da65d08f4e..b82ff47e7b5a1b21550f6795d5fb01d0fff9c515 100644 (file)
@@ -8,9 +8,10 @@
 #define CSS_PM_H
 
 #include <cdefs.h>
-#include <psci.h>
 #include <stdint.h>
 
+#include <lib/psci/psci.h>
+
 /* 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]
index 263313a9a761ccb98ddbbc43efa868209f723790..b4b6ba8e4e3831385b4661b9fe5fe9beeba4ec13 100644 (file)
@@ -7,9 +7,8 @@
 #ifndef SOC_CSS_DEF_H
 #define SOC_CSS_DEF_H
 
-#include <common_def.h>
-#include <utils_def.h>
-
+#include <lib/utils_def.h>
+#include <plat/common/common_def.h>
 
 /*
  * Definitions common to all ARM CSS SoCs
index 66074ac17c9c277d59e93408c5b09dcdfe212257..66c88ba8cca7e15c7ad56c4e17a28cb43e53538e 100644 (file)
@@ -6,10 +6,11 @@
 #ifndef COMMON_DEF_H
 #define COMMON_DEF_H
 
-#include <bl_common.h>
 #include <platform_def.h>
-#include <utils_def.h>
-#include <xlat_tables_defs.h>
+
+#include <common/bl_common.h>
+#include <lib/utils_def.h>
+#include <lib/xlat_tables/xlat_tables_defs.h>
 
 /******************************************************************************
  * Required platform porting definitions that are expected to be common to
index 04272b1b58f5627cd27d8cf5479dec49911a2cd5..13767ff0a4b51c923d293b745555863e56875467 100644 (file)
@@ -7,9 +7,10 @@
 #ifndef PLATFORM_H
 #define PLATFORM_H
 
-#include <psci.h>
 #include <stdint.h>
 
+#include <lib/psci/psci.h>
+
 /*******************************************************************************
  * Forward declarations
  ******************************************************************************/
index fdcc02a66a12fb114f8c0661b816c1cfc7ed21c3..c6953fb7139eab5a1f90f1c92b426450ad6ecb96 100644 (file)
@@ -8,9 +8,10 @@
 #ifndef ARMADA_COMMON_H
 #define ARMADA_COMMON_H
 
-#include <io_addr_dec.h>
 #include <stdint.h>
 
+#include <io_addr_dec.h>
+
 int marvell_get_io_dec_win_conf(struct dec_win_config **win, uint32_t *size);
 
 #endif /* ARMADA_COMMON_H */
index 3c105fca74cba9f2eb52e58ddff1786376e423cb..229b8b0295d4969c771b1821183ec59e4a9c2c39 100644 (file)
@@ -8,12 +8,12 @@
 #ifndef MARVELL_DEF_H
 #define MARVELL_DEF_H
 
-#include <arch.h>
-#include <common_def.h>
 #include <platform_def.h>
-#include <tbbr_img_def.h>
-#include <xlat_tables.h>
 
+#include <arch.h>
+#include <common/tbbr/tbbr_img_def.h>
+#include <lib/xlat_tables/xlat_tables.h>
+#include <plat/common/common_def.h>
 
 /****************************************************************************
  * Definitions common to all MARVELL standard platforms
index 01e42c545d699d641b465650217ec218489a2080..8b8b53ffe8c9ba4734999e8e3657fe9af9a1c975 100644 (file)
@@ -8,11 +8,12 @@
 #ifndef PLAT_MARVELL_H
 #define PLAT_MARVELL_H
 
-#include <bl_common.h>
-#include <cassert.h>
-#include <cpu_data.h>
 #include <stdint.h>
-#include <xlat_tables.h>
+
+#include <common/bl_common.h>
+#include <lib/cassert.h>
+#include <lib/el3_runtime/cpu_data.h>
+#include <lib/xlat_tables/xlat_tables.h>
 
 /*
  * Extern declarations common to Marvell standard platforms
index 64d9adf964716f666c0c767f3f604a4fcf0e17d4..dd2a24abca639cc4de15d5090f290829044f98d5 100644 (file)
@@ -8,10 +8,10 @@
 #ifndef ARMADA_COMMON_H
 #define ARMADA_COMMON_H
 
-#include <amb_adec.h>
-#include <io_win.h>
-#include <iob.h>
-#include <ccu.h>
+#include <drivers/marvell/amb_adec.h>
+#include <drivers/marvell/ccu.h>
+#include <drivers/marvell/io_win.h>
+#include <drivers/marvell/iob.h>
 
 /*
  * This struct supports skip image request
index c67b3cd872b3e3d0e5d301df36e935edcb9f2853..5ba90f711ec2df791329e3af7a6bfa5729028748 100644 (file)
@@ -8,12 +8,12 @@
 #ifndef MARVELL_DEF_H
 #define MARVELL_DEF_H
 
-#include <arch.h>
-#include <common_def.h>
 #include <platform_def.h>
-#include <tbbr_img_def.h>
-#include <xlat_tables.h>
 
+#include <arch.h>
+#include <common/tbbr/tbbr_img_def.h>
+#include <lib/xlat_tables/xlat_tables.h>
+#include <plat/common/common_def.h>
 
 /******************************************************************************
  * Definitions common to all MARVELL standard platforms
index 037548da063f1234c46a9d1cded1e8bb3d127820..65d4de8a6c78e0106e0031ab43975db2707d41fc 100644 (file)
@@ -8,11 +8,12 @@
 #ifndef PLAT_MARVELL_H
 #define PLAT_MARVELL_H
 
-#include <cassert.h>
-#include <cpu_data.h>
 #include <stdint.h>
-#include <utils.h>
-#include <xlat_tables.h>
+
+#include <lib/cassert.h>
+#include <lib/el3_runtime/cpu_data.h>
+#include <lib/utils.h>
+#include <lib/xlat_tables/xlat_tables.h>
 
 /*
  * Extern declarations common to Marvell standard platforms
index 96b364eebd80174b3a690258d73005b3384fcfba..b0a909bb6375f53b2e61f4275017577715dfb5e2 100644 (file)
@@ -8,7 +8,7 @@
 #ifndef CCI_MACROS_S
 #define CCI_MACROS_S
 
-#include <cci.h>
+#include <drivers/arm/cci.h>
 #include <platform_def.h>
 
 .section .rodata.cci_reg_name, "aS"
index c2a8bd055908bd5447b7623029a274bc1bf57e5f..bfe2d41273884ed5166f5fc5748d663b3023b895 100644 (file)
@@ -8,10 +8,10 @@
 #ifndef MARVELL_MACROS_S
 #define MARVELL_MACROS_S
 
-#include <cci.h>
-#include <gic_common.h>
-#include <gicv2.h>
-#include <gicv3.h>
+#include <drivers/arm/cci.h>
+#include <drivers/arm/gic_common.h>
+#include <drivers/arm/gicv2.h>
+#include <drivers/arm/gicv3.h>
 #include <platform_def.h>
 
 /*
index 6f0b588a7f17d182047afc2b2554d01e917bb098..78b5331e432948494b1abdee1d8a7c684c8f78f1 100644 (file)
@@ -8,7 +8,7 @@
 #ifndef MARVELL_PLAT_PRIV_H
 #define MARVELL_PLAT_PRIV_H
 
-#include <utils.h>
+#include <lib/utils.h>
 
 /*****************************************************************************
  * Function and variable prototypes
index e2ce90fda45851fb7507a7b6c25aa59b73f99748..c81e9048140eea6063ce07ce9073b3728e70bb88 100644 (file)
@@ -9,7 +9,7 @@
 
 #if SPM_DEPRECATED
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 #define MM_VERSION_MAJOR       U(1)
 #define MM_VERSION_MAJOR_SHIFT 16
index 4d0fd3fd34ace9209ab27e0e341b05427fdf0fe3..ae8c7e42fdfb58e707fe8bf322aebb93609689be 100644 (file)
@@ -7,8 +7,8 @@
 #ifndef SDEI_H
 #define SDEI_H
 
-#include <spinlock.h>
-#include <utils_def.h>
+#include <lib/spinlock.h>
+#include <lib/utils_def.h>
 
 /* Range 0xC4000020 - 0xC400003F reserved for SDE 64bit smc calls */
 #define SDEI_VERSION                           0xC4000020U
index 0ae6cf9919c16dc9424be016b8fd1776f8f57e0d..47f63684f35e9e4e011deffcf95441a17d4fb13c 100644 (file)
@@ -10,7 +10,8 @@
 #if SPM_DEPRECATED
 
 #include <stdint.h>
-#include <utils_def.h>
+
+#include <lib/utils_def.h>
 
 /*
  * Flags used by the secure_partition_mp_info structure to describe the
index dc0022128ce10f47dfd3863282d01a47c8dc9a54..b8be72eeb558280d81651f173b9899edb3d8271f 100644 (file)
@@ -8,7 +8,8 @@
 #define SPM_RES_DESC_H
 
 #include <stdint.h>
-#include <sp_res_desc_def.h>
+
+#include <services/sp_res_desc_def.h>
 
 /*******************************************************************************
  * Attribute Section
index 68df297a883e4ac9c5a84add4ffeba30a3a1627a..5a3c50d7f9cd70f2537b2f60eeadeb2613dcb1d2 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef SPM_RES_DESC_DEFS_H
 #define SPM_RES_DESC_DEFS_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 /*******************************************************************************
  * Attribute Section
index eae4fb7fef8b98d98db2ee47441e29f38e570b57..b82cf1e304657d06c5ed7b09ed5d08ac1a9487f4 100644 (file)
@@ -7,8 +7,8 @@
 #ifndef SPCI_SVC_H
 #define SPCI_SVC_H
 
-#include <smccc.h>
-#include <utils_def.h>
+#include <lib/smccc.h>
+#include <lib/utils_def.h>
 
 /* SPCI_VERSION helpers */
 
index 763b24eacdac0fdaae642d9baeabb055b8b2a313..fcb409b293d35a85f710919d5fd9591f1684ff74 100644 (file)
@@ -9,7 +9,7 @@
 
 #if SPM_DEPRECATED
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 #define SPM_VERSION_MAJOR      U(0)
 #define SPM_VERSION_MAJOR_SHIFT        16
index b6b51dd438109f59704f3bc979cb6fd4e9c2739e..bd695e58aac2b772cb45f2edaa015d5550427b0d 100644 (file)
@@ -7,8 +7,8 @@
 #ifndef SPRT_SVC_H
 #define SPRT_SVC_H
 
-#include <smccc.h>
-#include <utils_def.h>
+#include <lib/smccc.h>
+#include <lib/utils_def.h>
 
 /* SPRT_VERSION helpers */
 
index 9f586b0aa7953cd0825f6bad1bf42e244f74d357..598d5c25879264754bfb6538865623e42f4cc3c7 100644 (file)
@@ -8,7 +8,8 @@
 #define FIRMWARE_IMAGE_PACKAGE_H
 
 #include <stdint.h>
-#include <uuid.h>
+
+#include "uuid.h"
 
 /* This is used as a signature to validate the blob header */
 #define TOC_HEADER_NAME        0xAA640001
index 8920f7297ea851e67c081c94b4af5df25e817b40..9aac8cfb9495a7fefff9d4fd5442e6d4452aa1a0 100644 (file)
@@ -7,7 +7,7 @@
 #include <arch.h>
 #include <asm_macros.S>
 #include <assert_macros.S>
-#include <xlat_tables_defs.h>
+#include <lib/xlat_tables/xlat_tables_defs.h>
 
 #if !ERROR_DEPRECATED
        .globl  get_afflvl_shift
index bbaa33294e5b534618f067f0e979dd3b827cb47b..4201823502e88c3589cc06d2af797987544b4be6 100644 (file)
@@ -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
index 64f8879e4f71915017bb2a61bce91ad944882256..63bdc63594fe8e786cb79d5bff3c4694e70bdc2b 100644 (file)
@@ -5,12 +5,13 @@
  */
 
 #include <assert.h>
-#include <cbmem_console.h>
-#include <coreboot.h>
-#include <debug.h>
-#include <mmio.h>
 #include <string.h>
-#include <xlat_tables_v2.h>
+
+#include <drivers/coreboot/cbmem_console.h>
+#include <common/debug.h>
+#include <lib/coreboot.h>
+#include <lib/mmio.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
 
 /*
  * Structures describing coreboot's in-memory descriptor tables. See
index 1647e169f64a17467983c09a557bfe9c2be3ec32..4975ec60dfb3e6c9ce32d559abe15508f616067f 100644 (file)
@@ -3,12 +3,13 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
+
 #include <arch.h>
 #include <asm_macros.S>
 #include <assert_macros.S>
+#include <common/debug.h>
 #include <cortex_a53.h>
 #include <cpu_macros.S>
-#include <debug.h>
 
 #if A53_DISABLE_NON_TEMPORAL_HINT
 #undef ERRATA_A53_836870
index dff86be7688875915178e8c184240063f9936596..04942d3092f78024c84d60c5eed7d05daaa2d040 100644 (file)
@@ -6,9 +6,9 @@
 #include <arch.h>
 #include <asm_macros.S>
 #include <assert_macros.S>
+#include <common/debug.h>
 #include <cortex_a57.h>
 #include <cpu_macros.S>
-#include <debug.h>
 
        /* ---------------------------------------------
         * Disable intra-cluster coherency
index 3bc3388bc3fce9f231f3fc0aebc7a6adb05fe4dd..ff2b0e66e083fc3944f030f44d0977a61490ebf5 100644 (file)
@@ -6,9 +6,9 @@
 #include <arch.h>
 #include <asm_macros.S>
 #include <assert_macros.S>
+#include <common/debug.h>
 #include <cortex_a72.h>
 #include <cpu_macros.S>
-#include <debug.h>
 
        /* ---------------------------------------------
         * Disable all types of L2 prefetches.
index ddc0808421b0c57694a2737a8d7ba5b004c72cca..f84cd0dfaccd03d14e8ea9509aaedf37f9594894 100644 (file)
@@ -7,8 +7,8 @@
 #include <arch.h>
 #include <asm_macros.S>
 #include <assert_macros.S>
-#include <cpu_data.h>
 #include <cpu_macros.S>
+#include <lib/el3_runtime/cpu_data.h>
 
 #if defined(IMAGE_BL1) || defined(IMAGE_BL32) || (defined(IMAGE_BL2) && BL2_AT_EL3)
        /*
index 2e0d63161ad81102fa093de09fc615992ae29ae6..96e5dd3838fa5628731fe99e100c01570bb0b9ca 100644 (file)
@@ -6,7 +6,7 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <bl_common.h>
+#include <common/bl_common.h>
 #include <cortex_a35.h>
 #include <cpu_macros.S>
 #include <plat_macros.S>
index 108509f1f061971a8424f553e1283c691f648728..332bad75f3d880ec61f5777570825ffdbbb344cb 100644 (file)
@@ -5,11 +5,11 @@
  */
 #include <arch.h>
 #include <asm_macros.S>
-#include <bl_common.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
 #include <cortex_a53.h>
 #include <cpu_macros.S>
-#include <debug.h>
-#include <errata_report.h>
+#include <lib/cpus/errata_report.h>
 #include <plat_macros.S>
 
 #if A53_DISABLE_NON_TEMPORAL_HINT
index 4e9bd9f6f7b4f2e6f35747a35e32a0332bde6e0d..b347e299cbdf2db3e1f587627c44c301da08f1a8 100644 (file)
@@ -6,7 +6,7 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <bl_common.h>
+#include <common/bl_common.h>
 #include <cortex_a55.h>
 #include <cpu_macros.S>
 #include <plat_macros.S>
index 8e60445516275c284631b7b4a580da62fa1e9f4f..a862671660c715541f0915e87c04ed874c82a875 100644 (file)
@@ -6,10 +6,10 @@
 #include <arch.h>
 #include <asm_macros.S>
 #include <assert_macros.S>
-#include <bl_common.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
 #include <cortex_a57.h>
 #include <cpu_macros.S>
-#include <debug.h>
 #include <plat_macros.S>
 
        /* ---------------------------------------------
index b796561359ed9094e619d4acda5fe9a1c7f7d83c..772b0be79d8708ebb811fac5563ac5b85e43b69c 100644 (file)
@@ -5,7 +5,7 @@
  */
 #include <arch.h>
 #include <asm_macros.S>
-#include <bl_common.h>
+#include <common/bl_common.h>
 #include <cortex_a73.h>
 #include <cpu_macros.S>
 #include <plat_macros.S>
index f4ca486064ee3140f74f86c103b60f53ec0c234f..bd2c6974ed30b395a7cf89dc032229ccc0fce561 100644 (file)
@@ -6,7 +6,7 @@
 
 #include <cortex_a75.h>
 #include <cpuamu.h>
-#include <pubsub_events.h>
+#include <lib/el3_runtime/pubsub_events.h>
 
 static void *cortex_a75_context_save(const void *arg)
 {
index 4def14373754b6efe53c8404bb762079a992d586..27db74e418d8f19741a961dab4afda02b4f69759 100644 (file)
@@ -5,13 +5,13 @@
  */
 
 #include <arch.h>
-#include <arm_arch_svc.h>
 #include <asm_macros.S>
-#include <bl_common.h>
+#include <common/bl_common.h>
 #include <context.h>
 #include <cortex_a76.h>
 #include <cpu_macros.S>
 #include <plat_macros.S>
+#include <services/arm_arch_svc.h>
 
 #if !DYNAMIC_WORKAROUND_CVE_2018_3639
 #error Cortex A76 requires DYNAMIC_WORKAROUND_CVE_2018_3639=1
index 9566223f2a2c43451decb08447422c5730f854d9..4a4f33386b9e96cb49ee391792bd646501f5a65d 100644 (file)
@@ -6,7 +6,7 @@
 
 #include <cortex_ares.h>
 #include <cpuamu.h>
-#include <pubsub_events.h>
+#include <lib/el3_runtime/pubsub_events.h>
 
 static void *cortex_ares_context_save(const void *arg)
 {
index cad906f65cbf882794a7f4016572270aeb97bec9..0e72fba5a1aaaccea0c3f38870e50a2e5928aa6e 100644 (file)
@@ -6,7 +6,7 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <bl_common.h>
+#include <common/bl_common.h>
 #include <cortex_deimos.h>
 #include <cpu_macros.S>
 #include <plat_macros.S>
index 4812ac47ca73b8867d8c9ef66753d919fd063167..7d3d7e45c2228c9d6418d8018affb3f16ff87111 100644 (file)
@@ -5,10 +5,10 @@
  */
 #include <arch.h>
 #include <asm_macros.S>
-#include <bl_common.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
 #include <cortex_helios.h>
 #include <cpu_macros.S>
-#include <debug.h>
 #include <plat_macros.S>
 
 func cortex_helios_cpu_pwr_dwn
index 69ece8fffe91b5672c0adbdeab767a53be9dcef3..74d7bb2406b0ad93cbdb9cb3426a8f80a59080e4 100644 (file)
@@ -7,10 +7,10 @@
 #include <arch.h>
 #include <asm_macros.S>
 #include <assert_macros.S>
-#include <cpu_data.h>
+#include <common/debug.h>
 #include <cpu_macros.S>
-#include <debug.h>
-#include <errata_report.h>
+#include <lib/cpus/errata_report.h>
+#include <lib/el3_runtime/cpu_data.h>
 
  /* Reset fn is needed in BL at reset vector */
 #if defined(IMAGE_BL1) || defined(IMAGE_BL31) || (defined(IMAGE_BL2) && BL2_AT_EL3)
index 5ad5bf8392ceb8083e2b0a44820827c51ae0a9d0..3a2fa819f8788d9fbfea8bbdc8e807e72e73697d 100644 (file)
@@ -5,8 +5,8 @@
  */
 
 #include <cpuamu.h>
-#include <platform.h>
-#include <pubsub_events.h>
+#include <lib/el3_runtime/pubsub_events.h>
+#include <plat/common/platform.h>
 
 #define CPUAMU_NR_COUNTERS     5U
 
index 152a3da2633f03c413864beee16a36e98c366f96..eb84daacfaed55d916bcabcf363bb9bf0612d467 100644 (file)
@@ -6,7 +6,7 @@
 
 #include <asm_macros.S>
 #include <dsu_def.h>
-#include <errata_report.h>
+#include <lib/cpus/errata_report.h>
 
 /* -----------------------------------------------------------------------
  * DSU erratum 936184 check function
index c613ebdf6c870c75717956340e175ea9b34f69a4..c9a9544968315fecf7d1e55ca5adbdb0d9387ecf 100644 (file)
@@ -5,9 +5,9 @@
  */
 
 #include <arch.h>
-#include <arm_arch_svc.h>
 #include <asm_macros.S>
 #include <context.h>
+#include <services/arm_arch_svc.h>
 
        .globl  wa_cve_2017_5715_bpiall_vbar
 
index d7b6e26e40f7128ab148d3a2cac9e74f06022410..9277cc624cf1f94321ae992d557ad74cb3886b1c 100644 (file)
@@ -5,9 +5,9 @@
  */
 
 #include <arch.h>
-#include <arm_arch_svc.h>
 #include <asm_macros.S>
 #include <context.h>
+#include <services/arm_arch_svc.h>
 
        .globl  wa_cve_2017_5715_mmu_vbar
 
index 42603cb6d9358fffc953841085c262e1a536a1c0..aeb35600594f841685698120b5b44f67cba7067f 100644 (file)
@@ -6,14 +6,15 @@
 
 /* Runtime firmware routines to report errata status for the current CPU. */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <cpu_data.h>
-#include <debug.h>
-#include <errata_report.h>
-#include <spinlock.h>
 #include <stdbool.h>
-#include <utils.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <lib/cpus/errata_report.h>
+#include <lib/el3_runtime/cpu_data.h>
+#include <lib/spinlock.h>
+#include <lib/utils.h>
 
 #ifdef IMAGE_BL1
 # define BL_STRING     "BL1"
index ad0a1206d0d927f09378ba9a8fcb24e68fe7da3d..a4702fcc60f3d2eb7040f80c1089131c569667af 100644 (file)
@@ -4,19 +4,21 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <amu.h>
+#include <assert.h>
+#include <stdbool.h>
+#include <string.h>
+
+#include <platform_def.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <assert.h>
-#include <bl_common.h>
+#include <common/bl_common.h>
 #include <context.h>
-#include <context_mgmt.h>
-#include <platform.h>
-#include <platform_def.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/extensions/amu.h>
+#include <lib/utils.h>
+#include <plat/common/platform.h>
 #include <smccc_helpers.h>
-#include <stdbool.h>
-#include <string.h>
-#include <utils.h>
 
 /*******************************************************************************
  * Context management library initialisation routine. This library is used by
index 68d64151fccd17b03e6c5a0aa7e42984f2530a77..bdad2c145aa9d4bed7072c3cd033a7ad08d16698 100644 (file)
@@ -5,7 +5,7 @@
  */
 
 #include <asm_macros.S>
-#include <cpu_data.h>
+#include <lib/el3_runtime/cpu_data.h>
 
        .globl  _cpu_data
        .globl  _cpu_data_by_index
index 39c27d0ecaac0a54e17a38e267becc6e27ca8215..8a5764ce235f6a126f3cfb3c77f7f7f364d28155 100644 (file)
@@ -4,24 +4,26 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <amu.h>
+#include <assert.h>
+#include <stdbool.h>
+#include <string.h>
+
+#include <platform_def.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <assert.h>
-#include <bl_common.h>
+#include <bl31/interrupt_mgmt.h>
+#include <common/bl_common.h>
 #include <context.h>
-#include <context_mgmt.h>
-#include <interrupt_mgmt.h>
-#include <mpam.h>
-#include <platform.h>
-#include <platform_def.h>
-#include <pubsub_events.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/el3_runtime/pubsub_events.h>
+#include <lib/extensions/amu.h>
+#include <lib/extensions/mpam.h>
+#include <lib/extensions/spe.h>
+#include <lib/extensions/sve.h>
+#include <lib/utils.h>
+#include <plat/common/platform.h>
 #include <smccc_helpers.h>
-#include <spe.h>
-#include <stdbool.h>
-#include <string.h>
-#include <sve.h>
-#include <utils.h>
 
 
 /*******************************************************************************
index 96be0813cf235dea3f0d6366c61bcd949fed3c63..2edf2255963ba6e98a876e82c5d52217176312cb 100644 (file)
@@ -5,7 +5,7 @@
  */
 
 #include <asm_macros.S>
-#include <cpu_data.h>
+#include <lib/el3_runtime/cpu_data.h>
 
 .globl init_cpu_data_ptr
 .globl _cpu_data_by_index
index 10b1a7c5b69aa5b85eafa6f54ee331d771f5f6fc..13d464c974f3f8f8f407af35cf5c2193d23d1ab6 100644 (file)
@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <cassert.h>
-#include <cpu_data.h>
 #include <platform_def.h>
 
+#include <lib/cassert.h>
+#include <lib/el3_runtime/cpu_data.h>
+
 /* The per_cpu_ptr_cache_t space allocation */
 cpu_data_t percpu_data[PLATFORM_CORE_COUNT];
index 585d908f77c2eb6c7edff5cd77ee6bc04d64c7e1..82d2e186403f202ed0a3f3614c512b8def79e5ed 100644 (file)
@@ -4,13 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <amu.h>
-#include <amu_private.h>
+#include <stdbool.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <platform.h>
-#include <pubsub_events.h>
-#include <stdbool.h>
+#include <lib/el3_runtime/pubsub_events.h>
+#include <lib/extensions/amu.h>
+#include <lib/extensions/amu_private.h>
+#include <plat/common/platform.h>
 
 #define AMU_GROUP0_NR_COUNTERS 4
 
index 1564e840242cf7f48106faa658f00b1c7825d366..85f7007aac42e4db9303c1e96ee5d3a19e3df396 100644 (file)
@@ -4,15 +4,16 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <amu.h>
-#include <amu_private.h>
-#include <arch.h>
-#include <arch_helpers.h>
 #include <assert.h>
-#include <platform.h>
-#include <pubsub_events.h>
 #include <stdbool.h>
 
+#include <arch.h>
+#include <arch_helpers.h>
+#include <lib/el3_runtime/pubsub_events.h>
+#include <lib/extensions/amu.h>
+#include <lib/extensions/amu_private.h>
+#include <plat/common/platform.h>
+
 #define AMU_GROUP0_NR_COUNTERS 4
 
 struct amu_ctx {
index d57bb470bf9f6268cba25c398eb22bd6be30cd92..01667079019578d5edaf08a2d380df8fec942af5 100644 (file)
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <stdbool.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <mpam.h>
-#include <stdbool.h>
+#include <lib/extensions/mpam.h>
 
 bool mpam_supported(void)
 {
index f39e5f5f1b28b21cc7e2a93ebaf2a6539b549bc5..be8beceeb4972a89215b51c66870e7a7c287323a 100644 (file)
@@ -4,15 +4,16 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
-#include <debug.h>
-#include <ea_handle.h>
-#include <ehf.h>
-#include <platform.h>
-#include <ras.h>
-#include <ras_arch.h>
 #include <stdbool.h>
 
+#include <arch_helpers.h>
+#include <bl31/ea_handle.h>
+#include <bl31/ehf.h>
+#include <common/debug.h>
+#include <lib/extensions/ras.h>
+#include <lib/extensions/ras_arch.h>
+#include <plat/common/platform.h>
+
 #ifndef PLAT_RAS_PRI
 # error Platform must define RAS priority value
 #endif
index 9fdfd6b60f20b15b3799d56396bced1a04d255bf..c03fbbe43a396dd42ebb45b2bd4ff23c5c36d450 100644 (file)
@@ -3,8 +3,9 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include <ras_arch.h>
-#include <utils_def.h>
+
+#include <lib/extensions/ras_arch.h>
+#include <lib/utils_def.h>
 
 /*
  * Probe for error in memory-mapped registers containing error records
index e5df015b06fd85b92951db4babd499c7b921a5fa..78876c66b8acc37876f5f0c4793ca54b320a2b63 100644 (file)
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <stdbool.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <pubsub.h>
-#include <spe.h>
-#include <stdbool.h>
+#include <lib/el3_runtime/pubsub.h>
+#include <lib/extensions/spe.h>
 
 static inline void psb_csync(void)
 {
index e031bf61b95f039617f32a3ecf77c6f985f91e02..fa4ac77582976ad5efdc7d8a88a178a42f1d1752 100644 (file)
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <stdbool.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <pubsub.h>
-#include <stdbool.h>
-#include <sve.h>
+#include <lib/el3_runtime/pubsub.h>
+#include <lib/extensions/sve.h>
 
 bool sve_supported(void)
 {
index c9d16cccc68a6dc088fc6ce8731c93677b654404..432b1d075a6a8779668a150ae10b1eac2a1ee98d 100644 (file)
@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
 #include <stdlib.h>
 
+#include <common/debug.h>
+
 void abort(void)
 {
        ERROR("ABORT\n");
index 8fa8f72123652e35c1f1100ad866d93859098c19..60f1a86605f132e62c81e1a6f39ccd118549b501 100644 (file)
@@ -6,11 +6,12 @@
 
 #include <assert.h>
 #include <cdefs.h>
-#include <console.h>
-#include <debug.h>
-#include <platform.h>
 #include <stdio.h>
 
+#include <common/debug.h>
+#include <drivers/console.h>
+#include <plat/common/platform.h>
+
 /*
  * 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.
index d50876d750d628840d840bdfdbc5a1d3de5b444a..2715a72d4f4a7d790dab0826be0672b8e92e1aea 100644 (file)
@@ -3,12 +3,14 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
+
 #include <assert.h>
-#include <debug.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdint.h>
 
+#include <common/debug.h>
+
 #define get_num_va_args(_args, _lcount)                                \
        (((_lcount) > 1)  ? va_arg(_args, long long int) :      \
        (((_lcount) == 1) ? va_arg(_args, long int) :           \
index 0beb625b2d0beff3218431304e5d3ac42cff869d..037e28ac4237bb46caa2c1a7e078932e9b05bad1 100644 (file)
@@ -5,7 +5,8 @@
  */
 
 #include <stdio.h>
-#include <console.h>
+
+#include <drivers/console.h>
 
 int putchar(int c)
 {
index 66a2fa2f53122dd6152e9a3cf0c304d5425aee43..38ad1c71abb3fd5aa124d74612e1f4435c7beafe 100644 (file)
@@ -5,10 +5,11 @@
  */
 
 #include <assert.h>
-#include <debug.h>
-#include <platform.h>
 #include <stdarg.h>
 
+#include <common/debug.h>
+#include <plat/common/platform.h>
+
 static void string_print(char **s, size_t n, size_t *chars_printed,
                         const char *str)
 {
index 8e86790ab543e2445d9a0c1a9496dfec693d50aa..1634e3af6a50da9dfe1550a44ebe0bd1feaf1893 100644 (file)
@@ -4,13 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bakery_lock.h>
-#include <cpu_data.h>
-#include <platform.h>
 #include <string.h>
 
+#include <arch_helpers.h>
+#include <lib/bakery_lock.h>
+#include <lib/el3_runtime/cpu_data.h>
+#include <plat/common/platform.h>
+
 /*
  * Functions in this file implement Bakery Algorithm for mutual exclusion with the
  * bakery lock data structures in coherent memory.
index beae63c7220cbaf21d15e9cab9f66e92de0b29b7..867da929a3b491df89946dea24398be811791481 100644 (file)
@@ -4,13 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bakery_lock.h>
-#include <cpu_data.h>
-#include <platform.h>
 #include <string.h>
-#include <utils_def.h>
+
+#include <arch_helpers.h>
+#include <lib/bakery_lock.h>
+#include <lib/el3_runtime/cpu_data.h>
+#include <lib/utils_def.h>
+#include <plat/common/platform.h>
 
 /*
  * Functions in this file implement Bakery Algorithm for mutual exclusion with the
index 34d095b0db2b204770ba0838e455d19d6af70c66..f7392fda8192ece7e5e0d1eaf5ecb7009d99ed27 100644 (file)
@@ -4,12 +4,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
-#include <desc_image_load.h>
 #include <errno.h>
-#include <optee_utils.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <common/desc_image_load.h>
+#include <lib/optee_utils.h>
 
 /*
  * load_addr_hi and load_addr_lo: image load address.
index fe7bb7423b75dc43d53d69efc59bf0c379d460b5..131a0557895d771fa1e5dfb4ae2027b91509145d 100644 (file)
@@ -3,15 +3,17 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include <arch.h>
-#include <arch_helpers.h>
+
 #include <assert.h>
-#include <debug.h>
 #include <errno.h>
-#include <platform.h>
-#include <pmf.h>
 #include <string.h>
-#include <utils_def.h>
+
+#include <arch.h>
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <lib/pmf/pmf.h>
+#include <lib/utils_def.h>
+#include <plat/common/platform.h>
 
 /*******************************************************************************
  * The 'pmf_svc_descs' array holds the PMF service descriptors exported by
index 4c5b14f93bd66fd4106eeb5775e4a8ba2a1eb600..6d79502995003d14c554d1afb48cab1aa813f77f 100644 (file)
@@ -3,10 +3,12 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
+
 #include <assert.h>
-#include <debug.h>
-#include <platform.h>
-#include <pmf.h>
+
+#include <common/debug.h>
+#include <lib/pmf/pmf.h>
+#include <plat/common/platform.h>
 #include <smccc_helpers.h>
 
 /*
index 63d7e7088743cf7bd01b78e521f39b3b7eec064c..5cc192e66ba45fea845007b34f817b6524a9656e 100644 (file)
@@ -5,8 +5,8 @@
  */
 
 #include <asm_macros.S>
+#include <lib/psci/psci.h>
 #include <platform_def.h>
-#include <psci.h>
 
        .globl  psci_do_pwrdown_cache_maintenance
        .globl  psci_do_pwrup_cache_maintenance
index 88db1c9689442915eb9dc981f75fffaa7c874ae5..add968a7bef0be8ab6168128e65a461518aef6fc 100644 (file)
@@ -6,8 +6,8 @@
 
 #include <asm_macros.S>
 #include <assert_macros.S>
+#include <lib/psci/psci.h>
 #include <platform_def.h>
-#include <psci.h>
 
        .globl  psci_do_pwrdown_cache_maintenance
        .globl  psci_do_pwrup_cache_maintenance
index 97aeb8323ac81058a60a89c0c60d582bb0ca6586..2928c33e5925c233bc9d341fb197a511a2cb23d9 100644 (file)
@@ -4,16 +4,18 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <assert.h>
+#include <string.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <assert.h>
-#include <bl_common.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
 #include <context.h>
-#include <context_mgmt.h>
-#include <debug.h>
-#include <platform.h>
-#include <string.h>
-#include <utils.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/utils.h>
+#include <plat/common/platform.h>
+
 #include "psci_private.h"
 
 /*
index b4a25fb0a77e661b5cf2e0469c30e813e97b5729..5c0e952a9933a2a5f49e125b1d7339fc95305d93 100644 (file)
@@ -4,16 +4,18 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
-#include <arch_helpers.h>
-#include <arm_arch_svc.h>
 #include <assert.h>
-#include <debug.h>
-#include <platform.h>
-#include <pmf.h>
-#include <runtime_instr.h>
-#include <smccc.h>
 #include <string.h>
+
+#include <arch.h>
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <lib/pmf/pmf.h>
+#include <lib/runtime_instr.h>
+#include <lib/smccc.h>
+#include <plat/common/platform.h>
+#include <services/arm_arch_svc.h>
+
 #include "psci_private.h"
 
 /*******************************************************************************
index 857146b67ff9c5fb9349418f6fa1726fc95fee73..481051f95d9426e591a2fd4d3a9da13b4f3f4836 100644 (file)
@@ -6,7 +6,9 @@
 
 #include <assert.h>
 #include <limits.h>
-#include <utils.h>
+
+#include <lib/utils.h>
+
 #include "psci_private.h"
 
 u_register_t psci_mem_protect(unsigned int enable)
index 944f8bff9fa2b664e278a20b5de21b450f55e8f5..ac03e0596dcf0d065467a2a50b41c15ca738723b 100644 (file)
@@ -4,14 +4,16 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
-#include <platform.h>
-#include <pmf.h>
-#include <runtime_instr.h>
 #include <string.h>
+
+#include <arch.h>
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <lib/pmf/pmf.h>
+#include <lib/runtime_instr.h>
+#include <plat/common/platform.h>
+
 #include "psci_private.h"
 
 /******************************************************************************
index f38900cf5462c988f77ed3e8ec9cf0e55ef01698..aa6b324ed69e6dcc44113608f1a11dc61b537105 100644 (file)
@@ -4,15 +4,17 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <context_mgmt.h>
-#include <debug.h>
-#include <platform.h>
-#include <pubsub_events.h>
 #include <stddef.h>
+
+#include <arch.h>
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/el3_runtime/pubsub_events.h>
+#include <plat/common/platform.h>
+
 #include "psci_private.h"
 
 /*
index 82b951db6d6e22cd10c7ad030e498c0d203f4368..68ec7fb6612bad414c5ce75531dff82d349a0c93 100644 (file)
@@ -7,14 +7,15 @@
 #ifndef PSCI_PRIVATE_H
 #define PSCI_PRIVATE_H
 
+#include <stdbool.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <bakery_lock.h>
-#include <bl_common.h>
-#include <cpu_data.h>
-#include <psci.h>
-#include <spinlock.h>
-#include <stdbool.h>
+#include <common/bl_common.h>
+#include <lib/bakery_lock.h>
+#include <lib/el3_runtime/cpu_data.h>
+#include <lib/psci/psci.h>
+#include <lib/spinlock.h>
 
 /*
  * The PSCI capability which are provided by the generic code but does not
index 6b3081eb58c97ab8a39c4ed7811fa8e234496bba..b9467d3e00f347574015aedc831ab34bffa5a8ea 100644 (file)
@@ -4,15 +4,17 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <assert.h>
+#include <stddef.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <assert.h>
-#include <bl_common.h>
+#include <common/bl_common.h>
 #include <context.h>
-#include <context_mgmt.h>
-#include <errata_report.h>
-#include <platform.h>
-#include <stddef.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/cpus/errata_report.h>
+#include <plat/common/platform.h>
+
 #include "psci_private.h"
 
 /*******************************************************************************
index 6f6a7d4f84a6ccab55098cc32e69baddfa2c85b2..772a1840a1bc99be3d7ab3c2592e7f79b1117a67 100644 (file)
@@ -5,9 +5,12 @@
  */
 
 #include <assert.h>
-#include <debug.h>
-#include <platform.h>
+
 #include <platform_def.h>
+
+#include <common/debug.h>
+#include <plat/common/platform.h>
+
 #include "psci_private.h"
 
 #ifndef PLAT_MAX_PWR_LVL_STATES
index e00819de70354f622ec68177e793fa7e9769c112..8a752c1a15a223857e174e8a1dc9555015cf16b3 100644 (file)
@@ -4,19 +4,21 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <assert.h>
+#include <stddef.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <assert.h>
-#include <bl_common.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
 #include <context.h>
-#include <context_mgmt.h>
-#include <cpu_data.h>
-#include <debug.h>
-#include <platform.h>
-#include <pmf.h>
-#include <pubsub_events.h>
-#include <runtime_instr.h>
-#include <stddef.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/el3_runtime/cpu_data.h>
+#include <lib/el3_runtime/pubsub_events.h>
+#include <lib/pmf/pmf.h>
+#include <lib/runtime_instr.h>
+#include <plat/common/platform.h>
+
 #include "psci_private.h"
 
 /*******************************************************************************
index 7cac4e9376db4868f5a854d11e570ab0cdcfda67..141d69ef2b68bda7cd17e5b9003ad74e56eeb3b5 100644 (file)
@@ -4,12 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <console.h>
-#include <debug.h>
-#include <platform.h>
 #include <stddef.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/console.h>
+#include <plat/common/platform.h>
+
 #include "psci_private.h"
 
 void __dead2 psci_system_off(void)
index 8f0bc62bce13b19275b3241396f111c1774646e6..2aac4adf6fc86e92e8361d9a762d379c5bedbc9d 100644 (file)
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <lib/xlat_tables/xlat_tables_defs.h>
 #include <platform_def.h>
-#include <xlat_tables_defs.h>
 
 MEMORY {
        ROM (rx): ORIGIN = ROMLIB_RO_BASE, LENGTH = ROMLIB_RO_LIMIT - ROMLIB_RO_BASE
index 2ba43f343e99dac6528148bc8366c8cacee0dc0e..ee48dbc1f7c1d71618f516bc25031232ebb235ca 100644 (file)
@@ -6,9 +6,10 @@
 
 #include <assert.h>
 #include <errno.h>
-#include <semihosting.h>
 #include <string.h>
 
+#include <lib/semihosting.h>
+
 #ifndef SEMIHOSTING_SUPPORTED
 #define SEMIHOSTING_SUPPORTED  1
 #endif
index fba5e1ffa03a2bc826d31c0532c58cecac01592e..3ff74fc8a3b5b8923f257800e13f6df8d700b0db 100644 (file)
@@ -3,10 +3,12 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include <debug.h>
-#include <platform.h>
+
 #include <stdint.h>
 
+#include <common/debug.h>
+#include <plat/common/platform.h>
+
 /*
  * Canary value used by the compiler runtime checks to detect stack corruption.
  *
index a5c3c61700033d8a81118b29beff55a95f96adcf..662f6a05aee3345dab886f4f7621e76fc9a6acdc 100644 (file)
@@ -5,7 +5,8 @@
  */
 
 #include <assert.h>
-#include <utils.h>
+
+#include <lib/utils.h>
 
 /*
  * All the regions defined in mem_region_t must have the following properties
index 55957031fa308b4c0803ea6cffe9228014847351..468a9e7dd695140608cf5f6d8c7db91212ef4dec 100644 (file)
@@ -4,13 +4,16 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
-#include <arch_helpers.h>
 #include <assert.h>
+
 #include <platform_def.h>
-#include <utils.h>
-#include <xlat_tables_arch.h>
-#include <xlat_tables.h>
+
+#include <arch.h>
+#include <arch_helpers.h>
+#include <lib/utils.h>
+#include <lib/xlat_tables/xlat_tables_arch.h>
+#include <lib/xlat_tables/xlat_tables.h>
+
 #include "../xlat_tables_private.h"
 
 #if (ARM_ARCH_MAJOR == 7) && !defined(ARMV7_SUPPORTS_LARGE_PAGE_ADDRESSING)
index 4afdeed066788f04f7bae440b0fb71a1035e7134..71f491a2192183b86aabebd0dc8524d691781291 100644 (file)
@@ -4,16 +4,19 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <common_def.h>
-#include <platform_def.h>
 #include <stdint.h>
-#include <utils.h>
-#include <xlat_tables.h>
-#include <xlat_tables_arch.h>
+
+#include <platform_def.h>
+
+#include <arch.h>
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <lib/utils.h>
+#include <lib/xlat_tables/xlat_tables.h>
+#include <lib/xlat_tables/xlat_tables_arch.h>
+#include <plat/common/common_def.h>
+
 #include "../xlat_tables_private.h"
 
 #define XLAT_TABLE_LEVEL_BASE  \
index 2ee77c7aebe967b6f9db0dfe0aa2c053fc75873b..23fe3f0b40ba78ba7d7474957d905f1f3deb8e36 100644 (file)
@@ -4,18 +4,21 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
-#include <arch_helpers.h>
 #include <assert.h>
-#include <cassert.h>
-#include <common_def.h>
-#include <debug.h>
-#include <platform_def.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
-#include <utils.h>
-#include <xlat_tables.h>
+
+#include <platform_def.h>
+
+#include <arch.h>
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <lib/cassert.h>
+#include <lib/utils.h>
+#include <lib/xlat_tables/xlat_tables.h>
+#include <plat/common/common_def.h>
+
 #include "xlat_tables_private.h"
 
 #if LOG_LEVEL >= LOG_LEVEL_VERBOSE
index fad967ebfb948e2af9bdb2f582974e1c673ad0d2..4390f34ead7e390170caf92bd74f2efc9f6b77bd 100644 (file)
@@ -7,9 +7,10 @@
 #ifndef XLAT_TABLES_PRIVATE_H
 #define XLAT_TABLES_PRIVATE_H
 
-#include <cassert.h>
 #include <platform_def.h>
-#include <xlat_tables_arch.h>
+
+#include <lib/cassert.h>
+#include <lib/xlat_tables/xlat_tables_arch.h>
 
 #if HW_ASSISTED_COHERENCY
 #error xlat tables v2 must be used with HW_ASSISTED_COHERENCY
index 4a4ac30f512500c303291f0f9d0d443bccaf35fe..f2fff36c2a5af7ee616add7e36d55bcd57c2e29a 100644 (file)
@@ -6,7 +6,7 @@
 
 #include <asm_macros.S>
 #include <assert_macros.S>
-#include <xlat_tables_v2.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
 
        .global enable_mmu_direct_svc_mon
        .global enable_mmu_direct_hyp
index 66938e5f1bab566108c23b36afbe0bc032c8dcb9..349b6c4d50d9362890eb392412311d7185c5a62e 100644 (file)
@@ -4,14 +4,17 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
-#include <arch_helpers.h>
 #include <assert.h>
-#include <cassert.h>
-#include <platform_def.h>
 #include <stdbool.h>
-#include <utils_def.h>
-#include <xlat_tables_v2.h>
+
+#include <platform_def.h>
+
+#include <arch.h>
+#include <arch_helpers.h>
+#include <lib/cassert.h>
+#include <lib/utils_def.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
+
 #include "../xlat_tables_private.h"
 
 #if (ARM_ARCH_MAJOR == 7) && !defined(ARMV7_SUPPORTS_LARGE_PAGE_ADDRESSING)
index 504c03c152674179afee3e2bb5c7b330a59e1b29..07e7be1ec22cfadc2b8b233223e0ec501c9fdc23 100644 (file)
@@ -6,7 +6,7 @@
 
 #include <asm_macros.S>
 #include <assert_macros.S>
-#include <xlat_tables_v2.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
 
        .global enable_mmu_direct_el1
        .global enable_mmu_direct_el2
index 269adc7ef4531fde05688103fb0d03ba1755a32b..a803d8357f85f42d80bd82fca0fdc4486791bedd 100644 (file)
@@ -4,14 +4,16 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
-#include <arch_helpers.h>
 #include <assert.h>
-#include <cassert.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <utils_def.h>
-#include <xlat_tables_v2.h>
+
+#include <arch.h>
+#include <arch_helpers.h>
+#include <lib/cassert.h>
+#include <lib/utils_def.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
+
 #include "../xlat_tables_private.h"
 
 /*
index b887427a2e2ce564664ab823b750ecd40f15e356..bf3ae1e7de090c15a86e9ec1d1e6b79858726476 100644 (file)
@@ -5,10 +5,12 @@
  */
 
 #include <assert.h>
-#include <debug.h>
+
 #include <platform_def.h>
-#include <xlat_tables_defs.h>
-#include <xlat_tables_v2.h>
+
+#include <common/debug.h>
+#include <lib/xlat_tables/xlat_tables_defs.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
 
 #include "xlat_tables_private.h"
 
index 53fc874d8797565e56f7f90545450df4b6081b2f..c49554f1f12dc0eedb31e8e51d37b077fa50ca17 100644 (file)
@@ -4,17 +4,19 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
 #include <errno.h>
-#include <platform_def.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
-#include <utils_def.h>
-#include <xlat_tables_defs.h>
-#include <xlat_tables_v2.h>
+
+#include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <lib/utils_def.h>
+#include <lib/xlat_tables/xlat_tables_defs.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
 
 #include "xlat_tables_private.h"
 
index 528996a29aa6028ed738e3443161b7b445478923..fc709554bb0bf76462d5ff7e26954171187e542c 100644 (file)
@@ -7,9 +7,11 @@
 #ifndef XLAT_TABLES_PRIVATE_H
 #define XLAT_TABLES_PRIVATE_H
 
-#include <platform_def.h>
 #include <stdbool.h>
-#include <xlat_tables_defs.h>
+
+#include <platform_def.h>
+
+#include <lib/xlat_tables/xlat_tables_defs.h>
 
 #if PLAT_XLAT_TABLES_DYNAMIC
 /*
index 41c01aee7bd67c32f60821486ff27def5475d67a..f5848a255ea912a2d62ab528a1fce7a9b7ba2cb3 100644 (file)
@@ -4,17 +4,19 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
 #include <errno.h>
-#include <platform_def.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <utils_def.h>
-#include <xlat_tables_defs.h>
-#include <xlat_tables_v2.h>
+
+#include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <lib/utils_def.h>
+#include <lib/xlat_tables/xlat_tables_defs.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
 
 #include "xlat_tables_private.h"
 
index 574d871b06d38129a6468b2b592036c4a6208422..fd56dfc7c7a7a51b05b2641dbb0d45ac23eedc71 100644 (file)
@@ -5,11 +5,12 @@
  */
 
 #include <assert.h>
-#include <debug.h>
 #include <errno.h>
 #include <string.h>
+
+#include <common/debug.h>
+#include <lib/utils.h>
 #include <tf_gunzip.h>
-#include <utils.h>
 
 #include "zutil.h"
 
index 08eb5cf2b91e4b8bb56aa7d605f0302d62570d7c..ede3881a7dd3169c40192d9bcfec6e536dfa799c 100644 (file)
@@ -7,10 +7,11 @@
 #ifndef PLATFORM_DEF_H
 #define PLATFORM_DEF_H
 
-#include <common_def.h>
+#include <common/tbbr/tbbr_img_def.h>
+#include <lib/utils_def.h>
+#include <plat/common/common_def.h>
+
 #include <sunxi_mmap.h>
-#include <tbbr/tbbr_img_def.h>
-#include <utils_def.h>
 
 #define BL31_BASE                      SUNXI_SRAM_A2_BASE
 #define BL31_LIMIT                     (SUNXI_SRAM_A2_BASE + SUNXI_SRAM_A2_SIZE)
index 2c663291232d40e59bc350410a3465cecab79ab4..7ffa65821018aa40ddd6c246e98aea81e0388eb5 100644 (file)
@@ -4,20 +4,24 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
 #include <assert.h>
-#include <console.h>
-#include <debug.h>
-#include <generic_delay_timer.h>
-#include <gicv2.h>
+
 #include <libfdt.h>
-#include <mmio.h>
-#include <platform.h>
+
 #include <platform_def.h>
+
+#include <arch.h>
+#include <common/debug.h>
+#include <drivers/arm/gicv2.h>
+#include <drivers/console.h>
+#include <drivers/generic_delay_timer.h>
+#include <drivers/ti/uart/uart_16550.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
+
 #include <sunxi_def.h>
 #include <sunxi_mmap.h>
 #include <sunxi_private.h>
-#include <uart_16550.h>
 
 
 static entry_point_info_t bl32_image_ep_info;
index 2eb26a91bc35d2f893c7f041e47a2c6d8ee67eaf..6bb8968cee125cc1278d5183b2880be431f100b5 100644 (file)
@@ -4,16 +4,19 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
-#include <debug.h>
 #include <errno.h>
-#include <mmio.h>
-#include <platform.h>
+
 #include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <lib/mmio.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
+#include <plat/common/platform.h>
+
 #include <sunxi_def.h>
 #include <sunxi_mmap.h>
 #include <sunxi_private.h>
-#include <xlat_tables_v2.h>
 
 static mmap_region_t sunxi_mmap[PLATFORM_MMAP_REGIONS + 1] = {
        MAP_REGION_FLAT(SUNXI_SRAM_BASE, SUNXI_SRAM_SIZE,
index 3b732b5d13a824261c749069ac2b4bb004dbf466..8c086030aeb106cd61d8de3b531dad687a6a83ca 100644 (file)
@@ -4,18 +4,21 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <core_off_arisc.h>
-#include <debug.h>
-#include <delay_timer.h>
-#include <mmio.h>
-#include <platform.h>
+
 #include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <lib/mmio.h>
+#include <lib/utils_def.h>
+#include <plat/common/platform.h>
+
+#include <core_off_arisc.h>
 #include <sunxi_cpucfg.h>
 #include <sunxi_mmap.h>
 #include <sunxi_private.h>
-#include <utils_def.h>
 
 static void sunxi_cpu_disable_power(unsigned int cluster, unsigned int core)
 {
index 7d13cdad15dc920fd90094e71f2beccbe485bebd..8cc715c27a26ad1cf46dc485e91a9bb770e40e2d 100644 (file)
@@ -4,15 +4,18 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
-#include <delay_timer.h>
-#include <gicv2.h>
-#include <mmio.h>
-#include <platform.h>
+
 #include <platform_def.h>
-#include <psci.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/arm/gicv2.h>
+#include <drivers/delay_timer.h>
+#include <lib/mmio.h>
+#include <lib/psci/psci.h>
+#include <plat/common/platform.h>
+
 #include <sunxi_cpucfg.h>
 #include <sunxi_mmap.h>
 #include <sunxi_private.h>
index 9053728872f18fc6f6baf86bbc2f14173ec71c14..1f16a0b724d3f5e01127b90b93052d3045142f56 100644 (file)
@@ -4,8 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
-#include <mmio.h>
+#include <common/debug.h>
+#include <lib/mmio.h>
+
 #include <sunxi_mmap.h>
 #include <sunxi_private.h>
 
index 98cf63c8cd391e69da160ca2f5c5ab98707da7f9..7acc77a9a69ae3a518951f0c2224e2bb82cdebb1 100644 (file)
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
-#include <platform.h>
 #include <platform_def.h>
 
+#include <arch.h>
+#include <plat/common/platform.h>
+
 static unsigned char plat_power_domain_tree_desc[PLAT_MAX_PWR_LVL + 1] = {
        /* One root node for the SoC */
        1,
index 59feed7891b996f9ee73ac4334c138e63b650bb6..706bfcecbe4f3bcfe91c89517b289acf4cdcc93e 100644 (file)
@@ -5,14 +5,18 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <allwinner/sunxi_rsb.h>
-#include <arch_helpers.h>
-#include <debug.h>
-#include <delay_timer.h>
 #include <errno.h>
+
 #include <libfdt.h>
-#include <mmio.h>
+
 #include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/allwinner/sunxi_rsb.h>
+#include <drivers/delay_timer.h>
+#include <lib/mmio.h>
+
 #include <sunxi_def.h>
 #include <sunxi_mmap.h>
 #include <sunxi_private.h>
index 7bdac8ab0b6acd49029933dd51b9f5963811721a..5b5bad1771a9b524ba9c5f2cad43ee577a1b210b 100644 (file)
@@ -5,13 +5,15 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
-#include <debug.h>
-#include <delay_timer.h>
 #include <errno.h>
-#include <mmio.h>
-#include <mentor/mi2cv.h>
 #include <string.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <drivers/mentor/mi2cv.h>
+#include <lib/mmio.h>
+
 #include <sunxi_def.h>
 #include <sunxi_mmap.h>
 #include <sunxi_private.h>
index d64da292ad94f879882eb7a83dc184b262a45158..320bfb3c349e1e20b7a0bef854d45ebc32ab73b8 100644 (file)
@@ -3,8 +3,9 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
+
 #include <asm_macros.S>
-#include <bl_common.h>
+#include <common/bl_common.h>
 #include <v2m_def.h>
 
        .globl  plat_report_exception
index 4385e62ba8ae94881af037ebebc9b199ac2d8f8e..5a905244f48bf653bee913a0715e96ddc782f403 100644 (file)
@@ -3,8 +3,9 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
+
 #include <asm_macros.S>
-#include <bl_common.h>
+#include <common/bl_common.h>
 #include <v2m_def.h>
 
        .globl  plat_report_exception
index 6c03c91b5df8b727d2a98147270ae67dba59e820..64ca3c36d8c705e969ed3e939252ca8709624f75 100644 (file)
@@ -4,13 +4,15 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arm_def.h>
 #include <assert.h>
-#include <cassert.h>
-#include <platform.h>
 #include <stdint.h>
 #include <string.h>
-#include <tbbr_oid.h>
+
+#include <lib/cassert.h>
+#include <plat/common/platform.h>
+#include <tools_share/tbbr_oid.h>
+
+#include <arm_def.h>
 
 /* 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 <nvm.h>
-#include <nvm_otp.h>
-#include <sbrom_bsv_api.h>
+#include <drivers/arm/cryptocell/nvm.h>
+#include <drivers/arm/cryptocell/nvm_otp.h>
+#include <drivers/arm/cryptocell/sbrom_bsv_api.h>
 
 CASSERT(HASH_RESULT_SIZE_IN_BYTES == SHA256_BYTES,
                assert_mismatch_in_hash_result_size);
index 2556fc04af41c44fc86eef5571df6e4f37c4dba9..487aad7399ac6e046fec18fbd6183131b1b8b7ed 100644 (file)
@@ -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
index abc3ceb00fa35564a8b04989bb0d230290aa787e..0f905151b4ae5860e77cf0a2e9943914999f8ef7 100644 (file)
@@ -6,8 +6,8 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <gicv2.h>
-#include <gicv3.h>
+#include <drivers/arm/gicv2.h>
+#include <drivers/arm/gicv3.h>
 #include <platform_def.h>
 #include <v2m_def.h>
 #include "../drivers/pwrc/fvp_pwrc.h"
index fb80a8a0b93f9f326512289c387b4bcc6c03676a..759f6d0d86ed7e1b58e2ae42861f6ea80d6f0ff1 100644 (file)
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <ras.h>
+#include <lib/extensions/ras.h>
 
 struct ras_interrupt fvp_ras_interrupts[] = {
 };
index b17446c10c92405c889890748b15031734b60a99..c48bb07a3ac506b070f693fd913cdae1340a752f 100644 (file)
@@ -4,9 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bakery_lock.h>
-#include <mmio.h>
+#include <lib/bakery_lock.h>
+#include <lib/mmio.h>
+
 #include <plat_arm.h>
+
 #include "../../fvp_def.h"
 #include "../../fvp_private.h"
 #include "fvp_pwrc.h"
index 4b2a340b0c45a4e4e5f26d6be7200c3df5082e61..d6e82f50d90a76e178085ff13a2e55670373559b 100644 (file)
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <common/tbbr/tbbr_img_def.h>
+#include <plat/common/platform.h>
+
 #include <plat_arm.h>
-#include <platform.h>
-#include <tbbr_img_def.h>
-#include "fvp_private.h"
 
+#include "fvp_private.h"
 
 /*******************************************************************************
  * Perform any BL1 specific platform actions.
index 0a3b67d3997c9360e3c282feb4fcec76cb2b1462..13e74fd9a3a6b1cece1d9caed9502f5eafd4f962 100644 (file)
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <generic_delay_timer.h>
-#include <mmio.h>
+#include <drivers/arm/sp804_delay_timer.h>
+#include <drivers/generic_delay_timer.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
+
 #include <plat_arm.h>
-#include <platform.h>
-#include <sp804_delay_timer.h>
 #include <v2m_def.h>
 #include "fvp_def.h"
 #include "fvp_private.h"
index b9ab3f36e8701b830825ca82ae4d1e04bc6563c1..c51e287f613d39f18a16b7f5f2960d4c42b4592e 100644 (file)
@@ -4,8 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <plat/common/platform.h>
+
 #include <plat_arm.h>
-#include <platform.h>
 #include "fvp_def.h"
 #include "fvp_private.h"
 
index 1c8804f10a47d92368db49ad5e256410c46d8c09..5f2121c528c44b7981c789d4f59a386dce0cebfe 100644 (file)
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <drivers/arm/smmu_v3.h>
+#include <plat/common/platform.h>
+
 #include <arm_config.h>
 #include <plat_arm.h>
-#include <platform.h>
-#include <smmu_v3.h>
 #include "fvp_private.h"
 
 void __init bl31_early_platform_setup2(u_register_t arg0,
index f36b637ef1eb20b8009991e86b2910d9e7d432ef..31a61de4e7aee40d63c7cbbd1911b16009a7c2ec 100644 (file)
@@ -4,20 +4,22 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <assert.h>
+
+#include <common/debug.h>
+#include <drivers/arm/cci.h>
+#include <drivers/arm/ccn.h>
+#include <drivers/arm/gicv2.h>
+#include <lib/mmio.h>
+#include <lib/xlat_tables/xlat_tables_compat.h>
+#include <plat/common/platform.h>
+#include <services/secure_partition.h>
+
 #include <arm_config.h>
 #include <arm_def.h>
 #include <arm_spm_def.h>
-#include <assert.h>
-#include <cci.h>
-#include <ccn.h>
-#include <debug.h>
-#include <gicv2.h>
-#include <mmio.h>
 #include <plat_arm.h>
-#include <platform.h>
-#include <secure_partition.h>
 #include <v2m_def.h>
-#include <xlat_tables_compat.h>
 
 #include "../fvp_def.h"
 #include "fvp_private.h"
index a8ed9d324a84b886aa12653710d524455207b7c8..1b9f84b0011e6778ce1857dce6d1dbadb877d870 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef FVP_DEF_H
 #define FVP_DEF_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 #ifndef FVP_CLUSTER_COUNT
 #define FVP_CLUSTER_COUNT              2
index 11c7c3bcde19c2cda822eb57053e871901f42728..e186b3083872359cc442379ebd007aacc00adc90 100644 (file)
@@ -5,13 +5,15 @@
  */
 
 #include <assert.h>
-#include <common_def.h>
-#include <debug.h>
-#include <io_driver.h>
-#include <io_semihosting.h>
-#include <io_storage.h>
+
+#include <common/debug.h>
+#include <drivers/io/io_driver.h>
+#include <drivers/io/io_semihosting.h>
+#include <drivers/io/io_storage.h>
+#include <lib/semihosting.h>
+#include <plat/common/common_def.h>
+
 #include <plat_arm.h>
-#include <semihosting.h>       /* For FOPEN_MODE_... */
 
 /* Semihosting filenames */
 #define BL2_IMAGE_NAME                 "bl2.bin"
index 78d30255599624370f09d6d4eaf614947f2c6e5e..7da246bd60953e1ef65271ffcf9bf322d6c52b3a 100644 (file)
@@ -4,18 +4,21 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
-#include <arm_config.h>
 #include <assert.h>
-#include <debug.h>
 #include <errno.h>
-#include <gicv3.h>
-#include <mmio.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/arm/gicv3.h>
+#include <lib/extensions/spe.h>
+#include <lib/mmio.h>
+#include <lib/psci/psci.h>
+#include <plat/common/platform.h>
+
+#include <arm_config.h>
 #include <plat_arm.h>
-#include <platform.h>
-#include <psci.h>
-#include <spe.h>
 #include <v2m_def.h>
+
 #include "../../../../drivers/arm/gic/v3/gicv3_private.h"
 #include "drivers/pwrc/fvp_pwrc.h"
 #include "fvp_def.h"
index 1e8e3010ff529e294adcae1efcbc2f34d0777730..e940a1291482b915ab9c95fe1e978f31185d4d1b 100644 (file)
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
-#include <platform.h>
 #include <stdint.h>
 
+#include <arch_helpers.h>
+#include <plat/common/platform.h>
+
 #define RANDOM_CANARY_VALUE ((u_register_t) 3288484550995823360ULL)
 
 u_register_t plat_get_stack_protector_canary(void)
index e21b9d28c7245b9624e19be608ce5755614352c4..3384a2f7045bd27729a034a5db0572c61f6a8cb4 100644 (file)
@@ -4,12 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <platform_def.h>
+
 #include <arch.h>
-#include <arm_config.h>
-#include <cassert.h>
+#include <lib/cassert.h>
+#include <plat/common/platform.h>
+
 #include <plat_arm.h>
-#include <platform.h>
-#include <platform_def.h>
+#include <arm_config.h>
 #include "drivers/pwrc/fvp_pwrc.h"
 
 /* The FVP power domain tree descriptor */
index 39be4a6e7ec357e357f80979857223b0525690b2..c18bfb21375eaae841243fdeb92cc284a58df976 100644 (file)
@@ -7,8 +7,9 @@
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>
-#include <platform.h>
-#include <tbbr_oid.h>
+
+#include <plat/common/platform.h>
+#include <tools_share/tbbr_oid.h>
 
 #include "fvp_def.h"
 
index 3097f909bb6a8fd9c97bbd7fe72df30686fc4797..ca4bd53996aac20401bec6d9e4eb1d35a78e0931 100644 (file)
 # endif
 #endif /* AARCH32 */
 
+#include <drivers/arm/tzc400.h>
+#include <lib/utils_def.h>
+#include <plat/common/common_def.h>
+
 #include <arm_def.h>
 #include <arm_spm_def.h>
-#include <common_def.h>
-#include <tzc400.h>
-#include <utils_def.h>
 #include <v2m_def.h>
+
 #include "../fvp_def.h"
 
 /* Required platform porting definitions */
index 1bc4e309a83aba6be9609425b2fb4c810eb924c6..080a8ddcc5b9f9187baaadb4e22609a2241bb6d4 100644 (file)
@@ -6,7 +6,7 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <bl_common.h>
+#include <common/bl_common.h>
 #include <cortex_a53.h>
 #include <cortex_a57.h>
 #include <cortex_a72.h>
index edcfc7449127dfccc856c882f2b0a4dcf7e5d4b1..373f2fc89385c194a4705d7dbca88c6c6c678657 100644 (file)
@@ -6,7 +6,7 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <bl_common.h>
+#include <common/bl_common.h>
 #include <cortex_a53.h>
 #include <cortex_a57.h>
 #include <cortex_a72.h>
index 8098bc3febd858db793ae415b6bb6626e4249760..ed82879afc2102a5c7f6eb184eb92b3a9bd77336 100644 (file)
 #endif /* AARCH32 */
 
 
+#include <drivers/arm/tzc400.h>
+#if TRUSTED_BOARD_BOOT
+#include <drivers/auth/mbedtls/mbedtls_config.h>
+#endif
+#include <plat/common/common_def.h>
+
 #include <arm_def.h>
 #include <board_css_def.h>
-#include <common_def.h>
 #include <css_def.h>
-#if TRUSTED_BOARD_BOOT
-#include <mbedtls_config.h>
-#endif
 #include <soc_css_def.h>
-#include <tzc400.h>
 #include <v2m_def.h>
 #include "../juno_def.h"
 
index 3dd2a227c19181fe41664f26a3a268d37e4a4575..e751ab69c368d388cb8fdc0a75582835b9ad6d7b 100644 (file)
@@ -4,14 +4,16 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
-#include <debug.h>
 #include <errno.h>
+
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/tbbr/tbbr_img_def.h>
+#include <drivers/arm/sp805.h>
+#include <plat/common/platform.h>
+
 #include <plat_arm.h>
-#include <platform.h>
 #include <sds.h>
-#include <sp805.h>
-#include <tbbr_img_def.h>
 #include <v2m_def.h>
 
 void juno_reset_to_aarch32_state(void);
index 1f483d63dae84604764e38517192df8e51c39ed0..56f05eb185a9dee5f553c5cf8583103b9de67e93 100644 (file)
@@ -5,8 +5,10 @@
  */
 
 #include <assert.h>
-#include <bl_common.h>
-#include <desc_image_load.h>
+
+#include <common/bl_common.h>
+#include <common/desc_image_load.h>
+
 #include <plat_arm.h>
 
 #if JUNO_AARCH32_EL3_RUNTIME
index 5301886fb84a5ffff6a8d01ffac0cb87e5b93ff1..7a8bedf5abf4c476fb866651dc9a27b49158df89 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef JUNO_DEF_H
 #define JUNO_DEF_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 /*******************************************************************************
  * Juno memory map related constants
index dd8e27881d92467e20281509339ea0ce1a45a98c..69daa1ae0e5e5cca724502422ee3baf986e1c732 100644 (file)
@@ -4,9 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <errno.h>
-#include <platform.h>
+
+#include <arch_helpers.h>
+#include <plat/common/platform.h>
+
 #include <v2m_def.h>
 
 /*
index b6cfe7817d4b3f23f67f771faff567fdde6a8200..b0df837912d681794a5ba6c7dc9c064ee4c2db40 100644 (file)
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
-#include <mmio.h>
-#include <nic_400.h>
+#include <common/debug.h>
+#include <drivers/arm/nic_400.h>
+#include <lib/mmio.h>
+
 #include <plat_arm.h>
 #include <soc_css.h>
-
 #include "juno_def.h"
 #include "juno_tzmp1_def.h"
 
index ec0b1fbee966d06e51a241bb32dd26d58edc1fbc..ff05b5d468882010796a185749fe610b17367473 100644 (file)
@@ -5,8 +5,9 @@
  */
 
 #include <arch_helpers.h>
-#include <debug.h>
-#include <utils.h>
+#include <common/debug.h>
+#include <lib/utils.h>
+
 #include "juno_decl.h"
 #include "juno_def.h"
 
index c8a7598244f74950cd4810cd70e0329411b735c2..51b99aca7f883a76fb92ef7a0d730f7e4f4c139b 100644 (file)
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <plat/common/platform.h>
+
 #include <arm_def.h>
 #include <css_pm.h>
 #include <plat_arm.h>
-#include <platform.h>
 #include "juno_def.h"
 #include "../../css/drivers/scmi/scmi.h"
 #include "../../css/drivers/mhu/css_mhu_doorbell.h"
index d9ad1d4eb950d9e00c31fd8f5ae402aa53443474..505fb02667aa7206f8b6cd3aeb47890c887e64a7 100644 (file)
@@ -5,9 +5,11 @@
  */
 
 #include <assert.h>
-#include <mmio.h>
 #include <string.h>
-#include <utils_def.h>
+
+#include <lib/mmio.h>
+#include <lib/utils_def.h>
+
 #include "juno_decl.h"
 #include "juno_def.h"
 
index cdd0b63da79de85bb89552ad6284c43cc6b69b69..d044b7ccf3ca68f6a0d4491daded7764ec0cddfa 100644 (file)
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <platform_def.h>
+
 #include "../../css/drivers/scmi/scmi.h"
 #include "../../css/drivers/mhu/css_mhu_doorbell.h"
 #include <plat_arm.h>
-#include <platform_def.h>
 
 static scmi_channel_plat_info_t n1sdp_scmi_plat_info = {
                .scmi_mbx_mem = N1SDP_SCMI_PAYLOAD_BASE,
index 8c057c55ebac347c17a1cf3ea944411efda75b98..5aaa7376a42794c6fcfab7b8939778e51e84baeb 100644 (file)
@@ -4,12 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <platform_def.h>
+
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <plat/common/platform.h>
+
 #include <arm_def.h>
-#include <bl_common.h>
-#include <debug.h>
 #include <plat_arm.h>
-#include <platform.h>
-#include <platform_def.h>
 
 /*
  * Table of regions to map using the MMU.
index 16e2898de04c3caba06c71cd36866a9f76f8b414..6aea522f0d4c6520b7ed6f2c46efa84eb230b4dc 100644 (file)
@@ -7,8 +7,9 @@
 #ifndef PLATFORM_DEF_H
 #define PLATFORM_DEF_H
 
+#include <lib/utils_def.h>
+
 #include <sgi_base_platform_def.h>
-#include <utils_def.h>
 
 #define PLAT_ARM_CLUSTER_COUNT         2
 #define CSS_SGI_MAX_CPUS_PER_CLUSTER   4
index a8ca916d98d5210b7e36d4d644329ec334155197..d1a1fbf46f621f112ba4b30a0155f746ae7f5844 100644 (file)
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <platform.h>
+#include <plat/common/platform.h>
 
 unsigned int plat_arm_sgi_get_platform_id(void)
 {
index 7ccc59a7bc696e9601cfb4a6f0786def760dd04e..8417e1008430689a3e6d7cb705ba0f4f2dd90539 100644 (file)
@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
 #include <platform_def.h>
-#include <tzc_dmc620.h>
+
+#include <common/debug.h>
+#include <drivers/arm/tzc_dmc620.h>
 
 uintptr_t sgi575_dmc_base[] = {
        SGI575_DMC620_BASE0,
index 39907e8bc72a8b3838cdcd740082acbaa7dd233e..d2cdb49744364ab8241d84d6c1c75afc921bf182 100644 (file)
@@ -7,8 +7,9 @@
 #ifndef PLATFORM_DEF_H
 #define PLATFORM_DEF_H
 
+#include <lib/utils_def.h>
+
 #include <sgi_base_platform_def.h>
-#include <utils_def.h>
 
 #define PLAT_ARM_CLUSTER_COUNT         2
 #define CSS_SGI_MAX_CPUS_PER_CLUSTER   4
index 3df2da666f23346b389107ad9a49128bfdc5c816..3b7e5ee4e4cfbf72d837a2a420b3a946d5f949ce 100644 (file)
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <platform.h>
+#include <plat/common/platform.h>
 
 unsigned int plat_arm_sgi_get_platform_id(void)
 {
index 29cd75474496f49e14ecdf2c3a4f3b1f30b34b21..c455111d107d74d5f16c497bf1bd0bbee38d9e0b 100644 (file)
@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
 #include <platform_def.h>
-#include <tzc_dmc620.h>
+
+#include <common/debug.h>
+#include <drivers/arm/tzc_dmc620.h>
 
 uintptr_t sgiclarka_dmc_base[] = {
        SGICLARKA_DMC620_BASE0,
index 544ad90f32c241594513fbc8cde9016ff169dde8..fe8907bee6a2cc0ef1ee73b1990326959700fb76 100644 (file)
@@ -7,8 +7,9 @@
 #ifndef PLATFORM_DEF_H
 #define PLATFORM_DEF_H
 
+#include <lib/utils_def.h>
+
 #include <sgi_base_platform_def.h>
-#include <utils_def.h>
 
 #define PLAT_ARM_CLUSTER_COUNT         2
 #define CSS_SGI_MAX_CPUS_PER_CLUSTER   8
index 437592dbd74dd691d98f7cce6170088840159679..a1b8d621d63ba27fafd44f2ac9aa61a261a516cd 100644 (file)
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <platform.h>
+#include <plat/common/platform.h>
 
 unsigned int plat_arm_sgi_get_platform_id(void)
 {
index 5ae0b8284499b225cd41bb6a01407450515ba915..aaf9691cedaf10bec999ac17475bf211d73b7019 100644 (file)
@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
 #include <platform_def.h>
-#include <tzc_dmc620.h>
+
+#include <common/debug.h>
+#include <drivers/arm/tzc_dmc620.h>
 
 uintptr_t sgiclarkh_dmc_base[] = {
        SGICLARKH_DMC620_BASE0,
index 890f2c960d6629817b7ac34839fa7b1538525d35..e23dd258b2e8bfea0d9c37ee8116a7e923479f23 100644 (file)
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
-#include <desc_image_load.h>
-#include <platform.h>
 #include <platform_def.h>
 
+#include <common/bl_common.h>
+#include <common/desc_image_load.h>
+#include <plat/common/platform.h>
 
 /*******************************************************************************
  * Following descriptor provides BL image/ep information that gets used
index 8e6d00d056a867020807d84bbbc441cbced47b00..c0f42f3108bfd8ee2b66acbc7374f1783f9d419f 100644 (file)
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
-#include <desc_image_load.h>
-#include <platform.h>
 #include <platform_def.h>
 
+#include <common/bl_common.h>
+#include <common/desc_image_load.h>
+#include <plat/common/platform.h>
 
 /*******************************************************************************
  * Following descriptor provides BL image/ep information that gets used
index f313851852013b6949eb4859e4921135f266dea1..4ae992c95eb63c207a37ca1f795e40ed3d52a61b 100644 (file)
@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <ehf.h>
 #include <platform_def.h>
 
+#include <bl31/ehf.h>
+
 /*
  * Enumeration of priority levels on ARM platforms.
  */
index 687b21d43bb3dd8a89da7a3a1cf5ae9f25fb560b..493134b6a150a8dd9c7fe3e2caee8e8238337df4 100644 (file)
@@ -6,9 +6,10 @@
 
 /* SDEI configuration for ARM platforms */
 
-#include <ehf.h>
 #include <platform_def.h>
-#include <sdei.h>
+
+#include <bl31/ehf.h>
+#include <services/sdei.h>
 
 /* Private event mappings */
 static sdei_ev_map_t arm_sdei_private[] = {
index f2be47792b2130324a9d9efe4016604d1d0b4140..cd92aa8ed0fce3d1ef8aa8f51243d050c20f5b30 100644 (file)
@@ -5,14 +5,17 @@
  */
 
 #include <assert.h>
-#include <bl_common.h>
-#include <debug.h>
 #include <errno.h>
-#include <plat_arm.h>
-#include <platform.h>
+
 #include <platform_def.h>
-#include <tbbr_img_desc.h>
-#include <utils.h>
+
+#include <bl1/tbbr/tbbr_img_desc.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <lib/utils.h>
+#include <plat/common/platform.h>
+
+#include <plat_arm.h>
 
 /* Struct to keep track of usable memory */
 typedef struct bl1_mem_info {
index f760e18dceb8ae86266b7bbbad8324e828556ef9..e28211cfa7e86db32eac499136664e51151b6bc1 100644 (file)
@@ -4,17 +4,20 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <assert.h>
+
+#include <platform_def.h>
+
 #include <arch.h>
+#include <bl1/bl1.h>
+#include <common/bl_common.h>
+#include <drivers/arm/sp805.h>
+#include <lib/utils.h>
+#include <lib/xlat_tables/xlat_tables_compat.h>
+#include <plat/common/platform.h>
+
 #include <arm_def.h>
-#include <assert.h>
-#include <bl1.h>
-#include <bl_common.h>
 #include <plat_arm.h>
-#include <platform.h>
-#include <platform_def.h>
-#include <sp805.h>
-#include <utils.h>
-#include <xlat_tables_compat.h>
 
 #include "../../../bl1/bl1_private.h"
 
index 4f5e6a9e6e2794add41ef0cbd934c2db5dfc5c11..0c1f63ed4157d8269092528c8170d9c822a24a23 100644 (file)
@@ -3,11 +3,14 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include <arm_def.h>
+
 #include <assert.h>
-#include <generic_delay_timer.h>
+
+#include <drivers/generic_delay_timer.h>
+#include <plat/common/platform.h>
+
+#include <arm_def.h>
 #include <plat_arm.h>
-#include <platform.h>
 
 #pragma weak bl2_el3_early_platform_setup
 #pragma weak bl2_el3_plat_arch_setup
index 628a50def42c136b85816d06c5700e03eb8ba1fb..9319004eae5fb55c067992914c706dd2a76767e7 100644 (file)
@@ -4,21 +4,24 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
-#include <arm_def.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <debug.h>
-#include <desc_image_load.h>
-#include <generic_delay_timer.h>
+#include <string.h>
+
+#include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/desc_image_load.h>
+#include <drivers/generic_delay_timer.h>
 #ifdef SPD_opteed
-#include <optee_utils.h>
+#include <lib/optee_utils.h>
 #endif
+#include <lib/utils.h>
+#include <plat/common/platform.h>
+
+#include <arm_def.h>
 #include <plat_arm.h>
-#include <platform.h>
-#include <platform_def.h>
-#include <string.h>
-#include <utils.h>
 
 /* Data structure which holds the extents of the trusted SRAM for BL2 */
 static meminfo_t bl2_tzram_layout __aligned(CACHE_WRITEBACK_GRANULE);
index 3848aa065d8b80a671562f8ecf4efe7efbd3d181..0dc66e647ec1e3f83579bd07dcadf61a633c8a38 100644 (file)
@@ -4,15 +4,18 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <assert.h>
+#include <string.h>
+
+#include <platform_def.h>
+
 #include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <drivers/generic_delay_timer.h>
+#include <plat/common/platform.h>
+
 #include <arm_def.h>
-#include <assert.h>
-#include <bl_common.h>
-#include <generic_delay_timer.h>
 #include <plat_arm.h>
-#include <platform_def.h>
-#include <platform.h>
-#include <string.h>
 
 /* Weak definitions may be overridden in specific ARM standard platform */
 #pragma weak bl2u_platform_setup
index 1b05f46e90adf372ce0d63ba2131b3b3408f3c1e..41151c2c8286188016de414d4804e44fb72d4edf 100644 (file)
@@ -4,19 +4,21 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <assert.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/console.h>
+#include <lib/extensions/ras.h>
+#include <lib/mmio.h>
+#include <lib/utils.h>
+#include <lib/xlat_tables/xlat_tables_compat.h>
+#include <plat/common/platform.h>
+
 #include <arm_def.h>
-#include <assert.h>
-#include <bl_common.h>
-#include <console.h>
-#include <debug.h>
-#include <mmio.h>
 #include <plat_arm.h>
-#include <platform.h>
-#include <ras.h>
-#include <utils.h>
-#include <xlat_tables_compat.h>
 
 /*
  * Placeholder variables for copying the arguments that have been passed to
index 6505b9174f45010cc9fd62d41f1599e5d8a8c7a8..7ee997e29641e1821453526fb768f0261db18693 100644 (file)
@@ -4,11 +4,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <platform_def.h>
+
 #include <arch.h>
-#include <cci.h>
+#include <drivers/arm/cci.h>
+#include <lib/utils.h>
+
 #include <plat_arm.h>
-#include <platform_def.h>
-#include <utils.h>
 
 static const int cci_map[] = {
        PLAT_ARM_CCI_CLUSTER0_SL_IFACE_IX,
index ddf3286d79cc989a1d56fe2e0afa24a5dacb1206..6aa56f217dabd080658859c94ff0c79d0440fcef 100644 (file)
@@ -4,10 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <platform_def.h>
+
 #include <arch.h>
-#include <ccn.h>
+#include <drivers/arm/ccn.h>
+
 #include <plat_arm.h>
-#include <platform_def.h>
 
 static const unsigned char master_to_rn_id_map[] = {
        PLAT_ARM_CLUSTER_TO_CCN_ID_MAP
index 56ad8aeeb1a3aad91da8fb213b6f24124b6ab37d..4cd2ce3d6b3ce151b35dae0a117530df7c1ba0b9 100644 (file)
@@ -3,17 +3,21 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
+
+#include <assert.h>
+
+#include <platform_def.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <assert.h>
-#include <debug.h>
-#include <mmio.h>
+#include <common/debug.h>
+#include <common/romlib.h>
+#include <lib/mmio.h>
+#include <lib/xlat_tables/xlat_tables_compat.h>
+#include <plat/common/platform.h>
+#include <services/secure_partition.h>
+
 #include <plat_arm.h>
-#include <platform.h>
-#include <platform_def.h>
-#include <romlib.h>
-#include <secure_partition.h>
-#include <xlat_tables_compat.h>
 
 /* Weak definitions may be overridden in specific ARM standard platform */
 #pragma weak plat_get_ns_image_entrypoint
index bd3dca17f60a6154acf76c6b4aaed35be96925aa..29cb378275803b901e9907d8da58f5d45d579d07 100644 (file)
@@ -3,13 +3,17 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
+
 #include <assert.h>
-#include <console.h>
-#include <debug.h>
-#include <pl011.h>
-#include <plat_arm.h>
+
 #include <platform_def.h>
 
+#include <common/debug.h>
+#include <drivers/arm/pl011.h>
+#include <drivers/console.h>
+
+#include <plat_arm.h>
+
 /*******************************************************************************
  * Functions that set up the console
  ******************************************************************************/
index c2a4bb1e65cfd100dbc8689101f33c36c719a793..6c6dc568ca34d1ad6e5e51621ae966b16caeb66e 100644 (file)
@@ -4,19 +4,21 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arm_dyn_cfg_helpers.h>
 #include <assert.h>
-#include <debug.h>
-#include <desc_image_load.h>
+#include <string.h>
+
+#include <platform_def.h>
+
+#include <common/debug.h>
+#include <common/desc_image_load.h>
+#include <common/tbbr/tbbr_img_def.h>
 #if TRUSTED_BOARD_BOOT
-#include <mbedtls_config.h>
+#include <drivers/auth/mbedtls/mbedtls_config.h>
 #endif
-#include <plat_arm.h>
-#include <platform.h>
-#include <platform_def.h>
-#include <string.h>
-#include <tbbr_img_def.h>
+#include <plat/common/platform.h>
 
+#include <arm_dyn_cfg_helpers.h>
+#include <plat_arm.h>
 
 /* Variable to store the address to TB_FW_CONFIG passed from BL1 */
 static void *tb_fw_cfg_dtb;
index d12d09c7f2503f21de6fba8ab55c54e5ca227f9b..bf2f15643d54cb4e6357819f64cc2e4982b99b91 100644 (file)
@@ -4,11 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arm_dyn_cfg_helpers.h>
 #include <assert.h>
-#include <desc_image_load.h>
-#include <fdt_wrappers.h>
+
 #include <libfdt.h>
+
+#include <common/desc_image_load.h>
+#include <common/fdt_wrappers.h>
+
+#include <arm_dyn_cfg_helpers.h>
 #include <plat_arm.h>
 
 #define DTB_PROP_MBEDTLS_HEAP_ADDR "mbedtls_heap_addr"
index aa65f4f338f9b2cb2b47725e1a1a463dc63cd085..8650d48a7d7e43e99c76bf9b15e807984e0eae3f 100644 (file)
@@ -4,15 +4,18 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
-#include <console.h>
-#include <debug.h>
 #include <errno.h>
-#include <plat_arm.h>
-#include <platform.h>
-#include <platform_def.h>
 #include <stdint.h>
-#include <v2m_flash.h>
+
+#include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/cfi/v2m_flash.h>
+#include <drivers/console.h>
+#include <plat/common/platform.h>
+
+#include <plat_arm.h>
 
 #pragma weak plat_arm_error_handler
 
index 5644c60404134191c228d3f5e455bd7ef0fcabbf..fc848c19878389a664f85791a38b4969b22139c1 100644 (file)
@@ -4,11 +4,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <gicv2.h>
-#include <plat_arm.h>
-#include <platform.h>
 #include <platform_def.h>
 
+#include <drivers/arm/gicv2.h>
+#include <plat/common/platform.h>
+
+#include <plat_arm.h>
+
 /******************************************************************************
  * The following functions are defined as weak to allow a platform to override
  * the way the GICv2 driver is initialised and used.
index a43bff3d4837c2449e11dbd320305f39b6749793..0f6690a0b9dfbb8fa939c127077e6200afa81f19 100644 (file)
@@ -4,13 +4,15 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <platform_def.h>
+
+#include <common/interrupt_props.h>
+#include <drivers/arm/gicv3.h>
+#include <lib/utils.h>
+#include <plat/common/platform.h>
+
 #include <arm_def.h>
-#include <gicv3.h>
-#include <interrupt_props.h>
 #include <plat_arm.h>
-#include <platform.h>
-#include <platform_def.h>
-#include <utils.h>
 
 /******************************************************************************
  * The following functions are defined as weak to allow a platform to override
index 4f86efdf9254ab80c49ad17f2f7a2e339756baf4..791f05ed705978ba736359c79917ec852084172b 100644 (file)
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <common/bl_common.h>
+#include <common/desc_image_load.h>
+#include <plat/common/platform.h>
+
 #include <arm_def.h>
-#include <bl_common.h>
-#include <desc_image_load.h>
 #include <plat_arm.h>
-#include <platform.h>
-
 
 #pragma weak plat_flush_next_bl_params
 #pragma weak plat_get_bl_image_load_info
index cd58e4564ac3a0f749f4c81b2739d1defcef70d2..d7c5cac2463e9cc3f7106fcf1b131a7aa60429a2 100644 (file)
@@ -3,18 +3,22 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
+
 #include <assert.h>
-#include <debug.h>
-#include <firmware_image_package.h>
-#include <io_driver.h>
-#include <io_fip.h>
-#include <io_memmap.h>
-#include <io_storage.h>
-#include <plat_arm.h>
-#include <platform.h>
-#include <platform_def.h>
 #include <string.h>
-#include <utils.h>
+
+#include <platform_def.h>
+
+#include <common/debug.h>
+#include <drivers/io/io_driver.h>
+#include <drivers/io/io_fip.h>
+#include <drivers/io/io_memmap.h>
+#include <drivers/io/io_storage.h>
+#include <lib/utils.h>
+#include <plat/common/platform.h>
+#include <tools_share/firmware_image_package.h>
+
+#include <plat_arm.h>
 
 /* IO devices */
 static const io_dev_connector_t *fip_dev_con;
index 2a46b95d62ea92e7e312a38ad103b18bc15edf60..4ae57e5344cc965f590f4b74fcd25352b50ff0c1 100644 (file)
@@ -4,13 +4,15 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
-#include <mmio.h>
-#include <plat_arm.h>
 #include <platform_def.h>
-#include <psci.h>
-#include <utils.h>
-#include <v2m_flash.h>
+
+#include <common/debug.h>
+#include <drivers/cfi/v2m_flash.h>
+#include <lib/psci/psci.h>
+#include <lib/mmio.h>
+#include <lib/utils.h>
+
+#include <plat_arm.h>
 
 /*
  * DRAM1 is used also to load the NS boot loader. For this reason we
index 3be1b5d3935143e0330bfb501f5043fbea9b42b1..acfd9089955af64ebaa7229f180d35f91fa95780 100644 (file)
@@ -4,14 +4,17 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
-#include <arm_def.h>
 #include <assert.h>
 #include <errno.h>
-#include <plat_arm.h>
-#include <platform.h>
+
 #include <platform_def.h>
-#include <psci.h>
+
+#include <arch_helpers.h>
+#include <lib/psci/psci.h>
+#include <plat/common/platform.h>
+
+#include <arm_def.h>
+#include <plat_arm.h>
 
 /* Allow ARM Standard platforms to override these functions */
 #pragma weak plat_arm_program_trusted_mailbox
index e482a89456cbed689360f947f00050242c31911f..6b0f7e7be8ab475ac13e136d5e6d27033186782c 100644 (file)
@@ -4,14 +4,15 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arm_sip_svc.h>
-#include <debug.h>
-#include <plat_arm.h>
-#include <pmf.h>
-#include <runtime_svc.h>
 #include <stdint.h>
-#include <uuid.h>
 
+#include <common/debug.h>
+#include <common/runtime_svc.h>
+#include <lib/pmf/pmf.h>
+#include <tools_share/uuid.h>
+
+#include <arm_sip_svc.h>
+#include <plat_arm.h>
 
 /* ARM SiP Service UUID */
 DEFINE_SVC_UUID2(arm_sip_svc_uid,
index b0ad4d1c6a0f81cd238c820b78ff640ab5a4f840..6986e52b0380a4eea7eee8c7209567b8008154e4 100644 (file)
@@ -4,9 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <platform_def.h>
+
 #include <arch.h>
+
 #include <plat_arm.h>
-#include <platform_def.h>
 
 /*******************************************************************************
  * This function validates an MPIDR by checking whether it falls within the
index 2ae084c7bc1fe48036c661d5f19360b45ccffd2f..0346fa1845d088f364a1cd39d44b8c5001a6bef7 100644 (file)
@@ -4,13 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <platform_def.h>
+
+#include <common/debug.h>
+#include <drivers/arm/tzc400.h>
+
 #include <arm_def.h>
 #include <arm_spm_def.h>
-#include <debug.h>
 #include <plat_arm.h>
-#include <platform_def.h>
-#include <tzc400.h>
-
 
 /* Weak definitions may be overridden in specific ARM standard platform */
 #pragma weak plat_arm_security_setup
index 6bd771b0e5ba2681cd62dc5044578aec480d6a53..bea3867d37536d1b1f088bd7f22c4a6ed476f971 100644 (file)
@@ -4,12 +4,15 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arm_def.h>
 #include <assert.h>
-#include <debug.h>
-#include <plat_arm.h>
+
 #include <platform_def.h>
-#include <tzc_dmc500.h>
+
+#include <common/debug.h>
+#include <drivers/arm/tzc_dmc500.h>
+
+#include <arm_def.h>
+#include <plat_arm.h>
 
 /*******************************************************************************
  * Initialize the DMC500-TrustZone Controller for ARM standard platforms.
index 8fa864d66b8b635a2765d8778a03133726cd8f0c..e3134102dd68391aeb8fcecd2ff550f61b0c6bd7 100644 (file)
@@ -4,16 +4,18 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <stdbool.h>
+#include <string.h>
+
 #include <arch_helpers.h>
-#include <arm_sip_svc.h>
 #include <context.h>
-#include <context_mgmt.h>
-#include <plat_arm.h>
-#include <psci.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/psci/psci.h>
+#include <lib/utils.h>
 #include <smccc_helpers.h>
-#include <stdbool.h>
-#include <string.h>
-#include <utils.h>
+
+#include <arm_sip_svc.h>
+#include <plat_arm.h>
 
 /*
  * Handle SMC from a lower exception level to switch its execution state
index ca427d58a4cf373fce9e5d4bad23470de0e90e27..967b551e4e725573e864c77730f9dfba10bdd011 100644 (file)
@@ -5,15 +5,18 @@
  */
 
 #include <assert.h>
-#include <bl_common.h>
-#include <console.h>
-#include <debug.h>
-#include <mmio.h>
-#include <pl011.h>
-#include <plat_arm.h>
-#include <platform.h>
+
 #include <platform_def.h>
-#include <platform_sp_min.h>
+
+#include <bl32/sp_min/platform_sp_min.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/arm/pl011.h>
+#include <drivers/console.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
+
+#include <plat_arm.h>
 
 static entry_point_info_t bl33_image_ep_info;
 
index 3cf88251f1fb2e4292fcb343de4e6437b6ac84a2..a3d2f7157cae67872adae1c3bcc43423482cc006 100644 (file)
@@ -4,15 +4,18 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arm_def.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <console.h>
-#include <debug.h>
-#include <pl011.h>
-#include <plat_arm.h>
+
 #include <platform_def.h>
-#include <platform_tsp.h>
+
+#include <bl32/tsp/platform_tsp.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/arm/pl011.h>
+#include <drivers/console.h>
+
+#include <arm_def.h>
+#include <plat_arm.h>
 
 #define BL32_END (unsigned long)(&__BL32_END__)
 
index b1b275c6e70ee97542bde853811555ef8acad448..ae0f01133f631865c1137d70d79f625c36dbedc8 100644 (file)
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
-#include <debug.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <plat/common/platform.h>
+
 #include <plat_arm.h>
-#include <platform.h>
 #include <soc_css.h>
 
 void bl1_platform_setup(void)
index e41b1ca0aa1adf166468b1238fcc41e82b2eed1b..c1c7868b8b2198a87168a8aa9a44b604befd36d9 100644 (file)
@@ -4,13 +4,16 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
+#include <string.h>
+
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <lib/mmio.h>
+#include <lib/utils.h>
+
 #include <css_def.h>
-#include <debug.h>
-#include <mmio.h>
 #include <plat_arm.h>
-#include <string.h>
-#include <utils.h>
+
 #include "../drivers/scp/css_scp.h"
 
 /* Weak definition may be overridden in specific CSS based platform */
index 4ceb5cda7c102fbaf43204935c54987bab6a3641..564e98f705a2def3d317389af991b363c175ff42 100644 (file)
@@ -4,10 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
-#include <debug.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <plat/common/platform.h>
+
 #include <plat_arm.h>
-#include <platform.h>
+
 #include "../drivers/scp/css_scp.h"
 
 /* Weak definition may be overridden in specific CSS based platform */
index 4735a9dccab5361fa5c04abed3c2e4682f7c61c9..8a156e675dfa14c2f762c1d1e108c58c642a88d7 100644 (file)
@@ -4,15 +4,19 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <cassert.h>
-#include <css_pm.h>
-#include <debug.h>
 #include <errno.h>
-#include <plat_arm.h>
-#include <platform.h>
+
 #include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <lib/cassert.h>
+#include <plat/common/platform.h>
+
+#include <css_pm.h>
+#include <plat_arm.h>
+
 #include "../drivers/scp/css_scp.h"
 
 /* Allow CSS platforms to override `plat_arm_psci_pm_ops` */
index d1f1c98f4b1fb354ce0acee4c86335605a5de4cb..8ac223230812d99093fa79f1426e7a1428b8525c 100644 (file)
@@ -4,10 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <plat_arm.h>
-#include <platform.h>
 #include <assert.h>
 
+#include <plat/common/platform.h>
+
+#include <plat_arm.h>
+
 #if ARM_PLAT_MT
 #pragma weak plat_arm_get_cpu_pe_count
 #endif
index 7b33317566eeb1fdaf9a868ec6b2a4837be14825..e13818f2996f3c38e5ae122c368195843325d678 100644 (file)
@@ -4,13 +4,17 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bakery_lock.h>
+
+#include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <lib/bakery_lock.h>
+#include <lib/mmio.h>
+
 #include <css_def.h>
-#include <mmio.h>
 #include <plat_arm.h>
-#include <platform_def.h>
+
 #include "css_mhu.h"
 
 /* SCP MHU secure channel registers */
index 54f3e057d7e3af421ac3207b86ed74b77e38a990..b3203c2a75dde08575086f6a6d8c2e35b7836eed 100644 (file)
@@ -4,8 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <platform_def.h>
+
+#include <arch_helpers.h>
+
 #include "css_mhu_doorbell.h"
 #include "../scmi/scmi.h"
 
index cb75ed050a758772c51bc4856b20f762845da6cd..ecee56361fa16b0c6773ffb2143acad6e896a182 100644 (file)
@@ -7,9 +7,10 @@
 #ifndef CSS_MHU_DOORBELL_H
 #define CSS_MHU_DOORBELL_H
 
-#include <mmio.h>
 #include <stdint.h>
 
+#include <lib/mmio.h>
+
 /* MHUv2 Base Address */
 #define MHUV2_BASE_ADDR                PLAT_CSS_MHU_BASE
 
index 28dfc9ac6a150a1508a34432c119ea81a9763575..df259f76d822e46cc83e5577ea2573763157f40e 100644 (file)
@@ -7,11 +7,12 @@
 #ifndef SCMI_H
 #define SCMI_H
 
-#include <bakery_lock.h>
-#include <psci.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <spinlock.h>
+
+#include <lib/bakery_lock.h>
+#include <lib/psci/psci.h>
+#include <lib/spinlock.h>
 
 /* Supported SCMI Protocol Versions */
 #define SCMI_AP_CORE_PROTO_VER                 MAKE_SCMI_VERSION(1, 0)
index 1438cba46d49bdcaea4d9de2d886b950ad397d17..e495dccb0a6fe71991262d95494e15f8506bfe69 100644 (file)
@@ -4,9 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+
 #include "scmi.h"
 #include "scmi_private.h"
 
index b34178ec35f343b4eeee0be3945b286c7e291ac6..1b4ecb239c73ab6317c68a33e21b27c045533e21 100644 (file)
@@ -4,13 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+
 #include "scmi.h"
 #include "scmi_private.h"
 
-
 #if HW_ASSISTED_COHERENCY
 #define scmi_lock_init(lock)
 #define scmi_lock_get(lock)            spin_lock(lock)
index 90c5d6bc7b6fb88dd438dbbcacf0ebc0ce0176d6..f31562131445d8c5f8ab00684be9627cfc8ae5e1 100644 (file)
@@ -4,9 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+
 #include "scmi.h"
 #include "scmi_private.h"
 
index f6da3941682994d0839ed25fb139c0eee23dc1a5..03c3c063d80231d0ae79b329ceb8f58b4a69a728 100644 (file)
@@ -4,9 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+
 #include "scmi.h"
 #include "scmi_private.h"
 
index 5268510dbd0708c316f83260ede9b26471963821..27c9e1d50fb6b8e08aadcb81e090974dd3449062 100644 (file)
@@ -4,12 +4,15 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <css_def.h>
-#include <debug.h>
-#include <platform.h>
 #include <stdint.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <plat/common/platform.h>
+
+#include <css_def.h>
+
 #include "../mhu/css_mhu.h"
 #include "../scpi/css_scpi.h"
 #include "css_scp.h"
index 1397fd80ccccd5e8872fe9189a27260e727d99b2..bd6b5953203e7c6f8278b501e1b0e3473316d27a 100644 (file)
@@ -4,14 +4,17 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
+#include <string.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <plat/common/platform.h>
+
 #include <css_def.h>
 #include <css_pm.h>
-#include <debug.h>
 #include <plat_arm.h>
-#include <platform.h>
-#include <string.h>
+
 #include "../scmi/scmi.h"
 #include "css_scp.h"
 
index 123d54f4e5140b6f9266cd750c40e8c146fa8bc4..f53ac301587f1aa44e121596d2be3174f7cf0993 100644 (file)
@@ -4,11 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+
 #include <css_pm.h>
-#include <debug.h>
 #include <plat_arm.h>
+
 #include "../scpi/css_scpi.h"
 #include "css_scp.h"
 
index 84c1487d31b52dc307e292dacd60f79cc66d082c..f3c08c52f36346c01f0f30666e5d090170ba0379 100644 (file)
@@ -7,10 +7,12 @@
 #ifndef CSS_SCP_H
 #define CSS_SCP_H
 
-#include <cassert.h>
-#include <platform_def.h>
 #include <stdint.h>
 
+#include <platform_def.h>
+
+#include <lib/cassert.h>
+
 /* Forward declarations */
 struct psci_power_state;
 
index 561e97b2e4f2fdd63e3c1436ee94f21b20925db9..c152abca08228ff19515b63b8fc65349619b6923 100644 (file)
@@ -4,13 +4,16 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <css_def.h>
-#include <debug.h>
-#include <delay_timer.h>
-#include <platform.h>
 #include <stdint.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <plat/common/platform.h>
+
+#include <css_def.h>
+
 #include "css_scp.h"
 #include "../sds/sds.h"
 
index 2ed5760118a98f85f8f41c3ae4dd22a4308dd39a..42bf3b8e0079fc5d1b63d65ed36d0bee50caf9f6 100644 (file)
@@ -4,13 +4,16 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <css_def.h>
-#include <debug.h>
-#include <platform.h>
 #include <string.h>
-#include <utils.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <lib/utils.h>
+#include <plat/common/platform.h>
+
+#include <css_def.h>
+
 #include "../mhu/css_mhu.h"
 #include "css_scpi.h"
 
index e2fac54f371374e07ecb314069ba507fe2101a6e..3eeb0dc4df424a30de9aeab83273d701296944a1 100644 (file)
@@ -4,13 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
-#include <css_def.h>
 #include <stdint.h>
 #include <string.h>
 
+#include <arch_helpers.h>
+#include <common/debug.h>
+
+#include <css_def.h>
 #include "sds.h"
 #include "sds_private.h"
 
index 8705d63b107f686ee04f7019733323f7ce0b8475..ad7ab81d958536f204945fda1f7e8395d888d03e 100644 (file)
@@ -7,15 +7,16 @@
 #ifndef SGI_BASE_PLATFORM_DEF_H
 #define SGI_BASE_PLATFORM_DEF_H
 
+#include <lib/utils_def.h>
+#include <lib/xlat_tables/xlat_tables_defs.h>
+#include <plat/common/common_def.h>
+
 #include <arm_def.h>
 #include <arm_spm_def.h>
 #include <board_css_def.h>
-#include <common_def.h>
 #include <css_def.h>
 #include <soc_css_def.h>
-#include <utils_def.h>
 #include <v2m_def.h>
-#include <xlat_tables_defs.h>
 
 #define PLATFORM_CORE_COUNT            (PLAT_ARM_CLUSTER_COUNT *       \
                                        CSS_SGI_MAX_CPUS_PER_CLUSTER * \
index b1aa089b45783fb30f38d97b57cb3a30154680b9..617a62b775db7f07316d42f3e72783c38a61f4b3 100644 (file)
@@ -5,12 +5,16 @@
  */
 
 #include <assert.h>
-#include <bl_common.h>
-#include <debug.h>
+
 #include <libfdt.h>
+
+#include <common/bl_common.h>
+#include <common/debug.h>
+
 #include <plat_arm.h>
 #include <sgi_ras.h>
 #include <sgi_variant.h>
+
 #include "../../css/drivers/scmi/scmi.h"
 #include "../../css/drivers/mhu/css_mhu_doorbell.h"
 
index e078bd2af09320ca0b179027038f918ca2146f6e..1ed219d65350386a31e25084aca71edf3a04994c 100644 (file)
@@ -4,11 +4,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
-#include <debug.h>
-#include <desc_image_load.h>
 #include <libfdt.h>
-#include <platform.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <common/desc_image_load.h>
+#include <plat/common/platform.h>
+
 #include <sgi_variant.h>
 
 /*******************************************************************************
index 074f8a2745726a1875d21409857fc65f887ff216..e86c760d16b7d61dc753099de740e47547281fdb 100644 (file)
@@ -5,7 +5,7 @@
  */
 
 #include <arch_helpers.h>
-#include <debug.h>
+#include <common/debug.h>
 
 /*
  * For SGI575 which support FCM (with automatic interconnect enter/exit),
index 710430bb761cf15e7d6ea70b2ebacca266a4fa33..79f3e5b55d0c11da0d2ca0b0180879bec0577fc1 100644 (file)
@@ -4,16 +4,19 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <assert.h>
+
+#include <platform_def.h>
+
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/arm/ccn.h>
+#include <plat/common/platform.h>
+#include <services/secure_partition.h>
+
 #include <arm_def.h>
 #include <arm_spm_def.h>
-#include <assert.h>
-#include <bl_common.h>
-#include <ccn.h>
-#include <debug.h>
 #include <plat_arm.h>
-#include <platform_def.h>
-#include <platform.h>
-#include <secure_partition.h>
 #include "../../../../bl1/bl1_private.h"
 
 #if USE_COHERENT_MEM
index ac4610d2162a28887b4afeb5265d4c84a057238c..a6a32d150d1bd5a6f5985df7dd42c1d2a8caa90d 100644 (file)
@@ -4,18 +4,20 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arm_spm_def.h>
 #include <assert.h>
-#include <context_mgmt.h>
-#include <interrupt_mgmt.h>
-#include <mm_svc.h>
-#include <ras.h>
-#include <sgi_ras.h>
-#include <platform.h>
-#include <spm_svc.h>
-#include <sdei.h>
 #include <string.h>
 
+#include <bl31/interrupt_mgmt.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/extensions/ras.h>
+#include <plat/common/platform.h>
+#include <services/mm_svc.h>
+#include <services/sdei.h>
+#include <services/spm_svc.h>
+
+#include <arm_spm_def.h>
+#include <sgi_ras.h>
+
 static int sgi_ras_intr_handler(const struct err_record_info *err_rec,
                                int probe_data,
                                const struct err_handler_data *const data);
index 2178f069a5ea9983611663cb5af8564b6a741086..e3fa3f30e6ac76c90de4e0c0f104190200b0e9c7 100644 (file)
@@ -7,13 +7,14 @@
 #ifndef SGM_BASE_PLATFORM_DEF_H
 #define SGM_BASE_PLATFORM_DEF_H
 
+#include <drivers/arm/tzc400.h>
+#include <drivers/arm/tzc_common.h>
+#include <plat/common/common_def.h>
+
 #include <arm_def.h>
 #include <board_css_def.h>
-#include <common_def.h>
 #include <css_def.h>
 #include <soc_css_def.h>
-#include <tzc400.h>
-#include <tzc_common.h>
 #include <v2m_def.h>
 
 /* CPU topology */
index 79e6b5c6a681b3b99aeb3a22765fc30305849027..29b98d49ebe6011f87a6a4904f2c1d2c6d22cebf 100644 (file)
@@ -7,8 +7,8 @@
 #ifndef SGM_PLAT_CONFIG_H
 #define SGM_PLAT_CONFIG_H
 
-#include <ccn.h>
-#include <gicv3.h>
+#include <drivers/arm/ccn.h>
+#include <drivers/arm/gicv3.h>
 
 /* The type of interconnect */
 typedef enum {
index dc3d71dd45aa16b3fc4143fb146fd907f83d47d6..8b7c5dabbea31858976dc52ad6b8dd55612f799d 100644 (file)
@@ -4,8 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
-#include <debug.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+
 #include <plat_arm.h>
 #include <sgm_plat_config.h>
 #include <soc_css.h>
index 952572e3ad8a3c29533483dba41f180ba80edc80..7967cb59c4de29bccdb1b65495b72ed1d6b1a306 100644 (file)
@@ -4,10 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
-#include <debug.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+
 #include <plat_arm.h>
 #include <sgm_plat_config.h>
+
 #include "../../css/drivers/scmi/scmi.h"
 #include "../../css/drivers/mhu/css_mhu_doorbell.h"
 
index 6800ac3cf7eadabee028948d3b7001dc932111ad..a4df9ab19afa20342fb047a3ad555631d7226f5e 100644 (file)
@@ -4,11 +4,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <platform_def.h>
+
+#include <common/bl_common.h>
+#include <common/debug.h>
+
 #include <arm_def.h>
-#include <bl_common.h>
-#include <debug.h>
 #include <plat_arm.h>
-#include <platform_def.h>
 #include <sgm_variant.h>
 
 /*
index e977e618bca8039357d752338de3c657b158ba41..2a43487f1a721b66b2c210b7cc2ce1c288dc4e38 100644 (file)
@@ -5,12 +5,15 @@
  */
 
 #include <assert.h>
-#include <debug.h>
-#include <plat_arm.h>
+#include <string.h>
+
 #include <platform_def.h>
+
+#include <common/debug.h>
+
+#include <plat_arm.h>
 #include <sgm_plat_config.h>
 #include <sgm_variant.h>
-#include <string.h>
 
 static css_plat_config_t *css_plat_info;
 
index 7f9806001f80015ce9101b631104bf1e4bd1897a..548ec7bd59e0ba06463e4264d500f7df4105223d 100644 (file)
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
+#include <common/debug.h>
+#include <drivers/arm/tzc_dmc500.h>
+
 #include <plat_arm.h>
 #include <sgm_variant.h>
 #include <soc_css.h>
-#include <tzc_dmc500.h>
 
 /* Is populated with the DMC-500 controllers base addresses */
 static tzc_dmc500_driver_data_t plat_driver_data;
index f2296796c6abed28559e552095ff9a39c3918202..bbc5dcdc553edc8b21aa4d732e11c2f676d3e9ec 100644 (file)
@@ -4,10 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <board_css_def.h>
-#include <mmio.h>
-#include <nic_400.h>
 #include <platform_def.h>
+
+#include <drivers/arm/nic_400.h>
+#include <lib/mmio.h>
+
+#include <board_css_def.h>
 #include <soc_css.h>
 #include <soc_css_def.h>
 
index fc37c08fa43f695fabe4e5b0fe389fbda6a7b9a1..c9ad12cc4fa25ba3944a892df69093eaa22969f0 100644 (file)
@@ -10,7 +10,7 @@
  */
 
 #include <asm_macros.S>
-#include <console.h>
+#include <drivers/console.h>
 
        .globl  plat_crash_console_init
        .globl  plat_crash_console_putc
index 16c2b5c952e7c0c52d803b4f8b4f345eb5b5b8d1..2c1a8fa09bf1a6f1a7fbfa3202d6e41fb57e2ec3 100644 (file)
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <platform.h>
-#include <xlat_mmu_helpers.h>
+#include <lib/xlat_tables/xlat_mmu_helpers.h>
+#include <plat/common/platform.h>
 
 /*
  * The following platform setup functions are weakly defined. They
index f1b1e9c9f765541fef0544edc669403052f4c046..3bc84b1ad291f9814749b1e270827a34cd463999 100644 (file)
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <console.h>
-#include <platform.h>
+#include <drivers/console.h>
+#include <plat/common/platform.h>
 #include <platform_sp_min.h>
 
 /*
index 8f8ca11245827615aad5f925b3302bd716906577..491a99d360e63163896481110c44bc538de41928 100644 (file)
@@ -10,7 +10,7 @@
  */
 
 #include <asm_macros.S>
-#include <console.h>
+#include <drivers/console.h>
 
        .globl  plat_crash_console_init
        .globl  plat_crash_console_putc
index e6f5f2045ec7bdee1d9b663bdc1301101ec1de2c..1424c7894a0c233fedc07c4d884612857cdbfd86 100644 (file)
@@ -4,14 +4,15 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <console.h>
-#include <platform.h>
+
+#include <arch_helpers.h>
+#include <drivers/console.h>
 #if RAS_EXTENSION
-#include <ras.h>
+#include <lib/extensions/ras.h>
 #endif
-#include <xlat_mmu_helpers.h>
+#include <lib/xlat_tables/xlat_mmu_helpers.h>
+#include <plat/common/platform.h>
 
 /*
  * The following platform setup functions are weakly defined. They
index 89523194d226b2f646a38a3a312fa723080cc88d..b5788fba2d01ac191939894420aec4a7f8904a15 100644 (file)
@@ -6,7 +6,7 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <console.h>
+#include <drivers/console.h>
 #include <platform_def.h>
 
        .weak   plat_report_exception
index 824f9e551f02818b2f2baf982b0410cbbfc62a5a..5733781ac4e2bfed59f079fbc6a83dcd2e09a7a8 100644 (file)
@@ -4,15 +4,17 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <bl1.h>
-#include <debug.h>
 #include <errno.h>
-#include <platform.h>
+
 #include <platform_def.h>
 
+#include <arch_helpers.h>
+#include <bl1/bl1.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <plat/common/platform.h>
+
 /*
  * The following platform functions are weakly defined. They
  * are default implementations that allow BL1 to compile in
index 4cf1cc57355d83fc1f95d80f2ad1077da3346e08..2357edfa93a6414fd4e4017f0791ba2a616c8f02 100644 (file)
@@ -4,16 +4,17 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <debug.h>
 #include <errno.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
 #if TRUSTED_BOARD_BOOT
-#include <mbedtls_config.h>
+#include <drivers/auth/mbedtls/mbedtls_config.h>
 #endif
-#include <platform.h>
-#include <xlat_tables_compat.h>
+#include <lib/xlat_tables/xlat_tables_compat.h>
+#include <plat/common/platform.h>
 
 /*
  * The following platform functions are weakly defined. The Platforms
index 4b6687371f23dd8e22e66b6de7a121cdf2070620..4c76f1bd15d2f832b3e3f46dee63873a6b7a03a3 100644 (file)
@@ -3,13 +3,15 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
+
 #include <assert.h>
-#include <gic_common.h>
-#include <gicv2.h>
-#include <interrupt_mgmt.h>
-#include <platform.h>
 #include <stdbool.h>
 
+#include <bl31/interrupt_mgmt.h>
+#include <drivers/arm/gic_common.h>
+#include <drivers/arm/gicv2.h>
+#include <plat/common/platform.h>
+
 /*
  * The following platform GIC functions are weakly defined. They
  * provide typical implementations that may be re-used by multiple
index f8277fe54a66580b2db7065a3498d16a64a472d0..f5ed6fc96ff4d359a96e65917b4d3261489bf0ca 100644 (file)
@@ -3,16 +3,18 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include <arch_helpers.h>
+
 #include <assert.h>
-#include <bl_common.h>
-#include <cassert.h>
-#include <gic_common.h>
-#include <gicv3.h>
-#include <interrupt_mgmt.h>
-#include <platform.h>
 #include <stdbool.h>
 
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <bl31/interrupt_mgmt.h>
+#include <drivers/arm/gic_common.h>
+#include <drivers/arm/gicv3.h>
+#include <lib/cassert.h>
+#include <plat/common/platform.h>
+
 #ifdef IMAGE_BL31
 
 /*
index c757c6bf1a375f7f7f38c1fb3b71f573104fe87e..66b9758bca9705d9da66c732b363c2bdd79ad4c0 100644 (file)
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
-#include <platform.h>
+#include <common/debug.h>
+#include <plat/common/platform.h>
 
 /* Allow platforms to override the log prefix string */
 #pragma weak plat_log_get_prefix
index fab3c770b7fc16159aaf4a79e3059bbdd3d702b6..1a29d9ca428e3a493b5d21cb22698a09b8404c09 100644 (file)
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
 #include <assert.h>
-#include <platform.h>
-#include <pmf.h>
-#include <psci.h>
+
+#include <arch.h>
+#include <lib/pmf/pmf.h>
+#include <lib/psci/psci.h>
+#include <plat/common/platform.h>
 
 #if ENABLE_PSCI_STAT && ENABLE_PMF
 #pragma weak plat_psci_stat_accounting_start
index 69b9a23fb53b8d4f3beecb0b153ebef16ab96e6b..0c72cb7aa82514616b31da89f6bd5ff6282bf2e5 100644 (file)
@@ -5,13 +5,16 @@
  */
 
 #include <assert.h>
-#include <debug.h>
-#include <fdt_wrappers.h>
+#include <string.h>
+
 #include <libfdt.h>
+
 #include <platform_def.h>
-#include <sp_res_desc.h>
-#include <string.h>
-#include <object_pool.h>
+
+#include <common/debug.h>
+#include <common/fdt_wrappers.h>
+#include <lib/object_pool.h>
+#include <services/sp_res_desc.h>
 
 /*******************************************************************************
  * Resource pool
index 7b7fbd987e4c3008f46f39d069c549976139eab1..ce482799236693e437f393c34c6cd51c9cc573d5 100644 (file)
@@ -5,9 +5,11 @@
  */
 
 #include <assert.h>
-#include <debug.h>
+
 #include <platform_def.h>
-#include <sptool.h>
+
+#include <common/debug.h>
+#include <tools_share/sptool.h>
 
 static unsigned int sp_next;
 
index f5a4f315c9837e51ff868f5f212be502d30440ff..12ab0a9e0de765bbe65a53039ec99e9ed5e3cf11 100644 (file)
@@ -5,14 +5,15 @@
  */
 
 #include <assert.h>
-#include <auth/auth_mod.h>
-#include <platform.h>
+#include <string.h>
+
+#include <drivers/auth/auth_mod.h>
+#include <plat/common/platform.h>
 #if USE_TBBR_DEFS
-#include <tbbr_oid.h>
+#include <tools_share/tbbr_oid.h>
 #else
 #include <platform_oid.h>
 #endif
-#include <string.h>
 
 /*
  * Store a new non-volatile counter value. This implementation
index 60e4d867ff344d0ddb8ad992946275e99296b3b7..702fc2d865582fe240bba28430dc9b7e40dc2f5c 100644 (file)
@@ -4,15 +4,17 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <debug.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <lib/mmio.h>
+#include <lib/xlat_tables/xlat_tables.h>
+#include <plat/common/platform.h>
+
 #include <hikey_def.h>
 #include <hikey_layout.h>
-#include <mmio.h>
-#include <platform.h>
-#include <xlat_tables.h>
 
 #define MAP_DDR                MAP_REGION_FLAT(DDR_BASE,                       \
                                        DDR_SIZE - DDR_SEC_SIZE,        \
index 6fcb597329063000a973d5ab497eccfb2a447e49..a08bdfa72b64f3458eb79608e0f02ba1df26dbcd 100644 (file)
@@ -4,23 +4,25 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <debug.h>
-#include <dw_mmc.h>
 #include <errno.h>
+#include <string.h>
+
+#include <arch_helpers.h>
+#include <bl1/tbbr/tbbr_img_desc.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/arm/pl011.h>
+#include <drivers/mmc.h>
+#include <drivers/synopsys/dw_mmc.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
+
 #include <hi6220.h>
 #include <hikey_def.h>
 #include <hikey_layout.h>
-#include <mmc.h>
-#include <mmio.h>
-#include <pl011.h>
-#include <platform.h>
-#include <string.h>
-#include <tbbr/tbbr_img_desc.h>
 
-#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 */
index 23c16ed99db6f9918e6e5f7a7b6050a894fd7a97..4e013a0f3b8abafca001ed3d271737d854978dd9 100644 (file)
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
-#include <desc_image_load.h>
-#include <platform.h>
 #include <platform_def.h>      /* also includes hikey_def.h and hikey_layout.h*/
 
+#include <common/bl_common.h>
+#include <common/desc_image_load.h>
+#include <plat/common/platform.h>
 
 /*******************************************************************************
  * Following descriptor provides BL image/ep information that gets used
index 125d6654c902d4fe8e51b763fb375494afd219e4..b8723737365240fdf591d57466b1195cc3e9e102 100644 (file)
@@ -4,27 +4,29 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <debug.h>
-#include <delay_timer.h>
-#include <desc_image_load.h>
-#include <dw_mmc.h>
 #include <errno.h>
-#include <hi6220.h>
-#include <hisi_mcu.h>
-#include <hisi_sram_map.h>
-#include <mmc.h>
-#include <mmio.h>
+#include <string.h>
+
+#include <platform_def.h>      /* also includes hikey_def.h and hikey_layout.h*/
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/desc_image_load.h>
+#include <drivers/arm/pl011.h>
+#include <drivers/delay_timer.h>
+#include <drivers/mmc.h>
+#include <drivers/synopsys/dw_mmc.h>
+#include <lib/mmio.h>
 #ifdef SPD_opteed
-#include <optee_utils.h>
+#include <lib/optee_utils.h>
 #endif
-#include <pl011.h>
-#include <platform.h>
-#include <platform_def.h>      /* also includes hikey_def.h and hikey_layout.h*/
-#include <string.h>
+#include <plat/common/platform.h>
 
+#include <hi6220.h>
+#include <hisi_mcu.h>
+#include <hisi_sram_map.h>
 #include "hikey_private.h"
 
 /*
index 0e061e9273fa8790f5cc8282ba3334bd5dbe059d..b2dcb619645e4141f7c2ed3fda753ec0c2b5c780 100644 (file)
@@ -4,21 +4,24 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <cci.h>
-#include <debug.h>
 #include <errno.h>
-#include <gicv2.h>
+
+#include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/interrupt_props.h>
+#include <drivers/arm/cci.h>
+#include <drivers/arm/gicv2.h>
+#include <drivers/arm/pl011.h>
+#include <lib/mmio.h>
+
 #include <hi6220.h>
 #include <hikey_def.h>
 #include <hisi_ipc.h>
 #include <hisi_pwrc.h>
-#include <interrupt_props.h>
-#include <mmio.h>
-#include <pl011.h>
-#include <platform_def.h>
 
 #include "hikey_private.h"
 
index b254a900d1cb616ac2138eb91e0f7374659bcb1c..d062de455606c9e9e39fff2f3d883b4fdb2baffa 100644 (file)
@@ -5,13 +5,13 @@
  */
 
 #include <arch_helpers.h>
-#include <gpio.h>
+#include <drivers/arm/pl061_gpio.h>
+#include <drivers/arm/sp804_delay_timer.h>
+#include <drivers/gpio.h>
+#include <lib/mmio.h>
+
 #include <hi6220.h>
 #include <hi6553.h>
-#include <mmio.h>
-#include <pl061_gpio.h>
-#include <sp804_delay_timer.h>
-
 #include "hikey_private.h"
 
 void hikey_sp804_init(void)
index 43cece001dca67eda750102d5a60ed8c89531fa3..e688c157b8083114b19334f571a92f69827d430c 100644 (file)
@@ -4,16 +4,17 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
 #include <errno.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/arm/sp804_delay_timer.h>
+#include <lib/mmio.h>
+
 #include <hi6220.h>
 #include <hi6553.h>
 #include <hisi_sram_map.h>
-#include <mmio.h>
-#include <sp804_delay_timer.h>
-
 #include "hikey_private.h"
 
 static void init_pll(void)
index 32ca36db0d4007c8d976f20502b8e2c53923d593..0ab1ca49661e1b5655087a33d77a8c757eed8dac 100644 (file)
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
-#include <desc_image_load.h>
-#include <platform.h>
+#include <common/bl_common.h>
+#include <common/desc_image_load.h>
+#include <plat/common/platform.h>
 
 /*******************************************************************************
  * This function flushes the data structures so that they are visible
index 3efbefe8c6a1fdb498aefe54df30dd91bd857cd5..11dd97334c4e54022b8a7214cf75a7932b9e0063 100644 (file)
@@ -4,21 +4,24 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
 #include <errno.h>
-#include <firmware_image_package.h>
-#include <io_block.h>
-#include <io_driver.h>
-#include <io_fip.h>
-#include <io_memmap.h>
-#include <io_storage.h>
-#include <mmc.h>
-#include <mmio.h>
-#include <platform_def.h>
-#include <semihosting.h>       /* For FOPEN_MODE_... */
 #include <string.h>
+
+#include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/io/io_block.h>
+#include <drivers/io/io_driver.h>
+#include <drivers/io/io_fip.h>
+#include <drivers/io/io_memmap.h>
+#include <drivers/io/io_storage.h>
+#include <drivers/mmc.h>
+#include <lib/mmio.h>
+#include <lib/semihosting.h>
+#include <tools_share/firmware_image_package.h>
+
 #include "hikey_private.h"
 
 #define EMMC_BLOCK_SHIFT                       9
index 3128a3d12593bf700f729cd081a8eca4e78cdf60..05c1e7f225ef16388bdfe014ba15921c2755713b 100644 (file)
@@ -4,19 +4,21 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <cci.h>
-#include <debug.h>
-#include <gicv2.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/arm/cci.h>
+#include <drivers/arm/gicv2.h>
+#include <drivers/arm/sp804_delay_timer.h>
+#include <lib/mmio.h>
+#include <lib/psci/psci.h>
+
 #include <hi6220.h>
 #include <hikey_def.h>
 #include <hisi_ipc.h>
 #include <hisi_pwrc.h>
 #include <hisi_sram_map.h>
-#include <mmio.h>
-#include <psci.h>
-#include <sp804_delay_timer.h>
 
 #define CORE_PWR_STATE(state) \
        ((state)->pwr_domain_state[MPIDR_AFFLVL0])
index ca1baa3f5fbac33c81f8ff3cf9ad12cbce327006..d82a0794a0c5d6e850a74a89ede6cd9bbc6b022c 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef HIKEY_PRIVATE_H
 #define HIKEY_PRIVATE_H
 
-#include <bl_common.h>
+#include <common/bl_common.h>
 
 #define RANDOM_MAX             0x7fffffffffffffff
 #define RANDOM_MAGIC           0x9a4dbeaf
index 43d7b7ad788c35626e773e3a9746c1f58f87c12d..4b95939418876344a769a90c033de459a21438e7 100644 (file)
@@ -5,11 +5,14 @@
  */
 
 #include <assert.h>
-#include <debug.h>
-#include <platform_def.h>
 #include <stdint.h>
 #include <string.h>
-#include <utils_def.h>
+
+#include <platform_def.h>
+
+#include <common/debug.h>
+#include <lib/utils_def.h>
+
 #include "hikey_private.h"
 
 #define PORTNUM_MAX            5
index 20eda3619216193c709673845e663560bbc7ac95..1f05d18ea04058a4767e78689f97164c553e1cd3 100644 (file)
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <platform.h>
+#include <plat/common/platform.h>
 
 extern char hikey_rotpk_hash[], hikey_rotpk_hash_end[];
 
index 95948b8d2e945987c6f48a96ec4eafd75447e64d..7890eb7ede97afd437214dd24e482e0a532dd19f 100644 (file)
@@ -3,9 +3,11 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include <arch.h>
+
 #include <platform_def.h>
-#include <psci.h>
+
+#include <arch.h>
+#include <lib/psci/psci.h>
 
 /*
  * The HiKey power domain tree descriptor. The cluster power domains
index 0d4f893b911e35184c5b689f6723ff128d650904..22a67fdcae1eec3bd7f6262d277733097ffd8ba0 100644 (file)
@@ -4,18 +4,21 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <console.h>
-#include <debug.h>
+#include <string.h>
+
+#include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/console.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
+
 #include <hi6220.h>
 #include <hi6553.h>
 #include <hisi_sram_map.h>
-#include <mmio.h>
-#include <platform.h>
-#include <platform_def.h>
-#include <string.h>
 
 #define ACPU_FREQ_MAX_NUM              5
 #define        ACPU_OPP_NUM                    7
index 7e02f3ae1d7806cf0a60661bcb9900735276450c..43ee0b2abcad61712fe010470960d46a6154b929 100644 (file)
@@ -4,16 +4,19 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
-#include <debug.h>
-#include <hisi_ipc.h>
-#include <hisi_sram_map.h>
-#include <mmio.h>
-#include <platform_def.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 
+#include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <lib/mmio.h>
+
+#include <hisi_ipc.h>
+#include <hisi_sram_map.h>
+
 static int ipc_init;
 
 static unsigned int cpu_ipc_num[PLATFORM_CLUSTER_COUNT][PLATFORM_CORE_COUNT_PER_CLUSTER] = {
index 359b94d7b1d093bcf1c58386d8dfa6ea6131e758..ac83bd8544e843845d45887e37a2d80a0aeb847e 100644 (file)
@@ -4,17 +4,20 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <console.h>
-#include <debug.h>
-#include <hi6220.h>
-#include <mmio.h>
-#include <platform.h>
-#include <platform_def.h>
 #include <string.h>
 
+#include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/console.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
+
+#include <hi6220.h>
+
 #define MCU_SECTION_MAX                30
 
 enum MCU_IMAGE_SEC_TYPE_ENUM {
index b635fb16faec07017b398a6909ebbe262f540acb..e2e3db752f00e623045f458faa3c12a1076cfcf2 100644 (file)
@@ -4,8 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
-#include <mmio.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <platform_def.h>
+
+#include <common/debug.h>
+#include <lib/mmio.h>
 
 #include <hi6220_regs_acpu.h>
 #include <hi6220_regs_ao.h>
 #include <hisi_pwrc.h>
 #include <hisi_sram_map.h>
 
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-#include <platform_def.h>
-
 #define CLUSTER_CORE_COUNT             (4)
 #define CLUSTER_CORE_MASK              ((1 << CLUSTER_CORE_COUNT) - 1)
 
index ffa4903769df49433d4d4348545df81aa05c3f24..3cd1bd0921ea55a42824e6190d160b1f90081000 100644 (file)
@@ -4,13 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
-#include <hisi_sip_svc.h>
-#include <pmf.h>
-#include <runtime_svc.h>
 #include <stdint.h>
-#include <uuid.h>
 
+#include <common/debug.h>
+#include <common/runtime_svc.h>
+#include <lib/pmf/pmf.h>
+#include <tools_share/uuid.h>
+
+#include <hisi_sip_svc.h>
 
 /* Hisi SiP Service UUID */
 DEFINE_SVC_UUID2(hisi_sip_svc_uid,
index 55ce91cafc4c879027a4ce9f57a3cf6707c7d5c7..fc991f8427261ee4a5005d44863869919b008d96 100644 (file)
@@ -7,8 +7,9 @@
 #ifndef HI6553_H
 #define HI6553_H
 
+#include <lib/mmio.h>
+
 #include <hi6220.h>
-#include <mmio.h>
 
 #define HI6553_DISABLE6_XO_CLK                 (PMUSSI_BASE + (0x036 << 2))
 
index de38bd50bad7c37a2676713e919e3d979849fd92..9cd276a3e773347a789e1dc0d11c64dcf0b7e806 100644 (file)
@@ -7,8 +7,8 @@
 #ifndef PLAT_MACROS_S
 #define PLAT_MACROS_S
 
-#include <cci.h>
-#include <gicv2.h>
+#include <drivers/arm/cci.h>
+#include <drivers/arm/gicv2.h>
 #include <hi6220.h>
 #include <platform_def.h>
 
index 485eb380041c51a6b5066c95933a22a9a57e2596..2537ac66bf727eddf6c01b1f04748034aabf033a 100644 (file)
@@ -8,11 +8,12 @@
 #define PLATFORM_DEF_H
 
 #include <arch.h>
-#include <common_def.h>
+#include <common/tbbr/tbbr_img_def.h>
+#include <lib/utils_def.h>
+#include <plat/common/common_def.h>
+
 #include <hikey_def.h>
 #include <hikey_layout.h>              /* BL memory region sizes, etc */
-#include <tbbr_img_def.h>
-#include <utils_def.h>
 
 /* Special value used to verify platform parameters from BL2 to BL3-1 */
 #define HIKEY_BL31_PLAT_PARAM_VAL      0x0f1e2d3c4b5a6978ULL
index 398b224cf77a0631225ca861088d69fca1d39bcd..6d077f746428fcabb5942a200bd5e40e20ce353e 100644 (file)
@@ -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 \
index 1ed3eaa6770f8a5140418611b2995c687a8a727e..612a7f21b1d1c8a686ecc2104cf08248fdc52892 100644 (file)
@@ -4,14 +4,16 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <debug.h>
-#include <mmio.h>
-#include <platform.h>
+
 #include <platform_def.h>
-#include <xlat_tables.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <lib/mmio.h>
+#include <lib/xlat_tables/xlat_tables.h>
+#include <plat/common/platform.h>
 
 #include "../hikey960_def.h"
 #include "../hikey960_private.h"
index 4c664d112797371933703cdd48323180639ac77a..a6a4949347e55048ea5611e3f9260e95c3fa463a 100644 (file)
@@ -4,15 +4,17 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
-#include <hi3660.h>
-#include <hisi_ipc.h>
-#include <mmio.h>
-#include <platform.h>
+
 #include <platform_def.h>
 
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
+
+#include <hi3660.h>
+#include <hisi_ipc.h>
 #include "../../hikey960_private.h"
 
 #define IPC_MBX_SOURCE_REG(m)          (IPC_BASE + ((m) << 6))
index 45fcd42b409dd4ad55a997e6b4e4fb5c13e55d80..659a1c4ad25669e6ad11060a9bf37be13ab4ae71 100644 (file)
@@ -4,15 +4,16 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <../hikey960_def.h>
-#include <arch_helpers.h>
 #include <assert.h>
-#include <hisi_ipc.h>
-#include <mmio.h>
-#include <platform.h>
+
 #include <platform_def.h>
 
+#include <arch_helpers.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
 
+#include <../hikey960_def.h>
+#include <hisi_ipc.h>
 #include "hisi_pwrc.h"
 
 
index ff2c77a60d9c4bc3c89b43f3f223636a5b4c0f54..38bdbe41767dda18482168fd1c3969662700a813 100644 (file)
@@ -4,26 +4,28 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <debug.h>
-#include <delay_timer.h>
-#include <dw_ufs.h>
 #include <errno.h>
-#include <generic_delay_timer.h>
-#include <gicv2.h>
-#include <hi3660.h>
-#include <interrupt_props.h>
-#include <mmio.h>
-#include <pl011.h>
-#include <platform.h>
-#include <platform_def.h>
 #include <string.h>
-#include <tbbr/tbbr_img_desc.h>
-#include <ufs.h>
 
-#include "../../bl1/bl1_private.h"
+#include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <bl1/tbbr/tbbr_img_desc.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/interrupt_props.h>
+#include <drivers/arm/gicv2.h>
+#include <drivers/arm/pl011.h>
+#include <drivers/delay_timer.h>
+#include <drivers/dw_ufs.h>
+#include <drivers/generic_delay_timer.h>
+#include <drivers/ufs.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
+
+#include <hi3660.h>
+#include "../../../bl1/bl1_private.h"
 #include "hikey960_def.h"
 #include "hikey960_private.h"
 
index 2944b1f7cd5734751cb3b11a95245e0976b21703..ba236d22f16591bed30d47d8dc2923a037ab0b86 100644 (file)
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
-#include <desc_image_load.h>
-#include <platform.h>
 #include <platform_def.h>
 
+#include <common/bl_common.h>
+#include <common/desc_image_load.h>
+#include <plat/common/platform.h>
 
 /*******************************************************************************
  * Following descriptor provides BL image/ep information that gets used
index 552356f1cc4a704d426cc30cc11b2d9ddc76d8b5..788392db70b129a5ce5a13fc331cb4f645ca2716 100644 (file)
@@ -4,25 +4,27 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <debug.h>
-#include <delay_timer.h>
-#include <desc_image_load.h>
-#include <dw_ufs.h>
 #include <errno.h>
-#include <generic_delay_timer.h>
-#include <hi3660.h>
-#include <mmio.h>
+#include <string.h>
+
+#include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/desc_image_load.h>
+#include <drivers/arm/pl011.h>
+#include <drivers/delay_timer.h>
+#include <drivers/dw_ufs.h>
+#include <drivers/generic_delay_timer.h>
+#include <drivers/ufs.h>
+#include <lib/mmio.h>
 #ifdef SPD_opteed
-#include <optee_utils.h>
+#include <lib/optee_utils.h>
 #endif
-#include <pl011.h>
-#include <platform_def.h>
-#include <string.h>
-#include <ufs.h>
 
+#include <hi3660.h>
 #include "hikey960_def.h"
 #include "hikey960_private.h"
 
index 2261470617be288c90ea6eb8b7d3ebe9bc36808b..67b06f498cc26a3f2da00f74459cc1bad839ed72 100644 (file)
@@ -4,24 +4,26 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <cci.h>
-#include <console.h>
-#include <debug.h>
 #include <errno.h>
-#include <generic_delay_timer.h>
-#include <gicv2.h>
-#include <hi3660.h>
-#include <mmio.h>
-#include <hisi_ipc.h>
-#include <interrupt_mgmt.h>
-#include <interrupt_props.h>
-#include <pl011.h>
-#include <platform.h>
+
 #include <platform_def.h>
 
+#include <arch_helpers.h>
+#include <bl31/interrupt_mgmt.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/interrupt_props.h>
+#include <drivers/arm/cci.h>
+#include <drivers/arm/gicv2.h>
+#include <drivers/arm/pl011.h>
+#include <drivers/console.h>
+#include <drivers/generic_delay_timer.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
+
+#include <hi3660.h>
+#include <hisi_ipc.h>
 #include "hikey960_def.h"
 #include "hikey960_private.h"
 
index 0cee69f94d7f33464048fe79ff2ca348a0e5d5e6..89adccb2bbcea8b1338b93f929f88682e30eeceb 100644 (file)
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
-#include <delay_timer.h>
-#include <hi3660.h>
-#include <mmio.h>
-#include <pl061_gpio.h>
+#include <common/debug.h>
+#include <drivers/arm/pl061_gpio.h>
+#include <drivers/delay_timer.h>
+#include <lib/mmio.h>
 
+#include <hi3660.h>
 #include "hikey960_private.h"
 
 void hikey960_clk_init(void)
index f39c15385106c3ddf8d86577755b4d231649334f..1e1126fb1a903bf1c2225c6a4a3963416c88cfda 100644 (file)
@@ -5,12 +5,13 @@
  */
 
 #include <assert.h>
-#include <debug.h>
-#include <delay_timer.h>
 #include <errno.h>
-#include <hi3660.h>
-#include <mmio.h>
 
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <lib/mmio.h>
+
+#include <hi3660.h>
 #include "hikey960_private.h"
 
 #define ADC_ADCIN0                             0
index 91d0af3c0823ad6b1f2666f4e903a6923d52e09a..d977c7989ce00dc8a69a34f5fc6b547609ff52f5 100644 (file)
@@ -7,8 +7,8 @@
 #ifndef HIKEY960_DEF_H
 #define HIKEY960_DEF_H
 
-#include <common_def.h>
-#include <tbbr_img_def.h>
+#include <common/tbbr/tbbr_img_def.h>
+#include <plat/common/common_def.h>
 
 #define DDR_BASE                       0x0
 #define DDR_SIZE                       0xC0000000
index ad7be5081d604866025af0a39ab3dc14afd678af..57cb1b228eb06bd4dbcc96231317d2de81f5e0e9 100644 (file)
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
-#include <desc_image_load.h>
-#include <platform.h>
+#include <common/bl_common.h>
+#include <common/desc_image_load.h>
+#include <plat/common/platform.h>
 
 /*******************************************************************************
  * This function flushes the data structures so that they are visible
index cff3b0d235ae3651d08c41a25285f30a84350db6..a4e83897ededa327860d681aad29c4e0885ef584 100644 (file)
@@ -4,21 +4,23 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
 #include <errno.h>
-#include <firmware_image_package.h>
-#include <io_block.h>
-#include <io_driver.h>
-#include <io_fip.h>
-#include <io_memmap.h>
-#include <io_storage.h>
-#include <mmio.h>
-#include <platform_def.h>
-#include <semihosting.h>       /* For FOPEN_MODE_... */
 #include <string.h>
-#include <ufs.h>
+
+#include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/ufs.h>
+#include <drivers/io/io_block.h>
+#include <drivers/io/io_driver.h>
+#include <drivers/io/io_fip.h>
+#include <drivers/io/io_memmap.h>
+#include <drivers/io/io_storage.h>
+#include <lib/mmio.h>
+#include <lib/semihosting.h>
+#include <tools_share/firmware_image_package.h>
 
 struct plat_io_policy {
        uintptr_t *dev_handle;
index 7bf9a3d06b46300cb228302a2fee249e9547c6ff..b9ae31368a5c13832e18aae6f1ef17a4e866be4b 100644 (file)
@@ -4,16 +4,18 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <debug.h>
-#include <delay_timer.h>
 #include <errno.h>
-#include <hi3660.h>
-#include <mmio.h>
 #include <string.h>
 
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <lib/mmio.h>
+
+#include <hi3660.h>
+
 #define ADDR_CONVERT(addr)             ((addr) < 0x40000 ?     \
                                         (addr) + 0xFFF30000 :  \
                                         (addr) + 0x40000000)
index f1873eecdbd4c270560a3e91f5c8170287214b62..676cfa3f3cd01bb0ae38b8e351b09a6ae9e60b67 100644 (file)
@@ -4,19 +4,21 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <cci.h>
-#include <debug.h>
-#include <delay_timer.h>
-#include <gicv2.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/arm/cci.h>
+#include <drivers/arm/gicv2.h>
+#include <drivers/arm/pl011.h>
+#include <drivers/delay_timer.h>
+#include <lib/mmio.h>
+#include <lib/psci/psci.h>
+
 #include <hi3660.h>
 #include <hi3660_crg.h>
-#include <mmio.h>
-#include <pl011.h>
-#include <psci.h>
-#include "drivers/pwrc/hisi_pwrc.h"
 
+#include "drivers/pwrc/hisi_pwrc.h"
 #include "hikey960_def.h"
 #include "hikey960_private.h"
 
index 31d3a4ae391b3d5378e0af3fc93a5897209f14df..9a18dd620c5c0ff31f8cf7b72c3cc54021f40dfd 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef HIKEY960_PRIVATE_H
 #define HIKEY960_PRIVATE_H
 
-#include <bl_common.h>
+#include <common/bl_common.h>
 
 /*
  * Function and variable prototypes
index e9f28b3bc941088736d686d5b208ef911611adfd..e435ec2e5d5838ed605e99865f6d0fe853e8be94 100644 (file)
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <platform.h>
+#include <plat/common/platform.h>
 
 extern char hikey960_rotpk_hash[], hikey960_rotpk_hash_end[];
 
index 33637246986e6ec114fc79c5afc1c9b3f904f97a..a242bb1d381ebd262d5d510f64fdfbb64018dcd2 100644 (file)
@@ -3,9 +3,11 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include <arch.h>
+
 #include <platform_def.h>
-#include <psci.h>
+
+#include <arch.h>
+#include <lib/psci/psci.h>
 
 /*
  * The HiKey power domain tree descriptor. The cluster power domains
index 3b126f6529c3cc283fee94b60383e7414c7eb159..8765562a02b8d4a20ee97cead8ffaac621775e1b 100644 (file)
@@ -7,8 +7,8 @@
 #ifndef PLAT_MACROS_S
 #define PLAT_MACROS_S
 
-#include <cci.h>
-#include <gicv2.h>
+#include <drivers/arm/cci.h>
+#include <drivers/arm/gicv2.h>
 #include <hi3660.h>
 #include <platform_def.h>
 
index 427a1e7596efe7bb5fa88350b83fd1962e96d9da..3e2d79daafd90e4c1c2d2aabf92d381cb0f75d39 100644 (file)
@@ -8,7 +8,8 @@
 #define PLATFORM_DEF_H
 
 #include <arch.h>
-#include <utils_def.h>
+#include <lib/utils_def.h>
+
 #include "../hikey960_def.h"
 
 /* Special value used to verify platform parameters from BL2 to BL3-1 */
index d408209d895a13f592c687c7f55ca893245d374d..fcd0a8bcf845b4fa0fcb98ed6791eb41dad4a6ec 100644 (file)
@@ -4,15 +4,17 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <debug.h>
-#include <delay_timer.h>
 #include <errno.h>
-#include <mmio.h>
-#include <platform.h>
-#include <xlat_tables.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <lib/mmio.h>
+#include <lib/xlat_tables/xlat_tables.h>
+#include <plat/common/platform.h>
+
 #include "hi3798cv200.h"
 #include "platform_def.h"
 
index d0b12ad2bc3ad2a77b356b1fda7304b2a408bb54..eb8ffe4fd00dcc7ac5ffad8b9425f702ff04a3ed 100644 (file)
@@ -4,22 +4,25 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <debug.h>
-#include <dw_mmc.h>
 #include <errno.h>
-#include <generic_delay_timer.h>
-#include <mmc.h>
-#include <mmio.h>
-#include <pl011.h>
-#include <pl061_gpio.h>
-#include <platform.h>
-#include <platform_def.h>
 #include <string.h>
-#include <tbbr_img_def.h>
-#include "../../bl1/bl1_private.h"
+
+#include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/tbbr/tbbr_img_def.h>
+#include <drivers/arm/pl011.h>
+#include <drivers/arm/pl061_gpio.h>
+#include <drivers/generic_delay_timer.h>
+#include <drivers/mmc.h>
+#include <drivers/synopsys/dw_mmc.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
+
+#include "../../../bl1/bl1_private.h"
 #include "hi3798cv200.h"
 #include "plat_private.h"
 
index c73ead8d759110629501bef6ff4f333b7ba0a569..f683d750dc669eb39ed3dd1c1cea6cb0d15c544a 100644 (file)
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
-#include <desc_image_load.h>
-#include <platform.h>
 #include <platform_def.h>
 
+#include <common/bl_common.h>
+#include <common/desc_image_load.h>
+#include <plat/common/platform.h>
 
 /*******************************************************************************
  * Following descriptor provides BL image/ep information that gets used
index 3a3ed6a46fe991ed130c2ddc8dc500a24dc8f099..ff8e107dbf1f59a12c128d2dbe2250914b6b2f25 100644 (file)
@@ -4,21 +4,23 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <debug.h>
-#include <desc_image_load.h>
-#include <dw_mmc.h>
 #include <errno.h>
-#include <generic_delay_timer.h>
-#include <mmc.h>
-#include <mmio.h>
-#include <optee_utils.h>
-#include <partition/partition.h>
-#include <pl011.h>
-#include <platform.h>
 #include <string.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/desc_image_load.h>
+#include <drivers/arm/pl011.h>
+#include <drivers/generic_delay_timer.h>
+#include <drivers/partition/partition.h>
+#include <drivers/synopsys/dw_mmc.h>
+#include <drivers/mmc.h>
+#include <lib/mmio.h>
+#include <lib/optee_utils.h>
+#include <plat/common/platform.h>
+
 #include "hi3798cv200.h"
 #include "plat_private.h"
 
index e2079f9ee6b42d693bc5cd4760e07bead7f35f8e..69911e8d5ecc3eecb98755a70149b46f983bbd72 100644 (file)
@@ -4,21 +4,24 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl31.h>
-#include <bl_common.h>
-#include <cortex_a53.h>
-#include <debug.h>
 #include <errno.h>
-#include <generic_delay_timer.h>
-#include <mmio.h>
-#include <pl011.h>
-#include <platform.h>
-#include <platform_def.h>
 #include <stddef.h>
 #include <string.h>
+
+#include <platform_def.h>
+
+#include <arch.h>
+#include <arch_helpers.h>
+#include <bl31/bl31.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <cortex_a53.h>
+#include <drivers/arm/pl011.h>
+#include <drivers/generic_delay_timer.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
+
 #include "hi3798cv200.h"
 #include "plat_private.h"
 
index ddb43964cf28d6e4caff89e2559d64ad0ae2da5c..e31f4b3e1cc8c17c701b0b0098b2994c271a9dd2 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef HI3798CV200_H
 #define HI3798CV200_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 /* PL011 */
 #define PL011_UART0_BASE               (0xF8B00000)
index 3aeccc42418d9048f455e52c21aa0d61f916f870..a34f13846744fe7dd33d263a77437288bb3ca06b 100644 (file)
@@ -7,7 +7,8 @@
 #ifndef PLAT_PRIVATE_H
 #define PLAT_PRIVATE_H
 
-#include <bl_common.h>
+#include <common/bl_common.h>
+
 #include "hi3798cv200.h"
 
 void plat_configure_mmu_el3(unsigned long total_base,
index e39d94471a019b738dd75341f91a5b2b35e331af..8f7a1559b2472fd9033078144c192ec76f2f13ee 100644 (file)
@@ -8,11 +8,12 @@
 #define PLATFORM_DEF_H
 
 #include <arch.h>
-#include <common_def.h>
-#include <gic_common.h>
-#include <interrupt_props.h>
-#include <tbbr/tbbr_img_def.h>
-#include <utils_def.h>
+#include <common/interrupt_props.h>
+#include <common/tbbr/tbbr_img_def.h>
+#include <drivers/arm/gic_common.h>
+#include <lib/utils_def.h>
+#include <plat/common/common_def.h>
+
 #include "hi3798cv200.h"
 #include "poplar_layout.h"             /* BL memory region sizes, etc */
 
index eccb0b0d8cc864d31bbc5d57f71a6eec1d5fb514..67ebca1ca1a3e6003502517cc3ad4f78dad8ddb4 100644 (file)
@@ -4,16 +4,19 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <context.h>
-#include <context_mgmt.h>
-#include <debug.h>
-#include <mmio.h>
-#include <platform.h>
+
 #include <platform_def.h>
-#include <psci.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <context.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/mmio.h>
+#include <lib/psci/psci.h>
+#include <plat/common/platform.h>
+
 #include "hi3798cv200.h"
 #include "plat_private.h"
 
index 925274ce4e4aa2c0f19c6461ab3bcf518c8a469e..a17e0f1a22429326a59430e4ad8d25d73d58ef8f 100644 (file)
@@ -4,23 +4,25 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
-#include <firmware_image_package.h>
-#include <io_block.h>
-#include <io_driver.h>
-#include <io_fip.h>
-#include <io_memmap.h>
-#include <io_storage.h>
-#include <mmc.h>
-#include <mmio.h>
-#include <partition/partition.h>
-#include <semihosting.h>
 #include <string.h>
-#include <tbbr_img_def.h>
-#include <utils.h>
-#include "platform_def.h"
+
+#include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <common/tbbr/tbbr_img_def.h>
+#include <drivers/io/io_block.h>
+#include <drivers/io/io_driver.h>
+#include <drivers/io/io_fip.h>
+#include <drivers/io/io_memmap.h>
+#include <drivers/io/io_storage.h>
+#include <drivers/mmc.h>
+#include <drivers/partition/partition.h>
+#include <lib/mmio.h>
+#include <lib/semihosting.h>
+#include <lib/utils.h>
+#include <tools_share/firmware_image_package.h>
 
 #if !POPLAR_RECOVERY
 static const io_dev_connector_t *emmc_dev_con;
index bb53c6b1fa59d0c71227920f7a367f149130a047..764008e9e133c6dd8aebf3c73ad267c62c8a4e81 100644 (file)
@@ -4,9 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <platform_def.h>
+
 #include <arch.h>
-#include <psci.h>
-#include "platform_def.h"
+#include <lib/psci/psci.h>
+
 #include "plat_private.h"
 
 const unsigned char hisi_power_domain_tree_desc[] = {
index 0aaa7074aeab1a453c6c767894f32fc6fac8ffd7..eca14125e15588d12a0150b507327617291503b5 100644 (file)
@@ -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                   \
index 1c1be47fb89e00efb41838634a95aab0dcefa95f..59f7b76ee77a3a8d3ceea919baa658aeae6927fa 100644 (file)
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <gicv2.h>
-#include <platform.h>
 #include <platform_def.h>
 
+#include <drivers/arm/gicv2.h>
+#include <plat/common/platform.h>
+
 /******************************************************************************
  * On a GICv2 system, the Group 1 secure interrupts are treated as Group 0
  * interrupts.
index 32ca36db0d4007c8d976f20502b8e2c53923d593..0ab1ca49661e1b5655087a33d77a8c757eed8dac 100644 (file)
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
-#include <desc_image_load.h>
-#include <platform.h>
+#include <common/bl_common.h>
+#include <common/desc_image_load.h>
+#include <plat/common/platform.h>
 
 /*******************************************************************************
  * This function flushes the data structures so that they are visible
index 22a531bf8313b449d279eddbc7914c23542e9483..588d8b4e253b481611c335188f6e4ab8ce2433df 100644 (file)
@@ -4,12 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <stdbool.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <debug.h>
+#include <common/debug.h>
+
 #include <plat_imx8.h>
 #include <sci/sci.h>
-#include <stdbool.h>
 
 void __dead2 imx_system_off(void)
 {
index 64145c4ca89744d9a0b5c79c86882a734967206e..5e14d17fa27f0cfb5a28002f09a95e600f30c539 100644 (file)
@@ -6,7 +6,7 @@
 
 #include <arch.h>
 #include <arch_helpers.h>
-#include <platform.h>
+#include <plat/common/platform.h>
 
 const unsigned char imx_power_domain_tree_desc[] = {
        PWR_DOMAIN_AT_MAX_LVL,
index 991c262bc4f6dc7b02ba606a1e0d9da920b25d72..532d9c0eb14b64fb7e0bdf6e3769724dfbcb6c97 100644 (file)
@@ -4,8 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <mmio.h>
-#include <utils_def.h>
+#include <lib/mmio.h>
+#include <lib/utils_def.h>
+
 #include <imx_aips.h>
 #include <imx_regs.h>
 
index 335e1ed8ec5fd96ef3157df65d2f6e1739aa503a..d9c141f56270f9692de9eb776268e1b9feaa756b 100644 (file)
@@ -3,8 +3,11 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
+
 #include <stdint.h>
-#include <mmio.h>
+
+#include <lib/mmio.h>
+
 #include <imx_caam.h>
 
 void imx_caam_init(void)
index ccf2aeb1389bebf3dd393beab3347a3ca0db070b..743de553ab8d82d0d41efabcd523564227f92e3a 100644 (file)
@@ -3,10 +3,13 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include <arch.h>
-#include <mmio.h>
+
 #include <stdint.h>
 #include <stdbool.h>
+
+#include <arch.h>
+#include <lib/mmio.h>
+
 #include <imx_regs.h>
 #include <imx_clock.h>
 
index 7c6a63e8a28814c0643bf0646e386f8dabf9b70a..7e165d928132eb9f6fbe0f21b3d91afd62a3b596 100644 (file)
@@ -3,7 +3,9 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include <mmio.h>
+
+#include <lib/mmio.h>
+
 #include <imx_csu.h>
 #include <imx_regs.h>
 
index 723064716a197750755bae0295e2e0b2b5dda233..75de5d14e4f8beefce7f7da3514f84f0ca069caa 100644 (file)
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <mmio.h>
+#include <lib/mmio.h>
+
 #include <imx_regs.h>
 #include <imx_io_mux.h>
 
index 4a2a7d72500b6788a83d2014ade3399f6881ea54..9b3a737768197e64668051e938ffb34c8f5b99a2 100644 (file)
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <mmio.h>
+#include <lib/mmio.h>
+
 #include <imx_regs.h>
 #include <imx_snvs.h>
 
index 86813dd0177fb4ccff1bcc743f08c1c6609dd529..af6d7678e96e5c99c9832f620ed4a6f2423997da 100644 (file)
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <mmio.h>
+#include <lib/mmio.h>
+
 #include <imx_regs.h>
 #include <imx_wdog.h>
 
index 8e1184f9598d2aa6033e42213272081bcbbeb8d3..63449e7def607c6f18f53728fe25a54af078d0e9 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef IMX8_LPUART_H
 #define IMX8_LPUART_H
 
-#include <console.h>
+#include <drivers/console.h>
 
 #define VERID  0x0
 #define PARAM  0x4
index 0aed1e142f80f0cba88c17461faa3a5f1ef56bc0..0b3d1085f7d3e953be20d649c042509f277ed3cf 100644 (file)
@@ -7,6 +7,7 @@
 #define IMX_SNVS_H
 
 #include <stdint.h>
+
 #include <arch.h>
 
 struct snvs {
index d2c396888615eafb76160b409bf94e127f1ed07d..a251024f162db155dc3aad5fe37047ce8cbc729b 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef IMX_UART_H
 #define IMX_UART_H
 
-#include <console.h>
+#include <drivers/console.h>
 
 #ifndef __ASSEMBLY__
 
index 7b3037dfeab7969ac3f46156671e5c872d0b366d..75a729a99d3960b643fb31328efdbb3e1674763e 100644 (file)
@@ -7,9 +7,10 @@
 #ifndef IMX_WDOG_H
 #define IMX_WDOG_H
 
-#include <arch.h>
 #include <stdint.h>
 
+#include <arch.h>
+
 struct wdog_regs {
        uint16_t wcr;
        uint16_t wsr;
index 03799c459b1ce1a38f73148ab8fdd65ca335acb2..8d83173fdb78f1d34d4b23448eac79a120307948 100644 (file)
@@ -7,8 +7,8 @@
 #ifndef PLAT_IMX8_H
 #define PLAT_IMX8_H
 
-#include <gicv3.h>
-#include <psci.h>
+#include <drivers/arm/gicv3.h>
+#include <lib/psci/psci.h>
 
 unsigned int plat_calc_core_pos(uint64_t mpidr);
 void imx_mailbox_init(uintptr_t base_addr);
index 1771baed3787140ed55577919e5d6f77b471d4f6..60dbc27b6ba18655c12414f67664f421a7b08fca 100644 (file)
 
 /* Includes */
 
+#include <stdbool.h>
+
 #include <sci/sci_types.h>
 #include <sci/sci_ipc.h>
-#include <stdbool.h>
 
 /* Defines */
 
index 2da9cc0d98c909f1174402f90c66f46506a1dc82..aec0b6c9b13a143cec6f0b3aeda6b4da674fd95b 100644 (file)
@@ -4,13 +4,15 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
-#include <gicv3.h>
-#include <interrupt_props.h>
-#include <plat_imx8.h>
-#include <platform.h>
 #include <platform_def.h>
-#include <utils.h>
+
+#include <common/bl_common.h>
+#include <common/interrupt_props.h>
+#include <drivers/arm/gicv3.h>
+#include <lib/utils.h>
+#include <plat/common/platform.h>
+
+#include <plat_imx8.h>
 
 /* the GICv3 driver only needs to be initialized in EL3 */
 uintptr_t rdistif_base_addrs[PLATFORM_CORE_COUNT];
index 8028c76d62009f1f275cc3943c7688ee22b4ed87..26d9bdfef9671c8a7ca5f7f024ea366668b84a22 100644 (file)
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <mmio.h>
+#include <lib/mmio.h>
+
 #include "imx8_mu.h"
 
 void MU_EnableRxFullInt(uint32_t base, uint32_t index)
index 2af256782811ce2dda6fb009fe8fd758c255feae..6491ca575f481020da5d31b1d99c918c9736f61a 100644 (file)
@@ -4,11 +4,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bakery_lock.h>
+#include <stdlib.h>
+
+#include <lib/bakery_lock.h>
+
 #include <sci/sci_scfw.h>
 #include <sci/sci_ipc.h>
 #include <sci/sci_rpc.h>
-#include <stdlib.h>
 #include "imx8_mu.h"
 
 DEFINE_BAKERY_LOCK(sc_ipc_bakery_lock);
index 555e7047a840900436548d6da05d2481406a58cc..319d4696d8fcb4712443e016c8eb7dcdb3972859 100644 (file)
 
 /* Includes */
 
+#include <stdlib.h>
+
 #include <sci/sci_types.h>
 #include <sci/svc/rm/sci_rm_api.h>
 #include <sci/svc/pad/sci_pad_api.h>
 #include <sci/sci_rpc.h>
-#include <stdlib.h>
 #include "sci_pad_rpc.h"
 
 /* Local Defines */
index b108c499b54adf00c48673d77226529993193306..66a57a13d52f596b2711a6aca8c55559c2037fc2 100644 (file)
 
 /* Includes */
 
+#include <stdlib.h>
+
 #include <sci/sci_types.h>
 #include <sci/svc/rm/sci_rm_api.h>
 #include <sci/svc/pm/sci_pm_api.h>
 #include <sci/sci_rpc.h>
-#include <stdlib.h>
+
 #include "sci_pm_rpc.h"
 
 /* Local Defines */
index 230956c7ccf42808fb81f4c47ff05cd6b64d5a53..16771a5836963733f38e55bbdce30359436f6bc7 100644 (file)
 
 /* Includes */
 
+#include <stdlib.h>
+
 #include <sci/sci_types.h>
 #include <sci/svc/rm/sci_rm_api.h>
 #include <sci/sci_rpc.h>
-#include <stdlib.h>
+
 #include "sci_rm_rpc.h"
 
 /* Local Defines */
index 4ee6fd37deb49fac52cb19fdec52093636848b09..a931c8062ec40b5c8b6a69ee3cba02822eba7c99 100644 (file)
@@ -8,8 +8,8 @@
 #define PLATFORM_DEF_H
 
 #include <arch.h>
-#include <common_def.h>
-#include <tbbr_img_def.h>
+#include <common/tbbr/tbbr_img_def.h>
+#include <plat/common/common_def.h>
 
 #define PLATFORM_STACK_SIZE            0x1000
 
index 10c4160cf7df85e8501bf401c3980b11771aa499..032ed7b194986847c8d35c1bb756c65dd0126b3e 100644 (file)
@@ -4,19 +4,22 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <console.h>
-#include <debug.h>
-#include <desc_image_load.h>
-#include <mmc.h>
-#include <mmio.h>
-#include <optee_utils.h>
+
 #include <platform_def.h>
-#include <utils.h>
-#include <xlat_mmu_helpers.h>
-#include <xlat_tables_defs.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/desc_image_load.h>
+#include <drivers/console.h>
+#include <drivers/mmc.h>
+#include <lib/xlat_tables/xlat_mmu_helpers.h>
+#include <lib/xlat_tables/xlat_tables_defs.h>
+#include <lib/mmio.h>
+#include <lib/optee_utils.h>
+#include <lib/utils.h>
+
 #include <imx_aips.h>
 #include <imx_caam.h>
 #include <imx_clock.h>
@@ -27,6 +30,7 @@
 #include <imx_snvs.h>
 #include <imx_usdhc.h>
 #include <imx_wdog.h>
+
 #include "warp7_private.h"
 
 #define UART1_CLK_SELECT (CCM_TARGET_ROOT_ENABLE |\
index 12254d46ce536cca4f98963688e890039b9b4789..a29e14198f753544487b0c756eed11c25906d3d1 100644 (file)
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
-#include <desc_image_load.h>
-#include <platform.h>
 #include <platform_def.h>
 
+#include <common/bl_common.h>
+#include <common/desc_image_load.h>
+#include <plat/common/platform.h>
+
 static bl_mem_params_node_t bl2_mem_params_descs[] = {
        {
                .image_id = BL32_IMAGE_ID,
index 1e3a2b0b5fc5e007477b75d54721254396d35ad6..c3e47b9d7d242841b1733ff9106a56f98d031ab2 100644 (file)
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
-#include <desc_image_load.h>
-#include <platform.h>
+#include <common/bl_common.h>
+#include <common/desc_image_load.h>
+#include <plat/common/platform.h>
 
 void plat_flush_next_bl_params(void)
 {
index 8354766ae44528d334699ef7df31bee424c742f2..b9cace09063ca8886e1d497bf7a88f86226efb42 100644 (file)
@@ -3,16 +3,19 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
+
 #include <assert.h>
-#include <debug.h>
-#include <mmc.h>
-#include <firmware_image_package.h>
-#include <io_block.h>
-#include <io_driver.h>
-#include <io_fip.h>
-#include <io_memmap.h>
+
 #include <platform_def.h>
 
+#include <common/debug.h>
+#include <drivers/io/io_block.h>
+#include <drivers/io/io_driver.h>
+#include <drivers/io/io_fip.h>
+#include <drivers/io/io_memmap.h>
+#include <drivers/mmc.h>
+#include <tools_share/firmware_image_package.h>
+
 static const io_dev_connector_t *fip_dev_con;
 static uintptr_t fip_dev_handle;
 
index 187a4ad1f423850ee2d3ff35708c33b2d08c7a70..7fa5a3d1b1911ce8af7d1fd1232ed327e35b8e9a 100644 (file)
@@ -4,15 +4,17 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
-#include <gpc.h>
-#include <mmio.h>
-#include <platform_def.h>
-#include <psci.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <stdbool.h>
-#include <std_svc.h>
+
+#include <common/debug.h>
+#include <lib/mmio.h>
+#include <lib/psci/psci.h>
+#include <platform_def.h>
+#include <services/std_svc.h>
+
+#include <gpc.h>
 
 void imx_set_cpu_secure_entry(unsigned int core_id, uintptr_t sec_entrypoint)
 {
index 45d2a40f672147c230ed55b3cdf0e168aa990025..f4e6ee746e80aa0fa61f660d9cc52acb7c557040 100644 (file)
@@ -4,22 +4,25 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <console.h>
+#include <stdbool.h>
+
+#include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
 #include <context.h>
-#include <context_mgmt.h>
-#include <debug.h>
+#include <drivers/arm/tzc380.h>
+#include <drivers/console.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/mmio.h>
+#include <lib/xlat_tables/xlat_tables.h>
+#include <plat/common/platform.h>
+
 #include <gpc.h>
 #include <imx_uart.h>
-#include <stdbool.h>
-#include <mmio.h>
-#include <platform.h>
-#include <platform_def.h>
 #include <plat_imx8.h>
-#include <xlat_tables.h>
-#include <tzc380.h>
 
 IMPORT_SYM(uintptr_t, __COHERENT_RAM_START__, BL31_COHERENT_RAM_START);
 IMPORT_SYM(uintptr_t, __COHERENT_RAM_END__, BL31_COHERENT_RAM_END);
index 7afe52d3d4e1105b227aea76ccb7a7f2615afcd4..ee588656ea2bceb8563a4fb59d3d9fec62b40053 100644 (file)
@@ -4,14 +4,16 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <stdbool.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <debug.h>
+#include <common/debug.h>
+#include <lib/mmio.h>
+#include <lib/psci/psci.h>
+
 #include <gpc.h>
-#include <stdbool.h>
 #include <plat_imx8.h>
-#include <psci.h>
-#include <mmio.h>
 
 #define CORE_PWR_STATE(state) ((state)->pwr_domain_state[MPIDR_AFFLVL0])
 #define CLUSTER_PWR_STATE(state) ((state)->pwr_domain_state[MPIDR_AFFLVL1])
index 7410ac136e0d37781593e98d02189e8f6b5f8d35..a00695cc3e4b3597c81aaaea11e4d385b0adca0e 100644 (file)
@@ -4,25 +4,28 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <cci.h>
-#include <console.h>
+#include <stdbool.h>
+
+#include <platform_def.h>
+
+#include <arch_helpers.h>
 #include <context.h>
-#include <context_mgmt.h>
-#include <debug.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/arm/cci.h>
+#include <drivers/console.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/mmio.h>
+#include <lib/xlat_tables/xlat_tables.h>
+#include <plat/common/platform.h>
+
 #include <imx8qm_pads.h>
 #include <imx8_iomux.h>
 #include <imx8_lpuart.h>
-#include <mmio.h>
-#include <platform.h>
-#include <platform_def.h>
 #include <plat_imx8.h>
 #include <sci/sci.h>
 #include <sec_rsrc.h>
-#include <stdbool.h>
-#include <xlat_tables.h>
 
 IMPORT_SYM(unsigned long, __COHERENT_RAM_START__, BL31_COHERENT_RAM_START);
 IMPORT_SYM(unsigned long, __COHERENT_RAM_END__, BL31_COHERENT_RAM_END);
index 8166546d467de4331adf09a5f66f3db61e51c3e5..833048dcfd2ab8200438f60953c238cc732ec356 100644 (file)
@@ -4,16 +4,18 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <stdbool.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <cci.h>
-#include <debug.h>
-#include <gicv3.h>
-#include <mmio.h>
+#include <common/debug.h>
+#include <drivers/arm/cci.h>
+#include <drivers/arm/gicv3.h>
+#include <lib/mmio.h>
+#include <lib/psci/psci.h>
+
 #include <plat_imx8.h>
-#include <psci.h>
 #include <sci/sci.h>
-#include <stdbool.h>
 
 #define CORE_PWR_STATE(state) \
        ((state)->pwr_domain_state[MPIDR_AFFLVL0])
index 1cf7511a8278f4a02e43d0f342d71e8b110df0df..1d0bdf9a71de434f0be56c09110d069e9ab419a4 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef PLATFORM_DEF_H
 #define PLATFORM_DEF_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 #define PLATFORM_LINKER_FORMAT         "elf64-littleaarch64"
 #define PLATFORM_LINKER_ARCH           aarch64
index 6384a8566140c17bd1fc4991db9a11fcb4bceb3c..c90794a89395b8cf058dfa532e9f543411f567e3 100644 (file)
@@ -4,25 +4,28 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <cci.h>
-#include <console.h>
+#include <stdbool.h>
+
+#include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
 #include <context.h>
-#include <context_mgmt.h>
-#include <debug.h>
+#include <drivers/arm/cci.h>
+#include <drivers/console.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/mmio.h>
+#include <lib/xlat_tables/xlat_tables.h>
+#include <plat/common/platform.h>
+
 #include <imx8qx_pads.h>
 #include <imx8_iomux.h>
 #include <imx8_lpuart.h>
-#include <mmio.h>
-#include <platform.h>
-#include <platform_def.h>
 #include <plat_imx8.h>
 #include <sci/sci.h>
 #include <sec_rsrc.h>
-#include <stdbool.h>
-#include <xlat_tables.h>
 
 IMPORT_SYM(unsigned long, __COHERENT_RAM_START__, BL31_COHERENT_RAM_START);
 IMPORT_SYM(unsigned long, __COHERENT_RAM_END__, BL31_COHERENT_RAM_END);
index 46ea72486b8b30126c01893b13dcd1d4e548c2cd..94c2e2b1e10d5819d3948ee1f155fa7fda20af26 100644 (file)
@@ -4,15 +4,17 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <stdbool.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <debug.h>
-#include <gicv3.h>
-#include <mmio.h>
+#include <common/debug.h>
+#include <drivers/arm/gicv3.h>
+#include <lib/mmio.h>
+#include <lib/psci/psci.h>
+
 #include <plat_imx8.h>
-#include <psci.h>
 #include <sci/sci.h>
-#include <stdbool.h>
 
 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
index b9fd96c0cecd2d55956486d9f1391ca094b8ca1d..1239340d022429d8544ccf6b3250d7c3e517c760 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef PLATFORM_DEF_H
 #define PLATFORM_DEF_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 #define PLATFORM_LINKER_FORMAT         "elf64-littleaarch64"
 #define PLATFORM_LINKER_ARCH           aarch64
index 9c837204e09bc328fbfca60f38ac8a6388446084..d8c66e3118078263cde4434ec412990a31dda2e9 100644 (file)
@@ -7,13 +7,13 @@
 #ifndef LS_DEF_H
 #define LS_DEF_H
 
-#include <arch.h>
-#include <common_def.h>
 #include <platform_def.h>
-#include <tbbr_img_def.h>
-#include <utils_def.h>
-#include <xlat_tables_defs.h>
 
+#include <arch.h>
+#include <common/tbbr/tbbr_img_def.h>
+#include <lib/xlat_tables/xlat_tables_defs.h>
+#include <lib/utils_def.h>
+#include <plat/common/common_def.h>
 
 /******************************************************************************
  * Definitions common to all ARM standard platforms
index 46b2031e134886aa88f64765019c3787153b40d8..b6130001c4162e22ae57d46b49d4df363f6039d9 100644 (file)
@@ -7,9 +7,10 @@
 #ifndef PLATFORM_DEF_H
 #define PLATFORM_DEF_H
 
-#include <common_def.h>
-#include <tzc400.h>
-#include <utils.h>
+#include <drivers/arm/tzc400.h>
+#include <lib/utils.h>
+#include <plat/common/common_def.h>
+
 #include "ls_def.h"
 
 #define FIRMWARE_WELCOME_STR_LS1043    "Welcome to LS1043 BL1 Phase\n"
index e82a1fb86bb200db2c6883647e433935da9e8622..dfa4725431f31024e8c9670f14167bfac9115630 100644 (file)
@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <cci.h>
-#include <debug.h>
-#include <mmio.h>
+#include <common/debug.h>
+#include <drivers/arm/cci.h>
+#include <lib/mmio.h>
+
 #include "plat_ls.h"
 
 static const int cci_map[] = {
index b529aa50f93515c1fcbd9bc1e50fbb1492e9c2ab..c9db814776240f829c40ebadeb4ac812ab20a03b 100644 (file)
@@ -4,8 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <mmio.h>
-#include <debug.h>
+#include <common/debug.h>
+#include <lib/mmio.h>
+
 #include "plat_ls.h"
 
 void bl2_early_platform_setup2(u_register_t arg0, u_register_t arg1,
index 3473d98831ccbbdc4f8fd13eb7184a4c54ef1db6..6d15c11394c06d6caa5d98ccf6d795b4f1fb9a9d 100644 (file)
@@ -4,8 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <cci.h>
-#include <debug.h>
+#include <common/debug.h>
+#include <drivers/arm/cci.h>
+
 #include "plat_ls.h"
 #include "fsl_csu.h"
 
index e4a2cae4e3e21da6926f2894652d36de0cabd7a2..37077d4d8d212b0367730b48951acc43a343f8f6 100644 (file)
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
-#include <debug.h>
 #include <errno.h>
 #include <stdint.h>
 
+#include <arch_helpers.h>
+#include <common/debug.h>
+
 /*
  * Error handler
  */
index b402e7f772e7abb075ed94f2155d8a4231be5fcf..d6429c326103d842dc3d6411bfff90401d94984a 100644 (file)
@@ -4,17 +4,19 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
-#include <delay_timer.h>
 #include <endian.h>
 #include <errno.h>
-#include <gicv2.h>
-#include <mmio.h>
-#include <platform.h>
-#include <psci.h>
-#include "platform_def.h"
+
+#include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/arm/gicv2.h>
+#include <drivers/delay_timer.h>
+#include <lib/mmio.h>
+#include <lib/psci/psci.h>
+#include <plat/common/platform.h>
 
 #define LS_SCFG_BASE                   0x01570000
 /* register to store warm boot entry, big endian, higher 32bit */
index 50f463b9a0f7036cfa9f73e5a9c4744901df7b54..8a1a4e57d4ad5ba76bd6ad0e67c8bdd560db9aab 100644 (file)
@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <stdint.h>
 
+#include <arch_helpers.h>
+
 #define RANDOM_CANARY_VALUE ((u_register_t) 3288484550995823360ULL)
 
 u_register_t plat_get_stack_protector_canary(void)
index 12d2830fe3f0445c0af03cc48381a5bfbe11d0d4..c9c6a9cc5a5c42c492805525bcc65e7f28761516 100644 (file)
@@ -5,7 +5,9 @@
  */
 
 #include <arch.h>
-#include <cassert.h>
+
+#include <lib/cassert.h>
+
 #include "plat_ls.h"
 #include "platform_def.h"
 
index 3986153a284c76d77aabcff3798b0ca13c628b41..3d8b262d29733f82bcbc5cc7065fc39165c3d507 100644 (file)
@@ -4,10 +4,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <mmio.h>
-#include <debug.h>
 #include <endian.h>
-#include "platform_def.h"
+
+#include <platform_def.h>
+
+#include <common/debug.h>
+#include <lib/mmio.h>
+
 #include "soc.h"
 
 /*
index 795d924828b77ee35290964b4847ba3e7f043910..91a14a445ced300a50b4ebc8e5960d83f06cddf4 100644 (file)
@@ -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
index a96e3901b23e4c019b87f081762a88ed5e7256f2..94107400ad57122c1e7e1c895e00f22f616cd5c6 100644 (file)
@@ -4,11 +4,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
-#include <desc_image_load.h>
-#include <platform.h>
 #include <platform_def.h>
-#include <debug.h>
+
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/desc_image_load.h>
+#include <plat/common/platform.h>
+
 #include <ls_def.h>
 
 /*******************************************************************************
index 7d71f48266e29b1ce60e6f08efaf45411cd0834f..bbddd0b5108533b54eb3510ca6494b409da62804 100644 (file)
@@ -5,7 +5,7 @@
  */
 
 #include <asm_macros.S>
-#include <console.h>
+#include <drivers/console.h>
 #include <platform_def.h>
 
        .weak   plat_my_core_pos
index 94694eef7893da5aba5c5a8ef37ad67318caea6f..b0b1856f03dc9f50cdb7d070971b4955bf73bb0f 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef LS_16550_H
 #define LS_16550_H
 
-#include <console.h>
+#include <drivers/console.h>
 
 /* UART16550 Registers */
 #define UARTTX                 0x0
index 49526ca8b69785122f3a66a063f0846411425e0c..e56670bf0a35c9325a239c41b859c29077692706 100644 (file)
@@ -7,9 +7,10 @@
 #ifndef PLAT_LS_H
 #define PLAT_LS_H
 
-#include <cpu_data.h>
 #include <stdint.h>
 
+#include <lib/el3_runtime/cpu_data.h>
+
 /* BL1 utility functions */
 void ls_bl1_platform_setup(void);
 void ls_bl1_early_platform_setup(void);
index 0642b5ef7d27ce5a3c89eadcfa869caafd6528b1..fb929fef1f0313eb5baa9ced0afe2b3c689fd668 100644 (file)
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
+#include <common/debug.h>
+
 #include "ls_16550.h"
 #include "plat_ls.h"
 #include "../../../bl1/bl1_private.h"
index 4b2dc7245476e1af7d75f09f23a776d48befe97a..192eaec46bf9ccc1758eeb2d3d183fd570a00591 100644 (file)
@@ -5,8 +5,10 @@
  */
 
 #include <assert.h>
-#include <bl_common.h>
-#include <desc_image_load.h>
+
+#include <common/bl_common.h>
+#include <common/desc_image_load.h>
+
 #include "ls_16550.h"
 #include "plat_ls.h"
 #include "ls_def.h"
index 2067b90251b2991a2a240a102d8cbdba96928a9c..03e58076887093b537acdce9c1f58b496be5b8b7 100644 (file)
@@ -5,11 +5,12 @@
  */
 
 #include <assert.h>
-#include <bl_common.h>
-#include <console.h>
-#include <gicv2.h>
-#include <interrupt_props.h>
-#include <mmio.h>
+
+#include <common/bl_common.h>
+#include <common/interrupt_props.h>
+#include <drivers/arm/gicv2.h>
+#include <drivers/console.h>
+#include <lib/mmio.h>
 
 #include "ls_16550.h"
 #include "plat_ls.h"
index afd5927cdb9a4d7cc0872d3d862a9a9d64941eae..3b42909c72ffa92589d2ddb2c3d4b4b2d99372b0 100644 (file)
@@ -3,13 +3,16 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
+
+#include <assert.h>
+
+#include <platform_def.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <xlat_tables_v2.h>
-#include <assert.h>
-#include <debug.h>
-#include <mmio.h>
-#include "platform_def.h"
+#include <common/debug.h>
+#include <lib/mmio.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
 
 const mmap_region_t *plat_ls_get_mmap(void);
 
index 909bec2fa6ac32762aed19701c6a0e205903fbb3..70c01f2b2a9bb998337f95b44b0ded666e704c0d 100644 (file)
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <desc_image_load.h>
+#include <common/desc_image_load.h>
+
 #include "ls_def.h"
 
 /*******************************************************************************
index 7402366371b6c31c6f2931083496762f07931fb6..71c2f45b3f677e474a776924f88eedf9eafc828c 100644 (file)
@@ -3,14 +3,17 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
+
 #include <assert.h>
-#include <debug.h>
-#include <firmware_image_package.h>
-#include <io_driver.h>
-#include <io_fip.h>
-#include <io_memmap.h>
-#include <io_storage.h>
-#include "platform_def.h"
+
+#include <platform_def.h>
+
+#include <common/debug.h>
+#include <drivers/io/io_driver.h>
+#include <drivers/io/io_fip.h>
+#include <drivers/io/io_memmap.h>
+#include <drivers/io/io_storage.h>
+#include <tools_share/firmware_image_package.h>
 
 /* IO devices */
 static const io_dev_connector_t *fip_dev_con;
index 25b5e630517c94cd39855a8661b58113a1eaee53..021890bb6f0bc2a08eb0161a05022d72b4751a4b 100644 (file)
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <mmio.h>
-#include <delay_timer.h>
 #include <arch_helpers.h>
+#include <drivers/delay_timer.h>
+#include <lib/mmio.h>
 
 #define TIMER_BASE_ADDR 0x02B00000
 
index b9f32ac367609bed77e2047b8ccb7f509937d95f..44f3fcd94d785d585340b8ed8c890bb8f3c051df 100644 (file)
@@ -4,10 +4,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
-#include <mmio.h>
 #include <endian.h>
-#include "platform_def.h"
+
+#include <platform_def.h>
+
+#include <common/debug.h>
+#include <lib/mmio.h>
+
 #include "soc_tzasc.h"
 
 int tzc380_set_region(unsigned int tzasc_base, unsigned int region_id,
index e1daaed92abecc4afe8ba822dd769e2e64d90d9e..b84fdbd7e09029ba75c26ded461890d241f4e61d 100644 (file)
@@ -4,11 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <mmio.h>
 #include <endian.h>
-#include <debug.h>
+
+#include <platform_def.h>
+
+#include <common/debug.h>
+#include <lib/mmio.h>
+
 #include "ns_access.h"
-#include "platform_def.h"
 
 static void enable_devices_ns_access(struct csu_ns_dev *ns_dev, uint32_t num)
 {
index a046e2f2ddc250f70ff383e290267afe5036810f..c6073619a72177cfa58aba13cfbed13a693c5fa3 100644 (file)
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
-#include <gicv2.h>
-#include <interrupt_props.h>
+#include <common/debug.h>
+#include <common/interrupt_props.h>
+#include <drivers/arm/gicv2.h>
 
 #include "ls_16550.h"
 #include "plat_ls.h"
index bc48ce8ca345bccf457330fcc7eea891beac6bb8..d6eca5d167f47b434e47f56f89be0e4ec970304c 100644 (file)
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier:    BSD-3-Clause
  * https://spdx.org/licenses
  */
+
 #include <a3700_pm.h>
 #include <plat_marvell.h>
 
index 83db06f9d0fcf49098983737af8ffa2efc9cf3dc..6862a86706194a2ebc86eb13414a8c800714b42d 100644 (file)
@@ -5,10 +5,11 @@
  * https://spdx.org/licenses
  */
 
+#include <lib/mmio.h>
+
 #include <armada_common.h>
 #include <dram_win.h>
 #include <io_addr_dec.h>
-#include <mmio.h>
 #include <marvell_plat_priv.h>
 #include <plat_marvell.h>
 
index e2ac97ffc9b9eebf63ea9308f34cb41a6417f354..a4727d2ea74a7bae846f7a552ab14a2a3f002157 100644 (file)
@@ -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)
 
index 88d1fc2f7e1eb956335ce82af189b06fb18992a9..e8ac5fc08d2f59c4a46764808364a252ebbf6d28 100644 (file)
@@ -5,11 +5,13 @@
  * https://spdx.org/licenses
  */
 
-#include <debug.h>
+#include <common/debug.h>
+#include <common/runtime_svc.h>
+#include <lib/smccc.h>
+
 #include <marvell_plat_priv.h>
 #include <plat_marvell.h>
-#include <runtime_svc.h>
-#include <smccc.h>
+
 #include "comphy/phy-comphy-3700.h"
 
 /* Comphy related FID's */
index fb236d82d69d28c52c3d1b104f12f046bf76621b..694f6d480e63b08a2c18a95f19aefaf08ed4c8a3 100644 (file)
@@ -5,12 +5,14 @@
  * https://spdx.org/licenses
  */
 
+#include <string.h>
+
+#include <lib/mmio.h>
+
 #include <dram_win.h>
 #include <marvell_plat_priv.h>
-#include <mmio.h>
 #include <mvebu.h>
 #include <plat_marvell.h>
-#include <string.h>
 
 /* Armada 3700 has 5 configurable windows */
 #define MV_CPU_WIN_NUM         5
index 6f345f9453f40e5760beb49291c433a2e70ac698..26a013784abe9ee964f9b61923bec8c90a74f67e 100644 (file)
@@ -8,7 +8,8 @@
 #ifndef DRAM_WIN_H
 #define DRAM_WIN_H
 
-#include <bl_common.h>
+#include <common/bl_common.h>
+
 #include <io_addr_dec.h>
 
 void dram_win_map_build(struct dram_win_map *win_map);
index ca2553c99d364b18317a06244904a82006411be6..16865c4d23e0037795c823738b3131e5c81c95dd 100644 (file)
@@ -8,12 +8,13 @@
 #ifndef PLATFORM_DEF_H
 #define PLATFORM_DEF_H
 
-#include <board_marvell_def.h>
-#include <mvebu_def.h>
 #ifndef __ASSEMBLY__
 #include <stdio.h>
 #endif /* __ASSEMBLY__ */
 
+#include <board_marvell_def.h>
+#include <mvebu_def.h>
+
 /*
  * Most platform porting definitions provided by included headers
  */
index f00959433ac88ecfd95aa24ea584141f49723af0..b27633cf25f0e12ed00658c86a021adfdc74e2a2 100644 (file)
@@ -4,9 +4,11 @@
  * SPDX-License-Identifier:    BSD-3-Clause
  * https://spdx.org/licenses
  */
-#include <debug.h>
+
+#include <common/debug.h>
+#include <lib/mmio.h>
+
 #include <io_addr_dec.h>
-#include <mmio.h>
 #include <plat_marvell.h>
 
 #define MVEBU_DEC_WIN_CTRL_REG(base, win, off) (MVEBU_REGS_BASE + (base) + \
index 85a420130f8a6573c4f6032d20fa7ad4914a7e8f..3bf3d96bdbe9f7506e1f85ec9d7beb8cbf1bbd54 100644 (file)
@@ -5,7 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#include <bl_common.h>
+#include <common/bl_common.h>
+
 #include <io_addr_dec.h>
 #include <mvebu_def.h>
 
index dce484168d0ad0bcd42a1a95efdc7f199d77b48b..f8ce6fe29ee91a380a292261b05adbacf7472203 100644 (file)
@@ -5,22 +5,23 @@
  * https://spdx.org/licenses
  */
 
+#include <common/debug.h>
+#ifdef USE_CCI
+#include <drivers/arm/cci.h>
+#endif
+#include <lib/psci/psci.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
+
 #include <a3700_pm.h>
 #include <arch_helpers.h>
 #include <armada_common.h>
-#include <debug.h>
 #include <dram_win.h>
 #include <io_addr_dec.h>
-#include <mmio.h>
 #include <mvebu.h>
 #include <mvebu_def.h>
 #include <marvell_plat_priv.h>
-#include <platform.h>
 #include <plat_marvell.h>
-#include <psci.h>
-#ifdef USE_CCI
-#include <cci.h>
-#endif
 
 /* Warm reset register */
 #define MVEBU_WARM_RESET_REG           (MVEBU_NB_REGS_BASE + 0x840)
index c67025899e04c8def604aabdf67921daa0df8b92..4fca7e3837ea707e0890d0acbfd6ca569aa88b0c 100644 (file)
@@ -6,7 +6,8 @@
  */
 
 #include <arch_helpers.h>
-#include <debug.h>
+#include <common/debug.h>
+
 #include <mv_ddr_if.h>
 #include <plat_marvell.h>
 
index ab1df465ed39ab009263e1cba4d7ce0a37c988f1..aecf6c567227e57dd3d7dfb0f3b6c011ff384a42 100644 (file)
@@ -6,7 +6,8 @@
  */
 
 #include <arch_helpers.h>
-#include <debug.h>
+#include <common/debug.h>
+
 #include <mv_ddr_if.h>
 #include <plat_marvell.h>
 
index a99bf7c21f5f51f0678e5e7fe97539c8840ce306..02f4ffb0a3d6258d013b1a026c0ef2fb33bfe27e 100644 (file)
@@ -6,9 +6,10 @@
  */
 
 #include <arch_helpers.h>
-#include <debug.h>
-#include <mentor/mi2cv.h>
-#include <mmio.h>
+#include <common/debug.h>
+#include <drivers/mentor/mi2cv.h>
+#include <lib/mmio.h>
+
 #include <mv_ddr_if.h>
 #include <mvebu_def.h>
 #include <plat_marvell.h>
index fa222eecfe05f18832a75bf1ebc31d4fd58a905d..25808523c5138fb98f3728319e78e2c34cc07aa3 100644 (file)
@@ -6,9 +6,10 @@
  */
 
 #include <arch_helpers.h>
-#include <debug.h>
-#include <mentor/mi2cv.h>
-#include <mmio.h>
+#include <common/debug.h>
+#include <drivers/mentor/mi2cv.h>
+#include <lib/mmio.h>
+
 #include <mv_ddr_if.h>
 #include <mvebu_def.h>
 #include <plat_marvell.h>
index 384d0f54b946f601b2f4bf5658a98bf1d7ac8ab6..fa4e144c91459e26e22554f24a5ecf1cea798f37 100644 (file)
@@ -5,9 +5,10 @@
  * https://spdx.org/licenses
  */
 
+#include <drivers/delay_timer.h>
+#include <lib/mmio.h>
+
 #include <armada_common.h>
-#include <delay_timer.h>
-#include <mmio.h>
 
 /*
  * If bootrom is currently at BLE there's no need to include the memory
index e350d6ac96751912d27a814a041a97c229468c67..efb05b8e24269168ebcf4f7886b412e4a11fc34a 100644 (file)
@@ -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 \
index 8667331451ed7e9cec477139d33da05effd19dc2..06dc8411576a8a71c03ce64910432e391a874b2e 100644 (file)
@@ -5,12 +5,11 @@
  * https://spdx.org/licenses
  */
 
-#include <platform.h>
 #include <arch_helpers.h>
-#include <mmio.h>
-#include <debug.h>
-#include <cache_llc.h>
-
+#include <common/debug.h>
+#include <drivers/marvell/cache_llc.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
 
 #define CCU_HTC_ASET                   (MVEBU_CCU_BASE(MVEBU_AP0) + 0x264)
 #define MVEBU_IO_AFFINITY              (0xF00)
index 5f24ced23b5a54e79f837057051a2280c41e2e09..ed4ff3af293606c0c282464bb3e46bfdb87afa64 100644 (file)
@@ -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 \
index b04e8b7a666e888cd75f7c408857be50b30b9841..5b3acec2d15a80003aa29c01a8deed6e3b942f3c 100644 (file)
@@ -5,14 +5,17 @@
  * https://spdx.org/licenses
  */
 
+#include <string.h>
+
+#include <platform_def.h>
+
 #include <arch_helpers.h>
-#include <debug.h>
-#include <console.h>
+#include <common/debug.h>
+#include <drivers/console.h>
+
 #include <marvell_plat_priv.h>
 #include <marvell_pm.h>
-#include <platform_def.h>
 #include <plat_marvell.h>
-#include <string.h>
 
 #define BR_FLAG_SILENT         0x1
 #define SKIP_IMAGE_CODE                0xDEADB002
index 4c3e7a9eadabb930b1321d623fb1d1225c132ef9..3f6154e75e090a5d39a2467e0562ea851e26ee78 100644 (file)
@@ -8,14 +8,16 @@
 #ifndef PLATFORM_DEF_H
 #define PLATFORM_DEF_H
 
-#include <board_marvell_def.h>
-#include <gic_common.h>
-#include <interrupt_props.h>
-#include <mvebu_def.h>
 #ifndef __ASSEMBLY__
 #include <stdio.h>
 #endif /* __ASSEMBLY__ */
 
+#include <common/interrupt_props.h>
+#include <drivers/arm/gic_common.h>
+
+#include <board_marvell_def.h>
+#include <mvebu_def.h>
+
 /*
  * Most platform porting definitions provided by included headers
  */
index 973c56dc83919b145f54136731cf12ef4bb43c69..728ee54a05d0545a7997f24e0b4ac4b01372e097 100644 (file)
@@ -5,14 +5,16 @@
  * https://spdx.org/licenses
  */
 
+#include <platform_def.h>
+
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/marvell/ccu.h>
+#include <drivers/marvell/mochi/cp110_setup.h>
+#include <lib/mmio.h>
+
 #include <armada_common.h>
-#include <bl_common.h>
-#include <ccu.h>
-#include <cp110_setup.h>
-#include <debug.h>
 #include <marvell_plat_priv.h> /* timer functionality */
-#include <mmio.h>
-#include <platform_def.h>
 
 #include "mss_scp_bootloader.h"
 
index d1297b07b00c3aa7bb193a6c24fa562a56cd905e..a0705832fbc04c4ba69e64d23aae25c43d7f4676 100644 (file)
@@ -5,11 +5,12 @@
  * https://spdx.org/licenses
  */
 
-#include <debug.h>
-#include <mmio.h>
-#include <psci.h>
 #include <string.h>
 
+#include <common/debug.h>
+#include <lib/psci/psci.h>
+#include <lib/mmio.h>
+
 #include <mss_pm_ipc.h>
 
 /*
index 5d8510279f660ec080f32ff9a9c45c474e2ec7ff..f9521c871e46c8b7f31d9c17b33e2ba6b1a19e34 100644 (file)
@@ -5,7 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#include <mmio.h>
+#include <lib/mmio.h>
+
 #include <plat_marvell.h>
 
 void marvell_bl1_setup_mpps(void)
index 6dfbcbb20d59d143dbfd87e4cbb5ec992557bffb..98b3966ae3df2a444ab690de2b884c063ad6fec9 100644 (file)
@@ -5,17 +5,17 @@
  * https://spdx.org/licenses
  */
 
+#include <common/debug.h>
+#include <drivers/marvell/mci.h>
+#include <drivers/marvell/mochi/ap_setup.h>
+#include <drivers/marvell/mochi/cp110_setup.h>
+#include <lib/mmio.h>
+
 #include <armada_common.h>
-#include <ap_setup.h>
-#include <cp110_setup.h>
-#include <debug.h>
 #include <marvell_plat_priv.h>
 #include <marvell_pm.h>
 #include <mc_trustzone/mc_trustzone.h>
-#include <mmio.h>
-#include <mci.h>
 #include <plat_marvell.h>
-
 #include <mss_ipc_drv.h>
 #include <mss_mem.h>
 
index dbadeb768ba55a54ae4ca8e26fc0e7bf196f0e5e..0590cc0aef96c5135fbeb1e5d58727a20396b2bb 100644 (file)
@@ -5,17 +5,18 @@
  * https://spdx.org/licenses
  */
 
-#include <ap_setup.h>
+#include <common/debug.h>
+#include <drivers/marvell/ap807_clocks_init.h>
+#include <drivers/marvell/aro.h>
+#include <drivers/marvell/ccu.h>
+#include <drivers/marvell/io_win.h>
+#include <drivers/marvell/mochi/ap_setup.h>
+#include <drivers/marvell/mochi/cp110_setup.h>
+
 #include <armada_common.h>
-#include <aro.h>
-#include <ccu.h>
-#include <cp110_setup.h>
-#include <debug.h>
-#include <io_win.h>
 #include <mv_ddr_if.h>
 #include <mvebu_def.h>
 #include <plat_marvell.h>
-#include "ap807_clocks_init.h"
 
 /* Register for skip image use */
 #define SCRATCH_PAD_REG2               0xF06F00A8
index 285441691f59de0d6fbebaf2d6363051d4f2f167..e2575b13c16790617bf8807b445535c69fc4b717 100644 (file)
@@ -5,19 +5,21 @@
  * https://spdx.org/licenses
  */
 
-#include <armada_common.h>
 #include <assert.h>
-#include <bakery_lock.h>
-#include <debug.h>
-#include <delay_timer.h>
-#include <cache_llc.h>
-#include <console.h>
-#include <gicv2.h>
+
+#include <common/debug.h>
+#include <drivers/arm/gicv2.h>
+#include <drivers/console.h>
+#include <drivers/delay_timer.h>
+#include <drivers/marvell/cache_llc.h>
+#include <lib/bakery_lock.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
+
+#include <armada_common.h>
 #include <marvell_pm.h>
-#include <mmio.h>
 #include <mss_pm_ipc.h>
 #include <plat_marvell.h>
-#include <platform.h>
 #include <plat_pm_trace.h>
 
 #define MVEBU_PRIVATE_UID_REG          0x30
index 683e56f6a13a7eca5aa80498e6281a03e1b1b8dc..f589ff31b86ed6a317303e53c394ca0af38beb2f 100644 (file)
@@ -5,9 +5,10 @@
  * https://spdx.org/licenses
  */
 
-#include <mmio.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
+
 #include <mss_mem.h>
-#include <platform.h>
 #include <plat_pm_trace.h>
 
 #ifdef PM_TRACE_ENABLE
index 02fe82097d453effab0aeccc905a5542494035b1..a2fc0d0ab57ef728db0ac2b03629f9abb56d4753 100644 (file)
@@ -5,11 +5,12 @@
  * https://spdx.org/licenses
  */
 
-#include <debug.h>
-#include <delay_timer.h>
-#include <mmio.h>
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <drivers/marvell/thermal.h>
+#include <lib/mmio.h>
+
 #include <mvebu_def.h>
-#include <thermal.h>
 
 #define THERMAL_TIMEOUT                                        1200
 
index 17f8771238934592dceda55ff36c188b219d985e..6a8e11c90f9a4681ba4f4f1e3d0bc8faab4127f3 100644 (file)
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
-#include <desc_image_load.h>
-#include <marvell_def.h>
-#include <platform.h>
 #include <platform_def.h>
 
+#include <common/bl_common.h>
+#include <common/desc_image_load.h>
+#include <marvell_def.h>
+#include <plat/common/platform.h>
 
 /*******************************************************************************
  * Following descriptor provides BL image/ep information that gets used
index abc501a90dc3e1f424a6da1830d34d98cee8fb7f..ea0902cc07ad67621932c2e488917214e4047ef2 100644 (file)
@@ -5,15 +5,17 @@
  * https://spdx.org/licenses
  */
 
-#include <arch.h>
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
-#include <mmio.h>
-#include <plat_marvell.h>
+
 #include <platform_def.h>
-#include <xlat_tables.h>
 
+#include <arch.h>
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <lib/mmio.h>
+#include <lib/xlat_tables/xlat_tables.h>
+
+#include <plat_marvell.h>
 
 /* Weak definitions may be overridden in specific ARM standard platform */
 #pragma weak plat_get_ns_image_entrypoint
index fbd19cb612f25d7e7fdb30738acba1c90da11e32..6f625b95d53ff0fafdf669ef82eb0a24ffa1b1a2 100644 (file)
@@ -7,12 +7,12 @@
 
 #include <asm_macros.S>
 #include <cortex_a72.h>
-#include <marvell_def.h>
-#include <platform_def.h>
 #ifndef PLAT_a3700
-#include <ccu.h>
-#include <cache_llc.h>
+#include <drivers/marvell/ccu.h>
+#include <drivers/marvell/cache_llc.h>
 #endif
+#include <marvell_def.h>
+#include <platform_def.h>
 
        .weak   plat_marvell_calc_core_pos
        .weak   plat_my_core_pos
index c96f00679df800fac4c986004076c640a394038a..8f722102502a77eeb923b07c1efb631132ded575 100644 (file)
@@ -5,15 +5,17 @@
  * https://spdx.org/licenses
  */
 
-#include <bl1.h>
-#include <bl1/bl1_private.h>
-#include <bl_common.h>
-#include <console.h>
-#include <debug.h>
-#include <platform.h>
 #include <platform_def.h>
+
+#include <bl1/bl1.h>
+#include <bl1/bl1_private.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/arm/sp805.h>
+#include <drivers/console.h>
+#include <plat/common/platform.h>
+
 #include <plat_marvell.h>
-#include <sp805.h>
 
 /* Weak definitions may be overridden in specific Marvell standard platform */
 #pragma weak bl1_early_platform_setup
index 883336f0da76cc9604a65910c3157a65d27c3538..3c1c39112b88900a708585e643fe0be589bc28de 100644 (file)
@@ -5,17 +5,20 @@
  * https://spdx.org/licenses
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <console.h>
-#include <debug.h>
-#include <desc_image_load.h>
-#include <marvell_def.h>
+#include <string.h>
+
 #include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/desc_image_load.h>
+#include <drivers/console.h>
+#include <lib/utils.h>
+
+#include <marvell_def.h>
 #include <plat_marvell.h>
-#include <string.h>
-#include <utils.h>
 
 /* Data structure which holds the extents of the trusted SRAM for BL2 */
 static meminfo_t bl2_tzram_layout __aligned(CACHE_WRITEBACK_GRANULE);
index 3b1a6f130cf247ccef6b5cdd02c1555fe71cb165..802c01383bde07e524aeebe698570cf791e55a44 100644 (file)
@@ -5,18 +5,19 @@
  * https://spdx.org/licenses
  */
 
-#include <arch.h>
 #include <assert.h>
-#include <console.h>
-#include <debug.h>
-#include <marvell_def.h>
-#include <marvell_plat_priv.h>
-#include <plat_marvell.h>
-#include <platform.h>
 
+#include <arch.h>
+#include <common/debug.h>
 #ifdef USE_CCI
-#include <cci.h>
+#include <drivers/arm/cci.h>
 #endif
+#include <drivers/console.h>
+#include <plat/common/platform.h>
+
+#include <marvell_def.h>
+#include <marvell_plat_priv.h>
+#include <plat_marvell.h>
 
 /*
  * The next 3 constants identify the extents of the code, RO data region and the
index 2df480243eb21d28dca602285bf9183436cecd94..80351aedcd6e08edff7247445182ff0cfdabda95 100644 (file)
@@ -5,7 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#include <cci.h>
+#include <drivers/arm/cci.h>
+
 #include <plat_marvell.h>
 
 static const int cci_map[] = {
index eba106dc1a59fcd02fd0bea95da62bbfe5b56138..22c5eb3afd98a967253f632a40b8f6c00f6693f8 100644 (file)
@@ -4,18 +4,21 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 #include <assert.h>
-#include <console.h>
-#include <debug.h>
-#include <plat_marvell.h>
+
 #include <platform_def.h>
 
+#include <common/debug.h>
+#include <drivers/console.h>
+
+#include <plat_marvell.h>
+
 #ifdef PLAT_a3700
-#include <a3700_console.h>
+#include <drivers/marvell/uart/a3700_console.h>
 
 static console_a3700_t marvell_boot_console;
 static console_a3700_t marvell_runtime_console;
 #else
-#include <uart_16550.h>
+#include <drivers/ti/uart/uart_16550.h>
 
 static console_16550_t marvell_boot_console;
 static console_16550_t marvell_runtime_console;
index 68bff998b1ec063333786d104a4f3f7b2d89e2fc..734099652fd7b3a285fe5317f12ed00bc8484fae 100644 (file)
@@ -5,10 +5,12 @@
  * https://spdx.org/licenses
  */
 
-#include <debug.h>
 #include <platform_def.h>
+
+#include <common/debug.h>
+#include <lib/mmio.h>
+
 #include <ddr_info.h>
-#include <mmio.h>
 
 #define DRAM_CH0_MMAP_LOW_REG(iface, cs, base) \
        (base + DRAM_CH0_MMAP_LOW_OFFSET + (iface) * 0x10000 + (cs) * 0x8)
index 19e1ec0f53b3c9f95d1756d897987923148f14bd..2505c9f84d9c340a32c0c133be00506540ff2a9e 100644 (file)
@@ -5,15 +5,17 @@
  * https://spdx.org/licenses
  */
 
-#include <bakery_lock.h>
-#include <debug.h>
-#include <gicv2.h>
-#include <interrupt_mgmt.h>
-#include <mmio.h>
-#include <plat_marvell.h>
-#include <platform.h>
 #include <platform_def.h>
 
+#include <bl31/interrupt_mgmt.h>
+#include <common/debug.h>
+#include <drivers/arm/gicv2.h>
+#include <lib/bakery_lock.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
+
+#include <plat_marvell.h>
+
 /*
  * The following functions are defined as weak to allow a platform to override
  * the way the GICv2 driver is initialised and used.
index 7cfefaf5cf39126bf7d209973118da5c96e77a20..0bd5545708f72eb4774287510be41bebf4a9a0f5 100644 (file)
@@ -5,13 +5,15 @@
  * https://spdx.org/licenses
  */
 
-#include <debug.h>
-#include <gicv3.h>
-#include <interrupt_props.h>
+#include <platform_def.h>
+
+#include <common/debug.h>
+#include <common/interrupt_props.h>
+#include <drivers/arm/gicv3.h>
+#include <plat/common/platform.h>
+
 #include <marvell_def.h>
 #include <plat_marvell.h>
-#include <platform.h>
-#include <platform_def.h>
 
 /******************************************************************************
  * The following functions are defined as weak to allow a platform to override
index d69b1b1214ead3edbe0ed0991625be3a75541bd9..be16b089891bc1064135f67983b7453bc7ae73e0 100644 (file)
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
-#include <desc_image_load.h>
-#include <platform.h>
 #include <platform_def.h>
 
+#include <common/bl_common.h>
+#include <common/desc_image_load.h>
+#include <plat/common/platform.h>
+
 /*******************************************************************************
  * This function flushes the data structures so that they are visible
  * in memory for the next BL image.
index cb9ece24758718de7b678ca1cb1459d5ca7e958d..065f95688507346d28e36e937ea1a5dd8b712e58 100644 (file)
@@ -6,16 +6,18 @@
  */
 
 #include <assert.h>
-#include <bl_common.h>         /* For ARRAY_SIZE */
-#include <debug.h>
-#include <firmware_image_package.h>
-#include <io_driver.h>
-#include <io_fip.h>
-#include <io_memmap.h>
-#include <io_storage.h>
-#include <platform_def.h>
 #include <string.h>
 
+#include <platform_def.h>
+
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/io/io_driver.h>
+#include <drivers/io/io_fip.h>
+#include <drivers/io/io_memmap.h>
+#include <drivers/io/io_storage.h>
+#include <tools_share/firmware_image_package.h>
+
 /* IO devices */
 static const io_dev_connector_t *fip_dev_con;
 static uintptr_t fip_dev_handle;
index 2a75790093fe5c9267696cf770e150b57ebf435b..3c675b296bc992a6a1c05b7bc223642d79da0315 100644 (file)
@@ -5,9 +5,11 @@
  * https://spdx.org/licenses
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <psci.h>
+
+#include <arch_helpers.h>
+#include <lib/psci/psci.h>
+
 #include <marvell_pm.h>
 
 /* Standard ARM platforms are expected to export plat_arm_psci_pm_ops */
index bc4b621132b7285d266fc095a47a589e33b538ba..df211059b9d692b19f964fa0ff4c7bfd9212ffed 100644 (file)
@@ -5,13 +5,15 @@
  * https://spdx.org/licenses
  */
 
-#include <ap_setup.h>
-#include <cache_llc.h>
-#include <debug.h>
+#include <common/debug.h>
+#include <common/runtime_svc.h>
+#include <drivers/marvell/cache_llc.h>
+#include <drivers/marvell/mochi/ap_setup.h>
+#include <lib/smccc.h>
+
 #include <marvell_plat_priv.h>
 #include <plat_marvell.h>
-#include <runtime_svc.h>
-#include <smccc.h>
+
 #include "comphy/phy-comphy-cp110.h"
 
 /* #define DEBUG_COMPHY */
index 731c315bf07d4ea8672c14a0bf83dc9942c0c472..70ccfa5accc4ec1080ce808e4384bbadb54498cf 100644 (file)
@@ -5,11 +5,13 @@
  * https://spdx.org/licenses
  */
 
-#include <plat_marvell.h>
-#include <debug.h>
 #include <string.h>
+
+#include <common/debug.h>
+#include <lib/mmio.h>
+
+#include <plat_marvell.h>
 #include <mss_ipc_drv.h>
-#include <mmio.h>
 
 #define IPC_MSG_BASE_MASK              MVEBU_REGS_BASE_MASK
 
index 7bb15d3f28143c37feecca70f18ec51395429a08..bcb4b2d8f9adbbe5179356a99078a7602fa1e425 100644 (file)
@@ -8,7 +8,7 @@
 #ifndef MSS_IPC_DRV_H
 #define MSS_IPC_DRV_H
 
-#include <psci.h>
+#include <lib/psci/psci.h>
 
 #define MV_PM_FW_IPC_VERSION_MAGIC     (0xCA530000) /* Do NOT change */
 /* Increament for each version */
index 334fcfc614f75548fdee1e0bddbb83463df98599..7e442c61549000b523d95e8745e0435e29bae55b 100644 (file)
@@ -6,11 +6,13 @@
  */
 
 #include <assert.h>
-#include <debug.h>
-#include <mmio.h>
-#include <arch_helpers.h> /* for cache maintanance operations */
+
 #include <platform_def.h>
-#include <delay_timer.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <lib/mmio.h>
 
 #include <plat_pm_trace.h>
 #include <mss_scp_bootloader.h>
index dfc77c7fef6d66b4df3aee7656fa225cf51a2fd5..253975264b79bdba471189a9123c32d4a8918780 100644 (file)
@@ -6,7 +6,8 @@
  */
 
 #include <arch_helpers.h>
-#include <delay_timer.h>
+#include <drivers/delay_timer.h>
+
 #include <mvebu_def.h>
 
 #define SYS_COUNTER_FREQ_IN_MHZ        (COUNTER_FREQUENCY/1000000)
index 18bda515a460a99d2c1c2a1a58f33be0a69fe3dc..27ee6aa7bb605e6e6a7688500b30298d75acb36f 100644 (file)
@@ -3,15 +3,18 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
+
+#include <assert.h>
+#include <stdint.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <assert.h>
-#include <debug.h>
+#include <common/debug.h>
+#include <common/runtime_svc.h>
+#include <plat/common/platform.h>
+#include <tools_share/uuid.h>
+
 #include <oem_svc.h>
-#include <platform.h>
-#include <runtime_svc.h>
-#include <stdint.h>
-#include <uuid.h>
 
 /* OEM Service UUID */
 DEFINE_SVC_UUID2(oem_svc_uid,
index bff83c7343cf440f13b2f34de19b3f4da09dc690..a07a2981ac97e634595ac0faaeb1c8bb77babe8d 100644 (file)
@@ -3,17 +3,19 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
+
 #include <arch_helpers.h>
-#include <bl_common.h>
-#include <cci.h>
-#include <console.h>
-#include <debug.h>
-#include <mmio.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/arm/cci.h>
+#include <drivers/console.h>
+#include <lib/mmio.h>
+#include <lib/xlat_tables/xlat_tables.h>
+#include <plat/common/platform.h>
+
 #include <mtk_plat_common.h>
 #include <mtk_sip_svc.h>
 #include <plat_private.h>
-#include <platform.h>
-#include <xlat_tables.h>
 
 struct atf_arg_t gteearg;
 
index ff8e8c03741a6e464fa5bf2a7922b0e9c843cd3d..55f4c516ebf3f60d0c0093ea44de80f65cf26c73 100644 (file)
@@ -6,10 +6,11 @@
 #ifndef MTK_PLAT_COMMON_H
 #define MTK_PLAT_COMMON_H
 
-#include <bl_common.h>
-#include <param_header.h>
 #include <stdint.h>
 
+#include <common/bl_common.h>
+#include <common/param_header.h>
+
 /*******************************************************************************
  * Function and variable prototypes
  ******************************************************************************/
index 71eddca310fcae6ef4755031fe32b7baeed7a07c..dab0d4541c8876a6a956db29646d48b84dbb0293 100644 (file)
@@ -3,15 +3,18 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
+
 #include <assert.h>
-#include <console.h>
-#include <debug.h>
-#include <mmio.h>
+
+#include <common/debug.h>
+#include <common/runtime_svc.h>
+#include <drivers/console.h>
+#include <lib/mmio.h>
+#include <tools_share/uuid.h>
+
 #include <mtk_plat_common.h>
 #include <mtk_sip_svc.h>
 #include <plat_sip_calls.h>
-#include <runtime_svc.h>
-#include <uuid.h>
 
 /* Mediatek SiP Service UUID */
 DEFINE_SVC_UUID2(mtk_sip_svc_uid,
index 8f391df7e86acb80ffbda501df6802d0a7c4fc0b..6ec7a1ab4abc134301b115592eb5dc0b80293b3f 100644 (file)
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <lib/xlat_tables/xlat_tables_defs.h>
 #include <platform_def.h>
-#include <xlat_tables_defs.h>
 
 OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT)
 OUTPUT_ARCH(PLATFORM_LINKER_ARCH)
index 8df7dada899b857864b221eed5434e490780d017..2051fe7630efc0d26aa63d73cf19fbf3543572e0 100644 (file)
@@ -3,25 +3,28 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include <arch_helpers.h>
+
 #include <assert.h>
-#include <bl_common.h>
-#include <cci.h>
-#include <common_def.h>
-#include <console.h>
-#include <context_mgmt.h>
-#include <debug.h>
-#include <generic_delay_timer.h>
+#include <string.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/arm/cci.h>
+#include <drivers/console.h>
+#include <drivers/generic_delay_timer.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/mmio.h>
+#include <lib/utils_def.h>
+#include <lib/xlat_tables/xlat_tables.h>
+#include <plat/common/common_def.h>
+#include <plat/common/platform.h>
+
 #include <mcucfg.h>
-#include <mmio.h>
 #include <mt_cpuxgpt.h>
 #include <mtk_plat_common.h>
 #include <mtk_sip_svc.h>
 #include <plat_private.h>
-#include <platform.h>
-#include <string.h>
-#include <utils_def.h>
-#include <xlat_tables.h>
 
 /*******************************************************************************
  * Declarations of linker defined symbols which will help us find the layout
index b357972e418623302b01efd4c0a6073a66bdf24a..3696f8eec73a4bd1c7363c99b5d85b547c13dc89 100644 (file)
@@ -4,13 +4,15 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <stdint.h>
 
 #include <arch_helpers.h>
-#include <debug.h>
-#include <mmio.h>
+#include <common/debug.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
+
 #include <mt_cpuxgpt.h>
-#include <platform.h>
-#include <stdint.h>
+
 #define CPUXGPT_BASE   0x10200000
 #define INDEX_BASE             (CPUXGPT_BASE+0x0674)
 #define CTL_BASE               (CPUXGPT_BASE+0x0670)
index 7f6a786555190a8cf1c45992995cc88450bcd4d3..21c539462e4ec1d4d8b9489be772f8a4affd732d 100644 (file)
@@ -7,9 +7,10 @@
 #ifndef MCUCFG_H
 #define MCUCFG_H
 
-#include <platform_def.h>
 #include <stdint.h>
 
+#include <platform_def.h>
+
 struct mt6795_mcucfg_regs {
        uint32_t mp0_ca7l_cache_config;
        struct {
index 7485647f3f518b10fecd4765d66858367280c4a2..d198fdc11f30046abb0c6e53415bdec00437a6c0 100644 (file)
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <cci.h>
+#include <drivers/arm/cci.h>
 #include <platform_def.h>
 
 .section .rodata.gic_reg_name, "aS"
index 10baa23d98519bd817c83378d9d8c8aa8c2277d4..f7450ca1ce865dd46bdbbaa42984a7b1274ea6a4 100644 (file)
@@ -8,7 +8,8 @@
 #define PLAT_PRIVATE_H
 
 #include <stdint.h>
-#include <xlat_tables.h>
+
+#include <lib/xlat_tables/xlat_tables.h>
 
 void plat_configure_mmu_el3(unsigned long total_base,
                                        unsigned long total_size,
index 0110e192dc8a57a3dea88780224a30dd5a0e7365..301610d4cf1137977259ef64611643af0310c29c 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef PLATFORM_DEF_H
 #define PLATFORM_DEF_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 #define PLAT_PRIMARY_CPU  0x0
 
index 9df286771f6161fc477da2c2653d4c861df69ed0..965b6534884c63e662c90d444a4ac91b40ec192b 100644 (file)
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
-#include <delay_timer.h>
 #include <platform_def.h>
 
+#include <arch_helpers.h>
+#include <drivers/delay_timer.h>
+
 static uint32_t plat_get_timer_value(void)
 {
        /*
index 11282fc546970118590a391eaa12605fa418ec81..20cb26d5ee205ca78355d16f1f0dabb0a4dc9a16 100644 (file)
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <gicv2.h>
-#include <interrupt_props.h>
-#include <platform.h>
 #include <platform_def.h>
 
+#include <common/interrupt_props.h>
+#include <drivers/arm/gicv2.h>
+#include <plat/common/platform.h>
+
 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),
index d0506645f47457b8d093a8881002fd8ea148a396..0dfbd1846ac672efe575046169eb5442266c588d 100644 (file)
@@ -4,19 +4,22 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bakery_lock.h>
-#include <cci.h>
-#include <console.h>
-#include <debug.h>
 #include <errno.h>
+
+#include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/arm/cci.h>
+#include <drivers/console.h>
+#include <lib/bakery_lock.h>
+#include <lib/mmio.h>
+#include <lib/psci/psci.h>
+
 #include <mcucfg.h>
-#include <mmio.h>
 #include <plat_private.h>
-#include <platform_def.h>
 #include <power_tracer.h>
-#include <psci.h>
 #include <scu.h>
 
 struct core_context {
index 0a0cf8d78b4c164077c66ac3a3e31a30fb88af51..7425d2667ecca1738e32e6310172e5e7533bcf45 100644 (file)
@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
 #include <platform_def.h>
-#include <psci.h>
+
+#include <arch.h>
+#include <lib/psci/psci.h>
 
 unsigned int plat_get_aff_count(unsigned int aff_lvl, unsigned long mpidr)
 {
index 56e22402f99929939c2683d33e2a7bfd1cb02e0c..64d086d800de66fbaa803edde777934d772167ab 100644 (file)
@@ -5,7 +5,8 @@
  */
 
 #include <arch.h>
-#include <debug.h>
+#include <common/debug.h>
+
 #include <power_tracer.h>
 
 #define trace_log(...)  INFO("psci: " __VA_ARGS__)
index 9add19e5af7737d77d03e6c9bcd06762aa3a4a19..3b7452787df0616f1213931065b1002c8e74479d 100644 (file)
@@ -5,8 +5,9 @@
  */
 
 #include <arch.h>
+#include <lib/mmio.h>
+
 #include <mcucfg.h>
-#include <mmio.h>
 
 void disable_scu(unsigned long mpidr)
 {
index a7619926a1afc90f53ba9dc34d7f2c8b4a09f69e..a2dbe3e479c61ffe228ed7206204d59ec11b7d18 100644 (file)
@@ -3,14 +3,17 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
+
+#include <platform_def.h>
+
 #include <arch_helpers.h>
-#include <bl_common.h>
-#include <cci.h>
-#include <debug.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/arm/cci.h>
+#include <lib/utils.h>
+#include <lib/xlat_tables/xlat_tables.h>
+
 #include <mt8173_def.h>
-#include <platform_def.h>
-#include <utils.h>
-#include <xlat_tables.h>
 
 static const int cci_map[] = {
        PLAT_MT_CCI_CLUSTER0_SL_IFACE_IX,
index c27de8295d73894c8fe81649a2e2671de4ee1e6b..bd384a1d418f7ee9160a2f2c7fa9ee83caaa31a9 100644 (file)
@@ -3,19 +3,22 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
+
 #include <assert.h>
-#include <bl_common.h>
-#include <common_def.h>
-#include <console.h>
-#include <debug.h>
-#include <generic_delay_timer.h>
+
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/console.h>
+#include <drivers/generic_delay_timer.h>
+#include <lib/mmio.h>
+#include <plat/common/common_def.h>
+#include <plat/common/platform.h>
+
 #include <mcucfg.h>
-#include <mmio.h>
 #include <mtcmos.h>
 #include <mtk_plat_common.h>
 #include <plat_arm.h>
 #include <plat_private.h>
-#include <platform.h>
 #include <spm.h>
 
 static entry_point_info_t bl32_ep_info;
index 74d7702ad360a12adae462c36330b1efb8542414..bfb3082ba0ac5fd531be80afae6269d8b91f43c5 100644 (file)
@@ -3,12 +3,15 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
+
+#include <assert.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <assert.h>
-#include <debug.h>
-#include <delay_timer.h>
-#include <mmio.h>
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <lib/mmio.h>
+
 #include <mt8173_def.h>
 #include <mtk_sip_svc.h>
 
index 25f25097ed913ee919a97d3ee41f4dd70397bd5e..452ac224c643819ccd258bbe73aaf1684913c539 100644 (file)
@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
-#include <delay_timer.h>
-#include <mmio.h>
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <lib/mmio.h>
+
 #include <mt8173_def.h>
 #include <mtcmos.h>
 #include <spm.h>
index c64fdf7c2133f7fdc9e166d9323e09cd0282e0f3..8120d99626517b96da156d86922efc3f90c3e01a 100644 (file)
@@ -3,9 +3,11 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include <debug.h>
-#include <delay_timer.h>
-#include <mmio.h>
+
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <lib/mmio.h>
+
 #include <mt8173_def.h>
 #include <pmic_wrap_init.h>
 
index 22fed9e640cfb38743b0a9bbb88f00787a2bae5f..2b9033ed918df020b3a31412b300ae65bc75a4ca 100644 (file)
@@ -3,9 +3,12 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
+
 #include <assert.h>
-#include <debug.h>
-#include <delay_timer.h>
+
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+
 #include <mt8173_def.h>
 #include <pmic_wrap_init.h>
 #include <rtc.h>
index eb40072b9b9cd835f5e9c2e0ada317a05fa3faf4..1caab3bdf19552cb71be2db8304b3c8ce7f492b7 100644 (file)
@@ -3,9 +3,11 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include <bakery_lock.h>
-#include <debug.h>
-#include <mmio.h>
+
+#include <common/debug.h>
+#include <lib/bakery_lock.h>
+#include <lib/mmio.h>
+
 #include <mt8173_def.h>
 #include <spm.h>
 #include <spm_suspend.h>
index 6d275d04385d287d647caf64c230c705e75e8a95..b2b9adafe3a5f5c0a6ef5c2c4ffa3beda550cac3 100644 (file)
@@ -3,10 +3,12 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
+
 #include <arch.h>
-#include <mmio.h>
+#include <lib/mmio.h>
 #include <mt8173_def.h>
-#include <platform.h>
+#include <plat/common/platform.h>
+
 #include <spm.h>
 #include <spm_hotplug.h>
 #include <spm_mcdi.h>
index de8d73a517d00b21ad62dbaa7d0941d62878aa13..ea5f2bb14b3b96e44d335d2dbadd786828c652f6 100644 (file)
@@ -3,12 +3,15 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
+
+#include <platform_def.h>
+
 #include <arch.h>
-#include <debug.h>
-#include <mmio.h>
+#include <common/debug.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
+
 #include <mt8173_def.h>
-#include <platform.h>
-#include <platform_def.h>
 #include <spm.h>
 #include <spm_hotplug.h>
 #include <spm_mcdi.h>
index 8c79b3b4e7fd1d7eb2fbb8d74b518c948af0a94b..5021695db1e9bf6c528664a695d4e8b7d3797a8a 100644 (file)
@@ -3,10 +3,12 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include <bakery_lock.h>
-#include <debug.h>
-#include <delay_timer.h>
-#include <mmio.h>
+
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <lib/bakery_lock.h>
+#include <lib/mmio.h>
+
 #include <mt8173_def.h>
 #include <spm.h>
 #include <spm_suspend.h>
index 8a30d8aefa6cca7aa03b0b01a759edfa59c4aa3a..174a24d88f9376c8174de238ce869ff816e2e869 100644 (file)
@@ -3,9 +3,11 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
+
 #include <arch_helpers.h>
+#include <lib/mmio.h>
+
 #include <mcucfg.h>
-#include <mmio.h>
 #include <mt8173_def.h>
 #include <mt_cpuxgpt.h>
 
index 49d7c3e180a5788affda77b8ae0be59f51b75fc1..dedbc082fd8f959d0adefc25cb611f820a1e1042 100644 (file)
@@ -6,9 +6,10 @@
 #ifndef MCUCFG_H
 #define MCUCFG_H
 
-#include <mt8173_def.h>
 #include <stdint.h>
 
+#include <mt8173_def.h>
+
 struct mt8173_mcucfg_regs {
        uint32_t mp0_ca7l_cache_config;
        struct {
index 5eb4913f1f12f519e268b7450b17de99bb9f88d4..ac9fb160d4d42facb9386ff2c10921d070424f25 100644 (file)
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <cci.h>
-#include <gic_common.h>
-#include <gicv2.h>
+#include <drivers/arm/cci.h>
+#include <drivers/arm/gic_common.h>
+#include <drivers/arm/gicv2.h>
 #include <mt8173_def.h>
 
 .section .rodata.gic_reg_name, "aS"
index 9bbed3c3b9c17b856969fc490af566998193f3d5..205e26387032d00ab78c60a3e02171d8038bcccf 100644 (file)
@@ -7,9 +7,10 @@
 #ifndef PLATFORM_DEF_H
 #define PLATFORM_DEF_H
 
-#include <gic_common.h>
-#include <interrupt_props.h>
-#include <utils_def.h>
+#include <common/interrupt_props.h>
+#include <drivers/arm/gic_common.h>
+#include <lib/utils_def.h>
+
 #include "mt8173_def.h"
 
 /*******************************************************************************
index 16e36afbf7afe6f515b6640c05a868655ea64dd2..80b9010c1a628fc2fcf68a07790248b66ed8024e 100644 (file)
@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
+#include <common/bl_common.h>
+#include <lib/utils.h>
+
 #include <mt8173_def.h>
-#include <utils.h>
 
 const unsigned int mt_irq_sec_array[] = {
        MT_IRQ_SEC_SGI_0,
index b19d3f307c6e31f9ec804046eb4db72ea4f3d45a..9673d2c28924230c1277e9fb0cb34fa6496fec02 100644 (file)
@@ -4,22 +4,24 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bakery_lock.h>
-#include <cci.h>
-#include <console.h>
-#include <debug.h>
 #include <errno.h>
-#include <gicv2.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/arm/cci.h>
+#include <drivers/arm/gicv2.h>
+#include <drivers/console.h>
+#include <lib/bakery_lock.h>
+#include <lib/mmio.h>
+#include <lib/psci/psci.h>
+
 #include <mcucfg.h>
-#include <mmio.h>
 #include <mt8173_def.h>
 #include <mt_cpuxgpt.h> /* generic_timer_backup() */
 #include <plat_arm.h>
 #include <plat_private.h>
 #include <power_tracer.h>
-#include <psci.h>
 #include <rtc.h>
 #include <scu.h>
 #include <spm_hotplug.h>
index 1d51cb592ffcf366d87ce5d2003bf580deb3d68e..102feb22a65ec0e589acb70e5cfdea7d9835835f 100644 (file)
@@ -3,13 +3,15 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
+
+#include <common/debug.h>
+#include <common/runtime_svc.h>
+#include <lib/mmio.h>
+
 #include <crypt.h>
-#include <debug.h>
-#include <mmio.h>
 #include <mtcmos.h>
 #include <mtk_sip_svc.h>
 #include <plat_sip_calls.h>
-#include <runtime_svc.h>
 
 /* Authorized secure register list */
 enum {
index d70fea52299ed01fbc72f0d7116f1da0e5a6d074..23e7d2d3b66727a87b579718190c49b39b5aeb3f 100644 (file)
@@ -3,10 +3,11 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include <arch.h>
+
 #include <platform_def.h>
-#include <psci.h>
 
+#include <arch.h>
+#include <lib/psci/psci.h>
 
 const unsigned char mtk_power_domain_tree_desc[] = {
        /* No of root nodes */
index 787dad13fabec780e812d1cd38897ec8440f67d6..d1fcf9f2690dd185dfe1e632021bb3cb2076242e 100644 (file)
@@ -5,7 +5,8 @@
  */
 
 #include <arch.h>
-#include <debug.h>
+#include <common/debug.h>
+
 #include <power_tracer.h>
 
 #define trace_log(...)  INFO("psci: " __VA_ARGS__)
index 4daa9e5ff958f4bab870efd152488d1b297626f5..2524d72e121f8693909a2620493b3abe4cd4b6f9 100644 (file)
@@ -5,8 +5,9 @@
  */
 
 #include <arch.h>
+#include <lib/mmio.h>
+
 #include <mcucfg.h>
-#include <mmio.h>
 
 void disable_scu(unsigned long mpidr)
 {
index 3e176f9a0c61e383f4e43203ef7522033627de85..b867a58469e2d297e5238455016be4a1d089fc8a 100644 (file)
@@ -5,12 +5,14 @@
  */
 
 #include <assert.h>
-#include <bl_common.h>
-#include <gicv2.h>
-#include <interrupt_props.h>
-#include <platform.h>
+
 #include <platform_def.h>
-#include <xlat_mmu_helpers.h>
+
+#include <common/bl_common.h>
+#include <common/interrupt_props.h>
+#include <drivers/arm/gicv2.h>
+#include <lib/xlat_tables/xlat_mmu_helpers.h>
+#include <plat/common/platform.h>
 
 #include "gxbb_private.h"
 
index 349d02f9e082dee518ed5394247f80564cd5ccfd..0ca15e8606ed811933842e49d33f32e9525b1a22 100644 (file)
@@ -5,15 +5,17 @@
  */
 
 #include <assert.h>
-#include <bl_common.h>
-#include <debug.h>
-#include <ep_info.h>
-#include <interrupt_mgmt.h>
-#include <meson_console.h>
-#include <mmio.h>
-#include <platform_def.h>
 #include <stdint.h>
-#include <xlat_tables_v2.h>
+
+#include <platform_def.h>
+
+#include <bl31/interrupt_mgmt.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/ep_info.h>
+#include <drivers/meson/meson_console.h>
+#include <lib/mmio.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
 
 /*******************************************************************************
  * Platform memory map regions
index 0c73ac0820facaf21613f26597d7894feede0b4c..3e27097c34db9b20573e8b251d5030f91b7a25cb 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef GXBB_DEF_H
 #define GXBB_DEF_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 /*******************************************************************************
  * System oscillator
index 78b895c52332efdce45aadab7f74cc3b0f7ab423..903ef411c057b8af6a5a384ea01bfd8f076ec942 100644 (file)
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bakery_lock.h>
-#include <mmio.h>
 #include <platform_def.h>
 
+#include <lib/bakery_lock.h>
+#include <lib/mmio.h>
+
 static DEFINE_BAKERY_LOCK(mhu_lock);
 
 void mhu_secure_message_start(void)
index 930b5e168852b9028921bf3fdaf00f68be400104..59b9436fe3e05f50208f49c5e2158a03a8edae68 100644 (file)
@@ -4,16 +4,18 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <console.h>
-#include <debug.h>
 #include <errno.h>
-#include <gicv2.h>
-#include <mmio.h>
-#include <platform.h>
+
 #include <platform_def.h>
-#include <psci.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/arm/gicv2.h>
+#include <drivers/console.h>
+#include <lib/mmio.h>
+#include <lib/psci/psci.h>
+#include <plat/common/platform.h>
 
 #include "gxbb_private.h"
 
index 2390bcad8a187cbcf9f923f0480579987470a5f1..83eeda29d48dd1c33f89cd6405c3492e50626444 100644 (file)
@@ -5,11 +5,13 @@
  */
 
 #include <assert.h>
-#include <mmio.h>
-#include <platform.h>
-#include <platform_def.h>
 #include <string.h>
 
+#include <platform_def.h>
+
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
+
 #include "gxbb_private.h"
 
 #define SIZE_SHIFT     20
index 82ed44935769fa6d26dd03fea86ad4fb92324b4b..63c7dba15b090e80cf2ae9a8964406208776f412 100644 (file)
@@ -4,12 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
-#include <mmio.h>
-#include <platform_def.h>
-#include <runtime_svc.h>
 #include <stdint.h>
 
+#include <platform_def.h>
+
+#include <common/debug.h>
+#include <common/runtime_svc.h>
+#include <lib/mmio.h>
+
 #include "gxbb_private.h"
 
 /*******************************************************************************
index 49bb2dcad7e0dc4228f2b9166d7e2652d42ebb37..eec2d34d4d277f9d3265c4061227c6cd45d551c8 100644 (file)
@@ -4,10 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
-#include <platform_def.h>
 #include <stdint.h>
 
+#include <platform_def.h>
+
+#include <arch.h>
+
 #include "gxbb_private.h"
 
 /* The power domain tree descriptor */
index 948b5f98f87b9417fe11def638d1016acec7926a..c721c21b68455d0626822fb4f1dbedc8d417f50a 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef PLAT_MACROS_S
 #define PLAT_MACROS_S
 
-#include <gicv2.h>
+#include <drivers/arm/gicv2.h>
 #include <platform_def.h>
 
 .section .rodata.gic_reg_name, "aS"
index a85637fe26059e9a0cafbea9ec92a7601e989809..da4aedde85da71301c6d75d190efe88837647628 100644 (file)
@@ -8,7 +8,7 @@
 #define PLATFORM_DEF_H
 
 #include <arch.h>
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 #include "../gxbb_def.h"
 
index 68ff4007519119b70719cbdc9e4709ba0b70aac5..9669bf9590e58391690539c6a5123475385a1d9c 100644 (file)
@@ -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         \
index 2d827da81a0cef5d47791744bea138bd15330394..775ad30f6b9d59b2515069ddf3938975c4a7aebb 100644 (file)
@@ -4,13 +4,15 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
+
+#include <arch_helpers.h>
 #include <cortex_a53.h>
-#include <debug.h>
-#include <delay_timer.h>
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <lib/mmio.h>
+
 #include <flowctrl.h>
-#include <mmio.h>
 #include <pmc.h>
 #include <tegra_def.h>
 
index 9944e729dd58814373aab3474be60a10e6a8d527..58f49d05f6e8f483241efe0c99f27a86e170c806 100644 (file)
@@ -4,16 +4,18 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
+#include <string.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <lib/mmio.h>
+#include <lib/utils.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
+
 #include <memctrl.h>
 #include <memctrl_v1.h>
-#include <mmio.h>
-#include <string.h>
 #include <tegra_def.h>
-#include <utils.h>
-#include <xlat_tables_v2.h>
 
 /* Video Memory base and size (live values) */
 static uint64_t video_mem_base;
index 92fdadcfae67ae0f7f82a44a7eb44a951b7148a0..55b9152232ca1258cdc5fc50a89e297069084658 100644 (file)
@@ -4,20 +4,22 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <debug.h>
+#include <string.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <lib/mmio.h>
+#include <lib/utils.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
+
 #include <mce.h>
 #include <memctrl.h>
 #include <memctrl_v2.h>
-#include <mmio.h>
 #include <smmu.h>
-#include <string.h>
 #include <tegra_def.h>
 #include <tegra_platform.h>
-#include <utils.h>
-#include <xlat_tables_v2.h>
 
 /* Video Memory base and size (live values) */
 static uint64_t video_mem_base;
index d8827e101fe38bf4634366f41e9b7a15a6209554..b9ff5116d67ae99fe4ffedf9ac34043cebf7dd60 100644 (file)
@@ -4,10 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
-#include <mmio.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <lib/mmio.h>
+
 #include <pmc.h>
 #include <tegra_def.h>
 
index 4b9edb622f8276c58f613e5536d5e82267eb4fbd..610f32f1eb56561312bec02b5b2c467ff46758f7 100644 (file)
@@ -5,11 +5,14 @@
  */
 
 #include <assert.h>
-#include <bl_common.h>
-#include <debug.h>
+#include <string.h>
+
 #include <platform_def.h>
+
+#include <common/bl_common.h>
+#include <common/debug.h>
+
 #include <smmu.h>
-#include <string.h>
 #include <tegra_private.h>
 
 extern void memcpy16(void *dest, const void *src, unsigned int length);
index 9410d44fc9c786f9986d6756bf1a3533e6313b88..b49665027165dfabb52e34cb3bbe6ed89786a071 100644 (file)
@@ -4,27 +4,30 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <assert.h>
+#include <errno.h>
+#include <stddef.h>
+#include <string.h>
+
+#include <platform_def.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <assert.h>
-#include <bl31.h>
-#include <bl_common.h>
-#include <console.h>
+#include <bl31/bl31.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
 #include <cortex_a53.h>
 #include <cortex_a57.h>
-#include <debug.h>
 #include <denver.h>
-#include <errno.h>
+#include <drivers/console.h>
+#include <lib/mmio.h>
+#include <lib/utils.h>
+#include <lib/utils_def.h>
+#include <plat/common/platform.h>
+
 #include <memctrl.h>
-#include <mmio.h>
-#include <platform.h>
-#include <platform_def.h>
-#include <stddef.h>
-#include <string.h>
 #include <tegra_def.h>
 #include <tegra_private.h>
-#include <utils.h>
-#include <utils_def.h>
 
 /* length of Trusty's input parameters (in bytes) */
 #define TRUSTY_PARAMS_LEN_BYTES        (4096*2)
index 3bd2b0e2454d6de3a3410cbfc0bc4275b2d8ff55..63dcf410c2eb14b1b437e8665b1181b50d7012e5 100644 (file)
@@ -4,8 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <delay_timer.h>
-#include <mmio.h>
+#include <drivers/delay_timer.h>
+#include <lib/mmio.h>
+
 #include <tegra_def.h>
 #include <tegra_private.h>
 
index bc6d30546eca38da66fa65ef00b9f3a5112a28dd..0b663cef429fd67e5abb0eba73bcad5f061d7fa4 100644 (file)
@@ -4,16 +4,18 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bakery_lock.h>
-#include <bl_common.h>
+
+#include <arch_helpers.h>
+#include <bl31/interrupt_mgmt.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
 #include <context.h>
-#include <context_mgmt.h>
-#include <debug.h>
 #include <denver.h>
-#include <interrupt_mgmt.h>
-#include <platform.h>
+#include <lib/bakery_lock.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <plat/common/platform.h>
+
 #include <tegra_def.h>
 #include <tegra_private.h>
 
index c42c5ec3f764cc34efb8754852579635f9ec05b7..293df8d4f3673eb67b6831b24b1008b63cd78e1a 100644 (file)
@@ -5,12 +5,15 @@
  */
 
 #include <assert.h>
-#include <bl_common.h>
-#include <gicv2.h>
+
 #include <platform_def.h>
+
+#include <common/bl_common.h>
+#include <drivers/arm/gicv2.h>
+#include <lib/utils.h>
+
 #include <tegra_private.h>
 #include <tegra_def.h>
-#include <utils.h>
 
 /******************************************************************************
  * Tegra common helper to setup the GICv2 driver data.
index 6a906ae0b7eaf5472edc16984e5be8fd68d2becf..10edf9229c423c14aa7ac0808019488765639cd8 100644 (file)
@@ -5,7 +5,8 @@
  */
 
 #include <arch_helpers.h>
-#include <mmio.h>
+#include <lib/mmio.h>
+
 #include <tegra_def.h>
 #include <tegra_platform.h>
 #include <tegra_private.h>
index 86021ba94ff422371626209b38db400faa78849f..8361ddd3d35602fcefadd3e07c78f67a75b464a8 100644 (file)
@@ -4,19 +4,22 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <console.h>
+
+#include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
 #include <context.h>
-#include <context_mgmt.h>
-#include <debug.h>
+#include <drivers/console.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/mmio.h>
+#include <lib/psci/psci.h>
+#include <plat/common/platform.h>
+
 #include <memctrl.h>
-#include <mmio.h>
-#include <platform.h>
-#include <platform_def.h>
 #include <pmc.h>
-#include <psci.h>
 #include <tegra_def.h>
 #include <tegra_private.h>
 
index a8184531f7b7c68b4670a7ef357cc782daef8fcf..e50d12faf89de0165c7a858fd73bdf4c0e9dbfdc 100644 (file)
@@ -4,15 +4,17 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <debug.h>
 #include <errno.h>
+
+#include <arch.h>
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/runtime_svc.h>
+#include <lib/mmio.h>
+
 #include <memctrl.h>
-#include <mmio.h>
-#include <runtime_svc.h>
 #include <tegra_platform.h>
 #include <tegra_private.h>
 
index 0593053512780e007801ac109f9816789618ac86..893f28ff24137b6f5b8a434ab54301b485f6ecc3 100644 (file)
@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
 #include <platform_def.h>
-#include <psci.h>
+
+#include <arch.h>
+#include <lib/psci/psci.h>
 
 extern const unsigned char tegra_power_domain_tree_desc[];
 #pragma weak plat_core_pos_by_mpidr
index d604c970d2d78a95910cf94f910182d74ce97976..31221810b15a9283e9b33d3a3a6ca24ac0290043 100644 (file)
@@ -7,7 +7,8 @@
 #ifndef FLOWCTRL_H
 #define FLOWCTRL_H
 
-#include <mmio.h>
+#include <lib/mmio.h>
+
 #include <tegra_def.h>
 
 #define FLOWCTRL_HALT_CPU0_EVENTS      0x0U
index 81408702f9922ba4c487cedef866e5f5758f9526..4470b6b8b61e9a52e13c00c0846cd9c0dd284e82 100644 (file)
@@ -7,7 +7,8 @@
 #ifndef MCE_H
 #define MCE_H
 
-#include <mmio.h>
+#include <lib/mmio.h>
+
 #include <tegra_def.h>
 
 /*******************************************************************************
index 2553a1fd5f0615043c64dc45d580fc86270de188..8e9f198e861af73ef1e10b89e4b75469a98923f6 100644 (file)
@@ -7,7 +7,8 @@
 #ifndef MEMCTRL_V1_H
 #define MEMCTRL_V1_H
 
-#include <mmio.h>
+#include <lib/mmio.h>
+
 #include <tegra_def.h>
 
 /* SMMU registers */
index 9ae43023206ea9eb4ddc397256fefc645e38ccd8..957ff54c12fe9a28c69537c1135af7bd8db09620 100644 (file)
@@ -407,7 +407,7 @@ typedef struct tegra_mc_settings {
 
 #ifndef __ASSEMBLY__
 
-#include <mmio.h>
+#include <lib/mmio.h>
 
 static inline uint32_t tegra_mc_read_32(uint32_t off)
 {
index 14c92254471a7fa6814068e8a7b66b24ac83d1b1..a01a4b64f338581b22a6ab3736ecbb129b5213a2 100644 (file)
@@ -7,9 +7,10 @@
 #ifndef PMC_H
 #define PMC_H
 
-#include <mmio.h>
+#include <lib/mmio.h>
+#include <lib/utils_def.h>
+
 #include <tegra_def.h>
-#include <utils_def.h>
 
 #define PMC_CONFIG                             U(0x0)
 #define PMC_PWRGATE_STATUS                     U(0x38)
index 974aa3500431339b5a8e7bc5e2f2a262bd3270f2..9582a67ed376c799723e08797c245357d85406ee 100644 (file)
@@ -7,8 +7,9 @@
 #ifndef SMMU_H
 #define SMMU_H
 
+#include <lib/mmio.h>
+
 #include <memctrl_v2.h>
-#include <mmio.h>
 #include <tegra_def.h>
 
 /*******************************************************************************
index 2fe316d2b2def91f10963d17e02fa13635627815..6106b40a72e9f52117b5abfd41089359e4d55e97 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef __TEGRA_GIC_H__
 #define __TEGRA_GIC_H__
 
-#include <interrupt_props.h>
+#include <common/interrupt_props.h>
 
 /*******************************************************************************
  * Per-CPU struct describing FIQ state to be stored
index 6a507d481a1a7c287351be369531cad736f1f85d..d10dc262aa91fa15066c3125c84a7c4f24f7d01c 100644 (file)
@@ -8,9 +8,10 @@
 #define PLATFORM_DEF_H
 
 #include <arch.h>
-#include <common_def.h>
+#include <lib/utils_def.h>
+#include <plat/common/common_def.h>
+
 #include <tegra_def.h>
-#include <utils_def.h>
 
 /*******************************************************************************
  * Generic platform constants
index 277f91b639479feba3d6da358a4517b88160f5bd..1f58caabb5206beb841bc390055e44a601a9e4e1 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef TEGRA_DEF_H
 #define TEGRA_DEF_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 /*******************************************************************************
  * This value is used by the PSCI implementation during the `SYSTEM_SUSPEND`
index 79aff59700c7d35a79832e1ffa83bb3d0cdcd645..3abba55165ec75921e7706e19952b24b54b6083d 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef TEGRA_DEF_H
 #define TEGRA_DEF_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 /*******************************************************************************
  * MCE apertures used by the ARI interface
index 5d86224f9ff33c34bca2d2b06963df585dbf891c..14cdfd59dbdbe09610f66b9683b34bae91777c66 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef TEGRA_DEF_H
 #define TEGRA_DEF_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 /*******************************************************************************
  * Power down state IDs
index 7ca32c3d3b95b8f53b66db660dfada38533ea8b1..93223cc2413a09e80b4d12090f30514d7514821b 100644 (file)
@@ -7,12 +7,14 @@
 #ifndef TEGRA_PRIVATE_H
 #define TEGRA_PRIVATE_H
 
+#include <platform_def.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <platform_def.h>
-#include <psci.h>
+#include <lib/psci/psci.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
+
 #include <tegra_gic.h>
-#include <xlat_tables_v2.h>
 
 /*******************************************************************************
  * Tegra DRAM memory base address
index 1cffb741a9e16d7ecbd5ddcd1ba5fb434a801f3a..7226120b0494f09abcc4974512072fa10a5c91c6 100644 (file)
@@ -4,17 +4,20 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <assert.h>
+
+#include <platform_def.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <assert.h>
-#include <debug.h>
-#include <delay_timer.h>
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
 #include <denver.h>
+#include <lib/mmio.h>
+#include <lib/psci/psci.h>
+
 #include <flowctrl.h>
-#include <mmio.h>
-#include <platform_def.h>
 #include <pmc.h>
-#include <psci.h>
 #include <tegra_def.h>
 #include <tegra_private.h>
 
index d5ca30c976f47fbd0b45b566e350445ec8a998c3..f46ad3bb6f504bf1433cf16b5f72ae44ea6b7323 100644 (file)
@@ -4,14 +4,16 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
 #include <denver.h>
-#include <mmio.h>
-#include <platform.h>
+#include <lib/mmio.h>
+#include <lib/psci/psci.h>
+#include <plat/common/platform.h>
+
 #include <pmc.h>
-#include <psci.h>
 #include <tegra_def.h>
 
 #define SB_CSR                         0x0
index 4cbb3cc85324c50a27e3876bc5cfae8e95bcac72..f72b73ed52d4f2c495ca033b47b59dcbc175de4c 100644 (file)
@@ -5,10 +5,11 @@
  */
 
 #include <arch_helpers.h>
-#include <bl_common.h>
+#include <common/bl_common.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
+
 #include <tegra_def.h>
 #include <tegra_private.h>
-#include <xlat_tables_v2.h>
 
 /*******************************************************************************
  * The Tegra power domain tree has a single system level power domain i.e. a
index adc1c7125bea1ce789f7c5a7ca48e27410b53173..02dd1cd56ca670d2c4202f568d880da5b4c312fd 100644 (file)
@@ -4,13 +4,15 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <context_mgmt.h>
-#include <debug.h>
 #include <errno.h>
+
+#include <arch.h>
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <lib/el3_runtime/context_mgmt.h>
+
 #include <tegra_private.h>
 
 #define NS_SWITCH_AARCH32      1
index 27baab6d6483a03e98cffa73e69b96e38ea42c6e..96a5525a6be5bc7a9dd4dd20b1ab219fa4d98dc0 100644 (file)
@@ -7,7 +7,8 @@
 #ifndef MCE_PRIVATE_H
 #define MCE_PRIVATE_H
 
-#include <mmio.h>
+#include <lib/mmio.h>
+
 #include <tegra_def.h>
 
 /*******************************************************************************
index 7126c3ba7ef65804104fc879fbb8f9bc8d0dbf7e..1429a6158dfb82a49e04e6803007a8805ba492e6 100644 (file)
@@ -4,16 +4,18 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <assert.h>
+#include <errno.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <assert.h>
-#include <debug.h>
-#include <delay_timer.h>
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
 #include <denver.h>
-#include <errno.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
+
 #include <mce_private.h>
-#include <mmio.h>
-#include <platform.h>
 #include <t18x_ari.h>
 
 /*******************************************************************************
index 712519f9fc36156994aa17e75b39d427f0a761ec..828ad3cbdd1757702fb19f3c3ab38e603454e735 100644 (file)
@@ -4,19 +4,21 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <assert.h>
+#include <errno.h>
+#include <string.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <assert.h>
-#include <bl_common.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
 #include <context.h>
-#include <context_mgmt.h>
-#include <debug.h>
 #include <denver.h>
-#include <errno.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/mmio.h>
+
 #include <mce.h>
 #include <mce_private.h>
-#include <mmio.h>
-#include <string.h>
 #include <t18x_ari.h>
 #include <tegra_def.h>
 #include <tegra_platform.h>
index 857cfbb53d7750bf063d1f7148523c63ea2e2c08..1ac3710daf5a348e4c732e21048dc4fbdaf30f13 100644 (file)
@@ -4,13 +4,15 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <errno.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <debug.h>
+#include <common/debug.h>
 #include <denver.h>
-#include <errno.h>
+#include <lib/mmio.h>
+
 #include <mce_private.h>
-#include <mmio.h>
 #include <t18x_ari.h>
 
 int32_t nvg_enter_cstate(uint32_t ari_base, uint32_t state, uint32_t wake_time)
index 957ecf18745a1a9b9ed16704f0156d0749bffe33..38dffb22e5967d860f69a6479d990510baf5f8f1 100644 (file)
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
+#include <common/bl_common.h>
+
 #include <memctrl_v2.h>
 
 /*******************************************************************************
index 6eb18fa6c7b1161261d4ec7f467ca4334b7a2a25..fb94bcedf97bdd3231e2918a26ed73eff36e8861 100644 (file)
@@ -4,19 +4,21 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <assert.h>
+#include <string.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <assert.h>
-#include <bl_common.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
 #include <context.h>
-#include <context_mgmt.h>
-#include <debug.h>
 #include <denver.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/psci/psci.h>
+#include <plat/common/platform.h>
+
 #include <mce.h>
-#include <platform.h>
-#include <psci.h>
 #include <smmu.h>
-#include <string.h>
 #include <t18x_ari.h>
 #include <tegra_private.h>
 
index ebc2b46a2b4250c8fbdb3cfec3e691c0524ef9d1..4485e2733a034a2c1eeb94ecf7d7c325ef17e276 100644 (file)
@@ -4,11 +4,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <string.h>
+
 #include <arch_helpers.h>
-#include <debug.h>
+#include <common/debug.h>
+#include <lib/mmio.h>
+
 #include <mce.h>
-#include <mmio.h>
-#include <string.h>
 #include <tegra_def.h>
 #include <tegra_private.h>
 
index da5530f0b7844f0c3fa6e3e17de1a0fdb07c26d9..15dbd163907db3f12c54baddbebb6afb55460b30 100644 (file)
@@ -4,26 +4,28 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl31.h>
-#include <bl_common.h>
-#include <console.h>
+
+#include <arch_helpers.h>
+#include <bl31/bl31.h>
+#include <bl31/interrupt_mgmt.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/interrupt_props.h>
 #include <context.h>
-#include <context_mgmt.h>
 #include <cortex_a57.h>
-#include <debug.h>
 #include <denver.h>
-#include <gic_common.h>
-#include <gicv2.h>
-#include <interrupt_mgmt.h>
-#include <interrupt_props.h>
+#include <drivers/arm/gic_common.h>
+#include <drivers/arm/gicv2.h>
+#include <drivers/console.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
+#include <plat/common/platform.h>
+
 #include <mce.h>
-#include <platform.h>
 #include <tegra_def.h>
 #include <tegra_platform.h>
 #include <tegra_private.h>
-#include <xlat_tables_v2.h>
 
 DEFINE_RENAME_SYSREG_RW_FUNCS(l2ctlr_el1, CORTEX_A57_L2CTLR_EL1)
 extern uint64_t tegra_enable_l2_ecc_parity_prot;
index dfe1c7dbd754c2393261018a708c8338faef035b..bf98fcf648b6c3599513bfa47406379b1b33b43a 100644 (file)
@@ -4,17 +4,19 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <assert.h>
+#include <errno.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <assert.h>
-#include <bl_common.h>
-#include <context_mgmt.h>
-#include <debug.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/runtime_svc.h>
 #include <denver.h>
-#include <errno.h>
+#include <lib/el3_runtime/context_mgmt.h>
+
 #include <mce.h>
 #include <memctrl.h>
-#include <runtime_svc.h>
 #include <t18x_ari.h>
 #include <tegra_private.h>
 
index ead4c22b8bd6efb1fd64ae217df6e08ab45c58b8..19e065c18dfd81fdcd678871aa37a2f3633d7670 100644 (file)
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
+#include <common/bl_common.h>
+
 #include <smmu.h>
 #include <tegra_def.h>
 
index 6a17c3328b59c6477bfc6f7eb5feccb2f01c343f..69ca798f9c8dbebf6e066ead2d8435f61cfc74c7 100644 (file)
@@ -6,8 +6,8 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <common_def.h>
 #include <memctrl_v2.h>
+#include <plat/common/common_def.h>
 #include <tegra_def.h>
 
 #define TEGRA186_SMMU_CTX_SIZE         0x420
index f77746cae1ed320b27312005a3f76759595336ac..27786d3ca66c5415c92b30c8ce5331b14781a5e7 100644 (file)
@@ -4,16 +4,19 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
-#include <delay_timer.h>
-#include <flowctrl.h>
-#include <mmio.h>
-#include <platform.h>
+
 #include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <lib/mmio.h>
+#include <lib/psci/psci.h>
+#include <plat/common/platform.h>
+
+#include <flowctrl.h>
 #include <pmc.h>
-#include <psci.h>
 #include <tegra_def.h>
 #include <tegra_private.h>
 
index ecb258b918cc48854d00af2c208d057073b38939..e0242cf0ee5032bcf01cd34bfc020854ee899c6a 100644 (file)
@@ -4,8 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
-#include <mmio.h>
+#include <common/debug.h>
+#include <lib/mmio.h>
+
 #include <pmc.h>
 #include <tegra_def.h>
 
index c3fc7b4a580825824268e848cd9e0d2688e93fd7..c7f7165c0a7fdcdc29ef4cfb66f31ee1da25c818 100644 (file)
@@ -5,11 +5,12 @@
  */
 
 #include <arch_helpers.h>
-#include <bl_common.h>
-#include <console.h>
+#include <common/bl_common.h>
+#include <drivers/console.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
+
 #include <tegra_def.h>
 #include <tegra_private.h>
-#include <xlat_tables_v2.h>
 
 /*******************************************************************************
  * The Tegra power domain tree has a single system level power domain i.e. a
index c544d9f446d62dc1f24158feaa50768db2a77a07..b1cd368cb593d22363657820ff5c00063bf3d27c 100644 (file)
@@ -3,11 +3,15 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include <console.h>
-#include <debug.h>
-#include <libfdt.h>
-#include <psci.h>
+
 #include <string.h>
+
+#include <libfdt.h>
+
+#include <common/debug.h>
+#include <drivers/console.h>
+#include <lib/psci/psci.h>
+
 #include "qemu_private.h"
 
 static int append_psci_compatible(void *fdt, int offs, const char *str)
index c2289bc560b195b1cb3cfcc3a690ca61c5b527f0..2dd10ad8328e67bfe537e5182feb22806ae95d47 100644 (file)
@@ -8,9 +8,9 @@
 #define PLATFORM_DEF_H
 
 #include <arch.h>
-#include <common_def.h>
-#include <tbbr_img_def.h>
-#include <utils_def.h>
+#include <common/tbbr/tbbr_img_def.h>
+#include <lib/utils_def.h>
+#include <plat/common/common_def.h>
 
 /* Special value used to verify platform parameters from BL2 to BL3-1 */
 #define QEMU_BL31_PLAT_PARAM_VAL       0x0f1e2d3c4b5a6978ULL
index fd53495a642095dd0505d65840fbaad5a71dc44b..b5821517a04fd2206b11dd56a81757e2fb3b3e88 100644 (file)
@@ -4,11 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
+
 #include <platform_def.h>
+
+#include <arch.h>
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+
 #include "qemu_private.h"
 
 /* Data structure which holds the extents of the trusted SRAM for BL1*/
index 9965cfdb57e2ddc675aebb71081a37128257b168..ba6a4db2dddb3b30e044c8fe148fb89b2b82469b 100644 (file)
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <desc_image_load.h>
-#include <platform.h>
 #include <platform_def.h>
 
+#include <common/desc_image_load.h>
+#include <plat/common/platform.h>
+
 /*******************************************************************************
  * Following descriptor provides BL image/ep information that gets used
  * by BL2 to load the images and also subset of this information is
index b3c39605f70b08c395f8bf5fba35df662405d171..b8ca895f8c58f4acdb5e446f6579bd110310e509 100644 (file)
@@ -3,17 +3,22 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include <arch_helpers.h>
+
 #include <assert.h>
-#include <bl_common.h>
-#include <debug.h>
-#include <desc_image_load.h>
-#include <optee_utils.h>
+#include <string.h>
+
 #include <libfdt.h>
-#include <platform.h>
+
 #include <platform_def.h>
-#include <string.h>
-#include <utils.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/desc_image_load.h>
+#include <lib/optee_utils.h>
+#include <lib/utils.h>
+#include <plat/common/platform.h>
+
 #include "qemu_private.h"
 
 
index 7542674ec5e9bfbec7bfbbbd2faef4c140bb0958..97468114a1ae5eb075eb577028096c31386b4117 100644 (file)
@@ -5,11 +5,14 @@
  */
 
 #include <assert.h>
-#include <bl_common.h>
-#include <gic_common.h>
-#include <gicv2.h>
+
 #include <platform_def.h>
-#include <platform.h>
+
+#include <common/bl_common.h>
+#include <drivers/arm/gic_common.h>
+#include <drivers/arm/gicv2.h>
+#include <plat/common/platform.h>
+
 #include "qemu_private.h"
 
 /*
index 43a3f7012b48ee9f6f6c835f9c2fcc2573dec7bf..aee8321cb151d420771f8b324732e60b9502390b 100644 (file)
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
-#include <bl_common.h>
 #include <platform_def.h>
-#include <xlat_tables_v2.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
 
 #include "qemu_private.h"
 
index a90c9a18ccccd76371d62cd64d4bc19668892edf..759f997dcbb71f253e4eea8ce69e8cedeeacdf04 100644 (file)
@@ -3,10 +3,12 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include <console.h>
-#include <pl011.h>
+
 #include <platform_def.h>
 
+#include <drivers/console.h>
+#include <drivers/arm/pl011.h>
+
 #if MULTI_CONSOLE_API
 static console_pl011_t console;
 #endif /* MULTI_CONSOLE_API */
index 8e246477c9b5128378eed91fe39ca2997f4aadfc..9970d1de71c805f7efa4f616f69857ee45d81468 100644 (file)
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <desc_image_load.h>
+#include <common/desc_image_load.h>
 
 /*******************************************************************************
  * This function is a wrapper of a common function which flushes the data
index 1918f21d5d9011377438288a91dc421a0c73ea30..0e81cd1997b3739a153cf12d87a02c53d45f33a7 100644 (file)
@@ -5,18 +5,20 @@
  */
 
 #include <assert.h>
-#include <bl_common.h>         /* For ARRAY_SIZE */
-#include <debug.h>
-#include <firmware_image_package.h>
-#include <io_driver.h>
-#include <io_fip.h>
-#include <io_memmap.h>
-#include <io_semihosting.h>
-#include <io_storage.h>
-#include <platform_def.h>
-#include <semihosting.h>
 #include <string.h>
 
+#include <platform_def.h>
+
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/io/io_driver.h>
+#include <drivers/io/io_fip.h>
+#include <drivers/io/io_memmap.h>
+#include <drivers/io/io_semihosting.h>
+#include <drivers/io/io_storage.h>
+#include <lib/semihosting.h>
+#include <tools_share/firmware_image_package.h>
+
 /* Semihosting filenames */
 #define BL2_IMAGE_NAME                 "bl2.bin"
 #define BL31_IMAGE_NAME                        "bl31.bin"
index c184f1c35d9c47f8312f62881d44f5af1fcfebdc..3249d6e27752bb3471f1c29e78989c6755ee2ac1 100644 (file)
@@ -4,13 +4,15 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
-#include <gicv2.h>
-#include <platform.h>
+
 #include <platform_def.h>
-#include <psci.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/arm/gicv2.h>
+#include <lib/psci/psci.h>
+#include <plat/common/platform.h>
 
 /*
  * The secure entry point to be used on warm reset.
index 5b19828336dfcdeb6e6f74116115d9f7f6bc1729..c226158ad64c7de6da2b34a7324dc86926f65006 100644 (file)
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
-#include <platform.h>
 #include <stdint.h>
 
+#include <arch_helpers.h>
+#include <plat/common/platform.h>
+
 #define RANDOM_CANARY_VALUE ((u_register_t) 3288484550995823360ULL)
 
 u_register_t plat_get_stack_protector_canary(void)
index 7d8fed209a299dba3fb8644ed1ca7b1f44f8a19d..17666b99e7221e569fefd14712dd08d86391ce46 100644 (file)
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <platform.h>
+#include <plat/common/platform.h>
 
 extern char qemu_rotpk_hash[], qemu_rotpk_hash_end[];
 
index 5b98079bc7cf789c09286b39a1c64b43e21d1f7c..88decdf4dd6170007546a965e0f70bd9a82500cc 100644 (file)
@@ -4,18 +4,21 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <console.h>
-#include <debug.h>
-#include <gic_common.h>
-#include <gicv2.h>
-#include <mmio.h>
-#include <platform.h>
-#include <platform_def.h>
 #include <string.h>
-#include <xlat_tables.h>
+
+#include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/arm/gic_common.h>
+#include <drivers/arm/gicv2.h>
+#include <drivers/console.h>
+#include <lib/mmio.h>
+#include <lib/xlat_tables/xlat_tables.h>
+#include <plat/common/platform.h>
+
 #include "../qemu_private.h"
 
 #if RESET_TO_SP_MIN
index 569d15f8ca1e1ac465edb644715154dedf5cc8bc..6352706e9f6c75afaab77d881b35b744f63aee3e 100644 (file)
@@ -4,9 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
-#include <platform_def.h>
 #include <stdint.h>
+
+#include <platform_def.h>
+
+#include <arch.h>
+
 #include "qemu_private.h"
 
 /* The power domain tree descriptor */
index 7e1ff8ddacc794ea865a0cb80a25a17b883067c9..d40f8f2e3d8ff5a79209ad631a9c5e1c29649853 100644 (file)
@@ -7,10 +7,11 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <bl_common.h>
+#include <common/bl_common.h>
+#include <common/runtime_svc.h>
 #include <cortex_a57.h>
 #include <platform_def.h>
-#include <runtime_svc.h>
+
 #include "rcar_def.h"
 
        .globl  plat_get_my_entrypoint
index f344b3752b1569ec03aefc4c21c5ed0fbf2227a9..647a562ce1878169110ba2762776057793b32119 100644 (file)
@@ -5,17 +5,19 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <platform_def.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <bl_common.h>
-#include <debug.h>
-#include <gicv2.h>
-#include <gic_common.h>
-#include <interrupt_props.h>
-#include <mmio.h>
-#include <platform.h>
-#include <platform_def.h>
-#include <xlat_tables_v2.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/interrupt_props.h>
+#include <drivers/arm/gicv2.h>
+#include <drivers/arm/gic_common.h>
+#include <lib/mmio.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
+#include <plat/common/platform.h>
+
 #include "rcar_def.h"
 #include "rcar_private.h"
 #include "rcar_version.h"
index 880ad360450176d2057dd71e834859784afc19c1..883fc9a16ba3bf30452036888a412217fa8e1a51 100644 (file)
@@ -4,8 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
-#include <mmio.h>
+#include <common/debug.h>
+#include <lib/mmio.h>
+
 #include "rcar_def.h"
 #include "cpg_registers.h"
 #include "rcar_private.h"
index c50c603767e63980e4a74ef45374fc53afef11c5..2346017d83fd6977c1dfa23ac3dff545f579c71e 100644 (file)
@@ -5,11 +5,12 @@
  */
 
 #include <arch_helpers.h>
-#include <bl_common.h>
-#include <debug.h>
-#include <gicv2.h>
-#include <mmio.h>
-#include <runtime_svc.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/runtime_svc.h>
+#include <drivers/arm/gicv2.h>
+#include <lib/mmio.h>
+
 #include "rcar_def.h"
 
 #define SWDT_ERROR_ID  (1024U)
index 3dc9eff59f15e422d7e4706b8e2c631e829fc346..3b124c789377c6ea75adf013076f30e140600742 100644 (file)
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
-#include <desc_image_load.h>
-#include <platform.h>
 #include <platform_def.h>
-#include <xlat_tables_defs.h>
+
+#include <common/bl_common.h>
+#include <common/desc_image_load.h>
+#include <lib/xlat_tables/xlat_tables_defs.h>
+#include <plat/common/platform.h>
 
 #if (RCAR_BL33_EXECUTION_EL != 0) && (RCAR_BL33_EXECUTION_EL != 1)
 #error
index 7567813ca69b8fbd95433f64b1f43597d01c6d9c..77a5ed1706c0ef7017abee81a6052c13a69a9435 100644 (file)
@@ -4,18 +4,21 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <desc_image_load.h>
-#include <arch_helpers.h>
-#include <bl_common.h>
-#include <bl1.h>
-#include <console.h>
-#include <debug.h>
+#include <string.h>
+
 #include <libfdt.h>
-#include <mmio.h>
-#include <platform.h>
+
 #include <platform_def.h>
-#include <string.h>
-#include <xlat_tables_defs.h>
+
+#include <arch_helpers.h>
+#include <bl1/bl1.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/desc_image_load.h>
+#include <drivers/console.h>
+#include <lib/mmio.h>
+#include <lib/xlat_tables/xlat_tables_defs.h>
+#include <plat/common/platform.h>
 
 #include "avs_driver.h"
 #include "boot_init_dram.h"
index c0d49debc711b601ea6de5a239d268a03f2bc7aa..cbda1eb38139219ca4ff309fe4480a991d110b16 100644 (file)
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <lib/mmio.h>
+#include <lib/utils_def.h>
+
 #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);
index 00f6d100bed8ba34bd695a1e82ba66346b1d6be9..6f31417ba5174b9b36e637d1df5840dec5987abf 100644 (file)
@@ -5,16 +5,18 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <stddef.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <bl_common.h>
-#include <bl31.h>
-#include <cci.h>
-#include <console.h>
-#include <mmio.h>
-#include <platform.h>
-#include <stddef.h>
-#include <debug.h>
+#include <bl31/bl31.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/arm/cci.h>
+#include <drivers/console.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
+
 #include "pwrc.h"
 #include "rcar_def.h"
 #include "rcar_private.h"
index 0461141fd55d51a4c860ba558cba486185e35ffc..7aef324c4fb8eb8127b9a32a0dcbb9d81edf2cb7 100644 (file)
@@ -6,8 +6,8 @@
 #ifndef RCAR_PLAT_LD_S
 #define RCAR_PLAT_LD_S
 
+#include <lib/xlat_tables/xlat_tables_defs.h>
 #include <platform_def.h>
-#include <xlat_tables_defs.h>
 
 MEMORY {
     SRAM (rwx): ORIGIN = BL31_SRAM_BASE, LENGTH = DEVICE_SRAM_SIZE
index eb109287c82d6353e74d224199d2bf508a3a9f8d..927cd39e8ff67c3e5394e37d76042721b2a46a7e 100644 (file)
@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <cci.h>
-#include <gic_common.h>
-#include <gicv2.h>
+#include <drivers/arm/cci.h>
+#include <drivers/arm/gic_common.h>
+#include <drivers/arm/gicv2.h>
+
 #include "rcar_def.h"
 
 .section .rodata.gic_reg_name, "aS"
index fa6e474c44604b3efc3fa05bd3013e93528eee2b..20fd712301df3d5df00763a402a3b464d81eee13 100644 (file)
@@ -7,10 +7,12 @@
 #ifndef PLATFORM_DEF_H
 #define PLATFORM_DEF_H
 
-#include <arch.h>
 #ifndef __ASSEMBLY__
 #include <stdlib.h>
 #endif
+
+#include <arch.h>
+
 #include "rcar_def.h"
 
 /*******************************************************************************
index 61b95a4367037a982ea7e4ad662f34ac0f557ab0..242e007b5fef83588f06fca2032d4ce0b4641d12 100644 (file)
@@ -7,8 +7,8 @@
 #ifndef RCAR_DEF_H
 #define RCAR_DEF_H
 
-#include <tbbr_img_def.h>
-#include <utils_def.h>
+#include <common/tbbr/tbbr_img_def.h>
+#include <lib/utils_def.h>
 
 #define RCAR_PRIMARY_CPU               0x0
 #define RCAR_TRUSTED_SRAM_BASE         0x44000000
index e90fa08ad75224b1eedb8be0a13424637793cfba..def327605cf8377ee38cab33cd6bf39a06870071 100644 (file)
@@ -7,11 +7,12 @@
 #ifndef RCAR_PRIVATE_H
 #define RCAR_PRIVATE_H
 
-#include <bakery_lock.h>
-#include <bl_common.h>
-#include <cpu_data.h>
 #include <platform_def.h>
 
+#include <common/bl_common.h>
+#include <lib/bakery_lock.h>
+#include <lib/el3_runtime/cpu_data.h>
+
 typedef volatile struct mailbox {
        unsigned long value __aligned(CACHE_WRITEBACK_GRANULE);
 } mailbox_t;
index 469ac29c595e98b0bcd8a1a347cc8d7c72df5268..9d814a6e5937d35b07cfeb9b644bb372e8a53c9d 100644 (file)
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
-#include <desc_image_load.h>
-#include <platform.h>
+#include <common/bl_common.h>
+#include <common/desc_image_load.h>
+#include <plat/common/platform.h>
 
 extern void bl2_plat_flush_bl31_params(void);
 
index 84cc47e0d13fe6688a022144a8234e09a3b2f6a7..7086613f82e599b7707ee0743a1335f29247da59 100644 (file)
@@ -4,17 +4,19 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
-#include <bakery_lock.h>
-#include <bl_common.h>
-#include <cci.h>
-#include <debug.h>
 #include <errno.h>
-#include <gicv2.h>
-#include <mmio.h>
-#include <platform.h>
+
 #include <platform_def.h>
-#include <psci.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/arm/cci.h>
+#include <drivers/arm/gicv2.h>
+#include <lib/bakery_lock.h>
+#include <lib/mmio.h>
+#include <lib/psci/psci.h>
+#include <plat/common/platform.h>
 
 #include "iic_dvfs.h"
 #include "pwrc.h"
index 3b5d620dd73b3ed1e32445f40f21a6529eb7ac66..05e3d9f0dddb4bd3a8312837ad1983b14b01d103 100644 (file)
@@ -4,12 +4,15 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
-#include <io_driver.h>
-#include <io_storage.h>
-#include <io_semihosting.h>
-#include <platform_def.h>
 #include <string.h>
+
+#include <platform_def.h>
+
+#include <common/debug.h>
+#include <drivers/io/io_driver.h>
+#include <drivers/io/io_storage.h>
+#include <drivers/io/io_semihosting.h>
+
 #include "io_common.h"
 #include "io_rcar.h"
 #include "io_memdrv.h"
index 3582c2bde36e2670569fb8d6933185122b872a49..0d5880d7a2a65a64f50924365d2eb35edb6d16b2 100644 (file)
@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
 #include <platform_def.h>
-#include <psci.h>
+
+#include <common/debug.h>
+#include <lib/psci/psci.h>
 
 static const unsigned char rcar_power_domain_tree_desc[] = {
        1,
index f0136b0d918b02cfb239115c4156f09bf8e290b2..4af052b574244d1167ee6f54e0ae7462a82c73e1 100644 (file)
@@ -4,13 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <platform_def.h>
+
 #include <arch.h>
 #include <asm_macros.S>
-#include <bl_common.h>
+#include <common/bl_common.h>
 #include <cortex_a53.h>
 #include <cortex_a72.h>
 #include <plat_private.h>
-#include <platform_def.h>
 #include <plat_pmu_macros.S>
 
        .globl  cpuson_entry_point
index 9a74314c94de0a0ec46e8f558e593531c308938b..81e8520626cb33bd5144758e22ad4e18d09b78dd 100644 (file)
@@ -4,15 +4,18 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <string.h>
+
+#include <platform_def.h>
+
 #include <arch_helpers.h>
-#include <bl_common.h>
-#include <cci.h>
-#include <debug.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/arm/cci.h>
+#include <lib/utils.h>
+#include <lib/xlat_tables/xlat_tables.h>
+
 #include <plat_private.h>
-#include <platform_def.h>
-#include <string.h>
-#include <utils.h>
-#include <xlat_tables.h>
 
 #ifdef PLAT_RK_CCI_BASE
 static const int cci_map[] = {
index 7a9f7a9d10f740b43c56db4527660633d7d8a49e..2c970eb8a6e751561c1e6b8bfa959d12bbc7fee4 100644 (file)
@@ -5,16 +5,18 @@
  */
 
 #include <assert.h>
-#include <bl_common.h>
-#include <console.h>
-#include <coreboot.h>
-#include <debug.h>
-#include <generic_delay_timer.h>
-#include <mmio.h>
-#include <plat_private.h>
-#include <platform.h>
+
 #include <platform_def.h>
-#include <uart_16550.h>
+
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/console.h>
+#include <drivers/generic_delay_timer.h>
+#include <drivers/ti/uart/uart_16550.h>
+#include <lib/coreboot.h>
+#include <lib/mmio.h>
+#include <plat_private.h>
+#include <plat/common/platform.h>
 
 /*
  * The next 2 constants identify the extents of the code & RO data region.
index ea77757f7b1b9a142f7f2686c0499ee56587bf11..e89fe1e029ca4e3caf7ec1ba0a70b0fe73a1e8c9 100644 (file)
@@ -4,15 +4,19 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <string.h>
+
+#include <platform_def.h>
+
 #include <arch_helpers.h>
-#include <console.h>
-#include <debug.h>
-#include <delay_timer.h>
-#include <mmio.h>
+#include <common/debug.h>
+#include <drivers/console.h>
+#include <drivers/delay_timer.h>
+#include <lib/mmio.h>
+
 #include <plat_private.h>
-#include <platform_def.h>
 #include <soc.h>
-#include <string.h>
+
 #include "ddr_parameter.h"
 
 /*
index 69c4e18bdcd40577b0444399de029bad4ec08308..61349c44cff1d627d28ab2523bee6dcebde37f45 100644 (file)
@@ -7,15 +7,18 @@
 #ifndef DDR_PARAMETER_H
 #define DDR_PARAMETER_H
 
+#include <string.h>
+
+#include <platform_def.h>
+
 #include <arch_helpers.h>
-#include <console.h>
-#include <debug.h>
-#include <delay_timer.h>
-#include <mmio.h>
+#include <common/debug.h>
+#include <drivers/console.h>
+#include <drivers/delay_timer.h>
+#include <lib/mmio.h>
+
 #include <plat_private.h>
-#include <platform_def.h>
 #include <soc.h>
-#include <string.h>
 
 #define DDR_REGION_NR_MAX              10
 #define REGION_NR_OFFSET               0
index 9ee4e83e19c2818f535d3b93f631d5b0786d3ec8..691beeb448b813fc0e903f8f78ad39c92e05d22c 100644 (file)
@@ -6,10 +6,10 @@
 #ifndef ROCKCHIP_PLAT_MACROS_S
 #define ROCKCHIP_PLAT_MACROS_S
 
-#include <cci.h>
-#include <gic_common.h>
-#include <gicv2.h>
-#include <gicv3.h>
+#include <drivers/arm/cci.h>
+#include <drivers/arm/gic_common.h>
+#include <drivers/arm/gicv2.h>
+#include <drivers/arm/gicv3.h>
 #include <platform_def.h>
 
 .section .rodata.gic_reg_name, "aS"
index 955ca647c5cde2e6e8f5c7430e225d2f9abe78ef..e8750a5e9ff482ccb840e54672b1813c322020e8 100644 (file)
@@ -8,10 +8,12 @@
 #define PLAT_PRIVATE_H
 
 #ifndef __ASSEMBLY__
-#include <mmio.h>
-#include <psci.h>
+
 #include <stdint.h>
-#include <xlat_tables.h>
+
+#include <lib/psci/psci.h>
+#include <lib/xlat_tables/xlat_tables.h>
+#include <lib/mmio.h>
 
 #define __sramdata __attribute__((section(".sram.data")))
 #define __sramconst __attribute__((section(".sram.rodata")))
index a7ba83e5ac512218b7c574eaf391e4181dc0d280..3d1b40b3ffc04fe9012879adab588ea65af14f51 100644 (file)
@@ -5,16 +5,18 @@
  */
 
 #include <assert.h>
-#include <bl_common.h>
-#include <console.h>
-#include <coreboot.h>
-#include <debug.h>
-#include <gpio.h>
-#include <mmio.h>
+#include <string.h>
+
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/console.h>
+#include <drivers/gpio.h>
+#include <lib/coreboot.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
+
 #include <plat_params.h>
 #include <plat_private.h>
-#include <platform.h>
-#include <string.h>
 
 static struct gpio_info param_reset;
 static struct gpio_info param_poweroff;
index 352dbc842f7ede6cda8ff64b58a19ba038310a7e..c9563c9ed957c6f5676ef56a47a5aa00382cff30 100644 (file)
@@ -4,15 +4,18 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <console.h>
-#include <debug.h>
-#include <delay_timer.h>
 #include <errno.h>
-#include <plat_private.h>
+
 #include <platform_def.h>
-#include <psci.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/console.h>
+#include <drivers/delay_timer.h>
+#include <lib/psci/psci.h>
+
+#include <plat_private.h>
 
 /* Macros to read the rk power domain state */
 #define RK_CORE_PWR_STATE(state) \
index 49d063cf5746c2086bb04628fec02e00905b3c9c..a31e4103ecf6fa3759ffbfaf05c12cd9f5d38335 100644 (file)
@@ -4,10 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <platform_def.h>
+
 #include <arch.h>
+#include <lib/psci/psci.h>
+
 #include <plat_private.h>
-#include <platform_def.h>
-#include <psci.h>
 
 /*******************************************************************************
  * This function returns the RockChip default topology tree information.
index 4705042baac7d1555b8b8f3553d30d8e0802bbee..222a88261a9d58338832fdc6be0f19a514a44e8e 100644 (file)
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
-#include <gicv2.h>
-#include <interrupt_props.h>
 #include <platform_def.h>
-#include <utils.h>
+
+#include <common/bl_common.h>
+#include <common/interrupt_props.h>
+#include <drivers/arm/gicv2.h>
+#include <lib/utils.h>
 
 /******************************************************************************
  * The following functions are defined as weak to allow a platform to override
index efbf1d167c133cd2ceb222e857ccf3949ec934e5..edae2efd042eb0dc2b4a167684e2e9ae77612b41 100644 (file)
@@ -4,12 +4,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
-#include <gicv3.h>
-#include <interrupt_props.h>
-#include <platform.h>
 #include <platform_def.h>
-#include <utils.h>
+
+#include <common/bl_common.h>
+#include <common/interrupt_props.h>
+#include <drivers/arm/gicv3.h>
+#include <lib/utils.h>
+#include <plat/common/platform.h>
 
 /******************************************************************************
  * The following functions are defined as weak to allow a platform to override
index d690e92fc92810311a7c7624929b34a19fa47718..27ef042c3f78c54f7031899cf68580ae85e8e851 100644 (file)
@@ -5,12 +5,14 @@
  */
 
 #include <assert.h>
-#include <debug.h>
-#include <mmio.h>
+
+#include <common/debug.h>
+#include <common/runtime_svc.h>
+#include <lib/mmio.h>
+#include <tools_share/uuid.h>
+
 #include <plat_sip_calls.h>
 #include <rockchip_sip_svc.h>
-#include <runtime_svc.h>
-#include <uuid.h>
 
 /* Rockchip SiP Service UUID */
 DEFINE_SVC_UUID2(rk_sip_svc_uid,
index 835c3a6b688e5e877ccf65492b23f6efd23216db..c215ee2400e3cc09a32c653ef6cb479b8b2204cd 100644 (file)
@@ -4,18 +4,21 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bakery_lock.h>
-#include <bl31.h>
-#include <console.h>
-#include <debug.h>
-#include <delay_timer.h>
 #include <errno.h>
-#include <mmio.h>
-#include <plat_private.h>
-#include <platform.h>
+
 #include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <bl31/bl31.h>
+#include <common/debug.h>
+#include <drivers/console.h>
+#include <drivers/delay_timer.h>
+#include <lib/bakery_lock.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
+
+#include <plat_private.h>
 #include <pmu.h>
 #include <pmu_com.h>
 #include <rk3328_def.h>
index ce344d66d54a33a0a95c0f19211bb4c12081343f..d216020c58085bab9ead385cc9f88e77c10ea5c0 100644 (file)
@@ -4,14 +4,16 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <platform_def.h>
+
 #include <arch_helpers.h>
-#include <console.h>
+#include <common/debug.h>
+#include <drivers/console.h>
+#include <drivers/delay_timer.h>
+#include <lib/mmio.h>
+
 #include <ddr_parameter.h>
-#include <debug.h>
-#include <delay_timer.h>
-#include <mmio.h>
 #include <plat_private.h>
-#include <platform_def.h>
 #include <rk3328_def.h>
 #include <soc.h>
 
index 9b20b41d3fafbaa632a7e9de4449a01b59bba2fb..b62c8686935ce9a4d5741117131b82c509aed373 100644 (file)
@@ -8,7 +8,8 @@
 #define PLATFORM_DEF_H
 
 #include <arch.h>
-#include <common_def.h>
+#include <plat/common/common_def.h>
+
 #include <rk3328_def.h>
 
 /*******************************************************************************
index 1c33763f317d02220cdfaa4520d820e010ba1409..84d265476960a2fe7ffacf18f25daa00d0011489 100644 (file)
@@ -4,15 +4,18 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <mmio.h>
-#include <ddr_rk3368.h>
-#include <debug.h>
+#include <stdint.h>
+#include <string.h>
+
 #include <platform_def.h>
+
+#include <common/debug.h>
+#include <lib/mmio.h>
+
+#include <ddr_rk3368.h>
 #include <pmu.h>
 #include <rk3368_def.h>
 #include <soc.h>
-#include <stdint.h>
-#include <string.h>
 
 /* GRF_SOC_STATUS0 */
 #define DPLL_LOCK              (0x1 << 2)
index cb323e6ee931a55885b99468ce707536f2f64374..e277a18ba4af26485307a904717fe46a729564ec 100644 (file)
@@ -4,16 +4,19 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <ddr_rk3368.h>
-#include <debug.h>
-#include <delay_timer.h>
 #include <errno.h>
-#include <mmio.h>
-#include <plat_private.h>
-#include <platform.h>
+
 #include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
+
+#include <ddr_rk3368.h>
+#include <plat_private.h>
 #include <pmu.h>
 #include <pmu_com.h>
 #include <rk3368_def.h>
index d6979a8449eee9ee60f17edc0f2f4617ebc7766d..0c34554187c504a6faf32b467cc89b19e235904a 100644 (file)
@@ -4,11 +4,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <platform_def.h>
+
 #include <arch_helpers.h>
-#include <debug.h>
-#include <mmio.h>
+#include <common/debug.h>
+#include <lib/mmio.h>
+
 #include <plat_private.h>
-#include <platform_def.h>
 #include <rk3368_def.h>
 #include <soc.h>
 
index 4083938ef1d6a4a158c0568c35680d1d71c2b362..815650fd3a0e450643acb45bd30e9498b2b74237 100644 (file)
@@ -8,9 +8,10 @@
 #define PLATFORM_DEF_H
 
 #include <arch.h>
-#include <common_def.h>
+#include <lib/utils_def.h>
+#include <plat/common/common_def.h>
+
 #include <rk3368_def.h>
-#include <utils_def.h>
 
 /*******************************************************************************
  * Platform binary types for linking
index c0f43dbfc0a92b955192ee125f84786cdf67adc3..5918d58ce038fec085fcdf5edee6950f04ffca30 100644 (file)
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
-#include <mmio.h>
+#include <common/debug.h>
+#include <common/runtime_svc.h>
+#include <lib/mmio.h>
+
 #include <plat_sip_calls.h>
 #include <rockchip_sip_svc.h>
-#include <runtime_svc.h>
 
 uintptr_t rockchip_plat_sip_handler(uint32_t smc_fid,
                                   u_register_t x1,
index 73a75bb7c48f46de6f69514404987d66d1169178..aa71fdea6fd82f0d504cff03b45e3e3d1821b103 100644 (file)
@@ -6,11 +6,13 @@
 
 #include <assert.h>
 #include <cdefs.h>
-#include <cdn_dp.h>
-#include <smccc.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include <lib/smccc.h>
+
+#include <cdn_dp.h>
+
 __asm__(
        ".pushsection .text.hdcp_handler, \"ax\", %progbits\n"
        ".global hdcp_handler\n"
index e6d39a1dd8aa2a9c9e5a60def8043804b98817f8..45fd9240ed5271da58282073611ec6c50e736b79 100644 (file)
@@ -5,10 +5,11 @@
  */
 
 #include <arch_helpers.h>
-#include <debug.h>
-#include <delay_timer.h>
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <lib/mmio.h>
+
 #include <m0_ctl.h>
-#include <mmio.h>
 #include <plat_private.h>
 #include "dfs.h"
 #include "dram.h"
index ded511e02dc3c1077c65902cbb86643c6349e530..0eb12cf29950b2c01f9ff44cd1ef2e909863bb65 100644 (file)
@@ -7,9 +7,10 @@
 #ifndef DRAM_H
 #define DRAM_H
 
+#include <stdint.h>
+
 #include <dram_regs.h>
 #include <plat_private.h>
-#include <stdint.h>
 
 enum {
        DDR3 = 3,
index 3527f0e5ecec121cc24f9a5260f0448f489e5881..3cdb7a29633015b256ff4055dd9172b925c101dd 100644 (file)
@@ -4,10 +4,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <dram.h>
 #include <stdint.h>
 #include <string.h>
-#include <utils.h>
+
+#include <lib/utils.h>
+
+#include <dram.h>
+
 #include "dram_spec_timing.h"
 
 static const uint8_t ddr3_cl_cwl[][7] = {
index dd97581db14d425be10e3df952f650bcdf262caa..8bc66e1bca5c91729b3129e26b832c5b91dc77ad 100644 (file)
@@ -4,11 +4,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <platform_def.h>
+
 #include <arch_helpers.h>
-#include <debug.h>
+#include <common/debug.h>
+
 #include <dram.h>
 #include <plat_private.h>
-#include <platform_def.h>
 #include <pmu.h>
 #include <pmu_bits.h>
 #include <pmu_regs.h>
index e74c4d91a7de2cf85e781c0b467c782c1984cb6d..b8cba6dd93db619cf8bbab281bd6744ba86a78b9 100644 (file)
@@ -3,15 +3,19 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
+
 #include <assert.h>
-#include <debug.h>
-#include <delay_timer.h>
 #include <errno.h>
-#include <gpio.h>
-#include <mmio.h>
-#include <plat_private.h>
-#include <platform.h>
+
 #include <platform_def.h>
+
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <drivers/gpio.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
+
+#include <plat_private.h>
 #include <soc.h>
 
 uint32_t gpio_port[] = {
index 3f258b7894b82f2de7badfb7423da9781c1929b9..d919fa1d2ad299e943a434b8f346c6e3ec8a77c4 100644 (file)
@@ -4,12 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
-#include <delay_timer.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <lib/mmio.h>
+
 #include <m0_ctl.h>
-#include <mmio.h>
 #include <plat_private.h>
 #include <rk3399_def.h>
 #include <secure.h>
index 04446d60629ed3ca71dc5fcbd88dc8083b56cc30..42589b9b974f7794a6809e0ffb8b1679108ff6b1 100644 (file)
@@ -4,29 +4,32 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bakery_lock.h>
-#include <bl31.h>
-#include <debug.h>
-#include <delay_timer.h>
-#include <dfs.h>
 #include <errno.h>
-#include <gicv3.h>
-#include <gpio.h>
+#include <string.h>
+
+#include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <bl31/bl31.h>
+#include <common/debug.h>
+#include <drivers/arm/gicv3.h>
+#include <drivers/delay_timer.h>
+#include <drivers/gpio.h>
+#include <lib/bakery_lock.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
+
+#include <dfs.h>
 #include <m0_ctl.h>
-#include <mmio.h>
 #include <plat_params.h>
 #include <plat_private.h>
-#include <platform.h>
-#include <platform_def.h>
 #include <pmu.h>
 #include <pmu_com.h>
 #include <pwm.h>
 #include <rk3399_def.h>
 #include <secure.h>
 #include <soc.h>
-#include <string.h>
 #include <suspend.h>
 
 DEFINE_BAKERY_LOCK(rockchip_pd_lock);
index 1937b138084e3af3c6c413aa84f86a3db9e58504..8286f17c6469e98a1d10a97342fbd1f56b90b597 100644 (file)
@@ -4,10 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
-#include <delay_timer.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+
 #include <plat_private.h>
 #include <secure.h>
 #include <soc.h>
index 741adde66d5a8afc506bcd7a799f197b11f36c5e..c877dbde84b3b94c8ac6cbc8eae3bbfd782d9467 100644 (file)
@@ -4,16 +4,19 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
-#include <delay_timer.h>
+
+#include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <lib/mmio.h>
+
 #include <dfs.h>
 #include <dram.h>
 #include <m0_ctl.h>
-#include <mmio.h>
 #include <plat_private.h>
-#include <platform_def.h>
 #include <rk3399_def.h>
 #include <secure.h>
 #include <soc.h>
index 1f7ec07f0f50e75eebba36e19bc331785cc798ee..853933715ee411500904752fd5fce53132c58565 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef SOC_H
 #define SOC_H
 
-#include <utils.h>
+#include <lib/utils.h>
 
 #define GLB_SRST_FST_CFG_VAL   0xfdb9
 #define GLB_SRST_SND_CFG_VAL   0xeca8
index 5045ba8c2fc3a5177ae113c5e04c6087efd35b1b..cfa912f72f46938db357a9c6544f09328ee866ff 100644 (file)
@@ -6,7 +6,7 @@
 #ifndef ROCKCHIP_PLAT_LD_S
 #define ROCKCHIP_PLAT_LD_S
 
-#include <xlat_tables_defs.h>
+#include <lib/xlat_tables/xlat_tables_defs.h>
 
 MEMORY {
     SRAM (rwx): ORIGIN = SRAM_BASE, LENGTH = SRAM_SIZE
index cb798fbcbf05d07043076ce9eb68e167c1b9a836..2861a7dd4bdd3218260baafd19140c0146941e98 100644 (file)
@@ -8,10 +8,11 @@
 #define PLATFORM_DEF_H
 
 #include <arch.h>
+#include <lib/utils_def.h>
+#include <plat/common/common_def.h>
+
 #include <bl31_param.h>
-#include <common_def.h>
 #include <rk3399_def.h>
-#include <utils_def.h>
 
 /*******************************************************************************
  * Platform binary types for linking
index 3f0f619f26c5f052def375aae9fd9800d3ee21f3..c2cc5b11c3d2ab8da341ebe2ea51665e96ebb876 100644 (file)
@@ -4,13 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <common/debug.h>
+#include <common/runtime_svc.h>
+#include <lib/mmio.h>
+
 #include <cdn_dp.h>
-#include <debug.h>
 #include <dfs.h>
-#include <mmio.h>
 #include <plat_sip_calls.h>
 #include <rockchip_sip_svc.h>
-#include <runtime_svc.h>
 
 #define RK_SIP_DDR_CFG         0x82000008
 #define DRAM_INIT              0x00
index 6a3c1d6046652b5d2e50550def24a420a7111d6a..715aec410169bb816e7046e86be965e90fb8213e 100644 (file)
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
-#include <desc_image_load.h>
-#include <platform.h>
 #include <platform_def.h>
 
+#include <common/bl_common.h>
+#include <common/desc_image_load.h>
+#include <plat/common/platform.h>
+
 /*******************************************************************************
  * Following descriptor provides BL image/ep information that gets used
  * by BL2 to load the images and also subset of this information is
index 3b12c30d6e5ab2c44d69820694b48b872cf45b01..69ebdb372e0079ae7ab5e359802b44b1d63f615c 100644 (file)
@@ -8,9 +8,9 @@
 #define PLATFORM_DEF_H
 
 #include <arch.h>
-#include <common_def.h>
-#include <tbbr_img_def.h>
-#include <utils_def.h>
+#include <common/tbbr/tbbr_img_def.h>
+#include <lib/utils_def.h>
+#include <plat/common/common_def.h>
 
 #include "../rpi3_hw.h"
 
index 39bb3325656609377c7a10b25ff5a2ace37bd9ff..ea4215d83e1952780d152bb9fd8bdbc168cc51d0 100644 (file)
@@ -4,13 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <platform_def.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <bl_common.h>
-#include <debug.h>
-#include <platform_def.h>
-#include <xlat_mmu_helpers.h>
-#include <xlat_tables_defs.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <lib/xlat_tables/xlat_mmu_helpers.h>
+#include <lib/xlat_tables/xlat_tables_defs.h>
 
 #include "../../bl1/bl1_private.h"
 #include "rpi3_private.h"
index c78024eaa6814d58292b5efe948191c0c09738c2..53a2c72b8c5cc118c01d1d2cc7a4947e8c5a6acf 100644 (file)
@@ -4,15 +4,17 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <debug.h>
-#include <desc_image_load.h>
-#include <optee_utils.h>
+
 #include <platform_def.h>
-#include <xlat_mmu_helpers.h>
-#include <xlat_tables_defs.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/desc_image_load.h>
+#include <lib/optee_utils.h>
+#include <lib/xlat_tables/xlat_mmu_helpers.h>
+#include <lib/xlat_tables/xlat_tables_defs.h>
 
 #include "rpi3_private.h"
 
index 483d150f0a7c774162e9e4308f14351984f77388..af7f806cd15132bdb16fffcd8f23e179ae79944c 100644 (file)
@@ -5,12 +5,15 @@
  */
 
 #include <assert.h>
-#include <bl_common.h>
+
 #include <libfdt.h>
-#include <platform.h>
+
 #include <platform_def.h>
-#include <xlat_mmu_helpers.h>
-#include <xlat_tables_defs.h>
+
+#include <common/bl_common.h>
+#include <lib/xlat_tables/xlat_mmu_helpers.h>
+#include <lib/xlat_tables/xlat_tables_defs.h>
+#include <plat/common/platform.h>
 
 #include "rpi3_private.h"
 
index c7e8b3a755d55a36f0869a94160a3bbf140c26ae..9b10974adbe2ffc78f8b7b36978422da7dc83595 100644 (file)
@@ -4,15 +4,17 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <console.h>
-#include <debug.h>
-#include <interrupt_mgmt.h>
+
 #include <platform_def.h>
-#include <uart_16550.h>
-#include <xlat_tables_v2.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <bl31/interrupt_mgmt.h>
+#include <drivers/console.h>
+#include <drivers/ti/uart/uart_16550.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
 
 #include "rpi3_hw.h"
 #include "rpi3_private.h"
index 822644cd3b50ab88637549d4fe1c759ac51f5bc0..9d86eb8809db804046629f5e5c0ef50e359252fc 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef RPI3_HW_H
 #define RPI3_HW_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 /*
  * Peripherals
index fad9e4f34a18de1bcacccbc21089a42ea7e5118a..5394c6f7c8ef0eb1961dd0249b7541ff36f01e61 100644 (file)
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
-#include <desc_image_load.h>
-#include <platform.h>
 #include <platform_def.h>
 
+#include <common/bl_common.h>
+#include <common/desc_image_load.h>
+#include <plat/common/platform.h>
+
 /*******************************************************************************
  * This function flushes the data structures so that they are visible
  * in memory for the next BL image.
index cafcf6dd55239f2c2896163cb13c8fa12bcb20fa..7e66deb72e1b2ca8d61ad34d4b3ab44abbd93718 100644 (file)
@@ -5,15 +5,17 @@
  */
 
 #include <assert.h>
-#include <bl_common.h>
-#include <debug.h>
-#include <firmware_image_package.h>
-#include <io_driver.h>
-#include <io_fip.h>
-#include <io_memmap.h>
-#include <platform_def.h>
 #include <string.h>
 
+#include <platform_def.h>
+
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/io/io_driver.h>
+#include <drivers/io/io_fip.h>
+#include <drivers/io/io_memmap.h>
+#include <tools_share/firmware_image_package.h>
+
 /* Semihosting filenames */
 #define BL2_IMAGE_NAME                 "bl2.bin"
 #define BL31_IMAGE_NAME                        "bl31.bin"
index 77e17af6b02e18b3c22a6d785a70cde25c6f3fb7..2db605edf0b0a4c561580afe51f94f791fe75051 100644 (file)
@@ -5,11 +5,13 @@
  */
 
 #include <assert.h>
-#include <arch_helpers.h>
-#include <debug.h>
-#include <mmio.h>
+
 #include <platform_def.h>
 
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <lib/mmio.h>
+
 #include "rpi3_hw.h"
 
 /* This struct must be aligned to 16 bytes */
index b6adc8a5305f27eceb469772ff22be70e9c35b9b..3a077d37aadbe3fe7682224b557f0f448a8c2b66 100644 (file)
@@ -4,14 +4,16 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <console.h>
-#include <debug.h>
-#include <mmio.h>
+
 #include <platform_def.h>
-#include <platform.h>
-#include <psci.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/console.h>
+#include <lib/mmio.h>
+#include <lib/psci/psci.h>
+#include <plat/common/platform.h>
 
 #include "rpi3_hw.h"
 
index 111b3b6c6184eb17606c03b4784e9f0f158283f7..fd69adbf31c160c9046f6b772fa0793fc5a6e99f 100644 (file)
@@ -5,9 +5,10 @@
  */
 
 #include <assert.h>
-#include <mmio.h>
 #include <string.h>
 
+#include <lib/mmio.h>
+
 #include "rpi3_hw.h"
 
 /* Initial amount of values to discard */
index 812f6edfa9de6a36f788b68c7006d58e49dfc909..815f73135dd94e895ebbbc4043e517ec9d968758 100644 (file)
@@ -5,7 +5,8 @@
  */
 
 #include <stdint.h>
-#include <utils.h>
+
+#include <lib/utils.h>
 
 #include "rpi3_private.h"
 
index 31a22a469b532776a58912be498ca2a2d8b48fd1..200d41dd166c787454962b4f8c36e53dbfe96827 100644 (file)
@@ -4,10 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
-#include <platform_def.h>
 #include <stdint.h>
 
+#include <platform_def.h>
+
+#include <arch.h>
+
 #include "rpi3_private.h"
 
 /* The power domain tree descriptor */
index 2f528fc41db57a0471f4c5fcc3dc2300fcfd6927..b306c45c23eab4fa0d3ef1d41406564ad8e06d4b 100644 (file)
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <platform.h>
+#include <plat/common/platform.h>
 
 extern char rpi3_rotpk_hash[], rpi3_rotpk_hash_end[];
 
index 5c2a635bb98b7af70f55189f97f812f6a18115a5..925ed97042297a4b7b67a2d5d09da390945eda43 100644 (file)
@@ -4,11 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bakery_lock.h>
-#include <mmio.h>
+
 #include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <lib/bakery_lock.h>
+#include <lib/mmio.h>
+
 #include <sq_common.h>
 #include "sq_mhu.h"
 
index 170b7e184659590f283804622a30dd2b12364ec7..0cb75a02df54134d201e9f94f2445feabeca487f 100644 (file)
@@ -4,12 +4,15 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
+#include <string.h>
+
 #include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
 #include <sq_common.h>
-#include <debug.h>
-#include <string.h>
+
 #include "sq_mhu.h"
 #include "sq_scpi.h"
 
index bde73485bf4cd605afaac6e1b50e4a5d348af3af..de6be7d231f4c89fd3de48e48cf42c042f801b9f 100644 (file)
@@ -7,8 +7,8 @@
 #ifndef PLATFORM_DEF_H
 #define PLATFORM_DEF_H
 
-#include <common_def.h>
-#include <utils_def.h>
+#include <lib/utils_def.h>
+#include <plat/common/common_def.h>
 
 /* CPU topology */
 #define PLAT_MAX_CORES_PER_CLUSTER     2
index c395640347841f5b1af55242ed5841752010bad4..abd90904d75a5788fb771da5303e918ec6b883d8 100644 (file)
@@ -8,7 +8,8 @@
 #define SQ_COMMON_H
 
 #include <stdint.h>
-#include <xlat_tables_v2.h>
+
+#include <lib/xlat_tables/xlat_tables_v2.h>
 
 struct draminfo {
        uint32_t        num_regions;
index 07c1f89970dcd7622e67369b5b7d5046f7a6b3a8..f8d252622c7c72f5a8ffbe7618c3d3e27e5faea6 100644 (file)
@@ -4,14 +4,17 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <assert.h>
+
+#include <platform_def.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <platform_def.h>
-#include <assert.h>
-#include <bl_common.h>
-#include <pl011.h>
-#include <debug.h>
-#include <mmio.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/arm/pl011.h>
+#include <lib/mmio.h>
+
 #include <sq_common.h>
 
 static console_pl011_t console;
index bb70d5d801ec25962a66c6d784cfb626e1d21414..fa6ea87b2d0b87909436dd7ed0f948cbf7dd7867 100644 (file)
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <platform_def.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <ccn.h>
-#include <platform_def.h>
+#include <drivers/arm/ccn.h>
 
 static const unsigned char master_to_rn_id_map[] = {
        PLAT_SQ_CLUSTER_TO_CCN_ID_MAP
index 94e5a66b69a83f256c5a79876cab53c3e84c7827..05318e3723df344ea1673d4523679763b5653594 100644 (file)
@@ -5,11 +5,13 @@
  */
 
 #include <assert.h>
-#include <gicv3.h>
-#include <interrupt_props.h>
-#include <platform.h>
+
 #include <platform_def.h>
 
+#include <common/interrupt_props.h>
+#include <drivers/arm/gicv3.h>
+#include <plat/common/platform.h>
+
 #include "sq_common.h"
 
 static uintptr_t sq_rdistif_base_addrs[PLATFORM_CORE_COUNT];
index c327f1d4834c9fca43d9020c8fc4b749399d71f7..134224dce64ab1ed7ef9a0ab7f8b2516bb13b300 100644 (file)
@@ -4,17 +4,20 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <cassert.h>
-#include <debug.h>
-#include <delay_timer.h>
 #include <errno.h>
-#include <generic_delay_timer.h>
+
 #include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/delay_timer.h>
+#include <drivers/generic_delay_timer.h>
+#include <lib/cassert.h>
+#include <lib/psci/psci.h>
+
 #include <sq_common.h>
 #include "sq_scpi.h"
-#include <psci.h>
 
 /* Macros to read the SQ power domain state */
 #define SQ_PWR_LVL0    MPIDR_AFFLVL0
index aa20355999a98ce1ff7612ae6f99aa8d1f807e0d..359997aaefb932bc22c18368544798fc08151409 100644 (file)
@@ -4,9 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <platform_def.h>
+
 #include <arch.h>
+
 #include <sq_common.h>
-#include <platform_def.h>
 
 unsigned char sq_pd_tree_desc[PLAT_CLUSTER_COUNT + 1];
 
index ae147003a3818eddd29f7e7dd74e75901430dae2..5d1669d03ed6a4ed25bc3c00b65ec369b32c192c 100644 (file)
@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
 #include <platform_def.h>
-#include <xlat_tables_v2.h>
+
+#include <common/debug.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
 
 #define SQ_REG_REGION_BASE     0x20000000ULL
 #define SQ_REG_REGION_SIZE     0x60000000ULL
index 6e9b98edb1ce169bbffb053ba2c27a4b735dfa31..d4db3f5b0b6816f03a3076997327bca326216b29 100644 (file)
@@ -7,9 +7,9 @@
 #ifndef PLATFORM_DEF_H
 #define PLATFORM_DEF_H
 
-#include <common_def.h>
-#include <tbbr/tbbr_img_def.h>
-#include <utils_def.h>
+#include <common/tbbr/tbbr_img_def.h>
+#include <lib/utils_def.h>
+#include <plat/common/common_def.h>
 
 #define PLATFORM_STACK_SIZE            0x1000
 
index 7df17d3cdf6572454b5a416d410ad7248ef0e29e..e7dcc652db4db8b19066c98de9098848239164a2 100644 (file)
@@ -5,7 +5,8 @@
  */
 
 #include <platform_def.h>
-#include <xlat_mmu_helpers.h>
+
+#include <lib/xlat_tables/xlat_mmu_helpers.h>
 
 #include "../uniphier.h"
 
index fb7997c891f2387531239b2c0aeeb114052674cc..7109d21fefbeb5128330474b094decb6cb00c2ff 100644 (file)
@@ -4,18 +4,20 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
-#include <debug.h>
-#include <desc_image_load.h>
 #include <errno.h>
-#include <io/io_storage.h>
-#include <image_decompress.h>
-#include <platform.h>
+
 #include <platform_def.h>
+
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/desc_image_load.h>
+#include <common/image_decompress.h>
+#include <drivers/io/io_storage.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
+#include <plat/common/platform.h>
 #ifdef UNIPHIER_DECOMPRESS_GZIP
 #include <tf_gunzip.h>
 #endif
-#include <xlat_tables_v2.h>
 
 #include "uniphier.h"
 
index c5acdbd70fd97788a1396c35468afa72e28e52cd..ce32d89c01a72fc98a071303dcb0d34a6233b7ac 100644 (file)
@@ -4,16 +4,18 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <console.h>
-#include <debug.h>
 #include <errno.h>
-#include <mmio.h>
-#include <platform.h>
+
 #include <platform_def.h>
-#include <xlat_mmu_helpers.h>
+
+#include <arch.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/console.h>
+#include <lib/mmio.h>
+#include <lib/xlat_tables/xlat_mmu_helpers.h>
+#include <plat/common/platform.h>
 
 #include "uniphier.h"
 
index 78ca8ef06c10f7ccb8f9e76643c11ddb8beae25a..462c0859cec85d0eb60175f1d7da242a896da91c 100644 (file)
@@ -5,10 +5,11 @@
  */
 
 #include <assert.h>
-#include <mmio.h>
 #include <stdbool.h>
 #include <stddef.h>
-#include <utils_def.h>
+
+#include <lib/mmio.h>
+#include <lib/utils_def.h>
 
 #include "uniphier.h"
 
index 9e00c56e30e44dab93b55d5af9bb8d5882071a6c..3ca176895b0927d3c7d993869fc06db7b8fe01bd 100644 (file)
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
-#include <cci.h>
 #include <stddef.h>
-#include <utils_def.h>
+
+#include <arch_helpers.h>
+#include <drivers/arm/cci.h>
+#include <lib/utils_def.h>
 
 #include "uniphier.h"
 
index db87637b7405c23021a087f66c984f3030572d5d..4ac1f5108cee89d95a330810c42b4b3e323842a5 100644 (file)
@@ -4,13 +4,15 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <io/io_block.h>
-#include <mmio.h>
-#include <platform_def.h>
 #include <stdint.h>
-#include <utils_def.h>
+
+#include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <drivers/io/io_block.h>
+#include <lib/mmio.h>
+#include <lib/utils_def.h>
 
 #include "uniphier.h"
 
index 93bc73ac2cc34dd7f0cfa6b26d9b61fda6a74fbd..5148e8f9108aaee430344097e5964ccde2eac6b7 100644 (file)
@@ -5,11 +5,13 @@
  */
 
 #include <assert.h>
-#include <gicv3.h>
-#include <interrupt_props.h>
-#include <platform.h>
+
 #include <platform_def.h>
 
+#include <drivers/arm/gicv3.h>
+#include <common/interrupt_props.h>
+#include <plat/common/platform.h>
+
 #include "uniphier.h"
 
 static uintptr_t uniphier_rdistif_base_addrs[PLATFORM_CORE_COUNT];
index f4651db05de28786803bf4259aa0c646675e21d3..9e171e073c24296df971254fd688873e4f059456 100644 (file)
@@ -4,11 +4,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch.h>
 #include <assert.h>
-#include <desc_image_load.h>
+
 #include <platform_def.h>
 
+#include <arch.h>
+#include <common/desc_image_load.h>
+
 #include "uniphier.h"
 
 static struct bl_mem_params_node uniphier_image_descs[] = {
index 5d841ac00eeec406d6c6625383b9d2593b0b14ab..451e84f9e0b01dbfe1b4eb95ce475d47120aa412 100644 (file)
@@ -6,15 +6,17 @@
 
 #include <assert.h>
 #include <errno.h>
-#include <firmware_image_package.h>
-#include <io/io_block.h>
-#include <io/io_driver.h>
-#include <io/io_fip.h>
-#include <io/io_memmap.h>
-#include <platform_def.h>
 #include <stdint.h>
-#include <utils_def.h>
-#include <xlat_tables_v2.h>
+
+#include <platform_def.h>
+
+#include <drivers/io/io_block.h>
+#include <drivers/io/io_driver.h>
+#include <drivers/io/io_fip.h>
+#include <drivers/io/io_memmap.h>
+#include <lib/utils_def.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
+#include <tools_share/firmware_image_package.h>
 
 #include "uniphier.h"
 
index c8e825d6aee0ebe150ae02047635fc59623d7322..271aa0f49a7df68c7fe1b6f8de0ecf01e2397eb6 100644 (file)
@@ -4,13 +4,15 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
-#include <debug.h>
-#include <io/io_block.h>
-#include <mmio.h>
-#include <platform_def.h>
 #include <stdint.h>
-#include <utils_def.h>
+
+#include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/io/io_block.h>
+#include <lib/mmio.h>
+#include <lib/utils_def.h>
 
 #include "uniphier.h"
 
index 82081a05165cc654069f630a0a3239ea8c619b6e..ce11aa7cbbe4d99e62705df942b43b4239387e60 100644 (file)
@@ -5,9 +5,9 @@
  */
 
 #include <arch_helpers.h>
-#include <debug.h>
-#include <mmio.h>
-#include <psci.h>
+#include <common/debug.h>
+#include <lib/mmio.h>
+#include <lib/psci/psci.h>
 
 #include "uniphier.h"
 
index 58eb72eff0f94fdf4ea5fd7dcb46ddbea66c314a..c608a255a80d5a57d845603b4d6697cdc4d5f7a7 100644 (file)
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <mmio.h>
-#include <utils_def.h>
+#include <lib/mmio.h>
+#include <lib/utils_def.h>
 
 #include "uniphier.h"
 
index 55688f319d7003462dd78d950de090ca8825cbb6..377532deba8b66e0159b8f9b6285cb58699e2bb8 100644 (file)
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <mmio.h>
+#include <lib/mmio.h>
 
 #include "uniphier.h"
 
index d7bcaf86fb3716afcb29642dd44db2496b23de3f..19378430ff750e95ff7ddfe39d6f53bb5ccb72af 100644 (file)
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <platform.h>
+#include <plat/common/platform.h>
 
 unsigned int plat_get_syscnt_freq2(void)
 {
index 1c8341119140b0a1839a2d8b0fd30e8f828b8a1c..962a8d288e846a6d988e9509b1fa23da89f13719 100644 (file)
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <platform.h>
+#include <plat/common/platform.h>
 
 extern char uniphier_rotpk_hash[], uniphier_rotpk_hash_end[];
 
index 1f96f5851a9869f3d9cf6df906acb6a8c5dd0a86..c106c98b396529b75112bec74287cb114397cf63 100644 (file)
@@ -5,7 +5,7 @@
  */
 
 #include <arch.h>
-#include <platform.h>
+#include <plat/common/platform.h>
 
 #include "uniphier.h"
 
index b51b601208391774b8c8aaa598794103ee07d682..ef7079a5f9e36eb5465595fc523bed462d103f35 100644 (file)
@@ -4,13 +4,15 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <io/io_block.h>
-#include <mmio.h>
-#include <platform_def.h>
 #include <stdint.h>
-#include <utils_def.h>
+
+#include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <drivers/io/io_block.h>
+#include <lib/mmio.h>
+#include <lib/utils_def.h>
 
 #include "uniphier.h"
 
index 3112ecd9d9c5b5aa7635cd4ba0e9db7391cfe3f6..0faebc99398f490431215bbae7a29337cd285d88 100644 (file)
@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
 #include <platform_def.h>
-#include <xlat_tables_v2.h>
+
+#include <common/debug.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
 
 #define UNIPHIER_REG_REGION_BASE       0x50000000ULL
 #define UNIPHIER_REG_REGION_SIZE       0x20000000ULL
index b1125d15dbaa184bd45f0dc1def445f8a101b474..45a352e0c5a12434cb97f24df0722463e8094f89 100644 (file)
@@ -4,26 +4,29 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <boot_api.h>
-#include <debug.h>
-#include <io_block.h>
-#include <io_driver.h>
-#include <io_dummy.h>
-#include <io_mmc.h>
-#include <io_stm32image.h>
-#include <io_storage.h>
-#include <mmc.h>
-#include <mmio.h>
-#include <partition.h>
-#include <platform.h>
+#include <string.h>
+
 #include <platform_def.h>
-#include <stm32_sdmmc2.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/io/io_block.h>
+#include <drivers/io/io_driver.h>
+#include <drivers/io/io_dummy.h>
+#include <drivers/io/io_storage.h>
+#include <drivers/mmc.h>
+#include <drivers/partition/partition.h>
+#include <drivers/st/io_mmc.h>
+#include <drivers/st/io_stm32image.h>
+#include <drivers/st/stm32_sdmmc2.h>
+#include <drivers/st/stm32mp1_rcc.h>
+#include <lib/mmio.h>
+#include <lib/utils.h>
+#include <plat/common/platform.h>
+
+#include <boot_api.h>
 #include <stm32mp1_private.h>
-#include <stm32mp1_rcc.h>
-#include <string.h>
-#include <utils.h>
 
 /* IO devices */
 static const io_dev_connector_t *dummy_dev_con;
index d85ae96efd0c334c8cda369c03f09659f56f1729..6af65fd26edc50e8405044075f79fed29f6f25db 100644 (file)
@@ -4,29 +4,32 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <boot_api.h>
-#include <debug.h>
-#include <delay_timer.h>
-#include <desc_image_load.h>
-#include <generic_delay_timer.h>
-#include <mmio.h>
-#include <platform.h>
+#include <string.h>
+
 #include <platform_def.h>
-#include <stm32_console.h>
-#include <stm32mp1_clk.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/desc_image_load.h>
+#include <drivers/delay_timer.h>
+#include <drivers/generic_delay_timer.h>
+#include <drivers/st/stm32_console.h>
+#include <drivers/st/stm32mp1_clk.h>
+#include <drivers/st/stm32mp1_pmic.h>
+#include <drivers/st/stm32mp1_pwr.h>
+#include <drivers/st/stm32mp1_ram.h>
+#include <drivers/st/stm32mp1_rcc.h>
+#include <drivers/st/stm32mp1_reset.h>
+#include <lib/mmio.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
+#include <plat/common/platform.h>
+
+#include <boot_api.h>
 #include <stm32mp1_context.h>
 #include <stm32mp1_dt.h>
-#include <stm32mp1_pmic.h>
 #include <stm32mp1_private.h>
-#include <stm32mp1_pwr.h>
-#include <stm32mp1_ram.h>
-#include <stm32mp1_rcc.h>
-#include <stm32mp1_reset.h>
-#include <string.h>
-#include <xlat_tables_v2.h>
 
 static struct console_stm32 console;
 
index 2ba6cc64a2838e7a58f15436cc36454e5839a965..1b4df163bbc0aef167a1d2a0132024ab2a04cc1b 100644 (file)
@@ -8,9 +8,10 @@
 #define PLATFORM_DEF_H
 
 #include <arch.h>
-#include <common_def.h>
-#include <gic_common.h>
-#include <utils_def.h>
+#include <drivers/arm/gic_common.h>
+#include <lib/utils_def.h>
+#include <plat/common/common_def.h>
+
 #include "../stm32mp1_def.h"
 
 /*******************************************************************************
index 6f5bc4cc1338800bb10228851ec6ffb389a5dceb..62141943930e3d4918c8c776b07f7558bce34c7f 100644 (file)
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
-#include <desc_image_load.h>
-#include <platform.h>
 #include <platform_def.h>
 
+#include <common/bl_common.h>
+#include <common/desc_image_load.h>
+#include <plat/common/platform.h>
+
 /*******************************************************************************
  * Following descriptor provides BL image/ep information that gets used
  * by BL2 to load the images and also subset of this information is
index d5b328e3c11770841e49d4e7d2aeedaebe5bc76a..a52db6cac56dcdb4b0830922dedcdcc93ca21b99 100644 (file)
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <desc_image_load.h>
-#include <platform.h>
+#include <common/desc_image_load.h>
+#include <plat/common/platform.h>
 
 /*******************************************************************************
  * This function flushes the data structures so that they are visible
index 8890e822545bd515f0e2eb9cd9a039fc6a5dc5d6..8bb7a80e1a6fa8ac58322ca64ce2cd98f46a4c08 100644 (file)
@@ -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
index bd4f2ec01e966aeb1d6d27e99363d69ca8d665b1..f5413797cf014e32b10ede5d143f99397dbdc7f7 100644 (file)
@@ -4,25 +4,28 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
+#include <string.h>
+
+#include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
 #include <context.h>
-#include <context_mgmt.h>
-#include <debug.h>
+#include <drivers/arm/tzc400.h>
+#include <drivers/generic_delay_timer.h>
+#include <drivers/st/stm32_console.h>
+#include <drivers/st/stm32mp1_clk.h>
 #include <dt-bindings/clock/stm32mp1-clks.h>
-#include <generic_delay_timer.h>
-#include <mmio.h>
-#include <platform.h>
-#include <platform_def.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/mmio.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
+#include <plat/common/platform.h>
+
 #include <platform_sp_min.h>
-#include <stm32_console.h>
-#include <stm32mp1_clk.h>
 #include <stm32mp1_dt.h>
 #include <stm32mp1_private.h>
-#include <string.h>
-#include <tzc400.h>
-#include <xlat_tables_v2.h>
 
 /******************************************************************************
  * Placeholder variables for copying the arguments that have been passed to
index 50c926fb9c1df865b3e819ca1283bd75c530abb5..a8e822063004e7a6be2a8ecd521294a9a57f288b 100644 (file)
@@ -7,8 +7,8 @@
 #ifndef STM32MP1_LD_S
 #define STM32MP1_LD_S
 
+#include <lib/xlat_tables/xlat_tables_defs.h>
 #include <platform_def.h>
-#include <xlat_tables_defs.h>
 
 OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT)
 OUTPUT_ARCH(PLATFORM_LINKER_ARCH)
index 7d84da1f8736826ffe95fbfc335e014b708498b4..b54f313ffec25c725fb63df8d7a4e5f3123e0450 100644 (file)
@@ -4,16 +4,19 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <debug.h>
-#include <gicv2.h>
-#include <mmio.h>
+
 #include <platform_def.h>
-#include <platform.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/arm/gicv2.h>
+#include <lib/mmio.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
+#include <plat/common/platform.h>
+
 #include <stm32mp1_private.h>
-#include <xlat_tables_v2.h>
 
 #define MAP_SRAM       MAP_REGION_FLAT(STM32MP1_SRAM_BASE, \
                                        STM32MP1_SRAM_SIZE, \
index 245fd17d75ac8f94a23e8b0d4588be6188d75977..a8f9bf46d5c16876a402e8a33a26c62b2a08f654 100644 (file)
@@ -4,11 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <dt-bindings/clock/stm32mp1-clks.h>
 #include <errno.h>
-#include <mmio.h>
+
 #include <platform_def.h>
-#include <stm32mp1_clk.h>
+
+#include <drivers/st/stm32mp1_clk.h>
+#include <dt-bindings/clock/stm32mp1-clks.h>
+#include <lib/mmio.h>
+
 #include <stm32mp1_context.h>
 
 #define TAMP_BOOT_ITF_BACKUP_REG_ID    U(20)
index 2224498370b02fb06174c8743f66a57f4aebb3e2..fb21acceca58b2ee9d9f38a9d0fe64d701093578 100644 (file)
@@ -7,9 +7,9 @@
 #ifndef STM32MP1_DEF_H
 #define STM32MP1_DEF_H
 
-#include <tbbr_img_def.h>
-#include <utils_def.h>
-#include <xlat_tables_defs.h>
+#include <common/tbbr/tbbr_img_def.h>
+#include <lib/utils_def.h>
+#include <lib/xlat_tables/xlat_tables_defs.h>
 
 /*******************************************************************************
  * STM32MP1 memory map related constants
index bde968a0bb5ab8936f7c7b2cd7792f181fb2d14b..29e936aff8d71cb1f39dbcc0e976e2a0f65d544b 100644 (file)
@@ -5,15 +5,19 @@
  */
 
 #include <assert.h>
-#include <debug.h>
+
 #include <libfdt.h>
+
 #include <platform_def.h>
-#include <stm32_gpio.h>
-#include <stm32mp1_clk.h>
-#include <stm32mp1_clkfunc.h>
-#include <stm32mp1_ddr.h>
+
+#include <common/debug.h>
+#include <drivers/st/stm32_gpio.h>
+#include <drivers/st/stm32mp1_clk.h>
+#include <drivers/st/stm32mp1_clkfunc.h>
+#include <drivers/st/stm32mp1_ddr.h>
+#include <drivers/st/stm32mp1_ram.h>
+
 #include <stm32mp1_dt.h>
-#include <stm32mp1_ram.h>
 
 #define DT_GPIO_BANK_SHIFT     12
 #define DT_GPIO_BANK_MASK      0x1F000U
index 11eb0a3e2c671f5c81491ceb29f67858cd425639..fabed370f0a2cab002e8429c689711ee52438a56 100644 (file)
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
-#include <gicv2.h>
-#include <platform.h>
 #include <platform_def.h>
-#include <utils.h>
+
+#include <common/bl_common.h>
+#include <drivers/arm/gicv2.h>
+#include <lib/utils.h>
+#include <plat/common/platform.h>
 
 #include <stm32mp1_private.h>
 
index 673706eed02d17f262c34f0a723f11d264edb1a1..61c587f4f1d0e899701cbe1d7258c5f22d3bdd21 100644 (file)
@@ -4,12 +4,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <platform_def.h>
+
 #include <arch.h>
 #include <asm_macros.S>
-#include <bl_common.h>
-#include <platform_def.h>
-#include <stm32_gpio.h>
-#include <stm32mp1_rcc.h>
+#include <common/bl_common.h>
+#include <drivers/st/stm32_gpio.h>
+#include <drivers/st/stm32mp1_rcc.h>
 
 #define GPIO_BANK_G_ADDRESS    0x50008000
 #define GPIO_TX_PORT           11
index e24af0e5535948ad3a57a601752456f38bd7b981..85189ff21de06d301982336916407c413f734ff9 100644 (file)
@@ -4,21 +4,24 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <boot_api.h>
-#include <debug.h>
-#include <dt-bindings/clock/stm32mp1-clks.h>
 #include <errno.h>
-#include <gic_common.h>
-#include <gicv2.h>
-#include <mmio.h>
+
 #include <platform_def.h>
-#include <platform.h>
-#include <psci.h>
-#include <stm32mp1_clk.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/arm/gic_common.h>
+#include <drivers/arm/gicv2.h>
+#include <drivers/st/stm32mp1_clk.h>
+#include <drivers/st/stm32mp1_rcc.h>
+#include <dt-bindings/clock/stm32mp1-clks.h>
+#include <lib/mmio.h>
+#include <lib/psci/psci.h>
+#include <plat/common/platform.h>
+
+#include <boot_api.h>
 #include <stm32mp1_private.h>
-#include <stm32mp1_rcc.h>
 
 static uint32_t stm32_sec_entrypoint;
 static uint32_t cntfrq_core0;
index e783c14e45d29d71b17928ada6607df10bc70c89..39927040a84e8ecbadc868203fb8a136ab8501fb 100644 (file)
@@ -4,16 +4,19 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
-#include <dt-bindings/clock/stm32mp1-clks.h>
-#include <mmio.h>
 #include <stdint.h>
-#include <stm32mp1_clk.h>
+
+#include <platform_def.h>
+
+#include <common/debug.h>
+#include <drivers/arm/tzc400.h>
+#include <drivers/st/stm32mp1_clk.h>
+#include <drivers/st/stm32mp1_rcc.h>
+#include <dt-bindings/clock/stm32mp1-clks.h>
+#include <lib/mmio.h>
+
 #include <stm32mp1_dt.h>
 #include <stm32mp1_private.h>
-#include <stm32mp1_rcc.h>
-#include <tzc400.h>
-#include "platform_def.h"
 
 /*******************************************************************************
  * Initialize the TrustZone Controller. Configure Region 0 with Secure RW access
index c681300979d4fec41712148b7c4baae3534eb190..14e8e161212f90ee221e10037c1156e030036014 100644 (file)
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
-#include <platform.h>
 #include <stdint.h>
 
+#include <arch_helpers.h>
+#include <plat/common/platform.h>
+
 #define RANDOM_CANARY_VALUE    2144346116U
 
 u_register_t plat_get_stack_protector_canary(void)
index 405aa33eb3425b49ce63b10ea42ce44b3a3e1deb..59a0c17cf2aaa9a11d0f0f7d5065a27da1f666c5 100644 (file)
@@ -5,8 +5,9 @@
  */
 
 #include <platform_def.h>
-#include <platform.h>
-#include <psci.h>
+
+#include <lib/psci/psci.h>
+#include <plat/common/platform.h>
 
 /* 1 cluster, all cores into */
 static const unsigned char stm32mp1_power_domain_tree_desc[] = {
index 1bf58eda82230b6c9f7453cd0ba13d06d88fc1a7..4c8f88220442805b432c8c4fce4e1c1ebe10e553 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef BOARD_DEF_H
 #define BOARD_DEF_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
 
 /* The ports must be in order and contiguous */
 #define K3_CLUSTER0_CORE_COUNT         2
index 92414b9050f0ae1d82be1e5e08a28a3ffc7ce4be..5dd54d4ff3a53dc5a4d2a6a28984b77a0fc5b6a9 100644 (file)
@@ -7,14 +7,16 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
-#include <debug.h>
 #include <errno.h>
-#include <mmio.h>
-#include <platform_def.h>
 #include <stdlib.h>
-#include <utils.h>
-#include <utils_def.h>
+
+#include <platform_def.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <lib/mmio.h>
+#include <lib/utils.h>
+#include <lib/utils_def.h>
 
 #include "sec_proxy.h"
 
index 7ba0267dcc31ce38967ecdbc3660750878239c44..b211bdf60bf7163f8718fb152f6ca98035b47010 100644 (file)
@@ -7,13 +7,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
 #include <errno.h>
-#include <platform_def.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <string.h>
 
+#include <platform_def.h>
+
+#include <common/debug.h>
 #include <sec_proxy.h>
 
 #include "ti_sci_protocol.h"
index c0cf5e2a87321bf74ec9fd9dd6f548d65ea0ee64..3fa11b2318ec00c73a6707ced936aab8b0313942 100644 (file)
@@ -4,17 +4,20 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <assert.h>
+#include <string.h>
+
+#include <platform_def.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <assert.h>
-#include <bl_common.h>
-#include <debug.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
+
 #include <k3_console.h>
 #include <k3_gicv3.h>
-#include <platform_def.h>
-#include <string.h>
 #include <ti_sci.h>
-#include <xlat_tables_v2.h>
 
 /* Table of regions to map using the MMU */
 const mmap_region_t plat_k3_mmap[] = {
index ff3ca61ce6c75524f38057babdca83e53214cf7d..31c963245dadc8e2ff41917f9b7075cf2c695d31 100644 (file)
@@ -4,10 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <console.h>
-#include <k3_console.h>
 #include <platform_def.h>
-#include <uart_16550.h>
+
+#include <drivers/console.h>
+#include <drivers/ti/uart/uart_16550.h>
+
+#include <k3_console.h>
 
 void bl31_console_setup(void)
 {
index 3253130f6e765f63c05f2d233d15ad8681f56fe9..b7c7880141ffe9fec1583cfcaf575164f64b55c8 100644 (file)
@@ -4,13 +4,15 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
-#include <gicv3.h>
-#include <interrupt_props.h>
-#include <k3_gicv3.h>
-#include <platform.h>
 #include <platform_def.h>
-#include <utils.h>
+
+#include <common/bl_common.h>
+#include <common/interrupt_props.h>
+#include <drivers/arm/gicv3.h>
+#include <lib/utils.h>
+#include <plat/common/platform.h>
+
+#include <k3_gicv3.h>
 
 /* The GICv3 driver only needs to be initialized in EL3 */
 uintptr_t rdistif_base_addrs[PLATFORM_CORE_COUNT];
index 787cc82fda535a561fa1a056858039374936489a..cb75bf6544143f10c530380f1cee4ef35166bcfd 100644 (file)
@@ -4,19 +4,21 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <cpu_data.h>
-#include <debug.h>
-#include <k3_gicv3.h>
-#include <psci.h>
-/* Need to flush psci internal locks before shutdown or their values are lost */
-#include <../../lib/psci/psci_private.h>
-#include <platform.h>
 #include <stdbool.h>
 
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <lib/el3_runtime/cpu_data.h>
+#include <lib/psci/psci.h>
+#include <plat/common/platform.h>
+
+#include <k3_gicv3.h>
 #include <ti_sci.h>
 
+/* 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;
index d7ac0a5894dfd99200f008c5a3dac0243af08ec4..2b98acb278b5867d22664ad6686164a29063a276 100644 (file)
@@ -5,7 +5,8 @@
  */
 
 #include <platform_def.h>
-#include <psci.h>
+
+#include <lib/psci/psci.h>
 
 /* The power domain tree descriptor */
 static unsigned char power_domain_tree_desc[] = {
index 7d1df0aef78f6675dfb522c670da0ae2c763af16..5d563b6f0a0b2435f5682a71f8d9f32a52c9c14f 100644 (file)
@@ -8,8 +8,9 @@
 #define PLATFORM_DEF_H
 
 #include <arch.h>
+#include <plat/common/common_def.h>
+
 #include <board_def.h>
-#include <common_def.h>
 
 /*******************************************************************************
  * Generic platform constants
index c13b1b52a079868b57d8cbbd72b5d978111b8fec..587b797d7615a930162961bc7649d704f807cf8a 100644 (file)
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
-#include <generic_delay_timer.h>
-#include <mmio.h>
-#include <platform.h>
-#include <xlat_tables.h>
+#include <common/debug.h>
+#include <drivers/generic_delay_timer.h>
+#include <lib/mmio.h>
+#include <lib/xlat_tables/xlat_tables.h>
+#include <plat/common/platform.h>
+
 #include "../versal_def.h"
 #include "../versal_private.h"
 
index 1b7f95596c3064e62e9996f7cb1c5c5dd9582121..26eb05221fef01f2b93dd5ab6664324408c38726 100644 (file)
@@ -6,7 +6,7 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <gicv3.h>
+#include <drivers/arm/gicv3.h>
 #include <platform_def.h>
 
        .globl  plat_secondary_cold_boot_setup
index 9f71a1cc3ae5e93ef9e71d959e4b8be5d4802130..d7e07e036a8b32cb855d03187d55afc18f3fd98e 100644 (file)
@@ -5,14 +5,16 @@
  */
 
 #include <assert.h>
-#include <bl_common.h>
-#include <bl31.h>
-#include <console.h>
-#include <debug.h>
 #include <errno.h>
-#include <platform.h>
-#include <pl011.h>
-#include <xlat_tables.h>
+
+#include <bl31/bl31.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/arm/pl011.h>
+#include <drivers/console.h>
+#include <lib/xlat_tables/xlat_tables.h>
+#include <plat/common/platform.h>
+
 #include "versal_private.h"
 
 static entry_point_info_t bl32_image_ep_info;
index 4fc1315bee7397b3775ecfca9e7f7ad64f74f575..3a5221225127d620c31d2d10f58ca143342ea29b 100644 (file)
@@ -7,10 +7,11 @@
 #ifndef PLAT_MACROS_S
 #define PLAT_MACROS_S
 
+#include <drivers/arm/gic_common.h>
+#include <drivers/arm/gicv2.h>
+#include <drivers/arm/gicv3.h>
+
 #include "../include/platform_def.h"
-#include <gic_common.h>
-#include <gicv2.h>
-#include <gicv3.h>
 
 .section .rodata.gic_reg_name, "aS"
 /* Applicable only to GICv2 and GICv3 with SRE disabled (legacy mode) */
index 45aaa84be0fdd5bc604eee5c021f4da59679474d..0c4b9544f2803c7ece81031f7248a28a41ff8e33 100644 (file)
@@ -8,6 +8,7 @@
 #define PLATFORM_DEF_H
 
 #include <arch.h>
+
 #include "../versal_def.h"
 
 /*******************************************************************************
index 37d00f66c89d8771466e1f689b073b5c1da4398c..4a443697f02f2f7e4ec1f7d7032f8b4988a2f581 100644 (file)
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
-#include <mmio.h>
-#include <platform.h>
-#include <psci.h>
+#include <common/debug.h>
+#include <lib/mmio.h>
+#include <lib/psci/psci.h>
+#include <plat/common/platform.h>
+
 #include "versal_private.h"
 
 static uintptr_t versal_sec_entry;
index 152cb3626de554b2bd76551099fc20ac9f79bcff..642867da29ccdebbca146a92470d3bcff92eb329 100644 (file)
@@ -3,7 +3,9 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include <platform.h>
+
+#include <plat/common/platform.h>
+
 #include "versal_private.h"
 
 int plat_core_pos_by_mpidr(u_register_t mpidr)
index 4007d5c8f7390cb69aa3005c5ee43f720f22b621..8f2180b211930ac11bb3681941c22697c3fa86dc 100644 (file)
@@ -6,9 +6,9 @@
 
 /* Top level SMC handler for SiP calls. Dispatch PM calls to PM SMC handler. */
 
-#include <debug.h>
-#include <runtime_svc.h>
-#include <uuid.h>
+#include <common/debug.h>
+#include <common/runtime_svc.h>
+#include <tools_share/uuid.h>
 
 /* SMC function IDs for SiP Service queries */
 #define VERSAL_SIP_SVC_CALL_COUNT      0x8200ff00
index 5e42bd7840d1da5f8e61b392cda980528475e200..41c65b94dec725ce789f2d649c95a249241564ad 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef VERSAL_DEF_H
 #define VERSAL_DEF_H
 
-#include <common_def.h>
+#include <plat/common/common_def.h>
 
 /* List all consoles */
 #define VERSAL_CONSOLE_ID_pl011        1
index 72374b53b18f44dcbea22d3cff21111094efa297..dcf23b4253c353d4a862da68395f32caf86ecabd 100644 (file)
@@ -4,11 +4,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <gicv3.h>
-#include <interrupt_props.h>
-#include <platform.h>
 #include <platform_def.h>
-#include <utils.h>
+
+#include <common/interrupt_props.h>
+#include <drivers/arm/gicv3.h>
+#include <lib/utils.h>
+#include <plat/common/platform.h>
+
 #include "versal_private.h"
 
 /******************************************************************************
index 1e30ebc28e49f9bfb3f358bfb4ca566b305ac194..5d98d080c5fa73c29ee1dd18400d40ab16eddbf5 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef VERSAL_PRIVATE_H
 #define VERSAL_PRIVATE_H
 
-#include <xlat_tables.h>
+#include <lib/xlat_tables/xlat_tables.h>
 
 void versal_config_setup(void);
 
index 2f4228fea47ab41ed82ceac148cac5e76a573bee..23c02e068bfb8c2459ea1bdbd6bf8a24351e44c3 100644 (file)
@@ -4,13 +4,15 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
-#include <generic_delay_timer.h>
-#include <mmio.h>
-#include <platform.h>
 #include <stdbool.h>
 #include <string.h>
-#include <xlat_tables.h>
+
+#include <common/debug.h>
+#include <drivers/generic_delay_timer.h>
+#include <lib/mmio.h>
+#include <lib/xlat_tables/xlat_tables.h>
+#include <plat/common/platform.h>
+
 #include "../zynqmp_private.h"
 #include "pm_api_sys.h"
 
index 969d8faa1f8ee991826f26365f40a61ac59db7de..8d81665387b2ab476b11728eebe25a5a1cfc507a 100644 (file)
@@ -5,7 +5,7 @@
  */
 
 #include <asm_macros.S>
-#include <gicv2.h>
+#include <drivers/arm/gicv2.h>
 #include <platform_def.h>
 
        .globl  plat_secondary_cold_boot_setup
index 01634500aff0d06c974da8447c97d368b7c6cabe..01cd781ff64ee13c1079bd35ff00df57ba18f66e 100644 (file)
@@ -5,13 +5,15 @@
  */
 
 #include <assert.h>
-#include <bl31.h>
-#include <bl_common.h>
-#include <console.h>
-#include <debug.h>
 #include <errno.h>
+
+#include <bl31/bl31.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/console.h>
 #include <plat_arm.h>
-#include <platform.h>
+#include <plat/common/platform.h>
+
 #include "zynqmp_private.h"
 
 #define BL31_END (unsigned long)(&__BL31_END__)
index d721778d3002f85faa7679f94521eb7e0d666923..e3c9fcc1720740740e707e26a1f86bd52fb65c0c 100644 (file)
@@ -8,9 +8,10 @@
 #define PLATFORM_DEF_H
 
 #include <arch.h>
-#include <gic_common.h>
-#include <interrupt_props.h>
-#include <utils_def.h>
+#include <common/interrupt_props.h>
+#include <drivers/arm/gic_common.h>
+#include <lib/utils_def.h>
+
 #include "../zynqmp_def.h"
 
 /*******************************************************************************
index bfc19d3397296f7a14ea2833ae2e529e5ca2c8d2..11f382a05392b1b68725e2c98faaf78cab175268 100644 (file)
@@ -8,12 +8,14 @@
  * Top-level SMC handler for ZynqMP IPI Mailbox doorbell functions.
  */
 
-#include <bakery_lock.h>
-#include <debug.h>
 #include <errno.h>
-#include <mmio.h>
-#include <runtime_svc.h>
 #include <string.h>
+
+#include <common/debug.h>
+#include <common/runtime_svc.h>
+#include <lib/bakery_lock.h>
+#include <lib/mmio.h>
+
 #include "ipi_mailbox_svc.h"
 #include "../zynqmp_ipi.h"
 #include "../zynqmp_private.h"
index a82f69677d95b63438855eb85185437e39ec09fc..4183979a2c4af7676918227ff2e58664b52e6d63 100644 (file)
@@ -4,15 +4,17 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
 #include <errno.h>
-#include <gicv2.h>
-#include <mmio.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <drivers/arm/gicv2.h>
+#include <lib/mmio.h>
+#include <lib/psci/psci.h>
+#include <plat/common/platform.h>
+
 #include <plat_arm.h>
-#include <platform.h>
-#include <psci.h>
 #include "pm_api_sys.h"
 #include "pm_client.h"
 #include "zynqmp_private.h"
index d3e182cac5e463d81712d2bdf3367be4bea3a7c6..03f0e3d82d72175181433a8cf1aa9eebc453353f 100644 (file)
@@ -4,10 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <debug.h>
-#include <mmio.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <lib/mmio.h>
+
 #include "zynqmp_def.h"
 #include "zynqmp_private.h"
 
index 2441630bd5f49e2e62556fa6e2f8d8278f3b5426..ad18aafc305988298701c3ce2d91df873dda4068 100644 (file)
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <platform.h>
+#include <plat/common/platform.h>
+
 #include "zynqmp_private.h"
 
 int plat_core_pos_by_mpidr(u_register_t mpidr)
index b175b78b3ebd39fa6fe05a356a6542f19ebb6e43..04a58b488d0738e33ca7669ac4c0247e3e80d84b 100644 (file)
@@ -8,11 +8,13 @@
  * ZynqMP system level PM-API functions for clock control.
  */
 
-#include <arch_helpers.h>
-#include <mmio.h>
-#include <platform.h>
 #include <stdbool.h>
 #include <string.h>
+
+#include <arch_helpers.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
+
 #include "pm_api_clock.h"
 #include "pm_api_sys.h"
 #include "pm_client.h"
index f7cbdbaf08114d80665e48694cedb73b37d91b30..44e9773d099a4e3f7f5e91935e3a8bec107956ac 100644 (file)
@@ -11,7 +11,8 @@
 #ifndef PM_API_CLOCK_H
 #define PM_API_CLOCK_H
 
-#include <utils_def.h>
+#include <lib/utils_def.h>
+
 #include "pm_common.h"
 
 #define CLK_NAME_LEN           U(15)
index 16c08ae6d2c2be9295e9bd043c5b14419cd6f72a..fd9d7c0700acd45f197795c09d17c90e2a1decd1 100644 (file)
@@ -9,9 +9,10 @@
  */
 
 #include <arch_helpers.h>
-#include <delay_timer.h>
-#include <mmio.h>
-#include <platform.h>
+#include <drivers/delay_timer.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
+
 #include "pm_api_clock.h"
 #include "pm_api_ioctl.h"
 #include "pm_api_sys.h"
index 12b9c2d29ce76220724b6214fb896095c9e4d081..a900057e81a30bee34326f5be9d7f33a76d0cd56 100644 (file)
@@ -8,9 +8,11 @@
  * ZynqMP system level PM-API functions for pin control.
  */
 
-#include <arch_helpers.h>
-#include <platform.h>
 #include <string.h>
+
+#include <arch_helpers.h>
+#include <plat/common/platform.h>
+
 #include "pm_api_pinctrl.h"
 #include "pm_api_sys.h"
 #include "pm_client.h"
index e85b2cee338b09883799bf7a98d5e59525d260de..974dbb3d7db5331aede01fba26d40596f8a73bf5 100644 (file)
@@ -10,7 +10,8 @@
  */
 
 #include <arch_helpers.h>
-#include <platform.h>
+#include <plat/common/platform.h>
+
 #include "pm_api_clock.h"
 #include "pm_api_ioctl.h"
 #include "pm_api_pinctrl.h"
index fee91cdd9989f50079353c7999c74fc9991a1632..a0040cf8dda52e795c11ad256cd5b525599c13e4 100644 (file)
@@ -8,6 +8,7 @@
 #define PM_API_SYS_H
 
 #include <stdint.h>
+
 #include "pm_defs.h"
 
 enum pm_query_id {
index 874b8a9eac9eb5200efa5b699b227add3d5ce3d2..bebb74ce7fb96963de4ae8430a2835e6f5e2b7ad 100644 (file)
  */
 
 #include <assert.h>
-#include <bakery_lock.h>
-#include <bl_common.h>
-#include <gic_common.h>
-#include <gicv2.h>
-#include <mmio.h>
 #include <string.h>
-#include <utils.h>
+
+#include <common/bl_common.h>
+#include <drivers/arm/gic_common.h>
+#include <drivers/arm/gicv2.h>
+#include <lib/bakery_lock.h>
+#include <lib/mmio.h>
+#include <lib/utils.h>
+
 #include "../zynqmp_def.h"
 #include "pm_api_sys.h"
 #include "pm_client.h"
index 54746271f60fe24030da82a1b35aa6297901ed83..94e0568f6059c2617fbd1f300cc3068a88313c35 100644 (file)
 #ifndef PM_COMMON_H
 #define PM_COMMON_H
 
-#include <debug.h>
 #include <stdint.h>
+
+#include <common/debug.h>
+
 #include "pm_defs.h"
 
 #define PAYLOAD_ARG_CNT                6U
index dc1ea4d1229121ee9fca9b7a81592e724484cbd5..b3d833dfe294b215a030242aea5988d7121c38ce 100644 (file)
@@ -5,9 +5,10 @@
  */
 
 #include <arch_helpers.h>
-#include <bakery_lock.h>
-#include <mmio.h>
-#include <platform.h>
+#include <lib/bakery_lock.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
+
 #include "../zynqmp_ipi.h"
 #include "../zynqmp_private.h"
 #include "pm_ipi.h"
index 7790c979dfbeb405632d89e09cbd959a343ef91a..c885915528b4d20deda2cd0949e5db66c5ae9999 100644 (file)
  */
 
 #include <errno.h>
-#include <runtime_svc.h>
+
+#include <common/runtime_svc.h>
+#if ZYNQMP_WDT_RESTART
+#include <arch_helpers.h>
+#include <drivers/arm/gicv2.h>
+#include <lib/mmio.h>
+#include <lib/spinlock.h>
+#include <plat/common/platform.h>
+#endif
+
 #include "../zynqmp_private.h"
 #include "pm_api_sys.h"
 #include "pm_client.h"
 #include "pm_ipi.h"
-#if ZYNQMP_WDT_RESTART
-#include <arch_helpers.h>
-#include <gicv2.h>
-#include <mmio.h>
-#include <platform.h>
-#include <spinlock.h>
-#endif
 
 #define PM_SET_SUSPEND_MODE    0xa02
 #define PM_GET_TRUSTZONE_VERSION       0xa03
index 9fe709db90769cba0aaae4fb1713d0ace9827ead..8d23a014c553f4800035d95013e0da44e6851d4d 100644 (file)
@@ -6,8 +6,9 @@
 
 /* Top level SMC handler for SiP calls. Dispatch PM calls to PM SMC handler. */
 
-#include <runtime_svc.h>
-#include <uuid.h>
+#include <common/runtime_svc.h>
+#include <tools_share/uuid.h>
+
 #include "ipi_mailbox_svc.h"
 #include "pm_svc_main.h"
 #include "zynqmp_ipi.h"
index a27f34b45b8af924b8130a449e89646ac0ba6bea..25359f91aa4ce55e735848859a17efec41da0c0f 100644 (file)
@@ -4,11 +4,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <bl_common.h>
-#include <console.h>
-#include <debug.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <drivers/console.h>
+
 #include <plat_arm.h>
 #include <platform_tsp.h>
+
 #include "../zynqmp_private.h"
 
 #define BL32_END (unsigned long)(&__BL32_END__)
index ba382dd8b2b127a645db43f5e171ca3446d68593..f75530e7fa61aeb6b9bcd70a39394d324cbd9b03 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef ZYNQMP_DEF_H
 #define ZYNQMP_DEF_H
 
-#include <common_def.h>
+#include <plat/common/common_def.h>
 
 #define ZYNQMP_CONSOLE_ID_cadence      1
 #define ZYNQMP_CONSOLE_ID_cadence0     1
index 5038f8477a7bb216fb4731710889a16f6624d24f..54b18380def0158e03c6a416cd1a3a711caa1681 100644 (file)
@@ -8,12 +8,14 @@
  * Zynq UltraScale+ MPSoC IPI agent registers access management
  */
 
-#include <bakery_lock.h>
-#include <debug.h>
 #include <errno.h>
-#include <mmio.h>
-#include <runtime_svc.h>
 #include <string.h>
+
+#include <common/debug.h>
+#include <common/runtime_svc.h>
+#include <lib/bakery_lock.h>
+#include <lib/mmio.h>
+
 #include "zynqmp_ipi.h"
 #include "../zynqmp_private.h"
 
index 8a8d38abfe12e9e42284a61cc02bdd0b3a74548a..a8ebcebeeb219ec7c6f2c473484d4aa9f5ae9c56 100644 (file)
@@ -7,10 +7,11 @@
 #ifndef ZYNQMP_PRIVATE_H
 #define ZYNQMP_PRIVATE_H
 
-#include <bl_common.h>
-#include <interrupt_mgmt.h>
 #include <stdint.h>
 
+#include <bl31/interrupt_mgmt.h>
+#include <common/bl_common.h>
+
 void zynqmp_config_setup(void);
 
 unsigned int zynqmp_calc_core_pos(u_register_t mpidr);
index 3a5299fdf3039a1303a12d30addcd0634ed3522c..dfbe02cd3c8b21811ffd80bfb39c2f7f6da9cc2c 100644 (file)
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arm_arch_svc.h>
-#include <debug.h>
-#include <errata_report.h>
-#include <runtime_svc.h>
-#include <smccc.h>
+#include <common/debug.h>
+#include <common/runtime_svc.h>
+#include <lib/cpus/errata_report.h>
+#include <lib/cpus/wa_cve_2017_5715.h>
+#include <lib/cpus/wa_cve_2018_3639.h>
+#include <lib/smccc.h>
+#include <services/arm_arch_svc.h>
 #include <smccc_helpers.h>
-#include <wa_cve_2017_5715.h>
-#include <wa_cve_2018_3639.h>
 
 static int32_t smccc_version(void)
 {
index e5e2be77ef4717635526efdf61648cf153b3cae8..9aa19c5b9c0feeed0b5fb353f464828caedca6a9 100644 (file)
@@ -4,12 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <context_mgmt.h>
 #include <string.h>
-#include <utils.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/utils.h>
+
 #include "opteed_private.h"
 
 /*******************************************************************************
index 59d6ed29411fcc530a16bca2738969042e79a77e..160a693b2cd6fad7c08e4fa45405e141ed64b227 100644 (file)
  * handle the request locally or delegate it to the Secure Payload. It is also
  * responsible for initialising and maintaining communication with the SP.
  ******************************************************************************/
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl31.h>
-#include <bl_common.h>
-#include <context_mgmt.h>
-#include <debug.h>
 #include <errno.h>
-#include <platform.h>
-#include <runtime_svc.h>
 #include <stddef.h>
-#include <uuid.h>
+
+#include <arch_helpers.h>
+#include <bl31/bl31.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/runtime_svc.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <plat/common/platform.h>
+#include <tools_share/uuid.h>
+
 #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.
index b1336517e7e1b9b14870bb69e4a0784e569cdcf1..719eeb748df900d2855d10f0f38e8ddabf272f3a 100644 (file)
@@ -4,12 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <context_mgmt.h>
-#include <debug.h>
-#include <platform.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <plat/common/platform.h>
+
 #include "opteed_private.h"
 
 /*******************************************************************************
index 1a67fce7f64700e9e52df752d95a0d62c6ce5457..847b9c5c1a0c93ec1d1caf5bbdd7a082be9fdc4e 100644 (file)
@@ -7,11 +7,12 @@
 #ifndef OPTEED_PRIVATE_H
 #define OPTEED_PRIVATE_H
 
+#include <platform_def.h>
+
 #include <arch.h>
+#include <bl31/interrupt_mgmt.h>
 #include <context.h>
-#include <interrupt_mgmt.h>
-#include <platform_def.h>
-#include <psci.h>
+#include <lib/psci/psci.h>
 
 /*******************************************************************************
  * OPTEE PM state information e.g. OPTEE is suspended, uninitialised etc
 
 #ifndef __ASSEMBLY__
 
-#include <cassert.h>
 #include <stdint.h>
 
+#include <lib/cassert.h>
+
 typedef uint32_t optee_vector_isn_t;
 
 typedef struct optee_vectors {
index 0068dc7316b8a9039faf74817f4312df378c831d..9d8a1697f9963c738a335a649df3144700b58c83 100644 (file)
@@ -6,7 +6,7 @@
 #ifndef TEESMC_OPTEED_MACROS_H
 #define TEESMC_OPTEED_MACROS_H
 
-#include <runtime_svc.h>
+#include <common/runtime_svc.h>
 
 #define TEESMC_OPTEED_RV(func_num) \
                ((SMC_TYPE_FAST << FUNCID_TYPE_SHIFT) | \
index 6fec91bca75da409895d3c3306200662b7dae051..2f0194eb2f5a3f5f154f985ae010dd699f12a356 100644 (file)
@@ -4,11 +4,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <context_mgmt.h>
 #include <string.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <lib/el3_runtime/context_mgmt.h>
+
 #include "tlkd_private.h"
 
 #define AT_MASK                3
index cee7ef865deb476cdfef782a7fb9771f59df6fb4..ffe3319ec6877756863bbf4fc23bbfe4e244e595 100644 (file)
  ******************************************************************************/
 #include <arch_helpers.h>
 #include <assert.h>
-#include <bl31.h>
-#include <bl_common.h>
-#include <context_mgmt.h>
-#include <debug.h>
 #include <errno.h>
-#include <platform.h>
-#include <runtime_svc.h>
 #include <stddef.h>
+
+#include <bl31/bl31.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/runtime_svc.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <plat/common/platform.h>
+#include <tools_share/uuid.h>
+
 #include <tlk.h>
-#include <uuid.h>
 #include "tlkd_private.h"
 
 extern const spd_pm_ops_t tlkd_pm_ops;
index 2cd2fbbe799cf3ff2142b9fbaa94e958645c3990..de34bf6b51d784b34ff73f60b384cce425f042dd 100644 (file)
@@ -4,12 +4,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <context_mgmt.h>
-#include <debug.h>
-#include <psci.h>
+
+#include <arch_helpers.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/psci/psci.h>
 #include <tlk.h>
 
 #include "tlkd_private.h"
index 525cc3aec2e6062d9e0be3a1fcd6b89b261c8b13..53f9e20c30961e333e759bbc8c393e117fb426c7 100644 (file)
@@ -7,11 +7,12 @@
 #ifndef TLKD_PRIVATE_H
 #define TLKD_PRIVATE_H
 
+#include <platform_def.h>
+
 #include <arch.h>
+#include <bl31/interrupt_mgmt.h>
 #include <context.h>
-#include <interrupt_mgmt.h>
-#include <platform_def.h>
-#include <psci.h>
+#include <lib/psci/psci.h>
 
 /*
  * This flag is used by the TLKD to determine if the SP is servicing a yielding
 
 #ifndef __ASSEMBLY__
 
-#include <cassert.h>
 #include <stdint.h>
 
+#include <lib/cassert.h>
+
 /* AArch64 callee saved general purpose register context structure. */
 DEFINE_REG_STRUCT(c_rt_regs, TLKD_C_RT_CTX_ENTRIES);
 
index 6f766c4db93f40c889f9718b05736de5db9a8fac..771e2cfb60b3279cec5926f79abe6a799f6eed13 100644 (file)
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <debug.h>
-#include <runtime_svc.h>
 #include <stdio.h>
 
+#include <common/debug.h>
+#include <common/runtime_svc.h>
+
 #include "generic-arm64-smcall.h"
 
 int trusty_disable_serial_debug;
index 333583622558919d48b0ae3605f3cef883b374dc..b6ebeeba4e8828d6d9785beffb4023450d2caf5f 100644 (file)
@@ -4,18 +4,19 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
-#include <assert.h> /* for context_mgmt.h */
-#include <bl31.h>
-#include <bl_common.h>
-#include <context_mgmt.h>
-#include <debug.h>
-#include <interrupt_mgmt.h>
-#include <platform.h>
-#include <runtime_svc.h>
+#include <assert.h>
 #include <stdbool.h>
 #include <string.h>
 
+#include <arch_helpers.h>
+#include <bl31/bl31.h>
+#include <bl31/interrupt_mgmt.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/runtime_svc.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <plat/common/platform.h>
+
 #include "sm_err.h"
 #include "smcall.h"
 
index de54dbe94ddfff6d52675bde91d350929f1a1fbf..063fd01ff18f080ed904564ecf0a833aaab4d497 100644 (file)
@@ -4,14 +4,16 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <context_mgmt.h>
-#include <debug.h>
 #include <string.h>
-#include <tsp.h>
-#include <utils.h>
+
+#include <arch_helpers.h>
+#include <bl32/tsp/tsp.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/utils.h>
+
 #include "tspd_private.h"
 
 /*******************************************************************************
index d2acda8d9e8761d6d94291f9a468cfa7455438b4..d2bd43f765bc5c91ed4998be68a90277e5b3aaeb 100644 (file)
  * handle the request locally or delegate it to the Secure Payload. It is also
  * responsible for initialising and maintaining communication with the SP.
  ******************************************************************************/
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl31.h>
-#include <bl_common.h>
-#include <context_mgmt.h>
-#include <debug.h>
-#include <ehf.h>
 #include <errno.h>
-#include <platform.h>
-#include <runtime_svc.h>
 #include <stddef.h>
 #include <string.h>
-#include <tsp.h>
-#include <uuid.h>
+
+#include <arch_helpers.h>
+#include <bl31/bl31.h>
+#include <bl31/ehf.h>
+#include <bl32/tsp/tsp.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/runtime_svc.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <plat/common/platform.h>
+#include <tools_share/uuid.h>
+
 #include "tspd_private.h"
 
 /*******************************************************************************
index 9414c154e5b78edd3e4f9b0812a283dc023150b8..b95ee8fbaec2870db6664dafb2c1fc88b53d1914 100644 (file)
@@ -4,13 +4,15 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <context_mgmt.h>
-#include <debug.h>
-#include <platform.h>
-#include <tsp.h>
+
+#include <arch_helpers.h>
+#include <bl32/tsp/tsp.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <plat/common/platform.h>
+
 #include "tspd_private.h"
 
 /*******************************************************************************
index e2e333d09bd853175dce3caff943e06cdb20c0d5..50f3b875e58c30f5bcb2f335c4e3ad522cc019e1 100644 (file)
@@ -7,11 +7,12 @@
 #ifndef TSPD_PRIVATE_H
 #define TSPD_PRIVATE_H
 
+#include <platform_def.h>
+
 #include <arch.h>
+#include <bl31/interrupt_mgmt.h>
 #include <context.h>
-#include <interrupt_mgmt.h>
-#include <platform_def.h>
-#include <psci.h>
+#include <lib/psci/psci.h>
 
 /*******************************************************************************
  * Secure Payload PM state information e.g. SP is suspended, uninitialised etc
 
 #ifndef __ASSEMBLY__
 
-#include <cassert.h>
 #include <stdint.h>
 
+#include <lib/cassert.h>
+
 /*
  * The number of arguments to save during a SMC call for TSP.
  * Currently only x1 and x2 are used by TSP.
index ec69b9d274fd34cd8acdd27d1e76c8779454bcf4..0b608e1b64a60749a8b20306e2381df1b47ab106 100644 (file)
@@ -5,7 +5,9 @@
  */
 
 #include <assert.h>
-#include <utils.h>
+
+#include <lib/utils.h>
+
 #include "sdei_private.h"
 
 #define MAP_OFF(_map, _mapping) ((_map) - (_mapping)->map)
index fa778c04e9ca1ffcceb05fe8ac7da839b5b93876..b8799cd49fafe08f647f5e769098169c25852fd3 100644 (file)
@@ -4,16 +4,18 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
-#include <cassert.h>
-#include <debug.h>
-#include <ehf.h>
-#include <interrupt_mgmt.h>
-#include <runtime_svc.h>
-#include <sdei.h>
 #include <string.h>
+
+#include <arch_helpers.h>
+#include <bl31/ehf.h>
+#include <bl31/interrupt_mgmt.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/runtime_svc.h>
+#include <lib/cassert.h>
+#include <services/sdei.h>
+
 #include "sdei_private.h"
 
 /* x0-x17 GPREGS context */
index 990d0287637c8e06dfc51944ee0fdf0ed7ec3de3..04241776411695652182c62a63691cbfe6bf3af8 100644 (file)
@@ -6,20 +6,22 @@
 
 #include <arch_helpers.h>
 #include <assert.h>
-#include <bl31.h>
-#include <bl_common.h>
-#include <cassert.h>
-#include <context.h>
-#include <debug.h>
-#include <ehf.h>
-#include <interrupt_mgmt.h>
-#include <platform.h>
-#include <pubsub.h>
-#include <runtime_svc.h>
-#include <sdei.h>
 #include <stddef.h>
 #include <string.h>
-#include <utils.h>
+
+#include <bl31/bl31.h>
+#include <bl31/ehf.h>
+#include <bl31/interrupt_mgmt.h>
+#include <common/bl_common.h>
+#include <common/debug.h>
+#include <common/runtime_svc.h>
+#include <context.h>
+#include <lib/cassert.h>
+#include <lib/el3_runtime/pubsub.h>
+#include <lib/utils.h>
+#include <plat/common/platform.h>
+#include <services/sdei.h>
+
 #include "sdei_private.h"
 
 #define MAJOR_VERSION  1ULL
index 821266740c20a40ac2f5fc300e6e482cba3e687c..b945394dcf3fd03eacb5180bbe597afd1e21ae32 100644 (file)
@@ -7,19 +7,20 @@
 #ifndef SDEI_PRIVATE_H
 #define SDEI_PRIVATE_H
 
-#include <arch_helpers.h>
-#include <context.h>
-#include <context_mgmt.h>
-#include <debug.h>
 #include <errno.h>
-#include <interrupt_mgmt.h>
-#include <platform.h>
-#include <sdei.h>
-#include <setjmp.h>
-#include <spinlock.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <utils_def.h>
+
+#include <arch_helpers.h>
+#include <bl31/interrupt_mgmt.h>
+#include <common/debug.h>
+#include <context.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/spinlock.h>
+#include <lib/utils_def.h>
+#include <plat/common/platform.h>
+#include <services/sdei.h>
+#include <setjmp.h>
 
 #ifdef AARCH32
 # error SDEI is implemented only for AArch64 systems
index 66657862d33c120f53266144dbb796235b5f4867..1b448e62e892ad81d3fa2be1931bec36f304377d 100644 (file)
@@ -5,8 +5,10 @@
  */
 
 #include <assert.h>
-#include <cassert.h>
 #include <stdbool.h>
+
+#include <lib/cassert.h>
+
 #include "sdei_private.h"
 
 /* Aliases for SDEI handler states: 'R'unning, 'E'nabled, and re'G'istered */
index 9c218dfe85e42a7dffb33a134c5e4a2473d8a199..dab6150129c0dcc7686df07ee500f1b1ca6e8bbf 100644 (file)
@@ -6,7 +6,7 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <bl_common.h>
+#include <common/bl_common.h>
 #include <context.h>
 
 /* -----------------------------------------------------------------------------
index 5e4ff918391be80c7e598a5351b3bebca3264243..44a0acd6f93c58f0712a8ffda41f24aca50e1910 100644 (file)
@@ -5,17 +5,18 @@
  */
 
 #include <assert.h>
-#include <context_mgmt.h>
-#include <debug.h>
 #include <errno.h>
-#include <smccc.h>
+#include <string.h>
+
+#include <common/debug.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/smccc.h>
+#include <lib/spinlock.h>
+#include <lib/utils.h>
+#include <services/spci_svc.h>
+#include <services/sprt_svc.h>
 #include <smccc_helpers.h>
-#include <spci_svc.h>
-#include <spinlock.h>
 #include <sprt_host.h>
-#include <sprt_svc.h>
-#include <string.h>
-#include <utils.h>
 
 #include "spm_private.h"
 
index 747337af38de356dca8a549afb2c43538eb943e7..0c26a74bac4e134351e80b7b914578c37e9a8522 100644 (file)
@@ -5,9 +5,9 @@
  */
 
 #include <arch_helpers.h>
+#include <lib/spinlock.h>
+#include <lib/utils_def.h>
 #include <platform_def.h>
-#include <spinlock.h>
-#include <utils_def.h>
 
 /*******************************************************************************
  * Secure Service response global array. All the responses to the requests done
index 460d1fb31ca21e7795e61f61a2dfbd0f1b3cc32b..adfffd58c5561cdd0ddc9ee00bddaee875d39757 100644 (file)
@@ -4,23 +4,24 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <bl31.h>
-#include <context_mgmt.h>
-#include <debug.h>
-#include <ehf.h>
 #include <errno.h>
-#include <interrupt_mgmt.h>
-#include <platform.h>
-#include <runtime_svc.h>
-#include <smccc.h>
-#include <smccc_helpers.h>
-#include <spinlock.h>
 #include <string.h>
-#include <sprt_svc.h>
-#include <utils.h>
-#include <xlat_tables_v2.h>
+
+#include <arch_helpers.h>
+#include <bl31/bl31.h>
+#include <bl31/ehf.h>
+#include <bl31/interrupt_mgmt.h>
+#include <common/debug.h>
+#include <common/runtime_svc.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/smccc.h>
+#include <lib/spinlock.h>
+#include <lib/utils.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
+#include <plat/common/platform.h>
+#include <services/sprt_svc.h>
+#include <smccc_helpers.h>
 
 #include "spm_private.h"
 
index c1aad933a0c7d621438e8049f63e84932bf58daf..1d5a88e88cd9d24041ad4b6e54e8c936a1e727dd 100644 (file)
 
 #ifndef __ASSEMBLY__
 
-#include <spinlock.h>
-#include <sp_res_desc.h>
 #include <stdint.h>
-#include <xlat_tables_v2.h>
+
+#include <lib/xlat_tables/xlat_tables_v2.h>
+#include <lib/spinlock.h>
+#include <services/sp_res_desc.h>
 
 typedef enum sp_state {
        SP_STATE_RESET = 0,
index aca779f5df877e3eb5c6db1f7683b32aa1ed177f..3aabc2007242de845616b6208147bbdd9b339948 100644 (file)
@@ -4,19 +4,21 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <assert.h>
+#include <string.h>
+
+#include <platform_def.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <assert.h>
-#include <common_def.h>
 #include <context.h>
-#include <context_mgmt.h>
-#include <debug.h>
-#include <platform_def.h>
-#include <platform.h>
-#include <sp_res_desc.h>
+#include <common/debug.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
+#include <plat/common/common_def.h>
+#include <plat/common/platform.h>
+#include <services/sp_res_desc.h>
 #include <sprt_host.h>
-#include <string.h>
-#include <xlat_tables_v2.h>
 
 #include "spm_private.h"
 #include "spm_shim_private.h"
index f2a7e052cd0e5caf058a31e83806efc7c594ae5d..7fe9692b4563aae9b7ac4c736c6908f11e44fad9 100644 (file)
@@ -8,7 +8,8 @@
 #define SPM_SHIM_PRIVATE_H
 
 #include <stdint.h>
-#include <utils_def.h>
+
+#include <lib/utils_def.h>
 
 /* Assembly source */
 IMPORT_SYM(uintptr_t, spm_shim_exceptions_ptr,         SPM_SHIM_EXCEPTIONS_PTR);
index bbe392ddd3fe86dd42bbfe16c1e756cf62443052..57ad742453a2f7493977f377ecfb607c30ccd4fa 100644 (file)
@@ -8,14 +8,16 @@
 #include <arch_helpers.h>
 #include <assert.h>
 #include <errno.h>
-#include <object_pool.h>
-#include <platform_def.h>
-#include <platform.h>
-#include <sp_res_desc.h>
 #include <string.h>
-#include <utils.h>
-#include <utils_def.h>
-#include <xlat_tables_v2.h>
+
+#include <platform_def.h>
+
+#include <lib/object_pool.h>
+#include <lib/utils.h>
+#include <lib/utils_def.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
+#include <plat/common/platform.h>
+#include <services/sp_res_desc.h>
 
 #include "spm_private.h"
 #include "spm_shim_private.h"
index 034dced7eb99c8f0fdcc1565a12f01fa11eec74c..f6af49fc489cb8374c8607628dcb22fe5f4c4b42 100644 (file)
@@ -4,17 +4,18 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arch_helpers.h>
 #include <assert.h>
-#include <context_mgmt.h>
-#include <debug.h>
 #include <errno.h>
 #include <limits.h>
-#include <platform.h>
-#include <smccc.h>
+
+#include <arch_helpers.h>
+#include <common/debug.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/smccc.h>
+#include <lib/utils.h>
+#include <plat/common/platform.h>
+#include <services/sprt_svc.h>
 #include <smccc_helpers.h>
-#include <sprt_svc.h>
-#include <utils.h>
 
 #include "spm_private.h"
 
index 9c218dfe85e42a7dffb33a134c5e4a2473d8a199..dab6150129c0dcc7686df07ee500f1b1ca6e8bbf 100644 (file)
@@ -6,7 +6,7 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <bl_common.h>
+#include <common/bl_common.h>
 #include <context.h>
 
 /* -----------------------------------------------------------------------------
index 880e86e49603c23666ddafcb1b07ab7035c85826..540f257bd366ee513e15fbd9c14d85b71b8d34ab 100644 (file)
@@ -6,21 +6,22 @@
 
 #include <arch_helpers.h>
 #include <assert.h>
-#include <bl31.h>
-#include <context_mgmt.h>
-#include <debug.h>
-#include <ehf.h>
 #include <errno.h>
-#include <mm_svc.h>
-#include <platform.h>
-#include <runtime_svc.h>
-#include <secure_partition.h>
-#include <smccc.h>
+
+#include <bl31/bl31.h>
+#include <bl31/ehf.h>
+#include <common/debug.h>
+#include <common/runtime_svc.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/smccc.h>
+#include <lib/spinlock.h>
+#include <lib/utils.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
+#include <plat/common/platform.h>
+#include <services/mm_svc.h>
+#include <services/secure_partition.h>
+#include <services/spm_svc.h>
 #include <smccc_helpers.h>
-#include <spinlock.h>
-#include <spm_svc.h>
-#include <utils.h>
-#include <xlat_tables_v2.h>
 
 #include "spm_private.h"
 
index ec3f48ea28f55098212cf537ff3096a86239c1ed..8e94a282464739a8ab337b65a9bbd1f0da8f2593 100644 (file)
 
 #ifndef __ASSEMBLY__
 
-#include <spinlock.h>
 #include <stdint.h>
-#include <xlat_tables_v2.h>
+
+#include <lib/spinlock.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
 
 typedef enum sp_state {
        SP_STATE_RESET = 0,
index 0d61306faf663cea387fadea82c28a911c8f7c18..d458f4a6a21ba27b8b544283f61daa0b37bc43e6 100644 (file)
@@ -4,18 +4,19 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <assert.h>
+#include <string.h>
+
 #include <arch.h>
 #include <arch_helpers.h>
-#include <assert.h>
-#include <common_def.h>
 #include <context.h>
-#include <context_mgmt.h>
-#include <debug.h>
+#include <common/debug.h>
+#include <lib/el3_runtime/context_mgmt.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
 #include <platform_def.h>
-#include <platform.h>
-#include <secure_partition.h>
-#include <string.h>
-#include <xlat_tables_v2.h>
+#include <plat/common/common_def.h>
+#include <plat/common/platform.h>
+#include <services/secure_partition.h>
 
 #include "spm_private.h"
 #include "spm_shim_private.h"
index f2a7e052cd0e5caf058a31e83806efc7c594ae5d..7fe9692b4563aae9b7ac4c736c6908f11e44fad9 100644 (file)
@@ -8,7 +8,8 @@
 #define SPM_SHIM_PRIVATE_H
 
 #include <stdint.h>
-#include <utils_def.h>
+
+#include <lib/utils_def.h>
 
 /* Assembly source */
 IMPORT_SYM(uintptr_t, spm_shim_exceptions_ptr,         SPM_SHIM_EXCEPTIONS_PTR);
index 3527138600c83f867f489311c3e29abf7993d3b9..f54168e33416e778b9b8c1b35970cf87848cb2b9 100644 (file)
@@ -8,11 +8,11 @@
 #include <arch_helpers.h>
 #include <assert.h>
 #include <errno.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
 #include <platform_def.h>
-#include <platform.h>
-#include <secure_partition.h>
-#include <spm_svc.h>
-#include <xlat_tables_v2.h>
+#include <plat/common/platform.h>
+#include <services/secure_partition.h>
+#include <services/spm_svc.h>
 
 #include "spm_private.h"
 #include "spm_shim_private.h"
index 86ecdf7b89b535e637414fe0c8d359863ee2f147..7a34655fd78d8ac2d53082adfef5e421b506b755 100644 (file)
@@ -5,18 +5,19 @@
  */
 
 #include <assert.h>
-#include <cpu_data.h>
-#include <debug.h>
-#include <pmf.h>
-#include <psci.h>
-#include <runtime_instr.h>
-#include <runtime_svc.h>
-#include <sdei.h>
-#include <smccc_helpers.h>
-#include <spm_svc.h>
-#include <std_svc.h>
 #include <stdint.h>
-#include <uuid.h>
+
+#include <common/debug.h>
+#include <common/runtime_svc.h>
+#include <lib/el3_runtime/cpu_data.h>
+#include <lib/pmf/pmf.h>
+#include <lib/psci/psci.h>
+#include <lib/runtime_instr.h>
+#include <services/sdei.h>
+#include <services/spm_svc.h>
+#include <services/std_svc.h>
+#include <smccc_helpers.h>
+#include <tools_share/uuid.h>
 
 /* Standard Service UUID */
 static uuid_t arm_svc_uid = {