github
/
arm-trusted-firmware
mirror of https://github.com/ARM-software/arm-trusted-firmware.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

plat/arm: mhu: Move to drivers/ folder 

Change-Id: I656753a1825ea7340a3708b950fa6b57455e9056
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
pull/1784/head
Antonio Nino Diaz 6 years ago
parent
14928b88ab
commit
c411396e55
12 changed files with 22 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      drivers/arm/css/mhu/css_mhu.c
  2. 3
      drivers/arm/css/mhu/css_mhu_doorbell.c
  3. 0
      include/drivers/arm/css/css_mhu.h
  4. 0
      include/drivers/arm/css/css_mhu_doorbell.h
  5. 3
      plat/arm/board/juno/juno_topology.c
  6. 3
      plat/arm/board/n1sdp/n1sdp_bl31_setup.c
  7. 18
      plat/arm/css/common/css_common.mk
  8. 10
      plat/arm/css/common/sp_min/css_sp_min.mk
  9. 2
      plat/arm/css/drivers/scp/css_bom_bootloader.c
  10. 2
      plat/arm/css/drivers/scpi/css_scpi.c
  11. 3
      plat/arm/css/sgi/sgi_bl31_setup.c
  12. 2
      plat/arm/css/sgm/sgm_bl31_setup.c

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

@ -9,12 +9,11 @@
#include <platform_def.h>
#include <arch_helpers.h>
#include <drivers/arm/css/css_mhu.h>
#include <lib/bakery_lock.h>
#include <lib/mmio.h>
#include <plat/arm/common/plat_arm.h>
#include "css_mhu.h"
/* SCP MHU secure channel registers */
#define SCP_INTR_S_STAT 0x200
#define SCP_INTR_S_SET 0x208

3
plat/arm/css/drivers/mhu/css_mhu_doorbell.c → drivers/arm/css/mhu/css_mhu_doorbell.c
View File

@ -7,10 +7,9 @@
#include <platform_def.h>
#include <arch_helpers.h>
#include <drivers/arm/css/css_mhu_doorbell.h>
#include <drivers/arm/css/scmi.h>
#include "css_mhu_doorbell.h"
void mhu_ring_doorbell(struct scmi_channel_plat_info *plat_info)
{
MHU_RING_DOORBELL(plat_info->db_reg_addr,

0
plat/arm/css/drivers/mhu/css_mhu.h → include/drivers/arm/css/css_mhu.h
View File

0
plat/arm/css/drivers/mhu/css_mhu_doorbell.h → include/drivers/arm/css/css_mhu_doorbell.h
View File

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

@ -4,14 +4,13 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <drivers/arm/css/css_mhu_doorbell.h>
#include <drivers/arm/css/scmi.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/drivers/mhu/css_mhu_doorbell.h"
#if CSS_USE_SCMI_SDS_DRIVER
static scmi_channel_plat_info_t juno_scmi_plat_info = {
.scmi_mbx_mem = CSS_SCMI_PAYLOAD_BASE,

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

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

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

@ -26,16 +26,16 @@ BL31_SOURCES += plat/arm/css/common/css_pm.c \
plat/arm/css/common/css_topology.c
ifeq (${CSS_USE_SCMI_SDS_DRIVER},0)
BL31_SOURCES += plat/arm/css/drivers/scp/css_pm_scpi.c \
plat/arm/css/drivers/mhu/css_mhu.c \
BL31_SOURCES += drivers/arm/css/mhu/css_mhu.c \
plat/arm/css/drivers/scp/css_pm_scpi.c \
plat/arm/css/drivers/scpi/css_scpi.c
else
BL31_SOURCES += drivers/arm/css/scmi/scmi_ap_core_proto.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_common.c \
drivers/arm/css/scmi/scmi_pwr_dmn_proto.c \
drivers/arm/css/scmi/scmi_sys_pwr_proto.c \
plat/arm/css/drivers/scp/css_pm_scmi.c \
plat/arm/css/drivers/mhu/css_mhu_doorbell.c
plat/arm/css/drivers/scp/css_pm_scmi.c
endif
# Process CSS_LOAD_SCP_IMAGES flag
@ -55,12 +55,12 @@ ifeq (${CSS_LOAD_SCP_IMAGES},1)
BL2_SOURCES += plat/arm/css/drivers/scp/css_sds.c \
plat/arm/css/drivers/sds/sds.c
else
BL2U_SOURCES += plat/arm/css/drivers/scp/css_bom_bootloader.c \
plat/arm/css/drivers/mhu/css_mhu.c \
BL2U_SOURCES += drivers/arm/css/mhu/css_mhu.c \
plat/arm/css/drivers/scp/css_bom_bootloader.c \
plat/arm/css/drivers/scpi/css_scpi.c
BL2_SOURCES += plat/arm/css/drivers/scp/css_bom_bootloader.c \
plat/arm/css/drivers/mhu/css_mhu.c \
BL2_SOURCES += drivers/arm/css/mhu/css_mhu.c \
plat/arm/css/drivers/scp/css_bom_bootloader.c \
plat/arm/css/drivers/scpi/css_scpi.c
# Enable option to detect whether the SCP ROM firmware in use predates version
# 1.7.0 and therefore, is incompatible.

10
plat/arm/css/common/sp_min/css_sp_min.mk
View File

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

2
plat/arm/css/drivers/scp/css_bom_bootloader.c
View File

@ -9,10 +9,10 @@
#include <arch_helpers.h>
#include <common/debug.h>
#include <drivers/arm/css/css_mhu.h>
#include <plat/common/platform.h>
#include <platform_def.h>
#include "../mhu/css_mhu.h"
#include "../scpi/css_scpi.h"
#include "css_scp.h"

2
plat/arm/css/drivers/scpi/css_scpi.c
View File

@ -9,11 +9,11 @@
#include <arch_helpers.h>
#include <common/debug.h>
#include <drivers/arm/css/css_mhu.h>
#include <lib/utils.h>
#include <plat/common/platform.h>
#include <platform_def.h>
#include "../mhu/css_mhu.h"
#include "css_scpi.h"
#define SCPI_SHARED_MEM_SCP_TO_AP PLAT_CSS_SCP_COM_SHARED_MEM_BASE

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

@ -10,14 +10,13 @@
#include <common/bl_common.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 <sgi_ras.h>
#include <sgi_variant.h>
#include "../../css/drivers/mhu/css_mhu_doorbell.h"
sgi_platform_info_t sgi_plat_info;
static scmi_channel_plat_info_t sgi575_scmi_plat_info = {

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

@ -6,11 +6,11 @@
#include <common/bl_common.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 <sgm_plat_config.h>
#include "../../css/drivers/mhu/css_mhu_doorbell.h"
static scmi_channel_plat_info_t sgm775_scmi_plat_info = {
.scmi_mbx_mem = CSS_SCMI_PAYLOAD_BASE,

Write Preview
Loading…
Cancel
Save