Add EFI mmap specification

diff --git a/doc/multiboot.texi b/doc/multiboot.texi
index 44782c9c31ea4d70f5f1749a19276193e9019e6e..a8f45e330d7a22ef1a495eead84ce1c918e8b490 100644 (file)
--- a/doc/multiboot.texi
+++ b/doc/multiboot.texi
@@ -1127,6 +1127,21 @@ u32     | size              |
 
 This tag contains network information in the format specified as DHCP. It may be either a real DHCP reply or just the configuration info in the same format. This tag appears once per card.
 
+@subsection EFI memory map
+@example
+@group
+        +-------------------+
+u32     | type = 17         |
+u32     | size              |
+u32     | descriptor size   |
+u32     | descriptor version|
+        | EFI memory map    |
+        +-------------------+
+@end group
+@end example
+
+This tag contains EFI memory map as per EFI specification.
+
 
 @node Examples
 @chapter Examples

diff --git a/doc/multiboot2.h b/doc/multiboot2.h
index 0e26a8ec27a5bbdd76990ec682d77d8c6e83f840..58f2f684554d108056b6e34229d23d6a4a908cbd 100644 (file)
--- a/doc/multiboot2.h
+++ b/doc/multiboot2.h
@@ -58,6 +58,7 @@
 #define MULTIBOOT_TAG_TYPE_ACPI_OLD          14
 #define MULTIBOOT_TAG_TYPE_ACPI_NEW          15
 #define MULTIBOOT_TAG_TYPE_NETWORK           16
+#define MULTIBOOT_TAG_TYPE_EFI_MMAP          17
 
 #define MULTIBOOT_HEADER_TAG_END  0
 #define MULTIBOOT_HEADER_TAG_INFORMATION_REQUEST  1
@@ -361,6 +362,15 @@ struct multiboot_tag_network
   multiboot_uint8_t dhcpack[0];
 };
 
+struct multiboot_tag_efi_mmap
+{
+  multiboot_uint32_t type;
+  multiboot_uint32_t size;
+  multiboot_uint32_t descr_size;
+  multiboot_uint32_t descr_vers;
+  multiboot_uint8_t efi_mmap[0];
+}; 
+
 #endif /* ! ASM_FILE */
 
 #endif /* ! MULTIBOOT_HEADER */