zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stm32l4: Handle failing flash_size read like on other devices. 

Change-Id: I54d7cd3a8c80d0e4663c3c09457a4ff338a6f1a0
Signed-off-by: Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
Reviewed-on: http://openocd.zylin.com/3503
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Tested-by: jenkins
__archive__
Uwe Bonnes 2016-05-22 16:51:34 +02:00 committed by Andreas Fritiofson
parent 9aabe0b58b
commit 51f039bd0c
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/flash/nor/stm32l4x.c
View File

@ -599,6 +599,7 @@ static int stm32l4_probe(struct flash_bank *bank)
struct stm32l4_flash_bank *stm32l4_info = bank->driver_priv; struct stm32l4_flash_bank *stm32l4_info = bank->driver_priv;
int i; int i;
uint16_t flash_size_in_kb = 0xffff; uint16_t flash_size_in_kb = 0xffff;
uint16_t max_flash_size_in_kb;
uint32_t device_id; uint32_t device_id;
uint32_t options; uint32_t options;
uint32_t base_address = 0x08000000; uint32_t base_address = 0x08000000;
@ -614,6 +615,7 @@ static int stm32l4_probe(struct flash_bank *bank)
/* set max flash size depending on family */ /* set max flash size depending on family */
switch (device_id & 0xfff) { switch (device_id & 0xfff) {
case 0x415: case 0x415:
max_flash_size_in_kb = 1024;
break; break;
default: default:
LOG_WARNING("Cannot identify target as a STM32L4 family."); LOG_WARNING("Cannot identify target as a STM32L4 family.");
@ -623,6 +625,19 @@ static int stm32l4_probe(struct flash_bank *bank)
/* get flash size from target. */ /* get flash size from target. */
retval = target_read_u16(target, FLASH_SIZE_REG, &flash_size_in_kb); retval = target_read_u16(target, FLASH_SIZE_REG, &flash_size_in_kb);
/* failed reading flash size or flash size invalid (early silicon),
* default to max target family */
if (retval != ERROR_OK || flash_size_in_kb == 0xffff || flash_size_in_kb == 0) {
LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming %dk flash",
max_flash_size_in_kb);
flash_size_in_kb = max_flash_size_in_kb;
}
LOG_INFO("flash size = %dkbytes", flash_size_in_kb);
/* did we assign flash size? */
assert(flash_size_in_kb != 0xffff);
/* get options to for DUAL BANK. */ /* get options to for DUAL BANK. */
retval = target_read_u32(target, STM32_FLASH_OPTR, &options); retval = target_read_u32(target, STM32_FLASH_OPTR, &options);
@ -632,8 +647,6 @@ static int stm32l4_probe(struct flash_bank *bank)
else else
stm32l4_info->option_bytes.bank_b_start = flash_size_in_kb << 9; stm32l4_info->option_bytes.bank_b_start = flash_size_in_kb << 9;
LOG_INFO("flash size = %dkbytes", flash_size_in_kb);
/* did we assign flash size? */ /* did we assign flash size? */
assert((flash_size_in_kb != 0xffff) && flash_size_in_kb); assert((flash_size_in_kb != 0xffff) && flash_size_in_kb);