Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/83084?usp=email )
Change subject: include/device_tree.h: Fix function name fdt_node_name ......................................................................
include/device_tree.h: Fix function name fdt_node_name
Rename fdt_node_name to the actual function name and also rename the references.
Signed-off-by: Maximilian Brune maximilian.brune@9elements.com Change-Id: I527146df26264a0c3af1ad01c21644d751b80236 Reviewed-on: https://review.coreboot.org/c/coreboot/+/83084 Reviewed-by: Yu-Ping Wu yupingso@google.com Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Eric Lai ericllai@google.com --- M src/commonlib/include/commonlib/device_tree.h M src/lib/fit.c 2 files changed, 6 insertions(+), 8 deletions(-)
Approvals: Eric Lai: Looks good to me, but someone else must approve Yu-Ping Wu: Looks good to me, approved build bot (Jenkins): Verified
diff --git a/src/commonlib/include/commonlib/device_tree.h b/src/commonlib/include/commonlib/device_tree.h index be73357..81377fa 100644 --- a/src/commonlib/include/commonlib/device_tree.h +++ b/src/commonlib/include/commonlib/device_tree.h @@ -103,8 +103,11 @@ /* Read the property at offset, if any exists. */ int fdt_next_property(const void *blob, uint32_t offset, struct fdt_property *prop); -/* Read the name of the node at offset, if any exists. */ -int fdt_node_name(const void *blob, uint32_t offset, const char **name); +/* + * Read the node name into 'name' of the node behind 'node_offset' + * and return total bytes used for name + */ +int fdt_next_node_name(const void *blob, uint32_t node_offset, const char **name);
void fdt_print_node(const void *blob, uint32_t offset); int fdt_skip_node(const void *blob, uint32_t offset); @@ -123,11 +126,6 @@ /* Find a node by a given alias and return its offset */ u32 fdt_find_node_by_alias(const void *blob, const char *alias_name, u32 *addr_cells, u32 *size_cells); -/* - * Read the node name into 'name' of the node behind 'node_offset' - * and return total bytes used for name - */ -int fdt_next_node_name(const void *blob, uint32_t node_offset, const char **name);
/* Read memory regions from a flat device-tree. */ size_t fdt_read_memory_regions(const void *blob, struct device_tree_region regions[], diff --git a/src/lib/fit.c b/src/lib/fit.c index 7f0fe67..3bfca57 100644 --- a/src/lib/fit.c +++ b/src/lib/fit.c @@ -178,7 +178,7 @@ int offset = start_offset; int size;
- size = fdt_node_name(blob, offset, NULL); + size = fdt_next_node_name(blob, offset, NULL); if (!size) return -1; offset += size;