2010-01-03 Robert Millan <rmh.grub@aybabtu.com>

	* doc/boot.S (MULTIBOOT_HEADER_FLAGS): Redefine using macros.

diff --git a/ChangeLog b/ChangeLog
index b7f02e9fe6a0ccd5990048d7a441f958c893ace4..925600e9b439aa6920b972b5076a803d83264eb8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-03  Robert Millan  <rmh.grub@aybabtu.com>
+
+       * doc/boot.S (MULTIBOOT_HEADER_FLAGS): Redefine using macros.
+
 2010-01-03  Robert Millan  <rmh.grub@aybabtu.com>
 
        * Makefile.am (web-manual): Add `all' as dependency.

diff --git a/doc/boot.S b/doc/boot.S
index edf9268e22dee212b29eab7fdfa5d9348337dc8c..c8d517106c5a3e0db969ca315de32d0aaa1e2a3a 100644 (file)
--- a/doc/boot.S
+++ b/doc/boot.S
@@ -30,10 +30,11 @@
 
 /* The flags for the Multiboot header.  */
 #ifdef __ELF__
-# define MULTIBOOT_HEADER_FLAGS                0x00000003
+# define AOUT_KLUDGE 0
 #else
-# define MULTIBOOT_HEADER_FLAGS                0x00010003
+# define AOUT_KLUDGE MULTIBOOT_AOUT_KLUDGE
 #endif
+#define MULTIBOOT_HEADER_FLAGS                 MULTIBOOT_PAGE_ALIGN | MULTIBOOT_MEMORY_INFO | AOUT_KLUDGE
        
        .text