- added stellaris flash mass_erase command
git-svn-id: svn://svn.berlios.de/openocd/trunk@682 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
ntfreak
parent
7f19b91c80
commit
0cd5c07a2d
|
|
@ -48,7 +48,6 @@ int stellaris_protect(struct flash_bank_s *bank, int set, int first, int last);
|
|||
int stellaris_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count);
|
||||
int stellaris_auto_probe(struct flash_bank_s *bank);
|
||||
int stellaris_probe(struct flash_bank_s *bank);
|
||||
int stellaris_erase_check(struct flash_bank_s *bank);
|
||||
int stellaris_protect_check(struct flash_bank_s *bank);
|
||||
int stellaris_info(struct flash_bank_s *bank, char *buf, int buf_size);
|
||||
|
||||
|
|
@ -58,6 +57,8 @@ void stellaris_set_flash_mode(flash_bank_t *bank,int mode);
|
|||
u32 stellaris_wait_status_busy(flash_bank_t *bank, u32 waitbits, int timeout);
|
||||
|
||||
int stellaris_read_part_info(struct flash_bank_s *bank);
|
||||
int stellaris_handle_mass_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
|
||||
int stellaris_mass_erase(struct flash_bank_s *bank);
|
||||
|
||||
flash_driver_t stellaris_flash =
|
||||
{
|
||||
|
|
@ -69,7 +70,7 @@ flash_driver_t stellaris_flash =
|
|||
.write = stellaris_write,
|
||||
.probe = stellaris_probe,
|
||||
.auto_probe = stellaris_auto_probe,
|
||||
.erase_check = stellaris_erase_check,
|
||||
.erase_check = default_flash_blank_check,
|
||||
.protect_check = stellaris_protect_check,
|
||||
.info = stellaris_info
|
||||
};
|
||||
|
|
@ -270,11 +271,9 @@ int stellaris_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, c
|
|||
|
||||
int stellaris_register_commands(struct command_context_s *cmd_ctx)
|
||||
{
|
||||
/*
|
||||
command_t *stellaris_cmd = register_command(cmd_ctx, NULL, "stellaris", NULL, COMMAND_ANY, NULL);
|
||||
register_command(cmd_ctx, stellaris_cmd, "gpnvm", stellaris_handle_gpnvm_command, COMMAND_EXEC,
|
||||
"stellaris gpnvm <num> <bit> set|clear, set or clear stellaris gpnvm bit");
|
||||
*/
|
||||
command_t *stm32x_cmd = register_command(cmd_ctx, NULL, "stellaris", NULL, COMMAND_ANY, "stellaris flash specific commands");
|
||||
|
||||
register_command(cmd_ctx, stm32x_cmd, "mass_erase", stellaris_handle_mass_erase_command, COMMAND_EXEC, "mass erase device");
|
||||
return ERROR_OK;
|
||||
}
|
||||
|
||||
|
|
@ -400,7 +399,6 @@ void stellaris_set_flash_mode(flash_bank_t *bank,int mode)
|
|||
u32 usecrl = (stellaris_info->mck_freq/1000000ul-1);
|
||||
LOG_DEBUG("usecrl = %i",usecrl);
|
||||
target_write_u32(target, SCB_BASE|USECRL, usecrl);
|
||||
|
||||
}
|
||||
|
||||
u32 stellaris_wait_status_busy(flash_bank_t *bank, u32 waitbits, int timeout)
|
||||
|
|
@ -513,19 +511,6 @@ int stellaris_read_part_info(struct flash_bank_s *bank)
|
|||
* flash operations *
|
||||
***************************************************************************/
|
||||
|
||||
int stellaris_erase_check(struct flash_bank_s *bank)
|
||||
{
|
||||
/*
|
||||
|
||||
stellaris_flash_bank_t *stellaris_info = bank->driver_priv;
|
||||
target_t *target = bank->target;
|
||||
int i;
|
||||
|
||||
*/
|
||||
|
||||
return ERROR_OK;
|
||||
}
|
||||
|
||||
int stellaris_protect_check(struct flash_bank_s *bank)
|
||||
{
|
||||
u32 status;
|
||||
|
|
@ -582,6 +567,11 @@ int stellaris_erase(struct flash_bank_s *bank, int first, int last)
|
|||
return ERROR_FLASH_SECTOR_INVALID;
|
||||
}
|
||||
|
||||
if ((first == 0) && (last == (stellaris_info->num_pages-1)))
|
||||
{
|
||||
return stellaris_mass_erase(bank);
|
||||
}
|
||||
|
||||
/* Configure the flash controller timing */
|
||||
stellaris_read_clock_info(bank);
|
||||
stellaris_set_flash_mode(bank,0);
|
||||
|
|
@ -590,33 +580,6 @@ int stellaris_erase(struct flash_bank_s *bank, int first, int last)
|
|||
target_write_u32(target, FLASH_CIM, 0);
|
||||
target_write_u32(target, FLASH_MISC, PMISC|AMISC);
|
||||
|
||||
if ((first == 0) && (last == (stellaris_info->num_pages-1)))
|
||||
{
|
||||
target_write_u32(target, FLASH_FMA, 0);
|
||||
target_write_u32(target, FLASH_FMC, FMC_WRKEY | FMC_MERASE);
|
||||
/* Wait until erase complete */
|
||||
do
|
||||
{
|
||||
target_read_u32(target, FLASH_FMC, &flash_fmc);
|
||||
}
|
||||
while(flash_fmc & FMC_MERASE);
|
||||
|
||||
/* if device has > 128k, then second erase cycle is needed */
|
||||
if(stellaris_info->num_pages * stellaris_info->pagesize > 0x20000)
|
||||
{
|
||||
target_write_u32(target, FLASH_FMA, 0x20000);
|
||||
target_write_u32(target, FLASH_FMC, FMC_WRKEY | FMC_MERASE);
|
||||
/* Wait until erase complete */
|
||||
do
|
||||
{
|
||||
target_read_u32(target, FLASH_FMC, &flash_fmc);
|
||||
}
|
||||
while(flash_fmc & FMC_MERASE);
|
||||
}
|
||||
|
||||
return ERROR_OK;
|
||||
}
|
||||
|
||||
for (banknr=first;banknr<=last;banknr++)
|
||||
{
|
||||
/* Address is first word in page */
|
||||
|
|
@ -838,7 +801,6 @@ int stellaris_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
|
|||
wcount -= thisrun_count;
|
||||
}
|
||||
|
||||
|
||||
target_free_working_area(target, write_algorithm);
|
||||
target_free_working_area(target, source);
|
||||
|
||||
|
|
@ -978,3 +940,93 @@ int stellaris_auto_probe(struct flash_bank_s *bank)
|
|||
return ERROR_OK;
|
||||
return stellaris_probe(bank);
|
||||
}
|
||||
|
||||
int stellaris_mass_erase(struct flash_bank_s *bank)
|
||||
{
|
||||
target_t *target = NULL;
|
||||
stellaris_flash_bank_t *stellaris_info = NULL;
|
||||
u32 flash_fmc;
|
||||
|
||||
stellaris_info = bank->driver_priv;
|
||||
target = bank->target;
|
||||
|
||||
if (target->state != TARGET_HALTED)
|
||||
{
|
||||
return ERROR_TARGET_NOT_HALTED;
|
||||
}
|
||||
|
||||
if (stellaris_info->did1 == 0)
|
||||
{
|
||||
stellaris_read_part_info(bank);
|
||||
}
|
||||
|
||||
if (stellaris_info->did1 == 0)
|
||||
{
|
||||
LOG_WARNING("Cannot identify target as Stellaris");
|
||||
return ERROR_FLASH_OPERATION_FAILED;
|
||||
}
|
||||
|
||||
/* Configure the flash controller timing */
|
||||
stellaris_read_clock_info(bank);
|
||||
stellaris_set_flash_mode(bank, 0);
|
||||
|
||||
/* Clear and disable flash programming interrupts */
|
||||
target_write_u32(target, FLASH_CIM, 0);
|
||||
target_write_u32(target, FLASH_MISC, PMISC|AMISC);
|
||||
|
||||
target_write_u32(target, FLASH_FMA, 0);
|
||||
target_write_u32(target, FLASH_FMC, FMC_WRKEY | FMC_MERASE);
|
||||
/* Wait until erase complete */
|
||||
do
|
||||
{
|
||||
target_read_u32(target, FLASH_FMC, &flash_fmc);
|
||||
}
|
||||
while(flash_fmc & FMC_MERASE);
|
||||
|
||||
/* if device has > 128k, then second erase cycle is needed
|
||||
* this is only valid for older devices, but will not hurt */
|
||||
if(stellaris_info->num_pages * stellaris_info->pagesize > 0x20000)
|
||||
{
|
||||
target_write_u32(target, FLASH_FMA, 0x20000);
|
||||
target_write_u32(target, FLASH_FMC, FMC_WRKEY | FMC_MERASE);
|
||||
/* Wait until erase complete */
|
||||
do
|
||||
{
|
||||
target_read_u32(target, FLASH_FMC, &flash_fmc);
|
||||
}
|
||||
while(flash_fmc & FMC_MERASE);
|
||||
}
|
||||
|
||||
return ERROR_OK;
|
||||
}
|
||||
|
||||
int stellaris_handle_mass_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
|
||||
{
|
||||
flash_bank_t *bank;
|
||||
int i;
|
||||
|
||||
if (argc < 1)
|
||||
{
|
||||
command_print(cmd_ctx, "stellaris mass_erase <bank>");
|
||||
return ERROR_OK;
|
||||
}
|
||||
|
||||
bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
|
||||
if (!bank)
|
||||
{
|
||||
command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
|
||||
return ERROR_OK;
|
||||
}
|
||||
|
||||
stellaris_mass_erase(bank);
|
||||
|
||||
/* set all sectors as erased */
|
||||
for (i = 0; i < bank->num_sectors; i++)
|
||||
{
|
||||
bank->sectors[i].is_erased = 1;
|
||||
}
|
||||
|
||||
command_print(cmd_ctx, "stellaris mass erase complete");
|
||||
|
||||
return ERROR_OK;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue