diff --git a/kernel/init.c b/kernel/init.c index 640029a3..2fafb5b9 100644 --- a/kernel/init.c +++ b/kernel/init.c @@ -25,9 +25,6 @@ #include #include #include -#ifdef CONFIG_VGA -#include -#endif #ifdef CONFIG_LWIP #include #include @@ -47,9 +44,8 @@ static volatile int done = 0; int lowlevel_init(void) { -#ifdef CONFIG_VGA - vga_init(); -#endif + koutput_init(); + return 0; } diff --git a/kernel/main.c b/kernel/main.c index a67e2bde..eae0ec05 100644 --- a/kernel/main.c +++ b/kernel/main.c @@ -89,7 +89,6 @@ int main(void) #endif multitasking_init(); mmu_init(); - koutput_init(); initrd_init(); irq_enable(); diff --git a/libkern/stdio.c b/libkern/stdio.c index 451e85f6..ba989954 100644 --- a/libkern/stdio.c +++ b/libkern/stdio.c @@ -41,6 +41,10 @@ static unsigned char kmessages[KMSG_SIZE] = {[0 ... KMSG_SIZE-1] = 0x00}; int koutput_init(void) { +#ifdef CONFIG_VGA + vga_init(); +#endif + return 0; }