summaryrefslogtreecommitdiff
path: root/lib/fdtdec.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-10-23 18:58:51 -0600
committerSimon Glass <sjg@chromium.org>2014-11-21 04:43:17 +0100
commit76489832b28d158dd341b8992006576584cd204b (patch)
tree4fa101cce03036a05e639dea3c30fe417d372a26 /lib/fdtdec.c
parenta9e8e29101adcb0bfa1c39baba5fce6b9848678d (diff)
downloadu-boot-imx-76489832b28d158dd341b8992006576584cd204b.zip
u-boot-imx-76489832b28d158dd341b8992006576584cd204b.tar.gz
u-boot-imx-76489832b28d158dd341b8992006576584cd204b.tar.bz2
fdt: Use the correct return types for fdtdec_decode_region()
Use the correct FDT data types for this function. Also add more debugging. Acked-by: Anatolij Gustschin <agust@denx.de> Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'lib/fdtdec.c')
-rw-r--r--lib/fdtdec.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 9714620..749f66e 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -669,20 +669,25 @@ char *fdtdec_get_config_string(const void *blob, const char *prop_name)
return (char *)nodep;
}
-int fdtdec_decode_region(const void *blob, int node,
- const char *prop_name, void **ptrp, size_t *size)
+int fdtdec_decode_region(const void *blob, int node, const char *prop_name,
+ fdt_addr_t *basep, fdt_size_t *sizep)
{
const fdt_addr_t *cell;
int len;
- debug("%s: %s\n", __func__, prop_name);
+ debug("%s: %s: %s\n", __func__, fdt_get_name(blob, node, NULL),
+ prop_name);
cell = fdt_getprop(blob, node, prop_name, &len);
- if (!cell || (len != sizeof(fdt_addr_t) * 2))
+ if (!cell || (len < sizeof(fdt_addr_t) * 2)) {
+ debug("cell=%p, len=%d\n", cell, len);
return -1;
+ }
+
+ *basep = fdt_addr_to_cpu(*cell);
+ *sizep = fdt_size_to_cpu(cell[1]);
+ debug("%s: base=%08lx, size=%lx\n", __func__, (ulong)*basep,
+ (ulong)*sizep);
- *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;
}