diff --git a/libraries/AP_HAL_Linux/AP_HAL_Linux.h b/libraries/AP_HAL_Linux/AP_HAL_Linux.h
index 1b25167647..16f4f44fec 100644
--- a/libraries/AP_HAL_Linux/AP_HAL_Linux.h
+++ b/libraries/AP_HAL_Linux/AP_HAL_Linux.h
@@ -27,7 +27,7 @@
  * `void setup()` and `void loop()`, ala Arduino.
  */
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX || CONFIG_HAL_BOARD == HAL_BOARD_ERLE 
+#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 
 #include "HAL_Linux_Class.h"
 #include "AP_HAL_Linux_Main.h"
diff --git a/libraries/AP_HAL_Linux/AP_HAL_Linux_Main.h b/libraries/AP_HAL_Linux/AP_HAL_Linux_Main.h
index cbff61262d..5a5fd23c47 100644
--- a/libraries/AP_HAL_Linux/AP_HAL_Linux_Main.h
+++ b/libraries/AP_HAL_Linux/AP_HAL_Linux_Main.h
@@ -3,7 +3,7 @@
 #ifndef __AP_HAL_LINUX_MAIN_H__
 #define __AP_HAL_LINUX_MAIN_H__
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX || CONFIG_HAL_BOARD == HAL_BOARD_ERLE 
+#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 #define AP_HAL_MAIN() extern "C" {\
 int main (int argc, char * const argv[]) {        \
 	hal.init(argc, argv);			\
@@ -13,6 +13,6 @@ int main (int argc, char * const argv[]) {        \
         return 0;\
     }\
     }
-#endif // HAL_BOARD_LINUX || HAL_BOARD_ERLE
+#endif // HAL_BOARD_LINUX
 
 #endif // __AP_HAL_LINUX_MAIN_H__
diff --git a/libraries/AP_HAL_Linux/AnalogIn.cpp b/libraries/AP_HAL_Linux/AnalogIn.cpp
index aa3b7f0b4c..f919b62c14 100644
--- a/libraries/AP_HAL_Linux/AnalogIn.cpp
+++ b/libraries/AP_HAL_Linux/AnalogIn.cpp
@@ -1,6 +1,6 @@
 #include <AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX || CONFIG_HAL_BOARD == HAL_BOARD_ERLE
+#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 #include "AnalogIn.h"
 
 using namespace Linux;
diff --git a/libraries/AP_HAL_Linux/GPIO.cpp b/libraries/AP_HAL_Linux/GPIO.cpp
index 4974ac92c2..95e83e19b0 100644
--- a/libraries/AP_HAL_Linux/GPIO.cpp
+++ b/libraries/AP_HAL_Linux/GPIO.cpp
@@ -1,6 +1,6 @@
 #include <AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX || CONFIG_HAL_BOARD == HAL_BOARD_ERLE
+#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 
 #include "GPIO.h"
 #include <stdio.h>
diff --git a/libraries/AP_HAL_Linux/HAL_Linux_Class.cpp b/libraries/AP_HAL_Linux/HAL_Linux_Class.cpp
index 92b129d2ae..26d5d0e9da 100644
--- a/libraries/AP_HAL_Linux/HAL_Linux_Class.cpp
+++ b/libraries/AP_HAL_Linux/HAL_Linux_Class.cpp
@@ -1,5 +1,5 @@
 #include <AP_HAL.h>
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX || CONFIG_HAL_BOARD == HAL_BOARD_ERLE
+#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 
 #include "HAL_Linux_Class.h"
 #include "AP_HAL_Linux_Private.h"
diff --git a/libraries/AP_HAL_Linux/I2CDriver.cpp b/libraries/AP_HAL_Linux/I2CDriver.cpp
index 6b7eb90350..9b05af1025 100644
--- a/libraries/AP_HAL_Linux/I2CDriver.cpp
+++ b/libraries/AP_HAL_Linux/I2CDriver.cpp
@@ -1,7 +1,7 @@
 
 #include <AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX || CONFIG_HAL_BOARD == HAL_BOARD_ERLE
+#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 #include "I2CDriver.h"
 
 #include <sys/types.h>
@@ -13,9 +13,12 @@
 #include <linux/i2c-dev.h>
 #ifndef I2C_SMBUS_BLOCK_MAX
 #include <linux/i2c.h>
-#define I2C_DATA_TYPE __u8
-#else
+#endif
+
+#if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NONE
 #define I2C_DATA_TYPE char
+#else
+#define I2C_DATA_TYPE __u8
 #endif
 
 using namespace Linux;
