X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnor%2Flpc2000.c;h=3962f305c809ba3cef780cccb7cb6aa81c04c01d;hp=f3d8f9e9c3b8b6979e6ac5122e4acdb1fce4410f;hb=0bd6ef5f5d054fa6875d68a6e690e84e2dec6f46;hpb=d2d4f776d8e24e8e651d1c896c90c15c38633172 diff --git a/src/flash/nor/lpc2000.c b/src/flash/nor/lpc2000.c index f3d8f9e9c3..3962f305c8 100644 --- a/src/flash/nor/lpc2000.c +++ b/src/flash/nor/lpc2000.c @@ -18,7 +18,7 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ #ifdef HAVE_CONFIG_H @@ -35,9 +35,8 @@ * @file * flash programming support for NXP LPC17xx 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). + * @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). */ /* * currently supported devices: @@ -59,24 +58,36 @@ * lpc1700: * - 175x * - 176x (tested with LPC1768) + * + * lpc4300 (also available as lpc1800 - alias) + * - 43x2 | 3 | 5 | 7 (tested with 4337) + * - 18x2 | 3 | 5 | 7 + * + * lpc800: + * - 810 | 1 | 2 (tested with 812) */ typedef enum { lpc2000_v1, lpc2000_v2, - lpc1700 + lpc1700, + lpc4300, + lpc800, } lpc2000_variant; struct lpc2000_flash_bank { lpc2000_variant variant; - struct working_area *iap_working_area; 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; + uint32_t iap_max_stack; + uint32_t cmd51_src_offset; + uint32_t lpc4300_bank; }; enum lpc2000_status_codes { @@ -99,13 +110,15 @@ enum lpc2000_status_codes { LPC2000_INVALID_CODE = 16, LPC2000_INVALID_BAUD_RATE = 17, LPC2000_INVALID_STOP_BIT = 18, - LPC2000_CRP_ENABLED = 19 + LPC2000_CRP_ENABLED = 19, + LPC2000_INVALID_FLASH_UNIT = 20, + LPC2000_USER_CODE_CHECKSUM = 21, + LCP2000_ERROR_SETTING_ACTIVE_PARTITION = 22, }; static int lpc2000_build_sector_list(struct flash_bank *bank) { struct lpc2000_flash_bank *lpc2000_info = bank->driver_priv; - int i; uint32_t offset = 0; /* default to a 4096 write buffer */ @@ -116,7 +129,7 @@ static int lpc2000_build_sector_list(struct flash_bank *bank) if (bank->size == 128 * 1024) { bank->num_sectors = 16; bank->sectors = malloc(sizeof(struct flash_sector) * 16); - for (i = 0; i < 16; i++) { + for (int i = 0; i < 16; i++) { bank->sectors[i].offset = offset; bank->sectors[i].size = 8 * 1024; offset += bank->sectors[i].size; @@ -127,21 +140,21 @@ static int lpc2000_build_sector_list(struct flash_bank *bank) bank->num_sectors = 18; bank->sectors = malloc(sizeof(struct flash_sector) * 18); - for (i = 0; i < 8; i++) { + for (int i = 0; i < 8; i++) { bank->sectors[i].offset = offset; bank->sectors[i].size = 8 * 1024; offset += bank->sectors[i].size; bank->sectors[i].is_erased = -1; bank->sectors[i].is_protected = 1; } - for (i = 8; i < 10; i++) { + for (int i = 8; i < 10; i++) { bank->sectors[i].offset = offset; bank->sectors[i].size = 64 * 1024; offset += bank->sectors[i].size; bank->sectors[i].is_erased = -1; bank->sectors[i].is_protected = 1; } - for (i = 10; i < 18; i++) { + for (int i = 10; i < 18; i++) { bank->sectors[i].offset = offset; bank->sectors[i].size = 8 * 1024; offset += bank->sectors[i].size; @@ -193,7 +206,7 @@ static int lpc2000_build_sector_list(struct flash_bank *bank) bank->sectors = malloc(sizeof(struct flash_sector) * bank->num_sectors); - for (i = 0; i < bank->num_sectors; i++) { + for (int i = 0; i < bank->num_sectors; i++) { if (i < 8) { bank->sectors[i].offset = offset; bank->sectors[i].size = 4 * 1024; @@ -216,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 = 1024; + bank->num_sectors = 1; + break; + case 8 * 1024: + lpc2000_info->cmd51_max_buffer = 1024; + bank->num_sectors = 2; + break; + case 16 * 1024: + lpc2000_info->cmd51_max_buffer = 1024; + bank->num_sectors = 4; + break; case 32 * 1024: + lpc2000_info->cmd51_max_buffer = 1024; bank->num_sectors = 8; break; case 64 * 1024: @@ -238,15 +264,69 @@ static int lpc2000_build_sector_list(struct flash_bank *bank) bank->sectors = malloc(sizeof(struct flash_sector) * bank->num_sectors); - for (i = 0; i < bank->num_sectors; i++) { + 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 devices */ bank->sectors[i].size = (i < 16) ? 4 * 1024 : 32 * 1024; offset += bank->sectors[i].size; bank->sectors[i].is_erased = -1; bank->sectors[i].is_protected = 1; } + } else if (lpc2000_info->variant == lpc4300) { + switch (bank->size) { + case 256 * 1024: + bank->num_sectors = 11; + break; + case 384 * 1024: + bank->num_sectors = 13; + break; + case 512 * 1024: + bank->num_sectors = 15; + 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-7 are 8kB-sized, 8 and above are 64kB-sized for LPC43xx devices */ + bank->sectors[i].size = (i < 8) ? 8 * 1024 : 64 * 1024; + offset += bank->sectors[i].size; + 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: + bank->num_sectors = 4; + break; + case 8 * 1024: + 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); @@ -255,69 +335,69 @@ static int lpc2000_build_sector_list(struct flash_bank *bank) return ERROR_OK; } -/* call LPC1700/LPC2000 IAP function - * uses 180 bytes working area +/* this function allocates and initializes working area used for IAP algorithm + * uses 52 + max IAP stack bytes working area * 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: stack (only 128b needed) + * 0x34 to 0xb3|0x104: stack (only 128b needed for lpc17xx/2000, 208 for lpc43xx and 148b for lpc8xx) */ -static int lpc2000_iap_call(struct flash_bank *bank, - int code, - uint32_t param_table[5], - uint32_t result_table[4]) + +static int lpc2000_iap_working_area_init(struct flash_bank *bank, struct working_area **iap_working_area) { - int retval; - struct lpc2000_flash_bank *lpc2000_info = bank->driver_priv; struct target *target = bank->target; - struct mem_param mem_params[2]; - struct reg_param reg_params[5]; - struct arm_algorithm arm_algo; /* for LPC2000 */ - struct armv7m_algorithm armv7m_info; /* for LPC1700 */ - uint32_t status_code; - uint32_t iap_entry_point = 0; /* to make compiler happier */ + struct lpc2000_flash_bank *lpc2000_info = bank->driver_priv; - /* regrab previously allocated working_area, or allocate a new one */ - if (!lpc2000_info->iap_working_area) { - uint8_t jump_gate[8]; + if (target_alloc_working_area(target, 0x34 + lpc2000_info->iap_max_stack, iap_working_area) != ERROR_OK) { + LOG_ERROR("no working area specified, can't write LPC2000 internal flash"); + return ERROR_FLASH_OPERATION_FAILED; + } - /* make sure we have a working area */ - if (target_alloc_working_area(target, 180, - &lpc2000_info->iap_working_area) != ERROR_OK) { - LOG_ERROR("no working area specified, can't write LPC2000 internal flash"); - return ERROR_FLASH_OPERATION_FAILED; - } + uint8_t jump_gate[8]; - /* write IAP code to working area */ - switch (lpc2000_info->variant) { - case lpc1700: - target_buffer_set_u32(target, jump_gate, ARMV4_5_T_BX(12)); - target_buffer_set_u32(target, jump_gate + 4, ARMV5_T_BKPT(0)); - break; - case lpc2000_v1: - case lpc2000_v2: - target_buffer_set_u32(target, jump_gate, ARMV4_5_BX(12)); - target_buffer_set_u32(target, jump_gate + 4, ARMV4_5_B(0xfffffe, 0)); - break; - default: - LOG_ERROR("BUG: unknown lpc2000_info->variant encountered"); - exit(-1); - } - - retval = target_write_memory(target, - lpc2000_info->iap_working_area->address, 4, 2, jump_gate); - if (retval != ERROR_OK) { - LOG_ERROR( - "Write memory at address 0x%8.8" PRIx32 " failed (check work_area definition)", - lpc2000_info->iap_working_area->address); - return retval; - } + /* 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)); + target_buffer_set_u32(target, jump_gate + 4, ARMV5_T_BKPT(0)); + break; + case lpc2000_v1: + case lpc2000_v2: + target_buffer_set_u32(target, jump_gate, ARMV4_5_BX(12)); + target_buffer_set_u32(target, jump_gate + 4, ARMV4_5_B(0xfffffe, 0)); + break; + default: + LOG_ERROR("BUG: unknown lpc2000_info->variant encountered"); + exit(-1); } + int retval = target_write_memory(target, (*iap_working_area)->address, 4, 2, jump_gate); + if (retval != ERROR_OK) + LOG_ERROR("Write memory at address 0x%8.8" PRIx32 " failed (check work_area definition)", + (*iap_working_area)->address); + + return retval; +} + +/* call LPC1700/LPC2000 IAP function */ + +static int lpc2000_iap_call(struct flash_bank *bank, struct working_area *iap_working_area, int code, + uint32_t param_table[5], uint32_t result_table[4]) +{ + struct lpc2000_flash_bank *lpc2000_info = bank->driver_priv; + struct target *target = bank->target; + + struct arm_algorithm arm_algo; /* for LPC2000 */ + struct armv7m_algorithm armv7m_info; /* for LPC1700 */ + 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 = ARMV7M_MODE_ANY; + armv7m_info.core_mode = ARM_MODE_THREAD; iap_entry_point = 0x1fff1ff1; break; case lpc2000_v1: @@ -327,14 +407,21 @@ static int lpc2000_iap_call(struct flash_bank *bank, arm_algo.core_state = ARM_STATE_ARM; iap_entry_point = 0x7ffffff1; break; + case lpc4300: + armv7m_info.common_magic = ARMV7M_COMMON_MAGIC; + armv7m_info.core_mode = ARM_MODE_THREAD; + /* read out IAP entry point from ROM driver table at 0x10400100 */ + target_read_u32(target, 0x10400100, &iap_entry_point); + break; default: LOG_ERROR("BUG: unknown lpc2000->variant encountered"); exit(-1); } + struct mem_param mem_params[2]; + /* command parameter table */ - init_mem_param(&mem_params[0], lpc2000_info->iap_working_area->address + 8, 6 * 4, - PARAM_OUT); + init_mem_param(&mem_params[0], iap_working_area->address + 8, 6 * 4, PARAM_OUT); target_buffer_set_u32(target, mem_params[0].value, code); target_buffer_set_u32(target, mem_params[0].value + 0x04, param_table[0]); target_buffer_set_u32(target, mem_params[0].value + 0x08, param_table[1]); @@ -342,71 +429,64 @@ static int lpc2000_iap_call(struct flash_bank *bank, target_buffer_set_u32(target, mem_params[0].value + 0x10, param_table[3]); target_buffer_set_u32(target, mem_params[0].value + 0x14, param_table[4]); + struct reg_param reg_params[5]; + init_reg_param(®_params[0], "r0", 32, PARAM_OUT); - buf_set_u32(reg_params[0].value, 0, 32, lpc2000_info->iap_working_area->address + 0x08); + buf_set_u32(reg_params[0].value, 0, 32, iap_working_area->address + 0x08); /* command result table */ - init_mem_param(&mem_params[1], - lpc2000_info->iap_working_area->address + 0x20, - 5 * 4, - PARAM_IN); + init_mem_param(&mem_params[1], iap_working_area->address + 0x20, 5 * 4, PARAM_IN); init_reg_param(®_params[1], "r1", 32, PARAM_OUT); - buf_set_u32(reg_params[1].value, 0, 32, lpc2000_info->iap_working_area->address + 0x20); + buf_set_u32(reg_params[1].value, 0, 32, iap_working_area->address + 0x20); /* IAP entry point */ init_reg_param(®_params[2], "r12", 32, PARAM_OUT); buf_set_u32(reg_params[2].value, 0, 32, iap_entry_point); switch (lpc2000_info->variant) { + case lpc800: case lpc1700: + case lpc4300: /* IAP stack */ init_reg_param(®_params[3], "sp", 32, PARAM_OUT); - buf_set_u32(reg_params[3].value, 0, 32, - lpc2000_info->iap_working_area->address + 0xb4); + buf_set_u32(reg_params[3].value, 0, 32, iap_working_area->address + lpc2000_info->cmd51_src_offset); /* return address */ init_reg_param(®_params[4], "lr", 32, PARAM_OUT); - buf_set_u32(reg_params[4].value, 0, 32, - (lpc2000_info->iap_working_area->address + 0x04) | 1); + buf_set_u32(reg_params[4].value, 0, 32, (iap_working_area->address + 0x04) | 1); /* bit0 of LR = 1 to return in Thumb mode */ - target_run_algorithm(target, 2, mem_params, 5, reg_params, - lpc2000_info->iap_working_area->address, 0, 10000, &armv7m_info); + target_run_algorithm(target, 2, mem_params, 5, reg_params, iap_working_area->address, 0, 10000, + &armv7m_info); break; case lpc2000_v1: case lpc2000_v2: /* IAP stack */ init_reg_param(®_params[3], "sp_svc", 32, PARAM_OUT); - buf_set_u32(reg_params[3].value, 0, 32, - lpc2000_info->iap_working_area->address + 0xb4); + buf_set_u32(reg_params[3].value, 0, 32, iap_working_area->address + lpc2000_info->cmd51_src_offset); /* return address */ init_reg_param(®_params[4], "lr_svc", 32, PARAM_OUT); - buf_set_u32(reg_params[4].value, 0, 32, - lpc2000_info->iap_working_area->address + 0x04); + buf_set_u32(reg_params[4].value, 0, 32, iap_working_area->address + 0x04); - target_run_algorithm(target, 2, mem_params, 5, reg_params, - lpc2000_info->iap_working_area->address, - lpc2000_info->iap_working_area->address + 0x4, - 10000, &arm_algo); + target_run_algorithm(target, 2, mem_params, 5, reg_params, iap_working_area->address, + iap_working_area->address + 0x4, 10000, &arm_algo); break; default: LOG_ERROR("BUG: unknown lpc2000->variant encountered"); exit(-1); } - status_code = target_buffer_get_u32(target, mem_params[1].value); + int status_code = target_buffer_get_u32(target, mem_params[1].value); result_table[0] = target_buffer_get_u32(target, mem_params[1].value + 0x04); result_table[1] = target_buffer_get_u32(target, mem_params[1].value + 0x08); result_table[2] = target_buffer_get_u32(target, mem_params[1].value + 0x0c); 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, - code, param_table[0], param_table[1], param_table[2], - param_table[3], param_table[4], status_code); + 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, + code, param_table[0], param_table[1], param_table[2], param_table[3], param_table[4], status_code); destroy_mem_param(&mem_params[0]); destroy_mem_param(&mem_params[1]); @@ -422,22 +502,31 @@ static int lpc2000_iap_call(struct flash_bank *bank, static int lpc2000_iap_blank_check(struct flash_bank *bank, int first, int last) { - uint32_t param_table[5]; - uint32_t result_table[4]; - int status_code; - int i; - if ((first < 0) || (last >= bank->num_sectors)) return ERROR_FLASH_SECTOR_INVALID; - for (i = first; i <= last; i++) { + uint32_t param_table[5] = {0}; + uint32_t result_table[4]; + struct working_area *iap_working_area; + + int retval = lpc2000_iap_working_area_init(bank, &iap_working_area); + + if (retval != ERROR_OK) + return retval; + + struct lpc2000_flash_bank *lpc2000_info = bank->driver_priv; + if (lpc2000_info->variant == lpc4300) + param_table[2] = lpc2000_info->lpc4300_bank; + + for (int i = first; i <= last && retval == ERROR_OK; i++) { /* check single sector */ param_table[0] = param_table[1] = i; - status_code = lpc2000_iap_call(bank, 53, param_table, result_table); + int status_code = lpc2000_iap_call(bank, iap_working_area, 53, param_table, result_table); switch (status_code) { case ERROR_FLASH_OPERATION_FAILED: - return ERROR_FLASH_OPERATION_FAILED; + retval = ERROR_FLASH_OPERATION_FAILED; + break; case LPC2000_CMD_SUCCESS: bank->sectors[i].is_erased = 1; break; @@ -448,7 +537,7 @@ static int lpc2000_iap_blank_check(struct flash_bank *bank, int first, int last) bank->sectors[i].is_erased = 0; break; case LPC2000_BUSY: - return ERROR_FLASH_BUSY; + retval = ERROR_FLASH_BUSY; break; default: LOG_ERROR("BUG: unknown LPC2000 status code %i", status_code); @@ -456,7 +545,10 @@ static int lpc2000_iap_blank_check(struct flash_bank *bank, int first, int last) } } - return ERROR_OK; + struct target *target = bank->target; + target_free_working_area(target, iap_working_area); + + return retval; } /* @@ -464,12 +556,10 @@ static int lpc2000_iap_blank_check(struct flash_bank *bank, int first, int last) */ FLASH_BANK_COMMAND_HANDLER(lpc2000_flash_bank_command) { - struct lpc2000_flash_bank *lpc2000_info; - if (CMD_ARGC < 8) return ERROR_COMMAND_SYNTAX_ERROR; - lpc2000_info = malloc(sizeof(struct lpc2000_flash_bank)); + struct lpc2000_flash_bank *lpc2000_info = malloc(sizeof(struct lpc2000_flash_bank)); bank->driver_priv = lpc2000_info; if (strcmp(CMD_ARGV[6], "lpc2000_v1") == 0) { @@ -478,29 +568,56 @@ FLASH_BANK_COMMAND_HANDLER(lpc2000_flash_bank_command) lpc2000_info->cmd51_can_256b = 0; lpc2000_info->cmd51_can_8192b = 1; lpc2000_info->checksum_vector = 5; + lpc2000_info->iap_max_stack = 128; } else if (strcmp(CMD_ARGV[6], "lpc2000_v2") == 0) { lpc2000_info->variant = lpc2000_v2; lpc2000_info->cmd51_dst_boundary = 256; lpc2000_info->cmd51_can_256b = 1; lpc2000_info->cmd51_can_8192b = 0; lpc2000_info->checksum_vector = 5; + lpc2000_info->iap_max_stack = 128; } else if (strcmp(CMD_ARGV[6], "lpc1700") == 0) { lpc2000_info->variant = lpc1700; lpc2000_info->cmd51_dst_boundary = 256; lpc2000_info->cmd51_can_256b = 1; lpc2000_info->cmd51_can_8192b = 0; lpc2000_info->checksum_vector = 7; + lpc2000_info->iap_max_stack = 128; + } else if (strcmp(CMD_ARGV[6], "lpc1800") == 0 || strcmp(CMD_ARGV[6], "lpc4300") == 0) { + lpc2000_info->variant = lpc4300; + lpc2000_info->cmd51_dst_boundary = 512; + lpc2000_info->cmd51_can_256b = 0; + 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); return ERROR_FLASH_BANK_INVALID; } - lpc2000_info->iap_working_area = NULL; + /* see lpc2000_iap_working_area_init() for the reason behind the 0x34 value */ + lpc2000_info->cmd51_src_offset = 0x34 + lpc2000_info->iap_max_stack; + COMMAND_PARSE_NUMBER(u32, CMD_ARGV[7], lpc2000_info->cclk); lpc2000_info->calc_checksum = 0; lpc2000_build_sector_list(bank); + uint32_t temp_base = 0; + COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], temp_base); + if (temp_base >= 0x1B000000) + lpc2000_info->lpc4300_bank = 1; /* bank B */ + else + lpc2000_info->lpc4300_bank = 0; /* bank A */ + if (CMD_ARGC >= 9) { if (strcmp(CMD_ARGV[8], "calc_checksum") == 0) lpc2000_info->calc_checksum = 1; @@ -511,51 +628,74 @@ FLASH_BANK_COMMAND_HANDLER(lpc2000_flash_bank_command) static int lpc2000_erase(struct flash_bank *bank, int first, int last) { - struct lpc2000_flash_bank *lpc2000_info = bank->driver_priv; - uint32_t param_table[5]; - uint32_t result_table[4]; - int status_code; - if (bank->target->state != TARGET_HALTED) { LOG_ERROR("Target not halted"); return ERROR_TARGET_NOT_HALTED; } + struct lpc2000_flash_bank *lpc2000_info = bank->driver_priv; + uint32_t param_table[5] = {0}; + param_table[0] = first; param_table[1] = last; - param_table[2] = lpc2000_info->cclk; + + if (lpc2000_info->variant == lpc4300) + param_table[2] = lpc2000_info->lpc4300_bank; + else + param_table[2] = lpc2000_info->cclk; + + uint32_t result_table[4]; + struct working_area *iap_working_area; + + int retval = lpc2000_iap_working_area_init(bank, &iap_working_area); + + if (retval != ERROR_OK) + return retval; /* Prepare sectors */ - status_code = lpc2000_iap_call(bank, 50, param_table, result_table); + int status_code = lpc2000_iap_call(bank, iap_working_area, 50, param_table, result_table); switch (status_code) { case ERROR_FLASH_OPERATION_FAILED: - return ERROR_FLASH_OPERATION_FAILED; + retval = ERROR_FLASH_OPERATION_FAILED; + break; case LPC2000_CMD_SUCCESS: break; case LPC2000_INVALID_SECTOR: - return ERROR_FLASH_SECTOR_INVALID; + retval = ERROR_FLASH_SECTOR_INVALID; break; default: LOG_WARNING("lpc2000 prepare sectors returned %i", status_code); - return ERROR_FLASH_OPERATION_FAILED; + retval = ERROR_FLASH_OPERATION_FAILED; + break; } - /* Erase sectors */ - status_code = lpc2000_iap_call(bank, 52, param_table, result_table); - switch (status_code) { - case ERROR_FLASH_OPERATION_FAILED: - return ERROR_FLASH_OPERATION_FAILED; - case LPC2000_CMD_SUCCESS: - break; - case LPC2000_INVALID_SECTOR: - return ERROR_FLASH_SECTOR_INVALID; - break; - default: - LOG_WARNING("lpc2000 erase sectors returned %i", status_code); - return ERROR_FLASH_OPERATION_FAILED; + if (retval == ERROR_OK) { + /* Erase sectors */ + param_table[2] = lpc2000_info->cclk; + if (lpc2000_info->variant == lpc4300) + param_table[3] = lpc2000_info->lpc4300_bank; + + status_code = lpc2000_iap_call(bank, iap_working_area, 52, param_table, result_table); + switch (status_code) { + case ERROR_FLASH_OPERATION_FAILED: + retval = ERROR_FLASH_OPERATION_FAILED; + break; + case LPC2000_CMD_SUCCESS: + break; + case LPC2000_INVALID_SECTOR: + retval = ERROR_FLASH_SECTOR_INVALID; + break; + default: + LOG_WARNING("lpc2000 erase sectors returned %i", status_code); + retval = ERROR_FLASH_OPERATION_FAILED; + break; + } } - return ERROR_OK; + struct target *target = bank->target; + target_free_working_area(target, iap_working_area); + + return retval; } static int lpc2000_protect(struct flash_bank *bank, int set, int first, int last) @@ -566,19 +706,7 @@ static int lpc2000_protect(struct flash_bank *bank, int set, int first, int last static int lpc2000_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count) { - struct lpc2000_flash_bank *lpc2000_info = bank->driver_priv; struct target *target = bank->target; - uint32_t dst_min_alignment; - uint32_t bytes_remaining = count; - uint32_t bytes_written = 0; - int first_sector = 0; - int last_sector = 0; - uint32_t param_table[5]; - uint32_t result_table[4]; - int status_code; - int i; - struct working_area *download_area; - int retval = ERROR_OK; if (bank->target->state != TARGET_HALTED) { LOG_ERROR("Target not halted"); @@ -588,20 +716,22 @@ static int lpc2000_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offs if (offset + count > bank->size) return ERROR_FLASH_DST_OUT_OF_BANK; - dst_min_alignment = lpc2000_info->cmd51_dst_boundary; + struct lpc2000_flash_bank *lpc2000_info = bank->driver_priv; + + uint32_t dst_min_alignment = lpc2000_info->cmd51_dst_boundary; if (offset % dst_min_alignment) { - LOG_WARNING("offset 0x%" PRIx32 " breaks required alignment 0x%" PRIx32, - offset, - dst_min_alignment); + LOG_WARNING("offset 0x%" PRIx32 " breaks required alignment 0x%" PRIx32, offset, dst_min_alignment); return ERROR_FLASH_DST_BREAKS_ALIGNMENT; } - for (i = 0; i < bank->num_sectors; i++) { + int first_sector = 0; + int last_sector = 0; + + for (int i = 0; i < bank->num_sectors; i++) { if (offset >= bank->sectors[i].offset) first_sector = i; - if (offset + DIV_ROUND_UP(count, dst_min_alignment) - * dst_min_alignment > bank->sectors[i].offset) + if (offset + DIV_ROUND_UP(count, dst_min_alignment) * dst_min_alignment > bank->sectors[i].offset) last_sector = i; } @@ -610,35 +740,46 @@ 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) { uint32_t checksum = 0; - for (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)); + 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)); if (i != lpc2000_info->checksum_vector) checksum += buf_get_u32(buffer + (i * 4), 0, 32); } checksum = 0 - checksum; LOG_DEBUG("checksum: 0x%8.8" PRIx32, checksum); - uint32_t original_value = buf_get_u32(buffer + - (lpc2000_info->checksum_vector * 4), 0, 32); + uint32_t original_value = buf_get_u32(buffer + (lpc2000_info->checksum_vector * 4), 0, 32); if (original_value != checksum) { - LOG_WARNING("Verification will fail since checksum in image (0x%8.8" PRIx32 ") " - "to be written to flash is different from calculated vector " - "checksum (0x%8.8" PRIx32 ").", original_value, checksum); - LOG_WARNING("To remove this warning modify build tools on developer PC " - "to inject correct LPC vector checksum."); + LOG_WARNING("Verification will fail since checksum in image (0x%8.8" PRIx32 ") to be written to flash is " + "different from calculated vector checksum (0x%8.8" PRIx32 ").", original_value, checksum); + LOG_WARNING("To remove this warning modify build tools on developer PC to inject correct LPC vector " + "checksum."); } buf_set_u32(buffer + (lpc2000_info->checksum_vector * 4), 0, 32, checksum); } + struct working_area *iap_working_area; + + int retval = lpc2000_iap_working_area_init(bank, &iap_working_area); + + if (retval != ERROR_OK) + return retval; + + struct working_area *download_area; + /* allocate a working area */ - if (target_alloc_working_area(target, lpc2000_info->cmd51_max_buffer, - &download_area) != ERROR_OK) { + if (target_alloc_working_area(target, lpc2000_info->cmd51_max_buffer, &download_area) != ERROR_OK) { LOG_ERROR("no working area specified, can't write LPC2000 internal flash"); + target_free_working_area(target, iap_working_area); return ERROR_FLASH_OPERATION_FAILED; } + uint32_t bytes_remaining = count; + uint32_t bytes_written = 0; + uint32_t param_table[5] = {0}; + uint32_t result_table[4]; + while (bytes_remaining > 0) { uint32_t thisrun_bytes; if (bytes_remaining >= lpc2000_info->cmd51_max_buffer) @@ -647,13 +788,21 @@ 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; param_table[1] = last_sector; - status_code = lpc2000_iap_call(bank, 50, param_table, result_table); + + if (lpc2000_info->variant == lpc4300) + param_table[2] = lpc2000_info->lpc4300_bank; + else + param_table[2] = lpc2000_info->cclk; + + int status_code = lpc2000_iap_call(bank, iap_working_area, 50, param_table, result_table); switch (status_code) { case ERROR_FLASH_OPERATION_FAILED: retval = ERROR_FLASH_OPERATION_FAILED; @@ -674,8 +823,7 @@ static int lpc2000_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offs break; if (bytes_remaining >= thisrun_bytes) { - retval = target_write_buffer(bank->target, download_area->address, - thisrun_bytes, buffer + bytes_written); + retval = target_write_buffer(bank->target, download_area->address, thisrun_bytes, buffer + bytes_written); if (retval != ERROR_OK) { retval = ERROR_FLASH_OPERATION_FAILED; break; @@ -683,25 +831,20 @@ static int lpc2000_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offs } else { uint8_t *last_buffer = malloc(thisrun_bytes); memcpy(last_buffer, buffer + bytes_written, bytes_remaining); - memset(last_buffer + bytes_remaining, 0xff, thisrun_bytes - - bytes_remaining); - target_write_buffer(bank->target, - download_area->address, - thisrun_bytes, - last_buffer); + memset(last_buffer + bytes_remaining, 0xff, thisrun_bytes - bytes_remaining); + target_write_buffer(bank->target, download_area->address, thisrun_bytes, last_buffer); free(last_buffer); } - LOG_DEBUG("writing 0x%" PRIx32 " bytes to address 0x%" PRIx32, - thisrun_bytes, - bank->base + offset + bytes_written); + LOG_DEBUG("writing 0x%" PRIx32 " bytes to address 0x%" PRIx32, thisrun_bytes, + bank->base + offset + bytes_written); /* Write data */ param_table[0] = bank->base + offset + bytes_written; param_table[1] = download_area->address; param_table[2] = thisrun_bytes; param_table[3] = lpc2000_info->cclk; - status_code = lpc2000_iap_call(bank, 51, param_table, result_table); + status_code = lpc2000_iap_call(bank, iap_working_area, 51, param_table, result_table); switch (status_code) { case ERROR_FLASH_OPERATION_FAILED: retval = ERROR_FLASH_OPERATION_FAILED; @@ -728,6 +871,7 @@ static int lpc2000_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offs bytes_written += thisrun_bytes; } + target_free_working_area(target, iap_working_area); target_free_working_area(target, download_area); return retval; @@ -735,9 +879,7 @@ static int lpc2000_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offs static int lpc2000_probe(struct flash_bank *bank) { - /* we can't probe on an lpc2000 - * if this is an lpc2xxx, it has the configured flash - */ + /* we can't probe on an lpc2000 if this is an lpc2xxx, it has the configured flash */ return ERROR_OK; } @@ -761,21 +903,14 @@ static int get_lpc2000_info(struct flash_bank *bank, char *buf, int buf_size) { struct lpc2000_flash_bank *lpc2000_info = bank->driver_priv; - snprintf(buf, - buf_size, - "lpc2000 flash driver variant: %i, clk: %" PRIi32 "kHz", - lpc2000_info->variant, - lpc2000_info->cclk); + snprintf(buf, buf_size, "lpc2000 flash driver variant: %i, clk: %" PRIi32 "kHz", lpc2000_info->variant, + lpc2000_info->cclk); return ERROR_OK; } COMMAND_HANDLER(lpc2000_handle_part_id_command) { - uint32_t param_table[5]; - uint32_t result_table[4]; - int status_code; - if (CMD_ARGC < 1) return ERROR_COMMAND_SYNTAX_ERROR; @@ -789,18 +924,25 @@ COMMAND_HANDLER(lpc2000_handle_part_id_command) return ERROR_TARGET_NOT_HALTED; } - status_code = lpc2000_iap_call(bank, 54, param_table, result_table); + uint32_t param_table[5] = {0}; + uint32_t result_table[4]; + struct working_area *iap_working_area; + + retval = lpc2000_iap_working_area_init(bank, &iap_working_area); + + if (retval != ERROR_OK) + return retval; + + int status_code = lpc2000_iap_call(bank, iap_working_area, 54, param_table, result_table); if (status_code != 0x0) { if (status_code == ERROR_FLASH_OPERATION_FAILED) { - command_print(CMD_CTX, - "no sufficient working area specified, can't access LPC2000 IAP interface"); - return ERROR_OK; - } - command_print(CMD_CTX, "lpc2000 IAP returned status code %i", status_code); + command_print(CMD_CTX, "no sufficient working area specified, can't access LPC2000 IAP interface"); + } else + command_print(CMD_CTX, "lpc2000 IAP returned status code %i", status_code); } else command_print(CMD_CTX, "lpc2000 part id: 0x%8.8" PRIx32, result_table[0]); - return ERROR_OK; + return retval; } static const struct command_registration lpc2000_exec_command_handlers[] = {