From: Øyvind Harboe Date: Tue, 14 Dec 2010 08:26:08 +0000 (+0100) Subject: stm32: fix unprotect X-Git-Tag: v0.5.0-rc1~277 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=969b1e66dd46fff70168a69dbd4beaaa18ccb490;p=openocd 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 --- diff --git a/src/flash/nor/stm32x.c b/src/flash/nor/stm32x.c index 0edadfd2..3c49b8be 100644 --- 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