diff --git a/libraries/AP_HAL/AP_HAL_Boards.h b/libraries/AP_HAL/AP_HAL_Boards.h
index ff10481cd1..94cc182e38 100644
--- a/libraries/AP_HAL/AP_HAL_Boards.h
+++ b/libraries/AP_HAL/AP_HAL_Boards.h
@@ -68,10 +68,6 @@
 #define HAL_COMPASS_HIL       3
 #define HAL_COMPASS_VRBRAIN   4
 
-// storage devices
-#define USE_FS      1
-#define USE_FRAM    2
-
 /**
    CPU classes, used to select if CPU intensive algorithms should be used
 
@@ -188,14 +184,12 @@
 #define HAL_INS_DEFAULT HAL_INS_HIL
 #define HAL_BARO_DEFAULT HAL_BARO_HIL
 #define HAL_COMPASS_DEFAULT HAL_COMPASS_HIL
-#define HAL_STORAGE USE_FS
 #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_PXF || CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_ERLE
 #define HAL_BOARD_LOG_DIRECTORY "/var/APM/logs"
 #define HAL_BOARD_TERRAIN_DIRECTORY "/var/APM/terrain"
 #define HAL_INS_DEFAULT HAL_INS_MPU9250
 #define HAL_BARO_DEFAULT HAL_BARO_MS5611_SPI
 #define HAL_COMPASS_DEFAULT HAL_COMPASS_HMC5843
-#define HAL_STORAGE USE_FRAM
 #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NAVIO
 #define HAL_BOARD_LOG_DIRECTORY "/var/APM/logs"
 #define HAL_INS_DEFAULT HAL_INS_MPU9250
diff --git a/libraries/AP_HAL_Linux/Storage.h b/libraries/AP_HAL_Linux/Storage.h
index 40e9b05006..8ac7dbf802 100644
--- a/libraries/AP_HAL_Linux/Storage.h
+++ b/libraries/AP_HAL_Linux/Storage.h
@@ -1,10 +1,18 @@
 #ifndef __AP_HAL_LINUX_STORAGE_H__
 #define __AP_HAL_LINUX_STORAGE_H__
 
-#if HAL_STORAGE == USE_FRAM
+#if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_ERLE || CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_PXF
+#define LINUX_STORAGE_USE_FRAM 1
+#else
+#define LINUX_STORAGE_USE_FRAM 0
+#endif
+
+
+#if LINUX_STORAGE_USE_FRAM
 #include "Storage_FRAM.h"
 #else
 #include "Storage_FS.h"
 #endif
 
-#endif
+#endif // __AP_HAL_LINUX_STORAGE_H__
+
diff --git a/libraries/AP_HAL_Linux/Storage_FRAM.cpp b/libraries/AP_HAL_Linux/Storage_FRAM.cpp
index c1bbaec5f7..30d36438a5 100644
--- a/libraries/AP_HAL_Linux/Storage_FRAM.cpp
+++ b/libraries/AP_HAL_Linux/Storage_FRAM.cpp
@@ -1,6 +1,7 @@
 #include <AP_HAL.h>
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX && HAL_STORAGE == USE_FRAM
+#include "Storage.h"
 
+#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX && LINUX_STORAGE_USE_FRAM
 #include <assert.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -9,8 +10,6 @@
 #include <errno.h>
 #include <stdio.h>
 
-#include "Storage_FRAM.h"
-
 using namespace Linux;
 
 /*
diff --git a/libraries/AP_HAL_Linux/Storage_FS.cpp b/libraries/AP_HAL_Linux/Storage_FS.cpp
index 769a84f70a..596052ea92 100644
--- a/libraries/AP_HAL_Linux/Storage_FS.cpp
+++ b/libraries/AP_HAL_Linux/Storage_FS.cpp
@@ -1,5 +1,7 @@
 #include <AP_HAL.h>
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX && HAL_STORAGE == USE_FS
+#include "Storage.h"
+
+#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX && !LINUX_STORAGE_USE_FRAM
 
 #include <assert.h>
 #include <sys/types.h>
@@ -9,7 +11,6 @@
 #include <errno.h>
 #include <stdio.h>
 
-#include "Storage_FS.h"
 using namespace Linux;
 
 /*