- erase bank using bank erase rather than each sector

- Thanks Fredrik Hederstierna

git-svn-id: svn://svn.berlios.de/openocd/trunk@704 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
ntfreak 2008-06-05 18:55:55 +00:00
parent 24092a5172
commit a532e98176
1 changed files with 18 additions and 1 deletions

View File

@ -236,18 +236,31 @@ int str9x_erase(struct flash_bank_s *bank, int first, int last)
int i; int i;
u32 adr; u32 adr;
u8 status; u8 status;
u8 erase_cmd;
if (bank->target->state != TARGET_HALTED) if (bank->target->state != TARGET_HALTED)
{ {
return ERROR_TARGET_NOT_HALTED; return ERROR_TARGET_NOT_HALTED;
} }
/* Check if we erase whole bank */
if ((first == 0) && (last == (bank->num_sectors - 1)))
{
/* Optimize to run erase bank command instead of sector */
erase_cmd = 0x80;
}
else
{
/* Erase sector command */
erase_cmd = 0x20;
}
for (i = first; i <= last; i++) for (i = first; i <= last; i++)
{ {
adr = bank->base + bank->sectors[i].offset; adr = bank->base + bank->sectors[i].offset;
/* erase sectors */ /* erase sectors */
target_write_u16(target, adr, 0x20); target_write_u16(target, adr, erase_cmd);
target_write_u16(target, adr, 0xD0); target_write_u16(target, adr, 0xD0);
/* get status */ /* get status */
@ -271,6 +284,10 @@ int str9x_erase(struct flash_bank_s *bank, int first, int last)
LOG_ERROR("error erasing flash bank, status: 0x%x", status); LOG_ERROR("error erasing flash bank, status: 0x%x", status);
return ERROR_FLASH_OPERATION_FAILED; return ERROR_FLASH_OPERATION_FAILED;
} }
/* If we ran erase bank command, we are finished */
if (erase_cmd == 0x80)
break;
} }
for (i = first; i <= last; i++) for (i = first; i <= last; i++)