aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Smith2011-12-14 23:10:53 -0800
committerMike Smith2011-12-14 23:10:53 -0800
commitbba42ff6c91602b021d2518c7d51050cb17fadc9 (patch)
tree521c33672fabd31a96fc80d055431b73ec1bbff4
parentc9860e77164dc2201fbfeb930c2dccd0e5090613 (diff)
parent45eee497d078a2f55abed6587b486d01b63f49fd (diff)
Merge branch 'master' of git://github.com/gsmcmullin/blackmagic
-rw-r--r--src/stm32/cdcacm.c2
-rw-r--r--src/stm32f4.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/stm32/cdcacm.c b/src/stm32/cdcacm.c
index 4198af5..690081e 100644
--- a/src/stm32/cdcacm.c
+++ b/src/stm32/cdcacm.c
@@ -47,7 +47,7 @@
static char *get_dev_unique_id(char *serial_no);
static int configured;
-static int cdcacm_gdb_dtr;
+static int cdcacm_gdb_dtr = 1;
static const struct usb_device_descriptor dev = {
.bLength = USB_DT_DEVICE_SIZE,
diff --git a/src/stm32f4.c b/src/stm32f4.c
index edb45b0..e83daa9 100644
--- a/src/stm32f4.c
+++ b/src/stm32f4.c
@@ -158,7 +158,7 @@ static int stm32f4_flash_erase(struct target_s *target, uint32_t addr, int len)
uint32_t cr;
uint32_t pagesize;
- addr &= 0x07E00000;
+ addr &= 0x07FFC000;
/* Enable FPEC controller access */
adiv5_ap_mem_write(t->ap, FLASH_KEYR, KEY1);
@@ -207,13 +207,13 @@ static int stm32f4_flash_write_words(struct target_s *target, uint32_t dest,
uint16_t sr;
/* Construct data buffer used by stub */
- data[0] = dest & 0xFFFFFFFE;
- data[1] = len & 0xFFFFFFFE;
+ data[0] = dest & 0xFFFFFFFC;
+ data[1] = (len + 3) & 0xFFFFFFFC;
memcpy(&data[2], src, len);
/* Write stub and data to target ram and set PC */
target_mem_write_words(target, 0x20000000, (void*)stm32f4_flash_write_stub, 0x30);
- target_mem_write_words(target, 0x20000030, data, len + 8);
+ target_mem_write_words(target, 0x20000030, data, len + 11);
target_pc_write(target, 0x20000000);
if(target_check_error(target))
return -1;