commit 1dab74ba8d7b6acbe45dfeac9264a9f1c8c8eb86
author Øyvind Rønningstad <oyvind.ronningstad@nordicsemi.no> Tue Dec 01 15:26:39 2020 +0100
committer David Hu <david.hu@arm.com> Tue Dec 15 13:24:25 2020 +0000
tree 3cafe541e3c663adc8c5bf32bdd38f516521fae2
parent 5a212ec8141ddf720a328d7a37d49c3b9095158f

Build: Support out-of-tree platforms

Allows -DTFM_PLATFORM to be set to paths outside the TFM tree.

e.g.
cmake ... -DTFM_PLATFORM=../../../../tfm_platforms/my_platform

Note: TFM_PLATFORM currently only accepts paths relative from
platform/ext/target

Change-Id: I99d194fdee43ffa29da67b22eb79ef5e450c1559
Signed-off-by: Øyvind Rønningstad <oyvind.ronningstad@nordicsemi.no>

cmake/install.cmake

diff --git a/cmake/install.cmake b/cmake/install.cmake
index 1fcecc7..3deee99 100644
--- a/cmake/install.cmake
+++ b/cmake/install.cmake
@@ -8,9 +8,10 @@
 # Generate correct filename
 string(TOUPPER ${TFM_PLATFORM} TFM_PLATFORM_UPPERCASE)
 string(REGEX REPLACE "-" "_" TFM_PLATFORM_UPPERCASE_UNDERSCORE ${TFM_PLATFORM_UPPERCASE})
+string(REGEX REPLACE "^(\\.\\.([\\/\\\\]))+" "EXTERNAL\\2" TFM_PLATFORM_UPPERCASE_UNDERSCORE_NO_PARENT_DIR ${TFM_PLATFORM_UPPERCASE_UNDERSCORE})
 
 install(DIRECTORY ${CMAKE_BINARY_DIR}/bin/
-        DESTINATION ${CMAKE_BINARY_DIR}/install/outputs/${TFM_PLATFORM_UPPERCASE_UNDERSCORE}
+        DESTINATION ${CMAKE_BINARY_DIR}/install/outputs/${TFM_PLATFORM_UPPERCASE_UNDERSCORE_NO_PARENT_DIR}
 )
 
 set(INTERFACE_INC_DIR ${CMAKE_SOURCE_DIR}/interface/include)

platform/CMakeLists.txt

diff --git a/platform/CMakeLists.txt b/platform/CMakeLists.txt
index b03c88e..915307c 100755
--- a/platform/CMakeLists.txt
+++ b/platform/CMakeLists.txt
@@ -23,7 +23,7 @@
 
 set(PLATFORM_DIR ${CMAKE_CURRENT_LIST_DIR})
 
-add_subdirectory(ext/target/${TFM_PLATFORM})
+add_subdirectory(ext/target/${TFM_PLATFORM} target)
 
 #========================= Platform Secure ====================================#
 

platform/ext/target/musca_b1/sse_200/CMakeLists.txt

diff --git a/platform/ext/target/musca_b1/sse_200/CMakeLists.txt b/platform/ext/target/musca_b1/sse_200/CMakeLists.txt
index 8fac077..d65748f 100644
--- a/platform/ext/target/musca_b1/sse_200/CMakeLists.txt
+++ b/platform/ext/target/musca_b1/sse_200/CMakeLists.txt
@@ -187,7 +187,7 @@
             Device/Config
             Native_Driver
             ${MCUBOOT_PATH}/boot/bootutil/include # for fault_injection_hardening.h only
-            ${CMAKE_CURRENT_BINARY_DIR}/../../../../../bl2/ext/mcuboot # for mcuboot_config.h only
+            ${CMAKE_BINARY_DIR}/bl2/ext/mcuboot # for mcuboot_config.h only
             ${CMAKE_MUSCA_B1_COMMON_DIR}/Native_Driver
             ${CMAKE_MUSCA_B1_COMMON_DIR}/Libraries
     )

platform/ext/target/musca_s1/CMakeLists.txt

diff --git a/platform/ext/target/musca_s1/CMakeLists.txt b/platform/ext/target/musca_s1/CMakeLists.txt
index 536b12a..6180be2 100644
--- a/platform/ext/target/musca_s1/CMakeLists.txt
+++ b/platform/ext/target/musca_s1/CMakeLists.txt
@@ -148,6 +148,6 @@
             Device/Config
             Native_Driver
             ${MCUBOOT_PATH}/boot/bootutil/include # for fault_injection_hardening.h only
-            ${CMAKE_CURRENT_BINARY_DIR}/../../../../bl2/ext/mcuboot # for mcuboot_config.h only
+            ${CMAKE_BINARY_DIR}/bl2/ext/mcuboot # for mcuboot_config.h only
     )
 endif()