From 7b3cf4d1ba43fe9f9aee5d02acf5f1ec8744985a Mon Sep 17 00:00:00 2001
From: Francisco Molina <femolina@uc.cl>
Date: Fri, 7 Aug 2020 18:23:22 +0200
Subject: [PATCH] fixup! Merge pull request #12457 from kaspar030/update_msp430

---
 boards/cc2538dk/Makefile.include | 26 +-------------------------
 boards/cc2538dk/dist/board.resc  | 30 ------------------------------
 boards/cc2538dk/dist/debug.sh    | 17 -----------------
 boards/cc2538dk/dist/flash.sh    | 23 -----------------------
 boards/cc2538dk/dist/reset.sh    | 17 -----------------
 5 files changed, 1 insertion(+), 112 deletions(-)
 delete mode 100644 boards/cc2538dk/dist/board.resc
 delete mode 100755 boards/cc2538dk/dist/debug.sh
 delete mode 100755 boards/cc2538dk/dist/flash.sh
 delete mode 100755 boards/cc2538dk/dist/reset.sh

diff --git a/boards/cc2538dk/Makefile.include b/boards/cc2538dk/Makefile.include
index e7a694ea2a40b..aa93b15f7c647 100644
--- a/boards/cc2538dk/Makefile.include
+++ b/boards/cc2538dk/Makefile.include
@@ -5,32 +5,8 @@ PROGRAMMER_SERIAL ?= 06EB
 # the debug UART is always the second tty with the matching serial number:
 PORT_LINUX ?= $(word 2,$(shell $(RIOTTOOLS)/usb-serial/find-tty.sh '^$(PROGRAMMER_SERIAL)'))
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbserial*)))
-include $(RIOTMAKE)/tools/serial.inc.mk
 
 # setup emulator
 include $(RIOTMAKE)/tools/renode.inc.mk
 
-# debugger config
-DEBUGGER = $(RIOTBOARD)/cc2538dk/dist/debug.sh
-DEBUGSERVER = JLinkGDBServer -device CC2538SF53
-RESET ?= $(RIOTBOARD)/cc2538dk/dist/reset.sh
-
-# Define the flash-tool and default port:
-PROGRAMMER ?= cc2538-bsl
-
-ifeq ($(PROGRAMMER),cc2538-bsl)
-  include $(RIOTMAKE)/tools/cc2538-bsl.inc.mk
-else ifeq ($(PROGRAMMER),jlink)
-  FLASHER = $(RIOTBOARD)/cc2538dk/dist/flash.sh
-  FFLAGS  = $(BINDIR) $(FLASHFILE)
-endif
-
-OFLAGS = --gap-fill 0xff
-FLASHFILE ?= $(BINFILE)
-DEBUGGER_FLAGS = $(BINDIR) $(ELFFILE)
-RESET_FLAGS ?= $(BINDIR)
-
-OBJDUMPFLAGS += --disassemble --source --disassembler-options=force-thumb
-
-# include common cc2538 includes
-INCLUDES += -I$(RIOTBOARD)/common/cc2538/include
+include $(RIOTBOARD)/common/cc2538/Makefile.include
diff --git a/boards/cc2538dk/dist/board.resc b/boards/cc2538dk/dist/board.resc
deleted file mode 100644
index 3ec9edd893bc0..0000000000000
--- a/boards/cc2538dk/dist/board.resc
+++ /dev/null
@@ -1,30 +0,0 @@
-mach create
-using sysbus
-machine LoadPlatformDescription @platforms/cpus/cc2538.repl
-
-machine PyDevFromFile @scripts/pydev/rolling-bit.py 0x400D2004 0x4 True "sysctrl"
-
-# show the UART output
-showAnalyzer uart0
-
-# get an id value starting with 1
-$id = `next_value 1`
-
-macro reset
-"""
-    # set node address based on the $id variable. 0x00 0x12 0x4B is TI OUI
-    sysbus WriteByte 0x00280028 $id
-    sysbus WriteByte 0x0028002C 0x00
-    sysbus WriteByte 0x00280030 0xAB
-    sysbus WriteByte 0x00280034 0x89
-    sysbus WriteByte 0x00280038 0x00
-    sysbus WriteByte 0x0028003C 0x4B
-    sysbus WriteByte 0x00280040 0x12
-    sysbus WriteByte 0x00280044 0x00
-    sysbus LoadBinary @http://antmicro.com/projects/renode/cc2538_rom_dump.bin-s_524288-0c196cdc21b5397f82e0ff42b206d1cc4b6d7522 0x0
-    sysbus LoadELF $image_file
-    cpu VectorTableOffset 0x200000
-"""
-
-runMacro $reset
-start
diff --git a/boards/cc2538dk/dist/debug.sh b/boards/cc2538dk/dist/debug.sh
deleted file mode 100755
index 24bdbae0f64f0..0000000000000
--- a/boards/cc2538dk/dist/debug.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-# Start in-circuit debugging on this board: this script starts up the GDB
-# client and connects to a GDB server.
-#
-# Start the GDB server first using the 'make debugserver' target
-
-# @author Hauke Petersen <hauke.petersen@fu-berlin.de>
-
-BINDIR=$1
-ELFFILE=$2
-
-# write GDB config file
-echo "target extended-remote 127.0.0.1:2331" > $BINDIR/gdb.cfg
-
-# run GDB
-arm-none-eabi-gdb -tui -command=$BINDIR/gdb.cfg $ELFFILE
diff --git a/boards/cc2538dk/dist/flash.sh b/boards/cc2538dk/dist/flash.sh
deleted file mode 100755
index b7a28b51ffbca..0000000000000
--- a/boards/cc2538dk/dist/flash.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-# This flash script dynamically generates a file with a set of commands which
-# have to be handed to the flashing script of SEGGER (JLinkExe >4.84).
-# After that, JLinkExe will be executed with that set of commands to flash the
-# latest .bin file to the board.
-
-# @author Hauke Petersen <hauke.petersen@fu-berlin.de>
-
-BINDIR=$1
-BINFILE=$2
-FLASHADDR=200000
-
-# setup JLink command file
-echo "speed 1000" > $BINDIR/burn.seg
-echo "loadbin $BINFILE $FLASHADDR" >> $BINDIR/burn.seg
-echo "r" >> $BINDIR/burn.seg
-echo "g" >> $BINDIR/burn.seg
-echo "exit" >> $BINDIR/burn.seg
-
-# flash new binary to the board
-JLinkExe -device CC2538SF53 < $BINDIR/burn.seg
-echo ""
diff --git a/boards/cc2538dk/dist/reset.sh b/boards/cc2538dk/dist/reset.sh
deleted file mode 100755
index bb4da65c0ecf3..0000000000000
--- a/boards/cc2538dk/dist/reset.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-# This script resets a CC2538SF53 target using JLink called
-# with a pre-defined reset sequence.
-
-# @author Hauke Petersen <hauke.petersen@fu-berlin.de>
-
-BINDIR=$1
-
-# create JLink command file for resetting the board
-echo "r" >> $BINDIR/reset.seg
-echo "g" >> $BINDIR/reset.seg
-echo "exit" >> $BINDIR/reset.seg
-
-# reset the board
-JLinkExe -device CC2538SF53 < $BINDIR/reset.seg
-echo ""