projects
/
fw
/
stlink
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
For L1/F2/F4 we need the chip-id to distinguish, F1 needs core_id as common deniminator
[fw/stlink]
/
src
/
stlink-common.c
diff --git
a/src/stlink-common.c
b/src/stlink-common.c
index 03e1cce5228dd3f646c9c29a59f43128ca047555..9f122089826b5b5bde164897afc294f84a7ec6ae 100644
(file)
--- a/
src/stlink-common.c
+++ b/
src/stlink-common.c
@@
-972,7
+972,7
@@
int stlink_erase_flash_page(stlink_t *sl, stm32_addr_t flashaddr)
fprintf(stdout, "Erase Final CR:0x%x\n", read_flash_cr(sl));
#endif
}
fprintf(stdout, "Erase Final CR:0x%x\n", read_flash_cr(sl));
#endif
}
- else if (sl->c
ore_id == STM32L_CORE_ID
)
+ else if (sl->c
hip_id == STM32_CHIPID_L1_MEDIUM
)
{
uint32_t val;
{
uint32_t val;
@@
-1185,7
+1185,7
@@
int write_loader_to_sram(stlink_t *sl, stm32_addr_t* addr, size_t* size) {
const uint8_t* loader_code;
size_t loader_size;
const uint8_t* loader_code;
size_t loader_size;
- if (sl->c
ore_id == STM32L_CORE_ID
) /* stm32l */
+ if (sl->c
hip_id == STM32_CHIPID_L1_MEDIUM
) /* stm32l */
{
loader_code = loader_code_stm32l;
loader_size = sizeof(loader_code_stm32l);
{
loader_code = loader_code_stm32l;
loader_size = sizeof(loader_code_stm32l);
@@
-1404,7
+1404,7
@@
int stlink_write_flash(stlink_t *sl, stm32_addr_t addr, uint8_t* base, unsigned
} //STM32F4END
} //STM32F4END
- else if (sl->c
ore_id == STM32L_CORE_ID
) {
+ else if (sl->c
hip_id == STM32_CHIPID_L1_MEDIUM
) {
/* use fast word write. todo: half page. */
uint32_t val;
/* use fast word write. todo: half page. */
uint32_t val;
@@
-1599,7
+1599,7
@@
int run_flash_loader(stlink_t *sl, flash_loader_t* fl, stm32_addr_t target, cons
return -1;
}
return -1;
}
- if (sl->c
ore_id == STM32L_CORE_ID
) {
+ if (sl->c
hip_id == STM32_CHIPID_L1_MEDIUM
) {
size_t count = size / sizeof(uint32_t);
if (size % sizeof(uint32_t)) ++count;
size_t count = size / sizeof(uint32_t);
if (size % sizeof(uint32_t)) ++count;
@@
-1642,7
+1642,7
@@
int run_flash_loader(stlink_t *sl, flash_loader_t* fl, stm32_addr_t target, cons
}
/* check written byte count */
}
/* check written byte count */
- if (sl->c
ore_id == STM32L_CORE_ID
) {
+ if (sl->c
hip_id == STM32_CHIPID_L1_MEDIUM
) {
size_t count = size / sizeof(uint32_t);
if (size % sizeof(uint32_t)) ++count;
size_t count = size / sizeof(uint32_t);
if (size % sizeof(uint32_t)) ++count;