david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

[efi] Synchronise EFI header files 

Now that the PACKED macro conflict is resolved, we can use an
unmodified import of the EFI header files (using
include/ipxe/efi/import.pl).

Synchronised to EDK2 SVN revision 10556.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown 2010-05-29 22:39:22 +01:00
parent 307b39c08c
commit ae5ce45afe
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/include/ipxe/efi/Base.h
View File

@ -105,6 +105,16 @@ VERIFY_SIZE_OF (CHAR16, 2);
#define ASM_FUNCTION_REMOVE_IF_UNREFERENCED
#endif
#ifdef __CC_ARM
//
// Older RVCT ARM compilers don't fully support #pragma pack and require __packed
// as a prefix for the structure.
//
#define PACKED __packed
#else
#define PACKED
#endif
///
/// 128 bit buffer containing a unique identifier value.
/// Unless otherwise specified, aligned on a 64 bit boundary.

7
src/include/ipxe/efi/efi.h
View File

@ -19,13 +19,6 @@
* header to reflect its new location within the iPXE tree. It will
* also tidy up the file by removing carriage return characters and
* trailing whitespace.
*
*
* At the time of writing, there are a few other modifications to
* these headers that are present in my personal edk2 tree, that are
* not yet committed back to the main edk2 repository. These
* modifications are fixes for compilation on case-dependent
* filesystems, compilation under -mrtd and -mregparm=3, etc.
*/
/* EFI headers rudely redefine NULL */