diff options
| author | Michael Brown | 2010-05-29 23:39:22 +0200 |
|---|---|---|
| committer | Michael Brown | 2010-05-30 00:49:47 +0200 |
| commit | ae5ce45afe845d58a4c5f46e933e044646b62f36 (patch) | |
| tree | 9614246de209116a55fa8a7ddc2dfda9c03936f7 | |
| parent | [build] Remove PACKED macro (diff) | |
| download | ipxe-ae5ce45afe845d58a4c5f46e933e044646b62f36.tar.gz ipxe-ae5ce45afe845d58a4c5f46e933e044646b62f36.tar.xz ipxe-ae5ce45afe845d58a4c5f46e933e044646b62f36.zip | |
[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>
| -rw-r--r-- | src/include/ipxe/efi/Base.h | 10 | ||||
| -rw-r--r-- | src/include/ipxe/efi/efi.h | 7 |
2 files changed, 10 insertions, 7 deletions
diff --git a/src/include/ipxe/efi/Base.h b/src/include/ipxe/efi/Base.h index a4263c3bd..6042841f0 100644 --- a/src/include/ipxe/efi/Base.h +++ b/src/include/ipxe/efi/Base.h @@ -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. diff --git a/src/include/ipxe/efi/efi.h b/src/include/ipxe/efi/efi.h index b45ddc132..4b8c2b032 100644 --- a/src/include/ipxe/efi/efi.h +++ b/src/include/ipxe/efi/efi.h @@ -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 */ |