imi415/openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

STM32F2x: Don't clear FLASH_OPTCR bits when locking register

Browse Source 
stm32x_write_options is locking the FLASH_OPTCR register by
writing 0x00000001 to it, which clears the other bits. This
causes problems with subsequent flash operations; the hardware
is probably seeing the write protection bits in the register
set to '0' (protect), causing a WRPERR.
This patch ORs the value of the register with 0x00000001, so that
the only change is the lock bit itself.

Change-Id: I0e3ca9aa6563ce1b57a01fc0faf7563b6b85f620
Signed-off-by: Elliott Partridge <elliott.partridge@gmail.com>
Reviewed-on: http://openocd.zylin.com/2155
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
This commit is contained in:
Elliott Partridge 2014-05-28 12:20:44 -04:00 committed by Andreas Fritiofson
parent 248b85a6e7
commit 7bcf1d838d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/flash/nor/stm32f2x.c
View File

@ -372,7 +372,7 @@ static int stm32x_write_options(struct flash_bank *bank)
return retval;
/* relock registers */
retval = target_write_u32(target, STM32_FLASH_OPTCR, OPT_LOCK);
retval = target_write_u32(target, STM32_FLASH_OPTCR, optiondata | OPT_LOCK);
if (retval != ERROR_OK)
return retval;