* grub-core/loader/i386/multiboot_mbi.c (grub_fill_multiboot_mmap):

	Add BADRAM.
	* grub-core/loader/multiboot_mbi2.c (grub_fill_multiboot_mmap):
	Likewise.
	* include/multiboot.h: Resynced with specification.
	* include/multiboot2.h: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 53f1e1d49e2b8c366998a6c2acac25af4c763e4f..c79bdcf8fb2a5d0772ea29c231732510783fb7c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-21  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/loader/i386/multiboot_mbi.c (grub_fill_multiboot_mmap):
+       Add BADRAM.
+       * grub-core/loader/multiboot_mbi2.c (grub_fill_multiboot_mmap):
+       Likewise.
+       * include/multiboot.h: Resynced with specification.
+       * include/multiboot2.h: Likewise.
+
 2010-09-21  Colin Watson  <cjwatson@ubuntu.com>
 
        Fix po directory handling.

diff --git a/grub-core/loader/i386/multiboot_mbi.c b/grub-core/loader/i386/multiboot_mbi.c
index eb86958cbc328602cb0b0c6f2b2c81850cd84fb2..283b84c5a870aff58d2f1c353af65abd89880c8b 100644 (file)
--- a/grub-core/loader/i386/multiboot_mbi.c
+++ b/grub-core/loader/i386/multiboot_mbi.c
@@ -229,6 +229,10 @@ grub_fill_multiboot_mmap (struct multiboot_mmap_entry *first_entry)
        case GRUB_MEMORY_NVS:
          mmap_entry->type = MULTIBOOT_MEMORY_NVS;
          break;
+
+       case GRUB_MEMORY_BADRAM:
+         mmap_entry->type = MULTIBOOT_MEMORY_BADRAM;
+         break;
          
        default:
          mmap_entry->type = MULTIBOOT_MEMORY_RESERVED;

diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c
index b4cd8ac0ef6d2fe109ac93b765d98c959295d0d4..799985a1c4aa2023eaf505bf3deef7c9f48fe9d7 100644 (file)
--- a/grub-core/loader/multiboot_mbi2.c
+++ b/grub-core/loader/multiboot_mbi2.c
@@ -313,7 +313,11 @@ grub_fill_multiboot_mmap (struct multiboot_tag_mmap *tag)
        case GRUB_MEMORY_NVS:
          mmap_entry->type = MULTIBOOT_MEMORY_NVS;
          break;
-         
+
+       case GRUB_MEMORY_BADRAM:
+         mmap_entry->type = MULTIBOOT_MEMORY_BADRAM;
+         break;
+
        default:
          mmap_entry->type = MULTIBOOT_MEMORY_RESERVED;
          break;

diff --git a/include/multiboot.h b/include/multiboot.h
index ed71e6b96784e2f4bb8ecb34ca7cbec83b4c1192..bd133ba1f7208731f05bfd2be2bdeee02a9508c7 100644 (file)
--- a/include/multiboot.h
+++ b/include/multiboot.h
@@ -1,5 +1,5 @@
 /*  multiboot.h - Multiboot header file.  */
-/*  Copyright (C) 1999,2003,2007,2008,2009  Free Software Foundation, Inc.
+/*  Copyright (C) 1999,2003,2007,2008,2009,2010  Free Software Foundation, Inc.
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to
@@ -236,6 +236,7 @@ struct multiboot_mmap_entry
 #define MULTIBOOT_MEMORY_RESERVED              2
 #define MULTIBOOT_MEMORY_ACPI_RECLAIMABLE       3
 #define MULTIBOOT_MEMORY_NVS                    4
+#define MULTIBOOT_MEMORY_BADRAM                 5
   multiboot_uint32_t type;
 } __attribute__((packed));
 typedef struct multiboot_mmap_entry multiboot_memory_map_t;

diff --git a/include/multiboot2.h b/include/multiboot2.h
index 275debe758d0aa7f95d8ec8266fecd1d24286b3a..0e26a8ec27a5bbdd76990ec682d77d8c6e83f840 100644 (file)
--- a/include/multiboot2.h
+++ b/include/multiboot2.h
@@ -52,6 +52,12 @@
 #define MULTIBOOT_TAG_TYPE_FRAMEBUFFER       8
 #define MULTIBOOT_TAG_TYPE_ELF_SECTIONS      9
 #define MULTIBOOT_TAG_TYPE_APM               10
+#define MULTIBOOT_TAG_TYPE_EFI32             11
+#define MULTIBOOT_TAG_TYPE_EFI64             12
+#define MULTIBOOT_TAG_TYPE_SMBIOS            13
+#define MULTIBOOT_TAG_TYPE_ACPI_OLD          14
+#define MULTIBOOT_TAG_TYPE_ACPI_NEW          15
+#define MULTIBOOT_TAG_TYPE_NETWORK           16
 
 #define MULTIBOOT_HEADER_TAG_END  0
 #define MULTIBOOT_HEADER_TAG_INFORMATION_REQUEST  1
@@ -167,6 +173,7 @@ struct multiboot_mmap_entry
 #define MULTIBOOT_MEMORY_RESERVED              2
 #define MULTIBOOT_MEMORY_ACPI_RECLAIMABLE       3
 #define MULTIBOOT_MEMORY_NVS                    4
+#define MULTIBOOT_MEMORY_BADRAM                 5
   multiboot_uint32_t type;
   multiboot_uint32_t zero;
 } __attribute__((packed));
@@ -309,6 +316,51 @@ struct multiboot_tag_apm
   multiboot_uint16_t dseg_len;
 };
 
+struct multiboot_tag_efi32
+{
+  multiboot_uint32_t type;
+  multiboot_uint32_t size;
+  multiboot_uint32_t pointer;
+};
+
+struct multiboot_tag_efi64
+{
+  multiboot_uint32_t type;
+  multiboot_uint32_t size;
+  multiboot_uint64_t pointer;
+};
+
+struct multiboot_tag_smbios
+{
+  multiboot_uint32_t type;
+  multiboot_uint32_t size;
+  multiboot_uint8_t major;
+  multiboot_uint8_t minor;
+  multiboot_uint8_t reserved[6];
+  multiboot_uint8_t tables[0];
+};
+
+struct multiboot_tag_old_acpi
+{
+  multiboot_uint32_t type;
+  multiboot_uint32_t size;
+  multiboot_uint8_t rsdp[0];
+};
+
+struct multiboot_tag_new_acpi
+{
+  multiboot_uint32_t type;
+  multiboot_uint32_t size;
+  multiboot_uint8_t rsdp[0];
+};
+
+struct multiboot_tag_network
+{
+  multiboot_uint32_t type;
+  multiboot_uint32_t size;
+  multiboot_uint8_t dhcpack[0];
+};
+
 #endif /* ! ASM_FILE */
 
 #endif /* ! MULTIBOOT_HEADER */