2010-01-22 Robert Millan <rmh.grub@aybabtu.com>

	Use generic grub_reboot() for i386-efi.

	* kern/efi/efi.c [__i386__] (grub_reboot): Remove.
	* kern/i386/efi/startup.S: Include `"../realmode.S"'.
	* kern/i386/realmode.S: Include `<grub/i386/pc/memory.h>'.

diff --git a/ChangeLog b/ChangeLog
index 5eef8a8212aee692bdfd52d60fa5cb47afeda258..e559f218e53362ac5ea5b1686e99ccaef502d4cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-22  Robert Millan  <rmh.grub@aybabtu.com>
+
+       Use generic grub_reboot() for i386-efi.
+
+       * kern/efi/efi.c [__i386__] (grub_reboot): Remove.
+       * kern/i386/efi/startup.S: Include `"../realmode.S"'.
+       * kern/i386/realmode.S: Include `<grub/i386/pc/memory.h>'.
+
 2010-01-22  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * kern/ieee1275/init.c (grub_machine_set_prefix): Don't check for

diff --git a/kern/efi/efi.c b/kern/efi/efi.c
index c6ce04c5e5026ea8ac40289c7e10a7d1e6946b43..d8b22553545ee4afdd1d32a9f444da15f337ba5b 100644 (file)
--- a/kern/efi/efi.c
+++ b/kern/efi/efi.c
@@ -1,7 +1,7 @@
 /* efi.c - generic EFI support */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2006,2007,2008,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2006,2007,2008,2009,2010  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
@@ -162,6 +162,8 @@ grub_exit (void)
   for (;;) ;
 }
 
+/* On i386, a firmware-independant grub_reboot() is provided by realmode.S.  */
+#ifndef __i386__
 void
 grub_reboot (void)
 {
@@ -169,6 +171,7 @@ grub_reboot (void)
   efi_call_4 (grub_efi_system_table->runtime_services->reset_system,
               GRUB_EFI_RESET_COLD, GRUB_EFI_SUCCESS, 0, NULL);
 }
+#endif
 
 void
 grub_halt (void)

diff --git a/kern/i386/efi/startup.S b/kern/i386/efi/startup.S
index b886280108ab5092c33829da29cec76ec696bbc7..5b464ab83c3fe70048785053b238fa834adcc795 100644 (file)
--- a/kern/i386/efi/startup.S
+++ b/kern/i386/efi/startup.S
@@ -1,7 +1,7 @@
 /* startup.S - bootstrap GRUB itself */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2006,2007  Free Software Foundation, Inc.
+ *  Copyright (C) 2006,2007,2010  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
@@ -62,3 +62,5 @@ codestart:
        movl    %eax, EXT_C(grub_efi_system_table)
        call    EXT_C(grub_main)
        ret
+
+#include "../realmode.S"

diff --git a/kern/i386/realmode.S b/kern/i386/realmode.S
index a74eb12174e589474024b95a66de384348a685ec..578c8d2a8bbcf378ea7380aaab779010bfa1748e 100644 (file)
--- a/kern/i386/realmode.S
+++ b/kern/i386/realmode.S
@@ -1,6 +1,6 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 1999,2000,2001,2002,2003,2005,2006,2007,2009 Free Software Foundation, Inc.
+ *  Copyright (C) 1999,2000,2001,2002,2003,2005,2006,2007,2009,2010 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
@@ -16,6 +16,7 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <grub/i386/pc/memory.h>
 
 /*
  * Note: These functions defined in this file may be called from C.