summaryrefslogtreecommitdiff
path: root/app/boards/arm/nrf52840_m2/board.cmake
diff options
context:
space:
mode:
authorMega Mind <68985133+megamind4089@users.noreply.github.com>2020-10-03 18:21:22 +0800
committerMega Mind <68985133+megamind4089@users.noreply.github.com>2020-10-05 21:24:39 +0800
commitb8cb5f939a3c018af13de7727c15d7765ea1f1c1 (patch)
tree48a45cbf9929a86d88c4b5bc0c4ffa9aaa9e9327 /app/boards/arm/nrf52840_m2/board.cmake
parente2299836bccf21bf56a4d34c5ed2f53a2fa21da2 (diff)
M60 keymap update and misc changes
* Updated M60 keymap * Make nrfjproj as default runner * Remove the polling config
Diffstat (limited to 'app/boards/arm/nrf52840_m2/board.cmake')
-rw-r--r--app/boards/arm/nrf52840_m2/board.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/boards/arm/nrf52840_m2/board.cmake b/app/boards/arm/nrf52840_m2/board.cmake
index f521e2c..55b44e2 100644
--- a/app/boards/arm/nrf52840_m2/board.cmake
+++ b/app/boards/arm/nrf52840_m2/board.cmake
@@ -5,5 +5,5 @@
board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset")
-include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake)
include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake)