From: Gabor Juhos <juhosg@openwrt.org>
Date: Fri, 17 Dec 2010 20:34:31 +0000 (+0000)
Subject: firmware-utils/mkzynfw: fix available flash space calculation
X-Git-Tag: reboot~18040
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=29379780a6ba1509e1df5a86b4cabed8ceefbbc7;p=openwrt%2Fstaging%2Fxback.git

firmware-utils/mkzynfw: fix available flash space calculation

SVN-Revision: 24653
---

diff --git a/tools/firmware-utils/src/mkzynfw.c b/tools/firmware-utils/src/mkzynfw.c
index f3343df726..36c176f432 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;