From: Øyvind Harboe <oyvind.harboe@zylin.com>
Date: Thu, 3 Nov 2011 20:43:31 +0000 (+0100)
Subject: cfi: fix gaffe in fixing warnings
X-Git-Tag: v0.6.0-rc1~460
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=61699628c8152d91113b7991db1825c7dde9c436;p=openocd

cfi: fix gaffe in fixing warnings

introduced reading garbage value for arm32.

Change-Id: Ib5792a8a3207ee4db6d01d354df98c3cfabce037
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
Reviewed-on: http://openocd.zylin.com/162
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
---

diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index 62d2ae49..a4092b62 100644
--- a/src/flash/nor/cfi.c
+++ b/src/flash/nor/cfi.c
@@ -1897,7 +1897,7 @@ static int cfi_spansion_write_block(struct flash_bank *bank, uint8_t *buffer,
 		armv4_5_info.common_magic = ARMV7M_COMMON_MAGIC;
 		armv4_5_info.core_mode = ARMV7M_MODE_HANDLER;
 		armv4_5_info.core_state = ARM_STATE_ARM;
-	} else if (armv4_5_info.common_magic == ARM_COMMON_MAGIC)
+	} else if (is_arm7_9(target_to_arm7_9(target)))
 	{
 		/* All other ARM CPUs have 32 bit instructions */
 		armv4_5_info.common_magic = ARM_COMMON_MAGIC;