cfg: ignore ICEPick jrc tap version

Due to reports of newer targets using a updated version of the ICEPick tap
rather than add another tapid we ignore the tap version.

Also see Trac 49 for details.

Change-Id: Ic78414c54af2545c817e1bb2c860970c1b587259
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/1373
Tested-by: jenkins
Reviewed-by: Peter Stuge <peter@stuge.se>

diff --git a/tcl/target/am335x.cfg b/tcl/target/am335x.cfg
index 9a24ef00e7b26a3bf1eb46f0c920bd5b7371c865..a5376c1d1eb33ff002372a3fb5c02618127cf0c5 100644 (file)
--- a/tcl/target/am335x.cfg
+++ b/tcl/target/am335x.cfg
@@ -55,7 +55,7 @@ if { [info exists JRC_TAPID ] } {
 } else {
    set _JRC_TAPID 0x0b94402f
 }
-jtag newtap $_CHIPNAME jrc -irlen 6 -ircapture 0x1 -irmask 0x3f -expected-id $_JRC_TAPID
+jtag newtap $_CHIPNAME jrc -irlen 6 -ircapture 0x1 -irmask 0x3f -expected-id $_JRC_TAPID -ignore-version
 jtag configure $_CHIPNAME.jrc -event setup "jtag tapenable $_CHIPNAME.dap"
 # some TCK tycles are required to activate the DEBUG power domain
 jtag configure $_CHIPNAME.jrc -event post-reset "runtest 100"

diff --git a/tcl/target/omapl138.cfg b/tcl/target/omapl138.cfg
index d3e472c6d8c5519eaf7b0b66345c71d22804052c..9a10d530cb8a8ef7bed7a9798f4072fb6f0fa0b3 100644 (file)
--- a/tcl/target/omapl138.cfg
+++ b/tcl/target/omapl138.cfg
@@ -35,7 +35,7 @@ if { [info exists JRC_TAPID] } {
 } else {
    set _JRC_TAPID 0x0b7d102f
 }
-jtag newtap $_CHIPNAME jrc -irlen 6 -irmask 0x3f -expected-id $_JRC_TAPID
+jtag newtap $_CHIPNAME jrc -irlen 6 -irmask 0x3f -expected-id $_JRC_TAPID -ignore-version
 
 jtag configure $_CHIPNAME.jrc -event setup \
        "jtag tapenable $_CHIPNAME.etb; jtag tapenable $_CHIPNAME.arm"