X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Farm%2Fscripts%2Fflash.sh;h=a1eb3a3ad2777c21b4d16fb8db01c1df1d9a83b1;hb=4b94981fcfe9e893527ed913fe903902be1d2c4a;hp=998cf4be599b9574701a2234ae1fefb9c2a67a9d;hpb=6abf03e019383ce5c269318dd72e9d237377cbe5;p=bertos.git

diff --git a/bertos/cpu/arm/scripts/flash.sh b/bertos/cpu/arm/scripts/flash.sh
index 998cf4be..a1eb3a3a 100755
--- a/bertos/cpu/arm/scripts/flash.sh
+++ b/bertos/cpu/arm/scripts/flash.sh
@@ -2,8 +2,9 @@
 set -x
 
 BASE_DIR=`dirname $0`
-INT_FILE=${BASE_DIR}/openocd/${PROGRAMMER_TYPE}.tcl 
-CPU_FILE=${BASE_DIR}/openocd/${PROGRAMMER_CPU}.tcl 
+INT_FILE=${BASE_DIR}/openocd/${PROGRAMMER_TYPE}.cfg 
+CPU_FILE=${BASE_DIR}/openocd/${PROGRAMMER_CPU}.cfg 
+OUT_FILE="openocd.tmp"
 
 if [ ! -f ${INT_FILE} ]; then
 	printf "Interface ${PROGRAMMER_TYPE} not supported\n";
@@ -15,4 +16,10 @@ if [ ! -f ${CPU_FILE} ]; then
 	exit 1;
 fi
 
-sed -e "s#PROGRAMMER_TYPE#${INT_FILE}#" ${BASE_DIR}/openocd/flash.cfg | sed -e "s#PROGRAMMER_CPU#${CPU_FILE}#" > openocd.tmp
+sed -e "s#PROGRAMMER_TYPE#${INT_FILE}#" ${BASE_DIR}/openocd/flash.cfg | sed -e "s#PROGRAMMER_CPU#${CPU_FILE}#" \
+	| sed -e "s#IMAGE_FILE#${IMAGE_FILE}#" > ${OUT_FILE}
+
+openocd -f ${OUT_FILE}
+OCD_RET=$?
+rm -f ${OUT_FILE}
+exit $OCD_RET