diff --git a/src/arch/armv7/boot/coreboot_table.c b/src/arch/armv7/boot/coreboot_table.c
index 9f67da0e1b..86a004d887 100644
--- a/src/arch/armv7/boot/coreboot_table.c
+++ b/src/arch/armv7/boot/coreboot_table.c
@@ -251,7 +251,7 @@ static void add_cbmem_pointers(struct lb_header *header)
 		}
 		cbmem_ref->tag = sid->table_tag;
 		cbmem_ref->size = sizeof(*cbmem_ref);
-		cbmem_ref->cbmem_addr = cbmem_addr;
+		cbmem_ref->cbmem_addr = (unsigned long)cbmem_addr;
 	}
 }
 
diff --git a/src/arch/x86/boot/coreboot_table.c b/src/arch/x86/boot/coreboot_table.c
index 18ec6d8c3c..8dccd77287 100644
--- a/src/arch/x86/boot/coreboot_table.c
+++ b/src/arch/x86/boot/coreboot_table.c
@@ -251,7 +251,7 @@ static void add_cbmem_pointers(struct lb_header *header)
 		}
 		cbmem_ref->tag = sid->table_tag;
 		cbmem_ref->size = sizeof(*cbmem_ref);
-		cbmem_ref->cbmem_addr = cbmem_addr;
+		cbmem_ref->cbmem_addr = (unsigned long)cbmem_addr;
 	}
 }
 
diff --git a/src/include/boot/coreboot_tables.h b/src/include/boot/coreboot_tables.h
index 5d5ca2cf56..9cf90d3bc9 100644
--- a/src/include/boot/coreboot_tables.h
+++ b/src/include/boot/coreboot_tables.h
@@ -229,7 +229,7 @@ struct lb_cbmem_ref {
 	uint32_t tag;
 	uint32_t size;
 
-	void	*cbmem_addr;
+	uint64_t cbmem_addr;
 };
 
 #define LB_TAG_VBNV		0x0019