minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 04:26:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

mkimage: Fix variable length header support

Browse Source 
Support for variable length images like AIS image was introduced
in commit f0662105b674a3874227316abf8536bebc9b5995. A parameter
"-s" was also introduced to prohibit copying of the image file
automatically in the main program. However, this parameter
was implemented incorrectly and the image file was copied
nevertheless.

Signed-off-by: Christian Riesch <christian.riesch@omicron.at>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Heiko Schocher <hs@denx.de>
Acked-by: Stefano Babic <sbabic@denx.de>
This commit is contained in:
Christian Riesch 2011-12-09 09:47:38 +00:00 committed by Albert ARIBAUD
parent 3d2c8e6c7f
commit d1be8f922e
1 changed files with 49 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/mkimage.c
View File

@ -383,9 +383,9 @@ NXTARG: ;
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} }
if (!params.skipcpy && if (!params.skipcpy) {
(params.type == IH_TYPE_MULTI || if (params.type == IH_TYPE_MULTI ||
params.type == IH_TYPE_SCRIPT)) { params.type == IH_TYPE_SCRIPT) {
char *file = params.datafile; char *file = params.datafile;
uint32_t size; uint32_t size;
@ -443,6 +443,7 @@ NXTARG: ;
} else { } else {
copy_file (ifd, params.datafile, 0); copy_file (ifd, params.datafile, 0);
} }
}
/* We're a bit of paranoid */ /* We're a bit of paranoid */
#if defined(_POSIX_SYNCHRONIZED_IO) && \ #if defined(_POSIX_SYNCHRONIZED_IO) && \