diff options
| author | Tom Rini <trini@konsulko.com> | 2022-02-07 20:13:53 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-02-07 20:13:53 +0300 |
| commit | 8b139f4e1c08c4ffb1a8e739db128ed02cbc637f (patch) | |
| tree | 0bff6bd0fadc7230538d712b1b1f112e424dbea0 /tools | |
| parent | b5c5b9a0bee56030f9f05ece52334b5207b72673 (diff) | |
| parent | 530780a69cb5d32a7794dcc322afaa25cdbdab96 (diff) | |
| download | u-boot-8b139f4e1c08c4ffb1a8e739db128ed02cbc637f.tar.xz | |
Merge tag 'u-boot-imx-20220207' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
u-boot-imx-20211022
-------------------
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/10887
- imx8 : Toradex Verdin MX8M Plus
Kontron pitx-imx8m
- imx8ulp: several fixes and improvements
- imx6ull fixes
- switching to binman
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/mxsimage.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/tools/mxsimage.c b/tools/mxsimage.c index 002f4b525a..fee022aab4 100644 --- a/tools/mxsimage.c +++ b/tools/mxsimage.c @@ -1595,8 +1595,11 @@ static int sb_load_cmdfile(struct sb_image_ctx *ictx) size_t len; fp = fopen(ictx->cfg_filename, "r"); - if (!fp) - goto err_file; + if (!fp) { + fprintf(stderr, "ERR: Failed to load file \"%s\": \"%s\"\n", + ictx->cfg_filename, strerror(errno)); + return -EINVAL; + } while ((rlen = getline(&line, &len, fp)) > 0) { memset(&cmd, 0, sizeof(cmd)); @@ -1616,12 +1619,6 @@ static int sb_load_cmdfile(struct sb_image_ctx *ictx) fclose(fp); return 0; - -err_file: - fclose(fp); - fprintf(stderr, "ERR: Failed to load file \"%s\"\n", - ictx->cfg_filename); - return -EINVAL; } static int sb_build_tree_from_cfg(struct sb_image_ctx *ictx) |