flash: stm32l handle flash size read failure

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

diff --git a/src/flash/nor/stm32lx.c b/src/flash/nor/stm32lx.c
index ca29e1c3bd298438253edccd97556831c455d88b..3863144029959d4c9461189a34dd90ec9871c71c 100644 (file)
--- a/src/flash/nor/stm32lx.c
+++ b/src/flash/nor/stm32lx.c
@@ -409,6 +409,7 @@ static int stm32lx_write(struct flash_bank *bank, uint8_t *buffer,
        }
 
        bytes_written = 128 * halfpages_number;
+       address += bytes_written;
 
        retval = stm32lx_unlock_program_memory(bank);
        if (retval != ERROR_OK)
@@ -475,8 +476,11 @@ static int stm32lx_probe(struct flash_bank *bank)
 
        /* get flash size from target. */
        retval = target_read_u16(target, F_SIZE, &flash_size_in_kb);
-       if (retval != ERROR_OK)
-               return retval;
+       if (retval != ERROR_OK) {
+               LOG_WARNING("failed reading flash size, default to max target family");
+               /* failed reading flash size, default to max target family */
+               flash_size_in_kb = 0xffff;
+       }
 
        if ((device_id & 0xfff) == 0x416) {
                /* check for early silicon */
@@ -617,6 +621,10 @@ static int stm32lx_get_info(struct flash_bank *bank, char *buf, int buf_size)
                                snprintf(buf, buf_size, "Y");
                                break;
 
+                       case 0x1018:
+                               snprintf(buf, buf_size, "X");
+                               break;
+
                        case 0x1038:
                                snprintf(buf, buf_size, "W");
                                break;