X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnor%2Flpc2000.c;h=69c8b0341e02ced7a1d8a7ffc138fb8930979cfe;hp=aa9c98186d54c407d1b510a134edc86ea8b90a7e;hb=58256d48358ab695e970b5e61546aecb366ad914;hpb=08d4411b59dd8bd0e7d8009003b71d23acbf6eee

diff --git a/src/flash/nor/lpc2000.c b/src/flash/nor/lpc2000.c
index aa9c98186d..69c8b0341e 100644
--- a/src/flash/nor/lpc2000.c
+++ b/src/flash/nor/lpc2000.c
@@ -60,8 +60,11 @@
  * - 176x (tested with LPC1768)
  *
  * lpc4300 (also available as lpc1800 - alias)
- * - 43x2 | 3 | 5 | 7 (tested with 4337)
+ * - 43x2 | 3 | 5 | 7 (tested with LPC4337/LPC4357)
  * - 18x2 | 3 | 5 | 7
+ *
+ * lpc800:
+ * - 810 | 1 | 2 (tested with LPC810/LPC812)
  */
 
 typedef enum {
@@ -69,12 +72,14 @@ typedef enum {
 	lpc2000_v2,
 	lpc1700,
 	lpc4300,
+	lpc800,
 } lpc2000_variant;
 
 struct lpc2000_flash_bank {
 	lpc2000_variant variant;
 	uint32_t cclk;
 	int cmd51_dst_boundary;
+	int cmd51_can_64b;
 	int cmd51_can_256b;
 	int cmd51_can_8192b;
 	int calc_checksum;
@@ -224,7 +229,20 @@ static int lpc2000_build_sector_list(struct flash_bank *bank)
 		}
 	} else if (lpc2000_info->variant == lpc1700) {
 		switch (bank->size) {
+			case 4 * 1024:
+				lpc2000_info->cmd51_max_buffer = 256;
+				bank->num_sectors = 1;
+				break;
+			case 8 * 1024:
+				lpc2000_info->cmd51_max_buffer = 512;
+				bank->num_sectors = 2;
+				break;
+			case 16 * 1024:
+				lpc2000_info->cmd51_max_buffer = 512;
+				bank->num_sectors = 4;
+				break;
 			case 32 * 1024:
+				lpc2000_info->cmd51_max_buffer = 1024;
 				bank->num_sectors = 8;
 				break;
 			case 64 * 1024:
@@ -280,6 +298,37 @@ static int lpc2000_build_sector_list(struct flash_bank *bank)
 			bank->sectors[i].is_erased = -1;
 			bank->sectors[i].is_protected = 1;
 		}
+
+	}  else if (lpc2000_info->variant == lpc800) {
+			lpc2000_info->cmd51_max_buffer = 1024;
+		switch (bank->size) {
+			case 4 * 1024:
+				lpc2000_info->cmd51_max_buffer = 256;
+				bank->num_sectors = 4;
+				break;
+			case 8 * 1024:
+				lpc2000_info->cmd51_max_buffer = 512;
+				bank->num_sectors = 8;
+				break;
+			case 16 * 1024:
+				bank->num_sectors = 16;
+				break;
+			default:
+				LOG_ERROR("BUG: unknown bank->size encountered");
+				exit(-1);
+		}
+
+		bank->sectors = malloc(sizeof(struct flash_sector) * bank->num_sectors);
+
+		for (int i = 0; i < bank->num_sectors; i++) {
+			bank->sectors[i].offset = offset;
+			/* sectors 0-15 are 1kB-sized for LPC8xx devices */
+			bank->sectors[i].size = 1 * 1024;
+			offset += bank->sectors[i].size;
+			bank->sectors[i].is_erased = -1;
+			bank->sectors[i].is_protected = 1;
+		}
+
 	} else {
 		LOG_ERROR("BUG: unknown lpc2000_info->variant encountered");
 		exit(-1);
@@ -293,7 +342,7 @@ static int lpc2000_build_sector_list(struct flash_bank *bank)
  * 0x0 to 0x7: jump gate (BX to thumb state, b -2 to wait)
  * 0x8 to 0x1f: command parameter table (1+5 words)
  * 0x20 to 0x33: command result table (1+4 words)
- * 0x34 to 0xb3|0x104: stack (only 128b needed for lpc17xx/2000, 208 for lpc43xx)
+ * 0x34 to 0xb3|0x104: stack (only 128b needed for lpc17xx/2000, 208 for lpc43xx and 148b for lpc8xx)
  */
 
 static int lpc2000_iap_working_area_init(struct flash_bank *bank, struct working_area **iap_working_area)
@@ -310,6 +359,7 @@ static int lpc2000_iap_working_area_init(struct flash_bank *bank, struct working
 
 	/* write IAP code to working area */
 	switch (lpc2000_info->variant) {
+		case lpc800:
 		case lpc1700:
 		case lpc4300:
 			target_buffer_set_u32(target, jump_gate, ARMV4_5_T_BX(12));
@@ -346,6 +396,7 @@ static int lpc2000_iap_call(struct flash_bank *bank, struct working_area *iap_wo
 	uint32_t iap_entry_point = 0;	/* to make compiler happier */
 
 	switch (lpc2000_info->variant) {
+		case lpc800:
 		case lpc1700:
 			armv7m_info.common_magic = ARMV7M_COMMON_MAGIC;
 			armv7m_info.core_mode = ARM_MODE_THREAD;
@@ -396,6 +447,7 @@ static int lpc2000_iap_call(struct flash_bank *bank, struct working_area *iap_wo
 	buf_set_u32(reg_params[2].value, 0, 32, iap_entry_point);
 
 	switch (lpc2000_info->variant) {
+		case lpc800:
 		case lpc1700:
 		case lpc4300:
 			/* IAP stack */
@@ -435,7 +487,7 @@ static int lpc2000_iap_call(struct flash_bank *bank, struct working_area *iap_wo
 	result_table[3] = target_buffer_get_u32(target, mem_params[1].value + 0x10);
 
 	LOG_DEBUG("IAP command = %i (0x%8.8" PRIx32 ", 0x%8.8" PRIx32 ", 0x%8.8" PRIx32 ", 0x%8.8" PRIx32 ", 0x%8.8" PRIx32
-			") completed with result = %8.8" PRIx32,
+			") completed with result = %8.8x",
 			code, param_table[0], param_table[1], param_table[2], param_table[3], param_table[4], status_code);
 
 	destroy_mem_param(&mem_params[0]);
@@ -509,7 +561,8 @@ FLASH_BANK_COMMAND_HANDLER(lpc2000_flash_bank_command)
 	if (CMD_ARGC < 8)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
-	struct lpc2000_flash_bank *lpc2000_info = malloc(sizeof(struct lpc2000_flash_bank));
+	struct lpc2000_flash_bank *lpc2000_info = calloc(1, sizeof(*lpc2000_info));
+
 	bank->driver_priv = lpc2000_info;
 
 	if (strcmp(CMD_ARGV[6], "lpc2000_v1") == 0) {
@@ -540,6 +593,14 @@ FLASH_BANK_COMMAND_HANDLER(lpc2000_flash_bank_command)
 		lpc2000_info->cmd51_can_8192b = 0;
 		lpc2000_info->checksum_vector = 7;
 		lpc2000_info->iap_max_stack = 208;
+	} else if (strcmp(CMD_ARGV[6], "lpc800") == 0) {
+		lpc2000_info->variant = lpc800;
+		lpc2000_info->cmd51_dst_boundary = 64;
+		lpc2000_info->cmd51_can_64b = 1;
+		lpc2000_info->cmd51_can_256b = 0;
+		lpc2000_info->cmd51_can_8192b = 0;
+		lpc2000_info->checksum_vector = 7;
+		lpc2000_info->iap_max_stack = 148;
 	} else {
 		LOG_ERROR("unknown LPC2000 variant: %s", CMD_ARGV[6]);
 		free(lpc2000_info);
@@ -594,6 +655,10 @@ static int lpc2000_erase(struct flash_bank *bank, int first, int last)
 	if (retval != ERROR_OK)
 		return retval;
 
+	if (lpc2000_info->variant == lpc4300)
+		/* Init IAP Anyway */
+		lpc2000_iap_call(bank, iap_working_area, 49, param_table, result_table);
+
 	/* Prepare sectors */
 	int status_code = lpc2000_iap_call(bank, iap_working_area, 50, param_table, result_table);
 	switch (status_code) {
@@ -646,7 +711,7 @@ static int lpc2000_protect(struct flash_bank *bank, int set, int first, int last
 	return ERROR_OK;
 }
 
-static int lpc2000_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
+static int lpc2000_write(struct flash_bank *bank, const uint8_t *buffer, uint32_t offset, uint32_t count)
 {
 	struct target *target = bank->target;
 
@@ -681,6 +746,7 @@ static int lpc2000_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offs
 
 	/* check if exception vectors should be flashed */
 	if ((offset == 0) && (count >= 0x20) && lpc2000_info->calc_checksum) {
+		assert(lpc2000_info->checksum_vector < 8);
 		uint32_t checksum = 0;
 		for (int i = 0; i < 8; i++) {
 			LOG_DEBUG("Vector 0x%2.2x: 0x%8.8" PRIx32, i * 4, buf_get_u32(buffer + (i * 4), 0, 32));
@@ -698,7 +764,8 @@ static int lpc2000_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offs
 					"checksum.");
 		}
 
-		buf_set_u32(buffer + (lpc2000_info->checksum_vector * 4), 0, 32, checksum);
+		/* FIXME: WARNING! This code is broken because it modifies the callers buffer in place. */
+		buf_set_u32((uint8_t *)buffer + (lpc2000_info->checksum_vector * 4), 0, 32, checksum);
 	}
 
 	struct working_area *iap_working_area;
@@ -722,6 +789,10 @@ static int lpc2000_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offs
 	uint32_t param_table[5] = {0};
 	uint32_t result_table[4];
 
+	if (lpc2000_info->variant == lpc4300)
+		/* Init IAP Anyway */
+		lpc2000_iap_call(bank, iap_working_area, 49, param_table, result_table);
+
 	while (bytes_remaining > 0) {
 		uint32_t thisrun_bytes;
 		if (bytes_remaining >= lpc2000_info->cmd51_max_buffer)
@@ -730,8 +801,10 @@ static int lpc2000_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offs
 			thisrun_bytes = 1024;
 		else if ((bytes_remaining >= 512) || (!lpc2000_info->cmd51_can_256b))
 			thisrun_bytes = 512;
-		else
+		else if ((bytes_remaining >= 256) || (!lpc2000_info->cmd51_can_64b))
 			thisrun_bytes = 256;
+		else
+			thisrun_bytes = 64;
 
 		/* Prepare sectors */
 		param_table[0] = first_sector;