boards: nrf9161dk_nrf9161_ns: Add TF-M support to nrf9161 DK

Add TF-M support for nrf9161 DK and enable it by default for the
non-secure board variant.
Disable UART1 since TF-M use this for output and it is configured
as a secure peripheral.
Enabling this will trigger a BusFault in TF-M.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>

Author: joerchan

boards/arm/nrf9161dk_nrf9161/Kconfig.defconfig

@@ -8,6 +8,21 @@ if BOARD_NRF9161DK_NRF9161 || BOARD_NRF9161DK_NRF9161_NS
 config BOARD
 	default "nrf9161dk_nrf9161"
 
+# By default, if we build for a Non-Secure version of the board,
+# enable building with TF-M as the Secure Execution Environment.
+config BUILD_WITH_TFM
+	default y if BOARD_NRF9161DK_NRF9161_NS
+
+if BUILD_WITH_TFM
+
+# By default, if we build with TF-M, instruct build system to
+# flash the combined TF-M (Secure) & Zephyr (Non Secure) image
+config TFM_FLASH_MERGED_BINARY
+	bool
+	default y
+
+endif # BUILD_WITH_TFM
+
 # For the secure version of the board the firmware is linked at the beginning
 # of the flash, or into the code-partition defined in DT if it is intended to
 # be loaded by MCUboot. If the secure firmware is to be combined with a non-

boards/arm/nrf9161dk_nrf9161/board.cmake

@@ -5,7 +5,7 @@ if(CONFIG_BOARD_NRF9161DK_NRF9161_NS)
 endif()
 
 if(CONFIG_TFM_FLASH_MERGED_BINARY)
-  set_property(TARGET runners_yaml_props_target PROPERTY hex_file "${CMAKE_BINARY_DIR}/tfm_merged.hex")
+  set_property(TARGET runners_yaml_props_target PROPERTY hex_file tfm_merged.hex)
 endif()
 
 # TODO: change to nRF9161_xxAA when such device is available in JLink

boards/arm/nrf9161dk_nrf9161/nrf9161dk_nrf9161_ns.dts

@@ -15,3 +15,8 @@
 		zephyr,code-partition = &slot0_ns_partition;
 	};
 };
+
+/* Disable UART1, because it is used by default in TF-M */
+&uart1 {
+	status = "disabled";
+};

modules/trusted-firmware-m/Kconfig.tfm

@@ -10,6 +10,7 @@ config ZEPHYR_TRUSTED_FIRMWARE_M_MODULE
 config TFM_BOARD
 	string
 	default "nordic_nrf/nrf9160dk_nrf9160" if BOARD_NRF9160DK_NRF9160_NS
+	default "nordic_nrf/nrf9161dk_nrf9161" if BOARD_NRF9161DK_NRF9161_NS
 	default "nordic_nrf/nrf5340dk_nrf5340_cpuapp" if BOARD_NRF5340DK_NRF5340_CPUAPP_NS
 	default "nxp/lpcxpresso55s69" if BOARD_LPCXPRESSO55S69_CPU0
 	default "arm/mps2/an521" if BOARD_MPS2_AN521_CPU0_NS