smp: replace commands smp_on/smp_off with "smp [on|off]"

[openocd.git] / tcl / target / u8500.cfg

diff --git a/tcl/target/u8500.cfg b/tcl/target/u8500.cfg
index e1368740ef5592c5a46f7b0ad3eac9b46fd52331..7ff39291bab86eee39d7b33943ab6d29c8856cf1 100644 (file)
--- a/tcl/target/u8500.cfg
+++ b/tcl/target/u8500.cfg
@@ -19,12 +19,12 @@ proc ocd_gdb_restart {target_id} {
        global _SMP
     targets $_TARGETNAME_1
        if { [expr ($_SMP == 1)] } {
-       cortex_a8 smp_off
+       cortex_a smp off
        }
        rst_run
        halt
        if { [expr ($_SMP == 1)]} {
-       cortex_a8 smp_on
+       cortex_a smp on
        }
 }
 
@@ -167,11 +167,11 @@ if { [info exists CPUTAPID] } {
 } else {
        set _CPUTAPID 0x4ba00477
 }
-jtag newtap $_CHIPNAME dap -irlen 4 -ircapture 0xe -irmask 0xf -expected-id $_CPUTAPID -disable
-jtag configure $_CHIPNAME.dap -event tap-enable \
-       "u8500_dapenable $_CHIPNAME.dap"
-jtag configure $_CHIPNAME.dap -event tap-disable \
-       "u8500_tapdisable $_CHIPNAME.dap 0xc0"
+jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0xe -irmask 0xf -expected-id $_CPUTAPID -disable
+jtag configure $_CHIPNAME.cpu -event tap-enable \
+       "u8500_dapenable $_CHIPNAME.cpu"
+jtag configure $_CHIPNAME.cpu -event tap-disable \
+       "u8500_tapdisable $_CHIPNAME.cpu 0xc0"
 
 
 #CLTAPC TAP JRC equivalent
@@ -202,11 +202,9 @@ if { [info exists DAP_DBG2] } {
        set _DAP_DBG2 0x801AA000 
 }
 
-target create $_TARGETNAME_1 cortex_a8 -chain-position $_CHIPNAME.dap -dbgbase $_DAP_DBG1 -coreid 0
+dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu
 
-$_TARGETNAME_1 configure -event gdb-attach {
-       halt
-}
+target create $_TARGETNAME_1 cortex_a -dap $_CHIPNAME.dap -dbgbase $_DAP_DBG1 -coreid 0 -rtos linux
 
 
 if { ![info exists TARGETNAME_2] } {
@@ -217,11 +215,7 @@ global _TARGETNAME_2
 set _TARGETNAME_2 $TARGETNAME_2
 }
 
-target create $_TARGETNAME_2 cortex_a8 -chain-position $_CHIPNAME.dap -dbgbase $_DAP_DBG2 -coreid 1
-
-$_TARGETNAME_2 configure -event gdb-attach {
-       halt
-}
+target create $_TARGETNAME_2 cortex_a -dap $_CHIPNAME.dap -dbgbase $_DAP_DBG2 -coreid 1 -rtos linux
 
 
 if {![info exists SMP]} {