diff options
Diffstat (limited to 'asm/multiboot.s')
| -rw-r--r-- | asm/multiboot.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/multiboot.s b/asm/multiboot.s index 21df7bb..1927c9b 100644 --- a/asm/multiboot.s +++ b/asm/multiboot.s @@ -5,7 +5,7 @@ .set ALIGN, 1<<0 # align loaded modules on page boundaries .set MEMINFO, 1<<1 # provide memory map .set GFXINFO, 1<<2 # provide gfx info -.set FLAGS, ALIGN | MEMINFO # | GFXINFO # this is the Multiboot 'flag' field +.set FLAGS, ALIGN | MEMINFO | GFXINFO # this is the Multiboot 'flag' field .set MAGIC, 0x1BADB002 # 'magic number' lets bootloader find the header .set CHECKSUM, -(MAGIC + FLAGS) # checksum of above, to prove we are multiboot @@ -20,16 +20,16 @@ .long FLAGS .long CHECKSUM -.long 0 # we dont need this +.long 0 # we dont need this for ELF .long 0 .long 0 .long 0 .long 0 -.long 0 #gfx_stuff -.long 0 -.long 0 -.long 0 +.long 1 #gfx_stuff +.long 800 +.long 600 +.long 24 # Currently the stack pointer register (esp) points at anything and using it may # cause massive harm. Instead, we'll provide our own stack. We will allocate |