From 5932d194d7de355616de46adea8248224190b63e Mon Sep 17 00:00:00 2001 From: Antonio Nino Diaz Date: Wed, 23 Jan 2019 19:06:55 +0000 Subject: [PATCH] plat/arm: sds: Move to drivers/ folder Change-Id: Ia601d5ad65ab199e747fb60af4979b7db477d249 Signed-off-by: Antonio Nino Diaz --- drivers/arm/css/scp/css_sds.c | 3 +-- .../drivers => drivers/arm/css}/sds/aarch32/sds_helpers.S | 3 ++- .../drivers => drivers/arm/css}/sds/aarch64/sds_helpers.S | 3 ++- {plat/arm/css/drivers => drivers/arm/css}/sds/sds.c | 2 +- {plat/arm/css/drivers => drivers/arm/css}/sds/sds_private.h | 0 {plat/arm/css/drivers/sds => include/drivers/arm/css}/sds.h | 0 plat/arm/board/juno/juno_bl1_setup.c | 3 +-- plat/arm/board/juno/platform.mk | 5 ++--- plat/arm/css/common/css_common.mk | 6 +++--- 9 files changed, 12 insertions(+), 13 deletions(-) rename {plat/arm/css/drivers => drivers/arm/css}/sds/aarch32/sds_helpers.S (97%) rename {plat/arm/css/drivers => drivers/arm/css}/sds/aarch64/sds_helpers.S (97%) rename {plat/arm/css/drivers => drivers/arm/css}/sds/sds.c (99%) rename {plat/arm/css/drivers => drivers/arm/css}/sds/sds_private.h (100%) rename {plat/arm/css/drivers/sds => include/drivers/arm/css}/sds.h (100%) diff --git a/drivers/arm/css/scp/css_sds.c b/drivers/arm/css/scp/css_sds.c index 2bfe7501..e42ee10d 100644 --- a/drivers/arm/css/scp/css_sds.c +++ b/drivers/arm/css/scp/css_sds.c @@ -10,12 +10,11 @@ #include #include #include +#include #include #include #include -#include "../sds/sds.h" - int css_scp_boot_image_xfer(void *image, unsigned int image_size) { int ret; diff --git a/plat/arm/css/drivers/sds/aarch32/sds_helpers.S b/drivers/arm/css/sds/aarch32/sds_helpers.S similarity index 97% rename from plat/arm/css/drivers/sds/aarch32/sds_helpers.S rename to drivers/arm/css/sds/aarch32/sds_helpers.S index f68cb35f..13ff0e18 100644 --- a/plat/arm/css/drivers/sds/aarch32/sds_helpers.S +++ b/drivers/arm/css/sds/aarch32/sds_helpers.S @@ -6,8 +6,9 @@ #include #include +#include #include -#include "../sds.h" + #include "../sds_private.h" .globl sds_get_primary_cpu_id diff --git a/plat/arm/css/drivers/sds/aarch64/sds_helpers.S b/drivers/arm/css/sds/aarch64/sds_helpers.S similarity index 97% rename from plat/arm/css/drivers/sds/aarch64/sds_helpers.S rename to drivers/arm/css/sds/aarch64/sds_helpers.S index 3b9c562d..3256c2b5 100644 --- a/plat/arm/css/drivers/sds/aarch64/sds_helpers.S +++ b/drivers/arm/css/sds/aarch64/sds_helpers.S @@ -6,8 +6,9 @@ #include #include +#include #include -#include "../sds.h" + #include "../sds_private.h" .globl sds_get_primary_cpu_id diff --git a/plat/arm/css/drivers/sds/sds.c b/drivers/arm/css/sds/sds.c similarity index 99% rename from plat/arm/css/drivers/sds/sds.c rename to drivers/arm/css/sds/sds.c index eb2f48ef..1fb196c7 100644 --- a/plat/arm/css/drivers/sds/sds.c +++ b/drivers/arm/css/sds/sds.c @@ -10,9 +10,9 @@ #include #include +#include #include -#include "sds.h" #include "sds_private.h" /* diff --git a/plat/arm/css/drivers/sds/sds_private.h b/drivers/arm/css/sds/sds_private.h similarity index 100% rename from plat/arm/css/drivers/sds/sds_private.h rename to drivers/arm/css/sds/sds_private.h diff --git a/plat/arm/css/drivers/sds/sds.h b/include/drivers/arm/css/sds.h similarity index 100% rename from plat/arm/css/drivers/sds/sds.h rename to include/drivers/arm/css/sds.h diff --git a/plat/arm/board/juno/juno_bl1_setup.c b/plat/arm/board/juno/juno_bl1_setup.c index f72dba18..f72a6ff1 100644 --- a/plat/arm/board/juno/juno_bl1_setup.c +++ b/plat/arm/board/juno/juno_bl1_setup.c @@ -9,13 +9,12 @@ #include #include #include +#include #include #include #include #include -#include - void juno_reset_to_aarch32_state(void); static int is_watchdog_reset(void) diff --git a/plat/arm/board/juno/platform.mk b/plat/arm/board/juno/platform.mk index a0281af2..6575811a 100644 --- a/plat/arm/board/juno/platform.mk +++ b/plat/arm/board/juno/platform.mk @@ -26,8 +26,7 @@ endif # SCP during power management operations and for SCP RAM Firmware transfer. CSS_USE_SCMI_SDS_DRIVER := 1 -PLAT_INCLUDES := -Iplat/arm/board/juno/include \ - -Iplat/arm/css/drivers/sds +PLAT_INCLUDES := -Iplat/arm/board/juno/include PLAT_BL_COMMON_SOURCES := plat/arm/board/juno/${ARCH}/juno_helpers.S \ plat/arm/board/juno/juno_common.c @@ -87,7 +86,7 @@ BL31_SOURCES += drivers/cfi/v2m/v2m_flash.c \ ${JUNO_SECURITY_SOURCES} ifeq (${CSS_USE_SCMI_SDS_DRIVER},1) -BL1_SOURCES += plat/arm/css/drivers/sds/sds.c +BL1_SOURCES += drivers/arm/css/sds/sds.c endif endif diff --git a/plat/arm/css/common/css_common.mk b/plat/arm/css/common/css_common.mk index fba9cdce..2fbbe456 100644 --- a/plat/arm/css/common/css_common.mk +++ b/plat/arm/css/common/css_common.mk @@ -50,10 +50,10 @@ ifeq (${CSS_LOAD_SCP_IMAGES},1) ifeq (${CSS_USE_SCMI_SDS_DRIVER},1) BL2U_SOURCES += drivers/arm/css/scp/css_sds.c \ - plat/arm/css/drivers/sds/sds.c + drivers/arm/css/sds/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 BL2U_SOURCES += drivers/arm/css/mhu/css_mhu.c \ drivers/arm/css/scp/css_bom_bootloader.c \ @@ -73,7 +73,7 @@ ifeq (${CSS_LOAD_SCP_IMAGES},1) endif 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 # Process CSS_USE_SCMI_SDS_DRIVER flag -- 2.30.2