From 1562affc4951e147eba20380ea5be2e9f7152789 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sat, 14 Dec 2013 11:47:31 -0800
Subject: [PATCH] ao-tools: Use st-flash for STM flashing instead of openocd

st-flash, from the stlink tools, appears more reliable when flashing
STM CPUs.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 ao-tools/ao-flash/ao-flash-stm | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/ao-tools/ao-flash/ao-flash-stm b/ao-tools/ao-flash/ao-flash-stm
index c5aeb7ae..993258e5 100644
--- a/ao-tools/ao-flash/ao-flash-stm
+++ b/ao-tools/ao-flash/ao-flash-stm
@@ -5,17 +5,20 @@ case "$#" in
 	exit 1
 	;;
 esac
-cmds=/tmp/flash$$
-trap "rm $cmds" 0 1 15
-for file in "$@"; do
-	echo "flash write_image $file"
-done > $cmds
-openocd \
-	-f interface/stlink-v2.cfg \
-	-f target/stm32lx_stlink.cfg \
-	-c init \
-	-c 'reset halt' \
-	-f $cmds \
-	-c 'reset init' \
-        -c 'reset run' \
-	-c shutdown
+
+file=$1
+
+bin=/tmp/flash$$.bin
+trap "rm $bin" 0 1 15
+
+base=`arm-none-eabi-nm $file | awk '/interrupt_vector/ { print $1 }'`
+case x"$base" in
+x)
+    echo "$file: No interrupt vector address found"
+    exit 1
+    ;;
+esac
+
+arm-none-eabi-objcopy -O binary $file $bin
+
+st-flash --reset write $bin $base
\ No newline at end of file
-- 
2.30.2