Reverse the meaning of the fit_config_verify() return code

It is more common to have 0 mean OK, and -ve mean error. Change this
function to work the same way to avoid confusion.

Signed-off-by: Simon Glass <sjg@chromium.org>
master
Simon Glass 10 years ago committed by Tom Rini
parent ba923cab00
commit 12df2abe3e
  1. 2
      common/cmd_fdt.c
  2. 2
      common/image-fit.c
  3. 4
      common/image-sig.c
  4. 3
      tools/fit_check_sign.c

@ -612,7 +612,7 @@ static int do_fdt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
} }
ret = fit_config_verify(working_fdt, cfg_noffset); ret = fit_config_verify(working_fdt, cfg_noffset);
if (ret == 1) if (ret == 0)
return CMD_RET_SUCCESS; return CMD_RET_SUCCESS;
else else
return CMD_RET_FAILURE; return CMD_RET_FAILURE;

@ -1534,7 +1534,7 @@ int fit_image_load(bootm_headers_t *images, const char *prop_name, ulong addr,
images->fit_uname_cfg = fit_uname_config; images->fit_uname_cfg = fit_uname_config;
if (IMAGE_ENABLE_VERIFY && images->verify) { if (IMAGE_ENABLE_VERIFY && images->verify) {
puts(" Verifying Hash Integrity ... "); puts(" Verifying Hash Integrity ... ");
if (!fit_config_verify(fit, cfg_noffset)) { if (fit_config_verify(fit, cfg_noffset)) {
puts("Bad Data Hash\n"); puts("Bad Data Hash\n");
bootstage_error(bootstage_id + bootstage_error(bootstage_id +
BOOTSTAGE_SUB_HASH); BOOTSTAGE_SUB_HASH);

@ -467,6 +467,6 @@ int fit_config_verify_required_sigs(const void *fit, int conf_noffset,
int fit_config_verify(const void *fit, int conf_noffset) int fit_config_verify(const void *fit, int conf_noffset)
{ {
return !fit_config_verify_required_sigs(fit, conf_noffset, return fit_config_verify_required_sigs(fit, conf_noffset,
gd_fdt_blob()); gd_fdt_blob());
} }

@ -80,8 +80,7 @@ int main(int argc, char **argv)
image_set_host_blob(key_blob); image_set_host_blob(key_blob);
ret = fit_check_sign(fit_blob, key_blob); ret = fit_check_sign(fit_blob, key_blob);
if (!ret)
if (ret)
ret = EXIT_SUCCESS; ret = EXIT_SUCCESS;
else else
ret = EXIT_FAILURE; ret = EXIT_FAILURE;

Loading…
Cancel
Save