mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 15:14:43 +00:00
tools: do not print error messages in verify_header() functions
default_image.c and socfpgaimage.c are the only image modules that print error messages during header verification. The verify_header() is used to query if a given image file is processed by the image format. Thus, if the image format can't handle the file, it must simply return an error. Otherwise we pollute the screen with errors messages until we find the image format that handle a given image file. Signed-off-by: Guilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com>
This commit is contained in:
parent
39931f966a
commit
2662179998
2 changed files with 12 additions and 11 deletions
|
@ -15,6 +15,8 @@
|
|||
*/
|
||||
|
||||
#include "imagetool.h"
|
||||
#include "mkimage.h"
|
||||
|
||||
#include <image.h>
|
||||
#include <u-boot/crc.h>
|
||||
|
||||
|
@ -53,9 +55,8 @@ static int image_verify_header(unsigned char *ptr, int image_size,
|
|||
memcpy(hdr, ptr, sizeof(image_header_t));
|
||||
|
||||
if (be32_to_cpu(hdr->ih_magic) != IH_MAGIC) {
|
||||
fprintf(stderr,
|
||||
"%s: Bad Magic Number: \"%s\" is no valid image\n",
|
||||
params->cmdname, params->imagefile);
|
||||
debug("%s: Bad Magic Number: \"%s\" is no valid image\n",
|
||||
params->cmdname, params->imagefile);
|
||||
return -FDT_ERR_BADMAGIC;
|
||||
}
|
||||
|
||||
|
@ -66,9 +67,8 @@ static int image_verify_header(unsigned char *ptr, int image_size,
|
|||
hdr->ih_hcrc = cpu_to_be32(0); /* clear for re-calculation */
|
||||
|
||||
if (crc32(0, data, len) != checksum) {
|
||||
fprintf(stderr,
|
||||
"%s: ERROR: \"%s\" has bad header checksum!\n",
|
||||
params->cmdname, params->imagefile);
|
||||
debug("%s: ERROR: \"%s\" has bad header checksum!\n",
|
||||
params->cmdname, params->imagefile);
|
||||
return -FDT_ERR_BADSTATE;
|
||||
}
|
||||
|
||||
|
@ -77,9 +77,8 @@ static int image_verify_header(unsigned char *ptr, int image_size,
|
|||
|
||||
checksum = be32_to_cpu(hdr->ih_dcrc);
|
||||
if (crc32(0, data, len) != checksum) {
|
||||
fprintf(stderr,
|
||||
"%s: ERROR: \"%s\" has corrupted data!\n",
|
||||
params->cmdname, params->imagefile);
|
||||
debug("%s: ERROR: \"%s\" has corrupted data!\n",
|
||||
params->cmdname, params->imagefile);
|
||||
return -FDT_ERR_BADSTRUCTURE;
|
||||
}
|
||||
return 0;
|
||||
|
|
|
@ -33,6 +33,8 @@
|
|||
|
||||
#include "pbl_crc32.h"
|
||||
#include "imagetool.h"
|
||||
#include "mkimage.h"
|
||||
|
||||
#include <image.h>
|
||||
|
||||
#define HEADER_OFFSET 0x40
|
||||
|
@ -133,12 +135,12 @@ static int verify_buffer(const uint8_t *buf)
|
|||
|
||||
len = verify_header(buf + HEADER_OFFSET);
|
||||
if (len < 0) {
|
||||
fprintf(stderr, "Invalid header\n");
|
||||
debug("Invalid header\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (len < HEADER_OFFSET || len > PADDED_SIZE) {
|
||||
fprintf(stderr, "Invalid header length (%i)\n", len);
|
||||
debug("Invalid header length (%i)\n", len);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue