summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2023-07-04 21:16:14 +1000
committerGitHub <noreply@github.com>2023-07-04 21:16:14 +1000
commit2976bd627e5963ed14431cc402015b5a1a46105d (patch)
tree7934d8f30ec577295ea6c4977a8af1e39674d992
parent20318278528b99247c729ee6c0f0f6d14c296c6b (diff)
Fixup STM32-DFU (#21447)
-rw-r--r--platforms/chibios/bootloaders/stm32_dfu.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/platforms/chibios/bootloaders/stm32_dfu.c b/platforms/chibios/bootloaders/stm32_dfu.c
index 8cf640f7f9..fba3086e7a 100644
--- a/platforms/chibios/bootloaders/stm32_dfu.c
+++ b/platforms/chibios/bootloaders/stm32_dfu.c
@@ -107,6 +107,12 @@ void enter_bootloader_mode_if_requested(void) {
if (bootloader_marker_active()) {
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();
# if defined(QMK_MCU_ARCH_CORTEX_M7)
@@ -128,16 +134,11 @@ void enter_bootloader_mode_if_requested(void) {
NVIC->ICPR[i] = 0xFFFFFFFF;
}
+ __set_CONTROL(0);
+ __set_MSP(bootloader->stack_top);
__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
- __set_MSP(bootloader->stack_top);
bootloader->entrypoint();
while (true) {
}