Merge branch 'master' of git://git.denx.de/u-boot-blackfin

[platform/kernel/u-boot.git] / board / freescale / common / Makefile

diff --git a/board/freescale/common/Makefile b/board/freescale/common/Makefile
index 9cee9f1..620eb16 100644 (file)
--- a/board/freescale/common/Makefile
+++ b/board/freescale/common/Makefile
@@ -29,14 +29,22 @@ endif
 
 LIB    = $(obj)lib$(VENDOR).a
 
-COBJS  := sys_eeprom.o \
-          pixis.o      \
-          pq-mds-pib.o \
-          fsl_logo_bmp.o \
-          fsl_diu_fb.o
-
-SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS   := $(addprefix $(obj),$(COBJS))
+COBJS-${CONFIG_FSL_CADMUS}     += cadmus.o
+COBJS-${CONFIG_FSL_VIA}                += cds_via.o
+COBJS-${CONFIG_FSL_DIU_FB}     += fsl_diu_fb.o fsl_logo_bmp.o
+COBJS-${CONFIG_FSL_PIXIS}      += pixis.o
+COBJS-${CONFIG_FSL_NGPIXIS}    += ngpixis.o
+COBJS-${CONFIG_PQ_MDS_PIB}     += pq-mds-pib.o
+COBJS-${CONFIG_ID_EEPROM}      += sys_eeprom.o
+COBJS-${CONFIG_FSL_SGMII_RISER}        += sgmii_riser.o
+
+COBJS-${CONFIG_MPC8541CDS}     += cds_pci_ft.o
+COBJS-${CONFIG_MPC8548CDS}     += cds_pci_ft.o
+COBJS-${CONFIG_MPC8555CDS}     += cds_pci_ft.o
+
+
+SRCS   := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
+OBJS   := $(addprefix $(obj),$(COBJS-y))
 SOBJS  := $(addprefix $(obj),$(SOBJS))
 
 $(LIB):        $(obj).depend $(OBJS)
@@ -46,7 +54,7 @@ clean:
        rm -f $(SOBJS) $(OBJS)
 
 distclean:     clean
-       rm -f $(LIB) core *.bak .depend
+       rm -f $(LIB) core *.bak $(obj).depend
 
 #########################################################################