ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-01 16:58:22 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

firmware-utils/mkzynfw: don't use next_offset twice (closes #7273)

Browse Source 
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
This commit is contained in:
Gabor Juhos 2010-05-14 09:20:34 +00:00
parent 65dba323f7
commit 8976d8f2ad
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/firmware-utils/src/mkzynfw.c
View File

@ -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,