From: juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 17 Dec 2010 20:34:31 +0000 (+0000)
Subject: firmware-utils/mkzynfw: fix available flash space calculation
X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/934c0029fd9a2c715e0dba997b0699ca89df8186

firmware-utils/mkzynfw: fix available flash space calculation

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24653 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/tools/firmware-utils/src/mkzynfw.c b/tools/firmware-utils/src/mkzynfw.c
index f3343df72..36c176f43 100644
--- a/tools/firmware-utils/src/mkzynfw.c
+++ b/tools/firmware-utils/src/mkzynfw.c
@@ -999,12 +999,13 @@ calc_block_offsets(int type, uint32_t *offset)
 			continue;
 
 		next_offs = ALIGN(*offset, block->align);
-		avail = board->flash_size - board->romio_offs - next_offs;
+		avail = board->flash_size - next_offs;
 		if (block->file_size > avail) {
 			ERR("file %s is too big, offset = %u, size=%u,"
-				" align = %u", block->file_name,
+				" avail = %u, align = %u", block->file_name,
 				(unsigned)next_offs,
 				(unsigned)block->file_size,
+				(unsigned)avail,
 				(unsigned)block->align);
 			res = -1;
 			break;