memtest, grub: add EFI support

features.in/grub/cfg.in/90memtest_bios.cfg → features.in/grub/cfg.in/90memtest.cfg

 if [ "$grub_platform" = "pc" ]; then
   menuentry $"Memory Test" --id 'memtest' {
-    echo $"Loading memtest.bin ..."
-    linux16 /boot/memtest.bin
+    linux /boot/memtest.bin
+  }
+fi
+if [ "$grub_platform" = "efi" ]; then
+  menuentry $"Memory Test (may not work with Secure Boot" --id 'memtest' {
+    linux /boot/memtest.efi
   }
 fi

features.in/grub/cfg.in/90memtest_efi.cfg

-if [ "$grub_platform" = "efi" ]; then
-	menuentry $"Memory Test" --id 'memtest' {
-		chainloader /EFI/tools/memtest86.efi
-		boot
-	}
-fi

features.in/memtest/config.mk

@@ -3,7 +3,7 @@ use/memtest: use/syslinux use/grub
 	@$(call add_feature)
 	@$(call add,SYSTEM_PACKAGES,memtest86+)
 	@$(call add,SYSLINUX_CFG,memtest)
-	@$(call add,GRUB_CFG,memtest_bios)
+	@$(call add,GRUB_CFG,memtest)
 else
 use/memtest: ; @:
 endif

features.in/memtest/stage1/scripts.d/02-memtest

 #!/bin/sh
 
 mkdir -p "$WORKDIR"/boot
-MEMTEST="$(find /boot/ -name 'memtest*' -print -quit)"
+MEMTEST="$(find /boot/ -name 'memtest*.bin' -print -quit)"
+MEMTEST_EFI="$(find /boot/ -name 'memtest*.efi' -print -quit)"
 # hdt wiki recommends adding .bin
 [ -z "$MEMTEST" ] ||
 	cp -f "$MEMTEST" "$WORKDIR"/boot/memtest.bin
+
+[ -z "$GLOBAL_EFI_BOOTLOADER" ] || [ -z "$MEMTEST_EFI" ] ||
+	cp -f "$MEMTEST_EFI" "$WORKDIR"/boot/memtest.efi