diff --git a/boards/aconno/acn52832/board.cmake b/boards/aconno/acn52832/board.cmake index ddd57ab8839..69caa8667e3 100644 --- a/boards/aconno/acn52832/board.cmake +++ b/boards/aconno/acn52832/board.cmake @@ -2,5 +2,7 @@ board_runner_args(nrfjprog "--nrf-family=NRF52") board_runner_args(jlink "--device=nrf52" "--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) diff --git a/boards/actinius/icarus/board.cmake b/boards/actinius/icarus/board.cmake index 9c0c33243af..91aec43ebb5 100644 --- a/boards/actinius/icarus/board.cmake +++ b/boards/actinius/icarus/board.cmake @@ -1,5 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 board_runner_args(jlink "--device=nRF9160_xxAA" "--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) diff --git a/boards/actinius/icarus_bee/board.cmake b/boards/actinius/icarus_bee/board.cmake index 9c0c33243af..91aec43ebb5 100644 --- a/boards/actinius/icarus_bee/board.cmake +++ b/boards/actinius/icarus_bee/board.cmake @@ -1,5 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 board_runner_args(jlink "--device=nRF9160_xxAA" "--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) diff --git a/boards/actinius/icarus_som/board.cmake b/boards/actinius/icarus_som/board.cmake index 9c0c33243af..91aec43ebb5 100644 --- a/boards/actinius/icarus_som/board.cmake +++ b/boards/actinius/icarus_som/board.cmake @@ -1,5 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 board_runner_args(jlink "--device=nRF9160_xxAA" "--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) diff --git a/boards/actinius/icarus_som_dk/board.cmake b/boards/actinius/icarus_som_dk/board.cmake index 9c0c33243af..91aec43ebb5 100644 --- a/boards/actinius/icarus_som_dk/board.cmake +++ b/boards/actinius/icarus_som_dk/board.cmake @@ -1,5 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 board_runner_args(jlink "--device=nRF9160_xxAA" "--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) diff --git a/boards/adafruit/itsybitsy/board.cmake b/boards/adafruit/itsybitsy/board.cmake index 6366e4775ec..54b79bdf74b 100644 --- a/boards/adafruit/itsybitsy/board.cmake +++ b/boards/adafruit/itsybitsy/board.cmake @@ -3,6 +3,7 @@ include(${ZEPHYR_BASE}/boards/common/bossac.board.cmake) board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000") +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) diff --git a/boards/adafruit/nrf52_adafruit_feather/board.cmake b/boards/adafruit/nrf52_adafruit_feather/board.cmake index 4ddbcf66fbe..ca393522464 100644 --- a/boards/adafruit/nrf52_adafruit_feather/board.cmake +++ b/boards/adafruit/nrf52_adafruit_feather/board.cmake @@ -2,6 +2,7 @@ board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52832" "--frequency=4000000") +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) diff --git a/boards/atmarktechno/degu_evk/board.cmake b/boards/atmarktechno/degu_evk/board.cmake index 33b72c2e969..028127e8ef0 100644 --- a/boards/atmarktechno/degu_evk/board.cmake +++ b/boards/atmarktechno/degu_evk/board.cmake @@ -2,5 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 board_runner_args(jlink "--device=nRF52840_xxAA" "--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) diff --git a/boards/bbc/microbit/board.cmake b/boards/bbc/microbit/board.cmake index b6bae59502c..aad2286503c 100644 --- a/boards/bbc/microbit/board.cmake +++ b/boards/bbc/microbit/board.cmake @@ -9,6 +9,7 @@ set(OPENOCD_NRF5_SUBFAMILY "nrf51") set(OPENOCD_NRF5_INTERFACE "cmsis-dap") include(${ZEPHYR_BASE}/boards/common/pyocd.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/openocd-nrf5.board.cmake) diff --git a/boards/bbc/microbit_v2/board.cmake b/boards/bbc/microbit_v2/board.cmake index c94ffa16306..0dd45ff28f7 100644 --- a/boards/bbc/microbit_v2/board.cmake +++ b/boards/bbc/microbit_v2/board.cmake @@ -9,6 +9,7 @@ set(OPENOCD_NRF5_SUBFAMILY "nrf52") # in which case the following line should be removed to default back to "jlink" OpenOCD interface set(OPENOCD_NRF5_INTERFACE "cmsis-dap") include(${ZEPHYR_BASE}/boards/common/pyocd.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/openocd-nrf5.board.cmake) diff --git a/boards/bcdevices/plt_demo_v2/board.cmake b/boards/bcdevices/plt_demo_v2/board.cmake index 29355637973..ebf0cf5bffa 100644 --- a/boards/bcdevices/plt_demo_v2/board.cmake +++ b/boards/bcdevices/plt_demo_v2/board.cmake @@ -4,6 +4,7 @@ set(OPENOCD_NRF5_SUBFAMILY "nrf52") board_runner_args(nrfjprog "--nrf-family=NRF52") board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52832" "--frequency=4000000") +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) diff --git a/boards/circuitdojo/feather/board.cmake b/boards/circuitdojo/feather/board.cmake index 9c0c33243af..91aec43ebb5 100644 --- a/boards/circuitdojo/feather/board.cmake +++ b/boards/circuitdojo/feather/board.cmake @@ -1,5 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 board_runner_args(jlink "--device=nRF9160_xxAA" "--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) diff --git a/boards/contextualelectronics/abc/board.cmake b/boards/contextualelectronics/abc/board.cmake index 261663eef4e..1482c471b4c 100644 --- a/boards/contextualelectronics/abc/board.cmake +++ b/boards/contextualelectronics/abc/board.cmake @@ -3,6 +3,7 @@ set(OPENOCD_NRF5_SUBFAMILY "nrf52") board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000") +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) diff --git a/boards/croxel/croxel_cx1825/board.cmake b/boards/croxel/croxel_cx1825/board.cmake index f95878945be..506a1339840 100644 --- a/boards/croxel/croxel_cx1825/board.cmake +++ b/boards/croxel/croxel_cx1825/board.cmake @@ -2,6 +2,7 @@ board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000") +include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake) include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake) include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/ct/ctcc/board.cmake b/boards/ct/ctcc/board.cmake index 11d0511404b..65f36c72e6c 100644 --- a/boards/ct/ctcc/board.cmake +++ b/boards/ct/ctcc/board.cmake @@ -3,6 +3,7 @@ if(CONFIG_BOARD_CTCC_NRF52840) board_runner_args(nrfjprog "--softreset") board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000") + include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake) include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake) include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) elseif(CONFIG_BOARD_CTCC_NRF9161 OR CONFIG_BOARD_CTCC_NRF9161_NS) @@ -14,6 +15,7 @@ elseif(CONFIG_BOARD_CTCC_NRF9161 OR CONFIG_BOARD_CTCC_NRF9161_NS) endif() board_runner_args(nrfjprog "--softreset") board_runner_args(pyocd "--target=nrf9161" "--frequency=4000000") + include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake) include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake) include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) endif() diff --git a/boards/ebyte/e73_tbb/board.cmake b/boards/ebyte/e73_tbb/board.cmake index f99446d144d..5db65eede59 100644 --- a/boards/ebyte/e73_tbb/board.cmake +++ b/boards/ebyte/e73_tbb/board.cmake @@ -2,6 +2,7 @@ board_runner_args(jlink "--device=nrf52" "--speed=4000") board_runner_args(pyocd "--target=nrf52" "--frequency=4000000") +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) diff --git a/boards/electronut/nrf52840_papyr/board.cmake b/boards/electronut/nrf52840_papyr/board.cmake index 65580b0fef5..3ca8757d613 100644 --- a/boards/electronut/nrf52840_papyr/board.cmake +++ b/boards/electronut/nrf52840_papyr/board.cmake @@ -2,4 +2,5 @@ board_runner_args(nrfjprog "--softreset") include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake) +include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake) include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake) diff --git a/boards/ezurio/bl5340_dvk/board.cmake b/boards/ezurio/bl5340_dvk/board.cmake index 15aec8e6a36..41a597dead8 100644 --- a/boards/ezurio/bl5340_dvk/board.cmake +++ b/boards/ezurio/bl5340_dvk/board.cmake @@ -16,6 +16,6 @@ if(CONFIG_TFM_FLASH_MERGED_BINARY) set_property(TARGET runners_yaml_props_target PROPERTY hex_file tfm_merged.hex) 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) diff --git a/boards/ezurio/bl652_dvk/board.cmake b/boards/ezurio/bl652_dvk/board.cmake index 9449b78cd47..29682197edc 100644 --- a/boards/ezurio/bl652_dvk/board.cmake +++ b/boards/ezurio/bl652_dvk/board.cmake @@ -2,5 +2,6 @@ board_runner_args(nrfjprog "--softreset") board_runner_args(jlink "--device=nRF52832_xxAA" "--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) diff --git a/boards/ezurio/bl653_dvk/board.cmake b/boards/ezurio/bl653_dvk/board.cmake index 12b0d2996be..a19979a7e27 100644 --- a/boards/ezurio/bl653_dvk/board.cmake +++ b/boards/ezurio/bl653_dvk/board.cmake @@ -3,6 +3,7 @@ board_runner_args(nrfjprog "--softreset") board_runner_args(jlink "--device=nRF52833_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52833" "--frequency=4000000") +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) diff --git a/boards/ezurio/bl654_dvk/board.cmake b/boards/ezurio/bl654_dvk/board.cmake index a99f3ce8693..32b02a35258 100644 --- a/boards/ezurio/bl654_dvk/board.cmake +++ b/boards/ezurio/bl654_dvk/board.cmake @@ -2,5 +2,6 @@ board_runner_args(nrfjprog "--softreset") board_runner_args(jlink "--device=nRF52840_xxAA" "--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) diff --git a/boards/ezurio/bl654_sensor_board/board.cmake b/boards/ezurio/bl654_sensor_board/board.cmake index c1ca3bd12cf..17046697832 100644 --- a/boards/ezurio/bl654_sensor_board/board.cmake +++ b/boards/ezurio/bl654_sensor_board/board.cmake @@ -4,5 +4,6 @@ board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000") board_runner_args(nrfjprog "--softreset") board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000") include(${ZEPHYR_BASE}/boards/common/pyocd.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) diff --git a/boards/ezurio/bt510/board.cmake b/boards/ezurio/bt510/board.cmake index c1ca3bd12cf..17046697832 100644 --- a/boards/ezurio/bt510/board.cmake +++ b/boards/ezurio/bt510/board.cmake @@ -4,5 +4,6 @@ board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000") board_runner_args(nrfjprog "--softreset") board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000") include(${ZEPHYR_BASE}/boards/common/pyocd.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) diff --git a/boards/ezurio/bt610/board.cmake b/boards/ezurio/bt610/board.cmake index 0a2feda9ee2..4d421a07db6 100644 --- a/boards/ezurio/bt610/board.cmake +++ b/boards/ezurio/bt610/board.cmake @@ -3,6 +3,7 @@ board_runner_args(nrfjprog "--nrf-family=NRF52") board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000") +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) diff --git a/boards/ezurio/mg100/board.cmake b/boards/ezurio/mg100/board.cmake index 790ab533b4a..4a350c83167 100644 --- a/boards/ezurio/mg100/board.cmake +++ b/boards/ezurio/mg100/board.cmake @@ -3,6 +3,7 @@ board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000") +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) diff --git a/boards/ezurio/pinnacle_100_dvk/board.cmake b/boards/ezurio/pinnacle_100_dvk/board.cmake index d5f3c19d784..829cac0ce82 100644 --- a/boards/ezurio/pinnacle_100_dvk/board.cmake +++ b/boards/ezurio/pinnacle_100_dvk/board.cmake @@ -3,6 +3,7 @@ board_runner_args(nrfjprog "--softreset") board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000") +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) diff --git a/boards/ezurio/rm1xx_dvk/board.cmake b/boards/ezurio/rm1xx_dvk/board.cmake index 677dc6bdf2b..1f0cea559d1 100644 --- a/boards/ezurio/rm1xx_dvk/board.cmake +++ b/boards/ezurio/rm1xx_dvk/board.cmake @@ -2,5 +2,6 @@ board_runner_args(nrfjprog "--nrf-family=NRF51") board_runner_args(jlink "--device=nRF51822_xxAC" "--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) diff --git a/boards/holyiot/yj16019/board.cmake b/boards/holyiot/yj16019/board.cmake index 4ffa4da9578..6de15b50c29 100644 --- a/boards/holyiot/yj16019/board.cmake +++ b/boards/holyiot/yj16019/board.cmake @@ -1,4 +1,5 @@ board_runner_args(nrfjprog "--softreset") board_runner_args(jlink "--device=nRF52832_xxAA" "--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) diff --git a/boards/innblue/innblue21/board.cmake b/boards/innblue/innblue21/board.cmake index 12afc83afe3..641562c24c4 100644 --- a/boards/innblue/innblue21/board.cmake +++ b/boards/innblue/innblue21/board.cmake @@ -2,5 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 board_runner_args(jlink "--device=nRF9160_xxAA" "--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) diff --git a/boards/innblue/innblue22/board.cmake b/boards/innblue/innblue22/board.cmake index 12afc83afe3..641562c24c4 100644 --- a/boards/innblue/innblue22/board.cmake +++ b/boards/innblue/innblue22/board.cmake @@ -2,5 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 board_runner_args(jlink "--device=nRF9160_xxAA" "--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) diff --git a/boards/makerdiary/nrf52840_mdk_usb_dongle/board.cmake b/boards/makerdiary/nrf52840_mdk_usb_dongle/board.cmake index 1f43fd93827..895ec1a36bd 100644 --- a/boards/makerdiary/nrf52840_mdk_usb_dongle/board.cmake +++ b/boards/makerdiary/nrf52840_mdk_usb_dongle/board.cmake @@ -2,6 +2,7 @@ board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000") +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) diff --git a/boards/nordic/nrf21540dk/board.cmake b/boards/nordic/nrf21540dk/board.cmake index f95878945be..1ebf652634f 100644 --- a/boards/nordic/nrf21540dk/board.cmake +++ b/boards/nordic/nrf21540dk/board.cmake @@ -2,8 +2,8 @@ board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52840" "--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) diff --git a/boards/nordic/nrf51dk/board.cmake b/boards/nordic/nrf51dk/board.cmake index 1b08d95310e..b971cd7fb6b 100644 --- a/boards/nordic/nrf51dk/board.cmake +++ b/boards/nordic/nrf51dk/board.cmake @@ -1,7 +1,7 @@ # SPDX-License-Identifier: Apache-2.0 board_runner_args(jlink "--device=nRF51822_xxAC" "--speed=4000") -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/openocd-nrf5.board.cmake) diff --git a/boards/nordic/nrf51dongle/board.cmake b/boards/nordic/nrf51dongle/board.cmake index 86ac5ef3be6..3bdb9b702c1 100644 --- a/boards/nordic/nrf51dongle/board.cmake +++ b/boards/nordic/nrf51dongle/board.cmake @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 board_runner_args(jlink "--device=nRF51822_xxAC" "--speed=4000") -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) diff --git a/boards/nordic/nrf52833dk/board.cmake b/boards/nordic/nrf52833dk/board.cmake index f8c71dc5694..554146fe544 100644 --- a/boards/nordic/nrf52833dk/board.cmake +++ b/boards/nordic/nrf52833dk/board.cmake @@ -2,8 +2,8 @@ board_runner_args(jlink "--device=nRF52833_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52833" "--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) diff --git a/boards/nordic/nrf52840dk/board.cmake b/boards/nordic/nrf52840dk/board.cmake index f95878945be..1ebf652634f 100644 --- a/boards/nordic/nrf52840dk/board.cmake +++ b/boards/nordic/nrf52840dk/board.cmake @@ -2,8 +2,8 @@ board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52840" "--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) diff --git a/boards/nordic/nrf52840dongle/board.cmake b/boards/nordic/nrf52840dongle/board.cmake index 1f43fd93827..895ec1a36bd 100644 --- a/boards/nordic/nrf52840dongle/board.cmake +++ b/boards/nordic/nrf52840dongle/board.cmake @@ -2,6 +2,7 @@ board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000") +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) diff --git a/boards/nordic/nrf52dk/board.cmake b/boards/nordic/nrf52dk/board.cmake index f5b4011822a..f0434e83862 100644 --- a/boards/nordic/nrf52dk/board.cmake +++ b/boards/nordic/nrf52dk/board.cmake @@ -2,8 +2,8 @@ board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52832" "--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) diff --git a/boards/nordic/nrf5340_audio_dk/board.cmake b/boards/nordic/nrf5340_audio_dk/board.cmake index b44ece9b7e5..cfbdc3ff52b 100644 --- a/boards/nordic/nrf5340_audio_dk/board.cmake +++ b/boards/nordic/nrf5340_audio_dk/board.cmake @@ -10,6 +10,6 @@ elseif(CONFIG_BOARD_NRF5340_AUDIO_DK_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) diff --git a/boards/nordic/nrf5340dk/board.cmake b/boards/nordic/nrf5340dk/board.cmake index 306f1d7e4fb..3634697dd77 100644 --- a/boards/nordic/nrf5340dk/board.cmake +++ b/boards/nordic/nrf5340dk/board.cmake @@ -16,6 +16,6 @@ if(CONFIG_BOARD_NRF5340DK_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) diff --git a/boards/nordic/nrf7002dk/board.cmake b/boards/nordic/nrf7002dk/board.cmake index 51730b54e6f..56982511034 100644 --- a/boards/nordic/nrf7002dk/board.cmake +++ b/boards/nordic/nrf7002dk/board.cmake @@ -7,5 +7,6 @@ elseif(CONFIG_BOARD_NRF7002DK_NRF5340_CPUNET) board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000") endif() +include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake) include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/nordic/nrf9131ek/board.cmake b/boards/nordic/nrf9131ek/board.cmake index d67464ff5ae..204c8af33fc 100644 --- a/boards/nordic/nrf9131ek/board.cmake +++ b/boards/nordic/nrf9131ek/board.cmake @@ -9,5 +9,6 @@ if(CONFIG_TFM_FLASH_MERGED_BINARY) endif() board_runner_args(jlink "--device=nRF9131_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) diff --git a/boards/nordic/nrf9151dk/board.cmake b/boards/nordic/nrf9151dk/board.cmake index dc898e054b4..02b6c782c0a 100644 --- a/boards/nordic/nrf9151dk/board.cmake +++ b/boards/nordic/nrf9151dk/board.cmake @@ -9,5 +9,6 @@ if(CONFIG_TFM_FLASH_MERGED_BINARY) endif() board_runner_args(jlink "--device=nRF9151_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) diff --git a/boards/nordic/nrf9160dk/board.cmake b/boards/nordic/nrf9160dk/board.cmake index 8bb0e688183..678cfbe5c17 100644 --- a/boards/nordic/nrf9160dk/board.cmake +++ b/boards/nordic/nrf9160dk/board.cmake @@ -10,13 +10,13 @@ if(CONFIG_BOARD_NRF9160DK_NRF9160 OR CONFIG_BOARD_NRF9160DK_NRF9160_NS) endif() board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000") - 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) elseif(CONFIG_BOARD_NRF9160DK_NRF52840) board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000") - 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/openocd-nrf5.board.cmake) endif() diff --git a/boards/nordic/nrf9161dk/board.cmake b/boards/nordic/nrf9161dk/board.cmake index 6581b639658..5130159e744 100644 --- a/boards/nordic/nrf9161dk/board.cmake +++ b/boards/nordic/nrf9161dk/board.cmake @@ -9,5 +9,6 @@ if(CONFIG_TFM_FLASH_MERGED_BINARY) endif() board_runner_args(jlink "--device=nRF9161_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) diff --git a/boards/nordic/thingy52/board.cmake b/boards/nordic/thingy52/board.cmake index ee865440610..aa639b72df1 100644 --- a/boards/nordic/thingy52/board.cmake +++ b/boards/nordic/thingy52/board.cmake @@ -2,7 +2,7 @@ board_runner_args(nrfjprog "--softreset") board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000") -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/openocd-nrf5.board.cmake) diff --git a/boards/nordic/thingy53/board.cmake b/boards/nordic/thingy53/board.cmake index dc63ca31895..916d982b65c 100644 --- a/boards/nordic/thingy53/board.cmake +++ b/boards/nordic/thingy53/board.cmake @@ -6,6 +6,6 @@ elseif(CONFIG_BOARD_THINGY53_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) diff --git a/boards/norik/octopus_io_board/board.cmake b/boards/norik/octopus_io_board/board.cmake index e1ae7b4e9b2..9440e9893ea 100644 --- a/boards/norik/octopus_io_board/board.cmake +++ b/boards/norik/octopus_io_board/board.cmake @@ -2,5 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 board_runner_args(jlink "--device=nRF9160_xxAA" "--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) diff --git a/boards/norik/octopus_som/board.cmake b/boards/norik/octopus_som/board.cmake index e1ae7b4e9b2..9440e9893ea 100644 --- a/boards/norik/octopus_som/board.cmake +++ b/boards/norik/octopus_som/board.cmake @@ -2,5 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 board_runner_args(jlink "--device=nRF9160_xxAA" "--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) diff --git a/boards/panasonic/pan1770_evb/board.cmake b/boards/panasonic/pan1770_evb/board.cmake index 73bcf6990b0..ff0e2b9f005 100644 --- a/boards/panasonic/pan1770_evb/board.cmake +++ b/boards/panasonic/pan1770_evb/board.cmake @@ -6,6 +6,7 @@ board_runner_args(jlink "--device=nrf52" "--speed=4000") board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000") +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) diff --git a/boards/panasonic/pan1780_evb/board.cmake b/boards/panasonic/pan1780_evb/board.cmake index 4137b270080..f9c2bc7fd06 100644 --- a/boards/panasonic/pan1780_evb/board.cmake +++ b/boards/panasonic/pan1780_evb/board.cmake @@ -6,6 +6,7 @@ board_runner_args(jlink "--device=nrf52" "--speed=4000") board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000") +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) diff --git a/boards/panasonic/pan1781_evb/board.cmake b/boards/panasonic/pan1781_evb/board.cmake index 1710d8db443..fe7bb7edcd8 100644 --- a/boards/panasonic/pan1781_evb/board.cmake +++ b/boards/panasonic/pan1781_evb/board.cmake @@ -6,6 +6,7 @@ board_runner_args(jlink "--device=nrf52" "--speed=4000") board_runner_args(pyocd "--target=nrf52820" "--frequency=4000000") +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) diff --git a/boards/panasonic/pan1782_evb/board.cmake b/boards/panasonic/pan1782_evb/board.cmake index ecf22a84df9..8b03593870a 100644 --- a/boards/panasonic/pan1782_evb/board.cmake +++ b/boards/panasonic/pan1782_evb/board.cmake @@ -6,6 +6,7 @@ board_runner_args(jlink "--device=nrf52" "--speed=4000") board_runner_args(pyocd "--target=nrf52833" "--frequency=4000000") +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) diff --git a/boards/panasonic/pan1783/board.cmake b/boards/panasonic/pan1783/board.cmake index 1a211bc95c9..0de36eb5bbc 100644 --- a/boards/panasonic/pan1783/board.cmake +++ b/boards/panasonic/pan1783/board.cmake @@ -8,5 +8,6 @@ if(CONFIG_SOC_NRF5340_CPUNET_QKAA) board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000") endif() +include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake) include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/particle/argon/board.cmake b/boards/particle/argon/board.cmake index 93142011fe3..2295627b311 100644 --- a/boards/particle/argon/board.cmake +++ b/boards/particle/argon/board.cmake @@ -7,5 +7,6 @@ board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000") board_runner_args(nrfjprog "--softreset") board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000") include(${ZEPHYR_BASE}/boards/common/pyocd.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) diff --git a/boards/particle/boron/board.cmake b/boards/particle/boron/board.cmake index 93142011fe3..2295627b311 100644 --- a/boards/particle/boron/board.cmake +++ b/boards/particle/boron/board.cmake @@ -7,5 +7,6 @@ board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000") board_runner_args(nrfjprog "--softreset") board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000") include(${ZEPHYR_BASE}/boards/common/pyocd.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) diff --git a/boards/particle/xenon/board.cmake b/boards/particle/xenon/board.cmake index bb9c46f26c1..e458fa5fd1c 100644 --- a/boards/particle/xenon/board.cmake +++ b/boards/particle/xenon/board.cmake @@ -8,5 +8,6 @@ board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000") board_runner_args(nrfjprog "--softreset") board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000") include(${ZEPHYR_BASE}/boards/common/pyocd.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) diff --git a/boards/qorvo/decawave_dwm3001cdk/board.cmake b/boards/qorvo/decawave_dwm3001cdk/board.cmake index f8c71dc5694..554146fe544 100644 --- a/boards/qorvo/decawave_dwm3001cdk/board.cmake +++ b/boards/qorvo/decawave_dwm3001cdk/board.cmake @@ -2,8 +2,8 @@ board_runner_args(jlink "--device=nRF52833_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52833" "--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) diff --git a/boards/rakwireless/rak4631/board.cmake b/boards/rakwireless/rak4631/board.cmake index 2f2c24e0c28..074044926bf 100644 --- a/boards/rakwireless/rak4631/board.cmake +++ b/boards/rakwireless/rak4631/board.cmake @@ -3,6 +3,7 @@ board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000") +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) diff --git a/boards/rakwireless/rak5010/board.cmake b/boards/rakwireless/rak5010/board.cmake index d91b58c847d..2a2216ee259 100644 --- a/boards/rakwireless/rak5010/board.cmake +++ b/boards/rakwireless/rak5010/board.cmake @@ -3,6 +3,7 @@ board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000") +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) diff --git a/boards/raytac/mdbt50q_db_33/board.cmake b/boards/raytac/mdbt50q_db_33/board.cmake index 51744ab31b9..f841bdde504 100644 --- a/boards/raytac/mdbt50q_db_33/board.cmake +++ b/boards/raytac/mdbt50q_db_33/board.cmake @@ -3,6 +3,7 @@ board_runner_args(jlink "--device=nRF52833_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52833" "--frequency=4000000") +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) diff --git a/boards/raytac/mdbt50q_db_40/board.cmake b/boards/raytac/mdbt50q_db_40/board.cmake index 667c8f5f999..8dc0bf1382b 100644 --- a/boards/raytac/mdbt50q_db_40/board.cmake +++ b/boards/raytac/mdbt50q_db_40/board.cmake @@ -2,6 +2,7 @@ board_runner_args(jlink "--device=nrf52840_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000") +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) diff --git a/boards/raytac/mdbt53_db_40/board.cmake b/boards/raytac/mdbt53_db_40/board.cmake index e181f29ca44..bedb125bb9d 100644 --- a/boards/raytac/mdbt53_db_40/board.cmake +++ b/boards/raytac/mdbt53_db_40/board.cmake @@ -6,6 +6,6 @@ elseif(CONFIG_BOARD_RAYTAC_MDBT53_DB_40_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) diff --git a/boards/raytac/mdbt53v_db_40/board.cmake b/boards/raytac/mdbt53v_db_40/board.cmake index da45d8b8e83..41501725bd5 100644 --- a/boards/raytac/mdbt53v_db_40/board.cmake +++ b/boards/raytac/mdbt53v_db_40/board.cmake @@ -6,6 +6,6 @@ elseif(BOARD_RAYTAC_MDBT53V_DB_40_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) diff --git a/boards/ruuvi/ruuvitag/board.cmake b/boards/ruuvi/ruuvitag/board.cmake index fd74f070016..e30d805406e 100644 --- a/boards/ruuvi/ruuvitag/board.cmake +++ b/boards/ruuvi/ruuvitag/board.cmake @@ -2,5 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 board_runner_args(jlink "--device=nRF52832_xxAA" "--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) diff --git a/boards/seeed/xiao_ble/board.cmake b/boards/seeed/xiao_ble/board.cmake index a6aa2ac40a7..30caef58348 100644 --- a/boards/seeed/xiao_ble/board.cmake +++ b/boards/seeed/xiao_ble/board.cmake @@ -4,6 +4,7 @@ board_runner_args(nrfjprog "--nrf-family=NRF52") board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000") board_runner_args(uf2 "--board-id=Seeed_XIAO_nRF52840_Sense") +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) diff --git a/boards/sparkfun/micromod/board.cmake b/boards/sparkfun/micromod/board.cmake index 55900ba5975..6eed9c98a58 100644 --- a/boards/sparkfun/micromod/board.cmake +++ b/boards/sparkfun/micromod/board.cmake @@ -3,6 +3,7 @@ board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000") +include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake) include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake) include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake) include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) diff --git a/boards/sparkfun/thing_plus/board.cmake b/boards/sparkfun/thing_plus/board.cmake index a4f45e5cfdf..11ad52dbca6 100644 --- a/boards/sparkfun/thing_plus/board.cmake +++ b/boards/sparkfun/thing_plus/board.cmake @@ -2,5 +2,6 @@ board_runner_args(nrfjprog "--nrf-family=NRF91") board_runner_args(jlink "--device=nRF9160_xxAA" "--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) diff --git a/boards/u-blox/ubx_bmd300eval/board.cmake b/boards/u-blox/ubx_bmd300eval/board.cmake index ff043e765a8..7a6bc33788d 100644 --- a/boards/u-blox/ubx_bmd300eval/board.cmake +++ b/boards/u-blox/ubx_bmd300eval/board.cmake @@ -5,6 +5,7 @@ board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52832" "--frequency=4000000") +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) diff --git a/boards/u-blox/ubx_bmd330eval/board.cmake b/boards/u-blox/ubx_bmd330eval/board.cmake index 6ba621fc8f5..156fb582e64 100644 --- a/boards/u-blox/ubx_bmd330eval/board.cmake +++ b/boards/u-blox/ubx_bmd330eval/board.cmake @@ -4,6 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 board_runner_args(jlink "--device=nRF52810_xxAA" "--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) include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake) diff --git a/boards/u-blox/ubx_bmd340eval/board.cmake b/boards/u-blox/ubx_bmd340eval/board.cmake index 8d1e2b8b93d..ff0defdbc90 100644 --- a/boards/u-blox/ubx_bmd340eval/board.cmake +++ b/boards/u-blox/ubx_bmd340eval/board.cmake @@ -6,6 +6,7 @@ board_runner_args(nrfjprog "--nrf-family=NRF52") board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000") +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) diff --git a/boards/u-blox/ubx_bmd345eval/board.cmake b/boards/u-blox/ubx_bmd345eval/board.cmake index 2588f9d09a4..df3db6f9d21 100644 --- a/boards/u-blox/ubx_bmd345eval/board.cmake +++ b/boards/u-blox/ubx_bmd345eval/board.cmake @@ -6,6 +6,7 @@ board_runner_args(nrfjprog "--nrf-family=NRF52") board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000") +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) diff --git a/boards/u-blox/ubx_bmd360eval/board.cmake b/boards/u-blox/ubx_bmd360eval/board.cmake index f109b0318a5..597511273ad 100644 --- a/boards/u-blox/ubx_bmd360eval/board.cmake +++ b/boards/u-blox/ubx_bmd360eval/board.cmake @@ -4,6 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 board_runner_args(jlink "--device=nRF52811_xxAA" "--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) include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake) diff --git a/boards/u-blox/ubx_bmd380eval/board.cmake b/boards/u-blox/ubx_bmd380eval/board.cmake index ebeb58f74fb..fde7182d10a 100644 --- a/boards/u-blox/ubx_bmd380eval/board.cmake +++ b/boards/u-blox/ubx_bmd380eval/board.cmake @@ -6,6 +6,7 @@ board_runner_args(nrfjprog "--nrf-family=NRF52") board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000") +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) diff --git a/boards/u-blox/ubx_evkannab1/board.cmake b/boards/u-blox/ubx_evkannab1/board.cmake index 18747716bc1..98e9e3d7ae5 100644 --- a/boards/u-blox/ubx_evkannab1/board.cmake +++ b/boards/u-blox/ubx_evkannab1/board.cmake @@ -6,6 +6,7 @@ board_runner_args(nrfjprog "--nrf-family=NRF52") board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52832" "--frequency=4000000") +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) diff --git a/boards/u-blox/ubx_evkninab1/board.cmake b/boards/u-blox/ubx_evkninab1/board.cmake index 8546871b5f2..7eddd95a8c0 100644 --- a/boards/u-blox/ubx_evkninab1/board.cmake +++ b/boards/u-blox/ubx_evkninab1/board.cmake @@ -6,6 +6,7 @@ board_runner_args(nrfjprog "--nrf-family=NRF52") board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52832" "--frequency=4000000") +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) diff --git a/boards/u-blox/ubx_evkninab3/board.cmake b/boards/u-blox/ubx_evkninab3/board.cmake index ff8c1f01cf6..a92e93d80be 100644 --- a/boards/u-blox/ubx_evkninab3/board.cmake +++ b/boards/u-blox/ubx_evkninab3/board.cmake @@ -6,6 +6,7 @@ board_runner_args(nrfjprog "--nrf-family=NRF52") board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000") +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) diff --git a/boards/u-blox/ubx_evkninab4/board.cmake b/boards/u-blox/ubx_evkninab4/board.cmake index f7373de1254..c7b3288d4fe 100644 --- a/boards/u-blox/ubx_evkninab4/board.cmake +++ b/boards/u-blox/ubx_evkninab4/board.cmake @@ -6,6 +6,7 @@ board_runner_args(nrfjprog "--nrf-family=NRF52") board_runner_args(jlink "--device=nRF52833_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52833" "--frequency=4000000") +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) diff --git a/boards/waveshare/nrf51_ble400/board.cmake b/boards/waveshare/nrf51_ble400/board.cmake index e62f55b6a1d..3bdb9b702c1 100644 --- a/boards/waveshare/nrf51_ble400/board.cmake +++ b/boards/waveshare/nrf51_ble400/board.cmake @@ -1,5 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 board_runner_args(jlink "--device=nRF51822_xxAC" "--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) diff --git a/boards/we/ophelia1ev/board.cmake b/boards/we/ophelia1ev/board.cmake index ffc9229c087..c55ce2f4da5 100644 --- a/boards/we/ophelia1ev/board.cmake +++ b/boards/we/ophelia1ev/board.cmake @@ -4,6 +4,7 @@ board_runner_args(jlink "--device=nRF52805_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52805" "--frequency=4000000") +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) diff --git a/boards/we/proteus2ev/board.cmake b/boards/we/proteus2ev/board.cmake index 6b390dd00ba..468999481af 100644 --- a/boards/we/proteus2ev/board.cmake +++ b/boards/we/proteus2ev/board.cmake @@ -4,6 +4,7 @@ board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52832" "--frequency=4000000") +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) diff --git a/boards/we/proteus3ev/board.cmake b/boards/we/proteus3ev/board.cmake index 8d1cbeacc89..aa5959e4361 100644 --- a/boards/we/proteus3ev/board.cmake +++ b/boards/we/proteus3ev/board.cmake @@ -4,6 +4,7 @@ board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000") board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000") +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) diff --git a/doc/hardware/porting/board_porting.rst b/doc/hardware/porting/board_porting.rst index 8140c7a367b..1da052aea0d 100644 --- a/doc/hardware/porting/board_porting.rst +++ b/doc/hardware/porting/board_porting.rst @@ -696,11 +696,13 @@ example :file:`board.cmake`: board_runner_args(jlink "--device=nrf52" "--speed=4000") board_runner_args(pyocd "--target=nrf52" "--frequency=4000000") + 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) -This example configures the ``nrfjprog``, ``jlink``, and ``pyocd`` runners. +This example configures the ``nrfutil``, ``nrfjprog``, ``jlink``, and ``pyocd`` +runners. .. warning:: diff --git a/doc/releases/migration-guide-4.2.rst b/doc/releases/migration-guide-4.2.rst index 649b2d15492..771c7a5b1c9 100644 --- a/doc/releases/migration-guide-4.2.rst +++ b/doc/releases/migration-guide-4.2.rst @@ -29,6 +29,15 @@ Kernel Boards ****** +* All boards based on Nordic ICs that used the ``nrfjprog`` Nordic command-line + tool for flashing by default have been modified to instead default to the new + nRF Util (``nrfutil``) tool. This means that you may need to `install nRF Util + `_ or, if you + prefer to continue using ``nrfjprog``, you can do so by invoking west while + specfying the runner: ``west flash -r nrfjprog``. The full documentation for + nRF Util can be found + `here `_. + * The config option :kconfig:option:`CONFIG_NATIVE_POSIX_SLOWDOWN_TO_REAL_TIME` has been deprecated in favor of :kconfig:option:`CONFIG_NATIVE_SIM_SLOWDOWN_TO_REAL_TIME`.