Merge pull request #6919 from flom84/stm_dfu_mode
Software DFU mode implementation for STM32F4 MCU.
This commit is contained in:
commit
5593d23a05
@ -36,7 +36,7 @@
|
||||
#include "shared-bindings/microcontroller/__init__.h"
|
||||
#include "shared-bindings/microcontroller/Pin.h"
|
||||
#include "shared-bindings/microcontroller/Processor.h"
|
||||
|
||||
#include "supervisor/port.h"
|
||||
#include "supervisor/filesystem.h"
|
||||
#include "supervisor/shared/safe_mode.h"
|
||||
|
||||
@ -73,15 +73,25 @@ void common_hal_mcu_enable_interrupts(void) {
|
||||
__enable_irq();
|
||||
}
|
||||
|
||||
static bool next_reset_to_bootloader = false;
|
||||
|
||||
void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
|
||||
if (runmode == RUNMODE_SAFE_MODE) {
|
||||
safe_mode_on_next_reset(PROGRAMMATIC_SAFE_MODE);
|
||||
}
|
||||
if (runmode == RUNMODE_BOOTLOADER) {
|
||||
next_reset_to_bootloader = true;
|
||||
}
|
||||
}
|
||||
|
||||
void common_hal_mcu_reset(void) {
|
||||
filesystem_flush(); // TODO: implement as part of flash improvements
|
||||
NVIC_SystemReset();
|
||||
|
||||
if (next_reset_to_bootloader) {
|
||||
reset_to_bootloader();
|
||||
} else {
|
||||
NVIC_SystemReset();
|
||||
}
|
||||
}
|
||||
|
||||
// The singleton microcontroller.Processor object, bound to microcontroller.cpu
|
||||
|
@ -276,7 +276,39 @@ void reset_port(void) {
|
||||
}
|
||||
|
||||
void reset_to_bootloader(void) {
|
||||
|
||||
/*
|
||||
From STM AN2606:
|
||||
Before jumping to bootloader user must:
|
||||
• Disable all peripheral clocks
|
||||
• Disable used PLL
|
||||
• Disable interrupts
|
||||
• Clear pending interrupts
|
||||
System memory boot mode can be exited by getting out from bootloader activation
|
||||
condition and generating hardware reset or using Go command to execute user code
|
||||
*/
|
||||
HAL_RCC_DeInit();
|
||||
HAL_DeInit();
|
||||
|
||||
// disable all interupts
|
||||
__disable_irq();
|
||||
|
||||
// Clear all pending interrupts
|
||||
for (uint8_t i = 0; i < (sizeof(NVIC->ICPR) / NVIC->ICPR[0]); ++i) {
|
||||
NVIC->ICPR[i] = 0xFFFFFFFF;
|
||||
}
|
||||
// information about jump addresses has been taken from STM AN2606.
|
||||
#if defined(STM32F4)
|
||||
__set_MSP(*((uint32_t *)0x1FFF0000));
|
||||
((void (*)(void)) * ((uint32_t *)0x1FFF0004))();
|
||||
#else
|
||||
// DFU mode for STM32 variant note implemented.
|
||||
NVIC_SystemReset();
|
||||
#endif
|
||||
|
||||
while (true) {
|
||||
asm ("nop;");
|
||||
}
|
||||
}
|
||||
|
||||
void reset_cpu(void) {
|
||||
|
Loading…
Reference in New Issue
Block a user