[Cryptech-Commits] [sw/stm32] branch master updated: Whack shell scripts to work on Debian Jessie too.

[git at cryptech.is]

This is an automated email from the git hooks/post-receive script.

sra at hactrn.net pushed a commit to branch master
in repository sw/stm32.

The following commit(s) were added to refs/heads/master by this push:
       new  e961e98   Whack shell scripts to work on Debian Jessie too.
e961e98 is described below

commit e961e9818193acbb18c503830a554e52285e096b
Author: Rob Austein <sra at hactrn.net>
AuthorDate: Tue Jun 14 23:31:47 2016 -0400

    Whack shell scripts to work on Debian Jessie too.
---
 bin/debug        |  6 +++++-
 bin/flash-target | 14 ++++++++++++--
 bin/reset        |  6 +++++-
 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"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.