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

stlink for st-bootloader: Reset with platform_request_boot() 

Both V2 and V21 switch to (ST) bootloader with powered reset.
This commit is contained in:
Uwe Bonnes 2019-12-11 21:25:28 +01:00 committed by UweBonnes
parent 470c8e8cf1
commit ee316431f5
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/platforms/stlink/Makefile.inc
View File

@ -13,6 +13,7 @@ LDFLAGS_BOOT := $(LDFLAGS) --specs=nano.specs -lopencm3_stm32f1 \
-L../libopencm3/lib -L../libopencm3/lib
ifeq ($(ST_BOOTLOADER), 1) ifeq ($(ST_BOOTLOADER), 1)
$(info Load address 0x08004000 for original ST-LinkV2 Bootloader) $(info Load address 0x08004000 for original ST-LinkV2 Bootloader)
CFLAGS += -DST_BOOTLOADER
LDFLAGS = $(LDFLAGS_BOOT) -Wl,-Ttext=0x8004000 LDFLAGS = $(LDFLAGS_BOOT) -Wl,-Ttext=0x8004000
else else
LDFLAGS = $(LDFLAGS_BOOT) -Wl,-Ttext=0x8002000 LDFLAGS = $(LDFLAGS_BOOT) -Wl,-Ttext=0x8002000
@ -34,8 +35,11 @@ SRC += cdcacm.c \
traceswoasync.c \ traceswoasync.c \
stlink_common.c \ stlink_common.c \
ifeq ($(ST_BOOTLOADER), 1)
all: blackmagic.bin blackmagic_dfu.bin blackmagic_dfu.hex
else
all: blackmagic.bin blackmagic_dfu.bin blackmagic_dfu.hex dfu_upgrade.bin dfu_upgrade.hex all: blackmagic.bin blackmagic_dfu.bin blackmagic_dfu.hex dfu_upgrade.bin dfu_upgrade.hex
endif
blackmagic_dfu: usbdfu.o dfucore.o dfu_f1.o stlink_common.o blackmagic_dfu: usbdfu.o dfucore.o dfu_f1.o stlink_common.o
@echo " LD $@" @echo " LD $@"
$(Q)$(CC) $^ -o $@ $(LDFLAGS_BOOT) $(Q)$(CC) $^ -o $@ $(LDFLAGS_BOOT)

4
src/platforms/stlink/stlink_common.c
View File

@ -93,6 +93,9 @@ uint32_t detect_rev(void)
void platform_request_boot(void) void platform_request_boot(void)
{ {
#if defined(DST_BOOTLOADER)
scb_reset_system();
#else
uint32_t crl = GPIOA_CRL; uint32_t crl = GPIOA_CRL;
/* Assert bootloader marker. /* Assert bootloader marker.
* Enable Pull on GPIOA1. We don't rely on the external pin * Enable Pull on GPIOA1. We don't rely on the external pin
@ -103,4 +106,5 @@ void platform_request_boot(void)
crl |= 0x80; crl |= 0x80;
GPIOA_CRL = crl; GPIOA_CRL = crl;
SCB_VTOR = 0; SCB_VTOR = 0;
#endif
} }