From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sun, 8 Dec 2019 17:20:04 +0000 (+0100)
Subject: bootloader: Never auto-start the application in the intermediate bootloader.
X-Git-Url: http://git.code-monkey.de/?a=commitdiff_plain;h=3dcdbf0d5f41c407fd6f16a16c5ca1bc18e01a01;hp=e44d325020a027013b5518aad1c059d3d0d5ad16;p=gps-watch.git

bootloader: Never auto-start the application in the intermediate bootloader.

Instead, we now always enter bootloader operation. I think this has
less potential of bricking a device in case you don't press PTE24
fast enough after installing the intermediate bootloader.
---

diff --git a/src/bootloader/main.rs b/src/bootloader/main.rs
index 52a1473..a5fe983 100644
--- a/src/bootloader/main.rs
+++ b/src/bootloader/main.rs
@@ -65,6 +65,12 @@ unsafe fn application_missing() -> bool {
     first_app_word.read() == 0xffffffff
 }
 
+#[cfg(bootloader_type = "intermediate")]
+fn bootloader_requested() -> bool {
+    true
+}
+
+#[cfg(bootloader_type = "final")]
 fn bootloader_requested() -> bool {
     let start_ticks = systick::now();