minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-14 22:46:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

mpc83xx: 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.

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>
This commit is contained in:
Jerry Van Baren 2007-07-04 21:27:30 -04:00 committed by Kim Phillips
parent 9be39a67c9
commit 26d02c9bba
3 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
board/mpc8360emds/mpc8360emds.c
View File

@ -30,8 +30,7 @@
#endif #endif
#if defined(CONFIG_OF_FLAT_TREE) #if defined(CONFIG_OF_FLAT_TREE)
#include <ft_build.h> #include <ft_build.h>
#endif #elif defined(CONFIG_OF_LIBFDT)
#if defined(CONFIG_OF_LIBFDT)
#include <libfdt.h> #include <libfdt.h>
#include <libfdt_env.h> #include <libfdt_env.h>
#endif #endif
@ -683,7 +682,7 @@ ft_board_setup(void *blob, bd_t *bd)
int nodeoffset; int nodeoffset;
int tmp[2]; int tmp[2];
nodeoffset = fdt_path_offset (fdt, "/memory"); nodeoffset = fdt_find_node_by_path(fdt, "/memory");
if (nodeoffset >= 0) { if (nodeoffset >= 0) {
tmp[0] = cpu_to_be32(bd->bi_memstart); tmp[0] = cpu_to_be32(bd->bi_memstart);
tmp[1] = cpu_to_be32(bd->bi_memsize); tmp[1] = cpu_to_be32(bd->bi_memsize);

20
board/mpc8360emds/pci.c
View File

@ -20,8 +20,7 @@
#include <i2c.h> #include <i2c.h>
#if defined(CONFIG_OF_FLAT_TREE) #if defined(CONFIG_OF_FLAT_TREE)
#include <ft_build.h> #include <ft_build.h>
#endif #elif defined(CONFIG_OF_LIBFDT)
#if defined(CONFIG_OF_LIBFDT)
#include <libfdt.h> #include <libfdt.h>
#include <libfdt_env.h> #include <libfdt_env.h>
#endif #endif
@ -207,7 +206,7 @@ void pci_init_board(void)
/* Switch temporarily to I2C bus #2 */ /* Switch temporarily to I2C bus #2 */
orig_i2c_bus = i2c_get_bus_num(); orig_i2c_bus = i2c_get_bus_num();
i2c_set_bus_num(1); i2c_set_bus_num(1);
val8 = 0; val8 = 0;
i2c_write(0x23, 0x6, 1, &val8, 1); i2c_write(0x23, 0x6, 1, &val8, 1);
@ -311,26 +310,25 @@ ft_pci_setup(void *blob, bd_t *bd)
int err; int err;
int tmp[2]; int tmp[2];
nodeoffset = fdt_path_offset (fdt, "/" OF_SOC "/pci@8500"); nodeoffset = fdt_find_node_by_path(fdt, "/" OF_SOC "/pci@8500");
if (nodeoffset >= 0) { if (nodeoffset >= 0) {
tmp[0] = cpu_to_be32(hose[0].first_busno); tmp[0] = cpu_to_be32(hose[0].first_busno);
tmp[1] = cpu_to_be32(hose[0].last_busno); tmp[1] = cpu_to_be32(hose[0].last_busno);
err = fdt_setprop(fdt, nodeoffset, "bus-range", tmp, sizeof(tmp)); err = fdt_setprop(fdt, nodeoffset, "bus-range", tmp, sizeof(tmp));
} }
} }
#endif /* CONFIG_OF_LIBFDT */ #elif defined(CONFIG_OF_FLAT_TREE)
#ifdef CONFIG_OF_FLAT_TREE
void void
ft_pci_setup(void *blob, bd_t *bd) ft_pci_setup(void *blob, bd_t *bd)
{ {
u32 *p; u32 *p;
int len; int len;
p = (u32 *)ft_get_prop(blob, "/" OF_SOC "/pci@8500/bus-range", &len); p = (u32 *)ft_get_prop(blob, "/" OF_SOC "/pci@8500/bus-range", &len);
if (p != NULL) { if (p != NULL) {
p[0] = hose[0].first_busno; p[0] = hose[0].first_busno;
p[1] = hose[0].last_busno; p[1] = hose[0].last_busno;
} }
} }
#endif /* CONFIG_OF_FLAT_TREE */ #endif /* CONFIG_OF_FLAT_TREE */
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */

9
cpu/mpc83xx/cpu.c
View File

@ -33,8 +33,7 @@
#include <asm/processor.h> #include <asm/processor.h>
#if defined(CONFIG_OF_FLAT_TREE) #if defined(CONFIG_OF_FLAT_TREE)
#include <ft_build.h> #include <ft_build.h>
#endif #elif defined(CONFIG_OF_LIBFDT)
#if defined(CONFIG_OF_LIBFDT)
#include <libfdt.h> #include <libfdt.h>
#include <libfdt_env.h> #include <libfdt_env.h>
#endif #endif
@ -490,7 +489,7 @@ ft_cpu_setup(void *blob, bd_t *bd)
int j; int j;
for (j = 0; j < (sizeof(fixup_props) / sizeof(fixup_props[0])); 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) { if (nodeoffset >= 0) {
err = (*fixup_props[j].set_fn)(blob, nodeoffset, fixup_props[j].prop, bd); err = (*fixup_props[j].set_fn)(blob, nodeoffset, fixup_props[j].prop, bd);
if (err < 0) if (err < 0)
@ -501,9 +500,7 @@ ft_cpu_setup(void *blob, bd_t *bd)
} }
} }
} }
#endif #elif defined(CONFIG_OF_FLAT_TREE)
#if defined(CONFIG_OF_FLAT_TREE)
void void
ft_cpu_setup(void *blob, bd_t *bd) ft_cpu_setup(void *blob, bd_t *bd)
{ {