From 3bafb6e2bce51cda8419519c09a5352320d0a8a2 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Tue, 24 Nov 2020 14:47:05 +0100 Subject: [PATCH] makefiles/edbg: include openocd.inc.mk to define debug vars --- makefiles/boards/sam0.inc.mk | 7 ------- makefiles/tools/edbg.inc.mk | 4 ++++ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/makefiles/boards/sam0.inc.mk b/makefiles/boards/sam0.inc.mk index fec2026a48..debdebe33d 100644 --- a/makefiles/boards/sam0.inc.mk +++ b/makefiles/boards/sam0.inc.mk @@ -41,10 +41,3 @@ ifeq ($(PROGRAMMER),) PROGRAMMER ?= openocd endif endif - -ifeq ($(PROGRAMMER),edbg) - # use edbg for flashing. must be included before openocd - include $(RIOTMAKE)/tools/edbg.inc.mk - # use openocd for debugging - include $(RIOTMAKE)/tools/openocd.inc.mk -endif diff --git a/makefiles/tools/edbg.inc.mk b/makefiles/tools/edbg.inc.mk index 472146567e..2fe20b1084 100644 --- a/makefiles/tools/edbg.inc.mk +++ b/makefiles/tools/edbg.inc.mk @@ -31,3 +31,7 @@ define edbg-flash-recipe endef flash-recipe = $(edbg-flash-recipe) + +# use openocd for debugging, must be included at the end so FLASHER/RESET +# variables are already set for edbg. +include $(RIOTMAKE)/tools/openocd.inc.mk