Merge branch 'master' into from_upstream

Conflicts:
	.github/workflows/snapshot.yml
	NEWS
	configure.ac
	contrib/loaders/checksum/riscv_crc.c
	jimtcl
	src/helper/time_support.h
	src/jtag/drivers/arm-jtag-ew.c
	src/rtos/FreeRTOS.c
	src/target/image.c
	src/target/riscv/riscv.c

Change-Id: I043624ba540d4672fc123dddb2066bcb9c6b5a05

1 files changed, 3 insertions, 44 deletions

diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index 82327a3..f1e69e5 100644
--- a/src/jtag/startup.tcl
+++ b/src/jtag/startup.tcl
@@ -29,7 +29,7 @@ proc init_reset { mode } {
 #########
 
 # TODO: power_restore and power_dropout are currently neither
-# documented nor supported except on ZY1000.
+# documented nor supported.
 
 proc power_restore {} {
 	echo "Sensed power restore, running reset init and halting GDB."
@@ -55,7 +55,7 @@ proc power_dropout {} {
 #########
 
 # TODO: srst_deasserted and srst_asserted are currently neither
-# documented nor supported except on ZY1000.
+# documented nor supported.
 
 proc srst_deasserted {} {
 	echo "Sensed nSRST deasserted, running reset init and halting GDB."
@@ -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