diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-05-28 14:56:00 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-05-31 08:32:32 +0200 |
| commit | 08026afdeb1276163b8e99cb85c1e56779ff5c2f (patch) | |
| tree | 544138da233af23c7263a196c6abbad295034dd5 | |
| parent | a872dc166ad6cd4c7f7e809ba4cb315b1614ff04 (diff) | |
| download | barebox-08026afdeb1276163b8e99cb85c1e56779ff5c2f.tar.gz | |
bootm: make sure to print fixed oftree
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>
| -rw-r--r-- | arch/arm/lib/bootm.c | 2 | ||||
| -rw-r--r-- | 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 e7a0625d3b..133e04da07 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 5dd1703538..3976eb49b6 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; |