aboutsummaryrefslogtreecommitdiffstats
path: root/src/interface
diff options
context:
space:
mode:
authorMichael Brown <mcb30@etherboot.org>2009-01-07 02:05:51 +0000
committerMichael Brown <mcb30@etherboot.org>2009-01-07 22:59:05 +0000
commit314779eb369db746be5373b398111d5b746d67de (patch)
tree0856694401b250357ad6ece6e2845c4611b58d01 /src/interface
parent85e5e25c52834788239eb8b6c94e0d3aeddd2705 (diff)
downloadipxe-314779eb369db746be5373b398111d5b746d67de.tar.gz
[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.
Diffstat (limited to 'src/interface')
-rw-r--r--src/interface/efi/efi_init.c (renamed from src/interface/efi/efi_entry.c)10
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;
}