Merge pull request #11030 from SteveCEvans/f7_flash_lockup

betaflight · Nov 3, 2021 · 45102aa · 45102aa
1 parent e341107
commit 45102aa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/main/drivers/system_stm32f7xx.c b/src/main/drivers/system_stm32f7xx.c
@@ -76,7 +76,7 @@ static void checkForBootLoaderRequest(void)
     if (bootloaderRequest != RESET_BOOTLOADER_REQUEST_ROM) {
         return;
     }
-    persistentObjectWrite(PERSISTENT_OBJECT_RESET_REASON, RESET_NONE);
+    persistentObjectWrite(PERSISTENT_OBJECT_RESET_REASON, RESET_BOOTLOADER_POST);
 
     __SYSCFG_CLK_ENABLE();
     SYSCFG->MEMRMP |= SYSCFG_MEM_BOOT_ADD0 ;

diff --git a/src/main/startup/system_stm32f7xx.c b/src/main/startup/system_stm32f7xx.c
@@ -313,6 +313,13 @@ void OverclockRebootIfNecessary(uint32_t overclockLevel)
   */
 void SystemInit(void)
 {
+    uint32_t bootloaderRequest = persistentObjectRead(PERSISTENT_OBJECT_RESET_REASON);
+
+    if (bootloaderRequest == RESET_BOOTLOADER_POST) {
+        persistentObjectWrite(PERSISTENT_OBJECT_RESET_REASON, RESET_NONE);
+        NVIC_SystemReset();
+    }
+
     initialiseMemorySections();
 
     SystemInitOC();