aboutsummaryrefslogtreecommitdiff
path: root/src/helper/options.c
diff options
context:
space:
mode:
authorTim Newsome <tim@sifive.com>2021-04-13 11:22:43 -0700
committerTim Newsome <tim@sifive.com>2021-04-13 11:26:25 -0700
commit7420382a4d9453bf4bf72f2e42728136f9a3b7bb (patch)
tree4aa04d3b401b9b9da8c29fda93e6ff23a70b29f1 /src/helper/options.c
parent05e962e03a9642f883c0a91c38409ba89ad4fa7c (diff)
parent0f06d943366154963c6f5eb70f52e70f64fe5c71 (diff)
downloadriscv-openocd-7420382a4d9453bf4bf72f2e42728136f9a3b7bb.zip
riscv-openocd-7420382a4d9453bf4bf72f2e42728136f9a3b7bb.tar.gz
riscv-openocd-7420382a4d9453bf4bf72f2e42728136f9a3b7bb.tar.bz2
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
Diffstat (limited to 'src/helper/options.c')
-rw-r--r--src/helper/options.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/helper/options.c b/src/helper/options.c
index 246c6a8..f996749 100644
--- a/src/helper/options.c
+++ b/src/helper/options.c
@@ -55,7 +55,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}
};
@@ -282,7 +281,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)
@@ -322,13 +321,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;