mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 3/4] bootm: make sure to print fixed oftree
Date: Thu, 30 May 2013 12:44:53 +0200	[thread overview]
Message-ID: <1369910694-20991-4-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1369910694-20991-1-git-send-email-s.hauer@pengutronix.de>

when doing bootm -v -v we dumped the original tree to the console.
Make sure to print the fixed tree instead so that the fixups can
be examined.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/lib/bootm.c | 2 ++
 commands/bootm.c     | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index e7a0625..133e04d 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -91,6 +91,8 @@ static int __do_bootm_linux(struct image_data *data, int swap)
 			of_add_reserve_entry(initrd_start, initrd_end);
 		data->oftree = of_get_fixed_tree(data->of_root_node);
 		fdt_add_reserve_map(data->oftree);
+		if (bootm_verbose(data) > 1)
+			of_print_nodes(data->of_root_node, 0);
 	}
 
 	if (bootm_verbose(data)) {
diff --git a/commands/bootm.c b/commands/bootm.c
index 5dd1703..3976eb4 100644
--- a/commands/bootm.c
+++ b/commands/bootm.c
@@ -398,10 +398,6 @@ static int do_bootm(int argc, char *argv[])
 		if (bootm_verbose(&data) && data.of_root_node)
 			printf("using internal devicetree\n");
 	}
-
-
-	if (bootm_verbose(&data) > 1 && data.of_root_node)
-		of_print_nodes(data.of_root_node, 0);
 #endif
 	if (data.os_address == UIMAGE_SOME_ADDRESS)
 		data.os_address = UIMAGE_INVALID_ADDRESS;
-- 
1.8.2.rc2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2013-05-30 10:45 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-30 10:44 [PATCH] OF updates Sascha Hauer
2013-05-30 10:44 ` [PATCH 1/4] of: Also print disabled nodes Sascha Hauer
2013-05-30 10:44 ` [PATCH 2/4] of: remove unused define Sascha Hauer
2013-05-30 10:44 ` Sascha Hauer [this message]
2013-05-30 10:44 ` [PATCH 4/4] bootm: print Kernel commandline in verbose mode 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=1369910694-20991-4-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