Resync changelog

diff --git a/ChangeLog.tag b/ChangeLog.tag
index dbeea10179cd9656791c51b0c5a1a163c2e759c5..73983b4631edf1af46a5139290fab9be4183c4d3 100644 (file)
--- a/ChangeLog.tag
+++ b/ChangeLog.tag
@@ -4,13 +4,20 @@
 
        * 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_len): New proto.
+       (grub_get_multiboot_mmap_count): New proto.
        (grub_fill_multiboot_mmap): Likewise.
        (grub_multiboot_set_video_mode): Likewise.
        (grub_multiboot_fill_vbe_info_real): 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.