2009-12-24 Robert Millan <rmh.grub@aybabtu.com>

	* docs/multiboot.h (MULTIBOOT_HEADER_FLAGS): Moved from here ...
	* docs/boot.S (MULTIBOOT_HEADER_FLAGS): ... to here.

diff --git a/ChangeLog b/ChangeLog
index 793b5ccc28f4d2f63a2e9d91fcbd333e1907346b..5aeeebb3d21dcf15d51d0463d1e0a11f53acc663 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-24  Robert Millan  <rmh.grub@aybabtu.com>
+
+       * docs/multiboot.h (MULTIBOOT_HEADER_FLAGS): Moved from here ...
+       * docs/boot.S (MULTIBOOT_HEADER_FLAGS): ... to here.
+
 2009-12-24  Robert Millan  <rmh.grub@aybabtu.com>
 
        * docs/boot.S (ASM): Rename to ...

diff --git a/docs/boot.S b/docs/boot.S
index f743a1bce6c57ea6aeed14f0710535db5ee3d401..edf9268e22dee212b29eab7fdfa5d9348337dc8c 100644 (file)
--- a/docs/boot.S
+++ b/docs/boot.S
@@ -27,6 +27,13 @@
 
 /* The size of our stack (16KB).  */
 #define STACK_SIZE                     0x4000
+
+/* The flags for the Multiboot header.  */
+#ifdef __ELF__
+# define MULTIBOOT_HEADER_FLAGS                0x00000003
+#else
+# define MULTIBOOT_HEADER_FLAGS                0x00010003
+#endif
        
        .text
 

diff --git a/docs/multiboot.h b/docs/multiboot.h
index ddd8b7b40342e360617784f0e09f115b23da4b85..c345598a32f0c2d77807058e93e242bc0ebb85a4 100644 (file)
--- a/docs/multiboot.h
+++ b/docs/multiboot.h
@@ -20,13 +20,6 @@
 /* The magic number for the Multiboot header.  */
 #define MULTIBOOT_HEADER_MAGIC         0x1BADB002
 
-/* The flags for the Multiboot header.  */
-#ifdef __ELF__
-# define MULTIBOOT_HEADER_FLAGS                0x00000003
-#else
-# define MULTIBOOT_HEADER_FLAGS                0x00010003
-#endif
-
 /* The magic number passed by a Multiboot-compliant boot loader.  */
 #define MULTIBOOT_BOOTLOADER_MAGIC     0x2BADB002