From 3543e560afdbd795683e7781c6d6dc5ff7567951 Mon Sep 17 00:00:00 2001
From: none <none>
Date: Tue, 10 Jun 2014 21:23:17 -0700
Subject: [PATCH] Fix lpc11xx magic number programming when chunks overlap

In the case where the vectors are in a separate section smaller than
the chunksize, the lpc11xx magic number calculation could generate an
incorrect value.
---
 src/lpc11xx.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/lpc11xx.c b/src/lpc11xx.c
index 1e9b84d..880f27a 100644
--- a/src/lpc11xx.c
+++ b/src/lpc11xx.c
@@ -220,26 +220,26 @@ lpc11xx_flash_write(struct target_s *target, uint32_t dest, const uint8_t *src,
 				copylen = len;
 			memcpy(&flash_pgm.data[chunk_offset], src, copylen);
 
+			/* if we are programming the vectors, calculate the magic number */
+			if ((chunk == 0) && (chunk_offset == 0)) {
+				if (copylen < 32) {
+					/* we have to be programming at least the first 8 vectors... */
+					return -1;
+				}
+
+				uint32_t *w = (uint32_t *)(&flash_pgm.data[0]);
+				uint32_t sum = 0;
+
+				for (unsigned i = 0; i < 7; i++)
+					sum += w[i];
+				w[7] = ~sum + 1;
+			}
+
 			/* update to suit */
 			len -= copylen;
 			src += copylen;
 			chunk_offset = 0;
 
-			/* if we are programming the vectors, calculate the magic number */
-			if (chunk * IAP_PGM_CHUNKSIZE == 0) {
-				uint32_t *w = (uint32_t *)(&flash_pgm.data[0]);
-				uint32_t sum = 0;
-
-				if (copylen >= 7) {
-					for (unsigned i = 0; i < 7; i++)
-						sum += w[i];
-					w[7] = 0 - sum;
-				} else {
-					/* We can't possibly calculate the magic number */
-					return -1;
-				}
-			}
-
 		} else {
 
 			/* interior chunk, must be aligned and full-sized */