Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-30 07:39:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

plat/arm: scp: Move to drivers/ folder

Browse source 
Change-Id: Ida5dae39478654405d0ee31a6cbddb4579e76a7f
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
This commit is contained in:
Antonio Nino Diaz 2019-01-23 18:55:03 +00:00
parent 0387aa42ac
commit 2d4135e08f
10 changed files with 22 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plat/arm/css/drivers/scp/css_bom_bootloader.c → drivers/arm/css/scp/css_bom_bootloader.c
View file

@ -10,12 +10,11 @@
#include <arch_helpers.h> #include <arch_helpers.h>
#include <common/debug.h> #include <common/debug.h>
#include <drivers/arm/css/css_mhu.h> #include <drivers/arm/css/css_mhu.h>
#include <drivers/arm/css/css_scp.h>
#include <drivers/arm/css/css_scpi.h> #include <drivers/arm/css/css_scpi.h>
#include <plat/common/platform.h> #include <plat/common/platform.h>
#include <platform_def.h> #include <platform_def.h>
#include "css_scp.h"
/* ID of the MHU slot used for the BOM protocol */ /* ID of the MHU slot used for the BOM protocol */
#define BOM_MHU_SLOT_ID 0 #define BOM_MHU_SLOT_ID 0

3
plat/arm/css/drivers/scp/css_pm_scmi.c → drivers/arm/css/scp/css_pm_scmi.c
View file

@ -9,14 +9,13 @@
#include <arch_helpers.h> #include <arch_helpers.h>
#include <common/debug.h> #include <common/debug.h>
#include <drivers/arm/css/css_scp.h>
#include <drivers/arm/css/scmi.h> #include <drivers/arm/css/scmi.h>
#include <plat/arm/common/plat_arm.h> #include <plat/arm/common/plat_arm.h>
#include <plat/arm/css/common/css_pm.h> #include <plat/arm/css/common/css_pm.h>
#include <plat/common/platform.h> #include <plat/common/platform.h>
#include <platform_def.h> #include <platform_def.h>
#include "css_scp.h"
/* /*
* This file implements the SCP helper functions using SCMI protocol. * This file implements the SCP helper functions using SCMI protocol.
*/ */

3
plat/arm/css/drivers/scp/css_pm_scpi.c → drivers/arm/css/scp/css_pm_scpi.c
View file

@ -8,12 +8,11 @@
#include <arch_helpers.h> #include <arch_helpers.h>
#include <common/debug.h> #include <common/debug.h>
#include <drivers/arm/css/css_scp.h>
#include <drivers/arm/css/css_scpi.h> #include <drivers/arm/css/css_scpi.h>
#include <plat/arm/common/plat_arm.h> #include <plat/arm/common/plat_arm.h>
#include <plat/arm/css/common/css_pm.h> #include <plat/arm/css/common/css_pm.h>
#include "css_scp.h"
/* /*
* This file implements the SCP power management functions using SCPI protocol. * This file implements the SCP power management functions using SCPI protocol.
*/ */

2
plat/arm/css/drivers/scp/css_sds.c → drivers/arm/css/scp/css_sds.c
View file

@ -9,11 +9,11 @@
#include <arch_helpers.h> #include <arch_helpers.h>
#include <common/debug.h> #include <common/debug.h>
#include <drivers/arm/css/css_scp.h>
#include <drivers/delay_timer.h> #include <drivers/delay_timer.h>
#include <plat/common/platform.h> #include <plat/common/platform.h>
#include <platform_def.h> #include <platform_def.h>
#include "css_scp.h"
#include "../sds/sds.h" #include "../sds/sds.h"
int css_scp_boot_image_xfer(void *image, unsigned int image_size) int css_scp_boot_image_xfer(void *image, unsigned int image_size)

0
plat/arm/css/drivers/scp/css_scp.h → include/drivers/arm/css/css_scp.h
View file

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

@ -8,13 +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 <plat/arm/common/plat_arm.h>
#include <platform_def.h> #include <platform_def.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

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

@ -6,11 +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/arm/common/plat_arm.h>
#include <plat/common/platform.h> #include <plat/common/platform.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

22
plat/arm/css/common/css_common.mk
View file

