From: Gabor Juhos Date: Fri, 14 May 2010 09:20:34 +0000 (+0000) Subject: firmware-utils/mkzynfw: don't use next_offset twice (closes #7273) X-Git-Tag: reboot~19890 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8976d8f2ad8e3419cdc88c83bf5e827d69849a51;p=oweals%2Fopenwrt.git firmware-utils/mkzynfw: don't use next_offset twice (closes #7273) The test if a file can fit in an image considers the current offset twice. So a image that would fit is too big. Thanks-to: Michael Kurz SVN-Revision: 21445 --- diff --git a/tools/firmware-utils/src/mkzynfw.c b/tools/firmware-utils/src/mkzynfw.c index 5c1bc24372..9018ea1084 100644 --- a/tools/firmware-utils/src/mkzynfw.c +++ b/tools/firmware-utils/src/mkzynfw.c @@ -983,7 +983,7 @@ calc_block_offsets(int type, uint32_t *offset) next_offs = ALIGN(*offset, block->align); avail = board->flash_size - board->romio_offs - next_offs; - if (next_offs + block->file_size > avail) { + if (block->file_size > avail) { ERR("file %s is too big, offset = %u, size=%u," " align = %u", block->file_name, (unsigned)next_offs,