From e42bcdcb3095346a4c653938f7e90fa3c80b292f Mon Sep 17 00:00:00 2001
From: Anton Midyukov <antohami@altlinux.org>
Date: Wed, 10 Jul 2019 12:44:40 +0700
Subject: [PATCH] 90-build-distro.mk, boot.mk, syslinux: add ARM64 EFI support
 for distro targets

---
 features.in/build-distro/lib/90-build-distro.mk   | 3 +++
 features.in/syslinux/stage1/scripts.d/01-syslinux | 2 +-
 lib/boot.mk                                       | 6 ++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/features.in/build-distro/lib/90-build-distro.mk b/features.in/build-distro/lib/90-build-distro.mk
index ac2ca53c..b3d34b51 100644
--- a/features.in/build-distro/lib/90-build-distro.mk
+++ b/features.in/build-distro/lib/90-build-distro.mk
@@ -32,6 +32,9 @@ endif
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 BOOT_TYPE := isolinux
 endif
+ifeq (,$(filter-out aarch64,$(ARCH)))
+BOOT_TYPE := grubaa64boot
+endif
 ifeq (,$(filter-out ppc64le,$(ARCH)))
 BOOT_TYPE := ieee1275boot
 endif
diff --git a/features.in/syslinux/stage1/scripts.d/01-syslinux b/features.in/syslinux/stage1/scripts.d/01-syslinux
index d61b0da5..693a1f58 100755
--- a/features.in/syslinux/stage1/scripts.d/01-syslinux
+++ b/features.in/syslinux/stage1/scripts.d/01-syslinux
@@ -10,7 +10,7 @@ cd "$WORKDIR/syslinux"
 
 # validate just in case (see also stage1 Makefile)
 case "$GLOBAL_BOOTLOADER" in
-	isolinux|syslinux|ieee1275boot) ;;
+	isolinux|syslinux|ieee1275boot|grubaa64boot) ;;
 	*) echo "error: weird GLOBAL_BOOTLOADER: \`$GLOBAL_BOOTLOADER'" >&2;
 	   exit 1;;
 esac
diff --git a/lib/boot.mk b/lib/boot.mk
index 6d69488e..ae82fad2 100644
--- a/lib/boot.mk
+++ b/lib/boot.mk
@@ -10,6 +10,12 @@ boot/iso: use/syslinux
 	@$(call set,BOOTLOADER,isolinux)
 endif
 
+# install aarch64 media bootloader
+ifeq (,$(filter-out aarch64,$(ARCH)))
+boot/iso:
+	@$(call set,BOOTLOADER,grubaa64boot)
+endif
+
 # firmware is the bootloader
 ifeq (,$(filter-out e2k%,$(ARCH)))
 boot/iso: