Merge branch 'master' into ft-ks_flash

3 files changed, 22 insertions, 4 deletions

diff --git a/bin/debug b/bin/debug
index f87a3b5..14f3fa6 100755
--- a/bin/debug
+++ b/bin/debug
@@ -6,7 +6,11 @@ OPENOCD=openocd
 OPENOCD_BOARD_DIR=/usr/share/openocd/scripts/board
 OPENOCD_PROC_FILE=stm32f4discovery.cfg
 if [ "x`lsusb -d 0483:374b`" != "x" ]; then
-    OPENOCD_PROC_FILE=st_nucleo_f4.cfg
+    for fn in st_nucleo_f4.cfg st_nucleo_f401re.cfg; do
+        if [ -f "$OPENOCD_BOARD_DIR/$fn" ]; then
+	    OPENOCD_PROC_FILE="$fn"
+	fi
+    done
 fi
 $OPENOCD -f $OPENOCD_BOARD_DIR/$OPENOCD_PROC_FILE &
 
diff --git a/bin/flash-target b/bin/flash-target
index 0d60c85..7149c9f 100755
--- a/bin/flash-target
+++ b/bin/flash-target
@@ -22,7 +22,17 @@ OPENOCD_BOARD_DIR=/usr/share/openocd/scripts/board
 #
 OPENOCD_PROC_FILE=stm32f4discovery.cfg
 if [ "x`lsusb -d 0483:374b`" != "x" ]; then
-    OPENOCD_PROC_FILE=st_nucleo_f4.cfg
+    for fn in st_nucleo_f4.cfg st_nucleo_f401re.cfg; do
+        if [ -f "$OPENOCD_BOARD_DIR/$fn" ]; then
+	    OPENOCD_PROC_FILE="$fn"
+	fi
+    done
 fi
 
-$OPENOCD -f $OPENOCD_BOARD_DIR/$OPENOCD_PROC_FILE -c "program $PROJ.elf verify reset exit"
+# This used to be "... verify reset exit", but that fails on Debian Jessie.
+# The Net of a Million Lies claims that the "exit" is unnecessary, so the
+# simplest solution is just to omit it.  Should this turn out to be a mistake,
+# well, we'll have to do something more clever to deal with these silly version
+# skew problems between the several versions of openocd in current use.
+
+$OPENOCD -f $OPENOCD_BOARD_DIR/$OPENOCD_PROC_FILE -c "program $PROJ.elf verify reset" # exit
diff --git a/bin/reset b/bin/reset
index 1c57f97..8190805 100755
--- a/bin/reset
+++ b/bin/reset
@@ -21,7 +21,11 @@ OPENOCD_BOARD_DIR=/usr/share/openocd/scripts/board
 #
 OPENOCD_PROC_FILE=stm32f4discovery.cfg
 if [ "x`lsusb -d 0483:374b`" != "x" ]; then
-    OPENOCD_PROC_FILE=st_nucleo_f4.cfg
+    for fn in st_nucleo_f4.cfg st_nucleo_f401re.cfg; do
+        if [ -f "$OPENOCD_BOARD_DIR/$fn" ]; then
+	    OPENOCD_PROC_FILE="$fn"
+	fi
+    done
 fi
 
 $OPENOCD -f $OPENOCD_BOARD_DIR/$OPENOCD_PROC_FILE -c "init" -c "reset run" -c "exit"