From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 28 Mar 2010 11:53:23 +0000 (+0200)
Subject: 	Multiboot2 tag support
X-Git-Tag: 1.99~996
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f97e1f7d0af7034c2a339c2ac3a257b48ea1d566;p=thirdparty%2Fgrub.git

	Multiboot2 tag support

	* conf/i386.rmk (multiboot2_mod_SOURCES): Replace
	loader/i386/multiboot_mbi.c with loader/i386/multiboot_mbi2.c.
	Remove loader/multiboot_loader.c.
	* include/grub/i386/multiboot.h (grub_multiboot_real_boot): Removed.
	(grub_multiboot2_real_boot): Likewise.
	* include/grub/multiboot.h (grub_multiboot_set_accepts_video): Removed.
	(grub_get_multiboot_mmap_count): New proto.
	(grub_fill_multiboot_mmap): Likewise.
	(grub_multiboot_set_video_mode): Likewise.
	(grub_multiboot_set_console): Likewise.
	(grub_multiboot_load): Likewise.
	(grub_multiboot_load_elf): Likewise.
	(GRUB_MULTIBOOT_CONSOLE_EGA_TEXT): New definition.
	(GRUB_MULTIBOOT_CONSOLE_FRAMEBUFFER): Likewise.
	* include/multiboot.h: Resynced with specification.
	* include/multiboot2.h: Resynced with specification.
	* loader/i386/multiboot_mbi.c (DEFAULT_VIDEO_MODE): Moved from here...
	* loader/i386/multiboot.c (DEFAULT_VIDEO_MODE): ... here.
	* loader/i386/multiboot_mbi.c (HAS_VGA_TEXT): Moved from here ..
	* include/grub/multiboot.h (GRUB_MACHINE_HAS_VGA_TEXT): ... here. All
	users updated.
	* loader/i386/multiboot_mbi.c (accepts_video): Moved from here...
	* loader/i386/multiboot.c (accepts_video): ... here. All users updated.
	* loader/i386/multiboot_mbi.c (grub_multiboot_set_accepts_video):
	Removed.
	* loader/i386/multiboot_mbi.c (grub_get_multiboot_mmap_len):
	Moved from here...
	* loader/i386/multiboot.c (grub_get_multiboot_mmap_len): ... here.
	* loader/i386/multiboot_mbi.c (grub_fill_multiboot_mmap):
	Moved from here...
	* loader/i386/multiboot.c (grub_fill_multiboot_mmap): ... here.
	* loader/i386/multiboot_mbi.c (set_video_mode): Moved from here...
	* loader/i386/multiboot.c (grub_multiboot_set_video_mode): ... here.
	All users updated.
	* loader/i386/multiboot_mbi2.c: New file.
---

f97e1f7d0af7034c2a339c2ac3a257b48ea1d566
diff --cc ChangeLog
index 86c1d6ceb,86c1d6ceb..b15ba47d5
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,3 +1,43 @@@
++2010-03-28  Vladimir Serbinenko  <phcoder@gmail.com>
++
++	Multiboot2 tag support
++
++	* conf/i386.rmk (multiboot2_mod_SOURCES): Replace
++	loader/i386/multiboot_mbi.c with loader/i386/multiboot_mbi2.c.
++	Remove loader/multiboot_loader.c.
++	* include/grub/i386/multiboot.h (grub_multiboot_real_boot): Removed.
++	(grub_multiboot2_real_boot): Likewise.
++	* include/grub/multiboot.h (grub_multiboot_set_accepts_video): Removed.
++	(grub_get_multiboot_mmap_count): New proto.
++	(grub_fill_multiboot_mmap): Likewise.
++	(grub_multiboot_set_video_mode): Likewise.
++	(grub_multiboot_set_console): Likewise.
++	(grub_multiboot_load): Likewise.
++	(grub_multiboot_load_elf): Likewise.
++	(GRUB_MULTIBOOT_CONSOLE_EGA_TEXT): New definition.
++	(GRUB_MULTIBOOT_CONSOLE_FRAMEBUFFER): Likewise.
++	* include/multiboot.h: Resynced with specification.
++	* include/multiboot2.h: Resynced with specification.
++	* loader/i386/multiboot_mbi.c (DEFAULT_VIDEO_MODE): Moved from here...
++	* loader/i386/multiboot.c (DEFAULT_VIDEO_MODE): ... here.
++	* loader/i386/multiboot_mbi.c (HAS_VGA_TEXT): Moved from here ..
++	* include/grub/multiboot.h (GRUB_MACHINE_HAS_VGA_TEXT): ... here. All
++	users updated.
++	* loader/i386/multiboot_mbi.c (accepts_video): Moved from here...
++	* loader/i386/multiboot.c (accepts_video): ... here. All users updated.
++	* loader/i386/multiboot_mbi.c (grub_multiboot_set_accepts_video):
++	Removed.
++	* loader/i386/multiboot_mbi.c (grub_get_multiboot_mmap_len):
++	Moved from here...
++	* loader/i386/multiboot.c (grub_get_multiboot_mmap_len): ... here.
++	* loader/i386/multiboot_mbi.c (grub_fill_multiboot_mmap):
++	Moved from here...
++	* loader/i386/multiboot.c (grub_fill_multiboot_mmap): ... here.
++	* loader/i386/multiboot_mbi.c (set_video_mode): Moved from here...
++	* loader/i386/multiboot.c (grub_multiboot_set_video_mode): ... here.
++	All users updated.
++	* loader/i386/multiboot_mbi2.c: New file.
++
  2010-03-27  Vladimir Serbinenko  <phcoder@gmail.com>
  
  	Resync with gnulib.