From 7b12c99a0b6a56ce0f185b3f4f58ddf0a7104452 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphaelcoeffic@users.noreply.github.com>
Date: Thu, 12 Apr 2018 18:49:50 +0200
Subject: [PATCH] bootloader: use software reset instead of jump (#5823)

fixes #5627
---
 .../targets/common/arm/stm32/bootloader/boot.cpp   | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/radio/src/targets/common/arm/stm32/bootloader/boot.cpp b/radio/src/targets/common/arm/stm32/bootloader/boot.cpp
index 888139abd..8b71eef84 100644
--- a/radio/src/targets/common/arm/stm32/bootloader/boot.cpp
+++ b/radio/src/targets/common/arm/stm32/bootloader/boot.cpp
@@ -507,9 +507,21 @@ int main()
     }
 
     if (state == ST_REBOOT) {
-        // Jump to proper application address
+
         lcdClear();
+        lcdRefresh();
+        lcdRefreshWait();
+
+#if !defined(EEPROM)
+        // Use jump on radios with emergency mode
+        // to avoid triggering it with a soft reset
+
+        // Jump to proper application address
         jumpTo(APP_START_ADDRESS);
+#else
+        // Use software reset everywhere else
+        NVIC_SystemReset();
+#endif
     }
   }