board_status: Don't fetch dmesg via SSH when run over serial

It doesn't make much sense to try and obtain dmesg via SSH if we're
using the serial port. Serial should only be used to obtain dmesg if
SSH is unavailable.

Change-Id: Iec70e64666f9446cf7e98a0fbcaa1cd5cefd8898
Signed-off-by: David Hendricks <david.hendricks@gmail.com>
Reviewed-on: https://review.coreboot.org/21567
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
David Hendricks 2017-09-16 18:43:08 -07:00 committed by Martin Roth
parent 82145a1275
commit 0dcfb59220
1 changed files with 4 additions and 5 deletions

View File

@ -146,8 +146,7 @@ get_serial_bootlog () {
echo echo
echo "Waiting to receive boot log from $TTY" echo "Waiting to receive boot log from $TTY"
echo "Press [Enter] when the boot is complete and the" echo "Press [Enter] when the boot is complete."
echo "system is ready for ssh to get the dmesg log."
echo echo
if [ $tput_not_available -eq 0 ]; then if [ $tput_not_available -eq 0 ]; then
@ -371,12 +370,12 @@ if [ -z "$SERIAL_DEVICE" ]; then
cmd $REMOTE "$cbmem_cmd -c" "${tmpdir}/${results}/coreboot_console.txt" cmd $REMOTE "$cbmem_cmd -c" "${tmpdir}/${results}/coreboot_console.txt"
echo "Getting timestamp data" echo "Getting timestamp data"
cmd_nonfatal $REMOTE "$cbmem_cmd -t" "${tmpdir}/${results}/coreboot_timestamps.txt" cmd_nonfatal $REMOTE "$cbmem_cmd -t" "${tmpdir}/${results}/coreboot_timestamps.txt"
else
get_serial_bootlog "$SERIAL_DEVICE" "$SERIAL_PORT_SPEED" "${tmpdir}/${results}/coreboot_console.txt"
fi
echo "Getting remote dmesg" echo "Getting remote dmesg"
cmd $REMOTE dmesg "${tmpdir}/${results}/kernel_log.txt" cmd $REMOTE dmesg "${tmpdir}/${results}/kernel_log.txt"
else
get_serial_bootlog "$SERIAL_DEVICE" "$SERIAL_PORT_SPEED" "${tmpdir}/${results}/coreboot_console.txt"
fi
# #
# Finish up. # Finish up.