summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMegan Wachs <megan@sifive.com>2016-12-24 14:59:10 -0800
committerGitHub <noreply@github.com>2016-12-24 14:59:10 -0800
commit61ac13fa908b756adb46bd4cb3cc4061961df0d5 (patch)
treec8c31e489567806818cd2c951791e39ad35fde18
parentfb9d92d4bcfae53f60d82c1bd2ca270e67e312e7 (diff)
parenta04f4570efa06c4adf6a7723e731600a6d8f5f31 (diff)
Merge pull request #33 from sifive/verify_openocd_flash
Bump OpenOCD to pick up corrected malloc in Flashing code.
-rwxr-xr-xbsp/tools/openocd_upload.sh2
m---------openocd0
2 files changed, 1 insertions, 1 deletions
diff --git a/bsp/tools/openocd_upload.sh b/bsp/tools/openocd_upload.sh
index afa9dad..ecbe3b4 100755
--- a/bsp/tools/openocd_upload.sh
+++ b/bsp/tools/openocd_upload.sh
@@ -1,5 +1,5 @@
#! /bin/bash -x
openocd -f ${2} \
- -c "flash protect 0 64 last off; program ${1}; resume 0x20400000; exit" \
+ -c "flash protect 0 64 last off; program ${1} verify; resume 0x20400000; exit" \
2>&1 | tee openocd_upload.log
diff --git a/openocd b/openocd
-Subproject b474c22b33be7fa4969c0dfa9ccf172ce1bab5d
+Subproject 193f63094891cd3fe6a5032fef2c71d09f063ff