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

f4discovery: Use Magic constant in RAM for Bootloader entry.

This commit is contained in:
Uwe Bonnes 2017-04-18 20:02:01 +02:00
parent a0e47c392b
commit 8cc2c44dbf
3 changed files with 23 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/platforms/f4discovery/Makefile.inc
View File

@ -7,7 +7,7 @@ CFLAGS += -Istm32/include -mcpu=cortex-m4 -mthumb \
-DSTM32F4 -DF4DISCOVERY -I../libopencm3/include \ -DSTM32F4 -DF4DISCOVERY -I../libopencm3/include \
-Iplatforms/stm32 -Iplatforms/stm32
LDFLAGS = -lopencm3_stm32f4 -Wl,--defsym,_stack=0x20006000 \ LDFLAGS = -lopencm3_stm32f4 -Wl,--defsym,_stack=0x20010000 \
-Wl,-T,platforms/stm32/f4discovery.ld -nostartfiles -lc -lnosys \ -Wl,-T,platforms/stm32/f4discovery.ld -nostartfiles -lc -lnosys \
-Wl,-Map=mapfile -mthumb -mcpu=cortex-m4 -Wl,-gc-sections \ -Wl,-Map=mapfile -mthumb -mcpu=cortex-m4 -Wl,-gc-sections \
-mfloat-abi=hard -mfpu=fpv4-sp-d16 \ -mfloat-abi=hard -mfpu=fpv4-sp-d16 \

54
src/platforms/f4discovery/platform.c
View File

@ -38,13 +38,27 @@
#include <libopencm3/cm3/cortex.h> #include <libopencm3/cm3/cortex.h>
jmp_buf fatal_error_jmpbuf; jmp_buf fatal_error_jmpbuf;
extern uint32_t _ebss;
void platform_init(void) void platform_init(void)
{ {
volatile uint32_t *magic = (uint32_t *) &_ebss;
/* Check the USER button*/ /* Check the USER button*/
rcc_periph_clock_enable(RCC_GPIOA); rcc_periph_clock_enable(RCC_GPIOA);
if(gpio_get(GPIOA, GPIO0)) { if (gpio_get(GPIOA, GPIO0) ||
platform_request_boot(); ((magic[0] == BOOTMAGIC0) && (magic[1] == BOOTMAGIC1))) {
magic[0] = 0;
magic[1] = 0;
/* Assert blue LED as indicator we are in the bootloader */
rcc_periph_clock_enable(RCC_GPIOD);
gpio_mode_setup(LED_PORT, GPIO_MODE_OUTPUT,
GPIO_PUPD_NONE, LED_BOOTLOADER);
gpio_set(LED_PORT, LED_BOOTLOADER);
/* Jump to the built in bootloader by mapping System flash.
As we just come out of reset, no other deinit is needed!*/
rcc_periph_clock_enable(RCC_SYSCFG);
SYSCFG_MEMRM &= ~3;
SYSCFG_MEMRM |= 1;
scb_reset_core(); scb_reset_core();
} }
@ -89,36 +103,8 @@ const char *platform_target_voltage(void)
void platform_request_boot(void) void platform_request_boot(void)
{ {
/* Disconnect USB cable */ uint32_t *magic = (uint32_t *) &_ebss;
if (RCC_AHB2ENR & RCC_AHB2ENR_OTGFSEN) { magic[0] = BOOTMAGIC0;
usbd_disconnect(usbdev, 1); magic[1] = BOOTMAGIC1;
nvic_disable_irq(USB_IRQ); scb_reset_system();
rcc_periph_clock_disable(RCC_OTGFS);
}
/* Assert blue LED as indicator we are in the bootloader */
gpio_mode_setup(LED_PORT, GPIO_MODE_OUTPUT,
GPIO_PUPD_NONE, LED_BOOTLOADER);
gpio_set(LED_PORT, LED_BOOTLOADER);
/* Disable used ports beside PORTD.*/
rcc_periph_clock_disable(RCC_GPIOA);
rcc_periph_clock_disable(RCC_GPIOC);
rcc_periph_clock_disable(USBUSART_CLK);
/* Reset Systick.*/
systick_interrupt_disable();
STK_CSR = 0;
STK_RVR = 0;
STK_CVR = 0;
/*Disable Interrupts.*/
cm_disable_interrupts();
/* Switch back to HSI.*/
while (!(RCC_CR & RCC_CR_HSIRDY))
RCC_CR |= RCC_CR_HSION;
while (RCC_CFGR & (RCC_CFGR_SWS_HSE | RCC_CFGR_SWS_PLL))
RCC_CFGR &= ~(RCC_CFGR_SWS_HSE | RCC_CFGR_SWS_PLL);
/* Map System flash at 0.*/
rcc_periph_clock_enable(RCC_SYSCFG);
SYSCFG_MEMRM &= ~3;
SYSCFG_MEMRM |= 1;
} }

2
src/platforms/f4discovery/platform.h
View File

@ -80,6 +80,8 @@
#define LED_IDLE_RUN GPIO13 #define LED_IDLE_RUN GPIO13
#define LED_ERROR GPIO14 #define LED_ERROR GPIO14
#define LED_BOOTLOADER GPIO15 #define LED_BOOTLOADER GPIO15
#define BOOTMAGIC0 0xb007da7a
#define BOOTMAGIC1 0xbaadfeed
#define TMS_SET_MODE() \ #define TMS_SET_MODE() \
gpio_mode_setup(TMS_PORT, GPIO_MODE_OUTPUT, \ gpio_mode_setup(TMS_PORT, GPIO_MODE_OUTPUT, \