minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-13 14:06:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

sandbox: Use uintptr_t for 32/64-bit compatibility

Browse Source 
This fixes a problems when building on some 64-bit machines.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2011-09-17 06:48:58 +00:00 committed by Wolfgang Denk
parent c861fbf747
commit 925493582c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/cmd_mem.c
View File

@ -937,7 +937,7 @@ int do_mem_mtest (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
if (readback != val) { if (readback != val) {
printf ("\nMem error @ 0x%08X: " printf ("\nMem error @ 0x%08X: "
"found %08lX, expected %08lX\n", "found %08lX, expected %08lX\n",
(uint)addr, readback, val); (uint)(uintptr_t)addr, readback, val);
errs++; errs++;
if (ctrlc()) { if (ctrlc()) {
putc ('\n'); putc ('\n');

8
common/fdt_support.c
View File

@ -495,7 +495,7 @@ int fdt_resize(void *blob)
total = fdt_num_mem_rsv(blob); total = fdt_num_mem_rsv(blob);
for (i = 0; i < total; i++) { for (i = 0; i < total; i++) {
fdt_get_mem_rsv(blob, i, &addr, &size); 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); fdt_del_mem_rsv(blob, i);
break; break;
} }
@ -511,14 +511,14 @@ int fdt_resize(void *blob)
fdt_size_dt_strings(blob) + 5 * sizeof(struct fdt_reserve_entry); fdt_size_dt_strings(blob) + 5 * sizeof(struct fdt_reserve_entry);
/* Make it so the fdt ends on a page boundary */ /* Make it so the fdt ends on a page boundary */
actualsize = ALIGN(actualsize + ((uint)blob & 0xfff), 0x1000); actualsize = ALIGN(actualsize + ((uintptr_t)blob & 0xfff), 0x1000);
actualsize = actualsize - ((uint)blob & 0xfff); actualsize = actualsize - ((uintptr_t)blob & 0xfff);
/* Change the fdt header to reflect the correct size */ /* Change the fdt header to reflect the correct size */
fdt_set_totalsize(blob, actualsize); fdt_set_totalsize(blob, actualsize);
/* Add the new reservation */ /* 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) if (ret < 0)
return ret; return ret;