diff options
| author | Øyvind Harboe <oyvind.harboe@zylin.com> | 2011-11-03 21:43:31 +0100 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2011-11-04 22:53:31 +0000 |
| commit | 61699628c8152d91113b7991db1825c7dde9c436 (patch) | |
| tree | 99f383428d0bd67c6199a25c953dcd736f3712a0 /src/flash/nor/cfi.c | |
| parent | e875e321f155a3f610d447055f930a5be0d293a6 (diff) | |
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>
Diffstat (limited to 'src/flash/nor/cfi.c')
| -rw-r--r-- | src/flash/nor/cfi.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |