Osstest/TestSupport: Use right arch for UEFI grub setup

This table was erroneously never used.  Also, the value for arm64 is
wrong: it should be AA64.  We fix the table value, and substitute it
in, for no overall change on amd64.  On other arches we now do not
hardcode the wrong value.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
CC: Julien Grall <julien.grall@linaro.org>

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 6d5e667844ec0394e2371344c3333a9dde1dfb06..8f798a3aac8a168fced1e18bbf0c1692231ba48d 100644 (file)
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -2634,7 +2634,7 @@ sub setup_netboot_local_uefi ($) {
     my ($ho) = @_;
     my %efi_archs = qw(amd64 X64
                        arm32 ARM
-                       arm64 AARCH64
+                       arm64 AA64
                        i386  IA32);
     die "EFI arch" unless $efi_archs{ $r{arch} };
     my $efi = $efi_archs{ $r{arch} };
@@ -2646,8 +2646,8 @@ menuentry 'local' {
   insmod part_gpt
   insmod part_msdos
   set root=(hd0,gpt1)
-  echo "Chainloading (\${root})/EFI/BOOT/BOOTAA64.EFI"
-  chainloader (\${root})/EFI/BOOT/BOOTAA64.EFI
+  echo "Chainloading (\${root})/EFI/BOOT/BOOT$efi.EFI"
+  chainloader (\${root})/EFI/BOOT/BOOT$efi.EFI
   boot
 }
 END