flash: fix stm32 flash driver typo's

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

diff --git a/src/flash/nor/stm32f2x.c b/src/flash/nor/stm32f2x.c
index daa254651e869868c60294be0518204bd5b214b9..c7abd6a837992091fbae5857f925fd0dda1d9694 100644 (file)
--- a/src/flash/nor/stm32f2x.c
+++ b/src/flash/nor/stm32f2x.c
@@ -605,17 +605,22 @@ static int stm32x_probe(struct flash_bank *bank)
                flash_size_in_kb = 0xffff;
        }
 
+       /* some variants read 0 for flash size register
+        * use a max flash size as a default */
+       if (flash_size_in_kb == 0)
+               flash_size_in_kb = 0xffff;
+
        if ((device_id & 0xfff) == 0x411) {
                /* check for early silicon */
                if (flash_size_in_kb == 0xffff) {
-                       /* number of sectors may be incorrrect on early silicon */
+                       /* number of sectors may be incorrect on early silicon */
                        LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 1024k flash");
                        flash_size_in_kb = 1024;
                }
        } else if ((device_id & 0xfff) == 0x413) {
                /* check for early silicon */
                if (flash_size_in_kb == 0xffff) {
-                       /* number of sectors may be incorrrect on early silicon */
+                       /* number of sectors may be incorrect on early silicon */
                        LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 1024k flash");
                        flash_size_in_kb = 1024;
                }
@@ -826,7 +831,7 @@ struct flash_driver stm32f2x_flash = {
        .read = default_flash_read,
        .probe = stm32x_probe,
        .auto_probe = stm32x_auto_probe,
-       .erase_check = default_flash_mem_blank_check,
+       .erase_check = default_flash_blank_check,
        .protect_check = stm32x_protect_check,
        .info = get_stm32x_info,
 };