From 307f309133be53ef440654dff3ee70521bcafb45 Mon Sep 17 00:00:00 2001 From: Paul Selkirk Date: Thu, 15 Oct 2020 14:01:27 -0400 Subject: OpenOCD versions since at least 0.9.0 (May 2015) actually do need the 'exit' command to terminate the script. Hopefully we're all past using Debian Jessie by now? --- bin/flash-target | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'bin') diff --git a/bin/flash-target b/bin/flash-target index 7149c9f..336bae1 100755 --- a/bin/flash-target +++ b/bin/flash-target @@ -29,10 +29,4 @@ if [ "x`lsusb -d 0483:374b`" != "x" ]; then done fi -# 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 +$OPENOCD -f $OPENOCD_BOARD_DIR/$OPENOCD_PROC_FILE -c "program $PROJ.elf verify reset exit" -- cgit v1.2.3