bootloader: Mark jump_to_application() as noreturn.

[gps-watch.git] / src / bootloader / main.rs

diff --git a/src/bootloader/main.rs b/src/bootloader/main.rs
index ec71e15abccc9ad0d910320ea72001f2d63213f1..321166c55a55f9bde891b5ec32db1ae804d3f8ce 100644 (file)
--- a/src/bootloader/main.rs
+++ b/src/bootloader/main.rs
@@ -44,7 +44,7 @@ extern {
     fn enable_interrupts();
     fn disable_interrupts();
 
-    fn jump_to_application(address: u32);
+    fn jump_to_application(address: u32) -> !;
 }
 
 #[cfg(bootloader_type = "intermediate")]
@@ -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();
 
@@ -104,5 +110,7 @@ pub unsafe extern fn main() {
 
     disable_interrupts();
 
+    clock::reset();
+
     jump_to_application(APPLICATION_ADDR);
 }