Platform: Refactor fvp_sse300 CMakeList.txt files
Refactor mps2 and mps3 fvp_sse300 CMakeList.txt files to match
directory structure for better readability
Signed-off-by: Marton Berke <marton.berke@arm.com>
Change-Id: I67767fbd3dcc6125d1fa36dd3553d78e68982c39
diff --git a/platform/ext/target/mps2/fvp_sse300/CMakeLists.txt b/platform/ext/target/mps2/fvp_sse300/CMakeLists.txt
index d87cabb..6b417cd 100644
--- a/platform/ext/target/mps2/fvp_sse300/CMakeLists.txt
+++ b/platform/ext/target/mps2/fvp_sse300/CMakeLists.txt
@@ -92,26 +92,25 @@
native_drivers
partition
services/src
- native_drivers
${PLATFORM_DIR}/..
)
target_sources(platform_s
PRIVATE
- device/source/system_core_init.c
- device/source/device_definition.c
- native_drivers/uart_cmsdk_drv.c
- native_drivers/systimer_armv8-m_drv.c
- target_cfg.c
- cmsis_drivers/Driver_USART.c
cmsis_drivers/Driver_Flash.c
- native_drivers/mpc_sie_drv.c
- native_drivers/ppc_sse300_drv.c
- spm_hal.c
- tfm_hal_isolation.c
- native_drivers/mpu_armv8m_drv.c
cmsis_drivers/Driver_MPC.c
cmsis_drivers/Driver_SSE300_PPC.c
+ cmsis_drivers/Driver_USART.c
+ device/source/device_definition.c
+ device/source/system_core_init.c
+ native_drivers/mpc_sie_drv.c
+ native_drivers/mpu_armv8m_drv.c
+ native_drivers/ppc_sse300_drv.c
+ native_drivers/systimer_armv8-m_drv.c
+ native_drivers/uart_cmsdk_drv.c
+ spm_hal.c
+ target_cfg.c
+ tfm_hal_isolation.c
${CMAKE_SOURCE_DIR}/platform/ext/common/tfm_hal_isolation_mpu_v8m.c
$<$<BOOL:${TFM_PARTITION_PLATFORM}>:${CMAKE_CURRENT_SOURCE_DIR}/plat_test.c>
$<$<BOOL:${TFM_PARTITION_PLATFORM}>:${CMAKE_CURRENT_SOURCE_DIR}/services/src/tfm_platform_system.c>
@@ -131,12 +130,12 @@
target_sources(platform_ns
PRIVATE
- device/source/system_core_init.c
- device/source/device_definition.c
- native_drivers/uart_cmsdk_drv.c
- native_drivers/systimer_armv8-m_drv.c
- cmsis_drivers/Driver_USART.c
cmsis_drivers/Driver_Flash.c
+ cmsis_drivers/Driver_USART.c
+ device/source/device_definition.c
+ device/source/system_core_init.c
+ native_drivers/systimer_armv8-m_drv.c
+ native_drivers/uart_cmsdk_drv.c
$<$<BOOL:${TFM_PARTITION_PLATFORM}>:${CMAKE_CURRENT_SOURCE_DIR}/plat_test.c>
$<$<BOOL:${TFM_PARTITION_PLATFORM}>:${CMAKE_CURRENT_SOURCE_DIR}/services/src/tfm_platform_system.c>
)
@@ -153,10 +152,8 @@
device/include
device/source/armclang
native_drivers
- native_drivers/timer_cmsdk
partition
services/src
- native_drivers
)
#========================= Platform BL2 =======================================#
@@ -164,12 +161,12 @@
if(BL2)
target_sources(platform_bl2
PRIVATE
- boot_hal.c
+ cmsis_drivers/Driver_Flash.c
+ cmsis_drivers/Driver_USART.c
device/source/device_definition.c
device/source/system_core_init.c
- cmsis_drivers/Driver_Flash.c
native_drivers/uart_cmsdk_drv.c
- cmsis_drivers/Driver_USART.c
+ boot_hal.c
)
target_include_directories(platform_bl2
@@ -183,7 +180,6 @@
native_drivers
partition
services/src
- native_drivers
PRIVATE
.
diff --git a/platform/ext/target/mps3/fvp_sse300/CMakeLists.txt b/platform/ext/target/mps3/fvp_sse300/CMakeLists.txt
index 67d2fa5..838981d 100644
--- a/platform/ext/target/mps3/fvp_sse300/CMakeLists.txt
+++ b/platform/ext/target/mps3/fvp_sse300/CMakeLists.txt
@@ -79,18 +79,17 @@
native_drivers
partition
services/src
- native_drivers
${PLATFORM_DIR}/..
)
target_sources(platform_s
PRIVATE
- cmsis_drivers/Driver_FVP_SSE300_MPC.c
cmsis_drivers/Driver_Flash.c
+ cmsis_drivers/Driver_FVP_SSE300_MPC.c
cmsis_drivers/Driver_SSE300_PPC.c
cmsis_drivers/Driver_USART.c
- device/source/system_core_init.c
device/source/device_definition.c
+ device/source/system_core_init.c
native_drivers/mpc_sie_drv.c
native_drivers/mpu_armv8m_drv.c
native_drivers/ppc_sse300_drv.c
@@ -115,22 +114,16 @@
${COMPILER_CMSE_FLAG}
)
-target_compile_definitions(platform_s
- PUBLIC
- $<$<C_COMPILER_ID:GNU>:__STARTUP_CLEAR_BSS_MULTIPLE>
- $<$<C_COMPILER_ID:GNU>:__STARTUP_COPY_MULTIPLE>
-)
-
#========================= Platform Non-Secure ================================#
target_sources(platform_ns
PRIVATE
- device/source/system_core_init.c
- device/source/device_definition.c
- native_drivers/systimer_armv8-m_drv.c
- native_drivers/uart_cmsdk_drv.c
cmsis_drivers/Driver_Flash.c
cmsis_drivers/Driver_USART.c
+ device/source/device_definition.c
+ device/source/system_core_init.c
+ native_drivers/systimer_armv8-m_drv.c
+ native_drivers/uart_cmsdk_drv.c
$<$<BOOL:${TFM_PARTITION_PLATFORM}>:${CMAKE_CURRENT_SOURCE_DIR}/plat_test.c>
$<$<BOOL:${TFM_PARTITION_PLATFORM}>:${CMAKE_CURRENT_SOURCE_DIR}/services/src/tfm_platform_system.c>
)
@@ -149,7 +142,6 @@
native_drivers
partition
services/src
- native_drivers
)
#========================= Platform BL2 =======================================#
@@ -157,12 +149,12 @@
if(BL2)
target_sources(platform_bl2
PRIVATE
- boot_hal.c
+ cmsis_drivers/Driver_Flash.c
+ cmsis_drivers/Driver_USART.c
device/source/device_definition.c
device/source/system_core_init.c
- cmsis_drivers/Driver_Flash.c
native_drivers/uart_cmsdk_drv.c
- cmsis_drivers/Driver_USART.c
+ boot_hal.c
)
target_include_directories(platform_bl2
@@ -176,7 +168,6 @@
native_drivers
partition
services/src
- native_drivers
PRIVATE
.