Commit dfa52a3b authored by Torsten Rasmussen's avatar Torsten Rasmussen Committed by Carles Cufi
Browse files

module: moving TFM CMakeLists.txt into Zephyr repo 



This commit moves TFM CMakeLists.txt into Zephyr and relocates the
Kconfig.tfm file under the modules/tfm folder.

Updates the manifest to point to related TFM changes.

Signed-off-by: default avatarTorsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
parent acf42a22

CODEOWNERS

+1 −1
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ 
/lib/cmsis_rtos_v1/                       @nashif

/lib/libc/                                @nashif

/modules/                                 @nashif

/modules/Kconfig.tfm                      @ioannisg @microbuilder

/modules/trusted-firmware-m/              @ioannisg @microbuilder

/kernel/device.c                          @andyross @nashif

/kernel/idle.c                            @andyross @nashif

/samples/                                 @nashif

boards/arm/lpcxpresso55s69/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ if (CONFIG_BUILD_WITH_TFM) 
	if (NOT CONFIG_TFM_BL2_FALSE)

		set(PREPROCESSED_FILE_S "${CMAKE_BINARY_DIR}/tfm/bl2/ext/mcuboot/CMakeFiles/signing_layout_s.dir/signing_layout_s.o")

		set(PREPROCESSED_FILE_NS "${CMAKE_BINARY_DIR}/tfm/bl2/ext/mcuboot/CMakeFiles/signing_layout_ns.dir/signing_layout_ns.o")

		set(TFM_MCUBOOT_DIR "${ZEPHYR_TFM_MODULE_DIR}/trusted-firmware-m/bl2/ext/mcuboot")

		set(TFM_MCUBOOT_DIR "${ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR}/trusted-firmware-m/bl2/ext/mcuboot")

	endif()



	# Configure which format (full or hash) to include the public key in

boards/arm/mps2_an521/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ if (CONFIG_BUILD_WITH_TFM) 


	set(PREPROCESSED_FILE_S "${CMAKE_BINARY_DIR}/tfm/bl2/ext/mcuboot/CMakeFiles/signing_layout_s.dir/signing_layout_s.o")

	set(PREPROCESSED_FILE_NS "${CMAKE_BINARY_DIR}/tfm/bl2/ext/mcuboot/CMakeFiles/signing_layout_ns.dir/signing_layout_ns.o")

	set(TFM_MCUBOOT_DIR "${ZEPHYR_TFM_MODULE_DIR}/trusted-firmware-m/bl2/ext/mcuboot")

	set(TFM_MCUBOOT_DIR "${ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR}/trusted-firmware-m/bl2/ext/mcuboot")



	# Configure which format (full or hash) to include the public key in

	# the image manifest

boards/arm/nrf5340dk_nrf5340/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ if (CONFIG_BUILD_WITH_TFM) 
	if (NOT CONFIG_TFM_BL2_FALSE)

		set(PREPROCESSED_FILE_S "${CMAKE_BINARY_DIR}/tfm/bl2/ext/mcuboot/CMakeFiles/signing_layout_s.dir/signing_layout_s.o")

		set(PREPROCESSED_FILE_NS "${CMAKE_BINARY_DIR}/tfm/bl2/ext/mcuboot/CMakeFiles/signing_layout_ns.dir/signing_layout_ns.o")

		set(TFM_MCUBOOT_DIR "${ZEPHYR_TFM_MODULE_DIR}/trusted-firmware-m/bl2/ext/mcuboot")

		set(TFM_MCUBOOT_DIR "${ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR}/trusted-firmware-m/bl2/ext/mcuboot")

	endif()



	# Configure which format (full or hash) to include the public key in

boards/arm/nrf9160dk_nrf9160/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ if (CONFIG_BUILD_WITH_TFM) 


	set(PREPROCESSED_FILE_S "${CMAKE_BINARY_DIR}/tfm/bl2/ext/mcuboot/CMakeFiles/signing_layout_s.dir/signing_layout_s.o")

	set(PREPROCESSED_FILE_NS "${CMAKE_BINARY_DIR}/tfm/bl2/ext/mcuboot/CMakeFiles/signing_layout_ns.dir/signing_layout_ns.o")

	set(TFM_MCUBOOT_DIR "${ZEPHYR_TFM_MODULE_DIR}/trusted-firmware-m/bl2/ext/mcuboot")

	set(TFM_MCUBOOT_DIR "${ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR}/trusted-firmware-m/bl2/ext/mcuboot")



	# Configure which format (full or hash) to include the public key in

	# the image manifest

CRA Git | Maintained and supported by SUSTech CRA and CCSE