diff options
-rw-r--r-- | drivers/arm/css/scpi/css_scpi.c (renamed from plat/arm/css/drivers/scpi/css_scpi.c) | 3 | ||||
-rw-r--r-- | include/drivers/arm/css/css_scpi.h (renamed from plat/arm/css/drivers/scpi/css_scpi.h) | 0 | ||||
-rw-r--r-- | plat/arm/css/common/css_common.mk | 16 | ||||
-rw-r--r-- | plat/arm/css/common/sp_min/css_sp_min.mk | 4 | ||||
-rw-r--r-- | plat/arm/css/drivers/scp/css_bom_bootloader.c | 2 | ||||
-rw-r--r-- | plat/arm/css/drivers/scp/css_pm_scpi.c | 2 |
6 files changed, 13 insertions, 14 deletions
diff --git a/plat/arm/css/drivers/scpi/css_scpi.c b/drivers/arm/css/scpi/css_scpi.c index 4965c660bc..4b73265add 100644 --- a/plat/arm/css/drivers/scpi/css_scpi.c +++ b/drivers/arm/css/scpi/css_scpi.c @@ -10,12 +10,11 @@ #include <arch_helpers.h> #include <common/debug.h> #include <drivers/arm/css/css_mhu.h> +#include <drivers/arm/css/css_scpi.h> #include <lib/utils.h> #include <plat/common/platform.h> #include <platform_def.h> -#include "css_scpi.h" - #define SCPI_SHARED_MEM_SCP_TO_AP PLAT_CSS_SCP_COM_SHARED_MEM_BASE #define SCPI_SHARED_MEM_AP_TO_SCP (PLAT_CSS_SCP_COM_SHARED_MEM_BASE \ + 0x100) diff --git a/plat/arm/css/drivers/scpi/css_scpi.h b/include/drivers/arm/css/css_scpi.h index 68fc60a6e8..68fc60a6e8 100644 --- a/plat/arm/css/drivers/scpi/css_scpi.h +++ b/include/drivers/arm/css/css_scpi.h diff --git a/plat/arm/css/common/css_common.mk b/plat/arm/css/common/css_common.mk index 55303f11d9..36da732089 100644 --- a/plat/arm/css/common/css_common.mk +++ b/plat/arm/css/common/css_common.mk @@ -27,8 +27,8 @@ BL31_SOURCES += plat/arm/css/common/css_pm.c \ ifeq (${CSS_USE_SCMI_SDS_DRIVER},0) 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 + drivers/arm/css/scpi/css_scpi.c \ + plat/arm/css/drivers/scp/css_pm_scpi.c else BL31_SOURCES += drivers/arm/css/mhu/css_mhu_doorbell.c \ drivers/arm/css/scmi/scmi_ap_core_proto.c \ @@ -55,13 +55,13 @@ 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 += drivers/arm/css/mhu/css_mhu.c \ - plat/arm/css/drivers/scp/css_bom_bootloader.c \ - plat/arm/css/drivers/scpi/css_scpi.c + BL2U_SOURCES += drivers/arm/css/mhu/css_mhu.c \ + drivers/arm/css/scpi/css_scpi.c \ + plat/arm/css/drivers/scp/css_bom_bootloader.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 + BL2_SOURCES += drivers/arm/css/mhu/css_mhu.c \ + drivers/arm/css/scpi/css_scpi.c \ + plat/arm/css/drivers/scp/css_bom_bootloader.c # Enable option to detect whether the SCP ROM firmware in use predates version # 1.7.0 and therefore, is incompatible. CSS_DETECT_PRE_1_7_0_SCP := 1 diff --git a/plat/arm/css/common/sp_min/css_sp_min.mk b/plat/arm/css/common/sp_min/css_sp_min.mk index 53daf1b982..a7c61be82a 100644 --- a/plat/arm/css/common/sp_min/css_sp_min.mk +++ b/plat/arm/css/common/sp_min/css_sp_min.mk @@ -10,8 +10,8 @@ BL32_SOURCES += plat/arm/css/common/css_pm.c \ ifeq (${CSS_USE_SCMI_SDS_DRIVER},0) 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 + drivers/arm/css/scpi/css_scpi.c \ + plat/arm/css/drivers/scp/css_pm_scpi.c else BL32_SOURCES += drivers/arm/css/mhu/css_mhu_doorbell.c \ drivers/arm/css/scmi/scmi_common.c \ diff --git a/plat/arm/css/drivers/scp/css_bom_bootloader.c b/plat/arm/css/drivers/scp/css_bom_bootloader.c index 5fe268d63f..40880da299 100644 --- a/plat/arm/css/drivers/scp/css_bom_bootloader.c +++ b/plat/arm/css/drivers/scp/css_bom_bootloader.c @@ -10,10 +10,10 @@ #include <arch_helpers.h> #include <common/debug.h> #include <drivers/arm/css/css_mhu.h> +#include <drivers/arm/css/css_scpi.h> #include <plat/common/platform.h> #include <platform_def.h> -#include "../scpi/css_scpi.h" #include "css_scp.h" /* ID of the MHU slot used for the BOM protocol */ diff --git a/plat/arm/css/drivers/scp/css_pm_scpi.c b/plat/arm/css/drivers/scp/css_pm_scpi.c index 04c5f9b496..7e228169ac 100644 --- a/plat/arm/css/drivers/scp/css_pm_scpi.c +++ b/plat/arm/css/drivers/scp/css_pm_scpi.c @@ -8,10 +8,10 @@ #include <arch_helpers.h> #include <common/debug.h> +#include <drivers/arm/css/css_scpi.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" /* |