summaryrefslogtreecommitdiff
path: root/boot2/stage2.asm
diff options
context:
space:
mode:
Diffstat (limited to 'boot2/stage2.asm')
-rw-r--r--boot2/stage2.asm9
1 files changed, 8 insertions, 1 deletions
diff --git a/boot2/stage2.asm b/boot2/stage2.asm
index 0a3ee87..ad1e4ea 100644
--- a/boot2/stage2.asm
+++ b/boot2/stage2.asm
@@ -70,6 +70,9 @@ MEMMAP_INFO:
STR_PM:
db "PROTECTED MODE",0
+; kernel config
+%include "config.inc"
+
;
;;lets put our temporary GDT (Global Descriptor Table) here
;;kernel should move this away
@@ -144,7 +147,11 @@ kernel_load:
mov ax,[KERNEL_CHUNK]
cmp ax,0x5
jne skip_vesa_init
-; call VesaSetup
+
+ %ifndef FOOLOS_CONSOLE
+ call VesaSetup
+ %endif
+
skip_vesa_init:
call switch_to_pm