From 63197d014097a9a16090562892a4cb77e6426c0b Mon Sep 17 00:00:00 2001 From: Chandni Cherukuri Date: Tue, 4 Sep 2018 14:46:49 +0530 Subject: [PATCH] plat/arm/sgi: move fdts files to sgi575 board directory To align the placement of ftds files with that of other Arm platforms, move the ftds files from plat/arm/css/sgi/ to plat/arm/board/sgi575. Change-Id: Id7c772eb5cf3d308d4e02a3c8099218e889a0e96 Signed-off-by: Chandni Cherukuri --- plat/arm/{css/sgi => board/sgi575}/fdts/sgi575.dts | 0 .../sgi575}/fdts/sgi575_tb_fw_config.dts | 0 plat/arm/board/sgi575/platform.mk | 13 +++++++++++++ plat/arm/css/sgi/sgi-common.mk | 13 ------------- 4 files changed, 13 insertions(+), 13 deletions(-) rename plat/arm/{css/sgi => board/sgi575}/fdts/sgi575.dts (100%) rename plat/arm/{css/sgi => board/sgi575}/fdts/sgi575_tb_fw_config.dts (100%) diff --git a/plat/arm/css/sgi/fdts/sgi575.dts b/plat/arm/board/sgi575/fdts/sgi575.dts similarity index 100% rename from plat/arm/css/sgi/fdts/sgi575.dts rename to plat/arm/board/sgi575/fdts/sgi575.dts diff --git a/plat/arm/css/sgi/fdts/sgi575_tb_fw_config.dts b/plat/arm/board/sgi575/fdts/sgi575_tb_fw_config.dts similarity index 100% rename from plat/arm/css/sgi/fdts/sgi575_tb_fw_config.dts rename to plat/arm/board/sgi575/fdts/sgi575_tb_fw_config.dts diff --git a/plat/arm/board/sgi575/platform.mk b/plat/arm/board/sgi575/platform.mk index a18e45bb..8df8b129 100644 --- a/plat/arm/board/sgi575/platform.mk +++ b/plat/arm/board/sgi575/platform.mk @@ -21,3 +21,16 @@ BL31_SOURCES += ${SGI_CPU_SOURCES} \ drivers/cfi/v2m/v2m_flash.c \ lib/utils/mem_region.c \ plat/arm/common/arm_nor_psci_mem_protect.c + +# Add the FDT_SOURCES and options for Dynamic Config +FDT_SOURCES += ${SGI575_BASE}/fdts/${PLAT}_tb_fw_config.dts +TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_tb_fw_config.dtb + +# Add the TB_FW_CONFIG to FIP and specify the same to certtool +$(eval $(call TOOL_ADD_PAYLOAD,${TB_FW_CONFIG},--tb-fw-config)) + +FDT_SOURCES += ${SGI575_BASE}/fdts/${PLAT}.dts +HW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}.dtb + +# Add the HW_CONFIG to FIP and specify the same to certtool +$(eval $(call TOOL_ADD_PAYLOAD,${HW_CONFIG},--hw-config)) diff --git a/plat/arm/css/sgi/sgi-common.mk b/plat/arm/css/sgi/sgi-common.mk index bed8e99a..d6e5448d 100644 --- a/plat/arm/css/sgi/sgi-common.mk +++ b/plat/arm/css/sgi/sgi-common.mk @@ -47,19 +47,6 @@ ifeq (${RAS_EXTENSION},1) BL31_SOURCES += ${CSS_ENT_BASE}/sgi_ras.c endif -# Add the FDT_SOURCES and options for Dynamic Config -FDT_SOURCES += ${CSS_ENT_BASE}/fdts/${PLAT}_tb_fw_config.dts -TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_tb_fw_config.dtb - -# Add the TB_FW_CONFIG to FIP and specify the same to certtool -$(eval $(call TOOL_ADD_PAYLOAD,${TB_FW_CONFIG},--tb-fw-config)) - -FDT_SOURCES += ${CSS_ENT_BASE}/fdts/${PLAT}.dts -HW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}.dtb - -# Add the HW_CONFIG to FIP and specify the same to certtool -$(eval $(call TOOL_ADD_PAYLOAD,${HW_CONFIG},--hw-config)) - ifneq (${RESET_TO_BL31},0) $(error "Using BL31 as the reset vector is not supported on ${PLATFORM} platform. \ Please set RESET_TO_BL31 to 0.") -- 2.30.2