X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2Fstartup.tcl;h=eb965e009d2fd74b2795044f882fcdcb2137ffb9;hb=2136238908840dd230854cb5d78b8da181ca7340;hp=f91ba7ed521c9fa4f3de94b43078e613fc0abf14;hpb=3de3de0b37ec1bec5da7b3737a063fe28c332d46;p=openocd.git

diff --git a/src/helper/startup.tcl b/src/helper/startup.tcl
index f91ba7ed52..eb965e009d 100644
--- a/src/helper/startup.tcl
+++ b/src/helper/startup.tcl
@@ -100,37 +100,6 @@ proc new_target_name { } {
 	return [target number [expr [target count] - 1 ]]
 }
 
-
-proc target_script {target_num eventname scriptname} {
-
-	set tname [target number $target_num]
-	
-	if { 0 == [string compare $eventname "reset"] } {
-		$tname configure -event reset-init "script $scriptname"
-		return
-	}
-
-	if { 0 == [string compare $eventname "post_reset"] } {
-		$tname configure -event reset-init "script $scriptname"
-		return
-	}
-
-	if { 0 == [string compare $eventname "pre_reset"] } {
-		$tname configure -event reset-start "script $scriptname"
-		return
-	}
-
-	if { 0 == [string compare $eventname "gdb_program_config"] } {
-		$tname configure -event old-gdb_program_config "script $scriptname"
-		return
-	}
-
-	return -code error "Unknown target (old) event: $eventname (try $tname configure -event NAME)"
-
-}
-
-add_help_text target_script "DEPRECATED please see the new TARGETNAME configure -event interface"
-
 # Try flipping / and \ to find file if the filename does not
 # match the precise spelling
 proc find {filename} {
@@ -277,19 +246,6 @@ proc production_test {} {
 }
 add_help_text production "Runs test procedure. Throws exception if procedure failed. Prints progress messages. Implement in target script."
 
-proc load {args} {
-	return [eval "load_image $args"]
-}
-add_help_text load "synonym to load_image"
-
-proc verify {args} {
-	return [eval "verify_image $args"]
-}
-
-add_help_text verify "synonym to verify_image"
-
-
-
 add_help_text cpu "<name> - prints out target options and a comment on CPU which matches name"
 
 # A list of names of CPU and options required
@@ -347,3 +303,11 @@ add_help_text srst_deasserted "Overridable procedure run when srst deassert is d
 proc srst_asserted {} {
 	puts "Sensed nSRST asserted."
 }
+
+# catch any exceptions, capture output and return output
+proc capture_catch {a} {
+	catch {
+		capture {uplevel $a}
+	} result
+	return $result 
+}