dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 16:52:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replace fdt_node_offset() with fdt_find_node_by_path().

Browse Source 
The new name matches more closely the kernel's name, which is also
a much better description.

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Acked-by: Gerald Van Baren <vanbaren@cideas.com>
This commit is contained in:
Gerald Van Baren
2007-06-06 22:47:58 -04:00
parent addd8ce830
commit 1a861169bc
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/cmd_fdt.c
View File

@@ -59,7 +59,7 @@ static int findnodeoffset(const char *pathp)
if (strcmp(pathp, "/") == 0) { if (strcmp(pathp, "/") == 0) {
nodeoffset = 0; nodeoffset = 0;
} else { } else {
nodeoffset = fdt_path_offset (fdt, pathp); nodeoffset = fdt_find_node_by_path (fdt, pathp);
if (nodeoffset < 0) { if (nodeoffset < 0) {
/* /*
* Not found or something else bad happened. * Not found or something else bad happened.

10
common/fdt_support.c
View File

@@ -97,7 +97,7 @@ int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force)
/* /*
* Find the "chosen" node. * Find the "chosen" node.
*/ */
nodeoffset = fdt_path_offset (fdt, "/chosen"); nodeoffset = fdt_find_node_by_path (fdt, "/chosen");
/* /*
* If we have a "chosen" node already the "force the writing" * If we have a "chosen" node already the "force the writing"
@@ -145,7 +145,7 @@ int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force)
printf("WARNING fdt_chosen: could not set \"linux,stdout-path\" (libfdt error %s).\n", fdt_strerror(err)); printf("WARNING fdt_chosen: could not set \"linux,stdout-path\" (libfdt error %s).\n", fdt_strerror(err));
#endif #endif
nodeoffset = fdt_path_offset (fdt, "/cpus"); nodeoffset = fdt_find_node_by_path (fdt, "/cpus");
if (nodeoffset >= 0) { if (nodeoffset >= 0) {
clock = cpu_to_be32(bd->bi_intfreq); clock = cpu_to_be32(bd->bi_intfreq);
err = fdt_setprop(fdt, nodeoffset, "clock-frequency", &clock, 4); err = fdt_setprop(fdt, nodeoffset, "clock-frequency", &clock, 4);
@@ -153,7 +153,7 @@ int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force)
printf("WARNING fdt_chosen: could not set \"clock-frequency\" (libfdt error %s).\n", fdt_strerror(err)); printf("WARNING fdt_chosen: could not set \"clock-frequency\" (libfdt error %s).\n", fdt_strerror(err));
} }
#ifdef OF_TBCLK #ifdef OF_TBCLK
nodeoffset = fdt_path_offset (fdt, "/cpus/" OF_CPU "/timebase-frequency"); nodeoffset = fdt_find_node_by_path (fdt, "/cpus/" OF_CPU "/timebase-frequency");
if (nodeoffset >= 0) { if (nodeoffset >= 0) {
clock = cpu_to_be32(OF_TBCLK); clock = cpu_to_be32(OF_TBCLK);
err = fdt_setprop(fdt, nodeoffset, "clock-frequency", &clock, 4); err = fdt_setprop(fdt, nodeoffset, "clock-frequency", &clock, 4);
@@ -190,7 +190,7 @@ int fdt_env(void *fdt)
* See if we already have a "u-boot-env" node, delete it if so. * See if we already have a "u-boot-env" node, delete it if so.
* Then create a new empty node. * Then create a new empty node.
*/ */
nodeoffset = fdt_path_offset (fdt, "/u-boot-env"); nodeoffset = fdt_find_node_by_path (fdt, "/u-boot-env");
if (nodeoffset >= 0) { if (nodeoffset >= 0) {
err = fdt_del_node(fdt, nodeoffset); err = fdt_del_node(fdt, nodeoffset);
if (err < 0) { if (err < 0) {
@@ -310,7 +310,7 @@ int fdt_bd_t(void *fdt)
* See if we already have a "bd_t" node, delete it if so. * See if we already have a "bd_t" node, delete it if so.
* Then create a new empty node. * Then create a new empty node.
*/ */
nodeoffset = fdt_path_offset (fdt, "/bd_t"); nodeoffset = fdt_find_node_by_path (fdt, "/bd_t");
if (nodeoffset >= 0) { if (nodeoffset >= 0) {
err = fdt_del_node(fdt, nodeoffset); err = fdt_del_node(fdt, nodeoffset);
if (err < 0) { if (err < 0) {

2
include/libfdt.h
View File

@@ -77,7 +77,7 @@ int fdt_subnode_offset_namelen(const void *fdt, int parentoffset,
const char *name, int namelen); const char *name, int namelen);
int fdt_subnode_offset(const void *fdt, int parentoffset, const char *name); int fdt_subnode_offset(const void *fdt, int parentoffset, const char *name);
int fdt_path_offset(const void *fdt, const char *path); int fdt_find_node_by_path(const void *fdt, const char *path);
struct fdt_property *fdt_get_property(const void *fdt, int nodeoffset, struct fdt_property *fdt_get_property(const void *fdt, int nodeoffset,
const char *name, int *lenp); const char *name, int *lenp);

2
libfdt/fdt_ro.c
View File

@@ -132,7 +132,7 @@ int fdt_subnode_offset(const void *fdt, int parentoffset,
* Searches for the node corresponding to the given path and returns the * Searches for the node corresponding to the given path and returns the
* offset of that node. * offset of that node.
*/ */
int fdt_path_offset(const void *fdt, const char *path) int fdt_find_node_by_path(const void *fdt, const char *path)
{ {
const char *end = path + strlen(path); const char *end = path + strlen(path);
const char *p = path; const char *p = path;