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

* grub-core/loader/i386/linux.c (grub_linux_boot): Default to

Browse source 
gfxpayload=keep if cbfb is active.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-04-24 14:53:00 +02:00
parent e343549ca9
commit 1a40f80c98
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-04-24 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/loader/i386/linux.c (grub_linux_boot): Default to
gfxpayload=keep if cbfb is active.
2013-04-24 Vladimir Serbinenko <phcoder@gmail.com> 2013-04-24 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/disk/ata.c (grub_ata_real_open): Use grub_error properly. * grub-core/disk/ata.c (grub_ata_real_open): Use grub_error properly.

15
grub-core/loader/i386/linux.c
View file

@ -503,15 +503,20 @@ grub_linux_boot (void)
#endif #endif
grub_free (tmp); grub_free (tmp);
} }
else else /* We can't go back to text mode from coreboot fb. */
{ #ifdef GRUB_MACHINE_COREBOOT
if (grub_video_get_driver_id () == GRUB_VIDEO_DRIVER_COREBOOT)
err = GRUB_ERR_NONE;
else
#endif
{
#if ACCEPTS_PURE_TEXT #if ACCEPTS_PURE_TEXT
err = grub_video_set_mode (DEFAULT_VIDEO_MODE, 0, 0); err = grub_video_set_mode (DEFAULT_VIDEO_MODE, 0, 0);
#else #else
err = grub_video_set_mode (DEFAULT_VIDEO_MODE, err = grub_video_set_mode (DEFAULT_VIDEO_MODE,
GRUB_VIDEO_MODE_TYPE_PURE_TEXT, 0); GRUB_VIDEO_MODE_TYPE_PURE_TEXT, 0);
#endif #endif
} }
if (err) if (err)
{ {