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

Fix casts when compiling coreboot-specific code for 64-bit EFI.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-06-16 04:19:38 +02:00
parent 93d8479b70
commit 4aa237c8a4
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-06-16 Vladimir Serbinenko <phcoder@gmail.com>
Fix casts when compiling coreboot-specific code for 64-bit EFI.
2013-06-16 Vladimir Serbinenko <phcoder@gmail.com> 2013-06-16 Vladimir Serbinenko <phcoder@gmail.com>
Don't try to detect cbfs on *-emu. Don't try to detect cbfs on *-emu.

3
grub-core/commands/i386/coreboot/cbls.c
View file

@ -84,7 +84,8 @@ iterate_linuxbios_table (grub_linuxbios_table_item_t table_item,
grub_printf (": %dx%dx%d pitch=%d lfb=0x%llx %d/%d/%d/%d %d/%d/%d/%d", grub_printf (": %dx%dx%d pitch=%d lfb=0x%llx %d/%d/%d/%d %d/%d/%d/%d",
fb->width, fb->height, fb->width, fb->height,
fb->bpp, fb->pitch, fb->lfb, fb->bpp, fb->pitch,
(unsigned long long) fb->lfb,
fb->red_mask_size, fb->green_mask_size, fb->red_mask_size, fb->green_mask_size,
fb->blue_mask_size, fb->reserved_mask_size, fb->blue_mask_size, fb->reserved_mask_size,
fb->red_field_pos, fb->green_field_pos, fb->red_field_pos, fb->green_field_pos,

2
grub-core/fs/cbfs.c
View file

@ -331,7 +331,7 @@ init_cbfsdisk (void)
struct cbfs_header *head; struct cbfs_header *head;
ptr = *(grub_uint32_t *) 0xfffffffc; ptr = *(grub_uint32_t *) 0xfffffffc;
head = (struct cbfs_header *) ptr; head = (struct cbfs_header *) (grub_addr_t) ptr;
if (!validate_head (head)) if (!validate_head (head))
return; return;