[FILO] r108 - trunk/filo/i386

[repository service]

Author: stepan
Date: Mon Mar  8 14:09:45 2010
New Revision: 108
URL: http://tracker.coreboot.org/trac/filo/changeset/108

Log:
Set current cursor position in kernel header when VGA support was compiled
into libpayload so the kernel starts outputting it's messages at the right
position. The old code was actually working, but using the wrong
preprocessor define.

Signed-off-by: Mathias Krause 
Acked-by: Stefan Reinauer

Modified:
   trunk/filo/i386/linux_load.c

Modified: trunk/filo/i386/linux_load.c
==============================================================================
--- trunk/filo/i386/linux_load.c	Tue Oct  6 05:10:00 2009	(r107)
+++ trunk/filo/i386/linux_load.c	Mon Mar  8 14:09:45 2010	(r108)
@@ -26,6 +26,7 @@
  */

#include <libpayload.h>
+#include <libpayload-config.h>
 #include <config.h>
 #include <fs.h>
 #include "context.h"
@@ -585,7 +586,7 @@
 {
     struct segment_desc *linux_gdt;
     struct context *ctx;
-#ifdef CONFIG_VGA_CONSOLE
+#ifdef CONFIG_VGA_VIDEO_CONSOLE
     unsigned int cursor_x, cursor_y, cursor_en;
 #endif
 #ifdef CONFIG_PCMCIA_CF
@@ -625,7 +626,7 @@
     debug("eip=%#x\n", kern_addr);
     printf("Jumping to entry point...\n");

-#ifdef CONFIG_VGA_CONSOLE
+#ifdef CONFIG_VGA_VIDEO_CONSOLE
     /* Update VGA cursor position.
      * This must be here because the printf changes the value! */
     video_console_get_cursor(&cursor_x, &cursor_y, &cursor_en);