Skip to content

GitLab

Unverified Commit 83a2285e authored by Antonio Niño Díaz's avatar Antonio Niño Díaz Committed by GitHub
Browse files

Merge pull request #1784 from antonio-nino-diaz-arm/an/includes-arm 

plat/arm: Cleanup of includes and drivers
parents bc153881 560293bb
Show whitespace changes
Inline Side-by-side
plat/arm/common/arm_sip_svc.c
View file @ 83a2285e
...@@ -9,11 +9,10 @@ ...@@ -9,11 +9,10 @@
#include <common/debug.h> #include <common/debug.h>
#include <common/runtime_svc.h> #include <common/runtime_svc.h>
#include <lib/pmf/pmf.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 <tools_share/uuid.h>
#include <arm_sip_svc.h>
#include <plat_arm.h>
/* ARM SiP Service UUID */ /* ARM SiP Service UUID */
DEFINE_SVC_UUID2(arm_sip_svc_uid, DEFINE_SVC_UUID2(arm_sip_svc_uid,
0x556d75e2, 0x6033, 0xb54b, 0xb5, 0x75, 0x556d75e2, 0x6033, 0xb54b, 0xb5, 0x75,
......
plat/arm/common/arm_topology.c
View file @ 83a2285e
...@@ -7,8 +7,7 @@ ...@@ -7,8 +7,7 @@
#include <platform_def.h> #include <platform_def.h>
#include <arch.h> #include <arch.h>
#include <plat/arm/common/plat_arm.h>
#include <plat_arm.h>
/******************************************************************************* /*******************************************************************************
* This function validates an MPIDR by checking whether it falls within the * This function validates an MPIDR by checking whether it falls within the
......
plat/arm/common/arm_tzc400.c
View file @ 83a2285e
...@@ -8,8 +8,7 @@ ...@@ -8,8 +8,7 @@
#include <common/debug.h> #include <common/debug.h>
#include <drivers/arm/tzc400.h> #include <drivers/arm/tzc400.h>
#include <plat/arm/common/plat_arm.h>
#include <plat_arm.h>
/* Weak definitions may be overridden in specific ARM standard platform */ /* Weak definitions may be overridden in specific ARM standard platform */
#pragma weak plat_arm_security_setup #pragma weak plat_arm_security_setup
......
plat/arm/common/arm_tzc_dmc500.c
View file @ 83a2285e
...@@ -10,8 +10,7 @@ ...@@ -10,8 +10,7 @@
#include <common/debug.h> #include <common/debug.h>
#include <drivers/arm/tzc_dmc500.h> #include <drivers/arm/tzc_dmc500.h>
#include <plat/arm/common/plat_arm.h>
#include <plat_arm.h>
/******************************************************************************* /*******************************************************************************
* Initialize the DMC500-TrustZone Controller for ARM standard platforms. * Initialize the DMC500-TrustZone Controller for ARM standard platforms.
......
plat/arm/common/execution_state_switch.c
View file @ 83a2285e
...@@ -12,11 +12,10 @@ ...@@ -12,11 +12,10 @@
#include <lib/el3_runtime/context_mgmt.h> #include <lib/el3_runtime/context_mgmt.h>
#include <lib/psci/psci.h> #include <lib/psci/psci.h>
#include <lib/utils.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 <smccc_helpers.h>
#include <arm_sip_svc.h>
#include <plat_arm.h>
/* /*
* Handle SMC from a lower exception level to switch its execution state * Handle SMC from a lower exception level to switch its execution state
* (either from AArch64 to AArch32, or vice versa). * (either from AArch64 to AArch32, or vice versa).
......
plat/arm/common/sp_min/arm_sp_min_setup.c
View file @ 83a2285e
...@@ -14,10 +14,9 @@ ...@@ -14,10 +14,9 @@
#include <drivers/arm/pl011.h> #include <drivers/arm/pl011.h>
#include <drivers/console.h> #include <drivers/console.h>
#include <lib/mmio.h> #include <lib/mmio.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h> #include <plat/common/platform.h>
#include <plat_arm.h>
static entry_point_info_t bl33_image_ep_info; static entry_point_info_t bl33_image_ep_info;
/* Weak definitions may be overridden in specific ARM standard platform */ /* Weak definitions may be overridden in specific ARM standard platform */
......
plat/arm/common/tsp/arm_tsp_setup.c
View file @ 83a2285e
...@@ -13,8 +13,7 @@ ...@@ -13,8 +13,7 @@
#include <common/debug.h> #include <common/debug.h>
#include <drivers/arm/pl011.h> #include <drivers/arm/pl011.h>
#include <drivers/console.h> #include <drivers/console.h>
#include <plat/arm/common/plat_arm.h>
#include <plat_arm.h>
#define BL32_END (unsigned long)(&__BL32_END__) #define BL32_END (unsigned long)(&__BL32_END__)
......
plat/arm/css/common/css_bl1_setup.c
View file @ 83a2285e
...@@ -6,11 +6,10 @@ ...@@ -6,11 +6,10 @@
#include <common/bl_common.h> #include <common/bl_common.h>
#include <common/debug.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/common/platform.h>
#include <plat_arm.h>
#include <soc_css.h>
void bl1_platform_setup(void) void bl1_platform_setup(void)
{ {
arm_bl1_platform_setup(); arm_bl1_platform_setup();
......
plat/arm/css/common/css_bl2_setup.c
View file @ 83a2285e
...@@ -8,14 +8,12 @@ ...@@ -8,14 +8,12 @@
#include <common/bl_common.h> #include <common/bl_common.h>
#include <common/debug.h> #include <common/debug.h>
#include <drivers/arm/css/css_scp.h>
#include <lib/mmio.h> #include <lib/mmio.h>
#include <lib/utils.h> #include <lib/utils.h>
#include <plat/arm/common/plat_arm.h>
#include <platform_def.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 */ /* Weak definition may be overridden in specific CSS based platform */
#pragma weak plat_arm_bl2_handle_scp_bl2 #pragma weak plat_arm_bl2_handle_scp_bl2
......
plat/arm/css/common/css_bl2u_setup.c
View file @ 83a2285e
...@@ -6,12 +6,10 @@ ...@@ -6,12 +6,10 @@
#include <common/bl_common.h> #include <common/bl_common.h>
#include <common/debug.h> #include <common/debug.h>
#include <drivers/arm/css/css_scp.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.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 */ /* Weak definition may be overridden in specific CSS based platform */
#pragma weak bl2u_plat_handle_scp_bl2u #pragma weak bl2u_plat_handle_scp_bl2u
......
plat/arm/css/common/css_common.mk
View file @ 83a2285e
...@@ -11,8 +11,7 @@ CSS_LOAD_SCP_IMAGES ?= 1 ...@@ -11,8 +11,7 @@ CSS_LOAD_SCP_IMAGES ?= 1
# By default, SCMI driver is disabled for CSS platforms # By default, SCMI driver is disabled for CSS platforms
CSS_USE_SCMI_SDS_DRIVER ?= 0 CSS_USE_SCMI_SDS_DRIVER ?= 0
PLAT_INCLUDES += -Iinclude/plat/arm/css/common \ PLAT_INCLUDES += -Iinclude/plat/arm/css/common/aarch64
-Iinclude/plat/arm/css/common/aarch64
PLAT_BL_COMMON_SOURCES += plat/arm/css/common/${ARCH}/css_helpers.S PLAT_BL_COMMON_SOURCES += plat/arm/css/common/${ARCH}/css_helpers.S
...@@ -27,16 +26,16 @@ BL31_SOURCES += plat/arm/css/common/css_pm.c \ ...@@ -27,16 +26,16 @@ BL31_SOURCES += plat/arm/css/common/css_pm.c \
plat/arm/css/common/css_topology.c plat/arm/css/common/css_topology.c
ifeq (${CSS_USE_SCMI_SDS_DRIVER},0) ifeq (${CSS_USE_SCMI_SDS_DRIVER},0)
BL31_SOURCES += plat/arm/css/drivers/scp/css_pm_scpi.c \ BL31_SOURCES += drivers/arm/css/mhu/css_mhu.c \
plat/arm/css/drivers/mhu/css_mhu.c \ drivers/arm/css/scp/css_pm_scpi.c \
plat/arm/css/drivers/scpi/css_scpi.c drivers/arm/css/scpi/css_scpi.c
else else
BL31_SOURCES += plat/arm/css/drivers/scp/css_pm_scmi.c \ BL31_SOURCES += drivers/arm/css/mhu/css_mhu_doorbell.c \
plat/arm/css/drivers/scmi/scmi_ap_core_proto.c \ drivers/arm/css/scmi/scmi_ap_core_proto.c \
plat/arm/css/drivers/scmi/scmi_common.c \ drivers/arm/css/scmi/scmi_common.c \
plat/arm/css/drivers/scmi/scmi_pwr_dmn_proto.c \ drivers/arm/css/scmi/scmi_pwr_dmn_proto.c \
plat/arm/css/drivers/scmi/scmi_sys_pwr_proto.c \ drivers/arm/css/scmi/scmi_sys_pwr_proto.c \
plat/arm/css/drivers/mhu/css_mhu_doorbell.c drivers/arm/css/scp/css_pm_scmi.c
endif endif
# Process CSS_LOAD_SCP_IMAGES flag # Process CSS_LOAD_SCP_IMAGES flag
...@@ -50,19 +49,19 @@ ifeq (${CSS_LOAD_SCP_IMAGES},1) ...@@ -50,19 +49,19 @@ ifeq (${CSS_LOAD_SCP_IMAGES},1)
endif endif
ifeq (${CSS_USE_SCMI_SDS_DRIVER},1) ifeq (${CSS_USE_SCMI_SDS_DRIVER},1)
BL2U_SOURCES += plat/arm/css/drivers/scp/css_sds.c \ BL2U_SOURCES += drivers/arm/css/scp/css_sds.c \
plat/arm/css/drivers/sds/sds.c drivers/arm/css/sds/sds.c
BL2_SOURCES += plat/arm/css/drivers/scp/css_sds.c \ BL2_SOURCES += drivers/arm/css/scp/css_sds.c \
plat/arm/css/drivers/sds/sds.c drivers/arm/css/sds/sds.c
else else
BL2U_SOURCES += plat/arm/css/drivers/scp/css_bom_bootloader.c \ BL2U_SOURCES += drivers/arm/css/mhu/css_mhu.c \
plat/arm/css/drivers/mhu/css_mhu.c \ drivers/arm/css/scp/css_bom_bootloader.c \
plat/arm/css/drivers/scpi/css_scpi.c drivers/arm/css/scpi/css_scpi.c
BL2_SOURCES += plat/arm/css/drivers/scp/css_bom_bootloader.c \ BL2_SOURCES += drivers/arm/css/mhu/css_mhu.c \
plat/arm/css/drivers/mhu/css_mhu.c \ drivers/arm/css/scp/css_bom_bootloader.c \
plat/arm/css/drivers/scpi/css_scpi.c drivers/arm/css/scpi/css_scpi.c
# Enable option to detect whether the SCP ROM firmware in use predates version # Enable option to detect whether the SCP ROM firmware in use predates version
# 1.7.0 and therefore, is incompatible. # 1.7.0 and therefore, is incompatible.
CSS_DETECT_PRE_1_7_0_SCP := 1 CSS_DETECT_PRE_1_7_0_SCP := 1
...@@ -74,7 +73,7 @@ ifeq (${CSS_LOAD_SCP_IMAGES},1) ...@@ -74,7 +73,7 @@ ifeq (${CSS_LOAD_SCP_IMAGES},1)
endif endif
ifeq (${CSS_USE_SCMI_SDS_DRIVER},1) ifeq (${CSS_USE_SCMI_SDS_DRIVER},1)
PLAT_BL_COMMON_SOURCES += plat/arm/css/drivers/sds/${ARCH}/sds_helpers.S PLAT_BL_COMMON_SOURCES += drivers/arm/css/sds/${ARCH}/sds_helpers.S
endif endif
# Process CSS_USE_SCMI_SDS_DRIVER flag # Process CSS_USE_SCMI_SDS_DRIVER flag
......
plat/arm/css/common/css_pm.c
View file @ 83a2285e
...@@ -11,14 +11,12 @@ ...@@ -11,14 +11,12 @@
#include <arch_helpers.h> #include <arch_helpers.h>
#include <common/debug.h> #include <common/debug.h>
#include <drivers/arm/css/css_scp.h>
#include <lib/cassert.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 <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` */ /* Allow CSS platforms to override `plat_arm_psci_pm_ops` */
#pragma weak plat_arm_psci_pm_ops #pragma weak plat_arm_psci_pm_ops
......
plat/arm/css/common/css_topology.c
View file @ 83a2285e
...@@ -6,10 +6,9 @@ ...@@ -6,10 +6,9 @@
#include <assert.h> #include <assert.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h> #include <plat/common/platform.h>
#include <plat_arm.h>
#if ARM_PLAT_MT #if ARM_PLAT_MT
#pragma weak plat_arm_get_cpu_pe_count #pragma weak plat_arm_get_cpu_pe_count
#endif #endif
......
plat/arm/css/common/sp_min/css_sp_min.mk
View file @ 83a2285e
...@@ -9,13 +9,13 @@ BL32_SOURCES += plat/arm/css/common/css_pm.c \ ...@@ -9,13 +9,13 @@ BL32_SOURCES += plat/arm/css/common/css_pm.c \
plat/arm/css/common/css_topology.c plat/arm/css/common/css_topology.c
ifeq (${CSS_USE_SCMI_SDS_DRIVER},0) ifeq (${CSS_USE_SCMI_SDS_DRIVER},0)
BL32_SOURCES += plat/arm/css/drivers/scp/css_pm_scpi.c \ BL32_SOURCES += drivers/arm/css/mhu/css_mhu.c \
plat/arm/css/drivers/mhu/css_mhu.c \ drivers/arm/css/scp/css_pm_scpi.c \
plat/arm/css/drivers/scpi/css_scpi.c drivers/arm/css/scpi/css_scpi.c
else else
BL32_SOURCES += plat/arm/css/drivers/scp/css_pm_scmi.c \ BL32_SOURCES += drivers/arm/css/mhu/css_mhu_doorbell.c \
plat/arm/css/drivers/scmi/scmi_common.c \ drivers/arm/css/scp/css_pm_scmi.c \
plat/arm/css/drivers/scmi/scmi_pwr_dmn_proto.c \ drivers/arm/css/scmi/scmi_common.c \
plat/arm/css/drivers/scmi/scmi_sys_pwr_proto.c \ drivers/arm/css/scmi/scmi_pwr_dmn_proto.c \
plat/arm/css/drivers/mhu/css_mhu_doorbell.c drivers/arm/css/scmi/scmi_sys_pwr_proto.c
endif endif
plat/arm/css/sgi/include/sgi_base_platform_def.h
View file @ 83a2285e
...@@ -9,15 +9,14 @@ ...@@ -9,15 +9,14 @@
#include <lib/utils_def.h> #include <lib/utils_def.h>
#include <lib/xlat_tables/xlat_tables_defs.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 <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 * \ #define PLATFORM_CORE_COUNT (PLAT_ARM_CLUSTER_COUNT * \
CSS_SGI_MAX_CPUS_PER_CLUSTER * \ CSS_SGI_MAX_CPUS_PER_CLUSTER * \
CSS_SGI_MAX_PE_PER_CPU) CSS_SGI_MAX_PE_PER_CPU)
......
plat/arm/css/sgi/sgi_bl31_setup.c
View file @ 83a2285e
...@@ -10,14 +10,13 @@ ...@@ -10,14 +10,13 @@
#include <common/bl_common.h> #include <common/bl_common.h>
#include <common/debug.h> #include <common/debug.h>
#include <drivers/arm/css/css_mhu_doorbell.h>
#include <drivers/arm/css/scmi.h>
#include <plat/arm/common/plat_arm.h>
#include <plat_arm.h>
#include <sgi_ras.h> #include <sgi_ras.h>
#include <sgi_variant.h> #include <sgi_variant.h>
#include "../../css/drivers/scmi/scmi.h"
#include "../../css/drivers/mhu/css_mhu_doorbell.h"
sgi_platform_info_t sgi_plat_info; sgi_platform_info_t sgi_plat_info;
static scmi_channel_plat_info_t sgi575_scmi_plat_info = { static scmi_channel_plat_info_t sgi575_scmi_plat_info = {
......
plat/arm/css/sgi/sgi_image_load.c
View file @ 83a2285e
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
#include <arch_helpers.h> #include <arch_helpers.h>
#include <common/debug.h> #include <common/debug.h>
#include <common/desc_image_load.h> #include <common/desc_image_load.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h> #include <plat/common/platform.h>
#include <plat_arm.h>
#include <sgi_variant.h> #include <sgi_variant.h>
/******************************************************************************* /*******************************************************************************
......
plat/arm/css/sgi/sgi_plat.c
View file @ 83a2285e
...@@ -11,11 +11,10 @@ ...@@ -11,11 +11,10 @@
#include <common/bl_common.h> #include <common/bl_common.h>
#include <common/debug.h> #include <common/debug.h>
#include <drivers/arm/ccn.h> #include <drivers/arm/ccn.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h> #include <plat/common/platform.h>
#include <services/secure_partition.h> #include <services/secure_partition.h>
#include <plat_arm.h>
#if USE_COHERENT_MEM #if USE_COHERENT_MEM
/* /*
* The next 2 constants identify the extents of the coherent memory region. * The next 2 constants identify the extents of the coherent memory region.
......
plat/arm/css/sgi/sgi_ras.c
View file @ 83a2285e
...@@ -10,12 +10,12 @@ ...@@ -10,12 +10,12 @@
#include <bl31/interrupt_mgmt.h> #include <bl31/interrupt_mgmt.h>
#include <lib/el3_runtime/context_mgmt.h> #include <lib/el3_runtime/context_mgmt.h>
#include <lib/extensions/ras.h> #include <lib/extensions/ras.h>
#include <plat/arm/common/arm_spm_def.h>
#include <plat/common/platform.h> #include <plat/common/platform.h>
#include <services/mm_svc.h> #include <services/mm_svc.h>
#include <services/sdei.h> #include <services/sdei.h>
#include <services/spm_svc.h> #include <services/spm_svc.h>
#include <arm_spm_def.h>
#include <sgi_ras.h> #include <sgi_ras.h>
static int sgi_ras_intr_handler(const struct err_record_info *err_rec, static int sgi_ras_intr_handler(const struct err_record_info *err_rec,
......
plat/arm/css/sgi/sgi_topology.c
View file @ 83a2285e
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#include <plat_arm.h> #include <plat/arm/common/plat_arm.h>
#include <sgi_variant.h> #include <sgi_variant.h>
/* Topology */ /* Topology */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment