[efi] Use elf2efi utility in place of efilink

elf2efi converts a suitable ELF executable (containing relocation
information, and with appropriate virtual addresses) into an EFI
executable.  It is less tightly coupled with the gPXE build process
and, in particular, does not require the use of a hand-crafted PE
image header in efiprefix.S.

elf2efi correctly handles .bss sections, which significantly reduces
the size of the gPXE EFI executable.

1 files changed, 4 insertions, 6 deletions

diff --git a/src/interface/efi/efi_entry.c b/src/interface/efi/efi_init.c
index 7b670f8e9..6e54cf7e1 100644
--- a/src/interface/efi/efi_entry.c
+++ b/src/interface/efi/efi_init.c
@@ -16,7 +16,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <stdlib.h>
 #include <string.h>
 #include <gpxe/efi/efi.h>
 #include <gpxe/uuid.h>
@@ -58,14 +57,14 @@ static void * efi_find_table ( EFI_GUID *guid ) {
 }
 
 /**
- * EFI entry point
+ * Initialise EFI environment
  *
  * @v image_handle	Image handle
  * @v systab		System table
  * @ret efirc		EFI return status code
  */
-EFI_STATUS EFIAPI efi_entry ( EFI_HANDLE image_handle,
-			      EFI_SYSTEM_TABLE *systab ) {
+EFI_STATUS efi_init ( EFI_HANDLE image_handle,
+		      EFI_SYSTEM_TABLE *systab ) {
 	EFI_BOOT_SERVICES *bs;
 	struct efi_protocol *prot;
 	struct efi_config_table *tab;
@@ -119,6 +118,5 @@ EFI_STATUS EFIAPI efi_entry ( EFI_HANDLE image_handle,
 		}
 	}
 
-	/* Call to main() */
-	return RC_TO_EFIRC ( main () );
+	return 0;
 }