Merge pull request #11407 from aabadie/pr/boards/calliope-mini-progra…

…mmer boards/calliope-mini: rework programmer config (openocd and pyocd)
RIOT-OS · Apr 17, 2019 · b23fa61 · b23fa61
2 parents 5e789c6 + ccebd2b
commit b23fa61
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/boards/calliope-mini/Makefile.include b/boards/calliope-mini/Makefile.include
@@ -17,7 +17,12 @@ ifeq (fscopy,$(PROGRAMMER))
  export DEBUGGER =
  export DEBUGSERVER =
 else ifeq (openocd,$(PROGRAMMER))
- DEBUG_ADAPTER = jlink
+ DEBUG_ADAPTER = dap
+else ifeq (pyocd,$(PROGRAMMER))
+ # PyOCD doesn't recognize automatically the board ID, so target type has to
+ # be passed explicitly
+ export FLASH_TARGET_TYPE ?= -t nrf51
+ include $(RIOTMAKE)/tools/pyocd.inc.mk
 endif
 
 # include nrf51 boards common configuration