diff options
| author | Spencer Oliver <spen@spen-soft.co.uk> | 2012-11-20 15:17:46 +0000 |
|---|---|---|
| committer | Andreas Fritiofson <andreas.fritiofson@gmail.com> | 2012-12-31 19:08:17 +0000 |
| commit | bf2b0a03614ab8185eddb06c66e184b305b4fe75 (patch) | |
| tree | e4030183594a652207bc34b0ba2510d647dae2de /src/flash/nor/stm32f1x.c | |
| parent | 9060ae7de5967b76f7dfa69939a00c56830f74a7 (diff) | |
flash: use correct stm32f1x option read mask
Make sure we do not mask out the BFB2 boot bank bit, as this is used on
the larger XL devices.
Change-Id: Iacfdf874140e409e0c4ca9b9aee8f5c2f90dc9be
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/991
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Diffstat (limited to 'src/flash/nor/stm32f1x.c')
| -rw-r--r-- | src/flash/nor/stm32f1x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/flash/nor/stm32f1x.c b/src/flash/nor/stm32f1x.c index 2d86e566..37335eb7 100644 --- a/src/flash/nor/stm32f1x.c +++ b/src/flash/nor/stm32f1x.c @@ -231,7 +231,7 @@ static int stm32x_read_options(struct flash_bank *bank) if (retval != ERROR_OK) return retval; - stm32x_info->option_bytes.user_options = (uint16_t)0xFFF8 | ((optiondata >> 2) & 0x07); + stm32x_info->option_bytes.user_options = (uint16_t)0xFFF0 | ((optiondata >> 2) & 0x0f); stm32x_info->option_bytes.user_data = (optiondata >> stm32x_info->user_data_offset) & 0xffff; stm32x_info->option_bytes.RDP = (optiondata & (1 << OPT_READOUT)) ? 0xFFFF : 0x5AA5; @@ -1364,7 +1364,7 @@ COMMAND_HANDLER(stm32x_handle_options_write_command) { struct target *target = NULL; struct stm32x_flash_bank *stm32x_info = NULL; - uint16_t optionbyte = 0xF8; + uint32_t optionbyte = 0xF0; if (CMD_ARGC < 4) return ERROR_COMMAND_SYNTAX_ERROR; |