vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Tests: Support arm-efi

Browse source
This commit is contained in:
Vladimir Serbinenko 2016-01-08 09:49:08 +01:00
parent e4c49cab9b
commit b4787552b0
7 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/ahci_test.in
View file

@ -30,7 +30,7 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
mips*-arc | mips*-qemu_mips) mips*-arc | mips*-qemu_mips)
exit 0;; exit 0;;
# FIXME: No native drivers are available for those # FIXME: No native drivers are available for those
powerpc-ieee1275 | sparc64-ieee1275 | arm64-efi) powerpc-ieee1275 | sparc64-ieee1275 | arm*-efi)
exit 0;; exit 0;;
esac esac

2
tests/ehci_test.in
View file

@ -30,7 +30,7 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
mips*-arc | mips*-qemu_mips) mips*-arc | mips*-qemu_mips)
exit 0;; exit 0;;
# FIXME: No native drivers are available for those # FIXME: No native drivers are available for those
powerpc-ieee1275 | sparc64-ieee1275 | arm64-efi) powerpc-ieee1275 | sparc64-ieee1275 | arm*-efi)
exit 0;; exit 0;;
esac esac

2
tests/ohci_test.in
View file

@ -30,7 +30,7 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
mips*-arc | mips*-qemu_mips) mips*-arc | mips*-qemu_mips)
exit 0;; exit 0;;
# FIXME: No native drivers are available for those # FIXME: No native drivers are available for those
powerpc-ieee1275 | sparc64-ieee1275 | arm64-efi) powerpc-ieee1275 | sparc64-ieee1275 | arm*-efi)
exit 0;; exit 0;;
esac esac

3
tests/partmap_test.in
View file

@ -88,6 +88,9 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
mipsel-arc) mipsel-arc)
disk=arc/scsi0/disk0/rdisk0 disk=arc/scsi0/disk0/rdisk0
;; ;;
arm*-efi)
disk=hd3
;;
*) *)
disk=hd0 disk=hd0
;; ;;

2
tests/pata_test.in
View file

@ -30,7 +30,7 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
*-arc) *-arc)
exit 0;; exit 0;;
# FIXME: No native drivers are available for those # FIXME: No native drivers are available for those
powerpc-ieee1275 | sparc64-ieee1275 | arm64-efi) powerpc-ieee1275 | sparc64-ieee1275 | arm*-efi)
exit 0;; exit 0;;
i386-ieee1275) i386-ieee1275)
disk=hdb disk=hdb

2
tests/uhci_test.in
View file

@ -30,7 +30,7 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
mips*-arc | mips*-qemu_mips) mips*-arc | mips*-qemu_mips)
exit 0;; exit 0;;
# FIXME: No native drivers are available for those # FIXME: No native drivers are available for those
powerpc-ieee1275 | sparc64-ieee1275 | arm64-efi) powerpc-ieee1275 | sparc64-ieee1275 | arm*-efi)
exit 0;; exit 0;;
esac esac

15
tests/util/grub-shell.in
View file

@ -182,6 +182,15 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
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=efi0
;; ;;
arm-efi)
qemu=qemu-system-arm
boot=hd
console=console
trim=1
qemuopts="-machine virt -bios /usr/share/ovmf-arm/QEMU_EFI.fd $qemuopts"
disk="device virtio-blk-device,drive=hd1 -drive if=none,id=hd1,file="
serial_port=efi0
;;
*) *)
boot=hd boot=hd
qemu=qemu-system-i386 qemu=qemu-system-i386
@ -233,7 +242,7 @@ for option in "$@"; do
echo "(hd$disk) $dsk" >> "$device_map" echo "(hd$disk) $dsk" >> "$device_map"
disk="$((disk+1))" disk="$((disk+1))"
else else
if [ $disk = error ]; then if [ "$disk" = error ]; then
echo "Too many disks" 1>&2 echo "Too many disks" 1>&2
exit 1; exit 1;
fi fi
@ -370,7 +379,7 @@ if [ x$boot != xnet ] && [ x$boot != xemu ]; then
${files} >/dev/null 2>&1 ${files} >/dev/null 2>&1
fi fi
if [ x$boot = xhd ]; then if [ x$boot = xhd ]; then
if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = arm64-efi ]; then if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = arm64-efi ] || [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = arm-efi ]; then
device="device virtio-blk-device,drive=hd0 -drive if=none,id=hd0,file=" device="device virtio-blk-device,drive=hd0 -drive if=none,id=hd0,file="
elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = mips-arc ]; then elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = mips-arc ]; then
device="hdb " device="hdb "
@ -380,7 +389,7 @@ if [ x$boot = xhd ]; then
bootdev="-boot c" bootdev="-boot c"
fi fi
if [ x$boot = xcd ]; then if [ x$boot = xcd ]; then
if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = arm64-efi ]; then if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = arm64-efi ] || [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = arm-efi ]; then
device="device virtio-blk-device,drive=cd0 -drive if=none,id=cd0,media=cdrom,file=" device="device virtio-blk-device,drive=cd0 -drive if=none,id=cd0,media=cdrom,file="
elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = powerpc-ieee1275 ] && [ x$pseries != xy ] ; then elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = powerpc-ieee1275 ] && [ x$pseries != xy ] ; then
device="-drive if=ide,media=cdrom,file=" device="-drive if=ide,media=cdrom,file="