Skip to content

Commit 34fae56

Browse files
carlescuficarlescufi
committed
[nrf fromlist] boards: nrf: Default to nRF Util for flashing
Nordic has a new tool, nRF Util (`nrfutil`) which is replacing the previous set of command-line tools (particularly `nrfjprog`) that Zephyr had been using by default in many of the boards to flash the firmware onto the device. Since nRF Util is already mature and is going to be replacing the existing tools, including `nrfjprog`, it is now a good time to change the default flash tool to reflect this fact. Note that `nrfjprog` support is not being removed at all, but this may be a breaking change for users that do not have nRF Util installed. For this reason we also add a note in the migration guide. More info: https://devzone.nordicsemi.com/nordic/nordic-blog/b/blog/posts/nrf-util-unified-command-line-utility Installation: https://www.nordicsemi.com/Products/Development-tools/nrf-util Documentation: https://docs.nordicsemi.com/bundle/nrfutil/page/README.html Upstream PR #: 86729 Signed-off-by: Carles Cufi <[email protected]>
1 parent 5518823 commit 34fae56

File tree

84 files changed

+97
-17
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+97
-17
lines changed

‎boards/aconno/acn52832/board.cmake‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,7 @@
22

33
board_runner_args(nrfjprog "--nrf-family=NRF52")
44
board_runner_args(jlink "--device=nrf52" "--speed=4000")
5+
6+
include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
57
include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
68
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/actinius/icarus/board.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# SPDX-License-Identifier: Apache-2.0
22

33
board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000")
4+
include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
45
include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
56
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/actinius/icarus_bee/board.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# SPDX-License-Identifier: Apache-2.0
22

33
board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000")
4+
include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
45
include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
56
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/actinius/icarus_som/board.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# SPDX-License-Identifier: Apache-2.0
22

33
board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000")
4+
include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
45
include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
56
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/actinius/icarus_som_dk/board.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# SPDX-License-Identifier: Apache-2.0
22

33
board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000")
4+
include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
45
include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
56
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/adafruit/itsybitsy/board.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
include(${ZEPHYR_BASE}/boards/common/bossac.board.cmake)
44
board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
55
board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
6+
include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
67
include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
78
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
89
include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)

‎boards/adafruit/nrf52_adafruit_feather/board.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000")
44
board_runner_args(pyocd "--target=nrf52832" "--frequency=4000000")
5+
include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
56
include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
67
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
78
include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)

‎boards/atmarktechno/degu_evk/board.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
5+
include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
56
include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
67
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/bbc/microbit/board.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ set(OPENOCD_NRF5_SUBFAMILY "nrf51")
99
set(OPENOCD_NRF5_INTERFACE "cmsis-dap")
1010

1111
include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
12+
include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
1213
include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
1314
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
1415
include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)

‎boards/bbc/microbit_v2/board.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ set(OPENOCD_NRF5_SUBFAMILY "nrf52")
99
# in which case the following line should be removed to default back to "jlink" OpenOCD interface
1010
set(OPENOCD_NRF5_INTERFACE "cmsis-dap")
1111
include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
12+
include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
1213
include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
1314
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
1415
include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)

0 commit comments

Comments
 (0)