summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-11-25 10:42:53 -0500
committerTom Rini <trini@ti.com>2013-11-25 10:42:53 -0500
commit74279d37613cb3081ee1680d67b2aed1f934472a (patch)
tree6528e6a0a08a53856c7d31a7eed28dc4d2ec0d21 /lib
parent1a1326d2da9b2904bc90fb2990f829cb1ecef312 (diff)
parented072b96efd7a5de51cef01c3d4bed4db0e391f0 (diff)
downloadblackbird-obmc-uboot-74279d37613cb3081ee1680d67b2aed1f934472a.tar.gz
blackbird-obmc-uboot-74279d37613cb3081ee1680d67b2aed1f934472a.zip
Merge branch 'sandbox1' of http://git.denx.de/u-boot-x86
Diffstat (limited to 'lib')
-rw-r--r--lib/fdtdec.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 51fa868333..207314fa72 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -86,10 +86,10 @@ fdt_addr_t fdtdec_get_addr_size(const void *blob, int node,
size = (fdt_size_t *)((char *)cell +
sizeof(fdt_addr_t));
*sizep = fdt_size_to_cpu(*size);
- debug("addr=%p, size=%p\n", (void *)addr,
- (void *)*sizep);
+ debug("addr=%08lx, size=%08x\n",
+ (ulong)addr, *sizep);
} else {
- debug("%p\n", (void *)addr);
+ debug("%08lx\n", (ulong)addr);
}
return addr;
}
@@ -611,7 +611,7 @@ int fdtdec_decode_region(const void *blob, int node,
if (!cell || (len != sizeof(fdt_addr_t) * 2))
return -1;
- *ptrp = (void *)fdt_addr_to_cpu(*cell);
+ *ptrp = map_sysmem(fdt_addr_to_cpu(*cell), *size);
*size = fdt_size_to_cpu(cell[1]);
debug("%s: size=%zx\n", __func__, *size);
return 0;
OpenPOWER on IntegriCloud