From: Olivier Schonken <olivier.schonken@gmail.com>
Date: Mon, 28 Mar 2011 17:31:17 +0000 (+0200)
Subject: at91sam3: Modified cidr comparisson to ignore version bits
X-Git-Tag: v0.5.0-rc1~119
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ac6f8f9616aada403c52254738096ec43888ca42;p=openocd

at91sam3: Modified cidr comparisson to ignore version bits

production processor versions increment, thus the version
bits should be ignored for future proofing. e.g.
Engineering sample version == 0x00, production version 0x01
---

diff --git a/src/flash/nor/at91sam3.c b/src/flash/nor/at91sam3.c
index 0b71e819..40ff3aa0 100644
--- a/src/flash/nor/at91sam3.c
+++ b/src/flash/nor/at91sam3.c
@@ -1999,7 +1999,8 @@ sam3_GetDetails(struct sam3_bank_private *pPrivate)
 	LOG_DEBUG("Begin");
 	pDetails = all_sam3_details;
 	while (pDetails->name) {
-		if (pDetails->chipid_cidr == pPrivate->pChip->cfg.CHIPID_CIDR) {
+		// Compare cidr without version bits
+		if (pDetails->chipid_cidr == (pPrivate->pChip->cfg.CHIPID_CIDR & 0xFFFFFFE0)) {
 			break;
 		} else {
 			pDetails++;