[Openocd-svn] r2551 - trunk/src/flash

[ntfreak at B. <nt...@ma...>]

Author: ntfreak
Date: 2009-07-20 09:03:11 +0200 (Mon, 20 Jul 2009)
New Revision: 2551

Modified:
   trunk/src/flash/cfi.c
Log:
- fix issue with reading device id, bug appeared when flash_address code was added
- fix issue when multiple flash chips are connected, eg. x16 x 2 on 32bit mcu bus

Modified: trunk/src/flash/cfi.c
===================================================================
--- trunk/src/flash/cfi.c	2009-07-19 19:31:54 UTC (rev 2550)
+++ trunk/src/flash/cfi.c	2009-07-20 07:03:11 UTC (rev 2551)
@@ -2172,7 +2172,7 @@
 		{
 			return retval;
 		}
-		if ((retval = target_read_u16(target, flash_address(bank, 0, 0x02), &cfi_info->device_id)) != ERROR_OK)
+		if ((retval = target_read_u16(target, flash_address(bank, 0, 0x01), &cfi_info->device_id)) != ERROR_OK)
 		{
 			return retval;
 		}
@@ -2383,9 +2383,10 @@
 				sector++;
 			}
 		}
-		if (offset != cfi_info->dev_size)
+		if (offset != (cfi_info->dev_size * bank->bus_width / bank->chip_width))
 		{
-			LOG_WARNING("CFI size is 0x%" PRIx32 ", but total sector size is 0x%" PRIx32 "", cfi_info->dev_size, offset);
+			LOG_WARNING("CFI size is 0x%" PRIx32 ", but total sector size is 0x%" PRIx32 "", \
+				(cfi_info->dev_size * bank->bus_width / bank->chip_width), offset);
 		}
 	}