Platform: CS300: Fix CP flag settings
Moved the coprocessor related flags to a new cmake target
so it can be used for S/NS targets as well.
Changed the flash_drivers to interface lib so the CP flags
don't have to be added explicitly.
Change-Id: I4aa5e0586dc9408c0b93212e3f3d4dec20ca4b5e
Signed-off-by: Bence Balogh <bence.balogh@arm.com>
diff --git a/platform/ext/target/arm/mps3/corstone300/an547/CMakeLists.txt b/platform/ext/target/arm/mps3/corstone300/an547/CMakeLists.txt
index 51b8f79..26ab914 100644
--- a/platform/ext/target/arm/mps3/corstone300/an547/CMakeLists.txt
+++ b/platform/ext/target/arm/mps3/corstone300/an547/CMakeLists.txt
@@ -14,10 +14,10 @@
${CMAKE_CURRENT_SOURCE_DIR}/tfm_hal_platform_reset_halt.c
)
-add_library(flash_drivers STATIC)
+add_library(flash_drivers INTERFACE)
target_include_directories(flash_drivers
- PRIVATE
+ INTERFACE
${PLATFORM_DIR}/ext/target/arm/drivers/qspi/xilinx_pg153_axi
${PLATFORM_DIR}/ext/target/arm/drivers/flash/sst26vf064b
${PLATFORM_DIR}/ext/target/arm/drivers/flash/common
@@ -27,7 +27,7 @@
)
target_sources(flash_drivers
- PRIVATE
+ INTERFACE
cmsis_drivers/Driver_Flash.c
${PLATFORM_DIR}/ext/target/arm/drivers/flash/sst26vf064b/spi_sst26vf064b_flash_lib.c
${PLATFORM_DIR}/ext/target/arm/drivers/qspi/xilinx_pg153_axi/xilinx_pg153_axi_qspi_controller_drv.c
@@ -35,7 +35,7 @@
)
target_link_libraries(flash_drivers
- PRIVATE
+ INTERFACE
cmsis_includes_s
)
diff --git a/platform/ext/target/arm/mps3/corstone300/an552/CMakeLists.txt b/platform/ext/target/arm/mps3/corstone300/an552/CMakeLists.txt
index ee8018e..6d80dcb 100644
--- a/platform/ext/target/arm/mps3/corstone300/an552/CMakeLists.txt
+++ b/platform/ext/target/arm/mps3/corstone300/an552/CMakeLists.txt
@@ -9,10 +9,10 @@
include(${CORSTONE300_COMMON_DIR}/common.cmake)
-add_library(flash_drivers STATIC)
+add_library(flash_drivers INTERFACE)
target_include_directories(flash_drivers
- PRIVATE
+ INTERFACE
${PLATFORM_DIR}/ext/target/arm/drivers/qspi/xilinx_pg153_axi
${PLATFORM_DIR}/ext/target/arm/drivers/flash/sst26vf064b
${PLATFORM_DIR}/ext/target/arm/drivers/flash/common
@@ -22,7 +22,7 @@
)
target_sources(flash_drivers
- PRIVATE
+ INTERFACE
cmsis_drivers/Driver_Flash.c
${PLATFORM_DIR}/ext/target/arm/drivers/flash/sst26vf064b/spi_sst26vf064b_flash_lib.c
${PLATFORM_DIR}/ext/target/arm/drivers/qspi/xilinx_pg153_axi/xilinx_pg153_axi_qspi_controller_drv.c
@@ -30,7 +30,7 @@
)
target_link_libraries(flash_drivers
- PRIVATE
+ INTERFACE
cmsis_includes_s
)
diff --git a/platform/ext/target/arm/mps3/corstone300/common/common.cmake b/platform/ext/target/arm/mps3/corstone300/common/common.cmake
index 5d6de18..09ce7e4 100644
--- a/platform/ext/target/arm/mps3/corstone300/common/common.cmake
+++ b/platform/ext/target/arm/mps3/corstone300/common/common.cmake
@@ -122,15 +122,6 @@
${COMPILER_CMSE_FLAG}
)
-target_compile_options(cmsis_includes_s
- INTERFACE
- ${COMPILER_CP_FLAG}
-)
-
-target_link_options(cmsis_includes_s
- INTERFACE
- ${LINKER_CP_OPTION}
-)
add_library(cmsis_includes_ns INTERFACE)
target_link_libraries(cmsis_includes_ns INTERFACE cmsis_includes)
@@ -139,6 +130,18 @@
${CORSTONE300_COMMON_DIR}/cmsis_drivers/config/non_secure
)
+add_library(cp_flags INTERFACE)
+
+target_compile_options(cp_flags
+ INTERFACE
+ ${COMPILER_CP_FLAG}
+)
+
+target_link_options(cp_flags
+ INTERFACE
+ ${LINKER_CP_OPTION}
+)
+
#========================= Linking ===============================#
target_link_libraries(device_definition_s PUBLIC device_definition)
@@ -157,16 +160,17 @@
target_link_libraries(platform_s
PUBLIC
cmsis_includes_s
+ cp_flags
INTERFACE
device_definition
PRIVATE
device_definition_s
-
)
target_link_libraries(platform_ns
PUBLIC
cmsis_includes_ns
+ cp_flags
PRIVATE
device_definition_ns
)
diff --git a/platform/ext/target/arm/mps3/corstone300/fvp/CMakeLists.txt b/platform/ext/target/arm/mps3/corstone300/fvp/CMakeLists.txt
index 9021d20..bbcf1c6 100644
--- a/platform/ext/target/arm/mps3/corstone300/fvp/CMakeLists.txt
+++ b/platform/ext/target/arm/mps3/corstone300/fvp/CMakeLists.txt
@@ -9,10 +9,10 @@
include(${CORSTONE300_COMMON_DIR}/common.cmake)
-add_library(flash_drivers STATIC)
+add_library(flash_drivers INTERFACE)
target_include_directories(flash_drivers
- PRIVATE
+ INTERFACE
${PLATFORM_DIR}/ext/driver
${CMAKE_CURRENT_SOURCE_DIR}/partition
${CORSTONE300_COMMON_DIR}/partition
@@ -21,13 +21,13 @@
)
target_sources(flash_drivers
- PRIVATE
+ INTERFACE
cmsis_drivers/Driver_Flash.c
${PLATFORM_DIR}/ext/target/arm/drivers/flash/emulated/emulated_flash_drv.c
)
target_link_libraries(flash_drivers
- PRIVATE
+ INTERFACE
cmsis_includes_s
)