jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

stm32l4: Use targetid when available.

Browse Source 
Fixes STM32U5 from crashing.
This commit is contained in:
Uwe Bonnes 2021-10-26 13:01:49 +02:00
parent c4b6b42dcf
commit 8845a22226
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/target/stm32l4.c
View File

@ -507,22 +507,31 @@ static void stm32l4_detach(target *t)
bool stm32l4_probe(target *t) bool stm32l4_probe(target *t)
{ {
uint32_t idcode_reg = STM32L4_DBGMCU_IDCODE_PHYS;
ADIv5_AP_t *ap = cortexm_ap(t); ADIv5_AP_t *ap = cortexm_ap(t);
if (ap->dp->idcode == 0x0Be12477) { uint32_t idcode;
if (ap->dp->targetid > 1) { /* STM32L552 has in valid TARGETID 1 */
idcode = (ap->dp->targetid >> 16) & 0xfff;
} else {
uint32_t idcode_reg = STM32L4_DBGMCU_IDCODE_PHYS;
if (ap->dp->idcode == 0x0Be12477)
idcode_reg = STM32L5_DBGMCU_IDCODE_PHYS; idcode_reg = STM32L5_DBGMCU_IDCODE_PHYS;
if ((stm32l4_flash_read32(t, FLASH_OPTR)) & L5_FLASH_OPTR_TZEN) { idcode = target_mem_read32(t, idcode_reg) & 0xfff;
DEBUG_WARN("STM32L5 Trust Zone enabled\n"); DEBUG_INFO("Idcode %08" PRIx32 "\n", idcode);
} }
}
uint32_t idcode = target_mem_read32(t, idcode_reg) & 0xfff;
DEBUG_INFO("Read %" PRIx32 ": %" PRIx32 "\n", idcode_reg, idcode);
struct stm32l4_info const *chip = stm32l4_get_chip_info(idcode); struct stm32l4_info const *chip = stm32l4_get_chip_info(idcode);
if( !chip->idcode ) /* Not found */ if( !chip->idcode ) /* Not found */
return false; return false;
switch (idcode) {
case ID_STM32L55:
if ((stm32l4_flash_read32(t, FLASH_OPTR)) & L5_FLASH_OPTR_TZEN) {
DEBUG_WARN("STM32L5 Trust Zone enabled\n");
t->core = "M33(TZ)";
break;
}
}
t->driver = chip->designator; t->driver = chip->designator;
t->attach = stm32l4_attach; t->attach = stm32l4_attach;
t->detach = stm32l4_detach; t->detach = stm32l4_detach;