aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-05-14 09:20:34 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-05-14 09:20:34 +0000
commit3574cdbc0aec21b26e778929a0ffe5c5913497c0 (patch)
tree0ffa5eb8db6d00338617af2c0b48a01eeea8dd82 /tools
parentdae241a4754428a4eca6e741056fbd3223c0fd42 (diff)
downloadupstream-3574cdbc0aec21b26e778929a0ffe5c5913497c0.tar.gz
upstream-3574cdbc0aec21b26e778929a0ffe5c5913497c0.tar.bz2
upstream-3574cdbc0aec21b26e778929a0ffe5c5913497c0.zip
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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21445 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools')
-rw-r--r--tools/firmware-utils/src/mkzynfw.c2
1 files changed, 1 insertions, 1 deletions
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,