* include/multiboot2.h: Resync with spec.

diff --git a/ChangeLog b/ChangeLog
index b15ba47d5275efecdacfc187aa96fa74da6910da..aba023c7bf39ddc141e64c6900fb2e61de4d1b57 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * include/multiboot2.h: Resync with spec.
+
 2010-03-28  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Multiboot2 tag support

diff --git a/include/multiboot2.h b/include/multiboot2.h
index 59d7c951f6168e8e05dfb0deafd75619e660dc07..647109c0be7a781f6352a4a93ad4e109a67735a7 100644 (file)
--- a/include/multiboot2.h
+++ b/include/multiboot2.h
@@ -36,22 +36,10 @@
 #define MULTIBOOT_MOD_ALIGN                    0x00001000
 
 /* Alignment of the multiboot info structure.  */
-#define MULTIBOOT_INFO_ALIGN                   0x00000004
+#define MULTIBOOT_INFO_ALIGN                   0x00000008
 
 /* Flags set in the 'flags' member of the multiboot header.  */
 
-/* Align all boot modules on i386 page (4KB) boundaries.  */
-#define MULTIBOOT_PAGE_ALIGN                   0x00000001
-
-/* Must pass memory information to OS.  */
-#define MULTIBOOT_MEMORY_INFO                  0x00000002
-
-/* Must pass video information to OS.  */
-#define MULTIBOOT_VIDEO_MODE                   0x00000004
-
-/* This flag indicates the use of the address fields in the header.  */
-#define MULTIBOOT_AOUT_KLUDGE                  0x00010000
-
 #define MULTIBOOT_TAG_ALIGN                  8
 #define MULTIBOOT_TAG_TYPE_END               0
 #define MULTIBOOT_TAG_TYPE_CMDLINE           1