projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update 'make flash' support for ARM chips.
[bertos.git]
/
bertos
/
cpu
/
arm
/
scripts
/
flash.sh
diff --git
a/bertos/cpu/arm/scripts/flash.sh
b/bertos/cpu/arm/scripts/flash.sh
index 998cf4be599b9574701a2234ae1fefb9c2a67a9d..a1eb3a3ad2777c21b4d16fb8db01c1df1d9a83b1 100755
(executable)
--- a/
bertos/cpu/arm/scripts/flash.sh
+++ b/
bertos/cpu/arm/scripts/flash.sh
@@
-2,8
+2,9
@@
set -x
BASE_DIR=`dirname $0`
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";
if [ ! -f ${INT_FILE} ]; then
printf "Interface ${PROGRAMMER_TYPE} not supported\n";
@@
-15,4
+16,10
@@
if [ ! -f ${CPU_FILE} ]; then
exit 1;
fi
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