From 70ead8ff5d2af43aa79fbc14f80fe370d569df52 Mon Sep 17 00:00:00 2001
From: Antonio Borneo <borneo.antonio@gmail.com>
Date: Sat, 31 Oct 2020 23:58:33 +0100
Subject: [PATCH] startup.tcl: remove commands already deprecated in v0.7.0

Some command were already marked as deprecated in release v0.7.0,
more then 7 years ago, and for some of them the depredation date
is even earlier.
We can reasonably expect that in these 7 years any user of OpenOCD
has already migrated to v0.7.0 or to some following intermediate
build, thus has already updated any local/personal script to get
rid of the deprecated message.

Drop the commands already deprecated in v0.7.0.

Change-Id: I81cdc415ab855ebf30980ef5199f9780c5d7f932
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/6085
Tested-by: jenkins
Reviewed-by: Tarek BOCHKATI <tarek.bouchkati@gmail.com>
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
---
 src/flash/startup.tcl  | 11 -----------
 src/jtag/startup.tcl   | 43 +-----------------------------------------
 src/target/startup.tcl | 17 -----------------
 3 files changed, 1 insertion(+), 70 deletions(-)

diff --git a/src/flash/startup.tcl b/src/flash/startup.tcl
index 280a059a3f..7d9dbc7daf 100644
--- a/src/flash/startup.tcl
+++ b/src/flash/startup.tcl
@@ -119,14 +119,3 @@ proc stm32g4x args { eval stm32l4x $args }
 proc stm32l5x args { eval stm32l4x $args }
 proc stm32wbx args { eval stm32l4x $args }
 proc stm32wlx args { eval stm32l4x $args }
-
-# ease migration to updated flash driver
-proc stm32x args {
-	echo "DEPRECATED! use 'stm32f1x $args' not 'stm32x $args'"
-	eval stm32f1x $args
-}
-
-proc stm32f2xxx args {
-	echo "DEPRECATED! use 'stm32f2x $args' not 'stm32f2xxx $args'"
-	eval stm32f2x $args
-}
diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index 82327a39b6..e5c3b0f75a 100644
--- a/src/jtag/startup.tcl
+++ b/src/jtag/startup.tcl
@@ -117,23 +117,8 @@ proc jtag_ntrst_assert_width args {
 # JTAG-specific names despite the fact that the operations were not
 # specific to JTAG, or otherwise had troublesome/misleading names.
 #
-# FIXME phase these aids out after about April 2011
+# FIXME phase these aids out after some releases
 #
-proc jtag_khz args {
-	echo "DEPRECATED! use 'adapter speed' not 'jtag_khz'"
-	eval adapter speed $args
-}
-
-proc jtag_nsrst_delay args {
-	echo "DEPRECATED! use 'adapter srst delay' not 'jtag_nsrst_delay'"
-	eval adapter srst delay $args
-}
-
-proc jtag_nsrst_assert_width args {
-	echo "DEPRECATED! use 'adapter srst pulse_width' not 'jtag_nsrst_assert_width'"
-	eval adapter srst pulse_width $args
-}
-
 proc jtag_reset args {
 	echo "DEPRECATED! use 'adapter \[de\]assert' not 'jtag_reset'"
 	switch $args {
@@ -150,32 +135,6 @@ proc jtag_reset args {
 	}
 }
 
-# stlink migration helpers
-proc stlink_device_desc args {
-	echo "DEPRECATED! use 'hla_device_desc' not 'stlink_device_desc'"
-	eval hla_device_desc $args
-}
-
-proc stlink_serial args {
-	echo "DEPRECATED! use 'hla_serial' not 'stlink_serial'"
-	eval hla_serial $args
-}
-
-proc stlink_layout args {
-	echo "DEPRECATED! use 'hla_layout' not 'stlink_layout'"
-	eval hla_layout $args
-}
-
-proc stlink_vid_pid args {
-	echo "DEPRECATED! use 'hla_vid_pid' not 'stlink_vid_pid'"
-	eval hla_vid_pid $args
-}
-
-proc stlink args {
-	echo "DEPRECATED! use 'hla' not 'stlink'"
-	eval hla $args
-}
-
 proc adapter_khz args {
 	echo "DEPRECATED! use 'adapter speed' not 'adapter_khz'"
 	eval adapter speed $args
diff --git a/src/target/startup.tcl b/src/target/startup.tcl
index ca39b18161..a8f78ab49f 100644
--- a/src/target/startup.tcl
+++ b/src/target/startup.tcl
@@ -179,12 +179,6 @@ proc using_hla {} {
 
 #########
 
-# Temporary migration aid.  May be removed starting in January 2011.
-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.
@@ -212,14 +206,3 @@ proc init_target_events {} {
 # 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
-}
-- 
2.30.2