From 08ab8e91819b730ebd4b6db4906ce1ca42cf20eb Mon Sep 17 00:00:00 2001 From: Robert Millan Date: Thu, 24 Dec 2009 13:34:49 +0000 Subject: [PATCH] 2009-12-24 Robert Millan * docs/multiboot.h (MULTIBOOT_HEADER_FLAGS): Moved from here ... * docs/boot.S (MULTIBOOT_HEADER_FLAGS): ... to here. --- ChangeLog | 5 +++++ docs/boot.S | 7 +++++++ docs/multiboot.h | 7 ------- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 793b5ccc2..5aeeebb3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-12-24 Robert Millan + + * docs/multiboot.h (MULTIBOOT_HEADER_FLAGS): Moved from here ... + * docs/boot.S (MULTIBOOT_HEADER_FLAGS): ... to here. + 2009-12-24 Robert Millan * docs/boot.S (ASM): Rename to ... diff --git a/docs/boot.S b/docs/boot.S index f743a1bce..edf9268e2 100644 --- 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 ddd8b7b40..c345598a3 100644 --- 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