smp: move command deprecation to startup.tcl

Commit 246782229f8f ("smp: replace commands smp_on/smp_off with
"smp [on|off]"") deprecates some multi-word comments, when openocd
was unable to properly handle mixes of multi-word commands and tcl
procedures having a common initial word.
This limitation is over, so move in startup.tcl the multi-word
commands deprecation, making it easy to remove them after a grace
period.

Change-Id: Icb550d1fa7559b95692d2a1244880da6c90ec0b2
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5677
Tested-by: jenkins

diff --git a/src/target/smp.c b/src/target/smp.c
index acd4628e2e92933c3724d3aec1eb588a6a8415da..6501dc08a790982cb5c88a2c6536e9f38187014f 100644 (file)
--- a/src/target/smp.c
+++ b/src/target/smp.c
@@ -131,26 +131,6 @@ COMMAND_HANDLER(default_handle_smp_command)
        return ERROR_COMMAND_SYNTAX_ERROR;
 }
 
-COMMAND_HANDLER(deprecated_handle_smp_on_command)
-{
-       const char *argv[] = {"on", NULL};
-
-       LOG_WARNING("\'smp_on\' is deprecated, please use \'smp on\' instead.");
-       CMD_ARGC = 1;
-       CMD_ARGV = argv;
-       return CALL_COMMAND_HANDLER(default_handle_smp_command);
-}
-
-COMMAND_HANDLER(deprecated_handle_smp_off_command)
-{
-       const char *argv[] = {"off", NULL};
-
-       LOG_WARNING("\'smp_off\' is deprecated, please use \'smp off\' instead.");
-       CMD_ARGC = 1;
-       CMD_ARGV = argv;
-       return CALL_COMMAND_HANDLER(default_handle_smp_command);
-}
-
 COMMAND_HANDLER(handle_smp_gdb_command)
 {
        struct target *target = get_current_target(CMD_CTX);
@@ -180,20 +160,6 @@ const struct command_registration smp_command_handlers[] = {
                .help = "smp handling",
                .usage = "[on|off]",
        },
-       {
-               .name = "smp_on",
-               .handler = deprecated_handle_smp_on_command,
-               .mode = COMMAND_EXEC,
-               .help = "Restart smp handling",
-               .usage = "",
-       },
-       {
-               .name = "smp_off",
-               .handler = deprecated_handle_smp_off_command,
-               .mode = COMMAND_EXEC,
-               .help = "Stop smp handling",
-               .usage = "",
-       },
        {
                .name = "smp_gdb",
                .handler = handle_smp_gdb_command,

diff --git a/src/target/startup.tcl b/src/target/startup.tcl
index a8f78ab49f59560274362817afeded4549b33fc3..f128d3b5e2a470b6d1496ededc05f7bfe8c65e44 100644 (file)
--- a/src/target/startup.tcl
+++ b/src/target/startup.tcl
@@ -206,3 +206,34 @@ 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 {} {
 }
+
+# smp_on/smp_off were already DEPRECATED in v0.11.0 through http://openocd.zylin.com/4615
+proc "aarch64 smp_on" {args} {
+       echo "DEPRECATED! use 'aarch64 smp on' not 'aarch64 smp_on'"
+       eval aarch64 smp on $args
+}
+
+proc "aarch64 smp_off" {args} {
+       echo "DEPRECATED! use 'aarch64 smp off' not 'aarch64 smp_off'"
+       eval aarch64 smp off $args
+}
+
+proc "cortex_a smp_on" {args} {
+       echo "DEPRECATED! use 'cortex_a smp on' not 'cortex_a smp_on'"
+       eval cortex_a smp on $args
+}
+
+proc "cortex_a smp_off" {args} {
+       echo "DEPRECATED! use 'cortex_a smp off' not 'cortex_a smp_off'"
+       eval cortex_a smp off $args
+}
+
+proc "mips_m4k smp_on" {args} {
+       echo "DEPRECATED! use 'mips_m4k smp on' not 'mips_m4k smp_on'"
+       eval mips_m4k smp on $args
+}
+
+proc "mips_m4k smp_off" {args} {
+       echo "DEPRECATED! use 'mips_m4k smp off' not 'mips_m4k smp_off'"
+       eval mips_m4k smp off $args
+}