From 4aa237c8a400d1a70e75be45e97b6f205b34413e Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Sun, 16 Jun 2013 04:19:38 +0200 Subject: [PATCH] Fix casts when compiling coreboot-specific code for 64-bit EFI. --- ChangeLog | 4 ++++ grub-core/commands/i386/coreboot/cbls.c | 3 ++- grub-core/fs/cbfs.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8208b09d7..e71a84854 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-06-16 Vladimir Serbinenko + + Fix casts when compiling coreboot-specific code for 64-bit EFI. + 2013-06-16 Vladimir Serbinenko Don't try to detect cbfs on *-emu. diff --git a/grub-core/commands/i386/coreboot/cbls.c b/grub-core/commands/i386/coreboot/cbls.c index a3542f372..e0a10596f 100644 --- a/grub-core/commands/i386/coreboot/cbls.c +++ b/grub-core/commands/i386/coreboot/cbls.c @@ -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", 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->blue_mask_size, fb->reserved_mask_size, fb->red_field_pos, fb->green_field_pos, diff --git a/grub-core/fs/cbfs.c b/grub-core/fs/cbfs.c index e298db362..58a8427d5 100644 --- a/grub-core/fs/cbfs.c +++ b/grub-core/fs/cbfs.c @@ -331,7 +331,7 @@ init_cbfsdisk (void) struct cbfs_header *head; ptr = *(grub_uint32_t *) 0xfffffffc; - head = (struct cbfs_header *) ptr; + head = (struct cbfs_header *) (grub_addr_t) ptr; if (!validate_head (head)) return;