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

diff --git a/ChangeLog b/ChangeLog
index 8208b09d7b822940bf3999318125829e6831b7ca..e71a848548c9166509f84c61166dcef0821258dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        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 a3542f37277ee96eff940fee58410f7c3ce6fdd7..e0a10596fe279331cca94172e1f452fdfe18394f 100644 (file)
--- 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 e298db36281f6a583fa02d3a2cfa8df5fa9e9bb4..58a8427d5dd6d050ead83efeaef2a15d375327c2 100644 (file)
--- 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;