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

merge multiterm into gfxmenu+multiterm

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2009-12-27 17:24:16 +01:00
commit fad68f4cca
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
term/gfxterm.c
View file

@ -1176,7 +1176,12 @@ static grub_extcmd_t background_image_cmd_handle;
GRUB_MOD_INIT(term_gfxterm) GRUB_MOD_INIT(term_gfxterm)
{ {
#ifdef GRUB_MACHINE_MIPS_YEELOONG
grub_term_register_output_active ("gfxterm", &grub_video_term);
#else
grub_term_register_output ("gfxterm", &grub_video_term); grub_term_register_output ("gfxterm", &grub_video_term);
#endif
background_image_cmd_handle = background_image_cmd_handle =
grub_register_extcmd ("background_image", grub_register_extcmd ("background_image",
grub_gfxterm_background_image_cmd, grub_gfxterm_background_image_cmd,

2
term/i386/pc/at_keyboard.c
View file

@ -233,7 +233,7 @@ static struct grub_term_input grub_at_keyboard_term =
GRUB_MOD_INIT(at_keyboard) GRUB_MOD_INIT(at_keyboard)
{ {
#if defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU) #if defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU) || defined (GRUB_MACHINE_MIPS_YEELOONG)
grub_term_register_input_active ("at_keyboard", &grub_at_keyboard_term); grub_term_register_input_active ("at_keyboard", &grub_at_keyboard_term);
#else #else
grub_term_register_input ("at_keyboard", &grub_at_keyboard_term); grub_term_register_input ("at_keyboard", &grub_at_keyboard_term);