@ -27,15 +27,15 @@ BL31_SOURCES += plat/arm/css/common/css_pm.c \
ifeq (${CSS_USE_SCMI_SDS_DRIVER},0) ifeq (${CSS_USE_SCMI_SDS_DRIVER},0)
BL31_SOURCES += drivers/arm/css/mhu/css_mhu.c \ BL31_SOURCES += drivers/arm/css/mhu/css_mhu.c \
drivers/arm/css/scpi/css_scpi.c \ drivers/arm/css/scp/css_pm_scpi.c \
plat/arm/css/drivers/scp/css_pm_scpi.c drivers/arm/css/scpi/css_scpi.c
else else
BL31_SOURCES += drivers/arm/css/mhu/css_mhu_doorbell.c \ BL31_SOURCES += drivers/arm/css/mhu/css_mhu_doorbell.c \
drivers/arm/css/scmi/scmi_ap_core_proto.c \ drivers/arm/css/scmi/scmi_ap_core_proto.c \
drivers/arm/css/scmi/scmi_common.c \ drivers/arm/css/scmi/scmi_common.c \
drivers/arm/css/scmi/scmi_pwr_dmn_proto.c \ drivers/arm/css/scmi/scmi_pwr_dmn_proto.c \
drivers/arm/css/scmi/scmi_sys_pwr_proto.c \ drivers/arm/css/scmi/scmi_sys_pwr_proto.c \
plat/arm/css/drivers/scp/css_pm_scmi.c drivers/arm/css/scp/css_pm_scmi.c
endif endif
# Process CSS_LOAD_SCP_IMAGES flag # Process CSS_LOAD_SCP_IMAGES flag
@ -49,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 plat/arm/css/drivers/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 plat/arm/css/drivers/sds/sds.c
else else
BL2U_SOURCES += drivers/arm/css/mhu/css_mhu.c \ BL2U_SOURCES += drivers/arm/css/mhu/css_mhu.c \
drivers/arm/css/scpi/css_scpi.c \ drivers/arm/css/scp/css_bom_bootloader.c \
plat/arm/css/drivers/scp/css_bom_bootloader.c drivers/arm/css/scpi/css_scpi.c
BL2_SOURCES += drivers/arm/css/mhu/css_mhu.c \ BL2_SOURCES += drivers/arm/css/mhu/css_mhu.c \
drivers/arm/css/scpi/css_scpi.c \ drivers/arm/css/scp/css_bom_bootloader.c \
plat/arm/css/drivers/scp/css_bom_bootloader.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

3
plat/arm/css/common/css_pm.c
View file

@ -11,13 +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/common/plat_arm.h>
#include <plat/arm/css/common/css_pm.h> #include <plat/arm/css/common/css_pm.h>
#include <plat/common/platform.h> #include <plat/common/platform.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

8
plat/arm/css/common/sp_min/css_sp_min.mk
View file

@ -10,12 +10,12 @@ BL32_SOURCES += plat/arm/css/common/css_pm.c \
ifeq (${CSS_USE_SCMI_SDS_DRIVER},0) ifeq (${CSS_USE_SCMI_SDS_DRIVER},0)
BL32_SOURCES += drivers/arm/css/mhu/css_mhu.c \ BL32_SOURCES += drivers/arm/css/mhu/css_mhu.c \
drivers/arm/css/scpi/css_scpi.c \ drivers/arm/css/scp/css_pm_scpi.c \
plat/arm/css/drivers/scp/css_pm_scpi.c drivers/arm/css/scpi/css_scpi.c
else else
BL32_SOURCES += drivers/arm/css/mhu/css_mhu_doorbell.c \ BL32_SOURCES += drivers/arm/css/mhu/css_mhu_doorbell.c \
drivers/arm/css/scp/css_pm_scmi.c \
drivers/arm/css/scmi/scmi_common.c \ drivers/arm/css/scmi/scmi_common.c \
drivers/arm/css/scmi/scmi_pwr_dmn_proto.c \ drivers/arm/css/scmi/scmi_pwr_dmn_proto.c \
drivers/arm/css/scmi/scmi_sys_pwr_proto.c \ drivers/arm/css/scmi/scmi_sys_pwr_proto.c
plat/arm/css/drivers/scp/css_pm_scmi.c
endif endif