diff options
| author | Spencer Oliver <spen@spen-soft.co.uk> | 2012-11-19 17:21:57 +0000 |
|---|---|---|
| committer | Peter Stuge <peter@stuge.se> | 2012-11-19 22:16:16 +0000 |
| commit | 9785f51f194980328fec45cb1832ab8048993ddb (patch) | |
| tree | 69f39e58150617500d908ddd73bb02c981fb7f47 /src/flash | |
| parent | 78807eb6ec79b4ea2a6a1fa4aa074d6ccd56b4b0 (diff) | |
flash: add stm32f42x/stm32f43x support
Other than a larger memory layout these new devices also have an extra
MER1 bit to perform the mass erase.
Change-Id: I7110a05bac95c1707160d1f5622181664291eb4a
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/985
Tested-by: jenkins
Reviewed-by: Peter Stuge <peter@stuge.se>
Diffstat (limited to 'src/flash')
| -rw-r--r-- | src/flash/nor/stm32f2x.c | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/src/flash/nor/stm32f2x.c b/src/flash/nor/stm32f2x.c index dbecc26f..f007ad75 100644 --- a/src/flash/nor/stm32f2x.c +++ b/src/flash/nor/stm32f2x.c @@ -116,6 +116,7 @@ #define FLASH_PG (1 << 0) #define FLASH_SER (1 << 1) #define FLASH_MER (1 << 2) +#define FLASH_MER1 (1 << 15) #define FLASH_STRT (1 << 16) #define FLASH_PSIZE_8 (0 << 8) #define FLASH_PSIZE_16 (1 << 8) @@ -601,6 +602,9 @@ static int stm32x_probe(struct flash_bank *bank) case 0x413: max_flash_size_in_kb = 1024; break; + case 0x419: + max_flash_size_in_kb = 2048; + break; default: LOG_WARNING("Cannot identify target as a STM32 family."); return ERROR_FAIL; @@ -625,6 +629,10 @@ static int stm32x_probe(struct flash_bank *bank) /* calculate numbers of pages */ int num_pages = (flash_size_in_kb / 128) + 4; + /* check for larger 2048 bytes devices */ + if (flash_size_in_kb > 1024) + num_pages += 4; + /* check that calculation result makes sense */ assert(num_pages > 0); @@ -643,7 +651,17 @@ static int stm32x_probe(struct flash_bank *bank) setup_sector(bank, 4, 1, 64 * 1024); /* dynamic memory */ - setup_sector(bank, 4 + 1, num_pages - 5, 128 * 1024); + setup_sector(bank, 4 + 1, MAX(12, num_pages) - 5, 128 * 1024); + + if (num_pages > 12) { + + /* fixed memory for larger devices */ + setup_sector(bank, 12, 4, 16 * 1024); + setup_sector(bank, 16, 1, 64 * 1024); + + /* dynamic memory for larger devices */ + setup_sector(bank, 16 + 1, num_pages - 5 - 12, 128 * 1024); + } for (i = 0; i < num_pages; i++) { bank->sectors[i].is_erased = -1; @@ -699,7 +717,8 @@ static int get_stm32x_info(struct flash_bank *bank, char *buf, int buf_size) snprintf(buf, buf_size, "unknown"); break; } - } else if ((device_id & 0xfff) == 0x413) { + } else if (((device_id & 0xfff) == 0x413) || + ((device_id & 0xfff) == 0x419)) { printed = snprintf(buf, buf_size, "stm32f4x - Rev: "); buf += printed; buf_size -= printed; @@ -740,7 +759,10 @@ static int stm32x_mass_erase(struct flash_bank *bank) return retval; /* mass erase flash memory */ - retval = target_write_u32(target, stm32x_get_flash_reg(bank, STM32_FLASH_CR), FLASH_MER); + if (bank->num_sectors > 12) + retval = target_write_u32(target, stm32x_get_flash_reg(bank, STM32_FLASH_CR), FLASH_MER | FLASH_MER1); + else + retval = target_write_u32(target, stm32x_get_flash_reg(bank, STM32_FLASH_CR), FLASH_MER); if (retval != ERROR_OK) return retval; retval = target_write_u32(target, stm32x_get_flash_reg(bank, STM32_FLASH_CR), |