From 2b798fa8fc7b06de6053f09ad4394ee1454a5d82 Mon Sep 17 00:00:00 2001
From: Allen Ibara <allen@zee.aero>
Date: Fri, 10 Jan 2014 11:10:57 -0800
Subject: [PATCH] LPC43XX: Make the chunk_offset logic more explicit.

---
 src/lpc43xx.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/lpc43xx.c b/src/lpc43xx.c
index fbd3941..6954404 100644
--- a/src/lpc43xx.c
+++ b/src/lpc43xx.c
@@ -431,12 +431,20 @@ static int lpc43xx_flash_write(struct target_s *target, uint32_t dest, const uin
 {
 	unsigned first_chunk = dest / IAP_PGM_CHUNKSIZE;
 	unsigned last_chunk = (dest + len - 1) / IAP_PGM_CHUNKSIZE;
-	unsigned chunk_offset = dest % IAP_PGM_CHUNKSIZE;
+	unsigned chunk_offset;
 	unsigned chunk;
 	struct flash_program flash_pgm;
 
 	for (chunk = first_chunk; chunk <= last_chunk; chunk++)
 	{
+		if (chunk == first_chunk)
+		{
+			chunk_offset = dest % IAP_PGM_CHUNKSIZE;
+		}
+		else
+		{
+			chunk_offset = 0;
+		}
 
 		/* first and last chunk may require special handling */
 		if ((chunk == first_chunk) || (chunk == last_chunk)) {
@@ -454,7 +462,6 @@ static int lpc43xx_flash_write(struct target_s *target, uint32_t dest, const uin
 			/* update to suit */
 			len -= copylen;
 			src += copylen;
-			chunk_offset = 0;
 		} else {
 
 			/* interior chunk, must be aligned and full-sized */