From dd45333a09e81cee90ff2e5f7916d61a9ef45ea3 Mon Sep 17 00:00:00 2001
From: Thomas Eichinger <thomas.eichinger1@gmail.com>
Date: Thu, 29 Jan 2015 14:48:20 +0100
Subject: [PATCH] SQUASHME: Fixed issues and omitted parameters
---
boards/stm32f3discovery/Makefile.include | 2 --
boards/stm32f3discovery/dist/debug.sh | 20 +++++++++-----------
boards/stm32f3discovery/dist/flash.sh | 6 +++---
boards/stm32f3discovery/dist/gdb.conf | 2 +-
boards/stm32f3discovery/dist/reset.sh | 4 ++--
5 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/boards/stm32f3discovery/Makefile.include b/boards/stm32f3discovery/Makefile.include
index 432baa3311..9ace996a7d 100644
--- a/boards/stm32f3discovery/Makefile.include
+++ b/boards/stm32f3discovery/Makefile.include
@@ -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 -mthumb-interwork -nostartfiles
export LINKFLAGS += -T$(LINKERSCRIPT)
export OFLAGS = -O binary
-export FFLAGS = $(HEXFILE)
-export DEBUGGER_FLAGS = $(RIOTBOARD)/$(BOARD)/dist/gdb.conf $(ELFFILE)
export TERMFLAGS += -p "$(PORT)"
# unwanted (CXXUWFLAGS) and extra (CXXEXFLAGS) flags for c++
diff --git a/boards/stm32f3discovery/dist/debug.sh b/boards/stm32f3discovery/dist/debug.sh
index 726f0562c0..3676c42e13 100755
--- a/boards/stm32f3discovery/dist/debug.sh
+++ b/boards/stm32f3discovery/dist/debug.sh
@@ -1,23 +1,21 @@
#!/bin/sh
-if [ ! -f "$2" ]; then
- echo "ELF-file $2 does not exist"
- exit 1
-fi
+echo "##"
+echo "## Debugging ${ELFFILE}"
+echo "##"
# if GDB_PORT does not exist or holds empty string
if [ -z ${GDB_PORT} ]; then
- GDB_PORT=0
+ # set to gdb standard port
+ GDB_PORT=3333
+else
+ echo "Listening for GDB connection on port ${GDB_PORT}"
fi
-echo "##"
-echo "## Debugging $2"
-echo "##"
-
openocd -f "board/stm32f3discovery.cfg" \
-c "tcl_port 6333" \
-c "telnet_port 4444" \
- -c "gdb_port ${GDB_PORT}"
+ -c "gdb_port ${GDB_PORT}" \
-c "init" \
-c "targets" \
-c "reset halt" \
@@ -29,6 +27,6 @@ OCD_PID=$?
# needed for openocd to set up
sleep 2
-arm-none-eabi-gdb -tui -command=$1 $2
+arm-none-eabi-gdb -tui -command=${RIOTBOARD}/${BOARD}/dist/gdb.conf ${ELFFILE}
kill ${OCD_PID}
diff --git a/boards/stm32f3discovery/dist/flash.sh b/boards/stm32f3discovery/dist/flash.sh
index 4078fcbdd8..1566648460 100755
--- a/boards/stm32f3discovery/dist/flash.sh
+++ b/boards/stm32f3discovery/dist/flash.sh
@@ -1,16 +1,16 @@
#!/bin/bash
echo "##"
-echo "## Flashing $1"
+echo "## Flashing ${HEXFILE}"
echo "##"
openocd -f "board/stm32f3discovery.cfg" \
- -c "init" \
-c "tcl_port 0" \
-c "telnet_port 0" \
-c "gdb_port 0" \
+ -c "init" \
-c "targets" \
-c "reset halt" \
- -c "program $1 0x08000000 verify" \
+ -c "program ${HEXFILE} 0x08000000 verify" \
-c "reset run"\
-c "shutdown"
diff --git a/boards/stm32f3discovery/dist/gdb.conf b/boards/stm32f3discovery/dist/gdb.conf
index 7257c72805..ba7908fdf3 100644
--- a/boards/stm32f3discovery/dist/gdb.conf
+++ b/boards/stm32f3discovery/dist/gdb.conf
@@ -1 +1 @@
-tar extended-remote :4242
+tar extended-remote :3333
diff --git a/boards/stm32f3discovery/dist/reset.sh b/boards/stm32f3discovery/dist/reset.sh
index 18b4c68b07..b47fa81fa6 100755
--- a/boards/stm32f3discovery/dist/reset.sh
+++ b/boards/stm32f3discovery/dist/reset.sh
@@ -1,13 +1,13 @@
#!/bin/bash
echo "##"
-echo "## Resetting $1"
+echo "## Resetting ${BOARD}"
echo "##"
openocd -f "board/stm32f3discovery.cfg" \
- -c "init" \
-c "tcl_port 0" \
-c "telnet_port 0" \
-c "gdb_port 0" \
+ -c "init" \
-c "reset run"\
-c "shutdown"
--
GitLab