i2c: Clean drivers/i2c/ Makefile

Signed-off-by: Michal Simek <monstr@monstr.eu>

diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
index 534c015191c086387a779f03e440d3015e7d6178..1f25afb0ad7fb947f2e86653bd0752588bb49b8e 100644 (file)
--- a/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
@@ -25,11 +25,11 @@ include $(TOPDIR)/config.mk
 
 LIB    := $(obj)libi2c.a
 
-COBJS-y += fsl_i2c.o
-COBJS-y += omap1510_i2c.o
-COBJS-y += omap24xx_i2c.o
-COBJS-y += tsi108_i2c.o
-COBJS-y += mxc_i2c.o
+COBJS-$(CONFIG_FSL_I2C) += fsl_i2c.o
+COBJS-$(CONFIG_I2C_MXC) += mxc_i2c.o
+COBJS-$(CONFIG_DRIVER_OMAP1510_I2C) += omap1510_i2c.o
+COBJS-$(CONFIG_DRIVER_OMAP24XX_I2C) += omap24xx_i2c.o
+COBJS-$(CONFIG_TSI108_I2C) += tsi108_i2c.o
 
 COBJS  := $(COBJS-y)
 SRCS   := $(COBJS:.o=.c)

diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c
index 3f78e2f5c84bcc60ed7e4f4f2d1f4002e1438164..b7b3a75bc952700ef9a64e365281e75a09578d00 100644 (file)
--- a/drivers/i2c/fsl_i2c.c
+++ b/drivers/i2c/fsl_i2c.c
@@ -18,7 +18,6 @@
 
 #include <common.h>
 
-#ifdef CONFIG_FSL_I2C
 #ifdef CONFIG_HARD_I2C
 
 #include <command.h>
@@ -391,4 +390,3 @@ unsigned int i2c_get_bus_speed(void)
 }
 
 #endif /* CONFIG_HARD_I2C */
-#endif /* CONFIG_FSL_I2C */

diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index a21832944d2db14f01d383e19df3e239beeab175..1f6ba1f390c56d2c926bf02b376ac50a76ec20e1 100644 (file)
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -24,7 +24,7 @@
 
 #include <common.h>
 
-#if defined(CONFIG_HARD_I2C) && defined (CONFIG_I2C_MXC)
+#if defined(CONFIG_HARD_I2C)
 
 #include <asm/arch/mx31.h>
 #include <asm/arch/mx31-regs.h>

diff --git a/drivers/i2c/omap1510_i2c.c b/drivers/i2c/omap1510_i2c.c
index 04400fbcd2355ca35c7fb0918e5d7845f3b1f406..388951db1f46a18d54af9f29d2af740859c37791 100644 (file)
--- a/drivers/i2c/omap1510_i2c.c
+++ b/drivers/i2c/omap1510_i2c.c
@@ -20,8 +20,6 @@
 
 #include <common.h>
 
-#ifdef CONFIG_DRIVER_OMAP1510_I2C
-
 static void wait_for_bb (void);
 static u16 wait_for_pin (void);
 
@@ -277,5 +275,3 @@ static u16 wait_for_pin (void)
 
        return status;
 }
-
-#endif /* CONFIG_DRIVER_OMAP1510_I2C */

diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
index 7dab78685dfb44102295a2cf138d49f48118b9ac..d16cfb123f51b17865ef3955dee37eb0e988a1f4 100644 (file)
--- a/drivers/i2c/omap24xx_i2c.c
+++ b/drivers/i2c/omap24xx_i2c.c
@@ -22,8 +22,6 @@
 
 #include <common.h>
 
-#ifdef CONFIG_DRIVER_OMAP24XX_I2C
-
 #include <asm/arch/i2c.h>
 #include <asm/io.h>
 
@@ -325,5 +323,3 @@ static u16 wait_for_pin (void)
 }
        return status;
 }
-
-#endif /* CONFIG_DRIVER_OMAP24XX_I2C */

diff --git a/drivers/i2c/tsi108_i2c.c b/drivers/i2c/tsi108_i2c.c
index d6736b0477e663d8d4eafb6e65007175d3049042..695e393417e9587d977a1616c30f6bb66ad69cb8 100644 (file)
--- a/drivers/i2c/tsi108_i2c.c
+++ b/drivers/i2c/tsi108_i2c.c
@@ -25,7 +25,6 @@
 #include <config.h>
 #include <common.h>
 
-#ifdef CONFIG_TSI108_I2C
 #include <tsi108.h>
 
 #if defined(CONFIG_CMD_I2C)
@@ -280,4 +279,3 @@ int i2c_probe (uchar chip)
 }
 
 #endif
-#endif /* CONFIG_TSI108_I2C */