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 <michi.kurz@googlemail.com>

SVN-Revision: 21445
master
Gabor Juhos 15 years ago
parent 65dba323f7
commit 8976d8f2ad
  1. 2
      tools/firmware-utils/src/mkzynfw.c

@ -983,7 +983,7 @@ calc_block_offsets(int type, uint32_t *offset)
next_offs = ALIGN(*offset, block->align); next_offs = ALIGN(*offset, block->align);
avail = board->flash_size - board->romio_offs - next_offs; 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," ERR("file %s is too big, offset = %u, size=%u,"
" align = %u", block->file_name, " align = %u", block->file_name,
(unsigned)next_offs, (unsigned)next_offs,

Loading…
Cancel
Save