stm32: fix unprotect

the unprotect fn in stm32 needs to unprotect more sectors
than was requested aligned to some boundary.

Print warning when this happens.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>

diff --git a/src/flash/nor/stm32x.c b/src/flash/nor/stm32x.c
index 0edadfd2ae82e90b98eedcd24d8d2f5265b41120..3c49b8be1b3a587e52cfcd4cf86ba8e0c7b52747 100644 (file)
--- a/src/flash/nor/stm32x.c
+++ b/src/flash/nor/stm32x.c
@@ -487,12 +487,19 @@ static int stm32x_protect(struct flash_bank *bank, int set, int first, int last)
                return ERROR_TARGET_NOT_HALTED;
        }
 
-       if ((first && (first % stm32x_info->ppage_size)) || ((last + 1) &&
-                       (last + 1) % stm32x_info->ppage_size))
+       if ((first % stm32x_info->ppage_size) != 0)
        {
-               LOG_WARNING("Error: start and end sectors must be on a %d sector boundary",
+               LOG_WARNING("aligned start protect sector to a %d sector boundary",
                                stm32x_info->ppage_size);
-               return ERROR_FLASH_SECTOR_INVALID;
+               first = first - (first % stm32x_info->ppage_size);
+       }
+       if (((last + 1) % stm32x_info->ppage_size) != 0)
+       {
+               LOG_WARNING("aligned end protect sector to a %d sector boundary",
+                               stm32x_info->ppage_size);
+               last++;
+               last = last - (last % stm32x_info->ppage_size);
+               last--;
        }
 
        /* medium density - each bit refers to a 4bank protection