Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

[u-boot] / board / cm_t35 / Makefile

diff --git a/board/cm_t35/Makefile b/board/cm_t35/Makefile
index 27693f07ac1dc40893aaeb7115189db685d4a560..bde56e61f4178c76e4ac860fde3edfa445bce413 100644 (file)
--- a/board/cm_t35/Makefile
+++ b/board/cm_t35/Makefile
@@ -25,7 +25,10 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(BOARD).o
 
-COBJS  := cm_t35.o leds.o
+COBJS-$(CONFIG_DRIVER_OMAP34XX_I2C) += eeprom.o
+COBJS-$(CONFIG_LCD) += display.o
+
+COBJS  := cm_t35.o leds.o $(COBJS-y)
 
 SRCS   := $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS))