Browse Source

[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>
tags/v1.20.1
Michael Brown 14 years ago
parent
commit
ae5ce45afe
2 changed files with 10 additions and 7 deletions
  1. 10
    0
      src/include/ipxe/efi/Base.h
  2. 0
    7
      src/include/ipxe/efi/efi.h

+ 10
- 0
src/include/ipxe/efi/Base.h View File

105
   #define ASM_FUNCTION_REMOVE_IF_UNREFERENCED
105
   #define ASM_FUNCTION_REMOVE_IF_UNREFERENCED
106
 #endif
106
 #endif
107
 
107
 
108
+#ifdef __CC_ARM
109
+  //
110
+  // Older RVCT ARM compilers don't fully support #pragma pack and require __packed
111
+  // as a prefix for the structure.
112
+  //
113
+  #define PACKED  __packed
114
+#else
115
+  #define PACKED
116
+#endif
117
+
108
 ///
118
 ///
109
 /// 128 bit buffer containing a unique identifier value.
119
 /// 128 bit buffer containing a unique identifier value.
110
 /// Unless otherwise specified, aligned on a 64 bit boundary.
120
 /// Unless otherwise specified, aligned on a 64 bit boundary.

+ 0
- 7
src/include/ipxe/efi/efi.h View File

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

Loading…
Cancel
Save