summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-02-19 23:38:32 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2013-03-06 11:41:27 +0100
commit8a185a4ff2283c670ffc8724c1b7bdbf8d458cbe (patch)
tree0c1b954b5915c5d4384c7a5d5be21a03ca710ef6 /include
parent3afab2a83ef55f37c85c8abf13722a1f0b4c82cf (diff)
downloadbarebox-8a185a4ff2283c670ffc8724c1b7bdbf8d458cbe.tar.gz
barebox-8a185a4ff2283c670ffc8724c1b7bdbf8d458cbe.tar.xz
of: let of_unflatten_dtb return the unflattened tree
In order to be able to handle multiple devicetrees, do not assume the tree to be unflattened is the barebox internal one. Instead, just return a pointer to it and assign the barebox internal root_node external to the unflatten function. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'include')
-rw-r--r--include/of.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/of.h b/include/of.h
index d780dcf07c..333a7ebecd 100644
--- a/include/of.h
+++ b/include/of.h
@@ -133,7 +133,7 @@ void of_print_nodes(struct device_node *node, int indent);
int of_probe(void);
int of_parse_dtb(struct fdt_header *fdt);
void of_free(struct device_node *node);
-int of_unflatten_dtb(struct fdt_header *fdt);
+struct device_node *of_unflatten_dtb(struct device_node *root, struct fdt_header *fdt);
struct device_node *of_new_node(struct device_node *parent, const char *name);
struct property *of_new_property(struct device_node *node, const char *name,
const void *data, int len);
@@ -150,6 +150,7 @@ int of_parse_partitions(const char *cdevname,
struct device_node *node);
struct device_node *of_get_root_node(void);
+int of_set_root_node(struct device_node *);
int of_alias_get_id(struct device_node *np, const char *stem);
int of_device_is_stdout_path(struct device_d *dev);
const char *of_get_model(void);