From: Øyvind Harboe <oyvind.harboe@zylin.com>
Date: Wed, 9 Jun 2010 15:12:52 +0000 (+0200)
Subject: flash: add error message if image is too big for flash
X-Git-Tag: v0.5.0-rc1~649
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9ab7636ce6276d222662be431a1e6be96d9d34c0;p=openocd

flash: add error message if image is too big for flash

replaced assert() w/error message if the image is
too big.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
---

diff --git a/src/flash/nor/core.c b/src/flash/nor/core.c
index 1bd09b44..429bad67 100644
--- a/src/flash/nor/core.c
+++ b/src/flash/nor/core.c
@@ -636,7 +636,11 @@ int flash_write_unlock(struct target *target, struct image *image,
 				LOG_INFO("Padding image section %d with %d bytes", section_last-1, pad_bytes);
 		}
 
-		assert (run_address + run_size - 1 <= c->base + c->size - 1);
+		if (run_address + run_size - 1 > c->base + c->size - 1)
+		{
+			LOG_ERROR("The image is too big for the flash");
+			return ERROR_FAIL;
+		}
 
 		/* If we're applying any sector automagic, then pad this
 		 * (maybe-combined) segment to the end of its last sector.