[U-Boot-Users] [PATCH 01/11] i2c: Clean drivers/i2c/ Makefile

monstr at seznam.cz
2008-07-14T17:45:35Z

From: Michal Simek <monstr@monstr.eu>

Signed-off-by: Michal Simek <monstr@monstr.eu>
---
drivers/i2c/Makefile | 10 +++++-----
drivers/i2c/fsl_i2c.c | 2 --
drivers/i2c/mxc_i2c.c | 2 +-
drivers/i2c/omap1510_i2c.c | 4 ----
drivers/i2c/omap24xx_i2c.c | 4 ----
drivers/i2c/tsi108_i2c.c | 2 --
6 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
index 534c015..1f25afb 100644
--- 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 9f2c1ec..688f66a 100644
--- 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>
@@ -387,4 +386,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 a218329..1f6ba1f 100644
--- 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 04400fb..388951d 100644
--- 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 7dab786..d16cfb1 100644
--- 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 d6736b0..695e393 100644
--- 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 */
--
1.5.4.GIT