From 8f3a64f3653688bc5e49dba14c7133f2b3490465 Mon Sep 17 00:00:00 2001 From: Maximilian Deubel Date: Mon, 16 Sep 2024 16:07:43 +0200 Subject: [PATCH] boards: thingy91x: use nrfutil runner This patch uses the nrfutil runner by default for the Thingy:91x board. Also, the device family option was removed for the nrfjprog runner. The device family option is dangerous to use and should be avoided. For nrfutil-device, a safeguard is being put in place to remedy that problem, but nrfjprog will not be updated in that way. Signed-off-by: Maximilian Deubel --- boards/nordic/thingy91x/board.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/boards/nordic/thingy91x/board.cmake b/boards/nordic/thingy91x/board.cmake index ef469b0d6cca..518feb3571cb 100644 --- a/boards/nordic/thingy91x/board.cmake +++ b/boards/nordic/thingy91x/board.cmake @@ -2,19 +2,19 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause if(CONFIG_BOARD_THINGY91X_NRF9151 OR CONFIG_BOARD_THINGY91X_NRF9151_NS) - board_runner_args(nrfjprog "--nrf-family=NRF91") + board_runner_args(nrfjprog) board_runner_args(nrfutil "--nrf-family=NRF91") board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000") elseif(BOARD_THINGY91X_NRF5340_CPUAPP OR BOARD_THINGY91X_NRF5340_CPUAPP_NS) - board_runner_args(nrfjprog "--nrf-family=NRF53") + board_runner_args(nrfjprog) board_runner_args(nrfutil "--nrf-family=NRF53") board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000") elseif(BOARD_THINGY91X_NRF5340_CPUNET) - board_runner_args(nrfjprog "--nrf-family=NRF53") + board_runner_args(nrfjprog) board_runner_args(nrfutil "--nrf-family=NRF53") 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)