[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>

diff --git a/src/include/ipxe/efi/Base.h b/src/include/ipxe/efi/Base.h
index a4263c3bdb0383b80fa1932e3c13bbe84ad56358..6042841f0190b6549524449c281b451140d19857 100644 (file)
--- 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 b45ddc132105297c46232ebf6a00e10da4dd5414..4b8c2b032e2d578ce0ee58cd71d2da5bda3366f2 100644 (file)
--- 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 */