Detach optional parts of gfxterm and integrate in with coreboot init.

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-05-31 00:42:33 +02:00
parent 6570b2050e
commit fc4c4fddf6
26 changed files with 410 additions and 317 deletions

View file

@ -34,6 +34,7 @@
#include <grub/cpu/io.h>
#include <grub/cpu/floppy.h>
#include <grub/cpu/tsc.h>
#include <grub/video.h>
extern grub_uint8_t _start[];
extern grub_uint8_t _end[];
@ -89,6 +90,8 @@ grub_machine_init (void)
{
modend = grub_modules_get_end ();
grub_video_coreboot_fb_early_init ();
grub_vga_text_init ();
#ifdef GRUB_MACHINE_MULTIBOOT
@ -96,6 +99,11 @@ grub_machine_init (void)
#endif
grub_machine_mmap_iterate (heap_init, NULL);
grub_video_coreboot_fb_late_init ();
grub_font_init ();
grub_gfxterm_init ();
grub_tsc_init ();
}