]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
Use console rather than serial_efi0 on arm64-efi in tests
authorVladimir Serbinenko <phcoder@gmail.com>
Fri, 26 Feb 2016 10:56:28 +0000 (11:56 +0100)
committerVladimir Serbinenko <phcoder@gmail.com>
Sat, 27 Feb 2016 12:35:36 +0000 (13:35 +0100)
tests/util/grub-shell.in

index 7848b4222b5f1c6266307a63b2da5cd815b9621c..ab19dbbf5ee4a0e8918ae45e02d269111218f7d8 100644 (file)
@@ -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