Enable EFI on x86_64

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

lfs/flash-images

@@ -29,6 +29,10 @@ VER = ipfire
 THISAPP    = flash-image
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+ifeq "$(MACHINE)" "x86_64"
+	EFI = 1
+endif
+
 ifeq "$(MACHINE)" "i586"
 	EFI = 1
 endif
@@ -91,6 +95,14 @@ endif
 S_BOOT := $(shell echo $$(( 262144 - $(S_OFFSET) )))
 S_ROOT := 2477600
 
+ifeq "$(MACHINE)" "x86_64"
+	EFI_ARCH = x64
+endif
+
+ifeq "$(MACHINE)" "i586"
+	EFI_ARCH = ia32
+endif
+
 PADDING = 100 # MB
 
 ifeq "$(EFI)" "1"
@@ -222,7 +234,7 @@ ifeq "$(BOOTLOADER)" "grub"
 ifeq "$(EFI)" "1"
 	mkdir -pv $(MNThdd)/boot/efi/EFI/boot
 	cp -vf $(MNThdd)/boot/efi/EFI/ipfire/grub-efi/grub.efi \
-		$(MNThdd)/boot/efi/EFI/boot/bootia32.efi
+		$(MNThdd)/boot/efi/EFI/boot/boot$(EFI_ARCH).efi
 endif
 endif
 

lfs/grub

@@ -36,6 +36,12 @@ SUP_ARCH   = x86_64 i586
 
 EFI = 1
 
+EFI_ARCH = $(MACHINE)-efi
+
+ifeq "$(MACHINE)" "i586"
+	EFI_ARCH = i386-efi
+endif
+
 CFLAGS     =
 CXXFLAGS   =
 
@@ -96,7 +102,7 @@ ifeq "$(EFI)" "1"
 	cd $(DIR_APP_EFI) && make $(MAKETUNING)
 
 	cd $(DIR_APP_EFI) && ./grub-mkimage \
-		-O i386-efi \
+		-O $(EFI_ARCH) \
 		-p /EFI/ipfire/grub-efi \
 		-o grub.efi \
 		-d  grub-core part_msdos part_gpt fat ext2 xfs normal chain \