[coreboot-gerrit] Patch set updated for coreboot: b6daa62 cbfs: 64-bit cleanups

[Ronald G. Minnich (rminnich@gmail.com)]

Ronald G. Minnich (rminnich at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4037

-gerrit

commit b6daa62acafb42b61d1a56eb3fbc7e9715b62fec
Author: Ronald G. Minnich <rminnich at google.com>
Date:   Mon Nov 11 10:36:28 2013 -0800

    cbfs: 64-bit cleanups
    
    cbfs used u32 in a number of cases where uintptr_t was
    correct. This change builds for both 64-bit and 32-bit
    boards.
    
    Change-Id: If42c722a8a9e8d565d3827f65ed6c2cb8e90ba60
    Signed-off-by: Ronald G. Minnich <rminnich at google.com>
---
 src/lib/cbmem.c    | 2 +-
 src/lib/selfboot.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/lib/cbmem.c b/src/lib/cbmem.c
index de49816..6449b55 100644
--- a/src/lib/cbmem.c
+++ b/src/lib/cbmem.c
@@ -200,7 +200,7 @@ void *cbmem_add(u32 id, u64 size)
 	cbmem_toc[0].base += size;
 	cbmem_toc[0].size -= size;
 
-	return (void *)(u32)cbmem_toc[i].base;
+	return (void *)(uintptr_t)cbmem_toc[i].base;
 }
 
 void *cbmem_find(u32 id)
diff --git a/src/lib/selfboot.c b/src/lib/selfboot.c
index f69ad14..222eae2 100644
--- a/src/lib/selfboot.c
+++ b/src/lib/selfboot.c
@@ -305,7 +305,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg)
 static int build_self_segment_list(
 	struct segment *head,
 	struct lb_memory *mem,
-	struct cbfs_payload *payload, u32 *entry)
+	struct cbfs_payload *payload, uintptr_t *entry)
 {
 	struct segment *new;
 	struct segment *ptr;
@@ -332,8 +332,9 @@ static int build_self_segment_list(
 			new->s_memsz = ntohl(segment->mem_len);
 			new->compression = ntohl(segment->compression);
 
-			new->s_srcaddr = (u32) ((unsigned char *)first_segment)
-						+ ntohl(segment->offset);
+			new->s_srcaddr = (uintptr_t)
+				((unsigned char *)first_segment)
+				+ ntohl(segment->offset);
 			new->s_filesz = ntohl(segment->len);
 			printk(BIOS_DEBUG, "  New segment dstaddr 0x%lx memsize 0x%lx srcaddr 0x%lx filesize 0x%lx\n",
 				new->s_dstaddr, new->s_memsz, new->s_srcaddr, new->s_filesz);
@@ -504,7 +505,7 @@ static int load_self_segments(
 
 void *selfload(struct lb_memory *mem, struct cbfs_payload *payload)
 {
-	u32 entry=0;
+	uintptr_t entry = 0;
 	struct segment head;
 
 	/* Preprocess the self segments */