diff options
| author | Scott Wood <scottwood@freescale.com> | 2007-09-06 05:21:04 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-09-14 01:33:23 +1000 |
| commit | 4674f2f33948432469e52d5bcaeda9904e34fe46 (patch) | |
| tree | a58ebf94e2d09ddada9365f8d1401efcaef5e088 /arch/powerpc/boot/flatdevtree.h | |
| parent | 6bcc4c01755fd2066bc374193cf3b0849cbabe47 (diff) | |
| download | kernel_samsung_crespo-4674f2f33948432469e52d5bcaeda9904e34fe46.zip kernel_samsung_crespo-4674f2f33948432469e52d5bcaeda9904e34fe46.tar.gz kernel_samsung_crespo-4674f2f33948432469e52d5bcaeda9904e34fe46.tar.bz2 | |
[POWERPC] bootwrapper: flatdevtree fixes
1. ft_create_node was returning the internal pointer rather than a phandle.
2. ft_find_device_rel was treating a "top" phandle of NULL as an error,
rather than as the root of the tree. The old, absolute ft_find_device
is removed, and the relative version is renamed to ft_find_device().
Signed-off-by: Scott Wood <scottwood@freescale.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/boot/flatdevtree.h')
| -rw-r--r-- | arch/powerpc/boot/flatdevtree.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/powerpc/boot/flatdevtree.h b/arch/powerpc/boot/flatdevtree.h index cb26325..2c1c826 100644 --- a/arch/powerpc/boot/flatdevtree.h +++ b/arch/powerpc/boot/flatdevtree.h @@ -76,7 +76,7 @@ struct ft_cxt { unsigned int nodes_used; }; -int ft_begin_node(struct ft_cxt *cxt, const char *name); +char *ft_begin_node(struct ft_cxt *cxt, const char *name); void ft_end_node(struct ft_cxt *cxt); void ft_begin_tree(struct ft_cxt *cxt); @@ -96,9 +96,8 @@ int ft_add_rsvmap(struct ft_cxt *cxt, u64 physaddr, u64 size); void ft_dump_blob(const void *bphp); void ft_merge_blob(struct ft_cxt *cxt, void *blob); -void *ft_find_device(struct ft_cxt *cxt, const char *srch_path); -void *ft_find_device_rel(struct ft_cxt *cxt, const void *top, - const char *srch_path); +void *ft_find_device(struct ft_cxt *cxt, const void *top, + const char *srch_path); void *ft_find_descendent(struct ft_cxt *cxt, void *top, const char *srch_path); int ft_get_prop(struct ft_cxt *cxt, const void *phandle, const char *propname, void *buf, const unsigned int buflen); |