dut-console: update servo v4 and servo micro console names
The servo v4 and servo micro controls have changed from
servo_v4_console_pty and servo_console_pty to servo_v4_uart_pty and
servo_micro_uart_pty. All of the console names are now consistent it is
the console name _uart_pty. This change modifies dut-console to get the
pty_name by adding _uart_pty to the console flag.
BUG=none
CQ-DEPEND=CL:1368485
BRANCH=none
TEST=get servo v4 and servo micro consoles using dut-console
Change-Id: Ibcd72d3a070f8b99e5287dc7bca54ea3d9f3d49b
Signed-off-by: Mary Ruthven <mruthven@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1368624
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
diff --git a/contrib/dut-console b/contrib/dut-console
index b16d381..57e709c 100755
--- a/contrib/dut-console
+++ b/contrib/dut-console
@@ -39,7 +39,7 @@
'
DEFINE_string console "cpu" \
- "Opens a console, one of cpu, ec, cr50, fpmcu, servo, servo_v4" c
+ "Opens a console, one of cpu, ec, cr50, fpmcu, servo_micro, servo_v4" c
DEFINE_integer port "" "Servod port" p
DEFINE_boolean kdmx "${FLAGS_FALSE}" \
"Start kdmx proxy for kgdb (only makes sense for cpu console)" k
@@ -98,31 +98,7 @@
trap cleanup INT TERM ERR EXIT
- case "${FLAGS_console}" in
- cpu)
- pty_name=cpu_uart_pty
- ;;
- ec)
- pty_name=ec_uart_pty
- ;;
- cr50)
- pty_name=cr50_uart_pty
- ;;
- fpmcu)
- pty_name=fpmcu_uart_pty
- ;;
- servo)
- pty_name=servo_console_pty
- ;;
- servo_v4)
- pty_name=servo_v4_console_pty
- ;;
- *)
- flags_help
- exit 1
- ;;
- esac
-
+ pty_name="${FLAGS_console}_uart_pty"
pty="$(get_pty "${pty_name}" "${FLAGS_port}")"
if [[ ! -e "${pty}" ]]; then
