commit 57bfa43c98bd7cbb036d33f5ea2d0509ff10d013
author Tamas Ban <tamas.ban@arm.com> Fri Apr 13 16:05:49 2018 +0100
committer Tamas Ban <tamas.ban@arm.com> Fri Jul 20 16:00:27 2018 +0200
tree 3fbe09df4c5f8a3280acb567c56f3292142deb7a
parent f2589071516e7baf1281397a128f6ea885df7aef

CMake: collect executables to common location

Install target was extended to copy all artefacts to a
common location with elaborate naming convention.

Change-Id: I529ccd5ffd8bace7d015f093a1c1561c05eac6ff
Signed-off-by: Tamas Ban <tamas.ban@arm.com>

bl2/ext/mcuboot/MCUBoot.cmake

diff --git a/bl2/ext/mcuboot/MCUBoot.cmake b/bl2/ext/mcuboot/MCUBoot.cmake
index cdcfcbd..7ad81c8 100644
--- a/bl2/ext/mcuboot/MCUBoot.cmake
+++ b/bl2/ext/mcuboot/MCUBoot.cmake
@@ -29,6 +29,14 @@
 		message(FATAL_ERROR "mcuboot_create_boot_payload(): mandatory parameter 'SIGN_BIN' missing.")
 	endif()
 
+	if (DEFINED _MY_PARAMS_POSTFIX)
+		if (${_MY_PARAMS_POSTFIX} STREQUAL "_0")
+			set(MY_POSTFIX "0")
+		else()
+			set(MY_POSTFIX "1")
+		endif()
+	endif()
+
 	#Find Python3.x interpreter
 	find_package(PythonInterp 3)
 	if (NOT PYTHONINTERP_FOUND)
@@ -54,9 +62,33 @@
 						ARGS sign
 							 -k ${MCUBOOT_DIR}/root-rsa-2048.pem
 							 --align 1
-							 -v 1.0
+							 -v 1.2.3+4
 							 -H 0x400
 							 --pad ${SIGN_BIN_SIZE}
 							 ${CMAKE_BINARY_DIR}/${_MY_PARAMS_FULL_BIN}.bin
 							 ${CMAKE_BINARY_DIR}/${_MY_PARAMS_SIGN_BIN}.bin)
+
+	#Collect executables to common location: build/install/outputs/
+	set(TFM_FULL_NAME tfm_s_ns_concatenated)
+	set(TFM_SIGN_NAME tfm_s_ns_signed)
+
+	if (DEFINED MY_POSTFIX)
+		install(FILES  ${CMAKE_BINARY_DIR}/${_MY_PARAMS_SIGN_BIN}.bin
+				RENAME tfm_sig${MY_POSTFIX}.bin
+				DESTINATION outputs/${TARGET_PLATFORM}/)
+	else()
+		install(FILES ${CMAKE_BINARY_DIR}/${_MY_PARAMS_SIGN_BIN}.bin
+				DESTINATION outputs/${TARGET_PLATFORM}/)
+	endif()
+
+	install(FILES  ${CMAKE_BINARY_DIR}/${_MY_PARAMS_FULL_BIN}.bin
+			DESTINATION  outputs/${TARGET_PLATFORM}/)
+
+	install(FILES  ${CMAKE_BINARY_DIR}/${_MY_PARAMS_FULL_BIN}.bin
+			RENAME ${TFM_FULL_NAME}${_MY_PARAMS_POSTFIX}.bin
+			DESTINATION outputs/fvp/)
+
+	install(FILES  ${CMAKE_BINARY_DIR}/${_MY_PARAMS_SIGN_BIN}.bin
+			RENAME ${TFM_SIGN_NAME}${_MY_PARAMS_POSTFIX}.bin
+			DESTINATION outputs/fvp/)
 endfunction()
\ No newline at end of file