AP_Common: allow build for bootloader

tridge · May 27, 2024 · 061ea49 · 061ea49
1 parent 0d1dd8b
commit 061ea49
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/libraries/AP_Common/AP_ExpandingArray.cpp b/libraries/AP_Common/AP_ExpandingArray.cpp
@@ -16,6 +16,8 @@
 #include "AP_ExpandingArray.h"
 #include <AP_HAL/AP_HAL.h>
 
+#ifndef HAL_BOOTLOADER_BUILD
+
 extern const AP_HAL::HAL& hal;
 
 AP_ExpandingArrayGeneric::~AP_ExpandingArrayGeneric(void)
@@ -75,3 +77,5 @@ bool AP_ExpandingArrayGeneric::expand_to_hold(uint16_t num_items)
     uint16_t chunks_required = ((num_items - max_items()) / chunk_size) + 1;
     return expand(chunks_required);
 }
+
+#endif // HAL_BOOTLOADER_BUILD
diff --git a/libraries/AP_Common/ExpandingString.cpp b/libraries/AP_Common/ExpandingString.cpp
@@ -17,9 +17,10 @@
  */
 
 #include "ExpandingString.h"
-
 #include <AP_HAL/AP_HAL.h>
 
+#ifndef HAL_BOOTLOADER_BUILD
+
 extern const AP_HAL::HAL& hal;
 
 #define EXPAND_INCREMENT 512
@@ -127,3 +128,5 @@ void ExpandingString::set_buffer(char *s, uint32_t total_len, uint32_t used_len)
     allocation_failed = false;
     external_buffer = true;
 }
+
+#endif // HAL_BOOTLOADER_BUILD
diff --git a/libraries/AP_Common/Location.cpp b/libraries/AP_Common/Location.cpp
@@ -4,6 +4,8 @@
 
 #include "Location.h"
 
+#ifndef HAL_BOOTLOADER_BUILD
+
 #include <AP_AHRS/AP_AHRS.h>
 #include <AP_Terrain/AP_Terrain.h>
 
@@ -527,3 +529,5 @@ void Location::linearly_interpolate_alt(const Location &point1, const Location &
     // new target's distance along the original track and then linear interpolate between the original origin and destination altitudes
     set_alt_cm(point1.alt + (point2.alt - point1.alt) * constrain_float(line_path_proportion(point1, point2), 0.0f, 1.0f), point2.get_alt_frame());
 }
+
+#endif // HAL_BOOTLOADER_BUILD
diff --git a/libraries/AP_Common/MultiHeap.cpp b/libraries/AP_Common/MultiHeap.cpp
@@ -10,6 +10,8 @@
 
 #include "MultiHeap.h"
 
+#ifndef HAL_BOOTLOADER_BUILD
+
 /*
   on ChibiOS allow up to 4 heaps. On other HALs only allow a single
   heap. This is needed as hal.util->heap_realloc() needs to have the
@@ -141,3 +143,6 @@ void *MultiHeap::change_size(void *ptr, uint32_t old_size, uint32_t new_size)
     */
     return hal.util->heap_realloc(heaps[0], ptr, old_size, new_size);
 }
+
+#endif // HAL_BOOTLOADER_BUILD
+