From 214407d9c7496b0da46e63c1f5e36d57684c9581 Mon Sep 17 00:00:00 2001
From: zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Thu, 30 Apr 2009 23:19:46 +0000
Subject: [PATCH] Uwe Hermann <uwe@hermann-uwe.de>: Support both rev -A1 and
 -A2 of Hitex STR9-comStick.

git-svn-id: svn://svn.berlios.de/openocd/trunk@1585 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
 src/target/board/hitex_str9_comstick.cfg | 11 +++++++++++
 src/target/target/str9comstick.cfg       |  7 +++++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 src/target/board/hitex_str9_comstick.cfg

diff --git a/src/target/board/hitex_str9_comstick.cfg b/src/target/board/hitex_str9_comstick.cfg
new file mode 100644
index 00000000..1efb5f88
--- /dev/null
+++ b/src/target/board/hitex_str9_comstick.cfg
@@ -0,0 +1,11 @@
+#
+# Hitex STR9-comStick
+#
+# http://www.hitex.com/index.php?id=383
+#
+
+# This works for the STR9-comStick revisions STR912CS-A1 and STR912CS-A2.
+
+source [find interface/str9-comstick.cfg]
+source [find target/str9comstick.cfg]
+
diff --git a/src/target/target/str9comstick.cfg b/src/target/target/str9comstick.cfg
index d8c7c7a4..a621ffe6 100644
--- a/src/target/target/str9comstick.cfg
+++ b/src/target/target/str9comstick.cfg
@@ -39,9 +39,12 @@ jtag newtap $_CHIPNAME cpu   -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_
 if { [info exists BSTAPID ] } {
    set _BSTAPID $BSTAPID
 } else {
-   set _BSTAPID 0x1457f041
+   # Found on STR9-comStick, revision STR912CS-A1
+   set _BSTAPID1 0x1457f041
+   # Found on STR9-comStick, revision STR912CS-A2
+   set _BSTAPID2 0x2457f041
 }
-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
 
 set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
 target create $_TARGETNAME arm966e -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm966e
-- 
2.39.5