From d757b8b0b49eee3f14d0714d9be4b5b8b3a6fa82 Mon Sep 17 00:00:00 2001 From: juhosg Date: Fri, 14 May 2010 09:20:34 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21445 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- tools/firmware-utils/src/mkzynfw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/firmware-utils/src/mkzynfw.c b/tools/firmware-utils/src/mkzynfw.c index 5c1bc2437..9018ea108 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, -- 2.20.1