fwgdb: update to new servod rc logic
The logic and API for servod RC support (environment variables, and
rcfile) changed to something simpler. This change makes sure fwgdb uses
the right API.
A change on the servo_parsing side renamed the class containing the RC
parsing and processing logic for _ServodRCParser to ServodRCParser.
This change updates fwgdb to have that change as well.
Exempt-From-Owner-Approval: tool seems to be mainly used by Julius who reviewed the changes. Furthermore, it's not a functional change, rather conforming with changing APIs underneath the tool.
BUG=chromium:841121
TEST=None yet
Cq-Depend: chromium:1753623
Change-Id: I347be35dc9bd71464b6d12d0d29e13b0d4771b5a
Signed-off-by: Ruben Rodriguez Buchillon <coconutruben@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1369465
Reviewed-by: Julius Werner <jwerner@chromium.org>
diff --git a/scripts/fwgdb.py b/scripts/fwgdb.py
index c3e516d..f2691bb 100644
--- a/scripts/fwgdb.py
+++ b/scripts/fwgdb.py
@@ -69,25 +69,21 @@
parser.add_argument('-e', '--execute', action='append', default=[],
help='GDB command to run after connect (can be supplied '
'multiple times)')
- name_flags = ['-n', '--servod-name']
- parser.add_argument(*name_flags, dest='name')
- parser.add_argument('--servod-rcfile', default=servo_parsing.DEFAULT_RC_FILE)
+ parser.add_argument('--servod-rcfile', default=servo_parsing.DEFAULT_RC_FILE,
+ dest='rcfile')
parser.add_argument('--servod-server')
+ # Add --name for rc servod configuration.
+ servo_parsing.ServodRCParser.AddRCEnabledNameArg(parser)
+ # Add |port_flags| as the port arguments.
port_flags = ['-p', '--servod-port']
- parser.add_argument(*port_flags, type=int, dest='port')
+ servo_parsing.BaseServodParser.AddRCEnabledPortArg(parser,
+ port_flags=port_flags)
parser.add_argument('-t', '--tty',
help='TTY file to connect to (defaults to cpu_uart_pty)')
-
- # Retrieve port from environment variable if not already in cmdline args.
- servo_parsing.BaseServodParser.HandlePortEnvVar(cmdline=argv,
- pri_flags=port_flags)
- # Retrieve name from environment variable if not already in cmdline args.
- servo_parsing._ServodRCParser.HandleNameEnvVar(cmdline=argv,
- pri_flags=name_flags)
opts = parser.parse_args(argv)
# Set |.port| and |.board| in |opts| if there's a rc match for opts.name.
- servo_parsing._ServodRCParser.PostProcessRCElements(opts, opts.servod_rcfile)
+ servo_parsing.ServodRCParser.PostProcessRCElements(opts)
if not opts.servod_server:
opts.servod_server = client.DEFAULT_HOST