diff options
Diffstat (limited to 'rbutil/mkimxboot/mkimxboot.c')
-rw-r--r-- | rbutil/mkimxboot/mkimxboot.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/rbutil/mkimxboot/mkimxboot.c b/rbutil/mkimxboot/mkimxboot.c index 5fce116def..47035bbc4d 100644 --- a/rbutil/mkimxboot/mkimxboot.c +++ b/rbutil/mkimxboot/mkimxboot.c | |||
@@ -393,22 +393,6 @@ static enum imx_error_t patch_firmware(enum imx_model_t model, | |||
393 | } | 393 | } |
394 | } | 394 | } |
395 | 395 | ||
396 | static void imx_printf(void *user, bool error, color_t c, const char *fmt, ...) | ||
397 | { | ||
398 | (void) user; | ||
399 | (void) c; | ||
400 | va_list args; | ||
401 | va_start(args, fmt); | ||
402 | /* | ||
403 | if(error) | ||
404 | printf("[ERR] "); | ||
405 | else | ||
406 | printf("[INFO] "); | ||
407 | */ | ||
408 | vprintf(fmt, args); | ||
409 | va_end(args); | ||
410 | } | ||
411 | |||
412 | static uint32_t get_uint32be(unsigned char *p) | 396 | static uint32_t get_uint32be(unsigned char *p) |
413 | { | 397 | { |
414 | return (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]; | 398 | return (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]; |
@@ -556,7 +540,7 @@ static enum imx_error_t load_sb_file(const char *file, int md5_idx, | |||
556 | clear_keys(); | 540 | clear_keys(); |
557 | add_keys(imx_models[model].keys, imx_models[model].nr_keys); | 541 | add_keys(imx_models[model].keys, imx_models[model].nr_keys); |
558 | *sb_file = sb_read_file_ex(file, imx_sums[md5_idx].fw_variants[opt.fw_variant].offset, | 542 | *sb_file = sb_read_file_ex(file, imx_sums[md5_idx].fw_variants[opt.fw_variant].offset, |
559 | imx_sums[md5_idx].fw_variants[opt.fw_variant].size, false, NULL, &imx_printf, &err); | 543 | imx_sums[md5_idx].fw_variants[opt.fw_variant].size, false, NULL, &sb_std_printf, &err); |
560 | if(*sb_file == NULL) | 544 | if(*sb_file == NULL) |
561 | { | 545 | { |
562 | clear_keys(); | 546 | clear_keys(); |
@@ -760,7 +744,7 @@ enum imx_error_t mkimxboot(const char *infile, const char *bootfile, | |||
760 | ret = patch_firmware(model, opt.fw_variant, opt.output, | 744 | ret = patch_firmware(model, opt.fw_variant, opt.output, |
761 | sb_file, boot_fw, opt.force_version); | 745 | sb_file, boot_fw, opt.force_version); |
762 | if(ret == IMX_SUCCESS) | 746 | if(ret == IMX_SUCCESS) |
763 | ret = sb_write_file(sb_file, outfile); | 747 | ret = sb_write_file(sb_file, outfile, NULL, sb_std_printf); |
764 | 748 | ||
765 | clear_keys(); | 749 | clear_keys(); |
766 | rb_fw_free(&boot_fw); | 750 | rb_fw_free(&boot_fw); |