From 429e63b39f5ea46e593afad3ac82325c269fb184 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Wed, 6 Nov 2019 15:37:22 +0100 Subject: [PATCH] makefiles/sam0: fix debugging with edbg OpenOCD should *always* be included for debugging if JLinkExe is not used. fixes #12652 (cherry picked from commit 756cab938538517e326701f5b1c13f86715e3554) --- makefiles/boards/sam0.inc.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/makefiles/boards/sam0.inc.mk b/makefiles/boards/sam0.inc.mk index a9f6895d6276..4edfd9bd60c2 100644 --- a/makefiles/boards/sam0.inc.mk +++ b/makefiles/boards/sam0.inc.mk @@ -44,12 +44,10 @@ ifeq ($(PROGRAMMER),edbg) endif endif -# this board uses J-Link for debug and possibly flashing ifeq ($(PROGRAMMER),jlink) + # this board uses J-Link for debug and possibly flashing include $(RIOTMAKE)/tools/jlink.inc.mk -endif - -# this board uses openocd for debug and possibly flashing -ifeq ($(PROGRAMMER),openocd) +else + # this board uses openocd for debug and possibly flashing include $(RIOTMAKE)/tools/openocd.inc.mk endif