From 7f65a08f3e2606a5102fb68acf6ccf5fc283ecb6 Mon Sep 17 00:00:00 2001
From: Michael Brown
Date: Sat, 5 Dec 2015 23:54:10 +0000
Subject: [efi] Add %.usb target for building EFI-bootable USB (or other) disk
 images

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---
 src/arch/i386/Makefile.efi   | 4 ++++
 src/arch/x86/Makefile.efi    | 4 ++++
 src/arch/x86_64/Makefile.efi | 4 ++++
 3 files changed, 12 insertions(+)

(limited to 'src/arch')

diff --git a/src/arch/i386/Makefile.efi b/src/arch/i386/Makefile.efi
index aa809eb5d..37ede65ac 100644
--- a/src/arch/i386/Makefile.efi
+++ b/src/arch/i386/Makefile.efi
@@ -8,6 +8,10 @@ ELF2EFI		= $(ELF2EFI32)
 #
 CFLAGS		+= -malign-double
 
+# Specify EFI boot file
+#
+EFI_BOOT_FILE	= bootia32.efi
+
 # Include generic EFI Makefile
 #
 MAKEDEPS	+= arch/x86/Makefile.efi
diff --git a/src/arch/x86/Makefile.efi b/src/arch/x86/Makefile.efi
index f73bc7d5d..c4bc2308c 100644
--- a/src/arch/x86/Makefile.efi
+++ b/src/arch/x86/Makefile.efi
@@ -40,3 +40,7 @@ $(BIN)/%.efirom : $(BIN)/%.efidrv $(EFIROM)
 $(BIN)/efidrv.cab : $(BIN)/alldrv.efis # $(ALL_drv.efi) is not yet defined
 	$(QM)$(ECHO) "  [CAB] $@"
 	$(Q)$(LCAB) -n -q $(ALL_drv.efi) $@
+
+$(BIN)/%.usb : $(BIN)/%.efi
+	$(QM)$(ECHO) "  [GENEFIDSK] $@"
+	$(Q)bash util/genefidsk -o $@ -b $(EFI_BOOT_FILE) $<
diff --git a/src/arch/x86_64/Makefile.efi b/src/arch/x86_64/Makefile.efi
index 26b712780..12408f862 100644
--- a/src/arch/x86_64/Makefile.efi
+++ b/src/arch/x86_64/Makefile.efi
@@ -8,6 +8,10 @@ CFLAGS		+= -mno-red-zone
 #
 ELF2EFI		= $(ELF2EFI64)
 
+# Specify EFI boot file
+#
+EFI_BOOT_FILE	= bootx64.efi
+
 # Include generic EFI Makefile
 #
 MAKEDEPS	+= arch/x86/Makefile.efi
-- 
cgit v1.2.3-55-g7522