From cd998f6a2df67e33fb9252832451c12e96b074e8 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Tue, 4 Jun 2019 15:27:07 +0200 Subject: [PATCH] boards/microbit: use openocd as default programmer --- boards/microbit/Makefile.include | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/boards/microbit/Makefile.include b/boards/microbit/Makefile.include index 496edb3d1b..1ecc745974 100644 --- a/boards/microbit/Makefile.include +++ b/boards/microbit/Makefile.include @@ -5,21 +5,12 @@ export CPU_MODEL = nrf51x22xxab PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) -# this board supports flashing through plain fscopy, using JLink or using -# openocd. Default programmer is fscopy -PROGRAMMER ?= fscopy +# for this board we support flashing via openocd or pyocd +PROGRAMMER ?= openocd -ifeq (fscopy,$(PROGRAMMER)) - FFLAGS = $(HEXFILE) - DEBUGGER_FLAGS = - - FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh - DEBUGGER = - DEBUGSERVER = -else ifeq (openocd,$(PROGRAMMER)) - # this board uses a daplink adapter by default +ifeq (openocd,$(PROGRAMMER)) DEBUG_ADAPTER = dap -else ifeq (pyocd, $(PROGRAMMER)) +else ifeq (pyocd,$(PROGRAMMER)) include $(RIOTMAKE)/tools/pyocd.inc.mk endif