X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fbootloader%2Fmain.rs;h=52a14738f62e0008d6ad4cc95b362432ab0f6170;hb=e44d325020a027013b5518aad1c059d3d0d5ad16;hp=afd28dc994ca0794e33eb7f8d62d69dfda88d7db;hpb=2e15e18237f50ba61acc861a4bd23560d973e943;p=gps-watch.git

diff --git a/src/bootloader/main.rs b/src/bootloader/main.rs
index afd28dc..52a1473 100644
--- a/src/bootloader/main.rs
+++ b/src/bootloader/main.rs
@@ -35,6 +35,7 @@ use common::clock;
 use common::systick;
 use common::port;
 use common::gpio;
+use common::watchdog;
 use common::usb_serial;
 
 type Reg32 = register::Register<u32>;
@@ -78,6 +79,7 @@ fn bootloader_requested() -> bool {
 
 #[no_mangle]
 pub unsafe extern fn main() {
+    watchdog::disable();
     clock::configure();
     systick::init();
     port::init();
@@ -102,5 +104,7 @@ pub unsafe extern fn main() {
 
     disable_interrupts();
 
+    clock::reset();
+
     jump_to_application(APPLICATION_ADDR);
 }