From 289cecebf068e7f988dcbbc8786f6acc96803963 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C3=98yvind=20Harboe?= <oyvind.harboe@zylin.com>
Date: Wed, 4 May 2011 07:14:06 +0200
Subject: [PATCH] beagleboard: add support for various icepick versions

The beagleboard icepick jtag tap id's vary.
---
 tcl/target/amdm37x.cfg | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tcl/target/amdm37x.cfg b/tcl/target/amdm37x.cfg
index ab18681595..75593af2ef 100644
--- a/tcl/target/amdm37x.cfg
+++ b/tcl/target/amdm37x.cfg
@@ -1,6 +1,6 @@
 #
 # Copyright (C)   2010        by Karl Kurbjun
-# Copyright (C)   2009, 2010  by Øyvind Harboe
+# Copyright (C)   2009-2011  by Øyvind Harboe
 # Copyright (C)   2009        by David Brownell
 # Copyright (C)   2009        by Magnus Lundin
 #
@@ -29,11 +29,11 @@ if { [info exists CHIPTYPE] } {
    switch $CHIPTYPE {
       dm37x {
          # Primary TAP: ICEpick-C (JTAG route controller) and boundary scan
-         set _JRC_TAPID 0x0b89102f
+         set _JRC_TAPID "-expected-id 0x1b89102f -expected-id 0x0b89102f"
       }
       am35x {
          # Primary TAP: ICEpick-C (JTAG route controller) and boundary scan
-         set _JRC_TAPID 0x0b7ae02f
+         set _JRC_TAPID "-expected-id 0x0b7ae02f"
       }
       default {
          error "ERROR: CHIPTYPE was set, but it was not set to a valid value.  Acceptable values are \"dm37x\" or \"am35x\"."
@@ -113,8 +113,7 @@ jtag configure $_CHIPNAME.d2d -event tap-enable \
    "icepick_c_tapenable $_CHIPNAME.jrc 0"
 
 # Primary TAP: ICEpick - it is closest to TDI so last in the chain
-jtag newtap $_CHIPNAME jrc -irlen 6 -ircapture 0x1 -irmask 0x3f \
-   -expected-id $_JRC_TAPID
+eval "jtag newtap $_CHIPNAME jrc -irlen 6 -ircapture 0x1 -irmask 0x3f $_JRC_TAPID"
 	
 ######
 # End of Chain Description
-- 
2.30.2