diff options
| author | Simon Glass <sjg@chromium.org> | 2011-09-17 06:48:58 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-10-17 23:56:59 +0200 |
| commit | 925493582cc6e0760df813a9897464c77d5c7b25 (patch) | |
| tree | f7553c24f068c0c18601b1e6d6abf8ed8525b7b8 | |
| parent | c861fbf74784fdd27a5a73dec1f5c37e1bb7297e (diff) | |
| download | u-boot-imx-925493582cc6e0760df813a9897464c77d5c7b25.zip u-boot-imx-925493582cc6e0760df813a9897464c77d5c7b25.tar.gz u-boot-imx-925493582cc6e0760df813a9897464c77d5c7b25.tar.bz2 | |
sandbox: Use uintptr_t for 32/64-bit compatibility
This fixes a problems when building on some 64-bit machines.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | common/cmd_mem.c | 2 | ||||
| -rw-r--r-- | common/fdt_support.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/common/cmd_mem.c b/common/cmd_mem.c index e84cc4e..28476d7 100644 --- a/common/cmd_mem.c +++ b/common/cmd_mem.c @@ -937,7 +937,7 @@ int do_mem_mtest (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (readback != val) { printf ("\nMem error @ 0x%08X: " "found %08lX, expected %08lX\n", - (uint)addr, readback, val); + (uint)(uintptr_t)addr, readback, val); errs++; if (ctrlc()) { putc ('\n'); diff --git a/common/fdt_support.c b/common/fdt_support.c index abf6d53..e0d3fe3 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -495,7 +495,7 @@ int fdt_resize(void *blob) total = fdt_num_mem_rsv(blob); for (i = 0; i < total; i++) { fdt_get_mem_rsv(blob, i, &addr, &size); - if (addr == (uint64_t)(u32)blob) { + if (addr == (uintptr_t)blob) { fdt_del_mem_rsv(blob, i); break; } @@ -511,14 +511,14 @@ int fdt_resize(void *blob) fdt_size_dt_strings(blob) + 5 * sizeof(struct fdt_reserve_entry); /* Make it so the fdt ends on a page boundary */ - actualsize = ALIGN(actualsize + ((uint)blob & 0xfff), 0x1000); - actualsize = actualsize - ((uint)blob & 0xfff); + actualsize = ALIGN(actualsize + ((uintptr_t)blob & 0xfff), 0x1000); + actualsize = actualsize - ((uintptr_t)blob & 0xfff); /* Change the fdt header to reflect the correct size */ fdt_set_totalsize(blob, actualsize); /* Add the new reservation */ - ret = fdt_add_mem_rsv(blob, (uint)blob, actualsize); + ret = fdt_add_mem_rsv(blob, (uintptr_t)blob, actualsize); if (ret < 0) return ret; |