From 09544bc7101981f2688e0a678138dc4580ea3f76 Mon Sep 17 00:00:00 2001 From: Uwe Bonnes Date: Sat, 20 Jun 2015 22:24:47 +0200 Subject: [PATCH 1/3] src/stm32f1.c: More verbose FO detection message. --- src/stm32f1.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/stm32f1.c b/src/stm32f1.c index e405aca..4d291d1 100644 --- a/src/stm32f1.c +++ b/src/stm32f1.c @@ -87,6 +87,9 @@ static int stm32f1_flash_write(struct target_flash *f, #define DBGMCU_IDCODE 0xE0042000 #define DBGMCU_IDCODE_F0 0x40015800 +#define FLASHSIZE 0x1FFFF7E0 +#define FLASHSIZE_F0 0x1FFFF7CC + static const uint16_t stm32f1_flash_write_stub[] = { #include "../flashstub/stm32f1.stub" }; @@ -110,6 +113,7 @@ static void stm32f1_add_flash(target *t, bool stm32f1_probe(target *t) { + size_t flash_size; t->idcode = target_mem_read32(t, DBGMCU_IDCODE) & 0xfff; switch(t->idcode) { case 0x410: /* Medium density */ @@ -140,13 +144,25 @@ bool stm32f1_probe(target *t) t->idcode = target_mem_read32(t, DBGMCU_IDCODE_F0) & 0xfff; switch(t->idcode) { case 0x444: /* STM32F03 RM0091 Rev.7 */ + t->driver = "STM32F03"; + break; case 0x445: /* STM32F04 RM0091 Rev.7 */ + t->driver = "STM32F04"; + break; case 0x440: /* STM32F05 RM0091 Rev.7 */ + t->driver = "STM32F05"; + break; case 0x448: /* STM32F07 RM0091 Rev.7 */ + t->driver = "STM32F07"; + break; case 0x442: /* STM32F09 RM0091 Rev.7 */ - t->driver = "STM32F0"; + t->driver = "STM32F09"; + break; + } + if (t->driver) { + flash_size = target_mem_read32(t, FLASHSIZE_F0) *0x400; target_add_ram(t, 0x20000000, 0x5000); - stm32f1_add_flash(t, 0x8000000, 0x20000, 0x400); + stm32f1_add_flash(t, 0x8000000, flash_size, 0x400); target_add_commands(t, stm32f1_cmd_list, "STM32F0"); return true; } From a7f6753153e6442116b8440ec06f46e425137261 Mon Sep 17 00:00:00 2001 From: Uwe Bonnes Date: Mon, 22 Jun 2015 10:02:17 +0200 Subject: [PATCH 2/3] STM32f0: F07 and F09 have 2kiByte blocksize. --- src/stm32f1.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/stm32f1.c b/src/stm32f1.c index 4d291d1..fecebdf 100644 --- a/src/stm32f1.c +++ b/src/stm32f1.c @@ -114,6 +114,7 @@ static void stm32f1_add_flash(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; switch(t->idcode) { case 0x410: /* Medium density */ @@ -154,15 +155,18 @@ bool stm32f1_probe(target *t) break; case 0x448: /* STM32F07 RM0091 Rev.7 */ t->driver = "STM32F07"; + block_size = 0x800; break; case 0x442: /* STM32F09 RM0091 Rev.7 */ t->driver = "STM32F09"; + block_size = 0x800; break; } if (t->driver) { - flash_size = target_mem_read32(t, FLASHSIZE_F0) *0x400; + 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); - stm32f1_add_flash(t, 0x8000000, flash_size, 0x400); + stm32f1_add_flash(t, 0x8000000, flash_size, block_size); target_add_commands(t, stm32f1_cmd_list, "STM32F0"); return true; } From c97d3f0f6358f31810073a75fb60fadb8d2bd276 Mon Sep 17 00:00:00 2001 From: Uwe Bonnes Date: Mon, 22 Jun 2015 10:03:03 +0200 Subject: [PATCH 3/3] flashstub: Stubs need to run on different targets. Compile for M0. --- flashstub/Makefile | 2 +- flashstub/lmi.stub | 2 +- flashstub/nrf51.stub | 2 +- flashstub/stm32f1.stub | 2 +- flashstub/stm32f4.stub | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flashstub/Makefile b/flashstub/Makefile index c955ca8..faee76a 100644 --- a/flashstub/Makefile +++ b/flashstub/Makefile @@ -8,7 +8,7 @@ ifneq ($(V), 1) Q = @ 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 all: lmi.stub stm32f4.stub nrf51.stub stm32f1.stub diff --git a/flashstub/lmi.stub b/flashstub/lmi.stub index 5f2c696..4a6a490 100644 --- a/flashstub/lmi.stub +++ b/flashstub/lmi.stub @@ -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, \ No newline at end of file +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, \ No newline at end of file diff --git a/flashstub/nrf51.stub b/flashstub/nrf51.stub index 6c12fa4..78292cc 100644 --- a/flashstub/nrf51.stub +++ b/flashstub/nrf51.stub @@ -1 +1 @@ -0x4808, 0x4909, 0x467A, 0x3228, 0x4B08, 0x2B00, 0xD009, 0x6814, 0x600C, 0x6804, 0x2601, 0x4234, 0xD0FB, 0x3B04, 0x3104, 0x3204, 0xE7F3, 0xBE00, 0xE400, 0x4001, 0x0000, 0x0000, 0x000C, 0x0000, 0xAAAA, 0xAAAA, 0xBBBB, 0xBBBB, 0xCCCC, 0xCCCC, +0x4808, 0x4909, 0x467A, 0x3228, 0x4B08, 0x2B00, 0xD009, 0x6814, 0x600C, 0x6804, 0x2601, 0x4234, 0xD0FB, 0x3B04, 0x3104, 0x3204, 0xE7F3, 0xBE00, 0xE400, 0x4001, 0x0000, 0x0000, 0x000C, 0x0000, 0xAAAA, 0xAAAA, 0xBBBB, 0xBBBB, 0xCCCC, 0xCCCC, \ No newline at end of file diff --git a/flashstub/stm32f1.stub b/flashstub/stm32f1.stub index 7f2914c..3fe7cd0 100644 --- a/flashstub/stm32f1.stub +++ b/flashstub/stm32f1.stub @@ -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, \ No newline at end of file +0x2300, 0x4C09, 0x4293, 0xD209, 0x2601, 0x4D08, 0x602E, 0x5ACD, 0x52C5, 0x6825, 0x07ED, 0xD4FC, 0x3302, 0xE7F2, 0x2314, 0x6822, 0x421A, 0xD000, 0xBE01, 0xBE00, 0x200C, 0x4002, 0x2010, 0x4002, \ No newline at end of file diff --git a/flashstub/stm32f4.stub b/flashstub/stm32f4.stub index 25b5d9a..bd20406 100644 --- a/flashstub/stm32f4.stub +++ b/flashstub/stm32f4.stub @@ -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, \ No newline at end of file +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, \ No newline at end of file