]> git.sur5r.net Git - openocd/commitdiff
flash: add error message if image is too big for flash
authorØyvind Harboe <oyvind.harboe@zylin.com>
Wed, 9 Jun 2010 15:12:52 +0000 (17:12 +0200)
committerØyvind Harboe <oyvind.harboe@zylin.com>
Wed, 9 Jun 2010 15:12:52 +0000 (17:12 +0200)
replaced assert() w/error message if the image is
too big.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
src/flash/nor/core.c

index 1bd09b444d9c392d08f6f097937039c9660e8d43..429bad6762dcbe606cb776f5f39e1eceefc4cfd0 100644 (file)
@@ -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.