From 314779eb369db746be5373b398111d5b746d67de Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 7 Jan 2009 02:05:51 +0000 Subject: [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. --- src/interface/efi/efi_entry.c | 124 ------------------------------------------ src/interface/efi/efi_init.c | 122 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 124 deletions(-) delete mode 100644 src/interface/efi/efi_entry.c create mode 100644 src/interface/efi/efi_init.c (limited to 'src/interface/efi') diff --git a/src/interface/efi/efi_entry.c b/src/interface/efi/efi_entry.c deleted file mode 100644 index 7b670f8e9..000000000 --- a/src/interface/efi/efi_entry.c +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Copyright (C) 2008 Michael Brown . - * - * 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 -#include -#include -#include - -/** Image handle passed to entry point */ -EFI_HANDLE efi_image_handle; - -/** System table passed to entry point */ -EFI_SYSTEM_TABLE *efi_systab; - -/** Declared used EFI protocols */ -static struct efi_protocol efi_protocols[0] \ - __table_start ( struct efi_protocol, efi_protocols ); -static struct efi_protocol efi_protocols_end[0] \ - __table_end ( struct efi_protocol, efi_protocols ); - -/** Declared used EFI configuration tables */ -static struct efi_config_table efi_config_tables[0] \ - __table_start ( struct efi_config_table, efi_config_tables ); -static struct efi_config_table efi_config_tables_end[0] \ - __table_end ( struct efi_config_table, efi_config_tables ); - -/** - * Look up EFI configuration table - * - * @v guid Configuration table GUID - * @ret table Configuration table, or NULL - */ -static void * efi_find_table ( EFI_GUID *guid ) { - unsigned int i; - - for ( i = 0 ; i < efi_systab->NumberOfTableEntries ; i++ ) { - if ( memcmp ( &efi_systab->ConfigurationTable[i].VendorGuid, - guid, sizeof ( *guid ) ) == 0 ) - return efi_systab->ConfigurationTable[i].VendorTable; - } - - return NULL; -} - -/** - * EFI entry point - * - * @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_BOOT_SERVICES *bs; - struct efi_protocol *prot; - struct efi_config_table *tab; - EFI_STATUS efirc; - - /* Store image handle and system table pointer for future use */ - efi_image_handle = image_handle; - efi_systab = systab; - - /* Sanity checks */ - if ( ! systab ) - return EFI_NOT_AVAILABLE_YET; - if ( ! systab->ConOut ) - return EFI_NOT_AVAILABLE_YET; - if ( ! systab->BootServices ) { - DBGC ( systab, "EFI provided no BootServices entry point\n" ); - return EFI_NOT_AVAILABLE_YET; - } - if ( ! systab->RuntimeServices ) { - DBGC ( systab, "EFI provided no RuntimeServices entry " - "point\n" ); - return EFI_NOT_AVAILABLE_YET; - } - DBGC ( systab, "EFI handle %p systab %p\n", image_handle, systab ); - - /* Look up used protocols */ - bs = systab->BootServices; - for ( prot = efi_protocols ; prot < efi_protocols_end ; prot++ ) { - if ( ( efirc = bs->LocateProtocol ( &prot->u.guid, NULL, - prot->protocol ) ) == 0 ) { - DBGC ( systab, "EFI protocol %s is at %p\n", - uuid_ntoa ( &prot->u.uuid ), *(prot->protocol)); - } else { - DBGC ( systab, "EFI does not provide protocol %s\n", - uuid_ntoa ( &prot->u.uuid ) ); - /* All protocols are required */ - return efirc; - } - } - - /* Look up used configuration tables */ - for ( tab = efi_config_tables ; tab < efi_config_tables_end ; tab++ ) { - if ( ( *(tab->table) = efi_find_table ( &tab->u.guid ) ) ) { - DBGC ( systab, "EFI configuration table %s is at %p\n", - uuid_ntoa ( &tab->u.uuid ), *(tab->table) ); - } else { - DBGC ( systab, "EFI does not provide configuration " - "table %s\n", uuid_ntoa ( &tab->u.uuid ) ); - if ( tab->required ) - return EFI_NOT_AVAILABLE_YET; - } - } - - /* Call to main() */ - return RC_TO_EFIRC ( main () ); -} diff --git a/src/interface/efi/efi_init.c b/src/interface/efi/efi_init.c new file mode 100644 index 000000000..6e54cf7e1 --- /dev/null +++ b/src/interface/efi/efi_init.c @@ -0,0 +1,122 @@ +/* + * Copyright (C) 2008 Michael Brown . + * + * 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 +#include +#include + +/** Image handle passed to entry point */ +EFI_HANDLE efi_image_handle; + +/** System table passed to entry point */ +EFI_SYSTEM_TABLE *efi_systab; + +/** Declared used EFI protocols */ +static struct efi_protocol efi_protocols[0] \ + __table_start ( struct efi_protocol, efi_protocols ); +static struct efi_protocol efi_protocols_end[0] \ + __table_end ( struct efi_protocol, efi_protocols ); + +/** Declared used EFI configuration tables */ +static struct efi_config_table efi_config_tables[0] \ + __table_start ( struct efi_config_table, efi_config_tables ); +static struct efi_config_table efi_config_tables_end[0] \ + __table_end ( struct efi_config_table, efi_config_tables ); + +/** + * Look up EFI configuration table + * + * @v guid Configuration table GUID + * @ret table Configuration table, or NULL + */ +static void * efi_find_table ( EFI_GUID *guid ) { + unsigned int i; + + for ( i = 0 ; i < efi_systab->NumberOfTableEntries ; i++ ) { + if ( memcmp ( &efi_systab->ConfigurationTable[i].VendorGuid, + guid, sizeof ( *guid ) ) == 0 ) + return efi_systab->ConfigurationTable[i].VendorTable; + } + + return NULL; +} + +/** + * Initialise EFI environment + * + * @v image_handle Image handle + * @v systab System table + * @ret efirc EFI return status code + */ +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; + EFI_STATUS efirc; + + /* Store image handle and system table pointer for future use */ + efi_image_handle = image_handle; + efi_systab = systab; + + /* Sanity checks */ + if ( ! systab ) + return EFI_NOT_AVAILABLE_YET; + if ( ! systab->ConOut ) + return EFI_NOT_AVAILABLE_YET; + if ( ! systab->BootServices ) { + DBGC ( systab, "EFI provided no BootServices entry point\n" ); + return EFI_NOT_AVAILABLE_YET; + } + if ( ! systab->RuntimeServices ) { + DBGC ( systab, "EFI provided no RuntimeServices entry " + "point\n" ); + return EFI_NOT_AVAILABLE_YET; + } + DBGC ( systab, "EFI handle %p systab %p\n", image_handle, systab ); + + /* Look up used protocols */ + bs = systab->BootServices; + for ( prot = efi_protocols ; prot < efi_protocols_end ; prot++ ) { + if ( ( efirc = bs->LocateProtocol ( &prot->u.guid, NULL, + prot->protocol ) ) == 0 ) { + DBGC ( systab, "EFI protocol %s is at %p\n", + uuid_ntoa ( &prot->u.uuid ), *(prot->protocol)); + } else { + DBGC ( systab, "EFI does not provide protocol %s\n", + uuid_ntoa ( &prot->u.uuid ) ); + /* All protocols are required */ + return efirc; + } + } + + /* Look up used configuration tables */ + for ( tab = efi_config_tables ; tab < efi_config_tables_end ; tab++ ) { + if ( ( *(tab->table) = efi_find_table ( &tab->u.guid ) ) ) { + DBGC ( systab, "EFI configuration table %s is at %p\n", + uuid_ntoa ( &tab->u.uuid ), *(tab->table) ); + } else { + DBGC ( systab, "EFI does not provide configuration " + "table %s\n", uuid_ntoa ( &tab->u.uuid ) ); + if ( tab->required ) + return EFI_NOT_AVAILABLE_YET; + } + } + + return 0; +} -- cgit v1.2.3-55-g7522