From 30128517b5397dd9f5ea3a1309c5375b4b908b4b Mon Sep 17 00:00:00 2001
From: Oleg Semyonov <os@openpilot.org>
Date: Sat, 16 Mar 2013 11:44:22 +0200
Subject: [PATCH] Makefile: remove unused USE_I2C option from makefiles

---
 flight/targets/CopterControl/Makefile | 9 +--------
 flight/targets/OSD/Makefile           | 9 ---------
 flight/targets/Revolution/Makefile    | 5 -----
 3 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/flight/targets/CopterControl/Makefile b/flight/targets/CopterControl/Makefile
index a36b60190..1defe2ace 100644
--- a/flight/targets/CopterControl/Makefile
+++ b/flight/targets/CopterControl/Makefile
@@ -32,7 +32,6 @@ USE_CAMERASTAB   ?= YES
 USE_COMUSBBRIDGE ?= YES
 USE_GPS          ?= YES
 USE_TXPID        ?= YES
-USE_I2C          ?= NO
 USE_ALTITUDE     ?= NO
 USE_AUTOTUNE     ?= NO
 TEST_FAULTS      ?= NO
@@ -61,18 +60,12 @@ ifeq ($(USE_COMUSBBRIDGE), YES)
 endif
 ifeq ($(USE_GPS), YES)
     OPTMODULES += GPS
-    CDEFS += -DUSE_GPS
 endif
 ifeq ($(USE_TXPID), YES)
     OPTMODULES += TxPID
 endif
 ifeq ($(USE_ALTITUDE), YES)
-    ifeq ($(USE_I2C), YES)
-        OPTMODULES += Altitude
-        CDEFS += -DUSE_I2C
-    else
-        $(error Altitude module (USE_ALTITUDE=YES) requires i2c (USE_I2C=YES))
-    endif
+    OPTMODULES += Altitude
 endif
 ifeq ($(USE_AUTOTUNE), YES)
     OPTMODULES += Autotune
diff --git a/flight/targets/OSD/Makefile b/flight/targets/OSD/Makefile
index fd3d4f189..926276984 100644
--- a/flight/targets/OSD/Makefile
+++ b/flight/targets/OSD/Makefile
@@ -47,7 +47,6 @@ USE_CAMERASTAB ?= NO
 USE_COMUSBBRIDGE ?= NO
 USE_GPS ?= NO
 USE_TXPID ?= NO
-USE_I2C ?= NO
 USE_ALTITUDE ?= NO
 TEST_FAULTS ?= NO
 USE_MAGBARO ?= NO
@@ -67,21 +66,13 @@ ifeq ($(USE_TXPID), YES)
 OPTMODULES += TxPID
 endif
 ifeq ($(USE_ALTITUDE), YES)
-ifeq ($(USE_I2C), YES)
 OPTMODULES += Altitude
-else
-$(error "Altitude module (USE_ALTITUDE=YES) requires i2c (USE_I2C=YES)")
-endif
 endif
 ifeq ($(TEST_FAULTS), YES)
 OPTMODULES += Fault
 endif
 ifeq ($(USE_MAGBARO), YES)
-ifeq ($(USE_I2C), YES)
 OPTMODULES += Extensions/MagBaro
-else
-$(error "MagBaro module (USE_MAGBARO=YES) requires i2c (USE_I2C=YES)")
-endif
 endif
 
 # List of mandatory modules to include
diff --git a/flight/targets/Revolution/Makefile b/flight/targets/Revolution/Makefile
index 5e85dc504..2d120a6c7 100644
--- a/flight/targets/Revolution/Makefile
+++ b/flight/targets/Revolution/Makefile
@@ -45,7 +45,6 @@ FLASH_TOOL = OPENOCD
 # Optional module and driver defaults
 USE_COMUSBBRIDGE ?= NO
 USE_TXPID ?= NO
-USE_I2C ?= NO
 USE_ALTITUDE ?= NO
 TEST_FAULTS ?= NO
 USE_MAGBARO ?= NO
@@ -62,11 +61,7 @@ ifeq ($(TEST_FAULTS), YES)
 OPTMODULES += Fault
 endif
 ifeq ($(USE_MAGBARO), YES)
-ifeq ($(USE_I2C), YES)
 OPTMODULES += Extensions/MagBaro
-else
-$(error "MagBaro module (USE_MAGBARO=YES) requires i2c (USE_I2C=YES)")
-endif
 endif
 
 # List of modules to include