aboutsummaryrefslogtreecommitdiff
path: root/src/flash/nor/stm32f2x.c
diff options
context:
space:
mode:
authorSpencer Oliver <spen@spen-soft.co.uk>2012-01-09 12:42:31 +0000
committerSpencer Oliver <spen@spen-soft.co.uk>2012-01-12 20:42:40 +0000
commitad0847ca38e4c9d7ea0051ac7718afd3aa61868e (patch)
tree5024ea4f6cd92776416d57fb3a829ce03b485d95 /src/flash/nor/stm32f2x.c
parentafe95871c59f05d532529af84e1ee80e3845e923 (diff)
flash: use correct device_id mask
The stm32 drivers have been using 0x7ff as the DEV_ID mask, this should have been 0xfff. Change-Id: I232469620969d6dd1b9a2a2aa15ec18b947dbb05 Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk> Reviewed-on: http://openocd.zylin.com/352 Tested-by: jenkins Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Diffstat (limited to 'src/flash/nor/stm32f2x.c')
-rw-r--r--src/flash/nor/stm32f2x.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/flash/nor/stm32f2x.c b/src/flash/nor/stm32f2x.c
index 591b326b..b7e10096 100644
--- a/src/flash/nor/stm32f2x.c
+++ b/src/flash/nor/stm32f2x.c
@@ -605,14 +605,14 @@ static int stm32x_probe(struct flash_bank *bank)
flash_size_in_kb = 0xffff;
}
- if ((device_id & 0x7ff) == 0x411) {
+ if ((device_id & 0xfff) == 0x411) {
/* check for early silicon */
if (flash_size_in_kb == 0xffff) {
/* number of sectors may be incorrrect on early silicon */
LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 512k flash");
flash_size_in_kb = 512;
}
- } else if ((device_id & 0x7ff) == 0x413) {
+ } else if ((device_id & 0xfff) == 0x413) {
/* check for early silicon */
if (flash_size_in_kb == 0xffff) {
/* number of sectors may be incorrrect on early silicon */
@@ -681,7 +681,7 @@ static int get_stm32x_info(struct flash_bank *bank, char *buf, int buf_size)
if (retval != ERROR_OK)
return retval;
- if ((device_id & 0x7ff) == 0x411) {
+ if ((device_id & 0xfff) == 0x411) {
printed = snprintf(buf, buf_size, "stm32f2x - Rev: ");
buf += printed;
buf_size -= printed;
@@ -707,7 +707,7 @@ static int get_stm32x_info(struct flash_bank *bank, char *buf, int buf_size)
snprintf(buf, buf_size, "unknown");
break;
}
- } else if ((device_id & 0x7ff) == 0x413) {
+ } else if ((device_id & 0xfff) == 0x413) {
printed = snprintf(buf, buf_size, "stm32f4x - Rev: ");
buf += printed;
buf_size -= printed;