[2407] 2009-07-13 Pavel Roskin <[email protected]>

Revision: 2407
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2407
Author:   proski
Date:     2009-07-13 23:57:11 +0000 (Mon, 13 Jul 2009)
Log Message:
-----------
2009-07-13  Pavel Roskin  <[email protected]>

	* include/grub/i386/coreboot/machine.h: Rename
	GRUB_MACHINE_LINUXBIOS to GRUB_MACHINE_COREBOOT.
	* loader/multiboot_loader.c (grub_cmd_multiboot_loader): Allow
	multiboot 1 for GRUB_MACHINE_COREBOOT and GRUB_MACHINE_QEMU.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/include/grub/i386/coreboot/machine.h
    trunk/grub2/loader/multiboot_loader.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog	2009-07-13 23:04:31 UTC (rev 2406)
+++ trunk/grub2/ChangeLog	2009-07-13 23:57:11 UTC (rev 2407)
@@ -1,5 +1,10 @@
 2009-07-13  Pavel Roskin  <[email protected]>
 
+	* include/grub/i386/coreboot/machine.h: Rename
+	GRUB_MACHINE_LINUXBIOS to GRUB_MACHINE_COREBOOT.
+	* loader/multiboot_loader.c (grub_cmd_multiboot_loader): Allow
+	multiboot 1 for GRUB_MACHINE_COREBOOT and GRUB_MACHINE_QEMU.
+
 	* kern/dl.c: Force native word size to suppress warnings when
 	compiling grub-emu.
 

Modified: trunk/grub2/include/grub/i386/coreboot/machine.h
===================================================================
--- trunk/grub2/include/grub/i386/coreboot/machine.h	2009-07-13 23:04:31 UTC (rev 2406)
+++ trunk/grub2/include/grub/i386/coreboot/machine.h	2009-07-13 23:57:11 UTC (rev 2407)
@@ -19,6 +19,6 @@
 #ifndef GRUB_MACHINE_MACHINE_HEADER
 #define GRUB_MACHINE_MACHINE_HEADER	1
 
-#define GRUB_MACHINE_LINUXBIOS	1
+#define GRUB_MACHINE_COREBOOT	1
 
 #endif /* ! GRUB_MACHINE_MACHINE_HEADER */

Modified: trunk/grub2/loader/multiboot_loader.c
===================================================================
--- trunk/grub2/loader/multiboot_loader.c	2009-07-13 23:04:31 UTC (rev 2406)
+++ trunk/grub2/loader/multiboot_loader.c	2009-07-13 23:57:11 UTC (rev 2407)
@@ -139,7 +139,8 @@
 
   /* XXX Find a better way to identify this.
      This is for i386-pc */
-#if defined(GRUB_MACHINE_PCBIOS) || defined(GRUB_MACHINE_LINUXBIOS)
+#if defined(GRUB_MACHINE_PCBIOS) || defined(GRUB_MACHINE_COREBOOT) || \
+    defined(GRUB_MACHINE_QEMU)
   if (header_multi_ver_found == 1)
     {
       grub_dprintf ("multiboot_loader",
@@ -172,7 +173,8 @@
 			int argc, char *argv[])
 {
 
-#if defined(GRUB_MACHINE_PCBIOS) || defined(GRUB_MACHINE_LINUXBIOS)
+#if defined(GRUB_MACHINE_PCBIOS) || defined(GRUB_MACHINE_COREBOOT) || \
+    defined(GRUB_MACHINE_QEMU)
   if (module_version_status == 1)
     {
       grub_dprintf("multiboot_loader",