From 604a0df7017dbd66c164d4fb549ff896939b65b9 Mon Sep 17 00:00:00 2001
From: Gautier Hattenberger <gautier.hattenberger@enac.fr>
Date: Tue, 20 Sep 2016 17:21:05 +0200
Subject: [PATCH] [fix] remove unused i2c dev from aspirin_2 and lisa_s conf

this was produce a strange side effect on bluegiga module (#1835)
---
 conf/modules/imu_aspirin_v2_common.xml | 4 ----
 conf/modules/imu_lisa_s_v1.0.xml       | 3 +--
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/conf/modules/imu_aspirin_v2_common.xml b/conf/modules/imu_aspirin_v2_common.xml
index 6fd88bb652..3edb2191c0 100644
--- a/conf/modules/imu_aspirin_v2_common.xml
+++ b/conf/modules/imu_aspirin_v2_common.xml
@@ -7,7 +7,6 @@
       - Accelerometer/Gyroscope: MPU6000 via SPI
       - Magnetometer: HMC5883 as I2C slave of MPU
     </description>
-    <configure name="ASPIRIN_2_I2C_DEV" value="i2c2" description="I2C device to use"/>
     <configure name="ASPIRIN_2_SPI_DEV" value="spi2" description="SPI device to use for accel"/>
     <configure name="ASPIRIN_2_SPI_SLAVE_IDX" value="SPI_SLAVE2" description="slave index of the accel CS pin"/>
     <define name="ASPIRIN_2_DISABLE_MAG" value="FALSE" description="set to TRUE to disable the mag on Aspirin"/>
@@ -31,12 +30,9 @@
   <event fun="imu_aspirin2_event()"/>
   <makefile target="!sim|nps|fbw">
     <!-- default for stm32, do we want to provide i2c0,spi1,SPI_SLAVE0 defaults for lpc again?-->
-    <configure name="ASPIRIN_2_I2C_DEV" default="i2c2" case="lower|upper"/>
     <configure name="ASPIRIN_2_SPI_DEV" default="spi2" case="lower|upper"/>
     <configure name="ASPIRIN_2_SPI_SLAVE_IDX" default="SPI_SLAVE2"/>
 
-    <define name="ASPIRIN_2_I2C_DEV" value="$(ASPIRIN_2_I2C_DEV_LOWER)"/>
-    <define name="USE_$(ASPIRIN_2_I2C_DEV_UPPER)"/>
     <define name="ASPIRIN_2_SPI_DEV" value="$(ASPIRIN_2_SPI_DEV_LOWER)"/>
     <define name="USE_$(ASPIRIN_2_SPI_DEV_UPPER)"/>
     <define name="ASPIRIN_2_SPI_SLAVE_IDX" value="$(ASPIRIN_2_SPI_SLAVE_IDX)"/>
diff --git a/conf/modules/imu_lisa_s_v1.0.xml b/conf/modules/imu_lisa_s_v1.0.xml
index 7641305b51..22125737a8 100644
--- a/conf/modules/imu_lisa_s_v1.0.xml
+++ b/conf/modules/imu_lisa_s_v1.0.xml
@@ -18,8 +18,7 @@
   </doc>
   <autoload name="imu_aspirin_v2_common"/>
   <makefile target="!sim|nps|fbw">
-    <configure name="ASPIRIN_2_I2C_DEV" value="i2c2"/>
-    <configure name="ASPIRIN_2_SPI_DEV" value="spi1"/>
+    <configure name="ASPIRIN_2_SPI_DEV" value="spi1" case="lower|upper"/>
     <configure name="ASPIRIN_2_SPI_SLAVE_IDX" value="SPI_SLAVE0"/>
     <!-- SLAVE0 is on PA4 (NSS) (MPU600 CS) -->
     <define name="USE_SPI_SLAVE0"/>