2009-06-17 Pavel Roskin <proski@gnu.org>

	* include/grub/i386/coreboot/console.h: Don't use the i386-pc
	version, use declarations needed to use vga_text as the startup
	console.

diff --git a/ChangeLog b/ChangeLog
index e96652ba209f9784ade91767d1ea51ebf82e41a5..e582d91ba2f9dc9bba1e55b349491377a05adf5b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-06-17  Pavel Roskin  <proski@gnu.org>
 
+       * include/grub/i386/coreboot/console.h: Don't use the i386-pc
+       version, use declarations needed to use vga_text as the startup
+       console.
+
        * conf/i386-coreboot.rmk (kernel_elf_SOURCES): Remove
        term/i386/pc/at_keyboard.c, it doesn't need to be compiled into
        the kernel.

diff --git a/include/grub/i386/coreboot/console.h b/include/grub/i386/coreboot/console.h
index 305a46d8ea43249e83ea5694da6f063e01479f1a..2ffef730010919424771c9f4de7f268f311c21db 100644 (file)
--- a/include/grub/i386/coreboot/console.h
+++ b/include/grub/i386/coreboot/console.h
@@ -1 +1,25 @@
-#include <grub/i386/pc/console.h>
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GRUB_MACHINE_CONSOLE_HEADER
+#define GRUB_MACHINE_CONSOLE_HEADER    1
+
+void grub_vga_text_init (void);
+void grub_vga_text_fini (void);
+
+#endif /* ! GRUB_MACHINE_CONSOLE_HEADER */