[efi] Allow for .efidrv images as well as .efi images

Merge in the changes that allow for building EFI driver images (that
can be loaded using the EFI shell's "load" command) as well as EFI
applications.

5 files changed, 78 insertions, 29 deletions

diff --git a/src/arch/i386/Makefile.efi b/src/arch/i386/Makefile.efi
index c75338c9e..8d651b04d 100644
--- a/src/arch/i386/Makefile.efi
+++ b/src/arch/i386/Makefile.efi
@@ -1,19 +1,10 @@
 # -*- makefile -*- : Force emacs to use Makefile mode
 
-# The EFI linker script
+# Specify EFI image builder
 #
-LDSCRIPT	= arch/x86/scripts/efi.lds
+ELF2EFI		= $(ELF2EFI32)
 
-# Retain relocation information for elf2efi
+# Include generic EFI Makefile
 #
-LDFLAGS		+= -q -S
-
-# Media types.
-#
-NON_AUTO_MEDIA	+= efi
-
-# Rule for building EFI files
-#
-$(BIN)/%.efi : $(BIN)/%.efi.tmp $(ELF2EFI32)
-	$(QM)$(ECHO) "  [FINISH] $@"
-	$(Q)$(ELF2EFI32) $< $@
+MAKEDEPS	+= arch/x86/Makefile.efi
+include arch/x86/Makefile.efi
diff --git a/src/arch/x86/Makefile.efi b/src/arch/x86/Makefile.efi
new file mode 100644
index 000000000..92cd02048
--- /dev/null
+++ b/src/arch/x86/Makefile.efi
@@ -0,0 +1,24 @@
+# -*- makefile -*- : Force emacs to use Makefile mode
+
+# The EFI linker script
+#
+LDSCRIPT	= arch/x86/scripts/efi.lds
+
+# Retain relocation information for elf2efi
+#
+LDFLAGS		+= -q -S
+
+# Media types.
+#
+NON_AUTO_MEDIA	+= efi
+NON_AUTO_MEDIA	+= efidrv
+
+# Rules for building EFI files
+#
+$(BIN)/%.efi : $(BIN)/%.efi.tmp $(ELF2EFI)
+	$(QM)$(ECHO) "  [FINISH] $@"
+	$(Q)$(ELF2EFI) --subsystem=10 $< $@
+
+$(BIN)/%.efidrv : $(BIN)/%.efidrv.tmp $(ELF2EFI)
+	$(QM)$(ECHO) "  [FINISH] $@"
+	$(Q)$(ELF2EFI) --subsystem=11 $< $@
diff --git a/src/arch/x86/prefix/efidrvprefix.c b/src/arch/x86/prefix/efidrvprefix.c
new file mode 100644
index 000000000..5f631588f
--- /dev/null
+++ b/src/arch/x86/prefix/efidrvprefix.c
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2009 Michael Brown <mbrown@fensystems.co.uk>.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <stdlib.h>
+#include <gpxe/init.h>
+#include <gpxe/efi/efi.h>
+
+/**
+ * EFI entry point
+ *
+ * @v image_handle	Image handle
+ * @v systab		System table
+ * @ret efirc		EFI return status code
+ */
+EFI_STATUS EFIAPI _start ( EFI_HANDLE image_handle,
+			   EFI_SYSTEM_TABLE *systab ) {
+	EFI_STATUS efirc;
+
+	/* Initialise EFI environment */
+	if ( ( efirc = efi_init ( image_handle, systab ) ) != 0 )
+		return efirc;
+
+	/* Initialise gPXE environment */
+	initialise();
+	startup();
+
+	/* Install SNP driver and return */
+	return RC_TO_EFIRC ( efi_snp_install () );
+}
diff --git a/src/arch/x86/scripts/efi.lds b/src/arch/x86/scripts/efi.lds
index bfe817398..aac310569 100644
--- a/src/arch/x86/scripts/efi.lds
+++ b/src/arch/x86/scripts/efi.lds
@@ -5,7 +5,6 @@
  *
  */
 
-EXTERN ( _start )
 ENTRY ( _start )
 
 SECTIONS {
diff --git a/src/arch/x86_64/Makefile.efi b/src/arch/x86_64/Makefile.efi
index 928f5e92a..26b712780 100644
--- a/src/arch/x86_64/Makefile.efi
+++ b/src/arch/x86_64/Makefile.efi
@@ -4,20 +4,11 @@
 #
 CFLAGS		+= -mno-red-zone
 
-# The EFI linker script
+# Specify EFI image builder
 #
-LDSCRIPT	= arch/x86/scripts/efi.lds
+ELF2EFI		= $(ELF2EFI64)
 
-# Retain relocation information for elf2efi
+# Include generic EFI Makefile
 #
-LDFLAGS		+= -q -S
-
-# Media types.
-#
-NON_AUTO_MEDIA	+= efi
-
-# Rule for building EFI files
-#
-$(BIN)/%.efi : $(BIN)/%.efi.tmp $(ELF2EFI64)
-	$(QM)$(ECHO) "  [FINISH] $@"
-	$(Q)$(ELF2EFI64) $< $@
+MAKEDEPS	+= arch/x86/Makefile.efi
+include arch/x86/Makefile.efi