common: Move panic handler out of libcommon.

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

diff --git a/src/bootloader/main.rs b/src/bootloader/main.rs
index a5fe9832d30a7cf6d18ed9ca3e130e5477818163..2ce598050464a12deedb8c32c94153ca319f653e 100644 (file)
--- a/src/bootloader/main.rs
+++ b/src/bootloader/main.rs
@@ -22,7 +22,7 @@
  */
 
 #![no_std]
-#![crate_type="staticlib"]
+#![no_main]
 #[link(name="libcommon.rlib")]
 
 extern crate common;
@@ -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")]
@@ -83,8 +83,15 @@ fn bootloader_requested() -> bool {
     false
 }
 
+#[inline(never)]
+#[panic_handler]
+fn panic(_info: &core::panic::PanicInfo) -> ! {
+    loop {
+    }
+}
+
 #[no_mangle]
-pub unsafe extern fn main() {
+pub unsafe extern "C" fn _start() -> ! {
     watchdog::disable();
     clock::configure();
     systick::init();