From b4fcccc8fe98c7c4c4ded94f85190e0901cabc01 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Wed, 17 Apr 2019 14:08:02 +0200 Subject: [PATCH 1/2] boards/calliope-mini: use dap adapter with openocd --- boards/calliope-mini/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards/calliope-mini/Makefile.include b/boards/calliope-mini/Makefile.include index fa17c4159139..23f1c6e7d050 100644 --- a/boards/calliope-mini/Makefile.include +++ b/boards/calliope-mini/Makefile.include @@ -17,7 +17,7 @@ ifeq (fscopy,$(PROGRAMMER)) export DEBUGGER = export DEBUGSERVER = else ifeq (openocd,$(PROGRAMMER)) - DEBUG_ADAPTER = jlink + DEBUG_ADAPTER = dap endif # include nrf51 boards common configuration From ccebd2bd2f585b5fd7823003a201b79d6e5d2eec Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Wed, 17 Apr 2019 14:09:29 +0200 Subject: [PATCH 2/2] boards/calliope-mini: enable pyocd programmer option --- boards/calliope-mini/Makefile.include | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/boards/calliope-mini/Makefile.include b/boards/calliope-mini/Makefile.include index 23f1c6e7d050..35575ba53e6c 100644 --- a/boards/calliope-mini/Makefile.include +++ b/boards/calliope-mini/Makefile.include @@ -18,6 +18,11 @@ ifeq (fscopy,$(PROGRAMMER)) export DEBUGSERVER = else ifeq (openocd,$(PROGRAMMER)) 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