From c48ad46aa37a3ababe605f0d284aff830abed67d Mon Sep 17 00:00:00 2001
From: kc8apf <kc8apf@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Fri, 22 May 2009 17:48:26 +0000
Subject: [PATCH] =?UTF-8?q?Author:=20Ra=C3=BAl=20S=C3=A1nchez=20Siles=20<r?=
=?UTF-8?q?sanchezs@infoglobal.es>=20=09-=20Fix=20calculation=20of=20flash?=
=?UTF-8?q?=5Faddress=20for=20x16=20devices=20used=20as=20x8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
git-svn-id: svn://svn.berlios.de/openocd/trunk@1885 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
src/flash/cfi.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/flash/cfi.c b/src/flash/cfi.c
index c51539fe5..7ae58f104 100644
--- a/src/flash/cfi.c
+++ b/src/flash/cfi.c
@@ -112,9 +112,11 @@ static void cfi_fixup(flash_bank_t *bank, cfi_fixup_t *fixups)
/* inline u32 flash_address(flash_bank_t *bank, int sector, u32 offset) */
static __inline__ u32 flash_address(flash_bank_t *bank, int sector, u32 offset)
{
+ cfi_flash_bank_t *cfi_info = bank->driver_priv;
+
/* while the sector list isn't built, only accesses to sector 0 work */
if (sector == 0)
- return bank->base + offset * bank->bus_width;
+ return bank->base + (offset * bank->bus_width << cfi_info->x16_as_x8 );
else
{
if (!bank->sectors)
@@ -122,7 +124,7 @@ static __inline__ u32 flash_address(flash_bank_t *bank, int sector, u32 offset)
LOG_ERROR("BUG: sector list not yet built");
exit(-1);
}
- return bank->base + bank->sectors[sector].offset + offset * bank->bus_width;
+ return bank->base + bank->sectors[sector].offset + (offset * bank->bus_width << cfi_info->x16_as_x8 );
}
}
--
GitLab