vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/kern/i386/coreboot/init.c: Fix compilation on

Browse source 
i386-multiboot.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-08-14 10:43:10 +02:00
parent 797abd0a23
commit 2af2353b0a
2 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-08-14 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/i386/coreboot/init.c: Fix compilation on
i386-multiboot.
2013-08-14 Vladimir Serbinenko <phcoder@gmail.com> 2013-08-14 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/vga_init.c: Fix compilation on qemu-mips. * grub-core/kern/vga_init.c: Fix compilation on qemu-mips.

22
grub-core/kern/i386/coreboot/init.c
View file

@ -85,6 +85,8 @@ heap_init (grub_uint64_t addr, grub_uint64_t size, grub_memory_type_t type,
return 0; return 0;
} }
#ifndef GRUB_MACHINE_MULTIBOOT
void void
grub_machine_init (void) grub_machine_init (void)
{ {
@ -94,9 +96,6 @@ grub_machine_init (void)
grub_vga_text_init (); grub_vga_text_init ();
#ifdef GRUB_MACHINE_MULTIBOOT
grub_machine_mmap_init ();
#endif
grub_machine_mmap_iterate (heap_init, NULL); grub_machine_mmap_iterate (heap_init, NULL);
grub_video_coreboot_fb_late_init (); grub_video_coreboot_fb_late_init ();
@ -107,6 +106,23 @@ grub_machine_init (void)
grub_tsc_init (); grub_tsc_init ();
} }
#else
void
grub_machine_init (void)
{
modend = grub_modules_get_end ();
grub_vga_text_init ();
grub_machine_mmap_init ();
grub_machine_mmap_iterate (heap_init, NULL);
grub_tsc_init ();
}
#endif
void void
grub_machine_get_bootlocation (char **device __attribute__ ((unused)), grub_machine_get_bootlocation (char **device __attribute__ ((unused)),
char **path __attribute__ ((unused))) char **path __attribute__ ((unused)))