commit 3dd98630ffd986fbf05a352916b3a0f7fbbd0cb2
author Anton Komlev <anton.komlev@arm.com> Wed Sep 20 16:26:30 2023 +0100
committer Kevin Peng <kevin.peng@arm.com> Sat Oct 07 16:49:35 2023 +0800
tree a0577274cf86355a6d512e3ff45f59b28b9b3ed0
parent e478df97a8e75afa25f81bf17941adab0e3f66e2

Build: Remove redundant TFM_INSTALL_PATH variable

- Use a standard CMAKE_INSTALL_PREFIX variable instead
- Add default value CMAKE_INSTALL_PREFIX
- Make available install directoy global from local in install.cmake
- Install binaries to /bin instead of /outputs

Signed-off-by: Anton Komlev <anton.komlev@arm.com>
Change-Id: I3b259ac9686af69e98f1b1a4263209ce32eb1324

cmake/install.cmake

diff --git a/cmake/install.cmake b/cmake/install.cmake
index af31909..9c67f92 100644
--- a/cmake/install.cmake
+++ b/cmake/install.cmake
@@ -8,18 +8,9 @@
 #-------------------------------------------------------------------------------
 
 install(DIRECTORY ${CMAKE_BINARY_DIR}/bin/
-        DESTINATION outputs
+        DESTINATION bin
 )
 
-set(INTERFACE_INC_DIR ${CMAKE_SOURCE_DIR}/interface/include)
-set(INTERFACE_SRC_DIR ${CMAKE_SOURCE_DIR}/interface/src)
-
-set(INSTALL_INTERFACE_INC_DIR    ${TFM_INSTALL_PATH}/interface/include)
-set(INSTALL_INTERFACE_SRC_DIR    ${TFM_INSTALL_PATH}/interface/src)
-set(INSTALL_INTERFACE_LIB_DIR    ${TFM_INSTALL_PATH}/interface/lib)
-set(INSTALL_PLATFORM_NS_DIR      ${TFM_INSTALL_PATH}/platform)
-set(INSTALL_CMAKE_DIR            ${TFM_INSTALL_PATH}/cmake)
-
 # export veneer lib
 if (CONFIG_TFM_USE_TRUSTZONE)
     install(FILES       ${CMAKE_BINARY_DIR}/secure_fw/s_veneers.o
@@ -168,8 +159,6 @@
 
 ##################### Export image signing information #########################
 
-set(INSTALL_IMAGE_SIGNING_DIR ${TFM_INSTALL_PATH}/image_signing)
-
 if(BL2)
     install(DIRECTORY bl2/ext/mcuboot/scripts
             DESTINATION ${INSTALL_IMAGE_SIGNING_DIR}
@@ -211,19 +200,15 @@
 install(CODE "MESSAGE(\"----- Installing platform NS -----\")")
 
 install(FILES ${PLATFORM_DIR}/ext/common/gcc/tfm_common_ns.ld
-              DESTINATION ${INSTALL_PLATFORM_NS_DIR})
-
-install(FILES ${PLATFORM_DIR}/ext/common/armclang/tfm_common_ns.sct
-              DESTINATION ${INSTALL_PLATFORM_NS_DIR})
-
-install(FILES ${PLATFORM_DIR}/ext/common/iar/tfm_common_ns.icf
+              ${PLATFORM_DIR}/ext/common/armclang/tfm_common_ns.sct
+              ${PLATFORM_DIR}/ext/common/iar/tfm_common_ns.icf
               DESTINATION ${INSTALL_PLATFORM_NS_DIR})
 
 install(DIRECTORY ${PLATFORM_DIR}/ext/cmsis
         DESTINATION ${INSTALL_PLATFORM_NS_DIR})
 
 install(FILES ${CMAKE_SOURCE_DIR}/cmake/spe-CMakeLists.cmake
-        DESTINATION ${TFM_INSTALL_PATH}
+        DESTINATION ${CMAKE_INSTALL_PREFIX}
         RENAME CMakeLists.txt)
 
 install(FILES ${PLATFORM_DIR}/ns/toolchain_ns_GNUARM.cmake
@@ -248,12 +233,12 @@
 # "psa_crypto_config" target exists not in all configurations.
 # Functionally "psa_crypto_config" provides only include path for Crypto accelerator.
 install(TARGETS tfm_config psa_crypto_config psa_interface
-        DESTINATION ${TFM_INSTALL_PATH}
+        DESTINATION ${CMAKE_INSTALL_PREFIX}
         EXPORT tfm-config
         )
 else()
         install(TARGETS tfm_config psa_interface
-        DESTINATION ${TFM_INSTALL_PATH}
+        DESTINATION ${CMAKE_INSTALL_PREFIX}
         EXPORT tfm-config
         )
 endif()
@@ -269,6 +254,3 @@
 
 configure_file(${CMAKE_SOURCE_DIR}/config/spe_config.cmake.in
                ${INSTALL_CMAKE_DIR}/spe_config.cmake @ONLY)
-
-##################### Platform-specific installation ###########################
-include(${TARGET_PLATFORM_PATH}/install.cmake OPTIONAL)

cmake/spe-CMakeLists.cmake

diff --git a/cmake/spe-CMakeLists.cmake b/cmake/spe-CMakeLists.cmake
index 1d92591..d9a7405 100644
--- a/cmake/spe-CMakeLists.cmake
+++ b/cmake/spe-CMakeLists.cmake
@@ -83,11 +83,11 @@
         # support
         COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/image_signing/scripts/assemble.py
             --layout ${CMAKE_CURRENT_SOURCE_DIR}/image_signing/layout_files/signing_layout_s.o
-            --secure ${CMAKE_CURRENT_SOURCE_DIR}/outputs/tfm_s_signed.bin
+            --secure ${CMAKE_CURRENT_SOURCE_DIR}/bin/tfm_s_signed.bin
             --non_secure ${CMAKE_BINARY_DIR}/tfm_ns_signed.bin
             --output ${CMAKE_BINARY_DIR}/tfm_s_ns_signed.bin
         # merge bootloader and application into Hex image for upload
-        COMMAND srec_cat ${CMAKE_CURRENT_SOURCE_DIR}/outputs/bl2.bin -Binary -offset 0xA000000
+        COMMAND srec_cat ${CMAKE_CURRENT_SOURCE_DIR}/bin/bl2.bin -Binary -offset 0xA000000
             ${CMAKE_BINARY_DIR}/tfm_s_ns_signed.bin -Binary -offset 0xA020000
             -o ${CMAKE_BINARY_DIR}/tfm.hex -Intel
     )
@@ -101,7 +101,7 @@
         # concatenate S + NS binaries into tfm_s_ns.bin
         COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/image_signing/scripts/assemble.py
             --layout ${CMAKE_CURRENT_SOURCE_DIR}/image_signing/layout_files/signing_layout_s_ns.o
-            --secure ${CMAKE_CURRENT_SOURCE_DIR}/outputs/tfm_s.bin
+            --secure ${CMAKE_CURRENT_SOURCE_DIR}/bin/tfm_s.bin
             --non_secure ${CMAKE_BINARY_DIR}/tfm_ns.bin
             --output ${CMAKE_BINARY_DIR}/tfm_s_ns.bin