aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/boot.asm
diff options
context:
space:
mode:
authorMarvin Borner2019-10-27 13:07:06 +0100
committerMarvin Borner2019-10-27 13:07:06 +0100
commit654934e0b5e5ef08e6fd337d5ceb864289796c66 (patch)
tree75bb34443cda750c1f5e26d7d6e500b73963e1ae /src/kernel/boot.asm
parent52503f9b654f68f11dea676e9636c2004176ef29 (diff)
Improved boot process and color scheme
Diffstat (limited to 'src/kernel/boot.asm')
-rw-r--r--src/kernel/boot.asm10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/kernel/boot.asm b/src/kernel/boot.asm
index e3d469c..d533307 100644
--- a/src/kernel/boot.asm
+++ b/src/kernel/boot.asm
@@ -11,9 +11,9 @@ mboot:
; Multiboot macros
MULTIBOOT_PAGE_ALIGN equ 1<<0
MULTIBOOT_MEMORY_INFO equ 1<<1
- MULTIBOOT_VIDEO_MODE equ 1<<2
+ MULTIBOOT_AOUT_KLUDGE equ 1<<16
MULTIBOOT_HEADER_MAGIC equ 0x1BADB002
- MULTIBOOT_HEADER_FLAGS equ MULTIBOOT_PAGE_ALIGN | MULTIBOOT_MEMORY_INFO | MULTIBOOT_VIDEO_MODE
+ MULTIBOOT_HEADER_FLAGS equ MULTIBOOT_PAGE_ALIGN | MULTIBOOT_MEMORY_INFO | MULTIBOOT_AOUT_KLUDGE
MULTIBOOT_CHECKSUM equ -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS)
EXTERN code, bss, end
@@ -29,12 +29,6 @@ mboot:
dd end
dd start
- ; Request linear graphics mode
- dd 0
- dd 640 ; width
- dd 480 ; height
- dd 8 ; bpp
-
; Endless loop
stublet:
extern kernel_main