diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-04-28 21:24:32 +0200 | 
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-04-28 21:24:32 +0200 | 
| commit | 3577d3a33b8446c4cc4b7afdb44f9879b53ca293 (patch) | |
| tree | 01a191904845b42ab02e34fe1ccf5bc8c112ea00 | |
| parent | 76544f80e476a7a0cc3a0bbce853354f2c6a61e2 (diff) | |
| download | olio-uboot-2014.01-3577d3a33b8446c4cc4b7afdb44f9879b53ca293.tar.xz olio-uboot-2014.01-3577d3a33b8446c4cc4b7afdb44f9879b53ca293.zip | |
Fixed handling of bad checksums with "mkimage -l"
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | tools/mkimage.c | 13 | 
2 files changed, 10 insertions, 5 deletions
| @@ -2,6 +2,8 @@  Changes since U-Boot 1.1.4:  ====================================================================== +* Fixed handling of bad checksums with "mkimage -l" +  * Added support for BC3450 board    Patch by Stefan Strobl, 21. Oct 2005 diff --git a/tools/mkimage.c b/tools/mkimage.c index 5222bb21a..fea3e5bc6 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -277,7 +277,8 @@ NXTARG:		;  	 */  	if (xflag) {  		if (ep != addr + sizeof(image_header_t)) { -			fprintf (stderr, "%s: For XIP, the entry point must be the load addr + %lu\n", +			fprintf (stderr, +				"%s: For XIP, the entry point must be the load addr + %lu\n",  				cmdname,  				(unsigned long)sizeof(image_header_t));  			exit (EXIT_FAILURE); @@ -347,8 +348,9 @@ NXTARG:		;  		if (crc32 (0, data, len) != checksum) {  			fprintf (stderr, -				"*** Warning: \"%s\" has bad header checksum!\n", -				imagefile); +				"%s: ERROR: \"%s\" has bad header checksum!\n", +				cmdname, imagefile); +			exit (EXIT_FAILURE);  		}  		data = (char *)(ptr + sizeof(image_header_t)); @@ -356,8 +358,9 @@ NXTARG:		;  		if (crc32 (0, data, len) != ntohl(hdr->ih_dcrc)) {  			fprintf (stderr, -				"*** Warning: \"%s\" has corrupted data!\n", -				imagefile); +				"%s: ERROR: \"%s\" has corrupted data!\n", +				cmdname, imagefile); +			exit (EXIT_FAILURE);  		}  		/* for multi-file images we need the data part, too */ |