merged mainline into PCI

include/grub/i386/coreboot/boot.h

@@ -0,0 +1 @@
+#include <grub/i386/pc/boot.h>

include/grub/i386/coreboot/init.h

@@ -0,0 +1,28 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2007  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_INIT_I386_LINUXBIOS_HEADER
+#define GRUB_INIT_I386_LINUXBIOS_HEADER		1
+
+#include <grub/symbol.h>
+#include <grub/i386/pc/memory.h>
+
+void EXPORT_FUNC(grub_stop) (void) __attribute__ ((noreturn));
+void EXPORT_FUNC(grub_stop_floppy) (void);
+
+#endif

include/grub/i386/coreboot/loader.h

@@ -0,0 +1 @@
+#include <grub/cpu/loader.h>

include/grub/i386/coreboot/serial.h

@@ -0,0 +1 @@
+#include <grub/i386/pc/serial.h>

include/grub/i386/coreboot/time.h

@@ -0,0 +1 @@
+#include <grub/i386/pc/time.h>

include/grub/i386/multiboot.h

@@ -21,10 +21,10 @@
 
 /* The asm part of the multiboot loader.  */
 void grub_multiboot_real_boot (grub_addr_t entry,
-			       struct grub_multiboot_info *mbi)
+			       struct multiboot_info *mbi)
      __attribute__ ((noreturn));
 void grub_multiboot2_real_boot (grub_addr_t entry,
-				struct grub_multiboot_info *mbi)
+				struct multiboot_info *mbi)
      __attribute__ ((noreturn));
 
 extern grub_addr_t grub_multiboot_payload_orig;