Commit 3f9d277b authored by Øyvind Rønningstad's avatar Øyvind Rønningstad Committed by Carles Cufi
Browse files

boards: Use tfm target properties for executable paths 



for the signing procedures for boards an521, nrf5340, nrf9160,
nucleo_l552ze_q, and musca_b1.

Signed-off-by: default avatarØyvind Rønningstad <oyvind.ronningstad@nordicsemi.no>
parent 226f9182

boards/arm/lpcxpresso55s69/CMakeLists.txt

+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ if (CONFIG_BUILD_WITH_TFM) 
		#offset needs to be the same value as flash_layout.h in TFM

		set_property(GLOBAL APPEND PROPERTY extra_post_build_commands

			COMMAND ${SREC_CAT}

			ARGS ${CMAKE_BINARY_DIR}/tfm/bin/tfm_s.bin -Binary

			ARGS $<TARGET_PROPERTY:tfm,TFM_S_BIN_FILE> -Binary

				${CMAKE_BINARY_DIR}/zephyr/${KERNEL_BIN_NAME} -Binary

				-offset ${CONFIG_FLASH_LOAD_OFFSET}

				-o ${CMAKE_BINARY_DIR}/tfm_merged.bin -Binary
@@ -63,7 +63,7 @@ if (CONFIG_BUILD_WITH_TFM) 
				${ADD_NS_IMAGE_MIN_VER}

				-s auto

				-H ${CONFIG_ROM_START_OFFSET}

				${CMAKE_BINARY_DIR}/tfm/bin/tfm_s.bin

				$<TARGET_PROPERTY:tfm,TFM_S_BIN_FILE>

				${CMAKE_BINARY_DIR}/tfm_s_signed.bin



			#Sign non-secure binary image with public key
@@ -87,7 +87,7 @@ if (CONFIG_BUILD_WITH_TFM) 
				-o ${CMAKE_BINARY_DIR}/tfm_sign.bin



			#Copy mcuboot.bin

			COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/tfm/bin/bl2.bin ${CMAKE_BINARY_DIR}/mcuboot.bin

			COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_PROPERTY:tfm,BL2_BIN_FILE> ${CMAKE_BINARY_DIR}/mcuboot.bin



			#Merge mcuboot.bin and tfm_sign.bin for flashing

			COMMAND ${SREC_CAT}

boards/arm/mps2_an521/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ if (CONFIG_BUILD_WITH_TFM) 
			 ${ADD_NS_IMAGE_MIN_VER}

			 -s auto

			 -H 0x400

			 ${CMAKE_BINARY_DIR}/tfm/install/outputs/MPS2/AN521/tfm_s.bin

			 $<TARGET_PROPERTY:tfm,TFM_S_BIN_FILE>

			 ${CMAKE_BINARY_DIR}/tfm_s_signed.bin



		#Sign non-secure binary image with public key
@@ -71,7 +71,7 @@ if (CONFIG_BUILD_WITH_TFM) 
			 -o ${CMAKE_BINARY_DIR}/tfm_sign.bin



		#Copy mcuboot.bin

		COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/tfm/bin/bl2.bin ${CMAKE_BINARY_DIR}/mcuboot.bin

		COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_PROPERTY:tfm,BL2_BIN_FILE> ${CMAKE_BINARY_DIR}/mcuboot.bin



		#Merge mcuboot.bin and tfm_sign.bin for QEMU

		COMMAND ${SREC_CAT}

boards/arm/nrf5340dk_nrf5340/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ if (CONFIG_BUILD_WITH_TFM) 
				${ADD_NS_IMAGE_MIN_VER}

				-s auto

				-H 0x400

				${TFM_INSTALL_DIR}/tfm_s.bin

				$<TARGET_PROPERTY:tfm,TFM_S_BIN_FILE>

				${CMAKE_BINARY_DIR}/tfm_s_signed.bin



			#Sign non-secure binary image with public key
@@ -94,7 +94,7 @@ if (CONFIG_BUILD_WITH_TFM) 
				-o ${CMAKE_BINARY_DIR}/tfm_sign.bin



			#Copy mcuboot.bin

			COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/tfm/bin/bl2.bin ${CMAKE_BINARY_DIR}/mcuboot.bin

			COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_PROPERTY:tfm,BL2_BIN_FILE> ${CMAKE_BINARY_DIR}/mcuboot.bin



			# Generate an intel hex file from the signed output binary

			COMMAND srec_cat ${CMAKE_BINARY_DIR}/tfm_sign.bin

boards/arm/nrf9160dk_nrf9160/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ if (CONFIG_BUILD_WITH_TFM) 
			 ${ADD_NS_IMAGE_MIN_VER}

			 -s auto

			 -H 0x400

			 ${CMAKE_BINARY_DIR}/tfm/install/outputs/NORDIC_NRF/NRF9160DK_NRF9160/tfm_s.bin

			 $<TARGET_PROPERTY:tfm,TFM_S_BIN_FILE>

			 ${CMAKE_BINARY_DIR}/tfm_s_signed.bin



		#Sign non-secure binary image with public key
@@ -71,7 +71,7 @@ if (CONFIG_BUILD_WITH_TFM) 
			 -o ${CMAKE_BINARY_DIR}/tfm_sign.bin



		#Copy mcuboot.bin

		COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/tfm/bin/bl2.bin ${CMAKE_BINARY_DIR}/mcuboot.bin

		COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_PROPERTY:tfm,BL2_BIN_FILE> ${CMAKE_BINARY_DIR}/mcuboot.bin



		# Generate an intel hex file from the signed output binary

		COMMAND srec_cat ${CMAKE_BINARY_DIR}/tfm_sign.bin

boards/arm/nucleo_l552ze_q/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ if (CONFIG_BUILD_WITH_TFM) 
			 ${ADD_NS_IMAGE_MIN_VER}

			 -s auto

			 -H 0x400

			 ${CMAKE_BINARY_DIR}/tfm/install/outputs/STM/NUCLEO_L552ZE_Q/tfm_s.bin

			 $<TARGET_PROPERTY:tfm,TFM_S_BIN_FILE>

			 ${CMAKE_BINARY_DIR}/tfm_s_signed.bin



		#Sign non-secure binary image with public key
@@ -60,7 +60,7 @@ if (CONFIG_BUILD_WITH_TFM) 
			 ${CMAKE_BINARY_DIR}/zephyr_ns_signed.bin



		#Copy mcuboot.bin

		COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/tfm/bin/bl2.bin ${CMAKE_BINARY_DIR}/mcuboot.bin

		COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_PROPERTY:tfm,BL2_BIN_FILE> ${CMAKE_BINARY_DIR}/mcuboot.bin



		#Execute post build script postbuild.sh

		COMMAND ${CMAKE_BINARY_DIR}/tfm/postbuild.sh ${COMPILER_FULL_PATH}

CRA Git | Maintained and supported by SUSTech CRA and CCSE