sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #92 from maknoll/master 

Fixes #90 flashing of STM32 m0 chips
This commit is contained in:
Gareth McMullin 2015-06-29 19:29:57 -07:00
parent 492d6c9cf8 c97d3f0f63
commit 762e54060f
6 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flashstub/Makefile
View File

@ -8,7 +8,7 @@ ifneq ($(V), 1)
Q = @ Q = @
endif endif
CFLAGS=-Os -std=gnu99 -mcpu=cortex-m3 -mthumb -I../libopencm3/include CFLAGS=-Os -std=gnu99 -mcpu=cortex-m0 -mthumb -I../libopencm3/include
ASFLAGS=-mcpu=cortex-m3 -mthumb ASFLAGS=-mcpu=cortex-m3 -mthumb
all: lmi.stub stm32f4.stub nrf51.stub stm32f1.stub all: lmi.stub stm32f4.stub nrf51.stub stm32f1.stub

2
flashstub/lmi.stub
View File

@ -1 +1 @@
0x0892, 0x2300, 0x4293, 0xD20F, 0x4C08, 0x6020, 0xF851, 0x5023, 0x3408, 0xF844, 0x5C04, 0x4D06, 0x6025, 0x6825, 0xF015, 0x0F01, 0xD1FB, 0x3301, 0x3004, 0xE7ED, 0xBE00, 0xBF00, 0xD000, 0x400F, 0x0001, 0xA442, 0x2300, 0x009C, 0x1909, 0x1C1C, 0x0892, 0x4293, 0xD20E, 0x4E08, 0x1905, 0x6035, 0x590E, 0x4D07, 0x602E, 0x4D07, 0x4E07, 0x602E, 0x682E, 0x07F6, 0xD4FC, 0x3301, 0x3404, 0xE7EE, 0xBE00, 0x46C0, 0xD000, 0x400F, 0xD004, 0x400F, 0xD008, 0x400F, 0x0001, 0xA442,

2
flashstub/stm32f1.stub
View File

@ -1 +1 @@
0x2300, 0x4293, 0x4C09, 0xD20A, 0x4D09, 0x2601, 0x602E, 0x5ACD, 0x52C5, 0x6825, 0xF015, 0x0F01, 0xD1FB, 0x3302, 0xE7F1, 0x6823, 0xF013, 0x0F14, 0xD000, 0xBE01, 0xBE00, 0xBF00, 0x200C, 0x4002, 0x2010, 0x4002, 0x2300, 0x4C09, 0x4293, 0xD209, 0x2601, 0x4D08, 0x602E, 0x5ACD, 0x52C5, 0x6825, 0x07ED, 0xD4FC, 0x3302, 0xE7F2, 0x2314, 0x6822, 0x421A, 0xD000, 0xBE01, 0xBE00, 0x200C, 0x4002, 0x2010, 0x4002,

2
flashstub/stm32f4.stub
View File

@ -1 +1 @@
0x2300, 0x4293, 0x4C09, 0xD20B, 0x4D09, 0xF240, 0x2601, 0x602E, 0x58CD, 0x50C5, 0x6825, 0xF415, 0x3F80, 0xD1FB, 0x3304, 0xE7F0, 0x6823, 0xF013, 0x0FF2, 0xD000, 0xBE01, 0xBE00, 0x3C0C, 0x4002, 0x3C10, 0x4002, 0x2300, 0x4C09, 0x4293, 0xD209, 0x4D08, 0x4E09, 0x602E, 0x58CD, 0x50C5, 0x6825, 0x03ED, 0xD4FC, 0x3304, 0xE7F2, 0x23F2, 0x6822, 0x421A, 0xD000, 0xBE01, 0xBE00, 0x3C0C, 0x4002, 0x3C10, 0x4002, 0x0201, 0x0000,

24
src/stm32f1.c
View File

@ -87,6 +87,9 @@ static int stm32f1_flash_write(struct target_flash *f,
#define DBGMCU_IDCODE 0xE0042000 #define DBGMCU_IDCODE 0xE0042000
#define DBGMCU_IDCODE_F0 0x40015800 #define DBGMCU_IDCODE_F0 0x40015800
#define FLASHSIZE 0x1FFFF7E0
#define FLASHSIZE_F0 0x1FFFF7CC
static const uint16_t stm32f1_flash_write_stub[] = { static const uint16_t stm32f1_flash_write_stub[] = {
#include "../flashstub/stm32f1.stub" #include "../flashstub/stm32f1.stub"
}; };
@ -110,6 +113,8 @@ static void stm32f1_add_flash(target *t,
bool stm32f1_probe(target *t) bool stm32f1_probe(target *t)
{ {
size_t flash_size;
size_t block_size = 0x400;
t->idcode = target_mem_read32(t, DBGMCU_IDCODE) & 0xfff; t->idcode = target_mem_read32(t, DBGMCU_IDCODE) & 0xfff;
switch(t->idcode) { switch(t->idcode) {
case 0x410: /* Medium density */ case 0x410: /* Medium density */
@ -140,13 +145,28 @@ bool stm32f1_probe(target *t)
t->idcode = target_mem_read32(t, DBGMCU_IDCODE_F0) & 0xfff; t->idcode = target_mem_read32(t, DBGMCU_IDCODE_F0) & 0xfff;
switch(t->idcode) { switch(t->idcode) {
case 0x444: /* STM32F03 RM0091 Rev.7 */ case 0x444: /* STM32F03 RM0091 Rev.7 */
t->driver = "STM32F03";
break;
case 0x445: /* STM32F04 RM0091 Rev.7 */ case 0x445: /* STM32F04 RM0091 Rev.7 */
t->driver = "STM32F04";
break;
case 0x440: /* STM32F05 RM0091 Rev.7 */ case 0x440: /* STM32F05 RM0091 Rev.7 */
t->driver = "STM32F05";
break;
case 0x448: /* STM32F07 RM0091 Rev.7 */ case 0x448: /* STM32F07 RM0091 Rev.7 */
t->driver = "STM32F07";
block_size = 0x800;
break;
case 0x442: /* STM32F09 RM0091 Rev.7 */ case 0x442: /* STM32F09 RM0091 Rev.7 */
t->driver = "STM32F0"; t->driver = "STM32F09";
block_size = 0x800;
break;
}
if (t->driver) {
flash_size = (target_mem_read32(t, FLASHSIZE_F0) & 0xffff) *0x400;
gdb_outf("flash size %d block_size %d\n", flash_size, block_size);
target_add_ram(t, 0x20000000, 0x5000); target_add_ram(t, 0x20000000, 0x5000);
stm32f1_add_flash(t, 0x8000000, 0x20000, 0x400); stm32f1_add_flash(t, 0x8000000, flash_size, block_size);
target_add_commands(t, stm32f1_cmd_list, "STM32F0"); target_add_commands(t, stm32f1_cmd_list, "STM32F0");
return true; return true;
} }