Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Fix reset for STM32 devices

Browse source
This commit is contained in:
Fred Sundvik 2018-02-10 23:09:03 +02:00 committed by Jack Humbert
parent fca31693df
commit 8c2ae4a470
4 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
keyboards/clueboard/60/boards/GENERIC_STM32_F303XC/board.c
View file

@ -62,13 +62,15 @@ const PALConfig pal_default_config = {
}; };
#endif #endif
void enter_bootloader_mode_if_requested(void);
/** /**
* @brief Early initialization code. * @brief Early initialization code.
* @details This initialization must be performed just after stack setup * @details This initialization must be performed just after stack setup
* and before any other initialization. * and before any other initialization.
*/ */
void __early_init(void) { void __early_init(void) {
enter_bootloader_mode_if_requested();
stm32_clock_init(); stm32_clock_init();
} }

2
keyboards/clueboard/60/boards/GENERIC_STM32_F303XC/board.h
View file

@ -1171,7 +1171,7 @@
* USB bus de-activation macro, required by the USB driver. * USB bus de-activation macro, required by the USB driver.
*/ */
// #define usb_lld_disconnect_bus(usbp) // #define usb_lld_disconnect_bus(usbp)
#define usb_lld_disconnect_bus(usbp) (palSetPadMode(GPIOA, GPIOA_USB_DP, PAL_MODE_OUTPUT_PUSHPULL)) #define usb_lld_disconnect_bus(usbp) (palSetPadMode(GPIOA, GPIOA_USB_DP, PAL_MODE_OUTPUT_PUSHPULL)); palClearPad(GPIOA, GPIOA_USB_DP)
// #define usb_lld_disconnect_bus(usbp) palSetPadMode(GPIOA, 12, PAL_MODE_OUTPUT_PUSHPULL); palClearPad(GPIOA, 12) // #define usb_lld_disconnect_bus(usbp) palSetPadMode(GPIOA, 12, PAL_MODE_OUTPUT_PUSHPULL); palClearPad(GPIOA, 12)
#if !defined(_FROM_ASM_) #if !defined(_FROM_ASM_)

2
keyboards/clueboard/60/rules.mk
View file

@ -37,7 +37,7 @@ USE_FPU = yes
OPT_DEFS = OPT_DEFS =
# Options to pass to dfu-util when flashing # Options to pass to dfu-util when flashing
DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000 -R DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.

34
tmk_core/common/chibios/bootloader.c
View file

@ -6,32 +6,32 @@
#ifdef STM32_BOOTLOADER_ADDRESS #ifdef STM32_BOOTLOADER_ADDRESS
/* STM32 */ /* STM32 */
#if defined(STM32F0XX)
/* This code should be checked whether it runs correctly on platforms */ /* This code should be checked whether it runs correctly on platforms */
#define SYMVAL(sym) (uint32_t)(((uint8_t *)&(sym)) - ((uint8_t *)0)) #define SYMVAL(sym) (uint32_t)(((uint8_t *)&(sym)) - ((uint8_t *)0))
extern uint32_t __ram0_end__; extern uint32_t __ram0_end__;
#define BOOTLOADER_MAGIC 0xDEADBEEF
#define MAGIC_ADDR (unsigned long*)(SYMVAL(__ram0_end__) - 4)
void bootloader_jump(void) { void bootloader_jump(void) {
*((unsigned long *)(SYMVAL(__ram0_end__) - 4)) = 0xDEADBEEF; // set magic flag => reset handler will jump into boot loader *MAGIC_ADDR = BOOTLOADER_MAGIC; // set magic flag => reset handler will jump into boot loader
NVIC_SystemReset(); NVIC_SystemReset();
} }
#elif defined(STM32F3XX) void enter_bootloader_mode_if_requested(void) {
/* This code should be checked whether it runs correctly on platforms. unsigned long* check = MAGIC_ADDR;
* It was added for clueboard60 BUT HAS NOT BEEN TESTED. if(*check == BOOTLOADER_MAGIC) {
* FIXME - Test this *check = 0;
*/ __set_CONTROL(0);
#define SYMVAL(sym) (uint32_t)(((uint8_t *)&(sym)) - ((uint8_t *)0)) __set_MSP(*(__IO uint32_t*)STM32_BOOTLOADER_ADDRESS);
extern uint32_t __ram0_end__; __enable_irq();
void bootloader_jump(void) { typedef void (*BootJump_t)(void);
*((unsigned long *)(SYMVAL(__ram0_end__) - 4)) = 0xDEADBEEF; // set magic flag => reset handler will jump into boot loader BootJump_t boot_jump = *(BootJump_t*)(STM32_BOOTLOADER_ADDRESS + 4);
NVIC_SystemReset(); boot_jump();
} while(1);
}
#else /* defined(STM32F0XX) */ }
#error Check that the bootloader code works on your platform and add it to bootloader.c!
#endif /* defined(STM32F0XX) */
#elif defined(KL2x) || defined(K20x) /* STM32_BOOTLOADER_ADDRESS */ #elif defined(KL2x) || defined(K20x) /* STM32_BOOTLOADER_ADDRESS */
/* Kinetis */ /* Kinetis */