X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=tcl%2Ftarget%2Farmada370.cfg;h=ccf4b3606a8a89125dfc7922dd3849e28a97723e;hb=0dd969d83badb6793519ee99dd8ab8579d5f59df;hp=40c779bdc90e0cbdc1918ad74f377d9d24f3345a;hpb=518ce9e19e45d55b2e239ba99c457e018432d4ee;p=fw%2Fopenocd

diff --git a/tcl/target/armada370.cfg b/tcl/target/armada370.cfg
index 40c779bdc..ccf4b3606 100644
--- a/tcl/target/armada370.cfg
+++ b/tcl/target/armada370.cfg
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
 #
 # armada370 -- support for the Marvell Armada/370 CPU family
 #
@@ -16,10 +18,11 @@ if { [info exists CPUTAPID] } {
    set _CPUTAPID 0x4ba00477
 }
 
-jtag newtap $_CHIPNAME dap -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
+jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
 
 set _TARGETNAME $_CHIPNAME.cpu
-target create $_TARGETNAME cortex_a -chain-position $_CHIPNAME.dap
+dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu
+target create $_TARGETNAME cortex_a -dap $_CHIPNAME.dap
 
 proc armada370_dbginit {target} {
      cortex_a dbginit
@@ -27,7 +30,4 @@ proc armada370_dbginit {target} {
 
 $_TARGETNAME configure -event reset-assert-post "armada370_dbginit $_TARGETNAME"
 
-# We need to init now, so we can run the apsel command.
-init
 dap apsel 1
-