scripts: board gen: Default to nrfutil and align with upstream

Default to nrfutil on all boards and also add some changes made upstream
in the meantime.

Signed-off-by: Carles Cufi <[email protected]>

Author: carlescufi

scripts/west_commands/create_board/templates/nrf52/board.cmake.jinja2

@@ -1,10 +1,9 @@
-board_runner_args(jlink "--device={{ soc | replace("nrf", "nRF") }}_xx{{ variant[2:] | upper }}" "--speed=4000")
-
 set(OPENOCD_NRF5_SUBFAMILY "nrf52")
+board_runner_args(jlink "--device={{ soc | replace("nrf", "nRF") }}_xx{{ variant[2:] | upper }}" "--speed=4000")
 board_runner_args(pyocd "--target={{ soc }}" "--frequency=4000000")
 
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)

scripts/west_commands/create_board/templates/nrf53/board.cmake.jinja2

@@ -14,6 +14,6 @@ if(CONFIG_BOARD_{{ board | upper }}_NRF5340_CPUNET)
   board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
 endif()
 
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

scripts/west_commands/create_board/templates/nrf54l/board.cmake.jinja2

@@ -4,5 +4,13 @@ elseif (CONFIG_SOC_{{ soc | upper }}_CPUFLPR)
   board_runner_args(jlink "--device={{ soc | replace("nrf", "nRF") | replace("l", "L") }}_RV32" "--speed=4000")
 endif()
 
+if(CONFIG_BOARD_{{ board | upper }}_{{ soc | upper }}_NS)
+  set(TFM_PUBLIC_KEY_FORMAT "full")
+endif()
+
+if(CONFIG_TFM_FLASH_MERGED_BINARY)
+  set_property(TARGET runners_yaml_props_target PROPERTY hex_file "${CMAKE_BINARY_DIR}/tfm_merged.hex")
+endif()
+
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

scripts/west_commands/create_board/templates/nrf91/board.cmake.jinja2

@@ -8,5 +8,6 @@ endif()
 
 board_runner_args(jlink "--device={{ soc | replace("nrf", "nRF") }}_{{ 'xxAA' if soc == 'nrf9160' else 'xxCA' }}" "--speed=4000")
 
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)