From 72725490075953d2cac1093c6ffceca31f7be81c Mon Sep 17 00:00:00 2001
From: Alexandre Abadie <alexandre.abadie@inria.fr>
Date: Tue, 1 Dec 2020 12:11:22 +0100
Subject: [PATCH] boards/common/msp430: use common mspdebug

---
 boards/common/msb-430/Makefile.include | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/boards/common/msb-430/Makefile.include b/boards/common/msb-430/Makefile.include
index 9bd9258c48..b2b4e3f1b2 100644
--- a/boards/common/msb-430/Makefile.include
+++ b/boards/common/msb-430/Makefile.include
@@ -1,3 +1,5 @@
+INCLUDES += -I$(RIOTBOARD)/common/msb-430/include
+
 # set default port depending on operating system
 PORT_LINUX ?= /dev/ttyUSB0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
@@ -5,23 +7,5 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
 include $(RIOTMAKE)/tools/serial.inc.mk
 
 # setup flash tool
-PROGRAMMER ?= olimex
-MSPDEBUGFLAGS += -j $(PROGRAMMER)
-ifeq ($(strip $(PROGRAMMER)),uif)
-  MSPDEBUGFLAGS += -d $(PROG_DEV)
-endif
-FLASHER ?= mspdebug
-FLASHFILE ?= $(HEXFILE)
-FFLAGS = $(MSPDEBUGFLAGS) "prog $(FLASHFILE)"
-
-# setup debugger
-DEBUGSERVER = $(FLASHER)
-DEBUGSERVER_FLAGS = $(MSPDEBUGFLAGS) gdb
-DEBUGGER = $(PREFIX)gdb
-DEBUGGER_FLAGS = --ex="target remote localhost:2000" --ex "monitor reset halt" --ex load -ex "monitor reset halt"  $(ELFFILE)
-
-INCLUDES += -I$(RIOTBOARD)/common/msb-430/include
-
-# setup reset tool
-RESET ?= mspdebug
-RESET_FLAGS ?= $(MSPDEBUGFLAGS) reset
+PROGRAMMER ?= mspdebug
+MSPDEBUG_PROGRAMMER ?= olimex