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

* grub-core/kern/vga_init.c: Fix compilation on qemu-mips.

Browse source 
* grub-core/kern/mips/qemu_mips/init.c: Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-08-14 09:50:57 +02:00
parent 36e87d25e1
commit 797abd0a23
3 changed files with 5 additions and 6 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/vga_init.c: Fix compilation on qemu-mips.
* grub-core/kern/mips/qemu_mips/init.c: Likewise.
2013-08-13 Colin Watson <cjwatson@ubuntu.com> 2013-08-13 Colin Watson <cjwatson@ubuntu.com>
* util/getroot.c (grub_util_biosdisk_get_grub_dev): Zero out * util/getroot.c (grub_util_biosdisk_get_grub_dev): Zero out

2
grub-core/kern/mips/qemu_mips/init.c
View file

@ -57,8 +57,6 @@ grub_machine_init (void)
grub_install_get_time_ms (grub_rtc_get_time_ms); grub_install_get_time_ms (grub_rtc_get_time_ms);
grub_font_init ();
grub_keylayouts_init (); grub_keylayouts_init ();
grub_at_keyboard_init (); grub_at_keyboard_init ();

4
grub-core/kern/vga_init.c
View file

@ -46,11 +46,7 @@ static struct {grub_uint8_t r, g, b, a; } colors[] =
{0xFE, 0xFE, 0xFE, 0xFF} // 15 = white {0xFE, 0xFE, 0xFE, 0xFF} // 15 = white
}; };
#ifdef __mips__
extern unsigned char ascii_bitmaps[];
#else
#include <ascii.h> #include <ascii.h>
#endif
#ifdef __mips__ #ifdef __mips__
#define VGA_ADDR 0xb00a0000 #define VGA_ADDR 0xb00a0000