From 7199ccacda6bf7df16269067b7134178e239ed90 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <andrew@tridgell.net>
Date: Sun, 11 Feb 2024 13:36:51 +1100
Subject: [PATCH] AP_Bootloader: cope with RAM0_START not matching between bl
 and periph

this allows us to stay in bootloader based solely on RTC_BOOT_CANBL
without the RAM0 area matching between bootloader and periph fw

fixes an issue with current bootloaders where the old bl may not match
current RAM0 value
---
 Tools/AP_Bootloader/AP_Bootloader.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Tools/AP_Bootloader/AP_Bootloader.cpp b/Tools/AP_Bootloader/AP_Bootloader.cpp
index da268f948f6249..b3b9caa5fdd07f 100644
--- a/Tools/AP_Bootloader/AP_Bootloader.cpp
+++ b/Tools/AP_Bootloader/AP_Bootloader.cpp
@@ -136,8 +136,9 @@ int main(void)
     }
 #endif  // AP_CHECK_FIRMWARE_ENABLED
 #ifndef BOOTLOADER_DEV_LIST
-    else if (timeout != 0) {
-        // fast boot for good firmware
+    else if (timeout == HAL_BOOTLOADER_TIMEOUT) {
+        // fast boot for good firmware if we haven't been told to stay
+        // in bootloader
         try_boot = true;
         timeout = 1000;
     }