X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=tcl%2Ftarget%2Fu8500.cfg;h=5aee13541b9e21e1ec0fe616ad1df9c48f9e606b;hb=69ea481e0b3607085cc05cbc5ca41740c9f938f6;hp=f6e2091fa5a4e7f7f3c55336b956db34096f0b93;hpb=d2911627d236ecf3d4ee537fb4e3f17de77a60bb;p=fw%2Fopenocd

diff --git a/tcl/target/u8500.cfg b/tcl/target/u8500.cfg
index f6e2091fa..5aee13541 100644
--- a/tcl/target/u8500.cfg
+++ b/tcl/target/u8500.cfg
@@ -1,41 +1,41 @@
 #  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]
-	set cp [expr ($cp & ~1)]
+	set cp [expr {$cp & ~1}]
 	arm mcr 15 0 1 0 0 $cp
 }
 
 proc mmu_on {} {
 	set cp [arm mrc 15 0 1 0 0]
-	set cp [expr ($cp | 1)]
+	set cp [expr {$cp | 1}]
 	arm mcr 15 0 1 0 0 $cp
 }
 
 proc ocd_gdb_restart {target_id} {
-    global  _TARGETNAME_1
+    global _TARGETNAME_1
 	global _SMP
     targets $_TARGETNAME_1
-	if { [expr ($_SMP == 1)] } {
-	cortex_a8 smp_off
+	if { $_SMP == 1 } {
+	cortex_a smp off
 	}
 	rst_run
 	halt
-	if { [expr ($_SMP == 1)]} {
-	cortex_a8 smp_on
+	if { $_SMP == 1 } {
+	cortex_a smp on
 	}
 }
 
 proc smp_reg {} {
-	global  _TARGETNAME_1
-    global  _TARGETNAME_2
-    targets $_TARGETNAME_1 
+	global _TARGETNAME_1
+    global _TARGETNAME_2
+    targets $_TARGETNAME_1
 	echo "$_TARGETNAME_1"
 	set pc1 [reg pc]
 	set stck1 [reg sp_svc]
-	targets  $_TARGETNAME_2
+	targets $_TARGETNAME_2
 	echo "$_TARGETNAME_1"
 	set pc2 [reg pc]
 	set stck2 [reg sp_svc]
@@ -52,9 +52,9 @@ proc pwrsts { } {
 	irscan $_CHIPNAME.jrc 0x3a
 	drscan $_CHIPNAME.jrc 4 0
 	set pwrsts [drscan $_CHIPNAME.jrc 16 0]
-    echo "pwrsts ="$pwrsts
-    set a9 [expr (0x$pwrsts & 0xc)]
-	set ape [expr (0x$pwrsts & 0x3)]
+	echo "pwrsts ="$pwrsts
+	set a9 [expr "0x$pwrsts & 0xc"]
+	set ape [expr "0x$pwrsts & 0x3"]
 	if {[string equal "0" $ape]} {
 		echo "ape off"
 	} else {
@@ -68,7 +68,7 @@ proc pwrsts { } {
 		8 {
 			echo "A9 100% DVFS"
 		  }
-		c { 
+		c {
 			echo "A9 50% DVFS"
 		}
 	}
@@ -79,14 +79,14 @@ proc poll_pwrsts { } {
 	set result 1
 	set i 0
 	irscan $_CHIPNAME.jrc 0x3a
-	drscan $_CHIPNAME.jrc 4 0 
-	set pwrsts [drscan $_CHIPNAME.jrc 16 0]    
-	set pwrsts [expr (0x$pwrsts & 0xc)]
+	drscan $_CHIPNAME.jrc 4 0
+	set pwrsts [drscan $_CHIPNAME.jrc 16 0]
+	set pwrsts [expr "0x$pwrsts & 0xc"]
 	while {[string equal "4" $pwrsts] && $i<20} {
 		irscan $_CHIPNAME.jrc 0x3a
-		drscan $_CHIPNAME.jrc 4 0; 
-		set pwrsts [drscan $_CHIPNAME.jrc 16 0]    
-		set pwrsts [expr (0x$pwrsts & 0xc)]
+		drscan $_CHIPNAME.jrc 4 0;
+		set pwrsts [drscan $_CHIPNAME.jrc 16 0]
+		set pwrsts [expr "0x$pwrsts & 0xc"]
 		if {![string equal "4" $pwrsts]} {
 			set result 1
 		} else {
@@ -100,7 +100,7 @@ proc poll_pwrsts { } {
 }
 
 proc halt_ { } {
-	if {[poll_pwrsts]==1} { 
+	if {[poll_pwrsts]==1} {
 		halt
 	} else {
 		echo "halt failed : target in retention"
@@ -117,12 +117,12 @@ proc u8500_tapdisable {chip val} {
 
 
 proc enable_apetap {} {
-	global  _CHIPNAME
-	global _TARGETNAME_2 
+	global _CHIPNAME
+	global _TARGETNAME_2
     global _TARGETNAME_1
 	poll off
 	irscan $_CHIPNAME.jrc 0x3e
-	drscan $_CHIPNAME.jrc 8 0xcf 
+	drscan $_CHIPNAME.jrc 8 0xcf
 	jtag tapenable $_CHIPNAME.dap
 	irscan $_CHIPNAME.jrc 0x6
 	drscan $_CHIPNAME.jrc 32 0
@@ -131,7 +131,9 @@ proc enable_apetap {} {
 	set status [$_TARGETNAME_1 curstate]
     if {[string equal "unknown" $status]} {
 	$_TARGETNAME_1 arp_examine
+	cache_config l2x 0xa0412000 8
 	}
+
 	set status [$_TARGETNAME_2 curstate]
     if {[string equal "unknown" $status]} {
 	$_TARGETNAME_2 arp_examine
@@ -141,39 +143,39 @@ proc enable_apetap {} {
 tcl_port 5555
 telnet_port 4444
 gdb_port 3333
- 
-if { [info exists CHIPNAME] } {	
-global _CHIPNAME 
-    set  _CHIPNAME $CHIPNAME    
+
+if { [info exists CHIPNAME] } {
+global _CHIPNAME
+    set _CHIPNAME $CHIPNAME
 } else {
-global _CHIPNAME 
-	set  _CHIPNAME u8500
+global _CHIPNAME
+	set _CHIPNAME u8500
 }
 
-if { [info exists ENDIAN] } {	
-	set  _ENDIAN $ENDIAN    
-} else {	 
+if { [info exists ENDIAN] } {
+	set _ENDIAN $ENDIAN
+} else {
  # this defaults to a bigendian
-	set  _ENDIAN little
+	set _ENDIAN little
 }
 
 
 
 # Subsidiary TAP: APE with scan chains for ARM Debug, EmbeddedICE-RT,
-if { [info exists CPUTAPID ] } {
+if { [info exists CPUTAPID] } {
    set _CPUTAPID $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
-if { [info exists CLTAPC_ID ] } {
+if { [info exists CLTAPC_ID] } {
    set _CLTAPC_ID $CLTAPC_ID
 } else {
    set _CLTAPC_ID 0x22286041
@@ -181,45 +183,39 @@ if { [info exists CLTAPC_ID ] } {
 jtag newtap $_CHIPNAME jrc -irlen 6 -ircapture 0x6 -irmask 0xf -expected-id $_CLTAPC_ID -ignore-version
 
 
-if { ![info exists TARGETNAME_1 ] } {
-global  _TARGETNAME_1
+if { ![info exists TARGETNAME_1] } {
+global _TARGETNAME_1
 set _TARGETNAME_1 $_CHIPNAME.cpu1
 } else {
-global  _TARGETNAME_1
+global _TARGETNAME_1
 set _TARGETNAME_1 $TARGETNAME_1
 }
 
-if { [info exists  DAP_DBG1] } {
+if { [info exists DAP_DBG1] } {
 	set _DAP_DBG1 $DAP_DBG1
 } else {
-	set _DAP_DBG1 0x801A8000 
+	set _DAP_DBG1 0x801A8000
 }
-if { [info exists  DAP_DBG2] } {
+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 ] } {
-global  _TARGETNAME_2
+if { ![info exists TARGETNAME_2] } {
+global _TARGETNAME_2
 set _TARGETNAME_2 $_CHIPNAME.cpu2
 } else {
-global  _TARGETNAME_2
+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]} {
@@ -230,17 +226,20 @@ global _SMP
 set _SMP $SMP
 }
 global SMP
-if { $_SMP == 1} { 
+if { $_SMP == 1} {
 target smp $_CHIPNAME.cpu2 $_CHIPNAME.cpu1
 }
 
+
+
+
 proc secsts1 { } {
 	global _CHIPNAME
         irscan $_CHIPNAME.jrc 0x3a
 		drscan $_CHIPNAME.jrc 4 4
 	set secsts1 [drscan $_CHIPNAME.jrc 16 0]
 	echo "secsts1 ="$secsts1
-	set secsts1 [expr (0x$secsts1 & 0x4)]
+	set secsts1 [expr "0x$secsts1 & 0x4"]
 	if {![string equal "4" $secsts1]} {
 	echo "APE target secured"
         } else {
@@ -255,7 +254,7 @@ proc att { } {
 	drscan $_CHIPNAME.jrc 4 4
 	set secsts1 [drscan $_CHIPNAME.jrc 16 0]
 	echo "secsts1 ="$secsts1
-	set secsts1 [expr (0x$secsts1 & 0x4)]
+	set secsts1 [expr "0x$secsts1 & 0x4"]
 	if {[string equal "4" $secsts1]} {
 		if {[poll_pwrsts]==1} {
 		enable_apetap
@@ -265,6 +264,7 @@ proc att { } {
 	} else {
 		echo "target secured"
 	}
+
 }
 
 
@@ -291,13 +291,13 @@ proc rst_run { } {
 	drscan $_CHIPNAME.jrc 4 4
 	set secsts1 [drscan $_CHIPNAME.jrc 16 0]
 	echo "secsts1 ="$secsts1
-	set secsts1 [expr (0x$secsts1 & 0x4)]
+	set secsts1 [expr "0x$secsts1 & 0x4"]
 	while {![string equal "4" $secsts1]} {
 		irscan u8500.jrc 0x3a
 		drscan u8500.jrc 4 4
 		set secsts1 [drscan $_CHIPNAME.jrc 16 0]
 		echo "secsts1 ="$secsts1
-		set secsts1 [expr (0x$secsts1 & 0x4)]
+		set secsts1 [expr "0x$secsts1 & 0x4"]
 	}
 	echo "ape debugable"
 	enable_apetap
@@ -310,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
@@ -322,5 +322,3 @@ set mem inaccessible-by-default-off
 
 jtag_ntrst_delay 100
 reset_config trst_and_srst combined
-
-