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

* conf/Makefile.common (CPPFLAGS_KERNEL): Add -DGRUB_KERNEL=1.

Browse source 
* include/grub/dl.h (GRUB_MOD_INIT), (GRUB_MOD_FINI): Define
	functions when compiling for kernel.
This commit is contained in:
Vladimir Serbinenko 2013-10-25 16:07:01 +02:00
parent ea899a5760
commit af81ed880d
13 changed files with 27 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

10
grub-core/term/i386/pc/vga_text.c
View file

@ -270,15 +270,9 @@ static struct grub_term_output grub_vga_text_term =
.progress_update_divisor = GRUB_PROGRESS_FAST
};
/* FIXME: this is was too spaghetti. */
#ifndef MODE_MDA
#if defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU) || defined (GRUB_MACHINE_MIPS_QEMU_MIPS) || defined (GRUB_MACHINE_MULTIBOOT)
void grub_vga_text_init (void)
#else
GRUB_MOD_INIT(vga_text)
#endif
{
#ifdef GRUB_MACHINE_COREBOOT
if (!grub_video_coreboot_fbtable)
@ -286,11 +280,7 @@ GRUB_MOD_INIT(vga_text)
grub_term_register_output ("vga_text", &grub_vga_text_term);
}
#if defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU) || defined (GRUB_MACHINE_MIPS_QEMU_MIPS) || defined (GRUB_MACHINE_MULTIBOOT)
void grub_vga_text_fini (void)
#else
GRUB_MOD_FINI(vga_text)
#endif
{
grub_term_unregister_output (&grub_vga_text_term);
}