X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=tcl%2Ftarget%2Fam437x.cfg;h=8ce0941df0278de0aecdc52f5a22700e9b67e762;hp=e928dabc1105dcc27c5514e38debe5b2d3251461;hb=bebdbe8b73b8d7cb2837687c0d38396fee0142fd;hpb=1d8c36e16a0112f8778658f3472936dc25e7b347

diff --git a/tcl/target/am437x.cfg b/tcl/target/am437x.cfg
index e928dabc11..8ce0941df0 100644
--- a/tcl/target/am437x.cfg
+++ b/tcl/target/am437x.cfg
@@ -457,7 +457,8 @@ if { [info exists M3_DAP_TAPID] } {
 	set _M3_DAP_TAPID 0x4b6b902f
 }
 jtag newtap $_CHIPNAME $M3_MODULE -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_M3_DAP_TAPID -disable
-jtag configure $M3_NAME -event tap-enable "icepick_d_tapenable $JRC_NAME 11"
+jtag configure $M3_NAME -event tap-enable "icepick_d_tapenable $JRC_NAME 11 0"
+dap create $M3_NAME.dap -chain-position $M3_NAME
 
 #
 # DebugSS DAP
@@ -468,7 +469,8 @@ if { [info exists DAP_TAPID] } {
    set _DAP_TAPID 0x46b6902f
 }
 jtag newtap $_CHIPNAME $DEBUGSS_MODULE -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_DAP_TAPID -disable
-jtag configure $DEBUGSS_NAME -event tap-enable "icepick_d_tapenable $JRC_NAME 12"
+jtag configure $DEBUGSS_NAME -event tap-enable "icepick_d_tapenable $JRC_NAME 12 0"
+dap create $DEBUGSS_NAME.dap -chain-position $DEBUGSS_NAME
 
 #
 # ICEpick-D (JTAG route controller)
@@ -484,9 +486,9 @@ jtag configure $JRC_NAME -event setup "jtag tapenable $DEBUGSS_NAME"
 jtag configure $JRC_NAME -event post-reset "runtest 100"
 
 #
-# Cortex A9 target
+# Cortex-A9 target
 #
-target create $_TARGETNAME cortex_a -chain-position $DEBUGSS_NAME -coreid 0 -dbgbase 0x80000000
+target create $_TARGETNAME cortex_a -dap $DEBUGSS_NAME.dap -coreid 0 -dbgbase 0x80000000
 
 
 # SRAM: 256K at 0x4030.0000
@@ -993,11 +995,7 @@ proc config_ddr3 { SDRAM_CONFIG } {
 proc init_platform { SDRAM_CONFIG } {
 	config_opp100
 	config_ddr3 $SDRAM_CONFIG
-
-	# now that PLLs are configured, we can run JTAG at full speed
-	adapter_khz 16000
 }
 
-$_TARGETNAME configure -event reset-start { adapter_khz 1000 }
 $_TARGETNAME configure -event reset-init { init_platform 0x61a013b2 }
 $_TARGETNAME configure -event reset-end { disable_watchdog }