From d005f066a94f339ced249ac89983b9133c3ed347 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <andrew@tridgell.net>
Date: Mon, 27 May 2019 11:31:16 +1000
Subject: [PATCH] StorageManager: enable use of a single storage region

---
 libraries/StorageManager/StorageManager.cpp | 11 ++++++++++-
 libraries/StorageManager/StorageManager.h   |  2 ++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/libraries/StorageManager/StorageManager.cpp b/libraries/StorageManager/StorageManager.cpp
index e3178349d9..2d8e90eedc 100644
--- a/libraries/StorageManager/StorageManager.cpp
+++ b/libraries/StorageManager/StorageManager.cpp
@@ -30,6 +30,15 @@ extern const AP_HAL::HAL& hal;
   compatibility with older firmwares
  */
 
+#if STORAGE_NUM_AREAS == 1
+/*
+  layout for peripherals
+ */
+const StorageManager::StorageArea StorageManager::layout_default[STORAGE_NUM_AREAS] = {
+    { StorageParam,   0,     HAL_STORAGE_SIZE}
+};
+
+#else
 /*
   layout for fixed wing and rovers
   On PX4v1 this gives 309 waypoints, 30 rally points and 52 fence points
@@ -60,7 +69,6 @@ const StorageManager::StorageArea StorageManager::layout_default[STORAGE_NUM_ARE
 #endif
 };
 
-
 /*
   layout for copter.
   On PX4v1 this gives 303 waypoints, 26 rally points and 38 fence points
@@ -90,6 +98,7 @@ const StorageManager::StorageArea StorageManager::layout_copter[STORAGE_NUM_AREA
     { StorageMission, 10028,  6228}, // leave 128 byte gap for expansion
 #endif
 };
+#endif // STORAGE_NUM_AREAS == 1
 
 // setup default layout
 const StorageManager::StorageArea *StorageManager::layout = layout_default;
diff --git a/libraries/StorageManager/StorageManager.h b/libraries/StorageManager/StorageManager.h
index 7611e8bd74..0a26cb7c25 100644
--- a/libraries/StorageManager/StorageManager.h
+++ b/libraries/StorageManager/StorageManager.h
@@ -34,6 +34,8 @@
 #define STORAGE_NUM_AREAS 10
 #elif HAL_STORAGE_SIZE >= 4096
 #define STORAGE_NUM_AREAS 4
+#elif HAL_STORAGE_SIZE > 0
+#define STORAGE_NUM_AREAS 1
 #else
 #error "Unsupported storage size"
 #endif