Merge pull request #2372 from haukepetersen/add_f0discovery_openocd

board/stm32f0discovery: switched to OpenOCD

boards/stm32f0discovery/Makefile.include

@@ -24,9 +24,9 @@ export LINK = $(PREFIX)gcc
 export SIZE = $(PREFIX)size
 export OBJCOPY = $(PREFIX)objcopy
 export TERMPROG = $(RIOTBASE)/dist/tools/pyterm/pyterm
-export FLASHER = st-flash
+export FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh
 export DEBUGGER = $(RIOTBOARD)/$(BOARD)/dist/debug.sh
-export DEBUGSERVER = st-util
+export RESET = $(RIOTBOARD)/$(BOARD)/dist/reset.sh
 
 # define build specific options
 CPU_USAGE = -mcpu=cortex-m0
@@ -37,9 +37,7 @@ export ASFLAGS += -ggdb -g3 $(CPU_USAGE) $(FPU_USAGE) -mlittle-endian
 export LINKFLAGS += -g3 -ggdb -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 = write bin/$(BOARD)/$(APPLICATION).hex 0x08000000
-export DEBUGGER_FLAGS = $(RIOTBOARD)/$(BOARD)/dist/gdb.conf bin/$(BOARD)/$(APPLICATION).elf
+export OFLAGS = -O ihex
 export TERMFLAGS += -p "$(PORT)"
 
 # unwanted (CXXUWFLAGS) and extra (CXXEXFLAGS) flags for c++

boards/stm32f0discovery/dist/debug.sh

@@ -1,4 +1,27 @@
 #!/bin/sh
 
-echo "Debugging $1"
-arm-none-eabi-gdb -tui -command=$1 $2
+# check if GDB_PORT is already defined
+if [ -z ${GDB_PORT} ]; then
+    # set to gdb standard port
+    GDB_PORT=3333
+fi
+echo "Listening for GDB connection on port ${GDB_PORT}"
+
+openocd -f "board/stm32f0discovery.cfg" \
+    -c "tcl_port 6333" \
+    -c "telnet_port 4444" \
+    -c "gdb_port ${GDB_PORT}" \
+    -c "init" \
+    -c "targets" \
+    -c "reset halt" \
+    -l /dev/null &
+
+# save pid to terminate afterwards
+OCD_PID=$?
+
+# needed for openocd to set up
+sleep 2
+
+arm-none-eabi-gdb -tui -command="${RIOTBOARD}/${BOARD}/dist/gdb.cfg" ${ELFFILE}
+
+kill ${OCD_PID}

boards/stm32f0discovery/dist/flash.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+openocd -f "board/stm32f0discovery.cfg" \
+    -c 'tcl_port 0' \
+    -c 'gdb_port 0' \
+    -c 'telnet_port 0' \
+    -c "init" \
+    -c "targets" \
+    -c "reset halt" \
+    -c "flash write_image erase ${HEXFILE} 0" \
+    -c "verify_image ${HEXFILE}" \
+    -c "reset run"\
+    -c "shutdown"

boards/stm32f0discovery/dist/gdb.cfg

@@ -0,0 +1 @@
+target extended-remote :3333

boards/stm32f0discovery/dist/gdb.conf

@@ -1 +0,0 @@
-tar extended-remote :4242

boards/stm32f0discovery/dist/reset.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+openocd -f "board/stm32f0discovery.cfg" \
+    -c 'tcl_port 0' \
+    -c 'gdb_port 0' \
+    -c 'telnet_port 0' \
+    -c "init" \
+    -c "reset run" \
+    -c "shutdown"