OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Do not exit(0) on invalid options or parameters 

When some automation script gets some rimage flag wrong then rimage
exits and does not run at all. In such a case we want the build to fail
immediately and see the error at the bottom of the build logs and not
obscured by other, consecutive failures caused by the lack of rimage
output.

Take control of the exit code away from usage() and give it back to
main() where it belongs.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
This commit is contained in:
Marc Herbert 2021-09-16 22:44:19 +00:00 committed by Liam Girdwood
parent 6e22944e05
commit 0d7f2d4a34
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/rimage.c
View File

@ -30,7 +30,6 @@ static void usage(char *name)
fprintf(stdout, "\t -b build version\n");
fprintf(stdout, "\t -e build extended manifest\n");
fprintf(stdout, "\t -y verify signed file\n");
exit(0);
}
int main(int argc, char *argv[])
@ -84,10 +83,10 @@ int main(int argc, char *argv[])
break;
case 'h':
usage(argv[0]);
break;
return 0;
default:
/* getopt's default error message is good enough */
break;
return 1;
}
}
@ -95,8 +94,9 @@ int main(int argc, char *argv[])
/* we must have config */
if (!adsp_config) {
fprintf(stderr, "error: must have adsp desc");
usage(argv[0]);
fprintf(stderr, "error: must have adsp desc\n");
return -EINVAL;
}
/* requires private key */
@ -105,10 +105,11 @@ int main(int argc, char *argv[])
return -EINVAL;
}
/* make sure we have an outfile if nt verifying */
if ((!image.out_file && !image.verify_file))
/* make sure we have an outfile if not verifying */
if ((!image.out_file && !image.verify_file)) {
usage(argv[0]);
return -EINVAL;
}
/* firmware version and build id */
if (image.fw_ver_string) {