aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-04-23 14:03:42 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-04-23 14:03:42 +0000
commit9b7bd65883b0c0f76b5976c44b4808d6141ab30c (patch)
treefadb350220c8cd6e5b39b252a543cb0276f51dc9
parent90ff84a2ddecf220a9b452b7c4c90624284dcbb2 (diff)
downloadriscv-openocd-9b7bd65883b0c0f76b5976c44b4808d6141ab30c.zip
riscv-openocd-9b7bd65883b0c0f76b5976c44b4808d6141ab30c.tar.gz
riscv-openocd-9b7bd65883b0c0f76b5976c44b4808d6141ab30c.tar.bz2
stm32.cfg can expect one of 4 id's.
git-svn-id: svn://svn.berlios.de/openocd/trunk@1516 b42882b7-edfa-0310-969c-e2dbd0fdcd60
-rw-r--r--doc/openocd.texi4
-rw-r--r--src/target/target/stm32.cfg10
2 files changed, 8 insertions, 6 deletions
diff --git a/doc/openocd.texi b/doc/openocd.texi
index 84400fc..24c3dfd 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -1606,7 +1606,9 @@ bits long, during Capture-IR 0x42 is loaded into the IR, and bits
@itemize @bullet
@item @b{-expected-id NUMBER}
@* By default it is zero. If non-zero represents the
-expected tap ID used when the JTAG chain is examined. See below.
+expected tap ID used when the JTAG chain is examined. Repeat
+the option as many times as required if multiple id's can be
+expected. See below.
@item @b{-disable}
@item @b{-enable}
@* By default not specified the tap is enabled. Some chips have a
diff --git a/src/target/target/stm32.cfg b/src/target/target/stm32.cfg
index 2c3e070..2fe1785 100644
--- a/src/target/target/stm32.cfg
+++ b/src/target/target/stm32.cfg
@@ -37,15 +37,15 @@ if { [info exists BSTAPID ] } {
# See STM Document RM0008
# Section 26.6.2
# Low density devices, Rev A
- set _BSTAPID 0x06412041
+ set _BSTAPID1 0x06412041
# Medium density devices, Rev A
- set _BSTAPID 0x06410041
+ set _BSTAPID2 0x06410041
# Medium density devices, Rev B and Rev Z
- set _BSTAPID 0x16410041
+ set _BSTAPID3 0x16410041
# High density devices, Rev A
- set _BSTAPID 0x06414041
+ set _BSTAPID4 0x06414041
}
-jtag newtap $_CHIPNAME bs -irlen 5 -ircapture 0x1 -irmask 0x1 -expected-id $_BSTAPID
+jtag newtap $_CHIPNAME bs -irlen 5 -ircapture 0x1 -irmask 0x1 -expected-id $_BSTAPID1 -expected-id $_BSTAPID2 -expected-id $_BSTAPID3 -expected-id $_BSTAPID4
set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
target create $_TARGETNAME cortex_m3 -endian $_ENDIAN -chain-position $_TARGETNAME