X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fstartup.tcl;h=cf2813ba856fc440aba78dca884baf00ee794b7f;hb=b2dc1af59a4cead2bd9446256ef31658b2a5de61;hp=b597b84d15e7ec575e7e05a33ad08f274ab57a65;hpb=47cb10217a7bc4b97fa169a821db05f40bc2e51d;p=openocd.git

diff --git a/src/target/startup.tcl b/src/target/startup.tcl
index b597b84d15..cf2813ba85 100644
--- a/src/target/startup.tcl
+++ b/src/target/startup.tcl
@@ -41,7 +41,7 @@ proc ocd_process_reset_inner { MODE } {
 		set halt 0;
 	}
 	if { $halt < 0 } {
-		return -error "Invalid mode: $MODE, must be one of: halt, init, or run";
+		return -code error "Invalid mode: $MODE, must be one of: halt, init, or run";
 	}
 
 	# Target event handlers *might* change which TAPs are enabled
@@ -63,8 +63,12 @@ proc ocd_process_reset_inner { MODE } {
 
 	# Examine all targets on enabled taps.
 	foreach t $targets {
-		if {[jtag tapisenabled [$t cget -chain-position]]} {
-			$t arp_examine
+		if {![using_jtag] || [jtag tapisenabled [$t cget -chain-position]]} {
+			$t invoke-event examine-start
+			set err [catch "$t arp_examine"]
+			if { $err == 0 } {
+				$t invoke-event examine-end
+			}
 		}
 	}
 
@@ -75,7 +79,7 @@ proc ocd_process_reset_inner { MODE } {
 	}
 	foreach t $targets {
 		# C code needs to know if we expect to 'halt'
-		if {[jtag tapisenabled [$t cget -chain-position]]} {
+		if {![using_jtag] || [jtag tapisenabled [$t cget -chain-position]]} {
 			$t arp_reset assert $halt
 		}
 	}
@@ -90,7 +94,7 @@ proc ocd_process_reset_inner { MODE } {
 	}
 	foreach t $targets {
 		# Again, de-assert code needs to know if we 'halt'
-		if {[jtag tapisenabled [$t cget -chain-position]]} {
+		if {![using_jtag] || [jtag tapisenabled [$t cget -chain-position]]} {
 			$t arp_reset deassert $halt
 		}
 	}
@@ -103,7 +107,7 @@ proc ocd_process_reset_inner { MODE } {
 	# first executing any instructions.
 	if { $halt } {
 		foreach t $targets {
-			if {[jtag tapisenabled [$t cget -chain-position]] == 0} {
+			if {[using_jtag] && ![jtag tapisenabled [$t cget -chain-position]]} {
 				continue
 			}
 
@@ -119,7 +123,7 @@ proc ocd_process_reset_inner { MODE } {
 			set s [$t curstate]
 
 			if { 0 != [string compare $s "halted" ] } {
-				return -error [format "TARGET: %s - Not halted" $t]
+				return -code error [format "TARGET: %s - Not halted" $t]
 			}
 		}
 	}
@@ -127,7 +131,7 @@ proc ocd_process_reset_inner { MODE } {
 	#Pass 2 - if needed "init"
 	if { 0 == [string compare init $MODE] } {
 		foreach t $targets {
-			if {[jtag tapisenabled [$t cget -chain-position]] == 0} {
+			if {[using_jtag] && ![jtag tapisenabled [$t cget -chain-position]]} {
 				continue
 			}
 
@@ -144,6 +148,21 @@ proc ocd_process_reset_inner { MODE } {
 	}
 }
 
+proc using_jtag {} {
+	set _TRANSPORT [ transport select ]
+	expr { [ string first "jtag" $_TRANSPORT ] != -1 }
+}
+
+proc using_swd {} {
+	set _TRANSPORT [ transport select ]
+	expr { [ string first "swd" $_TRANSPORT ] != -1 }
+}
+
+proc using_hla {} {
+	set _TRANSPORT [ transport select ]
+	expr { [ string first "hla" $_TRANSPORT ] != -1 }
+}
+
 #########
 
 # Temporary migration aid.  May be removed starting in January 2011.
@@ -151,3 +170,41 @@ proc armv4_5 params {
 	echo "DEPRECATED! use 'arm $params' not 'armv4_5 $params'"
 	arm $params
 }
+
+# Target/chain configuration scripts can either execute commands directly
+# or define a procedure which is executed once all configuration
+# scripts have completed.
+#
+# By default(classic) the config scripts will set up the target configuration
+proc init_targets {} {
+}
+
+proc set_default_target_event {t e s} {
+	if {[$t cget -event $e] == ""} {
+		$t configure -event $e $s
+	}
+}
+
+proc init_target_events {} {
+	set targets [target names]
+
+	foreach t $targets {
+		set_default_target_event $t gdb-flash-erase-start "reset init"
+		set_default_target_event $t gdb-flash-write-end "reset halt"
+	}
+}
+
+# Additionally board config scripts can define a procedure init_board that will be executed after init and init_targets
+proc init_board {} {
+}
+
+# deprecated target name cmds
+proc cortex_m3 args {
+	echo "DEPRECATED! use 'cortex_m' not 'cortex_m3'"
+	eval cortex_m $args
+}
+
+proc cortex_a8 args {
+	echo "DEPRECATED! use 'cortex_a' not 'cortex_a8'"
+	eval cortex_a $args
+}