diff options
| author | Simon Glass <sjg@chromium.org> | 2011-12-10 11:07:55 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-03-18 20:56:00 +0100 |
| commit | 5ddb118da4cbd34c3c8a0231dedad56ba504699f (patch) | |
| tree | 5fb2e7e107427bb6b30a5292283c88c65b42bd24 /common/cmd_nand.c | |
| parent | 578ac1e9ba4c79175e69becb28e7157a84eff241 (diff) | |
| download | u-boot-5ddb118da4cbd34c3c8a0231dedad56ba504699f.tar.gz u-boot-5ddb118da4cbd34c3c8a0231dedad56ba504699f.tar.bz2 u-boot-5ddb118da4cbd34c3c8a0231dedad56ba504699f.zip | |
bootstage: Use show_boot_error() for -ve progress numbers
Rather than the caller negating our progress numbers to indicate an
error has occurred, which seems hacky, add a function to indicate this.
Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'common/cmd_nand.c')
| -rw-r--r-- | common/cmd_nand.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/common/cmd_nand.c b/common/cmd_nand.c index 035a6f64af..173e55116d 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -788,7 +788,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand, if (s != NULL && (strcmp(s, ".jffs2") && strcmp(s, ".e") && strcmp(s, ".i"))) { printf("Unknown nand load suffix '%s'\n", s); - show_boot_progress(-53); + show_boot_error(53); return 1; } @@ -798,7 +798,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand, r = nand_read_skip_bad(nand, offset, &cnt, (u_char *) addr); if (r) { puts("** Read error\n"); - show_boot_progress (-56); + show_boot_error(56); return 1; } show_boot_progress (56); @@ -821,7 +821,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand, break; #endif default: - show_boot_progress (-57); + show_boot_error(57); puts ("** Unknown image type\n"); return 1; } @@ -830,7 +830,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand, r = nand_read_skip_bad(nand, offset, &cnt, (u_char *) addr); if (r) { puts("** Read error\n"); - show_boot_progress (-58); + show_boot_error(58); return 1; } show_boot_progress (58); @@ -839,7 +839,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand, /* This cannot be done earlier, we need complete FIT image in RAM first */ if (genimg_get_format ((void *)addr) == IMAGE_FORMAT_FIT) { if (!fit_check_format (fit_hdr)) { - show_boot_progress (-150); + show_boot_error(150); puts ("** Bad FIT image format\n"); return 1; } @@ -908,14 +908,14 @@ int do_nandboot(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) #if defined(CONFIG_CMD_MTDPARTS) usage: #endif - show_boot_progress(-53); + show_boot_error(53); return CMD_RET_USAGE; } show_boot_progress(53); if (!boot_device) { puts("\n** No boot device **\n"); - show_boot_progress(-54); + show_boot_error(54); return 1; } show_boot_progress(54); @@ -924,7 +924,7 @@ usage: if (idx < 0 || idx >= CONFIG_SYS_MAX_NAND_DEVICE || !nand_info[idx].name) { printf("\n** Device %d not available\n", idx); - show_boot_progress(-55); + show_boot_error(55); return 1; } show_boot_progress(55); |