This is an automated email from Gerrit.
Spencer Oliver (s...@spen-soft.co.uk) just uploaded a new patch set to Gerrit,
which you can find at http://openocd.zylin.com/375
-- gerrit
commit 1007cd8800071d930959af802b525355560ceca0
Author: Spencer Oliver <s...@spen-soft.co.uk>
Date: Thu Jan 12 22:00:09 2012 +0000
build: fix broken commit
fixes commit 04fe2ca5547f76686c7dc555f90510eed6fcc551
Change-Id: Id7fcb82fa1a445f1df21b8d98e945f7c0e08ec93
Signed-off-by: Spencer Oliver <s...@spen-soft.co.uk>
diff --git a/src/flash/nor/stm32f2x.c b/src/flash/nor/stm32f2x.c
index 6d97bc6..4d3571c 100644
--- a/src/flash/nor/stm32f2x.c
+++ b/src/flash/nor/stm32f2x.c
@@ -595,7 +595,7 @@ static int stm32x_get_device_id(struct flash_bank *bank,
uint32_t *device_id)
if (retval != ERROR_OK)
return retval;
- if ((*device_id & DEV_ID_MASK) == 0x411) {
+ if ((*device_id & 0xfff) == 0x411) {
/* read CPUID reg to check core type */
retval = target_read_u32(target, 0xE000ED00, &cpuid);
if (retval != ERROR_OK)
@@ -603,7 +603,7 @@ static int stm32x_get_device_id(struct flash_bank *bank,
uint32_t *device_id)
/* check for cortex_m4 */
if (((cpuid >> 4) & 0xFFF) == 0xC24) {
- *device_id &= ~((0xFFFF << 16) | DEV_ID_MASK);
+ *device_id &= ~((0xFFFF << 16) | 0xfff);
*device_id |= (0x1000 << 16) | 0x413;
LOG_INFO("stm32f4x errata detected - fixing incorrect
MCU_IDCODE");
}
--
------------------------------------------------------------------------------
RSA(R) Conference 2012
Mar 27 - Feb 2
Save $400 by Jan. 27
Register now!
http://p.sf.net/sfu/rsa-sfdev2dev2
_______________________________________________
OpenOCD-devel mailing list
OpenOCD-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openocd-devel
