From cef5bfb8913d69c2d3367ade93c29f5e7f283f45 Mon Sep 17 00:00:00 2001
From: Michal Idziorek <m.i@gmx.at>
Date: Fri, 14 Nov 2014 14:12:34 +0100
Subject: use kernel/config.h to control VESA swtich in asm

---
 boot2/stage2.asm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'boot2/stage2.asm')

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
-- 
cgit v1.2.3