From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 01/29] of: unflatten: allocate root node explicitly
Date: Tue, 26 Feb 2013 21:18:28 +0100 [thread overview]
Message-ID: <1361909936-2665-2-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1361909936-2665-1-git-send-email-s.hauer@pengutronix.de>
By doing so of_new_node does not depend on the global root_node
anymore.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/of/base.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/drivers/of/base.c b/drivers/of/base.c
index eaaeaf4..e853add 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -890,7 +890,7 @@ int of_unflatten_dtb(struct fdt_header *fdt)
const struct fdt_property *fdt_prop;
const char *pathp;
int depth = 10000;
- struct device_node *node = NULL, *n;
+ struct device_node *node = NULL, *n, *root = NULL;
struct property *p;
nodeoffset = fdt_path_offset(fdt, "/");
@@ -903,6 +903,10 @@ int of_unflatten_dtb(struct fdt_header *fdt)
return -EINVAL;
}
+ root = of_new_node(NULL, NULL);
+ if (!root)
+ return -ENOMEM;
+
while (1) {
tag = fdt_next_tag(fdt, nodeoffset, &nextoffset);
switch (tag) {
@@ -912,11 +916,14 @@ int of_unflatten_dtb(struct fdt_header *fdt)
if (pathp == NULL)
pathp = "/* NULL pointer error */";
- n = of_find_child(node, pathp);
- if (n) {
- node = n;
+ if (!node) {
+ node = root;
} else {
- node = of_new_node(node, pathp);
+ if ((n = of_find_child(node, pathp))) {
+ node = n;
+ } else {
+ node = of_new_node(node, pathp);
+ }
}
break;
case FDT_END_NODE:
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2013-02-26 20:19 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-26 20:18 [PATCH] remove libfdt Sascha Hauer
2013-02-26 20:18 ` Sascha Hauer [this message]
2013-02-26 20:18 ` [PATCH 02/29] of: export of_find_child Sascha Hauer
2013-02-26 20:18 ` [PATCH 03/29] of: removed unused variables Sascha Hauer
2013-02-26 20:18 ` [PATCH 04/29] of: Let of_find_node_by_path iterate over tree Sascha Hauer
2013-02-26 20:18 ` [PATCH 05/29] of: remove allnodes list Sascha Hauer
2013-02-26 20:18 ` [PATCH 06/29] ARM bootm: Use of_get_fixed_tree Sascha Hauer
2013-02-26 20:18 ` [PATCH 07/29] of: Add of_set_property and of_create_node Sascha Hauer
2013-02-26 20:18 ` [PATCH 08/29] of_node command: use of_create_node Sascha Hauer
2013-02-26 20:18 ` [PATCH 09/29] of: Add root node argument to of_find_node_by_path Sascha Hauer
2013-02-26 20:18 ` [PATCH 10/29] of: Add missing prototype for of_device_is_compatible Sascha Hauer
2013-02-26 20:18 ` [PATCH 11/29] of: let of_unflatten_dtb return the unflattened tree Sascha Hauer
2013-02-26 20:18 ` [PATCH 12/29] of: make unflatten independent of libfdt Sascha Hauer
2013-02-26 20:18 ` [PATCH 13/29] of: make flatten " Sascha Hauer
2013-02-26 21:05 ` Alexander Aring
2013-02-27 8:40 ` Sascha Hauer
2013-02-27 19:52 ` Alexander Aring
2013-02-26 20:18 ` [PATCH 14/29] of/fdt: use optimized endianess conversion Sascha Hauer
2013-02-26 20:18 ` [PATCH 15/29] oftree command: Use of_print_nodes Sascha Hauer
2013-02-26 20:18 ` [PATCH 16/29] of: move OFTREE Kconfig option to drivers/of/ Sascha Hauer
2013-02-26 20:18 ` [PATCH 17/29] of: make OFDEVICE a user selectable option Sascha Hauer
2013-02-26 20:18 ` [PATCH 18/29] oftree command: retire CMD_OFTREE_PROBE Kconfig option Sascha Hauer
2013-02-26 20:18 ` [PATCH 19/29] of: move oftree Kconfig to the top of the drivers menu Sascha Hauer
2013-02-26 20:18 ` [PATCH 20/29] of: Pass barebox internal format devicetree to of_get_fixed_tree Sascha Hauer
2013-02-26 20:18 ` [PATCH 21/29] bootm: Use of_print_nodes instead of fdt_print Sascha Hauer
2013-02-26 20:18 ` [PATCH 22/29] of: move flat devicetree functions to separate file Sascha Hauer
2013-02-26 20:18 ` [PATCH 23/29] of: Add of property write functions for u32 Sascha Hauer
2013-02-26 20:18 ` [PATCH 24/29] of: make value of property in of_new_property optional Sascha Hauer
2013-02-26 20:18 ` [PATCH 25/29] of: Add missing prototype for size/address counting functions Sascha Hauer
2013-02-26 20:18 ` [PATCH 26/29] of: fixup unflattened devicetree Sascha Hauer
2013-02-26 20:18 ` [PATCH 27/29] of: remove unused libfdt Sascha Hauer
2013-02-26 20:18 ` [PATCH 28/29] of_* commands: print usage when insufficient arguments are given Sascha Hauer
2013-02-26 20:18 ` [PATCH 29/29] of_property command: Fix crash with empty property value Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1361909936-2665-2-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox