This is an automated email from Gerrit. Cosmin Gorgovan ([email protected]) just uploaded a new patch set to Gerrit, which you can find at http://openocd.zylin.com/2075
-- gerrit commit 8ab07e69c72d2a7720edfb0502711751975eb5a3 Author: Cosmin Gorgovan <[email protected]> Date: Sat Mar 29 22:34:43 2014 +0000 Flash/LPC2000: Add support for auto-probing flash size Adds support for auto-probing on devices which support the IAP Read Part ID command. Includes IDs for all LPC17XX, LPC13XX, LPC11XX, LPC11AXX, LPC11CXX, LPC11UXX devices. Change-Id: Ic617c32925c9ebe0e9d9192ed8ddbfa08e9f0aaa Signed-off-by: Cosmin Gorgovan <[email protected]> diff --git a/src/flash/nor/lpc2000.c b/src/flash/nor/lpc2000.c index 28bb955..3ca8698 100644 --- a/src/flash/nor/lpc2000.c +++ b/src/flash/nor/lpc2000.c @@ -5,6 +5,9 @@ * LPC1700 support Copyright (C) 2009 by Audrius Urmanavicius * * [email protected] * * * + * LPC1100 variant and auto-probing support Copyright (C) 2014 * + * by Cosmin Gorgovan cosmin [at] linux-geek [dot] org * + * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * @@ -67,6 +70,96 @@ * - 810 | 1 | 2 (tested with LPC810/LPC812) */ +/* Part IDs for autodetection */ +#define LPC1110_1 0x0A07102B +#define LPC1110_2 0x1A07102B +#define LPC1111_002_1 0x0A16D02B +#define LPC1111_002_2 0x1A16D02B +#define LPC1111_101_1 0x041E502B +#define LPC1111_101_2 0x2516D02B +#define LPC1111_103_1 0x00010013 +#define LPC1111_201_1 0x0416502B +#define LPC1111_201_2 0x2516902B +#define LPC1111_203_1 0x00010012 +#define LPC1112_101_1 0x042D502B +#define LPC1112_101_2 0x2524D02B +#define LPC1112_102_1 0x0A24902B +#define LPC1112_102_2 0x1A24902B +#define LPC1112_103_1 0x00020023 +#define LPC1112_201_1 0x0425502B +#define LPC1112_201_2 0x2524902B +#define LPC1112_203_1 0x00020022 +#define LPC1113_201_1 0x0434502B +#define LPC1113_201_2 0x2532902B +#define LPC1113_203_1 0x00030032 +#define LPC1113_301_1 0x0434102B +#define LPC1113_301_2 0x2532102B +#define LPC1113_303_1 0x00030030 +#define LPC1114_102_1 0x0A40902B +#define LPC1114_102_2 0x1A40902B +#define LPC1114_201_1 0x0444502B +#define LPC1114_201_2 0x2540902B +#define LPC1114_203_1 0x00040042 +#define LPC1114_301_1 0x0444102B +#define LPC1114_301_2 0x2540102B +#define LPC1114_303_1 0x00040040 +#define LPC1114_323_1 0x00040060 +#define LPC1114_333_1 0x00040070 +#define LPC1115_303_1 0x00050080 + +#define LPC11A02_1 0x4D4C802B +#define LPC11A04_1 0x4D80002B +#define LPC11A11_001_1 0x455EC02B +#define LPC11A12_101_1 0x4574802B +#define LPC11A13_201_1 0x458A402B +#define LPC11A14_301_1 0x35A0002B +#define LPC11A14_301_2 0x45A0002B + +#define LPC11C12_301_1 0x1421102B +#define LPC11C14_301_1 0x1440102B +#define LPC11C22_301_1 0x1431102B +#define LPC11C24_301_1 0x1430102B + +#define LPC11U12_201_1 0x095C802B +#define LPC11U12_201_2 0x295C802B +#define LPC11U13_201_1 0x097A802B +#define LPC11U13_201_2 0x297A802B +#define LPC11U14_201_1 0x0998802B +#define LPC11U14_201_2 0x2998802B +#define LPC11U23_301 0x2972402B +#define LPC11U24_301 0x2988402B +#define LPC11U24_401 0x2980002B +#define LPC11U34_311 0x0003D440 +#define LPC11U34_421 0x0001CC40 +#define LPC11U35_401 0x0001BC40 +#define LPC11U35_501 0x0000BC40 +#define LPC11U36_401 0x00019C40 +#define LPC11U37_401 0x00017C40 +#define LPC11U37H_401 0x00007C44 +#define LPC11U37_501 0x00007C40 + +#define LPC1311 0x2C42502B +#define LPC1311_1 0x1816902B +#define LPC1313 0x2C40102B +#define LPC1313_1 0x1830102B +#define LPC1315 0x3A010523 +#define LPC1316 0x1A018524 +#define LPC1317 0x1A020525 +#define LPC1342 0x3D01402B +#define LPC1343 0x3D00002B +#define LPC1345 0x28010541 +#define LPC1346 0x08018542 +#define LPC1347 0x08020543 + +#define LPC1774 0x27011132 +#define LPC1776 0x27191F43 +#define LPC1777 0x27193747 +#define LPC1778 0x27193F47 +#define LPC1785 0x281D1743 +#define LPC1786 0x281D1F43 +#define LPC1787 0x281D3747 +#define LPC1788 0x281D3F47 + typedef enum { lpc2000_v1, lpc2000_v2, @@ -89,6 +182,7 @@ struct lpc2000_flash_bank { uint32_t iap_max_stack; uint32_t cmd51_src_offset; uint32_t lpc4300_bank; + bool probed; }; enum lpc2000_status_codes { @@ -585,6 +679,7 @@ FLASH_BANK_COMMAND_HANDLER(lpc2000_flash_bank_command) return ERROR_COMMAND_SYNTAX_ERROR; struct lpc2000_flash_bank *lpc2000_info = calloc(1, sizeof(*lpc2000_info)); + lpc2000_info->probed = false; bank->driver_priv = lpc2000_info; @@ -642,7 +737,6 @@ FLASH_BANK_COMMAND_HANDLER(lpc2000_flash_bank_command) 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); @@ -920,9 +1014,184 @@ static int lpc2000_write(struct flash_bank *bank, const uint8_t *buffer, uint32_ return retval; } +static int get_lpc2000_part_id(struct flash_bank *bank, uint32_t *part_id) +{ + if (bank->target->state != TARGET_HALTED) { + LOG_ERROR("Target not halted"); + return ERROR_TARGET_NOT_HALTED; + } + + 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; + + int status_code = lpc2000_iap_call(bank, iap_working_area, 54, param_table, result_table); + + if (status_code == LPC2000_CMD_SUCCESS) + *part_id = result_table[0]; + + return status_code; +} + +static int lpc2000_auto_probe_flash(struct flash_bank *bank) +{ + uint32_t part_id; + int retval; + + if (bank->target->state != TARGET_HALTED) { + LOG_ERROR("Target not halted"); + return ERROR_TARGET_NOT_HALTED; + } + + retval = get_lpc2000_part_id(bank, &part_id); + if (retval != LPC2000_CMD_SUCCESS) { + LOG_ERROR("Could not get part ID"); + return retval; + } + + switch (part_id) { + case LPC1110_1: + case LPC1110_2: + bank->size = 4 * 1024; + break; + + case LPC1111_002_1: + case LPC1111_002_2: + case LPC1111_101_1: + case LPC1111_101_2: + case LPC1111_103_1: + case LPC1111_201_1: + case LPC1111_201_2: + case LPC1111_203_1: + case LPC11A11_001_1: + case LPC1311: + case LPC1311_1: + bank->size = 8 * 1024; + break; + + case LPC1112_101_1: + case LPC1112_101_2: + case LPC1112_102_1: + case LPC1112_102_2: + case LPC1112_103_1: + case LPC1112_201_1: + case LPC1112_201_2: + case LPC1112_203_1: + case LPC11A02_1: + case LPC11A12_101_1: + case LPC11U12_201_1: + case LPC11U12_201_2: + case LPC1342: + bank->size = 16 * 1024; + break; + + case LPC1113_201_1: + case LPC1113_201_2: + case LPC1113_203_1: + case LPC1113_301_1: + case LPC1113_301_2: + case LPC1113_303_1: + case LPC11A13_201_1: + case LPC11U13_201_1: + case LPC11U13_201_2: + case LPC11U23_301: + bank->size = 24 * 1024; + break; + + case LPC1114_102_1: + case LPC1114_102_2: + case LPC1114_201_1: + case LPC1114_201_2: + case LPC1114_203_1: + case LPC1114_301_1: + case LPC1114_301_2: + case LPC1114_303_1: + case LPC11A04_1: + case LPC11A14_301_1: + case LPC11A14_301_2: + case LPC11U14_201_1: + case LPC11U14_201_2: + case LPC11U24_301: + case LPC11U24_401: + case LPC1313: + case LPC1313_1: + case LPC1315: + case LPC1343: + case LPC1345: + bank->size = 32 * 1024; + break; + + case LPC11U34_311: + bank->size = 40 * 1024; + break; + + case LPC1114_323_1: + case LPC11U34_421: + case LPC1316: + case LPC1346: + bank->size = 48 * 1024; + break; + + case LPC1114_333_1: + bank->size = 56 * 1024; + break; + + case LPC1115_303_1: + case LPC11U35_401: + case LPC11U35_501: + case LPC1317: + case LPC1347: + bank->size = 64 * 1024; + break; + + case LPC11U36_401: + bank->size = 96 * 1024; + break; + + case LPC11U37_401: + case LPC11U37H_401: + case LPC11U37_501: + case LPC1774: + bank->size = 128 * 1024; + break; + + case LPC1776: + case LPC1785: + case LPC1786: + bank->size = 256 * 1024; + break; + + case LPC1777: + case LPC1778: + case LPC1787: + case LPC1788: + bank->size = 512 * 1024; + break; + + default: + LOG_ERROR("BUG: unknown Part ID encountered: 0x%x", part_id); + exit(-1); + } + + return ERROR_OK; +} + 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 */ + struct lpc2000_flash_bank *lpc2000_info = bank->driver_priv; + + if (!lpc2000_info->probed) { + if (bank->size == 0) + lpc2000_auto_probe_flash(bank); + + lpc2000_build_sector_list(bank); + lpc2000_info->probed = true; + } return ERROR_OK; } @@ -968,23 +1237,15 @@ COMMAND_HANDLER(lpc2000_handle_part_id_command) return ERROR_TARGET_NOT_HALTED; } - 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); + uint32_t part_id; + int status_code = get_lpc2000_part_id(bank, &part_id); 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"); } 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]); + command_print(CMD_CTX, "lpc2000 part id: 0x%8.8" PRIx32, part_id); return retval; } -- ------------------------------------------------------------------------------ _______________________________________________ OpenOCD-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openocd-devel
