cdrom: Fix building GRUB image for aarch64
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 10 Jul 2018 17:10:14 +0000 (18:10 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 14 Jul 2018 12:43:53 +0000 (13:43 +0100)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
lfs/Config
lfs/cdrom

index bb29390..63ca295 100644 (file)
@@ -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
 ###############################################################################
index 05b4fe8..81e0058 100644 (file)
--- 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 \