@@ -182,7 +185,7 @@ uint8_t LinuxI2CDriver::readRegistersMultiple(uint8_t addr, uint8_t reg,
             msgs[i*2].addr = addr;
             msgs[i*2].flags = 0;
             msgs[i*2].len = 1;
-            msgs[i*2].buf = &reg;
+            msgs[i*2].buf = (I2C_DATA_TYPE *)&reg;
             msgs[i*2+1].addr = addr;
             msgs[i*2+1].flags = I2C_M_RD;
             msgs[i*2+1].len = len;
diff --git a/libraries/AP_HAL_Linux/RCInput.cpp b/libraries/AP_HAL_Linux/RCInput.cpp
index 0dc4586fd6..652ea8db57 100644
--- a/libraries/AP_HAL_Linux/RCInput.cpp
+++ b/libraries/AP_HAL_Linux/RCInput.cpp
@@ -1,6 +1,6 @@
 #include <AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX || CONFIG_HAL_BOARD == HAL_BOARD_ERLE
+#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 
 #include "RCInput.h"
 
diff --git a/libraries/AP_HAL_Linux/RCOutput.cpp b/libraries/AP_HAL_Linux/RCOutput.cpp
index 3eba24f1e4..c9639eeba0 100644
--- a/libraries/AP_HAL_Linux/RCOutput.cpp
+++ b/libraries/AP_HAL_Linux/RCOutput.cpp
@@ -1,7 +1,7 @@
 
 #include <AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX || CONFIG_HAL_BOARD == HAL_BOARD_ERLE
+#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 
 #include "RCOutput.h"
 #include <sys/types.h>
diff --git a/libraries/AP_HAL_Linux/SPIDriver.cpp b/libraries/AP_HAL_Linux/SPIDriver.cpp
index 14d548e348..004231e309 100644
--- a/libraries/AP_HAL_Linux/SPIDriver.cpp
+++ b/libraries/AP_HAL_Linux/SPIDriver.cpp
@@ -1,6 +1,6 @@
 #include <AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX || CONFIG_HAL_BOARD == HAL_BOARD_ERLE
+#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 #include "SPIDriver.h"
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/libraries/AP_HAL_Linux/Scheduler.cpp b/libraries/AP_HAL_Linux/Scheduler.cpp
index cc84e81b82..9477155978 100644
--- a/libraries/AP_HAL_Linux/Scheduler.cpp
+++ b/libraries/AP_HAL_Linux/Scheduler.cpp
@@ -1,6 +1,6 @@
 #include <AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX || CONFIG_HAL_BOARD == HAL_BOARD_ERLE
+#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 
 #include "Scheduler.h"
 #include "Storage.h"
diff --git a/libraries/AP_HAL_Linux/Scheduler.h b/libraries/AP_HAL_Linux/Scheduler.h
index 8d5064f172..0e86a689e2 100644
--- a/libraries/AP_HAL_Linux/Scheduler.h
+++ b/libraries/AP_HAL_Linux/Scheduler.h
@@ -4,7 +4,7 @@
 
 #include <AP_HAL_Linux.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX || CONFIG_HAL_BOARD == HAL_BOARD_ERLE
+#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 #include <sys/time.h>
 #include <pthread.h>
 
diff --git a/libraries/AP_HAL_Linux/Semaphores.cpp b/libraries/AP_HAL_Linux/Semaphores.cpp
index 5b6f4a475d..5b6a918ab7 100644
--- a/libraries/AP_HAL_Linux/Semaphores.cpp
+++ b/libraries/AP_HAL_Linux/Semaphores.cpp
@@ -1,6 +1,6 @@
 #include <AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX || CONFIG_HAL_BOARD == HAL_BOARD_ERLE
+#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 
 #include "Semaphores.h"
 
diff --git a/libraries/AP_HAL_Linux/Semaphores.h b/libraries/AP_HAL_Linux/Semaphores.h
index c39b2d884c..7828cbf0e1 100644
--- a/libraries/AP_HAL_Linux/Semaphores.h
+++ b/libraries/AP_HAL_Linux/Semaphores.h
@@ -4,7 +4,7 @@
 
 #include <AP_HAL_Boards.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX || CONFIG_HAL_BOARD == HAL_BOARD_ERLE
+#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 #include <AP_HAL_Linux.h>
 #include <pthread.h>
 
diff --git a/libraries/AP_HAL_Linux/Storage.cpp b/libraries/AP_HAL_Linux/Storage.cpp
index cf2d69acff..8d2f26a15d 100644
--- a/libraries/AP_HAL_Linux/Storage.cpp
+++ b/libraries/AP_HAL_Linux/Storage.cpp
@@ -1,5 +1,5 @@
 #include <AP_HAL.h>
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX || CONFIG_HAL_BOARD == HAL_BOARD_ERLE
+#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 
 #include <assert.h>
 #include <sys/types.h>
diff --git a/libraries/AP_HAL_Linux/UARTDriver.cpp b/libraries/AP_HAL_Linux/UARTDriver.cpp
index 2c47b9e036..9a03cd54cc 100644
--- a/libraries/AP_HAL_Linux/UARTDriver.cpp
+++ b/libraries/AP_HAL_Linux/UARTDriver.cpp
@@ -1,6 +1,6 @@
 #include <AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX || CONFIG_HAL_BOARD == HAL_BOARD_ERLE
+#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 
 #include "UARTDriver.h"
 
diff --git a/libraries/AP_HAL_Linux/Util.cpp b/libraries/AP_HAL_Linux/Util.cpp
index 94c817545b..c0b075f351 100644
--- a/libraries/AP_HAL_Linux/Util.cpp
+++ b/libraries/AP_HAL_Linux/Util.cpp
@@ -1,5 +1,5 @@
 #include <AP_HAL.h>
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX || CONFIG_HAL_BOARD == HAL_BOARD_ERLE
+#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 #include <stdio.h>
 #include <stdarg.h>
 #include <unistd.h>
@@ -20,4 +20,4 @@ void LinuxUtil::commandline_arguments(uint8_t &argc, char * const *&argv)
     argv = saved_argv;
 }
 
-#endif // CONFIG_HAL_BOARD == HAL_BOARD_LINUX || CONFIG_HAL_BOARD == HAL_BOARD_ERLE
+#endif // CONFIG_HAL_BOARD == HAL_BOARD_LINUX