Commit 070e1903 authored by Vladimir Serbinenko's avatar Vladimir Serbinenko
Browse files

Use console rather than serial_efi0 on arm64-efi in tests

parent 109189ce
...@@ -74,6 +74,7 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in ...@@ -74,6 +74,7 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
disk=0 disk=0
# To skip "Welcome to GRUB" and color setttings # To skip "Welcome to GRUB" and color setttings
trim=1 trim=1
serial_port=
;; ;;
powerpc-ieee1275) powerpc-ieee1275)
boot=hd boot=hd
...@@ -181,7 +182,7 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in ...@@ -181,7 +182,7 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
trim=1 trim=1
qemuopts="-machine virt -cpu cortex-a57 -bios /usr/share/qemu-efi/QEMU_EFI.fd $qemuopts" 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=" disk="device virtio-blk-device,drive=hd1 -drive if=none,id=hd1,file="
serial_port=efi0 serial_port=
;; ;;
arm-efi) arm-efi)
qemu=qemu-system-arm qemu=qemu-system-arm
...@@ -322,7 +323,7 @@ fi ...@@ -322,7 +323,7 @@ fi
if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = powerpc-ieee1275 ]; then if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = powerpc-ieee1275 ]; then
echo insmod escc >>${cfgfile} echo insmod escc >>${cfgfile}
fi fi
if [ "${grub_modinfo_platform}" != emu ]; then if [ "${serial_port}" != "" ]; then
echo "serial ${serial_port}" >>${cfgfile} echo "serial ${serial_port}" >>${cfgfile}
term="serial_${serial_port}" term="serial_${serial_port}"
else else
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment