* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
****************************************************************************/
-/***************************************************************************************************************************************************************************************
+/***************************************************************************
*
* New flash setup command:
*
-* flash bank <driver> <base_addr> <size> <chip_width> <bus_width> <target_number> [<target_name> <banks> <sectors_per_bank> <pages_per_sector> <page_size> <num_nvmbits> <ext_freq_khz>]
+* flash bank <driver> <base_addr> <size> <chip_width> <bus_width> <target_id>
+* [<chip_type> <banks>
+* <sectors_per_bank> <pages_per_sector>
+* <page_size> <num_nvmbits>
+* <ext_freq_khz>]
*
* <ext_freq_khz> - MUST be used if clock is from external source,
-* CAN be used if main oscillator frequency is known (recomended)
+* CAN be used if main oscillator frequency is known (recommended)
* Examples:
-* flash bank at91sam7 0x00100000 0 0 4 0 0 AT91SAM7XC256 1 16 64 256 3 25000 ==== RECOMENDED ============
-* flash bank at91sam7 0 0 0 0 0 0 0 0 0 0 0 0 25000 (auto-detection, except for clock) ==== RECOMENDED ============
-* flash bank at91sam7 0x00100000 0 0 4 0 0 AT91SAM7XC256 1 16 64 256 3 0 ==== NOT RECOMENDED !!! ====
-* flash bank at91sam7 0 0 0 0 0 (old style, full auto-detection) ==== NOT RECOMENDED !!! ====
-****************************************************************************************************************************************************************************************/
+* ==== RECOMMENDED (covers clock speed) ============
+* flash bank at91sam7 0x00100000 0 0 4 $_TARGETNAME AT91SAM7XC256 1 16 64 256 3 25000
+* (if auto-detect fails; provides clock spec)
+* flash bank at91sam7 0 0 0 0 $_TARGETNAME 0 0 0 0 0 0 25000
+* (auto-detect everything except the clock)
+* ==== NOT RECOMMENDED !!! (clock speed is not configured) ====
+* flash bank at91sam7 0x00100000 0 0 4 $_TARGETNAME AT91SAM7XC256 1 16 64 256 3 0
+* (if auto-detect fails)
+* flash bank at91sam7 0 0 0 0 $_TARGETNAME
+* (old style, auto-detect everything)
+****************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "at91sam7.h"
#include "binarybuffer.h"
-
-static int at91sam7_register_commands(struct command_context_s *cmd_ctx);
-static int at91sam7_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);
-static int at91sam7_erase(struct flash_bank_s *bank, int first, int last);
-static int at91sam7_protect(struct flash_bank_s *bank, int set, int first, int last);
-static int at91sam7_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count);
-static int at91sam7_probe(struct flash_bank_s *bank);
-//static int at91sam7_auto_probe(struct flash_bank_s *bank);
-static int at91sam7_erase_check(struct flash_bank_s *bank);
static int at91sam7_protect_check(struct flash_bank_s *bank);
-static int at91sam7_info(struct flash_bank_s *bank, char *buf, int buf_size);
+static int at91sam7_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count);
static uint32_t at91sam7_get_flash_status(target_t *target, int bank_number);
static void at91sam7_set_flash_mode(flash_bank_t *bank, int mode);
static uint32_t at91sam7_wait_status_busy(flash_bank_t *bank, uint32_t waitbits, int timeout);
static int at91sam7_flash_command(struct flash_bank_s *bank, uint8_t cmd, uint16_t pagen);
-static int at91sam7_handle_gpnvm_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-
-flash_driver_t at91sam7_flash =
-{
- .name = "at91sam7",
- .register_commands = at91sam7_register_commands,
- .flash_bank_command = at91sam7_flash_bank_command,
- .erase = at91sam7_erase,
- .protect = at91sam7_protect,
- .write = at91sam7_write,
- .probe = at91sam7_probe,
- .auto_probe = at91sam7_probe,
- .erase_check = at91sam7_erase_check,
- .protect_check = at91sam7_protect_check,
- .info = at91sam7_info
-};
static uint32_t MC_FMR[4] = { 0xFFFFFF60, 0xFFFFFF70, 0xFFFFFF80, 0xFFFFFF90 };
static uint32_t MC_FCR[4] = { 0xFFFFFF64, 0xFFFFFF74, 0xFFFFFF84, 0xFFFFFF94 };
};
#endif
-static int at91sam7_register_commands(struct command_context_s *cmd_ctx)
-{
- command_t *at91sam7_cmd = register_command(cmd_ctx, NULL, "at91sam7", NULL, COMMAND_ANY, NULL);
-
- register_command(cmd_ctx, at91sam7_cmd, "gpnvm", at91sam7_handle_gpnvm_command, COMMAND_EXEC,
- "at91sam7 gpnvm <bit> set | clear, set or clear one gpnvm bit");
- return ERROR_OK;
-}
static uint32_t at91sam7_get_flash_status(target_t *target, int bank_number)
{
/* create a new flash bank element */
flash_bank_t *fb = malloc(sizeof(flash_bank_t));
fb->target = target;
- fb->driver = &at91sam7_flash;
+ fb->driver = bank->driver;
fb->driver_priv = malloc(sizeof(at91sam7_flash_bank_t));
fb->next = NULL;
return ERROR_OK;
}
-/***************************************************************************************************************************************************************************************
-# flash bank <driver> <base_addr> <size> <chip_width> <bus_width> <target_number> [<target_name> <banks> <sectors_per_bank> <pages_per_sector> <page_size> <num_nvmbits> <ext_freq_khz>]
-# <ext_freq_khz> - MUST be used if clock is from external source
-# CAN be used if main oscillator frequency is known
-# Examples:
-# flash bank at91sam7 0x00100000 0 0 4 0 0 AT91SAM7XC256 1 16 64 256 3 25000 ==== RECOMENDED ============
-# flash bank at91sam7 0 0 0 0 0 0 0 0 0 0 0 0 25000 (auto-detection, except for clock) ==== RECOMENDED ============
-# flash bank at91sam7 0x00100000 0 0 4 0 0 AT91SAM7XC256 1 16 64 256 3 0 ==== NOT RECOMENDED !!! ====
-# flash bank at91sam7 0 0 0 0 0 (old style, full auto-detection) ==== NOT RECOMENDED !!! ====
-****************************************************************************************************************************************************************************************/
static int at91sam7_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank)
{
flash_bank_t *t_bank = bank;
uint32_t base_address;
uint32_t bank_size;
- uint32_t ext_freq;
+ uint32_t ext_freq = 0;
int chip_width;
int bus_width;
at91sam7_info->ext_freq = 0;
at91sam7_info->flash_autodetection = 0;
- if (argc == 14)
+ if (argc < 13)
{
- ext_freq = atol(args[13]) * 1000;
+ at91sam7_info->flash_autodetection = 1;
+ return ERROR_OK;
+ }
+
+ COMMAND_PARSE_NUMBER(u32, args[1], base_address);
+
+ COMMAND_PARSE_NUMBER(int, args[3], chip_width);
+ COMMAND_PARSE_NUMBER(int, args[4], bus_width);
+
+ COMMAND_PARSE_NUMBER(int, args[8], banks_num);
+ COMMAND_PARSE_NUMBER(int, args[9], num_sectors);
+ COMMAND_PARSE_NUMBER(u16, args[10], pages_per_sector);
+ COMMAND_PARSE_NUMBER(u16, args[11], page_size);
+ COMMAND_PARSE_NUMBER(u16, args[12], num_nvmbits);
+
+ if (argc == 14) {
+ unsigned long freq;
+ COMMAND_PARSE_NUMBER(ulong, args[13], freq);
+ ext_freq = freq * 1000;
at91sam7_info->ext_freq = ext_freq;
}
- if ((argc != 14) ||
- (atoi(args[4]) == 0) || /* bus width */
- (atoi(args[8]) == 0) || /* banks number */
- (atoi(args[9]) == 0) || /* sectors per bank */
- (atoi(args[10]) == 0) || /* pages per sector */
- (atoi(args[11]) == 0) || /* page size */
- (atoi(args[12]) == 0)) /* nvmbits number */
+ if ((bus_width == 0) || (banks_num == 0) || (num_sectors == 0) ||
+ (pages_per_sector == 0) || (page_size == 0) || (num_nvmbits == 0))
{
at91sam7_info->flash_autodetection = 1;
return ERROR_OK;
}
- base_address = strtoul(args[1], NULL, 0);
- chip_width = atoi(args[3]);
- bus_width = atoi(args[4]);
- banks_num = atoi(args[8]);
- num_sectors = atoi(args[9]);
- pages_per_sector = atoi(args[10]);
- page_size = atoi(args[11]);
- num_nvmbits = atoi(args[12]);
-
target_name = calloc(strlen(args[7]) + 1, sizeof(char));
strcpy(target_name, args[7]);
/* create a new bank element */
flash_bank_t *fb = malloc(sizeof(flash_bank_t));
fb->target = target;
- fb->driver = &at91sam7_flash;
+ fb->driver = bank->driver;
fb->driver_priv = malloc(sizeof(at91sam7_flash_bank_t));
fb->next = NULL;
{
return ERROR_FLASH_BANK_INVALID;
}
- if (bank->driver != &at91sam7_flash)
+ if (strcmp(bank->driver->name, "at91sam7"))
{
command_print(cmd_ctx, "not an at91sam7 flash bank '%s'", args[0]);
return ERROR_FLASH_BANK_INVALID;
}
}
- bit = atoi(args[0]);
+ COMMAND_PARSE_NUMBER(int, args[0], bit);
if ((bit < 0) || (bit >= at91sam7_info->num_nvmbits))
{
command_print(cmd_ctx, "gpnvm bit '#%s' is out of bounds for target %s", args[0], at91sam7_info->target_name);
return ERROR_OK;
}
+
+static int at91sam7_register_commands(struct command_context_s *cmd_ctx)
+{
+ command_t *at91sam7_cmd = register_command(cmd_ctx, NULL, "at91sam7",
+ NULL, COMMAND_ANY, NULL);
+
+ register_command(cmd_ctx, at91sam7_cmd, "gpnvm",
+ at91sam7_handle_gpnvm_command, COMMAND_EXEC,
+ "at91sam7 gpnvm <bit> set | clear, "
+ "set or clear one gpnvm bit");
+
+ return ERROR_OK;
+}
+
+flash_driver_t at91sam7_flash = {
+ .name = "at91sam7",
+ .register_commands = &at91sam7_register_commands,
+ .flash_bank_command = &at91sam7_flash_bank_command,
+ .erase = &at91sam7_erase,
+ .protect = &at91sam7_protect,
+ .write = &at91sam7_write,
+ .probe = &at91sam7_probe,
+ .auto_probe = &at91sam7_probe,
+ .erase_check = &at91sam7_erase_check,
+ .protect_check = &at91sam7_protect_check,
+ .info = &at91sam7_info,
+ };
projects / openocd / blobdiff