vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
* docs/multiboot.h (MULTIBOOT_HEADER_FLAGS): Moved from here ...
	* docs/boot.S (MULTIBOOT_HEADER_FLAGS): ... to here.
This commit is contained in:
Robert Millan 2009-12-24 13:34:49 +00:00
parent ca3c56e765
commit 08ab8e9181
3 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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 ...

7
docs/boot.S
View file

@ -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

7
docs/multiboot.h
View file

@ -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