X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=tcl%2Ftarget%2Fu8500.cfg;h=36e0db71d20e08166f789fb3b37f7697e95f4a38;hb=9b32a06dad0aa6fc9c3896b21d3c32015487a090;hp=e1368740ef5592c5a46f7b0ad3eac9b46fd52331;hpb=ca45e700b1c57caca2ef08e665e3c7e3e02ac8d3;p=fw%2Fopenocd

diff --git a/tcl/target/u8500.cfg b/tcl/target/u8500.cfg
index e1368740e..36e0db71d 100644
--- a/tcl/target/u8500.cfg
+++ b/tcl/target/u8500.cfg
@@ -1,6 +1,6 @@
 #  Copyright (C) ST-Ericsson SA 2011
 #  Author : michel.jaouen@stericsson.com
-#  U8500 target 
+#  U8500 target
 
 proc mmu_off {} {
 	set cp [arm mrc 15 0 1 0 0]
@@ -19,19 +19,19 @@ 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
 	}
 }
 
 proc smp_reg {} {
 	global _TARGETNAME_1
     global _TARGETNAME_2
-    targets $_TARGETNAME_1 
+    targets $_TARGETNAME_1
 	echo "$_TARGETNAME_1"
 	set pc1 [reg pc]
 	set stck1 [reg sp_svc]
@@ -68,7 +68,7 @@ proc pwrsts { } {
 		8 {
 			echo "A9 100% DVFS"
 		  }
-		c { 
+		c {
 			echo "A9 50% DVFS"
 		}
 	}
@@ -144,7 +144,7 @@ tcl_port 5555
 telnet_port 4444
 gdb_port 3333
 
-if { [info exists CHIPNAME] } {	
+if { [info exists CHIPNAME] } {
 global _CHIPNAME
     set _CHIPNAME $CHIPNAME
 } else {
@@ -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
@@ -194,19 +194,17 @@ set _TARGETNAME_1 $TARGETNAME_1
 if { [info exists DAP_DBG1] } {
 	set _DAP_DBG1 $DAP_DBG1
 } else {
-	set _DAP_DBG1 0x801A8000 
+	set _DAP_DBG1 0x801A8000
 }
 if { [info exists DAP_DBG2] } {
 	set _DAP_DBG2 $DAP_DBG2
 } else {
-	set _DAP_DBG2 0x801AA000 
+	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]} {
@@ -232,7 +226,7 @@ global _SMP
 set _SMP $SMP
 }
 global SMP
-if { $_SMP == 1} { 
+if { $_SMP == 1} {
 target smp $_CHIPNAME.cpu2 $_CHIPNAME.cpu1
 }
 
@@ -270,7 +264,7 @@ proc att { } {
 	} else {
 		echo "target secured"
 	}
-	
+
 }
 
 
@@ -316,11 +310,11 @@ if {![info exists MAXSPEED]} {
 global _MAXSPEED
 set _MAXSPEED 15000
 } else {
-global _MAXSPEED 
+global _MAXSPEED
 set _MAXSPEED $MAXSPEED
 }
-global _MAXSPEED 
-adapter_khz $_MAXSPEED
+global _MAXSPEED
+adapter speed $_MAXSPEED
 
 
 gdb_breakpoint_override hard
@@ -328,5 +322,3 @@ set mem inaccessible-by-default-off
 
 jtag_ntrst_delay 100
 reset_config trst_and_srst combined
-
-