projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash
[oweals/u-boot.git]
/
drivers
/
block
/
Makefile
diff --git
a/drivers/block/Makefile
b/drivers/block/Makefile
index a09cd2a603b1661b7a4f625c9e8d83a69542526c..f1ebdcc6d2eb65e481517ad04ebdc74c1309a2fc 100644
(file)
--- a/
drivers/block/Makefile
+++ b/
drivers/block/Makefile
@@
-23,16
+23,23
@@
include $(TOPDIR)/config.mk
include $(TOPDIR)/config.mk
-LIB := $(obj)libblock.
a
+LIB := $(obj)libblock.
o
-COBJS-y += ahci.o
-COBJS-y += ata_piix.o
+COBJS-$(CONFIG_SCSI_AHCI) += ahci.o
+COBJS-$(CONFIG_ATA_PIIX) += ata_piix.o
+COBJS-$(CONFIG_DWC_AHSATA) += dwc_ahsata.o
COBJS-$(CONFIG_FSL_SATA) += fsl_sata.o
COBJS-$(CONFIG_FSL_SATA) += fsl_sata.o
+COBJS-$(CONFIG_IDE_FTIDE020) += ftide020.o
COBJS-$(CONFIG_LIBATA) += libata.o
COBJS-$(CONFIG_LIBATA) += libata.o
+COBJS-$(CONFIG_MVSATA_IDE) += mvsata_ide.o
+COBJS-$(CONFIG_MX51_PATA) += mxc_ata.o
+COBJS-$(CONFIG_PATA_BFIN) += pata_bfin.o
+COBJS-$(CONFIG_SATA_DWC) += sata_dwc.o
COBJS-$(CONFIG_SATA_SIL3114) += sata_sil3114.o
COBJS-$(CONFIG_SATA_SIL3114) += sata_sil3114.o
-COBJS-y += sil680.o
-COBJS-y += sym53c8xx.o
-COBJS-y += systemace.o
+COBJS-$(CONFIG_SATA_SIL) += sata_sil.o
+COBJS-$(CONFIG_IDE_SIL680) += sil680.o
+COBJS-$(CONFIG_SCSI_SYM53C8XX) += sym53c8xx.o
+COBJS-$(CONFIG_SYSTEMACE) += systemace.o
COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)
COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)
@@
-41,7
+48,7
@@
OBJS := $(addprefix $(obj),$(COBJS))
all: $(LIB)
$(LIB): $(obj).depend $(OBJS)
all: $(LIB)
$(LIB): $(obj).depend $(OBJS)
- $(
AR) $(ARFLAGS) $@ $(OBJS
)
+ $(
call cmd_link_o_target, $(OBJS)
)
#########################################################################
#########################################################################