X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fstm32x.c;h=22bd4f978b5b65b4fbe2ede6d595f2ff55e5c2b5;hb=86a7d813a165fda2816b8152342219b6c4ae2fc4;hp=2f8ca3be69e1fabc09174aae303fb732b1ba374f;hpb=f90d8fa45f2d4c9d4b7990f198b232ee55cbb4e1;p=openocd.git diff --git a/src/flash/stm32x.c b/src/flash/stm32x.c index 2f8ca3be69..22bd4f978b 100644 --- a/src/flash/stm32x.c +++ b/src/flash/stm32x.c @@ -182,9 +182,9 @@ static int stm32x_erase_options(struct flash_bank_s *bank) status = stm32x_wait_status_busy(bank, 10); - if (status & FLASH_WRPRTERR ) + if (status & FLASH_WRPRTERR) return ERROR_FLASH_OPERATION_FAILED; - if (status & FLASH_PGERR ) + if (status & FLASH_PGERR) return ERROR_FLASH_OPERATION_FAILED; /* clear readout protection and complementary option bytes @@ -218,9 +218,9 @@ static int stm32x_write_options(struct flash_bank_s *bank) status = stm32x_wait_status_busy(bank, 10); - if (status & FLASH_WRPRTERR ) + if (status & FLASH_WRPRTERR) return ERROR_FLASH_OPERATION_FAILED; - if (status & FLASH_PGERR ) + if (status & FLASH_PGERR) return ERROR_FLASH_OPERATION_FAILED; /* write protection byte 1 */ @@ -228,9 +228,9 @@ static int stm32x_write_options(struct flash_bank_s *bank) status = stm32x_wait_status_busy(bank, 10); - if (status & FLASH_WRPRTERR ) + if (status & FLASH_WRPRTERR) return ERROR_FLASH_OPERATION_FAILED; - if (status & FLASH_PGERR ) + if (status & FLASH_PGERR) return ERROR_FLASH_OPERATION_FAILED; /* write protection byte 2 */ @@ -238,9 +238,9 @@ static int stm32x_write_options(struct flash_bank_s *bank) status = stm32x_wait_status_busy(bank, 10); - if (status & FLASH_WRPRTERR ) + if (status & FLASH_WRPRTERR) return ERROR_FLASH_OPERATION_FAILED; - if (status & FLASH_PGERR ) + if (status & FLASH_PGERR) return ERROR_FLASH_OPERATION_FAILED; /* write protection byte 3 */ @@ -248,9 +248,9 @@ static int stm32x_write_options(struct flash_bank_s *bank) status = stm32x_wait_status_busy(bank, 10); - if (status & FLASH_WRPRTERR ) + if (status & FLASH_WRPRTERR) return ERROR_FLASH_OPERATION_FAILED; - if (status & FLASH_PGERR ) + if (status & FLASH_PGERR) return ERROR_FLASH_OPERATION_FAILED; /* write protection byte 4 */ @@ -258,9 +258,9 @@ static int stm32x_write_options(struct flash_bank_s *bank) status = stm32x_wait_status_busy(bank, 10); - if (status & FLASH_WRPRTERR ) + if (status & FLASH_WRPRTERR) return ERROR_FLASH_OPERATION_FAILED; - if (status & FLASH_PGERR ) + if (status & FLASH_PGERR) return ERROR_FLASH_OPERATION_FAILED; /* write readout protection bit */ @@ -268,9 +268,9 @@ static int stm32x_write_options(struct flash_bank_s *bank) status = stm32x_wait_status_busy(bank, 10); - if (status & FLASH_WRPRTERR ) + if (status & FLASH_WRPRTERR) return ERROR_FLASH_OPERATION_FAILED; - if (status & FLASH_PGERR ) + if (status & FLASH_PGERR) return ERROR_FLASH_OPERATION_FAILED; target_write_u32(target, STM32_FLASH_CR, FLASH_LOCK); @@ -304,14 +304,15 @@ static int stm32x_protect_check(struct flash_bank_s *bank) if (stm32x_info->ppage_size == 2) { - /* high density flash */ + /* high density flash/connectivity line protection */ set = 1; if (protection & (1 << 31)) set = 0; - /* bit 31 controls sector 62 - 255 protection */ + /* bit 31 controls sector 62 - 255 protection for high density + * bit 31 controls sector 62 - 127 protection for connectivity line */ for (s = 62; s < bank->num_sectors; s++) { bank->sectors[s].is_protected = set; @@ -333,7 +334,7 @@ static int stm32x_protect_check(struct flash_bank_s *bank) } else { - /* medium density flash */ + /* low/medium density flash protection */ for (i = 0; i < num_bits; i++) { set = 1; @@ -378,9 +379,9 @@ static int stm32x_erase(struct flash_bank_s *bank, int first, int last) status = stm32x_wait_status_busy(bank, 10); - if (status & FLASH_WRPRTERR ) + if (status & FLASH_WRPRTERR) return ERROR_FLASH_OPERATION_FAILED; - if (status & FLASH_PGERR ) + if (status & FLASH_PGERR) return ERROR_FLASH_OPERATION_FAILED; bank->sectors[i].is_erased = 1; } @@ -409,7 +410,7 @@ static int stm32x_protect(struct flash_bank_s *bank, int set, int first, int las if ((first && (first % stm32x_info->ppage_size)) || ((last + 1) && (last + 1) % stm32x_info->ppage_size)) { - LOG_WARNING("sector start/end incorrect - stm32 has %dK sector protection", stm32x_info->ppage_size); + LOG_WARNING("Error: start and end sectors must be on a %d sector boundary", stm32x_info->ppage_size); return ERROR_FLASH_SECTOR_INVALID; } @@ -445,7 +446,7 @@ static int stm32x_protect(struct flash_bank_s *bank, int set, int first, int las reg = (i / stm32x_info->ppage_size) / 8; bit = (i / stm32x_info->ppage_size) - (reg * 8); - if (set ) + if (set) prot_reg[reg] &= ~(1 << bit); else prot_reg[reg] |= (1 << bit); @@ -459,7 +460,7 @@ static int stm32x_protect(struct flash_bank_s *bank, int set, int first, int las reg = (i / stm32x_info->ppage_size) / 8; bit = (i / stm32x_info->ppage_size) - (reg * 8); - if (set ) + if (set) prot_reg[reg] &= ~(1 << bit); else prot_reg[reg] |= (1 << bit); @@ -658,12 +659,12 @@ static int stm32x_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t off status = stm32x_wait_status_busy(bank, 5); - if (status & FLASH_WRPRTERR ) + if (status & FLASH_WRPRTERR) { LOG_ERROR("flash memory not erased before writing"); return ERROR_FLASH_OPERATION_FAILED; } - if (status & FLASH_PGERR ) + if (status & FLASH_PGERR) { LOG_ERROR("flash memory write protected"); return ERROR_FLASH_OPERATION_FAILED; @@ -684,12 +685,12 @@ static int stm32x_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t off status = stm32x_wait_status_busy(bank, 5); - if (status & FLASH_WRPRTERR ) + if (status & FLASH_WRPRTERR) { LOG_ERROR("flash memory not erased before writing"); return ERROR_FLASH_OPERATION_FAILED; } - if (status & FLASH_PGERR ) + if (status & FLASH_PGERR) { LOG_ERROR("flash memory write protected"); return ERROR_FLASH_OPERATION_FAILED; @@ -720,7 +721,7 @@ static int stm32x_probe(struct flash_bank_s *bank) /* read stm32 device id register */ target_read_u32(target, 0xE0042000, &device_id); - LOG_INFO("device id = 0x%08" PRIx32 "", device_id ); + LOG_INFO("device id = 0x%08" PRIx32 "", device_id); /* get flash size from target */ if (target_read_u16(target, 0x1FFFF7E0, &num_pages) != ERROR_OK) @@ -740,7 +741,7 @@ static int stm32x_probe(struct flash_bank_s *bank) if (num_pages == 0xffff) { /* number of sectors incorrect on revA */ - LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 128k flash" ); + LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 128k flash"); num_pages = 128; } } @@ -755,7 +756,7 @@ static int stm32x_probe(struct flash_bank_s *bank) if (num_pages == 0xffff) { /* number of sectors incorrect on revA */ - LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 32k flash" ); + LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 32k flash"); num_pages = 32; } } @@ -770,32 +771,32 @@ static int stm32x_probe(struct flash_bank_s *bank) if (num_pages == 0xffff) { /* number of sectors incorrect on revZ */ - LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 512k flash" ); + LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 512k flash"); num_pages = 512; } } else if ((device_id & 0x7ff) == 0x418) { - /* connectivity line density - we have 1k pages - * 4 pages for a protection area */ - page_size = 1024; - stm32x_info->ppage_size = 4; + /* connectivity line density - we have 2k pages + * 2 pages for a protection area */ + page_size = 2048; + stm32x_info->ppage_size = 2; /* check for early silicon */ if (num_pages == 0xffff) { /* number of sectors incorrect on revZ */ - LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 256k flash" ); + LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 256k flash"); num_pages = 256; } } else { - LOG_WARNING("Cannot identify target as a STM32 family." ); + LOG_WARNING("Cannot identify target as a STM32 family."); return ERROR_FLASH_OPERATION_FAILED; } - LOG_INFO("flash size = %dkbytes", num_pages ); + LOG_INFO("flash size = %dkbytes", num_pages); /* calculate numbers of pages */ num_pages /= (page_size / 1024); @@ -921,6 +922,10 @@ static int stm32x_info(struct flash_bank_s *bank, char *buf, int buf_size) snprintf(buf, buf_size, "A"); break; + case 0x1001: + snprintf(buf, buf_size, "Z"); + break; + default: snprintf(buf, buf_size, "unknown"); break; @@ -1188,13 +1193,13 @@ static int stm32x_mass_erase(struct flash_bank_s *bank) target_write_u32(target, STM32_FLASH_CR, FLASH_LOCK); - if (status & FLASH_WRPRTERR ) + if (status & FLASH_WRPRTERR) { LOG_ERROR("stm32x device protected"); return ERROR_OK; } - if (status & FLASH_PGERR ) + if (status & FLASH_PGERR) { LOG_ERROR("stm32x device programming failed"); return ERROR_OK;