Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
flash/nor/psoc4: fix warnings
[openocd.git] / src / flash / nor / lpc2000.c
diff --git a/src/flash/nor/lpc2000.c b/src/flash/nor/lpc2000.c
index c2a1fc203784cd1f0908af6d06972773fc1a2652..9da5da2cac282eebbb7e262df4483e3d7972f0e9 100644 (file)
--- a/src/flash/nor/lpc2000.c
+++ b/src/flash/nor/lpc2000.c
@@ -23,9 +23,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   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.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -213,6 +211,7 @@
 #define LPC1317        0x1A020525
 #define LPC1342        0x3D01402B
 #define LPC1343        0x3D00002B
+#define LPC1343_1      0x3000002B
 #define LPC1345        0x28010541
 #define LPC1346        0x08018542
 #define LPC1347        0x08020543
@@ -260,6 +259,8 @@
 
 #define IAP_CODE_LEN 0x34
 
+#define LPC11xx_REG_SECTORS    24
+
 typedef enum {
        lpc2000_v1,
        lpc2000_v2,
@@ -276,9 +277,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;
@@ -323,9 +321,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;
 
@@ -371,9 +366,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;
 
@@ -440,9 +432,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;
 
@@ -492,9 +481,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;
 
@@ -526,9 +512,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 */
@@ -565,9 +548,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;
 
@@ -576,14 +556,21 @@ static int lpc2000_build_sector_list(struct flash_bank *bank)
                        exit(-1);
                }
                lpc2000_info->cmd51_max_buffer = 512; /* smallest MCU in the series, LPC1110, has 1 kB of SRAM */
-               bank->num_sectors = bank->size / 4096;
+               unsigned int large_sectors = 0;
+               unsigned int normal_sectors = bank->size / 4096;
+
+               if (normal_sectors > LPC11xx_REG_SECTORS) {
+                       large_sectors = (normal_sectors - LPC11xx_REG_SECTORS) / 8;
+                       normal_sectors = LPC11xx_REG_SECTORS;
+               }
+
+               bank->num_sectors = normal_sectors + large_sectors;
 
                bank->sectors = malloc(sizeof(struct flash_sector) * bank->num_sectors);
 
                for (int i = 0; i < bank->num_sectors; i++) {
                        bank->sectors[i].offset = offset;
-                       /* all sectors are 4kB-sized */
-                       bank->sectors[i].size = 4 * 1024;
+                       bank->sectors[i].size = (i < LPC11xx_REG_SECTORS ? 4 : 32) * 1024;
                        offset += bank->sectors[i].size;
                        bank->sectors[i].is_erased = -1;
                        bank->sectors[i].is_protected = 1;
@@ -591,9 +578,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;
 
@@ -625,9 +609,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;
 
@@ -706,9 +687,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)
-               LOG_ERROR("Write memory at address 0x%8.8" PRIx32 " failed (check work_area definition)",
+       if (retval != ERROR_OK) {
+               LOG_ERROR("Write memory at address 0x%8.8" TARGET_PRIxADDR " failed (check work_area definition)",
                                (*iap_working_area)->address);
+               target_free_working_area(target, *iap_working_area);
+       }
 
        return retval;
 }
@@ -1127,14 +1110,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;
@@ -1240,6 +1217,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;
@@ -1345,6 +1325,7 @@ static int lpc2000_auto_probe_flash(struct flash_bank *bank)
                case LPC1313_1:
                case LPC1315:
                case LPC1343:
+               case LPC1343_1:
                case LPC1345:
                        lpc2000_info->variant = lpc1100;
                        bank->size = 32 * 1024;
@@ -1478,7 +1459,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);
        }
 
@@ -1500,7 +1481,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);
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)