stm32l flash: add another device ID

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

diff --git a/src/flash/nor/stm32lx.c b/src/flash/nor/stm32lx.c
index 70414cdcde504205973cae9e96fab7e05cd52f72..b8b530624c60ec1c50bd822adadb5be0b3607675 100644 (file)
--- a/src/flash/nor/stm32lx.c
+++ b/src/flash/nor/stm32lx.c
@@ -259,7 +259,7 @@ static int stm32lx_write_half_pages(struct flash_bank *bank, uint8_t *buffer,
        retval = target_write_buffer(target,
                        write_algorithm->address,
                        sizeof(stm32lx_flash_write_code),
-                       (uint8_t *)stm32lx_flash_write_code);
+                       stm32lx_flash_write_code);
        if (retval != ERROR_OK) {
                target_free_working_area(target, write_algorithm);
                return retval;
@@ -550,6 +550,12 @@ static int stm32lx_probe(struct flash_bank *bank)
                first_bank_size_in_kb = 192;
                stm32lx_info->has_dual_banks = true;
                break;
+       case 0x437:
+               /* Dual bank, high density */
+               max_flash_size_in_kb = 512;
+               first_bank_size_in_kb = 192;
+               stm32lx_info->has_dual_banks = true;
+               break;
        default:
                LOG_WARNING("Cannot identify target as a STM32L family.");
                return ERROR_FAIL;
@@ -558,7 +564,8 @@ static int stm32lx_probe(struct flash_bank *bank)
        /* Get the flash size from target.  0x427 and 0x436 devices use a
         * different location for the Flash Size register, please see RM0038 r8 or
         * newer. */
-       if ((device_id & 0xfff) == 0x427 || (device_id & 0xfff) == 0x436)
+       if ((device_id & 0xfff) == 0x427 || (device_id & 0xfff) == 0x436 ||
+               (device_id & 0xfff) == 0x437)
                        retval = target_read_u16(target, F_SIZE_MP, &flash_size_in_kb);
        else
                        retval = target_read_u16(target, F_SIZE, &flash_size_in_kb);
@@ -598,14 +605,15 @@ static int stm32lx_probe(struct flash_bank *bank)
                        /* This is the first bank */
                        flash_size_in_kb = first_bank_size_in_kb;
                } else {
-                       LOG_WARNING("STM32L flash bank base address config is incorrect. 0x%x but should rather be 0x%x or 0x%x",
+                       LOG_WARNING("STM32L flash bank base address config is incorrect."
+                                   " 0x%" PRIx32 " but should rather be 0x%" PRIx32 " or 0x%" PRIx32,
                                                bank->base, base_address, second_bank_base);
                        return ERROR_FAIL;
                }
-               LOG_INFO("STM32L flash has dual banks. Bank (%d) size is %dkb, base address is 0x%x",
+               LOG_INFO("STM32L flash has dual banks. Bank (%d) size is %dkb, base address is 0x%" PRIx32,
                                bank->bank_number, flash_size_in_kb, base_address);
        } else {
-               LOG_INFO("STM32L flash size is %dkb, base address is 0x%x", flash_size_in_kb, base_address);
+               LOG_INFO("STM32L flash size is %dkb, base address is 0x%" PRIx32, flash_size_in_kb, base_address);
        }
 
        /* if the user sets the size manually then ignore the probed value
@@ -778,6 +786,10 @@ static int stm32lx_get_info(struct flash_bank *bank, char *buf, int buf_size)
                }
                break;
 
+       case 0x437:
+               device_str = "STM32L1xx (Medium+/High Density)";
+               break;
+
        default:
                snprintf(buf, buf_size, "Cannot identify target as a STM32L1");
                return ERROR_FAIL;