Skip to content

tf307_fwupd.py: Minor fixes #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iv-m wants to merge 1 commit into
base: master
Choose a base branch
from
Open

tf307_fwupd.py: Minor fixes #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions tf307_fwupd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import os
import time
import serial
import sys
import subprocess

MYDIR = os.path.dirname(os.path.abspath(__file__))
Expand Down Expand Up @@ -75,15 +74,15 @@ def guess_board_revision(bmc):
bmc.read_until() # discard echo
header = bmc.read_until().strip().decode('utf-8')
if header.lower() != AVAILABLE_PINS:
logger.error('got: "%s", expected "%s"', header, AVAILABLE_PINS)
logging.error('got: "%s", expected "%s"', header, AVAILABLE_PINS)
raise RuntimeError('Unexpected reply to "pins list"')

out = bmc.read_until(BMC_PROMPT)
pins_list = [line.decode('utf-8') for line in out.split(b'\r\n')]
for line in pins_list:
logging.debug('guess_board_revision: %s', line)
d_rx = re.compile('^11:\s*OUT\s+BM_SPI_SEL.*$')
ac_rx = re.compile('^07:\s*OUT\s+BM_SPI_SEL.*$')
d_rx = re.compile(r'^11:\s*OUT\s+BM_SPI_SEL.*$')
ac_rx = re.compile(r'^07:\s*OUT\s+BM_SPI_SEL.*$')
is_d = any(d_rx.match(line) is not None for line in pins_list)
is_ac = any(ac_rx.match(line) is not None for line in pins_list)

Expand Down Expand Up @@ -157,7 +156,7 @@ def finish(bmc):
if reply != b'\x1b[32mL: [SHELL] Starting boot sequence\x1b[0m\r\n':
logging.error('finish: unexpected reply "%s"', reply)
raise RuntimeError('Got "%s" as reply to "pins bootseq"' % reply)

expected = b'\x1b[32mL: [SHELL] Boot sequence finished\x1b[0m\r\n'
while reply != expected:
logging.info('finish: reading more BMC output')
Expand Down