From: Spencer Oliver <spen@spen-soft.co.uk>
Date: Thu, 12 Jan 2012 22:00:09 +0000 (+0000)
Subject: build: fix broken commit
X-Git-Tag: v0.6.0-rc1~312
X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=c2c4f440afb7695c2c1bc3f2d4b925de3c035212;ds=sidebyside

build: fix broken commit

fixes commit 04fe2ca5547f76686c7dc555f90510eed6fcc551

Change-Id: Id7fcb82fa1a445f1df21b8d98e945f7c0e08ec93
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/375
Tested-by: jenkins
---

diff --git a/src/flash/nor/stm32f2x.c b/src/flash/nor/stm32f2x.c
index 6d97bc64f3..4d3571cad4 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");
 		}