flash: Constify write buffer

[openocd] / src / flash / nor / efm32.c

diff --git a/src/flash/nor/efm32.c b/src/flash/nor/efm32.c
index be9f8eea0a8056913b246ccfc9febd5ae262dc50..3c46c76da0b02eec183a4f0f153a5ee78d8743e0 100644 (file)
--- a/src/flash/nor/efm32.c
+++ b/src/flash/nor/efm32.c
@@ -42,6 +42,7 @@
 #define EFM_FAMILY_ID_GIANT_GECKO       72
 #define EFM_FAMILY_ID_TINY_GECKO        73
 #define EFM_FAMILY_ID_LEOPARD_GECKO     74
+#define EFM_FAMILY_ID_WONDER_GECKO      75
 
 #define EFM32_FLASH_ERASE_TMO           100
 #define EFM32_FLASH_WDATAREADY_TMO      100
@@ -97,7 +98,7 @@ struct efm32_info {
        uint16_t page_size;
 };
 
-static int efm32x_write(struct flash_bank *bank, uint8_t *buffer,
+static int efm32x_write(struct flash_bank *bank, const uint8_t *buffer,
        uint32_t offset, uint32_t count);
 
 static int efm32x_get_flash_size(struct flash_bank *bank, uint16_t *flash_sz)
@@ -139,8 +140,10 @@ static int efm32x_read_info(struct flash_bank *bank,
 
        if (((cpuid >> 4) & 0xfff) == 0xc23) {
                /* Cortex M3 device */
+       } else if (((cpuid >> 4) & 0xfff) == 0xc24) {
+               /* Cortex M4 device */
        } else {
-               LOG_ERROR("Target is not CortexM3");
+               LOG_ERROR("Target is not CortexM3 or M4");
                return ERROR_FAIL;
        }
 
@@ -191,6 +194,18 @@ static int efm32x_read_info(struct flash_bank *bank,
                        LOG_ERROR("Invalid page size %u", efm32_info->page_size);
                        return ERROR_FAIL;
                }
+       } else if (EFM_FAMILY_ID_WONDER_GECKO == efm32_info->part_family) {
+               uint8_t pg_size = 0;
+               ret = target_read_u8(bank->target, EFM32_MSC_DI_PAGE_SIZE,
+                       &pg_size);
+               if (ERROR_OK != ret)
+                       return ret;
+
+               efm32_info->page_size = (1 << ((pg_size+10) & 0xff));
+               if (2048 != efm32_info->page_size) {
+                       LOG_ERROR("Invalid page size %u", efm32_info->page_size);
+                       return ERROR_FAIL;
+               }
        } else {
                LOG_ERROR("Unknown MCU family %d", efm32_info->part_family);
                return ERROR_FAIL;
@@ -292,7 +307,7 @@ static int efm32x_erase_page(struct flash_bank *bank, uint32_t addr)
        int ret = 0;
        uint32_t status = 0;
 
-       LOG_DEBUG("erasing flash page at 0x%08x", addr);
+       LOG_DEBUG("erasing flash page at 0x%08" PRIx32, addr);
 
        ret = target_write_u32(bank->target, EFM32_MSC_ADDRB, addr);
        if (ERROR_OK != ret)
@@ -307,13 +322,13 @@ static int efm32x_erase_page(struct flash_bank *bank, uint32_t addr)
        if (ERROR_OK != ret)
                return ret;
 
-       LOG_DEBUG("status 0x%x", status);
+       LOG_DEBUG("status 0x%" PRIx32, status);
 
        if (status & EFM32_MSC_STATUS_LOCKED_MASK) {
                LOG_ERROR("Page is locked");
                return ERROR_FAIL;
        } else if (status & EFM32_MSC_STATUS_INVADDR_MASK) {
-               LOG_ERROR("Invalid address 0x%x", addr);
+               LOG_ERROR("Invalid address 0x%" PRIx32, addr);
                return ERROR_FAIL;
        }
 
@@ -484,7 +499,7 @@ static int efm32x_protect(struct flash_bank *bank, int set, int first, int last)
        return ERROR_OK;
 }
 
-static int efm32x_write_block(struct flash_bank *bank, uint8_t *buf,
+static int efm32x_write_block(struct flash_bank *bank, const uint8_t *buf,
        uint32_t offset, uint32_t count)
 {
        struct target *target = bank->target;
@@ -578,8 +593,7 @@ static int efm32x_write_block(struct flash_bank *bank, uint8_t *buf,
        };
 
        ret = target_write_buffer(target, write_algorithm->address,
-               sizeof(efm32x_flash_write_code),
-               (uint8_t *)efm32x_flash_write_code);
+                       sizeof(efm32x_flash_write_code), efm32x_flash_write_code);
        if (ret != ERROR_OK)
                return ret;
 
@@ -681,13 +695,13 @@ static int efm32x_write_word(struct flash_bank *bank, uint32_t addr,
        if (ERROR_OK != ret)
                return ret;
 
-       LOG_DEBUG("status 0x%x", status);
+       LOG_DEBUG("status 0x%" PRIx32, status);
 
        if (status & EFM32_MSC_STATUS_LOCKED_MASK) {
                LOG_ERROR("Page is locked");
                return ERROR_FAIL;
        } else if (status & EFM32_MSC_STATUS_INVADDR_MASK) {
-               LOG_ERROR("Invalid address 0x%x", addr);
+               LOG_ERROR("Invalid address 0x%" PRIx32, addr);
                return ERROR_FAIL;
        }
 
@@ -721,7 +735,7 @@ static int efm32x_write_word(struct flash_bank *bank, uint32_t addr,
        return ERROR_OK;
 }
 
-static int efm32x_write(struct flash_bank *bank, uint8_t *buffer,
+static int efm32x_write(struct flash_bank *bank, const uint8_t *buffer,
                uint32_t offset, uint32_t count)
 {
        struct target *target = bank->target;
@@ -747,9 +761,9 @@ static int efm32x_write(struct flash_bank *bank, uint8_t *buffer,
                                "for padding buffer");
                        return ERROR_FAIL;
                }
-               LOG_INFO("odd number of bytes to write (%d), extending to %d "
+               LOG_INFO("odd number of bytes to write (%" PRIu32 "), extending to %" PRIu32 " "
                        "and padding with 0xff", old_count, count);
-               memset(buffer, 0xff, count);
+               memset(new_buffer, 0xff, count);
                buffer = memcpy(new_buffer, buffer, old_count);
        }
 
@@ -826,6 +840,9 @@ static int efm32x_probe(struct flash_bank *bank)
                case EFM_FAMILY_ID_LEOPARD_GECKO:
                        LOG_INFO("Leopard Gecko MCU detected");
                        break;
+               case EFM_FAMILY_ID_WONDER_GECKO:
+                       LOG_INFO("Wonder Gecko MCU detected");
+                       break;
                default:
                        LOG_ERROR("Unsupported MCU family %d",
                                efm32_mcu_info.part_family);
@@ -936,6 +953,9 @@ static int get_efm32x_info(struct flash_bank *bank, char *buf, int buf_size)
                case EFM_FAMILY_ID_LEOPARD_GECKO:
                        printed = snprintf(buf, buf_size, "Leopard Gecko");
                        break;
+               case EFM_FAMILY_ID_WONDER_GECKO:
+                       printed = snprintf(buf, buf_size, "Wonder Gecko");
+                       break;
        }
 
        buf += printed;