diff options
| author | Evan Green <evgreen@chromium.org> | 2019-11-18 10:51:04 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-02-28 22:10:01 +0000 |
| commit | 46ad4982f363f4f85aa0e6a7a15f63f4408695f6 (patch) | |
| tree | 8443fe29c2b69278748bb63932ed60621bbe4fcb | |
| parent | d7320ae24009f4001f043fd500be39f47d4a88b6 (diff) | |
| download | chrome-ec-46ad4982f363f4f85aa0e6a7a15f63f4408695f6.tar.gz | |
cr50_rma_open: Disable UART timestamps
The log timestamps are unexpected by the script, and cause issues.
Send a dut-control command to disable UART timestamps.
Also fix the regex in the board ID portion to accept a colon as well as
a comma, whichever comes first.
BUG=None
TEST=Try cr50_rma_unlock.py
BRANCH=None
Change-Id: Ie9e54e65b86c52aef120fa3249453bfc090cf6f0
Signed-off-by: Evan Green <evgreen@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1921703
Reviewed-by: Mary Ruthven <mruthven@chromium.org>
(cherry picked from commit 2f814c9a297f2be7a508676a17052c7fe652c1d2)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2080632
Tested-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-by: Namyoon Woo <namyoon@chromium.org>
Commit-Queue: Mary Ruthven <mruthven@chromium.org>
| -rwxr-xr-x[-rw-r--r--] | extra/cr50_rma_open/cr50_rma_open.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/extra/cr50_rma_open/cr50_rma_open.py b/extra/cr50_rma_open/cr50_rma_open.py index 1cc90dca5d..920b21a77d 100644..100755 --- a/extra/cr50_rma_open/cr50_rma_open.py +++ b/extra/cr50_rma_open/cr50_rma_open.py @@ -165,6 +165,7 @@ class RMAOpen(object): self.servo_port = servo_port if servo_port else '9999' self.print_caps = print_caps self.ip = ip + self._dut_control('cr50_uart_timestamp:off') if device: self.set_cr50_device(device) elif servo_port: @@ -580,7 +581,7 @@ class RMAOpen(object): def print_platform_info(self): """Print the cr50 BID RLZ code""" bid_output = self.send_cmd_get_output('bid') - bid = re.search('Board ID: (\S+),', bid_output).group(1) + bid = re.search('Board ID: (\S+?)[:,]', bid_output).group(1) if bid == ERASED_BID: debug(DEBUG_ERASED_BOARD_ID) raise ValueError('Cannot run RMA Open when board id is erased') |