From d076bc13e3e91d0efe01cef096daa55c561901d4 Mon Sep 17 00:00:00 2001
From: haukepetersen <hauke.petersen@fu-berlin.de>
Date: Sun, 8 Feb 2015 15:06:33 +0100
Subject: [PATCH] board/nucloe-f334: use unified openocd script

---
 boards/nucleo-f334/Makefile.include     | 17 ++++++++++-------
 boards/nucleo-f334/dist/debug-server.sh | 10 ----------
 boards/nucleo-f334/dist/debug.sh        | 11 -----------
 boards/nucleo-f334/dist/flash.sh        | 13 -------------
 boards/nucleo-f334/dist/gdb.conf        |  1 -
 boards/nucleo-f334/dist/openocd.cfg     |  1 +
 boards/nucleo-f334/dist/reset.sh        | 10 ----------
 7 files changed, 11 insertions(+), 52 deletions(-)
 delete mode 100755 boards/nucleo-f334/dist/debug-server.sh
 delete mode 100755 boards/nucleo-f334/dist/debug.sh
 delete mode 100755 boards/nucleo-f334/dist/flash.sh
 delete mode 100755 boards/nucleo-f334/dist/gdb.conf
 create mode 100644 boards/nucleo-f334/dist/openocd.cfg
 delete mode 100755 boards/nucleo-f334/dist/reset.sh

diff --git a/boards/nucleo-f334/Makefile.include b/boards/nucleo-f334/Makefile.include
index a861d93e70..ab42686905 100644
--- a/boards/nucleo-f334/Makefile.include
+++ b/boards/nucleo-f334/Makefile.include
@@ -23,11 +23,12 @@ export AS = $(PREFIX)as
 export LINK = $(PREFIX)gcc
 export SIZE = $(PREFIX)size
 export OBJCOPY = $(PREFIX)objcopy
+export DBG = $(PREFIX)gdb
 export TERMPROG = $(RIOTBASE)/dist/tools/pyterm/pyterm
-export FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh
-export DEBUGGER = $(RIOTBOARD)/$(BOARD)/dist/debug.sh
-export DEBUGSERVER = $(RIOTBOARD)/$(BOARD)/dist/debug-server.sh
-export RESET = $(RIOTBOARD)/$(BOARD)/dist/reset.sh
+export FLASHER = $(RIOTBASE)/dist/tools/openocd/openocd.sh
+export DEBUGGER = $(RIOTBASE)/dist/tools/openocd/openocd.sh
+export DEBUGSERVER = $(RIOTBASE)/dist/tools/openocd/openocd.sh
+export RESET = $(RIOTBASE)/dist/tools/openocd/openocd.sh
 
 # unwanted (CXXUWFLAGS) and extra (CXXEXFLAGS) flags for c++
 export CXXUWFLAGS +=
@@ -42,10 +43,12 @@ export ASFLAGS += -ggdb -g3 $(CPU_USAGE) $(FPU_USAGE) -mlittle-endian
 export LINKFLAGS += -ggdb -g3 -std=gnu99 $(CPU_USAGE) $(FPU_USAGE) -mlittle-endian -static -lgcc -mthumb -mno-thumb-interwork -nostartfiles
 # $(LINKERSCRIPT) is specified in cpu/Makefile.include
 export LINKFLAGS += -T$(LINKERSCRIPT)
-export OFLAGS = -O binary
-export FFLAGS = $(HEXFILE)
-export DEBUGGER_FLAGS = $(RIOTBOARD)/$(BOARD)/dist/gdb.conf $(ELFFILE)
+export OFLAGS = -O ihex
 export TERMFLAGS += -p "$(PORT)"
+export FFLAGS = flash
+export DEBUGGER_FLAGS = debug
+export DEBUGSERVER_FLAGS = debug-server
+export RESET_FLAGS = reset
 
 # use the nano-specs of the NewLib when available
 #ifeq ($(shell $(LINK) -specs=nano.specs -E - 2>/dev/null >/dev/null </dev/null ; echo $$?),0)
diff --git a/boards/nucleo-f334/dist/debug-server.sh b/boards/nucleo-f334/dist/debug-server.sh
deleted file mode 100755
index 0353a8bf27..0000000000
--- a/boards/nucleo-f334/dist/debug-server.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-echo "##"
-echo "## Starting debug server"
-echo "##"
-
-openocd -f board/st_nucleo_f334r8.cfg \
-    -c "init" \
-    -c "targets" \
-    -c "reset halt"
diff --git a/boards/nucleo-f334/dist/debug.sh b/boards/nucleo-f334/dist/debug.sh
deleted file mode 100755
index 350187969d..0000000000
--- a/boards/nucleo-f334/dist/debug.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-if [ ! -f "$2" ]; then
-    echo "ELF-file $2 does not exist"
-    exit 1
-fi
-
-echo "##"
-echo "## Debugging $2"
-echo "##"
-arm-none-eabi-gdb -tui -command="$1" $2
diff --git a/boards/nucleo-f334/dist/flash.sh b/boards/nucleo-f334/dist/flash.sh
deleted file mode 100755
index 2e464c8306..0000000000
--- a/boards/nucleo-f334/dist/flash.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-echo "##"
-echo "## Flashing $1"
-echo "##"
-
-openocd -f board/st_nucleo_f334r8.cfg \
-    -c "init" \
-    -c "targets" \
-    -c "reset halt" \
-    -c "program $1 0x8000000 verify" \
-    -c "reset run"\
-    -c "shutdown"
diff --git a/boards/nucleo-f334/dist/gdb.conf b/boards/nucleo-f334/dist/gdb.conf
deleted file mode 100755
index ba7908fdf3..0000000000
--- a/boards/nucleo-f334/dist/gdb.conf
+++ /dev/null
@@ -1 +0,0 @@
-tar extended-remote :3333
diff --git a/boards/nucleo-f334/dist/openocd.cfg b/boards/nucleo-f334/dist/openocd.cfg
new file mode 100644
index 0000000000..205fcf33b2
--- /dev/null
+++ b/boards/nucleo-f334/dist/openocd.cfg
@@ -0,0 +1 @@
+source [find board/st_nucleo_f334r8.cfg]
diff --git a/boards/nucleo-f334/dist/reset.sh b/boards/nucleo-f334/dist/reset.sh
deleted file mode 100755
index 666f54e7b1..0000000000
--- a/boards/nucleo-f334/dist/reset.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-echo "##"
-echo "## Resetting $1"
-echo "##"
-
-openocd -f board/st_nucleo_f334r8.cfg \
-    -c "init" \
-    -c "reset run"\
-    -c "shutdown"