Merge pull request #2364 from thomaseichinger/f3dicovery-openocd

boards/stm32f3discovery: use OpenOCD for flashing, debugging and resetting

boards/stm32f3discovery/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-m4
@@ -37,8 +37,6 @@ 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
 export LINKFLAGS += -T$(LINKERSCRIPT)
 export OFLAGS = -O binary
-export FFLAGS = write bin/$(BOARD)/$(APPLICATION).hex 0x8000000
-export DEBUGGER_FLAGS = $(RIOTBOARD)/$(BOARD)/dist/gdb.conf $(BINDIR)/$(APPLICATION).elf
 export TERMFLAGS += -p "$(PORT)"
 
 # unwanted (CXXUWFLAGS) and extra (CXXEXFLAGS) flags for c++

boards/stm32f3discovery/dist/debug.sh

 #!/bin/sh
 
-echo "Debugging $1"
-arm-none-eabi-gdb -tui -command=$1 $2
+echo "##"
+echo "## Debugging ${ELFFILE}"
+echo "##"
+
+# if GDB_PORT does not exist or holds empty string
+if [ -z ${GDB_PORT} ]; then
+    # set to gdb standard port
+    GDB_PORT=3333
+else
+    echo "Listening for GDB connection on port ${GDB_PORT}"
+fi
+
+openocd -f "board/stm32f3discovery.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.conf ${ELFFILE}
+
+kill ${OCD_PID}

boards/stm32f3discovery/dist/flash.sh

+#!/bin/bash
+
+echo "##"
+echo "## Flashing ${HEXFILE}"
+echo "##"
+
+openocd -f "board/stm32f3discovery.cfg" \
+    -c "tcl_port 0" \
+    -c "telnet_port 0" \
+    -c "gdb_port 0" \
+    -c "init" \
+    -c "targets" \
+    -c "reset halt" \
+    -c "program ${HEXFILE} 0x08000000 verify" \
+    -c "reset run"\
+    -c "shutdown"

boards/stm32f3discovery/dist/gdb.conf

-tar extended-remote :4242
+tar extended-remote :3333

boards/stm32f3discovery/dist/reset.sh

+#!/bin/bash
+
+echo "##"
+echo "## Resetting ${BOARD}"
+echo "##"
+
+openocd -f "board/stm32f3discovery.cfg" \
+    -c "tcl_port 0" \
+    -c "telnet_port 0" \
+    -c "gdb_port 0" \
+    -c "init" \
+    -c "reset run"\
+    -c "shutdown"