X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=tcl%2Ftarget%2Fam335x.cfg;h=6fad92c311db7c183b10f7a0f006e15d6398eed4;hp=a5376c1d1eb33ff002372a3fb5c02618127cf0c5;hb=ba66b4c594e12e4b1dd37168376ded95a8ae4e89;hpb=39cff815d2684e2d42361af768cd5b5e73ad49e2

diff --git a/tcl/target/am335x.cfg b/tcl/target/am335x.cfg
index a5376c1d1e..6fad92c311 100644
--- a/tcl/target/am335x.cfg
+++ b/tcl/target/am335x.cfg
@@ -1,3 +1,4 @@
+source [find target/icepick.cfg]
 
 if { [info exists CHIPNAME] } {
    set _CHIPNAME $CHIPNAME
@@ -5,26 +6,6 @@ if { [info exists CHIPNAME] } {
    set _CHIPNAME am335x
 }
 
-# This chip contains an IcePick-D JTAG router.  The IcePick-C configuration is almost
-# compatible, but it doesn't work.  For now, we will just embed the IcePick-D
-# routines here.
-proc icepick_d_tapenable {jrc port} {
-	# select router
-	irscan $jrc 7 -endstate IRPAUSE
-	drscan $jrc 8 0x89 -endstate DRPAUSE
-
-	# set ip control
-	irscan $jrc 2 -endstate IRPAUSE
-	drscan $jrc 32 [expr 0xa0002108 + ($port << 24)] -endstate DRPAUSE
-
-	# for icepick_D
-	irscan $jrc 2 -endstate IRPAUSE
-	drscan $jrc 32 0xe0002008 -endstate DRPAUSE
-
-	irscan $jrc 0x3F -endstate RUN/IDLE
-	runtest 10
-}
-
 #
 # M3 DAP
 #
@@ -39,7 +20,7 @@ jtag configure $_CHIPNAME.m3_dap -event tap-enable "icepick_d_tapenable $_CHIPNA
 #
 # Main DAP
 #
-if { [info exists DAP_TAPID ] } {
+if { [info exists DAP_TAPID] } {
    set _DAP_TAPID $DAP_TAPID
 } else {
    set _DAP_TAPID 0x4b6b902f
@@ -50,7 +31,7 @@ jtag configure $_CHIPNAME.dap -event tap-enable "icepick_d_tapenable $_CHIPNAME.
 #
 # ICEpick-D (JTAG route controller)
 #
-if { [info exists JRC_TAPID ] } {
+if { [info exists JRC_TAPID] } {
    set _JRC_TAPID $JRC_TAPID
 } else {
    set _JRC_TAPID 0x0b94402f