summaryrefslogtreecommitdiffstats
path: root/commands/bootm.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-01-17 10:24:16 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2013-01-18 11:56:53 +0100
commit525d82f33e32427da0eefe0878b53ad73a6a7139 (patch)
tree634e803e396683ece74498ea1a8f9627d956ca35 /commands/bootm.c
parent43afe67390697041d1d16d4e5c934d2bfa831399 (diff)
downloadbarebox-525d82f33e32427da0eefe0878b53ad73a6a7139.tar.gz
barebox-525d82f33e32427da0eefe0878b53ad73a6a7139.tar.xz
bootm: move printing of file locations outside verbose mode
The location of files that are booted is a precious information, so print it by default and not only in verbose mode. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Cc: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'commands/bootm.c')
-rw-r--r--commands/bootm.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/commands/bootm.c b/commands/bootm.c
index 483e6a1933..5ccf2372ac 100644
--- a/commands/bootm.c
+++ b/commands/bootm.c
@@ -143,8 +143,7 @@ static int bootm_open_oftree(struct image_data *data, const char *oftree, int nu
size_t size;
unsigned int align;
- if (bootm_verbose(data))
- printf("Loading oftree from '%s'\n", oftree);
+ printf("Loading devicetree from '%s'\n", oftree);
ft = file_name_detect_type(oftree);
if ((int)ft < 0) {
@@ -380,13 +379,14 @@ static int do_bootm(int argc, char *argv[])
}
}
+ printf("\nLoading OS %s '%s'", file_type_to_string(os_type),
+ data.os_file);
+ if (os_type == filetype_uimage &&
+ data.os->header.ih_type == IH_TYPE_MULTI)
+ printf(", multifile image %d", data.os_num);
+ printf("\n");
+
if (bootm_verbose(&data)) {
- printf("\nLoading OS %s '%s'", file_type_to_string(os_type),
- data.os_file);
- if (os_type == filetype_uimage &&
- data.os->header.ih_type == IH_TYPE_MULTI)
- printf(", multifile image %d", data.os_num);
- printf("\n");
if (data.os_res)
printf("OS image is at 0x%08x-0x%08x\n",
data.os_res->start,