From 070e190305986dff1d528af08b964667f29dc914 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Fri, 26 Feb 2016 11:56:28 +0100 Subject: [PATCH] Use console rather than serial_efi0 on arm64-efi in tests --- tests/util/grub-shell.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in index 7848b4222..ab19dbbf5 100644 --- a/tests/util/grub-shell.in +++ b/tests/util/grub-shell.in @@ -74,6 +74,7 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in disk=0 # To skip "Welcome to GRUB" and color setttings trim=1 + serial_port= ;; powerpc-ieee1275) boot=hd @@ -181,7 +182,7 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in trim=1 qemuopts="-machine virt -cpu cortex-a57 -bios /usr/share/qemu-efi/QEMU_EFI.fd $qemuopts" disk="device virtio-blk-device,drive=hd1 -drive if=none,id=hd1,file=" - serial_port=efi0 + serial_port= ;; arm-efi) qemu=qemu-system-arm @@ -322,7 +323,7 @@ fi if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = powerpc-ieee1275 ]; then echo insmod escc >>${cfgfile} fi -if [ "${grub_modinfo_platform}" != emu ]; then +if [ "${serial_port}" != "" ]; then echo "serial ${serial_port}" >>${cfgfile} term="serial_${serial_port}" else