Initial arm64 / aarch64 support

[grml-live.git] / templates / boot / grub / addons.cfg

diff --git a/templates/boot/grub/addons.cfg b/templates/boot/grub/addons.cfg
index b4ce608..e0a3d26 100644 (file)
--- a/templates/boot/grub/addons.cfg
+++ b/templates/boot/grub/addons.cfg
@@ -2,18 +2,23 @@ submenu "Addons ->" --class=submenu {
 
 # EFI:
 if [ "${grub_platform}" == "efi" ] ; then
-  # try to detect amd64 by checking whether CPU supports 64-bit (long) mode
-  if cpuid -l ; then
-    if test -e /boot/addons/memtest86+x64.efi ; then
-      menuentry "Memory test (memtest86+x64.efi)" {
-        linuxefi /boot/addons/memtest86+x64.efi
-      }
-    fi
-  else # assume i386
-    if test -e /boot/addons/memtest86+x32.efi ; then
-      menuentry "Memory test (memtest86+x32.efi)" {
-        linuxefi /boot/addons/memtest86+x32.efi
-      }
+  # arm64 doesn't provide the cpuid command, and we also
+  # don't have any memtest* efi files available, so only
+  # run on architectures other than arm64 (amd64 + i386)
+  if [ "${grub_cpu}" != "arm64" ] ; then
+    # try to detect amd64 by checking whether CPU supports 64-bit (long) mode
+    if cpuid -l ; then
+      if test -e /boot/addons/memtest86+x64.efi ; then
+        menuentry "Memory test (memtest86+x64.efi)" {
+          linuxefi /boot/addons/memtest86+x64.efi
+        }
+      fi
+    else # assume i386
+      if test -e /boot/addons/memtest86+x32.efi ; then
+        menuentry "Memory test (memtest86+x32.efi)" {
+          linuxefi /boot/addons/memtest86+x32.efi
+        }
+      fi
     fi
   fi
 fi