- 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 git-svn-id: svn://svn.berlios.de/openocd/trunk@2551 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
parent
f703322b3f
commit
55b1ea1d8e
|
@ -2172,7 +2172,7 @@ static int cfi_probe(struct flash_bank_s *bank)
|
|||
{
|
||||
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 @@ static int cfi_probe(struct flash_bank_s *bank)
|
|||
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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue