[coreboot-gerrit] New patch to review for coreboot: 2ac32f5 lib/cbfs: more cleanup for 32/64 issues

[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/7068

-gerrit

commit 2ac32f50f0ea57336b100cdf49bedd253839914a
Author: Ronald G. Minnich <rminnich at gmail.com>
Date:   Thu Oct 16 10:57:01 2014 +0000

    lib/cbfs: more cleanup for 32/64 issues
    
    Change-Id: I5499a99cec82b464c5146cfc2008d683d079b23a
    Signed-off-by: Ronald G. Minnich <rminnich at gmail.com>
---
 src/lib/cbfs.c      | 4 ++--
 src/lib/cbfs_core.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c
index dc08937..de25736 100644
--- a/src/lib/cbfs.c
+++ b/src/lib/cbfs.c
@@ -123,7 +123,7 @@ void * cbfs_load_stage(struct cbfs_media *media, const char *name)
 		cbfs_get_file_content(media, name, CBFS_TYPE_STAGE, NULL);
 	/* this is a mess. There is no ntohll. */
 	/* for now, assume compatible byte order until we solve this. */
-	uint32_t entry;
+	uintptr_t entry;
 	uint32_t final_size;
 
 	if (stage == NULL)
@@ -137,7 +137,7 @@ void * cbfs_load_stage(struct cbfs_media *media, const char *name)
 	final_size = cbfs_decompress(stage->compression,
 				     ((unsigned char *) stage) +
 				     sizeof(struct cbfs_stage),
-				     (void *) (uint32_t) stage->load,
+				     (void *) (uintptr_t) stage->load,
 				     stage->len);
 	if (!final_size)
 		return (void *) -1;
diff --git a/src/lib/cbfs_core.c b/src/lib/cbfs_core.c
index 19cf83a..5e83a4e 100644
--- a/src/lib/cbfs_core.c
+++ b/src/lib/cbfs_core.c
@@ -220,7 +220,7 @@ int cbfs_decompress(int algo, void *src, void *dst, int len)
 		case CBFS_COMPRESS_NONE:
 			/* Reads need to be aligned at 4 bytes to avoid
 			   poor flash performance.  */
-			while (len && ((u32)src & 3)) {
+			while (len && ((uintptr_t)src & 3)) {
 				*(u8*)dst++ = *(u8*)src++;
 				len--;
 			}