From 28ad2287c8153dd59f3eee01beac2ae502f7b4e4 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <andrew@tridgell.net>
Date: Wed, 27 Jun 2018 20:59:07 +1000
Subject: [PATCH] AP_Bootloader: for fast boot don't init USB

---
 Tools/AP_Bootloader/AP_Bootloader.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Tools/AP_Bootloader/AP_Bootloader.cpp b/Tools/AP_Bootloader/AP_Bootloader.cpp
index 421a7b3c15..417a39ced1 100644
--- a/Tools/AP_Bootloader/AP_Bootloader.cpp
+++ b/Tools/AP_Bootloader/AP_Bootloader.cpp
@@ -42,8 +42,6 @@ struct boardinfo board_info;
 
 int main(void)
 {
-    init_uarts();
-
     board_info.board_type = APJ_BOARD_ID;
     board_info.board_rev = 0;
     board_info.fw_size = (BOARD_FLASH_SIZE - FLASH_BOOTLOADER_LOAD_KB)*1024;
@@ -51,8 +49,6 @@ int main(void)
         board_info.fw_size = (1024 - FLASH_BOOTLOADER_LOAD_KB)*1024;        
     }
 
-    flash_init();
-
     bool try_boot = false;
     uint32_t timeout = HAL_BOOTLOADER_TIMEOUT;
 
@@ -71,6 +67,9 @@ int main(void)
     if (try_boot) {
         jump_to_app();
     }
+
+    init_uarts();
+    flash_init();
     
     while (true) {
         bootloader(timeout);