andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

plat/arm: Sanitise includes 

Use full include paths like it is done for common includes.

This cleanup was started in commit d40e0e08283a ("Sanitise includes
across codebase"), but it only cleaned common files and drivers. This
patch does the same to Arm platforms.

Change-Id: If982e6450bbe84dceb56d464e282bcf5d6d9ab9b
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
This commit is contained in:
Antonio Nino Diaz 2019-01-25 14:30:04 +00:00
parent 7ca572d93c
commit bd9344f670
91 changed files with 136 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/plat/arm/board/common/board_css_def.h
View File

@ -8,11 +8,10 @@
#define BOARD_CSS_DEF_H
#include <lib/utils_def.h>
#include <plat/arm/board/common/v2m_def.h>
#include <plat/arm/soc/common/soc_css_def.h>
#include <plat/common/common_def.h>
#include <soc_css_def.h>
#include <v2m_def.h>
/*
* Definitions common to all ARM CSS-based development platforms
*/

2
include/plat/arm/board/common/v2m_def.h
View File

@ -6,7 +6,7 @@
#ifndef V2M_DEF_H
#define V2M_DEF_H
#include <lib/xlat_tables/xlat_tables_compat.h>
#include <lib/utils_def.h>
/* V2M motherboard system registers & offsets */
#define V2M_SYSREGS_BASE UL(0x1c010000)

2
lib/utils/mem_region.c
View File

@ -6,7 +6,9 @@
#include <assert.h>
#include <common/debug.h>
#include <lib/utils.h>
#include <lib/xlat_tables/xlat_tables_compat.h>
/*
* All the regions defined in mem_region_t must have the following properties

2
plat/arm/board/common/board_common.mk
View File

@ -4,8 +4,6 @@
# SPDX-License-Identifier: BSD-3-Clause
#
PLAT_INCLUDES += -Iinclude/plat/arm/board/common/
PLAT_BL_COMMON_SOURCES += drivers/arm/pl011/${ARCH}/pl011_console.S \
plat/arm/board/common/${ARCH}/board_arm_helpers.S

2
plat/arm/board/fvp/drivers/pwrc/fvp_pwrc.c
View File

@ -6,9 +6,9 @@
#include <lib/bakery_lock.h>
#include <lib/mmio.h>
#include <plat/arm/common/plat_arm.h>
#include <platform_def.h>
#include <plat_arm.h>
#include "../../fvp_private.h"
#include "fvp_pwrc.h"

3
plat/arm/board/fvp/fvp_bl1_setup.c
View File

@ -5,10 +5,9 @@
*/
#include <common/tbbr/tbbr_img_def.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <plat_arm.h>
#include "fvp_private.h"
/*******************************************************************************

3
plat/arm/board/fvp/fvp_bl2_el3_setup.c
View File

@ -4,7 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <plat_arm.h>
#include <plat/arm/common/plat_arm.h>
#include "fvp_private.h"
void bl2_el3_early_platform_setup(u_register_t arg0 __unused,

2
plat/arm/board/fvp/fvp_bl2_setup.c
View File

@ -7,10 +7,10 @@
#include <drivers/arm/sp804_delay_timer.h>
#include <drivers/generic_delay_timer.h>
#include <lib/mmio.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <platform_def.h>
#include <plat_arm.h>
#include "fvp_private.h"
void bl2_early_platform_setup2(u_register_t arg0, u_register_t arg1, u_register_t arg2, u_register_t arg3)

2
plat/arm/board/fvp/fvp_bl2u_setup.c
View File

@ -4,10 +4,10 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <platform_def.h>
#include <plat_arm.h>
#include "fvp_private.h"
void bl2u_early_platform_setup(struct meminfo *mem_layout, void *plat_info)

4
plat/arm/board/fvp/fvp_bl31_setup.c
View File

@ -5,10 +5,10 @@
*/
#include <drivers/arm/smmu_v3.h>
#include <plat/arm/common/arm_config.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <arm_config.h>
#include <plat_arm.h>
#include "fvp_private.h"
void __init bl31_early_platform_setup2(u_register_t arg0,

5
plat/arm/board/fvp/fvp_common.c
View File

@ -12,13 +12,12 @@
#include <drivers/arm/gicv2.h>
#include <lib/mmio.h>
#include <lib/xlat_tables/xlat_tables_compat.h>
#include <plat/arm/common/arm_config.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <platform_def.h>
#include <services/secure_partition.h>
#include <arm_config.h>
#include <plat_arm.h>
#include "fvp_private.h"
/* Defines for GIC Driver build time selection */

3
plat/arm/board/fvp/fvp_io_storage.c
View File

@ -11,10 +11,9 @@
#include <drivers/io/io_semihosting.h>
#include <drivers/io/io_storage.h>
#include <lib/semihosting.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/common_def.h>
#include <plat_arm.h>
/* Semihosting filenames */
#define BL2_IMAGE_NAME "bl2.bin"
#define BL31_IMAGE_NAME "bl31.bin"

6
plat/arm/board/fvp/fvp_pm.c
View File

@ -13,13 +13,11 @@
#include <lib/extensions/spe.h>
#include <lib/mmio.h>
#include <lib/psci/psci.h>
#include <plat/arm/common/arm_config.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <platform_def.h>
#include <arm_config.h>
#include <plat_arm.h>
#include "../../../../drivers/arm/gic/v3/gicv3_private.h"
#include "drivers/pwrc/fvp_pwrc.h"
#include "fvp_private.h"

2
plat/arm/board/fvp/fvp_private.h
View File

@ -7,7 +7,7 @@
#ifndef FVP_PRIVATE_H
#define FVP_PRIVATE_H
#include <plat_arm.h>
#include <plat/arm/common/plat_arm.h>
/*******************************************************************************
* Function and variable prototypes

4
plat/arm/board/fvp/fvp_security.c
View File

@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <arm_config.h>
#include <plat_arm.h>
#include <plat/arm/common/arm_config.h>
#include <plat/arm/common/plat_arm.h>
/*
* We assume that all security programming is done by the primary core.

4
plat/arm/board/fvp/fvp_topology.c
View File

@ -8,10 +8,10 @@
#include <arch.h>
#include <lib/cassert.h>
#include <plat/arm/common/arm_config.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <plat_arm.h>
#include <arm_config.h>
#include "drivers/pwrc/fvp_pwrc.h"
/* The FVP power domain tree descriptor */

4
plat/arm/board/fvp/include/plat.ld.S
View File

@ -6,7 +6,7 @@
#ifndef PLAT_LD_S
#define PLAT_LD_S
#include <arm_tzc_dram.ld.S>
#include <arm_reclaim_init.ld.S>
#include <plat/arm/common/arm_tzc_dram.ld.S>
#include <plat/arm/common/arm_reclaim_init.ld.S>
#endif /* PLAT_LD_S */

7
plat/arm/board/fvp/include/platform_def.h
View File

@ -20,12 +20,11 @@
#include <drivers/arm/tzc400.h>
#include <lib/utils_def.h>
#include <plat/arm/board/common/v2m_def.h>
#include <plat/arm/common/arm_def.h>
#include <plat/arm/common/arm_spm_def.h>
#include <plat/common/common_def.h>
#include <arm_def.h>
#include <arm_spm_def.h>
#include <v2m_def.h>
#include "../fvp_def.h"
/* Required platform porting definitions */

3
plat/arm/board/fvp/sp_min/fvp_sp_min_setup.c
View File

@ -4,7 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <plat_arm.h>
#include <plat/arm/common/plat_arm.h>
#include "../fvp_private.h"
void plat_arm_sp_min_early_platform_setup(u_register_t arg0, u_register_t arg1,

3
plat/arm/board/fvp/tsp/fvp_tsp_setup.c
View File

@ -4,7 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <plat_arm.h>
#include <plat/arm/common/plat_arm.h>
#include "../fvp_private.h"
void tsp_early_platform_setup(void)

10
plat/arm/board/juno/include/platform_def.h
View File

@ -23,13 +23,13 @@
#if TRUSTED_BOARD_BOOT
#include <drivers/auth/mbedtls/mbedtls_config.h>
#endif
#include <plat/arm/board/common/board_css_def.h>
#include <plat/arm/board/common/v2m_def.h>
#include <plat/arm/common/arm_def.h>
#include <plat/arm/css/common/css_def.h>
#include <plat/arm/soc/common/soc_css_def.h>
#include <plat/common/common_def.h>
#include <arm_def.h>
#include <board_css_def.h>
#include <css_def.h>
#include <soc_css_def.h>
#include <v2m_def.h>
#include "../juno_def.h"
/* Required platform porting definitions */

2
plat/arm/board/juno/juno_bl1_setup.c
View File

@ -10,10 +10,10 @@
#include <common/debug.h>
#include <common/tbbr/tbbr_img_def.h>
#include <drivers/arm/sp805.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <platform_def.h>
#include <plat_arm.h>
#include <sds.h>
void juno_reset_to_aarch32_state(void);

3
plat/arm/board/juno/juno_bl2_setup.c
View File

@ -8,8 +8,7 @@
#include <common/bl_common.h>
#include <common/desc_image_load.h>
#include <plat_arm.h>
#include <plat/arm/common/plat_arm.h>
#if JUNO_AARCH32_EL3_RUNTIME
/*******************************************************************************

2
plat/arm/board/juno/juno_common.c
View File

@ -5,7 +5,7 @@
*/
#include <platform_def.h>
#include <plat_arm.h>
#include <plat/arm/common/plat_arm.h>
/*
* Table of memory regions for different BL stages to map using the MMU.

3
plat/arm/board/juno/juno_pm.c
View File

@ -4,7 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <plat_arm.h>
#include <plat/arm/common/plat_arm.h>
#include <scmi.h>
const plat_psci_ops_t *plat_arm_psci_override_pm_ops(plat_psci_ops_t *ops)

4
plat/arm/board/juno/juno_security.c
View File

@ -8,9 +8,9 @@
#include <drivers/arm/nic_400.h>
#include <lib/mmio.h>
#include <platform_def.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/arm/soc/common/soc_css.h>
#include <plat_arm.h>
#include <soc_css.h>
#include "juno_tzmp1_def.h"
#ifdef JUNO_TZMP1

4
plat/arm/board/juno/juno_topology.c
View File

@ -4,11 +4,11 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <plat/arm/common/plat_arm.h>
#include <plat/arm/css/common/css_pm.h>
#include <plat/common/platform.h>
#include <platform_def.h>
#include <css_pm.h>
#include <plat_arm.h>
#include "../../css/drivers/scmi/scmi.h"
#include "../../css/drivers/mhu/css_mhu_doorbell.h"

6
plat/arm/board/n1sdp/include/platform_def.h
View File

@ -7,9 +7,9 @@
#ifndef PLATFORM_DEF_H
#define PLATFORM_DEF_H
#include <arm_def.h>
#include <css_def.h>
#include <v2m_def.h>
#include <plat/arm/board/common/v2m_def.h>
#include <plat/arm/common/arm_def.h>
#include <plat/arm/css/common/css_def.h>
/* UART related constants */
#define PLAT_ARM_BOOT_UART_BASE 0x2A400000

3
plat/arm/board/n1sdp/n1sdp_bl31_setup.c
View File

@ -6,9 +6,10 @@
#include <platform_def.h>
#include <plat/arm/common/plat_arm.h>
#include "../../css/drivers/scmi/scmi.h"
#include "../../css/drivers/mhu/css_mhu_doorbell.h"
#include <plat_arm.h>
static scmi_channel_plat_info_t n1sdp_scmi_plat_info = {
.scmi_mbx_mem = N1SDP_SCMI_PAYLOAD_BASE,

3
plat/arm/board/n1sdp/n1sdp_plat.c
View File

@ -8,10 +8,9 @@
#include <common/bl_common.h>
#include <common/debug.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <plat_arm.h>
/*
* Table of regions to map using the MMU.
* Replace or extend the below regions as required

2
plat/arm/board/n1sdp/n1sdp_topology.c
View File

@ -4,7 +4,7 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <plat_arm.h>
#include <plat/arm/common/plat_arm.h>
/* Topology */
typedef struct n1sdp_topology {

3
plat/arm/common/arm_bl1_fwu.c
View File

@ -13,10 +13,9 @@
#include <common/bl_common.h>
#include <common/debug.h>
#include <lib/utils.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <plat_arm.h>
/* Struct to keep track of usable memory */
typedef struct bl1_mem_info {
uintptr_t mem_base;

3
plat/arm/common/arm_bl1_setup.c
View File

@ -14,10 +14,9 @@
#include <drivers/arm/sp805.h>
#include <lib/utils.h>
#include <lib/xlat_tables/xlat_tables_compat.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <plat_arm.h>
/* Weak definitions may be overridden in specific ARM standard platform */
#pragma weak bl1_early_platform_setup
#pragma weak bl1_plat_arch_setup

3
plat/arm/common/arm_bl2_el3_setup.c
View File

@ -7,11 +7,10 @@
#include <assert.h>
#include <drivers/generic_delay_timer.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <platform_def.h>
#include <plat_arm.h>
#pragma weak bl2_el3_early_platform_setup
#pragma weak bl2_el3_plat_arch_setup
#pragma weak bl2_el3_plat_prepare_exit

3
plat/arm/common/arm_bl2_setup.c
View File

@ -18,10 +18,9 @@
#include <lib/optee_utils.h>
#endif
#include <lib/utils.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <plat_arm.h>
/* Data structure which holds the extents of the trusted SRAM for BL2 */
static meminfo_t bl2_tzram_layout __aligned(CACHE_WRITEBACK_GRANULE);

3
plat/arm/common/arm_bl2u_setup.c
View File

@ -12,10 +12,9 @@
#include <arch_helpers.h>
#include <common/bl_common.h>
#include <drivers/generic_delay_timer.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <plat_arm.h>
/* Weak definitions may be overridden in specific ARM standard platform */
#pragma weak bl2u_platform_setup
#pragma weak bl2u_early_platform_setup

3
plat/arm/common/arm_bl31_setup.c
View File

@ -15,11 +15,10 @@
#include <lib/mmio.h>
#include <lib/utils.h>
#include <lib/xlat_tables/xlat_tables_compat.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <platform_def.h>
#include <plat_arm.h>
/*
* Placeholder variables for copying the arguments that have been passed to
* BL31 from BL2.

3
plat/arm/common/arm_cci.c
View File

@ -9,8 +9,7 @@
#include <arch.h>
#include <drivers/arm/cci.h>
#include <lib/utils.h>
#include <plat_arm.h>
#include <plat/arm/common/plat_arm.h>
static const int cci_map[] = {
PLAT_ARM_CCI_CLUSTER0_SL_IFACE_IX,

3
plat/arm/common/arm_ccn.c
View File

@ -8,8 +8,7 @@
#include <arch.h>
#include <drivers/arm/ccn.h>
#include <plat_arm.h>
#include <plat/arm/common/plat_arm.h>
static const unsigned char master_to_rn_id_map[] = {
PLAT_ARM_CLUSTER_TO_CCN_ID_MAP

3
plat/arm/common/arm_common.c
View File

@ -14,11 +14,10 @@
#include <common/romlib.h>
#include <lib/mmio.h>
#include <lib/xlat_tables/xlat_tables_compat.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <services/secure_partition.h>
#include <plat_arm.h>
/* Weak definitions may be overridden in specific ARM standard platform */
#pragma weak plat_get_ns_image_entrypoint
#pragma weak plat_arm_get_mmap

5
plat/arm/common/arm_common.mk
View File

@ -141,9 +141,6 @@ ifeq (${ARM_CRYPTOCELL_INTEG},1)
endif
endif
PLAT_INCLUDES += -Iinclude/common/tbbr \
-Iinclude/plat/arm/common
ifeq (${ARCH}, aarch64)
PLAT_INCLUDES += -Iinclude/plat/arm/common/aarch64
endif
@ -257,8 +254,6 @@ ifneq (${TRUSTED_BOARD_BOOT},0)
drivers/auth/img_parser_mod.c \
drivers/auth/tbbr/tbbr_cot.c \
PLAT_INCLUDES += -Iinclude/bl1/tbbr
BL1_SOURCES += ${AUTH_SOURCES} \
bl1/tbbr/tbbr_img_desc.c \
plat/arm/common/arm_bl1_fwu.c \

3
plat/arm/common/arm_console.c
View File

@ -11,8 +11,7 @@
#include <common/debug.h>
#include <drivers/arm/pl011.h>
#include <drivers/console.h>
#include <plat_arm.h>
#include <plat/arm/common/plat_arm.h>
/*******************************************************************************
* Functions that set up the console

5
plat/arm/common/arm_dyn_cfg.c
View File

@ -15,11 +15,10 @@
#if TRUSTED_BOARD_BOOT
#include <drivers/auth/mbedtls/mbedtls_config.h>
#endif
#include <plat/arm/common/arm_dyn_cfg_helpers.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <arm_dyn_cfg_helpers.h>
#include <plat_arm.h>
/* Variable to store the address to TB_FW_CONFIG passed from BL1 */
static void *tb_fw_cfg_dtb;
static size_t tb_fw_cfg_dtb_size;

5
plat/arm/common/arm_dyn_cfg_helpers.c
View File

@ -10,9 +10,8 @@
#include <common/desc_image_load.h>
#include <common/fdt_wrappers.h>
#include <arm_dyn_cfg_helpers.h>
#include <plat_arm.h>
#include <plat/arm/common/arm_dyn_cfg_helpers.h>
#include <plat/arm/common/plat_arm.h>
#define DTB_PROP_MBEDTLS_HEAP_ADDR "mbedtls_heap_addr"
#define DTB_PROP_MBEDTLS_HEAP_SIZE "mbedtls_heap_size"

3
plat/arm/common/arm_err.c
View File

@ -13,10 +13,9 @@
#include <common/debug.h>
#include <drivers/cfi/v2m_flash.h>
#include <drivers/console.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <plat_arm.h>
#pragma weak plat_arm_error_handler
/*

3
plat/arm/common/arm_gicv2.c
View File

@ -7,10 +7,9 @@
#include <platform_def.h>
#include <drivers/arm/gicv2.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <plat_arm.h>
/******************************************************************************
* The following functions are defined as weak to allow a platform to override
* the way the GICv2 driver is initialised and used.

3
plat/arm/common/arm_gicv3.c
View File

@ -9,10 +9,9 @@
#include <common/interrupt_props.h>
#include <drivers/arm/gicv3.h>
#include <lib/utils.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <plat_arm.h>
/******************************************************************************
* The following functions are defined as weak to allow a platform to override
* the way the GICv3 driver is initialised and used.

3
plat/arm/common/arm_image_load.c
View File

@ -7,10 +7,9 @@
#include <assert.h>
#include <common/bl_common.h>
#include <common/desc_image_load.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <plat_arm.h>
#pragma weak plat_flush_next_bl_params
#pragma weak plat_get_bl_image_load_info
#pragma weak plat_get_next_bl_params

3
plat/arm/common/arm_io_storage.c
View File

@ -15,11 +15,10 @@
#include <drivers/io/io_memmap.h>
#include <drivers/io/io_storage.h>
#include <lib/utils.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <tools_share/firmware_image_package.h>
#include <plat_arm.h>
/* IO devices */
static const io_dev_connector_t *fip_dev_con;
static uintptr_t fip_dev_handle;

3
plat/arm/common/arm_nor_psci_mem_protect.c
View File

@ -11,8 +11,7 @@
#include <lib/psci/psci.h>
#include <lib/mmio.h>
#include <lib/utils.h>
#include <plat_arm.h>
#include <plat/arm/common/plat_arm.h>
/*
* DRAM1 is used also to load the NS boot loader. For this reason we

3
plat/arm/common/arm_pm.c
View File

@ -11,10 +11,9 @@
#include <arch_helpers.h>
#include <lib/psci/psci.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <plat_arm.h>
/* Allow ARM Standard platforms to override these functions */
#pragma weak plat_arm_program_trusted_mailbox

5
plat/arm/common/arm_sip_svc.c
View File

@ -9,11 +9,10 @@
#include <common/debug.h>
#include <common/runtime_svc.h>
#include <lib/pmf/pmf.h>
#include <plat/arm/common/arm_sip_svc.h>
#include <plat/arm/common/plat_arm.h>
#include <tools_share/uuid.h>
#include <arm_sip_svc.h>
#include <plat_arm.h>
/* ARM SiP Service UUID */
DEFINE_SVC_UUID2(arm_sip_svc_uid,
0x556d75e2, 0x6033, 0xb54b, 0xb5, 0x75,

3
plat/arm/common/arm_topology.c
View File

@ -7,8 +7,7 @@
#include <platform_def.h>
#include <arch.h>
#include <plat_arm.h>
#include <plat/arm/common/plat_arm.h>
/*******************************************************************************
* This function validates an MPIDR by checking whether it falls within the

3
plat/arm/common/arm_tzc400.c
View File

@ -8,8 +8,7 @@
#include <common/debug.h>
#include <drivers/arm/tzc400.h>
#include <plat_arm.h>
#include <plat/arm/common/plat_arm.h>
/* Weak definitions may be overridden in specific ARM standard platform */
#pragma weak plat_arm_security_setup

3
plat/arm/common/arm_tzc_dmc500.c
View File

@ -10,8 +10,7 @@
#include <common/debug.h>
#include <drivers/arm/tzc_dmc500.h>
#include <plat_arm.h>
#include <plat/arm/common/plat_arm.h>
/*******************************************************************************
* Initialize the DMC500-TrustZone Controller for ARM standard platforms.

5
plat/arm/common/execution_state_switch.c
View File

@ -12,11 +12,10 @@
#include <lib/el3_runtime/context_mgmt.h>
#include <lib/psci/psci.h>
#include <lib/utils.h>
#include <plat/arm/common/arm_sip_svc.h>
#include <plat/arm/common/plat_arm.h>
#include <smccc_helpers.h>
#include <arm_sip_svc.h>
#include <plat_arm.h>
/*
* Handle SMC from a lower exception level to switch its execution state
* (either from AArch64 to AArch32, or vice versa).

3
plat/arm/common/sp_min/arm_sp_min_setup.c
View File

@ -14,10 +14,9 @@
#include <drivers/arm/pl011.h>
#include <drivers/console.h>
#include <lib/mmio.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <plat_arm.h>
static entry_point_info_t bl33_image_ep_info;
/* Weak definitions may be overridden in specific ARM standard platform */

3
plat/arm/common/tsp/arm_tsp_setup.c
View File

@ -13,8 +13,7 @@
#include <common/debug.h>
#include <drivers/arm/pl011.h>
#include <drivers/console.h>
#include <plat_arm.h>
#include <plat/arm/common/plat_arm.h>
#define BL32_END (unsigned long)(&__BL32_END__)

5
plat/arm/css/common/css_bl1_setup.c
View File

@ -6,11 +6,10 @@
#include <common/bl_common.h>
#include <common/debug.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/arm/soc/common/soc_css.h>
#include <plat/common/platform.h>
#include <plat_arm.h>
#include <soc_css.h>
void bl1_platform_setup(void)
{
arm_bl1_platform_setup();

3
plat/arm/css/common/css_bl2_setup.c
View File

@ -10,10 +10,9 @@
#include <common/debug.h>
#include <lib/mmio.h>
#include <lib/utils.h>
#include <plat/arm/common/plat_arm.h>
#include <platform_def.h>
#include <plat_arm.h>
#include "../drivers/scp/css_scp.h"
/* Weak definition may be overridden in specific CSS based platform */

3
plat/arm/css/common/css_bl2u_setup.c
View File

@ -6,10 +6,9 @@
#include <common/bl_common.h>
#include <common/debug.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <plat_arm.h>
#include "../drivers/scp/css_scp.h"
/* Weak definition may be overridden in specific CSS based platform */

3
plat/arm/css/common/css_common.mk
View File

@ -11,8 +11,7 @@ CSS_LOAD_SCP_IMAGES ?= 1
# By default, SCMI driver is disabled for CSS platforms
CSS_USE_SCMI_SDS_DRIVER ?= 0
PLAT_INCLUDES += -Iinclude/plat/arm/css/common \
-Iinclude/plat/arm/css/common/aarch64
PLAT_INCLUDES += -Iinclude/plat/arm/css/common/aarch64
PLAT_BL_COMMON_SOURCES += plat/arm/css/common/${ARCH}/css_helpers.S

5
plat/arm/css/common/css_pm.c
View File

@ -12,11 +12,10 @@
#include <arch_helpers.h>
#include <common/debug.h>
#include <lib/cassert.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/arm/css/common/css_pm.h>
#include <plat/common/platform.h>
#include <css_pm.h>
#include <plat_arm.h>
#include "../drivers/scp/css_scp.h"
/* Allow CSS platforms to override `plat_arm_psci_pm_ops` */

3
plat/arm/css/common/css_topology.c
View File

@ -6,10 +6,9 @@
#include <assert.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <plat_arm.h>
#if ARM_PLAT_MT
#pragma weak plat_arm_get_cpu_pe_count
#endif

3
plat/arm/css/drivers/mhu/css_mhu.c
View File

@ -11,8 +11,7 @@
#include <arch_helpers.h>
#include <lib/bakery_lock.h>
#include <lib/mmio.h>
#include <plat_arm.h>
#include <plat/arm/common/plat_arm.h>
#include "css_mhu.h"

5
plat/arm/css/drivers/scp/css_pm_scmi.c
View File

@ -9,12 +9,11 @@
#include <arch_helpers.h>
#include <common/debug.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/arm/css/common/css_pm.h>
#include <plat/common/platform.h>
#include <platform_def.h>
#include <css_pm.h>
#include <plat_arm.h>
#include "../scmi/scmi.h"
#include "css_scp.h"

5
plat/arm/css/drivers/scp/css_pm_scpi.c
View File

@ -8,9 +8,8 @@
#include <arch_helpers.h>
#include <common/debug.h>
#include <css_pm.h>
#include <plat_arm.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/arm/css/common/css_pm.h>
#include "../scpi/css_scpi.h"
#include "css_scp.h"

13
plat/arm/css/sgi/include/sgi_base_platform_def.h
View File

@ -9,15 +9,14 @@
#include <lib/utils_def.h>
#include <lib/xlat_tables/xlat_tables_defs.h>
#include <plat/arm/board/common/board_css_def.h>
#include <plat/arm/board/common/v2m_def.h>
#include <plat/arm/common/arm_def.h>
#include <plat/arm/common/arm_spm_def.h>
#include <plat/arm/css/common/css_def.h>
#include <plat/arm/soc/common/soc_css_def.h>
#include <plat/common/common_def.h>
#include <arm_def.h>
#include <arm_spm_def.h>
#include <board_css_def.h>
#include <css_def.h>
#include <soc_css_def.h>
#include <v2m_def.h>
#define PLATFORM_CORE_COUNT (PLAT_ARM_CLUSTER_COUNT * \
CSS_SGI_MAX_CPUS_PER_CLUSTER * \
CSS_SGI_MAX_PE_PER_CPU)

2
plat/arm/css/sgi/sgi_bl31_setup.c
View File

@ -10,8 +10,8 @@
#include <common/bl_common.h>
#include <common/debug.h>
#include <plat/arm/common/plat_arm.h>
#include <plat_arm.h>
#include <sgi_ras.h>
#include <sgi_variant.h>

2
plat/arm/css/sgi/sgi_image_load.c
View File

@ -9,9 +9,9 @@
#include <arch_helpers.h>
#include <common/debug.h>
#include <common/desc_image_load.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <plat_arm.h>
#include <sgi_variant.h>
/*******************************************************************************

3
plat/arm/css/sgi/sgi_plat.c
View File

@ -11,11 +11,10 @@
#include <common/bl_common.h>
#include <common/debug.h>
#include <drivers/arm/ccn.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <services/secure_partition.h>
#include <plat_arm.h>
#if USE_COHERENT_MEM
/*
* The next 2 constants identify the extents of the coherent memory region.

2
plat/arm/css/sgi/sgi_ras.c
View File

@ -10,12 +10,12 @@
#include <bl31/interrupt_mgmt.h>
#include <lib/el3_runtime/context_mgmt.h>
#include <lib/extensions/ras.h>
#include <plat/arm/common/arm_spm_def.h>
#include <plat/common/platform.h>
#include <services/mm_svc.h>
#include <services/sdei.h>
#include <services/spm_svc.h>
#include <arm_spm_def.h>
#include <sgi_ras.h>
static int sgi_ras_intr_handler(const struct err_record_info *err_rec,

3
plat/arm/css/sgi/sgi_topology.c
View File

@ -4,7 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <plat_arm.h>
#include <plat/arm/common/plat_arm.h>
#include <sgi_variant.h>
/* Topology */

3
plat/arm/css/sgm/include/platform_oid.h
View File

@ -3,7 +3,8 @@
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#include "../../../../../include/plat/arm/board/common/board_arm_oid.h"
#include <plat/arm/board/common/board_arm_oid.h>
/*
* Required platform OIDs

11
plat/arm/css/sgm/include/sgm_base_platform_def.h
View File

@ -9,14 +9,13 @@
#include <drivers/arm/tzc400.h>
#include <drivers/arm/tzc_common.h>
#include <plat/arm/board/common/board_css_def.h>
#include <plat/arm/board/common/v2m_def.h>
#include <plat/arm/common/arm_def.h>
#include <plat/arm/css/common/css_def.h>
#include <plat/arm/soc/common/soc_css_def.h>
#include <plat/common/common_def.h>
#include <arm_def.h>
#include <board_css_def.h>
#include <css_def.h>
#include <soc_css_def.h>
#include <v2m_def.h>
/* CPU topology */
#define PLAT_ARM_CLUSTER_COUNT 1
#define PLAT_ARM_CLUSTER_CORE_COUNT 8

4
plat/arm/css/sgm/sgm_bl1_setup.c
View File

@ -6,10 +6,10 @@
#include <common/bl_common.h>
#include <common/debug.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/arm/soc/common/soc_css.h>
#include <plat_arm.h>
#include <sgm_plat_config.h>
#include <soc_css.h>
void bl1_early_platform_setup(void)
{

3
plat/arm/css/sgm/sgm_bl31_setup.c
View File

@ -6,10 +6,9 @@
#include <common/bl_common.h>
#include <common/debug.h>
#include <plat/arm/common/plat_arm.h>
#include <plat_arm.h>
#include <sgm_plat_config.h>
#include "../../css/drivers/scmi/scmi.h"
#include "../../css/drivers/mhu/css_mhu_doorbell.h"

2
plat/arm/css/sgm/sgm_mmap_config.c
View File

@ -8,8 +8,8 @@
#include <common/bl_common.h>
#include <common/debug.h>
#include <plat/arm/common/plat_arm.h>
#include <plat_arm.h>
#include <sgm_variant.h>
/*

2
plat/arm/css/sgm/sgm_plat_config.c
View File

@ -10,8 +10,8 @@
#include <platform_def.h>
#include <common/debug.h>
#include <plat/arm/common/plat_arm.h>
#include <plat_arm.h>
#include <sgm_plat_config.h>
#include <sgm_variant.h>

4
plat/arm/css/sgm/sgm_security.c
View File

@ -6,10 +6,10 @@
#include <common/debug.h>
#include <drivers/arm/tzc_dmc500.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/arm/soc/common/soc_css.h>
#include <plat_arm.h>
#include <sgm_variant.h>
#include <soc_css.h>
/* Is populated with the DMC-500 controllers base addresses */
static tzc_dmc500_driver_data_t plat_driver_data;

3
plat/arm/css/sgm/sgm_topology.c
View File

@ -4,7 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <plat_arm.h>
#include <plat/arm/common/plat_arm.h>
#include <sgm_plat_config.h>
/*******************************************************************************

3
plat/arm/css/sgm/tsp/sgm_tsp_setup.c
View File

@ -4,7 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <plat_arm.h>
#include <plat/arm/common/plat_arm.h>
#include <sgm_plat_config.h>
void tsp_early_platform_setup(void)

2
plat/arm/soc/common/soc_css.mk
View File

@ -4,8 +4,6 @@
# SPDX-License-Identifier: BSD-3-Clause
#
PLAT_INCLUDES += -Iinclude/plat/arm/soc/common/
#PLAT_BL_COMMON_SOURCES +=
BL1_SOURCES += plat/arm/soc/common/soc_css_security.c

3
plat/arm/soc/common/soc_css_security.c
View File

@ -8,8 +8,7 @@
#include <drivers/arm/nic_400.h>
#include <lib/mmio.h>
#include <soc_css.h>
#include <plat/arm/soc/common/soc_css.h>
void soc_css_init_nic400(void)
{

2
plat/mediatek/mt8173/bl31_plat_setup.c
View File

@ -11,13 +11,13 @@
#include <drivers/console.h>
#include <drivers/generic_delay_timer.h>
#include <lib/mmio.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/common_def.h>
#include <plat/common/platform.h>
#include <mcucfg.h>
#include <mtcmos.h>
#include <mtk_plat_common.h>
#include <plat_arm.h>
#include <plat_private.h>
#include <spm.h>

2
plat/mediatek/mt8173/plat_pm.c
View File

@ -15,11 +15,11 @@
#include <lib/bakery_lock.h>
#include <lib/mmio.h>
#include <lib/psci/psci.h>
#include <plat/arm/common/plat_arm.h>
#include <mcucfg.h>
#include <mt8173_def.h>
#include <mt_cpuxgpt.h> /* generic_timer_backup() */
#include <plat_arm.h>
#include <plat_private.h>
#include <power_tracer.h>
#include <rtc.h>

1
plat/mediatek/mt8173/platform.mk
View File

@ -9,7 +9,6 @@ MTK_PLAT_SOC := ${MTK_PLAT}/${PLAT}
PLAT_INCLUDES := -I${MTK_PLAT}/common/ \
-I${MTK_PLAT}/common/drivers/uart/ \
-Iinclude/plat/arm/common \
-Iinclude/plat/arm/common/aarch64 \
-I${MTK_PLAT_SOC}/drivers/crypt/ \
-I${MTK_PLAT_SOC}/drivers/mtcmos/ \

5
plat/xilinx/zynqmp/bl31_zynqmp_setup.c
View File

@ -11,10 +11,11 @@
#include <common/bl_common.h>
#include <common/debug.h>
#include <drivers/console.h>
#include <plat_arm.h>
#include <plat_private.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <plat_private.h>
#define BL31_END (unsigned long)(&__BL31_END__)
static entry_point_info_t bl32_image_ep_info;

4
plat/xilinx/zynqmp/plat_psci.c
View File

@ -12,10 +12,10 @@
#include <drivers/arm/gicv2.h>
#include <lib/mmio.h>
#include <lib/psci/psci.h>
#include <plat_private.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <plat_arm.h>
#include <plat_private.h>
#include "pm_api_sys.h"
#include "pm_client.h"

3
plat/xilinx/zynqmp/platform.mk
View File

@ -45,8 +45,7 @@ ifdef ZYNQMP_WDT_RESTART
$(eval $(call add_define,ZYNQMP_WDT_RESTART))
endif
PLAT_INCLUDES := -Iinclude/plat/arm/common/ \
-Iinclude/plat/arm/common/aarch64/ \
PLAT_INCLUDES := -Iinclude/plat/arm/common/aarch64/ \
-Iplat/xilinx/common/include/ \
-Iplat/xilinx/zynqmp/include/ \
-Iplat/xilinx/zynqmp/pm_service/ \

2
plat/xilinx/zynqmp/tsp/tsp_plat_setup.c
View File

@ -7,8 +7,8 @@
#include <common/bl_common.h>
#include <common/debug.h>
#include <drivers/console.h>
#include <plat/arm/common/plat_arm.h>
#include <plat_arm.h>
#include <plat_private.h>
#include <platform_tsp.h>