gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-02-26 01:40:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into xap

Browse Source
This commit is contained in:
QMK Bot 2023-07-04 11:16:51 +00:00
commit cf12dbe772
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
platforms/chibios/bootloaders/stm32_dfu.c
View File

@ -107,6 +107,12 @@ void enter_bootloader_mode_if_requested(void) {
if (bootloader_marker_active()) { if (bootloader_marker_active()) {
bootloader_marker_disable(); bootloader_marker_disable();
struct system_memory_vector_t {
uint32_t stack_top;
void (*entrypoint)(void);
};
const struct system_memory_vector_t *bootloader = (const struct system_memory_vector_t *)(STM32_BOOTLOADER_ADDRESS);
__disable_irq(); __disable_irq();
# if defined(QMK_MCU_ARCH_CORTEX_M7) # if defined(QMK_MCU_ARCH_CORTEX_M7)
@ -128,16 +134,11 @@ void enter_bootloader_mode_if_requested(void) {
NVIC->ICPR[i] = 0xFFFFFFFF; NVIC->ICPR[i] = 0xFFFFFFFF;
} }
__set_CONTROL(0);
__set_MSP(bootloader->stack_top);
__enable_irq(); __enable_irq();
struct system_memory_vector_t {
uint32_t stack_top;
void (*entrypoint)(void);
};
const struct system_memory_vector_t *bootloader = (const struct system_memory_vector_t *)(STM32_BOOTLOADER_ADDRESS);
// Jump to bootloader // Jump to bootloader
__set_MSP(bootloader->stack_top);
bootloader->entrypoint(); bootloader->entrypoint();
while (true) { while (true) {
} }