openocd: remove command line flag -p/--pipe deprecated in v0.5.0

The OpenOCD command line flag -p/--pipe was marked as deprecated
in release v0.5.0, more than 9 years ago.
We can reasonably expect that in these 9 years any user of OpenOCD
has already migrated to v0.5.0 or to some newer release, thus has
already updated any local/personal script to get rid of the
deprecated message.

Drop the command line flag already deprecated in v0.5.0.

Change-Id: I2faeb592ed2c2f67c2d3227f118093e39fcf4a8c
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/6084
Tested-by: jenkins
Reviewed-by: Tarek BOCHKATI <tarek.bouchkati@gmail.com>
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>

diff --git a/doc/openocd.texi b/doc/openocd.texi
index 640687da51ac3494fa1c6c37533e91acf0980bf0..34168fdaa846ea67a6f27fd92b08fcc781b5cb5c 100644 (file)
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -2155,9 +2155,6 @@ disables the gdb server.
 When using "pipe", also use log_output to redirect the log
 output to a file so as not to flood the stdin/out pipes.
 
-The -p/--pipe option is deprecated and a warning is printed
-as it is equivalent to passing in -c "gdb_port pipe; log_output openocd.log".
-
 Any other string is interpreted as named pipe to listen to.
 Output pipe is the same name as input pipe, but with 'o' appended,
 e.g. /var/gdb, /var/gdbo.

diff --git a/src/helper/options.c b/src/helper/options.c
index 0ccbf564246e5364c69c3a3e5ff69fb78ad29322..477d7b303db6fd253b979f4867347fb6f5095cb4 100644 (file)
--- a/src/helper/options.c
+++ b/src/helper/options.c
@@ -54,7 +54,6 @@ static const struct option long_options[] = {
        {"search",              required_argument,              0,                              's'},
        {"log_output",  required_argument,              0,                              'l'},
        {"command",             required_argument,              0,                              'c'},
-       {"pipe",                no_argument,                    0,                              'p'},
        {0, 0, 0, 0}
 };
 
@@ -281,7 +280,7 @@ int parse_cmdline_args(struct command_context *cmd_ctx, int argc, char *argv[])
                /* getopt_long stores the option index here. */
                int option_index = 0;
 
-               c = getopt_long(argc, argv, "hvd::l:f:s:c:p", long_options, &option_index);
+               c = getopt_long(argc, argv, "hvd::l:f:s:c:", long_options, &option_index);
 
                /* Detect the end of the options. */
                if (c == -1)
@@ -321,13 +320,6 @@ int parse_cmdline_args(struct command_context *cmd_ctx, int argc, char *argv[])
                                if (optarg)
                                    add_config_command(optarg);
                                break;
-                       case 'p':
-                               /* to replicate the old syntax this needs to be synchronous
-                                * otherwise the gdb stdin will overflow with the warning message */
-                               command_run_line(cmd_ctx, "gdb_port pipe; log_output openocd.log");
-                               LOG_WARNING("deprecated option: -p/--pipe. Use '-c \"gdb_port pipe; "
-                                               "log_output openocd.log\"' instead.");
-                               break;
                        default:  /* '?' */
                                /* getopt will emit an error message, all we have to do is bail. */
                                return ERROR_FAIL;