From ff879a2d4cc73046460e1fc88e5d1251bdc6dd1d Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Fri, 13 Apr 2012 15:07:21 +0200 Subject: [PATCH] bootm: be more informative with oftrees - print error message when the specified oftree cannot be opened - move verbose info to top of function so that the information is printed before something else fails. Signed-off-by: Sascha Hauer --- commands/bootm.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/commands/bootm.c b/commands/bootm.c index 4f174dbc7..1e1dc52eb 100644 --- a/commands/bootm.c +++ b/commands/bootm.c @@ -154,9 +154,14 @@ static int bootm_open_oftree(struct image_data *data, char *oftree, int num) int ret; size_t size; + if (bootm_verbose(data)) + printf("Loading oftree from '%s'\n", oftree); + ft = file_name_detect_type(oftree); - if ((int)ft < 0) + if ((int)ft < 0) { + printf("failed to open %s: %s\n", oftree, strerror(-(int)ft)); return ft; + } if (ft == filetype_uimage) { #ifdef CONFIG_CMD_BOOTM_OFTREE_UIMAGE @@ -196,9 +201,6 @@ static int bootm_open_oftree(struct image_data *data, char *oftree, int num) file_type_to_string(ft)); } - if (bootm_verbose(data)) - printf("Loading oftree from '%s'\n", oftree); - fdt = xrealloc(fdt, size + 0x8000); fdt_open_into(fdt, fdt, size + 0x8000);