diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-02 16:28:34 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-02 16:28:34 +0200 |
| commit | 5f56c3506007eea1a284cdc55f8b3e60de67f2cc (patch) | |
| tree | 9a1cd309204118818168f17f5e6c9232417d1806 /commands | |
| parent | e57a8119d11bd1c835945cb4090d036003f8d2f9 (diff) | |
| parent | 5d308ce6400678239248c54d565bf385bbadbb42 (diff) | |
| download | barebox-5f56c3506007eea1a284cdc55f8b3e60de67f2cc.tar.gz barebox-5f56c3506007eea1a284cdc55f8b3e60de67f2cc.tar.xz | |
Merge branch 'for-next/of'
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/bootm.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/commands/bootm.c b/commands/bootm.c index 5dd1703538..6ce2ca9897 100644 --- a/commands/bootm.c +++ b/commands/bootm.c @@ -395,13 +395,9 @@ static int do_bootm(int argc, char *argv[]) goto err_out; } else { data.of_root_node = of_get_root_node(); - if (bootm_verbose(&data) && data.of_root_node) + if (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; |