static int stm32x_mass_erase(struct flash_bank *bank);
static int stm32x_get_device_id(struct flash_bank *bank, uint32_t *device_id);
-static int stm32x_write_block(struct flash_bank *bank, uint8_t *buffer,
+static int stm32x_write_block(struct flash_bank *bank, const uint8_t *buffer,
uint32_t offset, uint32_t count);
/* flash bank stm32x <base> <size> 0 0 <target#>
return stm32x_write_options(bank);
}
-static int stm32x_write_block(struct flash_bank *bank, uint8_t *buffer,
+static int stm32x_write_block(struct flash_bank *bank, const uint8_t *buffer,
uint32_t offset, uint32_t count)
{
struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
};
retval = target_write_buffer(target, write_algorithm->address,
- sizeof(stm32x_flash_write_code), (uint8_t *)stm32x_flash_write_code);
+ sizeof(stm32x_flash_write_code), stm32x_flash_write_code);
if (retval != ERROR_OK)
return retval;
return retval;
}
-static int stm32x_write(struct flash_bank *bank, uint8_t *buffer,
+static int stm32x_write(struct flash_bank *bank, const uint8_t *buffer,
uint32_t offset, uint32_t count)
{
struct target *target = bank->target;
}
LOG_INFO("odd number of bytes to write, padding with 0xff");
buffer = memcpy(new_buffer, buffer, count);
- buffer[count++] = 0xff;
+ new_buffer[count++] = 0xff;
}
uint32_t words_remaining = count / 2;
stm32x_info->option_offset = 6;
stm32x_info->default_rdp = 0x55AA;
break;
- case 0x440: /* stm32f0x */
- case 0x444:
+ case 0x440: /* stm32f05x */
+ case 0x444: /* stm32f03x */
page_size = 1024;
stm32x_info->ppage_size = 4;
max_flash_size_in_kb = 64;
stm32x_info->option_offset = 6;
stm32x_info->default_rdp = 0x55AA;
break;
+ case 0x448: /* stm32f07x */
+ page_size = 2048;
+ stm32x_info->ppage_size = 4;
+ max_flash_size_in_kb = 128;
+ stm32x_info->user_data_offset = 16;
+ stm32x_info->option_offset = 6;
+ stm32x_info->default_rdp = 0x55AA;
+ break;
default:
LOG_WARNING("Cannot identify target as a STM32 family.");
return ERROR_FAIL;
switch (device_id) {
case 0x410:
- device_str = "stm32x (Medium Density)";
+ device_str = "STM32F10x (Medium Density)";
switch (rev_id) {
case 0x0000:
break;
case 0x412:
- device_str = "stm32x (Low Density)";
+ device_str = "STM32F10x (Low Density)";
switch (rev_id) {
case 0x1000:
break;
case 0x414:
- device_str = "stm32x (High Density)";
+ device_str = "STM32F10x (High Density)";
switch (rev_id) {
case 0x1000:
case 0x1001:
rev_str = "Z";
break;
+
+ case 0x1003:
+ rev_str = "Y";
+ break;
}
break;
case 0x418:
- device_str = "stm32x (Connectivity)";
+ device_str = "STM32F10x (Connectivity)";
switch (rev_id) {
case 0x1000:
break;
case 0x420:
- device_str = "stm32x (Value)";
+ device_str = "STM32F100 (Low/Medium Density)";
switch (rev_id) {
case 0x1000:
break;
case 0x422:
- device_str = "stm32f30x";
+ device_str = "STM32F30x";
switch (rev_id) {
case 0x1000:
rev_str = "Z";
break;
+ case 0x1003:
+ rev_str = "Y";
+ break;
+
case 0x2000:
rev_str = "B";
break;
break;
case 0x428:
- device_str = "stm32x (Value HD)";
+ device_str = "STM32F100 (High Density)";
switch (rev_id) {
case 0x1000:
break;
case 0x430:
- device_str = "stm32x (XL)";
+ device_str = "STM32F10x (XL Density)";
switch (rev_id) {
case 0x1000:
break;
case 0x432:
- device_str = "stm32f37x";
+ device_str = "STM32F37x";
switch (rev_id) {
case 0x1000:
}
break;
- case 0x440:
case 0x444:
- device_str = "stm32f0x";
+ device_str = "STM32F03x";
+
+ switch (rev_id) {
+ case 0x1000:
+ rev_str = "1.0";
+ break;
+
+ case 0x2000:
+ rev_str = "2.0";
+ break;
+ }
+ break;
+
+ case 0x440:
+ device_str = "STM32F05x";
+
+ switch (rev_id) {
+ case 0x1000:
+ rev_str = "1.0";
+ break;
+
+ case 0x2000:
+ rev_str = "2.0";
+ break;
+ }
+ break;
+
+ case 0x448:
+ device_str = "STM32F07x";
switch (rev_id) {
case 0x1000:
break;
default:
- snprintf(buf, buf_size, "Cannot identify target as a stm32x\n");
+ snprintf(buf, buf_size, "Cannot identify target as a STM32F0/1/3\n");
return ERROR_FAIL;
}
int user_data = optionbyte;
- if (buf_get_u32((uint8_t *)&optionbyte, OPT_ERROR, 1))
+ if (optionbyte >> OPT_ERROR & 1)
command_print(CMD_CTX, "Option Byte Complement Error");
- if (buf_get_u32((uint8_t *)&optionbyte, OPT_READOUT, 1))
+ if (optionbyte >> OPT_READOUT & 1)
command_print(CMD_CTX, "Readout Protection On");
else
command_print(CMD_CTX, "Readout Protection Off");
/* user option bytes are offset depending on variant */
optionbyte >>= stm32x_info->option_offset;
- if (buf_get_u32((uint8_t *)&optionbyte, OPT_RDWDGSW, 1))
+ if (optionbyte >> OPT_RDWDGSW & 1)
command_print(CMD_CTX, "Software Watchdog");
else
command_print(CMD_CTX, "Hardware Watchdog");
- if (buf_get_u32((uint8_t *)&optionbyte, OPT_RDRSTSTOP, 1))
+ if (optionbyte >> OPT_RDRSTSTOP & 1)
command_print(CMD_CTX, "Stop: No reset generated");
else
command_print(CMD_CTX, "Stop: Reset generated");
- if (buf_get_u32((uint8_t *)&optionbyte, OPT_RDRSTSTDBY, 1))
+ if (optionbyte >> OPT_RDRSTSTDBY & 1)
command_print(CMD_CTX, "Standby: No reset generated");
else
command_print(CMD_CTX, "Standby: Reset generated");
if (stm32x_info->has_dual_banks) {
- if (buf_get_u32((uint8_t *)&optionbyte, OPT_BFB2, 1))
+ if (optionbyte >> OPT_BFB2 & 1)
command_print(CMD_CTX, "Boot: Bank 0");
else
command_print(CMD_CTX, "Boot: Bank 1");
}
command_print(CMD_CTX, "User Option0: 0x%02" PRIx8,
- (user_data >> stm32x_info->user_data_offset) & 0xff);
+ (uint8_t)((user_data >> stm32x_info->user_data_offset) & 0xff));
command_print(CMD_CTX, "User Option1: 0x%02" PRIx8,
- (user_data >> (stm32x_info->user_data_offset + 8)) & 0xff);
+ (uint8_t)((user_data >> (stm32x_info->user_data_offset + 8)) & 0xff));
return ERROR_OK;
}
else if (strcmp("HWWDG", CMD_ARGV[0]) == 0)
optionbyte &= ~(1 << 0);
else if (strcmp("NORSTSTOP", CMD_ARGV[0]) == 0)
- optionbyte &= ~(1 << 1);
- else if (strcmp("RSTSTNDBY", CMD_ARGV[0]) == 0)
+ optionbyte |= (1 << 1);
+ else if (strcmp("RSTSTOP", CMD_ARGV[0]) == 0)
optionbyte &= ~(1 << 1);
else if (strcmp("NORSTSTNDBY", CMD_ARGV[0]) == 0)
- optionbyte &= ~(1 << 2);
- else if (strcmp("RSTSTOP", CMD_ARGV[0]) == 0)
+ optionbyte |= (1 << 2);
+ else if (strcmp("RSTSTNDBY", CMD_ARGV[0]) == 0)
optionbyte &= ~(1 << 2);
else if (stm32x_info->has_dual_banks) {
if (strcmp("BOOT0", CMD_ARGV[0]) == 0)