Flash/LPC2000: Add support for LPC11(x)xx, LPC13xx

[openocd.git] / src / flash / nor / lpc2000.c

diff --git a/src/flash/nor/lpc2000.c b/src/flash/nor/lpc2000.c
index 3962f305c809ba3cef780cccb7cb6aa81c04c01d..e81c97d4d5ca61489a32897c1cb3b63a5793fc4e 100644 (file)
--- a/src/flash/nor/lpc2000.c
+++ b/src/flash/nor/lpc2000.c
@@ -60,11 +60,21 @@
  * - 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 812)
+ * - 810 | 1 | 2 (tested with LPC810/LPC812)
+ *
+ * lpc1100:
+ * - 11xx
+ * - 11Axx
+ * - 11Cxx
+ * - 11Dxx
+ * - 11Exx
+ * - 11Uxx (tested with LPC11U34)
+ * - 131x
+ * - 134x
  */
 
 typedef enum {
@@ -73,6 +83,7 @@ typedef enum {
        lpc1700,
        lpc4300,
        lpc800,
+       lpc1100,
 } lpc2000_variant;
 
 struct lpc2000_flash_bank {
@@ -230,15 +241,15 @@ 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;
+                               lpc2000_info->cmd51_max_buffer = 256;
                                bank->num_sectors = 1;
                                break;
                        case 8 * 1024:
-                               lpc2000_info->cmd51_max_buffer = 1024;
+                               lpc2000_info->cmd51_max_buffer = 512;
                                bank->num_sectors = 2;
                                break;
                        case 16 * 1024:
-                               lpc2000_info->cmd51_max_buffer = 1024;
+                               lpc2000_info->cmd51_max_buffer = 512;
                                bank->num_sectors = 4;
                                break;
                        case 32 * 1024:
@@ -303,9 +314,11 @@ static int lpc2000_build_sector_list(struct flash_bank *bank)
                        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:
@@ -327,6 +340,25 @@ static int lpc2000_build_sector_list(struct flash_bank *bank)
                        bank->sectors[i].is_protected = 1;
                }
 
+       } else if (lpc2000_info->variant == lpc1100) {
+               if ((bank->size % (4 * 1024)) != 0) {
+                       LOG_ERROR("BUG: unknown bank->size encountered,\nLPC1100 flash size must be a multiple of 4096");
+                       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;
+
+               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;
+                       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);
@@ -358,6 +390,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 lpc1100:
                case lpc1700:
                case lpc4300:
                        target_buffer_set_u32(target, jump_gate, ARMV4_5_T_BX(12));
@@ -395,6 +428,7 @@ static int lpc2000_iap_call(struct flash_bank *bank, struct working_area *iap_wo
 
        switch (lpc2000_info->variant) {
                case lpc800:
+               case lpc1100:
                case lpc1700:
                        armv7m_info.common_magic = ARMV7M_COMMON_MAGIC;
                        armv7m_info.core_mode = ARM_MODE_THREAD;
@@ -446,6 +480,7 @@ static int lpc2000_iap_call(struct flash_bank *bank, struct working_area *iap_wo
 
        switch (lpc2000_info->variant) {
                case lpc800:
+               case lpc1100:
                case lpc1700:
                case lpc4300:
                        /* IAP stack */
@@ -485,7 +520,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]);
@@ -559,7 +594,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) {
@@ -598,6 +634,13 @@ FLASH_BANK_COMMAND_HANDLER(lpc2000_flash_bank_command)
                lpc2000_info->cmd51_can_8192b = 0;
                lpc2000_info->checksum_vector = 7;
                lpc2000_info->iap_max_stack = 148;
+       } else if (strcmp(CMD_ARGV[6], "lpc1100") == 0) {
+               lpc2000_info->variant = lpc1100;
+               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 {
                LOG_ERROR("unknown LPC2000 variant: %s", CMD_ARGV[6]);
                free(lpc2000_info);
@@ -652,6 +695,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) {
@@ -704,7 +751,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;
 
@@ -739,6 +786,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));
@@ -756,7 +804,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;
@@ -780,6 +829,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)