summaryrefslogtreecommitdiff
path: root/cpu/mpc83xx/cpu.c
diff options
context:
space:
mode:
authorJerry Van Baren <gvb.uboot@gmail.com>2007-07-04 21:27:30 -0400
committerKim Phillips <kim.phillips@freescale.com>2007-08-10 01:12:03 -0500
commit26d02c9bbac1751c5e19294f000100b48d43a920 (patch)
tree0e54fdfc94ee0c3fd33e8d6861625700b58e12ae /cpu/mpc83xx/cpu.c
parent9be39a67c9f8fef7107f5df09d673005f04d0963 (diff)
downloadu-boot-imx-26d02c9bbac1751c5e19294f000100b48d43a920.zip
u-boot-imx-26d02c9bbac1751c5e19294f000100b48d43a920.tar.gz
u-boot-imx-26d02c9bbac1751c5e19294f000100b48d43a920.tar.bz2
mpc83xx: Replace fdt_node_offset() with fdt_find_node_by_path().
The new name matches more closely the kernel's name, which is also a much better description. These are the mpc83xx changes made necessary by the function name change. Signed-off-by: Wolfgang Grandegger <wg@grandegger.com> Acked-by: Gerald Van Baren <vanbaren@cideas.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Diffstat (limited to 'cpu/mpc83xx/cpu.c')
-rw-r--r--cpu/mpc83xx/cpu.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/cpu/mpc83xx/cpu.c b/cpu/mpc83xx/cpu.c
index bfac227..40e8d0c 100644
--- a/cpu/mpc83xx/cpu.c
+++ b/cpu/mpc83xx/cpu.c
@@ -33,8 +33,7 @@
#include <asm/processor.h>
#if defined(CONFIG_OF_FLAT_TREE)
#include <ft_build.h>
-#endif
-#if defined(CONFIG_OF_LIBFDT)
+#elif defined(CONFIG_OF_LIBFDT)
#include <libfdt.h>
#include <libfdt_env.h>
#endif
@@ -490,7 +489,7 @@ ft_cpu_setup(void *blob, bd_t *bd)
int j;
for (j = 0; j < (sizeof(fixup_props) / sizeof(fixup_props[0])); j++) {
- nodeoffset = fdt_path_offset(fdt, fixup_props[j].node);
+ nodeoffset = fdt_find_node_by_path(fdt, fixup_props[j].node);
if (nodeoffset >= 0) {
err = (*fixup_props[j].set_fn)(blob, nodeoffset, fixup_props[j].prop, bd);
if (err < 0)
@@ -501,9 +500,7 @@ ft_cpu_setup(void *blob, bd_t *bd)
}
}
}
-#endif
-
-#if defined(CONFIG_OF_FLAT_TREE)
+#elif defined(CONFIG_OF_FLAT_TREE)
void
ft_cpu_setup(void *blob, bd_t *bd)
{