From 84e578b3df9e6e3d08eb12f790e758a9232f26d1 Mon Sep 17 00:00:00 2001
From: Tom Pittenger <tom.pittenger@krausaerospace.com>
Date: Tue, 15 Dec 2020 16:08:59 -0800
Subject: [PATCH] AP_Bootloader: respect HAL_BOOTLOADER_TIMEOUT when CAN and
 SERIAL/USB is enabled

---
 Tools/AP_Bootloader/AP_Bootloader.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Tools/AP_Bootloader/AP_Bootloader.cpp b/Tools/AP_Bootloader/AP_Bootloader.cpp
index 500eacab60..1ce163b47e 100644
--- a/Tools/AP_Bootloader/AP_Bootloader.cpp
+++ b/Tools/AP_Bootloader/AP_Bootloader.cpp
@@ -90,11 +90,14 @@ int main(void)
         // bad firmware CRC, don't try and boot
         timeout = 0;
         try_boot = false;
-    } else if (timeout != 0) {
+    }
+#ifndef BOOTLOADER_DEV_LIST
+    else if (timeout != 0) {
         // fast boot for good firmware
         try_boot = true;
         timeout = 1000;
     }
+#endif
     if (was_watchdog && m != RTC_BOOT_FWOK) {
         // we've had a watchdog within 30s of booting main CAN
         // firmware. We will stay in bootloader to allow the user to