STM32F2x: Don't clear FLASH_OPTCR bits when locking register
commit7bcf1d838dc2b007598df9594725d17e918c75e2
authorElliott Partridge <elliott.partridge@gmail.com>
Wed, 28 May 2014 16:20:44 +0000 (28 12:20 -0400)
committerAndreas Fritiofson <andreas.fritiofson@gmail.com>
Sun, 1 Jun 2014 17:38:42 +0000 (1 17:38 +0000)
tree46e874994e31fa6273330a6f5a87db16160715fb
parent248b85a6e739c8eb107c3a278b8eac6fc1f0cf62
STM32F2x: Don't clear FLASH_OPTCR bits when locking register

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>
src/flash/nor/stm32f2x.c