aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorKen Liu <ken.liu@arm.com>2019-08-01 13:43:16 +0800
committerKen Liu <ken.liu@arm.com>2019-08-27 01:10:08 +0000
commitd8e0b8c2663eeb6163b072f388e8c4b30a27d72c (patch)
tree42e8d8fd52e6546ff3c04100f29582611cae8504 /app
parent1c361cd4c858bd21178ee1a0d3d8cce91102ea1b (diff)
downloadtrusted-firmware-m-d8e0b8c2663eeb6163b072f388e8c4b30a27d72c.tar.gz
Build: Move 'secure_fw' out of 'app' build territory
'secure_fw' should be a standalone project instead of being launched by 'app' build. Move it out of 'app' territory and correct veneer lib settings for 'app'. Change-Id: Ic50b0df234cbee0741ff9385a0c59ef87070df41 Signed-off-by: Ken Liu <ken.liu@arm.com>
Diffstat (limited to 'app')
-rw-r--r--app/CMakeLists.txt15
1 files changed, 9 insertions, 6 deletions
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 54e25a66f9..b4084bb385 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -303,8 +303,16 @@ function(set_up_app_build)
#Ensure secure_fw is built before our executable.
add_dependencies(${EXE_NAME} ${S_BIN})
+ if (NOT DEFINED S_VENEER_PATH)
+ if (EXISTS ${CMAKE_CURRENT_BINARY_DIR}/../secure_fw)
+ set (S_VENEER_PATH "${CMAKE_CURRENT_BINARY_DIR}/../secure_fw")
+ else()
+ message(FATAL_ERROR "No valid path for S_VENEER_PATH, secure_fw is built?")
+ endif()
+ endif()
+
#Add the veneers to the executable.
- set(S_VENEER_FILE "${CMAKE_CURRENT_BINARY_DIR}/${VENEER_NAME}")
+ set(S_VENEER_FILE "${S_VENEER_PATH}/${VENEER_NAME}")
set_property(TARGET ${EXE_NAME} APPEND PROPERTY LINK_LIBRARIES ${S_VENEER_FILE})
#Collect executables to common location: build/install/outputs/
@@ -317,11 +325,6 @@ function(set_up_app_build)
DESTINATION outputs/fvp/)
endfunction()
-if (NOT TARGET_TFM_S_EXISTED)
- set(S_VENEER_FILE_LOCATION "${CMAKE_CURRENT_BINARY_DIR}")
- add_subdirectory(../secure_fw ${CMAKE_CURRENT_BINARY_DIR}/secure_fw)
-endif()
-
if (LINK_TO_BOTH_MEMORY_REGION)
#Link to primary memory region
set_up_app_build(NS_TARGET ${PROJECT_NAME}