Merge with git://www.denx.de/git/u-boot.git#testing-USB

[platform/kernel/u-boot.git] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index ff6b6d2..0ca400c 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -1,5 +1,5 @@
 #
-# (C) Copyright 2000-2004
+# (C) Copyright 2000-2006
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 #
 # See file CREDITS for list of people who contributed to this
@@ -25,36 +25,49 @@ include $(TOPDIR)/config.mk
 
 # CFLAGS += -DET_DEBUG -DDEBUG
 
-LIB    = libdrivers.a
+LIB    = $(obj)libdrivers.a
 
-OBJS   = 3c589.o 5701rls.o ali512x.o \
+COBJS  = 3c589.o 5701rls.o ali512x.o atmel_usart.o \
          bcm570x.o bcm570x_autoneg.o cfb_console.o cfi_flash.o \
-         cs8900.o ct69000.o dataflash.o dc2114x.o          \
+         cs8900.o ct69000.o dataflash.o dc2114x.o dm9000x.o \
          e1000.o eepro100.o \
-         i8042.o i82365.o inca-ip_sw.o \
-         lan91c96.o natsemi.o netarm_eth.o \
-         ns16550.o ns8382x.o ns87308.o \
-         pci.o pci_auto.o pci_indirect.o \
+         i8042.o inca-ip_sw.o keyboard.o \
+         lan91c96.o \
+         natsemi.o ne2000.o netarm_eth.o netconsole.o \
+         ns16550.o ns8382x.o ns87308.o ns7520_eth.o omap1510_i2c.o \
+         omap24xx_i2c.o pci.o pci_auto.o pci_indirect.o \
          pcnet.o plb2800_eth.o \
-         ps2ser.o ps2mult.o pc_keyb.o keyboard.o \
-         rtl8019.o rtl8139.o \
-         s3c24x0_i2c.o sed13806.o sed156x.o \
-         serial.o serial_max3100.o serial_pl011.o serial_pl010.o \
-         smc91111.o smiLynxEM.o status_led.o sym53c8xx.o \
-         ti_pci1410a.o tigon3.o w83c553f.o omap1510_i2c.o \
-         usbdcore.o usbdcore_ep0.o usbdcore_omap1510.o usbtty.o \
-         videomodes.o
+         ps2ser.o ps2mult.o pc_keyb.o \
+         rtl8019.o rtl8139.o rtl8169.o \
+         s3c4510b_eth.o s3c4510b_uart.o \
+         sed13806.o sed156x.o \
+         serial.o serial_max3100.o \
+         serial_pl010.o serial_pl011.o serial_xuartlite.o \
+         sl811_usb.o sm501.o smc91111.o smiLynxEM.o \
+         status_led.o sym53c8xx.o systemace.o ahci.o \
+         ti_pci1410a.o tigon3.o tsec.o \
+         usb_ohci.o \
+         usbdcore.o usbdcore_ep0.o usbdcore_mpc8xx.o usbdcore_omap1510.o \
+         usbtty.o \
+         videomodes.o w83c553f.o \
+         ks8695eth.o \
+         pxa_pcmcia.o mpc8xx_pcmcia.o tqm8xx_pcmcia.o  \
+         rpx_pcmcia.o \
+         fsl_i2c.o
+
+SRCS   := $(COBJS:.o=.c)
+OBJS   := $(addprefix $(obj),$(COBJS))
 
 all:   $(LIB)
 
-$(LIB): $(OBJS)
-       $(AR) crv $@ $(OBJS)
+$(LIB): $(obj).depend $(OBJS)
+       $(AR) $(ARFLAGS) $@ $(OBJS)
 
 #########################################################################
 
-.depend:       Makefile $(OBJS:.o=.c)
-               $(CC) -M $(CFLAGS) $(OBJS:.o=.c) > $@
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
 
-sinclude .depend
+sinclude $(obj).depend
 
 #########################################################################