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

[oweals/u-boot.git] / board / ads5121 / Makefile

diff --git a/board/ads5121/Makefile b/board/ads5121/Makefile
index cd8148c43ea33828245e76e5475aa9f87de9ef9d..f4dacce285b13481f8d2e3bf27d6214f537c39d1 100644 (file)
--- a/board/ads5121/Makefile
+++ b/board/ads5121/Makefile
@@ -23,10 +23,17 @@
 
 include $(TOPDIR)/config.mk
 
+$(shell mkdir -p $(OBJTREE)/board/freescale/common)
+
 LIB    = $(obj)lib$(BOARD).a
 
-COBJS  := $(BOARD).o
+COBJS-y        := $(BOARD).o
+COBJS-${CONFIG_FSL_DIU_FB} += ads5121_diu.o
+COBJS-${CONFIG_FSL_DIU_FB} += ../freescale/common/fsl_diu_fb.o
+COBJS-${CONFIG_FSL_DIU_FB} += ../freescale/common/fsl_logo_bmp.o
+COBJS-$(CONFIG_PCI) += pci.o
 
+COBJS  := $(COBJS-y)
 SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS))
 SOBJS  := $(addprefix $(obj),$(SOBJS))