summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2021-09-03 16:16:18 +0300
committerTom Warren <twarren@nvidia.com>2021-10-14 00:18:30 +0300
commit4bf88ba76abb224b3ca258a2f502384ec6c86bd6 (patch)
tree74ac3ca45b7a69addd61faf887b20a175e92aa16 /lib
parentd5598cfa9bcab50812b2b416af91c2a37be67531 (diff)
downloadu-boot-4bf88ba76abb224b3ca258a2f502384ec6c86bd6.tar.xz
fdtdec: Support retrieving the name of a carveout
When retrieving a given carveout for a device, allow callers to query the name. This helps differentiating between carveouts when there are more than one. This is also useful when copying carveouts to help assign a meaningful name that cannot always be guessed. Signed-off-by: Thierry Reding <treding@nvidia.com> Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Warren <twarren@nvidia.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/fdtdec.c12
-rw-r--r--lib/fdtdec_test.c3
2 files changed, 10 insertions, 5 deletions
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index f2861eb395..3ada77d80c 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -1406,8 +1406,9 @@ int fdtdec_add_reserved_memory(void *blob, const char *basename,
return 0;
}
-int fdtdec_get_carveout(const void *blob, const char *node, const char *name,
- unsigned int index, struct fdt_memory *carveout)
+int fdtdec_get_carveout(const void *blob, const char *node,
+ const char *prop_name, unsigned int index,
+ struct fdt_memory *carveout, const char **name)
{
const fdt32_t *prop;
uint32_t phandle;
@@ -1418,9 +1419,9 @@ int fdtdec_get_carveout(const void *blob, const char *node, const char *name,
if (offset < 0)
return offset;
- prop = fdt_getprop(blob, offset, name, &len);
+ prop = fdt_getprop(blob, offset, prop_name, &len);
if (!prop) {
- debug("failed to get %s for %s\n", name, node);
+ debug("failed to get %s for %s\n", prop_name, node);
return -FDT_ERR_NOTFOUND;
}
@@ -1442,6 +1443,9 @@ int fdtdec_get_carveout(const void *blob, const char *node, const char *name,
return offset;
}
+ if (name)
+ *name = fdt_get_name(blob, offset, NULL);
+
carveout->start = fdtdec_get_addr_size_auto_noparent(blob, offset,
"reg", 0, &size,
true);
diff --git a/lib/fdtdec_test.c b/lib/fdtdec_test.c
index e0c6e0971c..760aca2669 100644
--- a/lib/fdtdec_test.c
+++ b/lib/fdtdec_test.c
@@ -214,7 +214,8 @@ static int check_fdt_carveout(void *fdt, uint32_t address_cells,
printf("carveout: %pap-%pap na=%u ns=%u: ", &expected.start,
&expected.end, address_cells, size_cells);
- CHECK(fdtdec_get_carveout(fdt, name, "memory-region", 0, &carveout));
+ CHECK(fdtdec_get_carveout(fdt, name, "memory-region", 0, &carveout,
+ NULL));
if ((carveout.start != expected.start) ||
(carveout.end != expected.end)) {