From 7d1f1b11dd8ac1d65455892a3ae075be5d39b8a7 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: add ARM64 EFI support for distro
 targets

# Conflicts:
#	features.in/build-distro/lib/90-build-distro.mk
---
 features.in/build-distro/lib/90-build-distro.mk | 3 +++
 lib/boot.mk                                     | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/features.in/build-distro/lib/90-build-distro.mk b/features.in/build-distro/lib/90-build-distro.mk
index ac2ca53c..e7bcbf80 100644
--- a/features.in/build-distro/lib/90-build-distro.mk
+++ b/features.in/build-distro/lib/90-build-distro.mk
@@ -35,6 +35,9 @@ endif
 ifeq (,$(filter-out ppc64le,$(ARCH)))
 BOOT_TYPE := ieee1275boot
 endif
+ifeq (,$(filter-out aarch64,$(ARCH)))
+BOOT_TYPE := grubaa64boot
+endif
 endif
 
 all: | $(GLOBAL_DEBUG) prep copy-subdirs copy-tree run-scripts pack-image \
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: