X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnor%2Flpc2000.c;h=8340aea572c3885750f009d150e23704fd5936d9;hp=0b063d3007ee558af92aa50b77c2bca50a58d5aa;hb=14040c7a57320fd62386e2bbb16cd88044eb282a;hpb=34f3e84d690d6466267872d434f291756c3a685d diff --git a/src/flash/nor/lpc2000.c b/src/flash/nor/lpc2000.c index 0b063d3007..8340aea572 100644 --- a/src/flash/nor/lpc2000.c +++ b/src/flash/nor/lpc2000.c @@ -40,7 +40,7 @@ /** * @file - * flash programming support for NXP LPC8xx,LPC1xxx,LPC43xx,LP5410x and LPC2xxx devices. + * flash programming support for NXP LPC8xx,LPC1xxx,LPC4xxx,LP5410x and LPC2xxx devices. * * @todo Provide a way to update CCLK after declaring the flash bank. The value which is correct after chip reset will * rarely still work right after the clocks switch to use the PLL (e.g. 4MHz --> 100 MHz). @@ -65,13 +65,20 @@ * lpc1700: * - 175x * - 176x (tested with LPC1768) + * - 177x + * - 178x (tested with LPC1788) * - * lpc4300 (also available as lpc1800 - alias) + * lpc4000: (lpc1700's alias) + * - 407x + * - 408x (tested with LPC4088) + * + * lpc4300: (also available as lpc1800 - alias) * - 43x2 | 3 | 5 | 7 (tested with LPC4337/LPC4357) * - 18x2 | 3 | 5 | 7 * * lpc800: * - 810 | 1 | 2 (tested with LPC810/LPC811/LPC812) + * - 822 | 4 (tested with LPC824) * * lpc1100: * - 11xx @@ -100,6 +107,10 @@ * - 134x * - 175x * - 176x + * - 177x + * - 178x + * - 407x + * - 408x * - 81x * - 82x */ @@ -229,6 +240,12 @@ #define LPC1787 0x281D3747 #define LPC1788 0x281D3F47 +#define LPC4072 0x47011121 +#define LPC4074 0x47011132 +#define LPC4076 0x47191F43 +#define LPC4078 0x47193F47 +#define LPC4088 0x481D3F47 + #define LPC810_021 0x00008100 #define LPC811_001 0x00008110 #define LPC812_101 0x00008120 @@ -259,9 +276,6 @@ 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; uint32_t cmd51_max_buffer; int checksum_vector; @@ -306,9 +320,6 @@ static int lpc2000_build_sector_list(struct flash_bank *bank) if (lpc2000_info->variant == lpc2000_v1) { lpc2000_info->cmd51_dst_boundary = 512; - lpc2000_info->cmd51_can_64b = 0; - lpc2000_info->cmd51_can_256b = 0; - lpc2000_info->cmd51_can_8192b = 1; lpc2000_info->checksum_vector = 5; lpc2000_info->iap_max_stack = 128; @@ -354,9 +365,6 @@ static int lpc2000_build_sector_list(struct flash_bank *bank) } } else if (lpc2000_info->variant == lpc2000_v2) { lpc2000_info->cmd51_dst_boundary = 256; - lpc2000_info->cmd51_can_64b = 0; - lpc2000_info->cmd51_can_256b = 1; - lpc2000_info->cmd51_can_8192b = 0; lpc2000_info->checksum_vector = 5; lpc2000_info->iap_max_stack = 128; @@ -423,9 +431,6 @@ static int lpc2000_build_sector_list(struct flash_bank *bank) } } else if (lpc2000_info->variant == lpc1700) { lpc2000_info->cmd51_dst_boundary = 256; - lpc2000_info->cmd51_can_64b = 0; - lpc2000_info->cmd51_can_256b = 1; - lpc2000_info->cmd51_can_8192b = 0; lpc2000_info->checksum_vector = 7; lpc2000_info->iap_max_stack = 128; @@ -467,7 +472,7 @@ static int lpc2000_build_sector_list(struct flash_bank *bank) for (int i = 0; i < bank->num_sectors; i++) { bank->sectors[i].offset = offset; - /* sectors 0-15 are 4kB-sized, 16 and above are 32kB-sized for LPC17xx devices */ + /* sectors 0-15 are 4kB-sized, 16 and above are 32kB-sized for LPC17xx/LPC40xx devices */ bank->sectors[i].size = (i < 16) ? 4 * 1024 : 32 * 1024; offset += bank->sectors[i].size; bank->sectors[i].is_erased = -1; @@ -475,9 +480,6 @@ static int lpc2000_build_sector_list(struct flash_bank *bank) } } else if (lpc2000_info->variant == lpc4300) { lpc2000_info->cmd51_dst_boundary = 512; - lpc2000_info->cmd51_can_64b = 0; - lpc2000_info->cmd51_can_256b = 0; - lpc2000_info->cmd51_can_8192b = 0; lpc2000_info->checksum_vector = 7; lpc2000_info->iap_max_stack = 208; @@ -509,9 +511,6 @@ static int lpc2000_build_sector_list(struct flash_bank *bank) } else if (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 = 208; /* 148byte for LPC81x,208byte for LPC82x. */ lpc2000_info->cmd51_max_buffer = 256; /* smallest MCU in the series, LPC810, has 1 kB of SRAM */ @@ -548,9 +547,6 @@ static int lpc2000_build_sector_list(struct flash_bank *bank) } else if (lpc2000_info->variant == lpc1100) { lpc2000_info->cmd51_dst_boundary = 256; - lpc2000_info->cmd51_can_64b = 0; - lpc2000_info->cmd51_can_256b = 1; - lpc2000_info->cmd51_can_8192b = 0; lpc2000_info->checksum_vector = 7; lpc2000_info->iap_max_stack = 128; @@ -574,9 +570,6 @@ static int lpc2000_build_sector_list(struct flash_bank *bank) } else if (lpc2000_info->variant == lpc1500) { lpc2000_info->cmd51_dst_boundary = 256; - lpc2000_info->cmd51_can_64b = 0; - lpc2000_info->cmd51_can_256b = 1; - lpc2000_info->cmd51_can_8192b = 0; lpc2000_info->checksum_vector = 7; lpc2000_info->iap_max_stack = 128; @@ -608,9 +601,6 @@ static int lpc2000_build_sector_list(struct flash_bank *bank) } else if (lpc2000_info->variant == lpc54100) { lpc2000_info->cmd51_dst_boundary = 256; - lpc2000_info->cmd51_can_64b = 0; - lpc2000_info->cmd51_can_256b = 1; - lpc2000_info->cmd51_can_8192b = 0; lpc2000_info->checksum_vector = 7; lpc2000_info->iap_max_stack = 128; @@ -689,9 +679,11 @@ static int lpc2000_iap_working_area_init(struct flash_bank *bank, struct working } int retval = target_write_memory(target, (*iap_working_area)->address, 4, 2, jump_gate); - if (retval != ERROR_OK) + if (retval != ERROR_OK) { LOG_ERROR("Write memory at address 0x%8.8" PRIx32 " failed (check work_area definition)", (*iap_working_area)->address); + target_free_working_area(target, *iap_working_area); + } return retval; } @@ -897,7 +889,7 @@ FLASH_BANK_COMMAND_HANDLER(lpc2000_flash_bank_command) lpc2000_info->variant = lpc2000_v1; } else if (strcmp(CMD_ARGV[6], "lpc2000_v2") == 0) { lpc2000_info->variant = lpc2000_v2; - } else if (strcmp(CMD_ARGV[6], "lpc1700") == 0) { + } else if (strcmp(CMD_ARGV[6], "lpc1700") == 0 || strcmp(CMD_ARGV[6], "lpc4000") == 0) { lpc2000_info->variant = lpc1700; } else if (strcmp(CMD_ARGV[6], "lpc1800") == 0 || strcmp(CMD_ARGV[6], "lpc4300") == 0) { lpc2000_info->variant = lpc4300; @@ -1110,14 +1102,8 @@ static int lpc2000_write(struct flash_bank *bank, const uint8_t *buffer, uint32_ uint32_t thisrun_bytes; if (bytes_remaining >= lpc2000_info->cmd51_max_buffer) thisrun_bytes = lpc2000_info->cmd51_max_buffer; - else if (bytes_remaining >= 1024) - thisrun_bytes = 1024; - else if ((bytes_remaining >= 512) || (!lpc2000_info->cmd51_can_256b)) - thisrun_bytes = 512; - else if ((bytes_remaining >= 256) || (!lpc2000_info->cmd51_can_64b)) - thisrun_bytes = 256; else - thisrun_bytes = 64; + thisrun_bytes = lpc2000_info->cmd51_dst_boundary; /* Prepare sectors */ param_table[0] = first_sector; @@ -1223,6 +1209,9 @@ static int get_lpc2000_part_id(struct flash_bank *bank, uint32_t *part_id) firmwares, so ignore it. */ lpc2000_iap_call(bank, iap_working_area, 54, param_table, result_table); + struct target *target = bank->target; + target_free_working_area(target, iap_working_area); + /* If the result is zero, the command probably didn't work out. */ if (result_table[0] == 0) return LPC2000_INVALID_COMMAND; @@ -1369,6 +1358,7 @@ static int lpc2000_auto_probe_flash(struct flash_bank *bank) break; case LPC1752: + case LPC4072: lpc2000_info->variant = lpc1700; bank->size = 64 * 1024; break; @@ -1395,6 +1385,7 @@ static int lpc2000_auto_probe_flash(struct flash_bank *bank) case LPC1754: case LPC1764: case LPC1774: + case LPC4074: lpc2000_info->variant = lpc1700; bank->size = 128 * 1024; break; @@ -1412,6 +1403,7 @@ static int lpc2000_auto_probe_flash(struct flash_bank *bank) case LPC1776: case LPC1785: case LPC1786: + case LPC4076: lpc2000_info->variant = lpc1700; bank->size = 256 * 1024; break; @@ -1425,6 +1417,8 @@ static int lpc2000_auto_probe_flash(struct flash_bank *bank) case LPC1778: case LPC1787: case LPC1788: + case LPC4078: + case LPC4088: lpc2000_info->variant = lpc1700; bank->size = 512 * 1024; break; @@ -1456,7 +1450,7 @@ static int lpc2000_auto_probe_flash(struct flash_bank *bank) break; default: - LOG_ERROR("BUG: unknown Part ID encountered: 0x%x", part_id); + LOG_ERROR("BUG: unknown Part ID encountered: 0x%" PRIx32, part_id); exit(-1); } @@ -1478,7 +1472,7 @@ static int lpc2000_probe(struct flash_bank *bank) status = get_lpc2000_part_id(bank, &part_id); if (status == LPC2000_CMD_SUCCESS) LOG_INFO("If auto-detection fails for this part, please email " - "openocd-devel@lists.sourceforge.net, citing part id 0x%x.\n", part_id); + "openocd-devel@lists.sourceforge.net, citing part id 0x%" PRIx32 ".\n", part_id); } lpc2000_build_sector_list(bank);