From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 10 Jul 2018 17:10:14 +0000 (+0100)
Subject: cdrom: Fix building GRUB image for aarch64
X-Git-Tag: v2.21-core124~77^2~21
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=a1eb7761991af6515bd3b08f598454c7720119f8

cdrom: Fix building GRUB image for aarch64

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/lfs/Config b/lfs/Config
index bb2939078b..63ca295415 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -83,28 +83,26 @@ CCACHE_COMPILERCHECK += $(shell gcc -dumpspecs 2>/dev/null | md5sum | cut -d ' '
 ifeq "$(BUILD_ARCH)" "x86_64"
 	EFI = 1
 	EFI_ARCH = x64
+	GRUB_ARCH = $(BUILD_ARCH)
 endif
 
 ifeq "$(BUILD_ARCH)" "aarch64"
 	EFI = 1
 	EFI_ARCH = aa64
+	GRUB_ARCH = arm64
 endif
 
 # Basic modules
 GRUB_EFI_MODULES = \
 	configfile \
-	efi_gop \
-	efi_uga \
 	gzio \
 	linux \
-	loadbios \
 	loadenv \
 	normal \
 	regexp
 
 # Stuff for accessing file systems
 GRUB_EFI_MODULES += \
-	ahci \
 	ext2 \
 	fat \
 	iso9660 \
@@ -115,15 +113,13 @@ GRUB_EFI_MODULES += \
 # Graphics & IO
 GRUB_EFI_MODULES += \
 	all_video \
-	at_keyboard \
 	bitmap_scale \
 	font \
 	gfxmenu \
 	gfxterm \
 	jpeg \
 	png \
-	tga \
-	usb_keyboard
+	tga
 
 # Commands
 GRUB_EFI_MODULES += \
@@ -144,6 +140,15 @@ GRUB_EFI_MODULES += \
 	test \
 	true
 
+# Platform dependent modules
+ifeq "$(BUILD_ARCH)" "x86_64"
+	GRUB_EFI_MODULES += \
+		loadbios \
+		ahci \
+		at_keyboard \
+		usb_keyboard
+endif
+
 ###############################################################################
 # Common Macro Definitions
 ###############################################################################
diff --git a/lfs/cdrom b/lfs/cdrom
index 05b4fe891a..81e0058684 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -158,7 +158,7 @@ ifeq "$(EFI)" "1"
 	# Build a GRUB EFI image
 	mkdir -pv /install/cdrom/EFI/BOOT
 	grub-mkimage \
-		--format=$(BUILD_ARCH)-efi \
+		--format=$(GRUB_ARCH)-efi \
 		--output=/install/cdrom/EFI/BOOT/boot$(EFI_ARCH).efi \
 		--config=/tmp/grub-efi.cfg \
 		--compression=xz \