diff options
| -rw-r--r-- | Makefile | 1 | ||||
| -rwxr-xr-x | drivers/Makefile | 11 | ||||
| -rw-r--r-- | drivers/usb/Makefile | 52 | ||||
| -rw-r--r-- | drivers/usb/isp116x-hcd.c (renamed from drivers/isp116x-hcd.c) | 0 | ||||
| -rw-r--r-- | drivers/usb/isp116x.h (renamed from drivers/isp116x.h) | 0 | ||||
| -rw-r--r-- | drivers/usb/sl811.h (renamed from drivers/sl811.h) | 0 | ||||
| -rw-r--r-- | drivers/usb/sl811_usb.c (renamed from drivers/sl811_usb.c) | 2 | ||||
| -rw-r--r-- | drivers/usb/usb_ohci.c (renamed from drivers/usb_ohci.c) | 0 | ||||
| -rw-r--r-- | drivers/usb/usb_ohci.h (renamed from drivers/usb_ohci.h) | 0 | ||||
| -rw-r--r-- | drivers/usb/usbdcore.c (renamed from drivers/usbdcore.c) | 0 | ||||
| -rw-r--r-- | drivers/usb/usbdcore_ep0.c (renamed from drivers/usbdcore_ep0.c) | 0 | ||||
| -rw-r--r-- | drivers/usb/usbdcore_mpc8xx.c (renamed from drivers/usbdcore_mpc8xx.c) | 0 | ||||
| -rw-r--r-- | drivers/usb/usbdcore_omap1510.c (renamed from drivers/usbdcore_omap1510.c) | 0 |
13 files changed, 54 insertions, 12 deletions
@@ -225,6 +225,7 @@ ifeq ($(CPU),mpc85xx) LIBS += drivers/qe/qe.a endif LIBS += drivers/serial/libserial.a +LIBS += drivers/usb/libusb.a LIBS += post/libpost.a post/drivers/libpostdrivers.a LIBS += $(shell if [ -d post/lib_$(ARCH) ]; then echo \ "post/lib_$(ARCH)/libpost$(ARCH).a"; fi) diff --git a/drivers/Makefile b/drivers/Makefile index cf8b584c72..666957dff7 100755 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -55,17 +55,6 @@ COBJS-y += ps2ser.o COBJS-y += ps2mult.o # -# USB Drivers -# -COBJS-y += isp116x-hcd.o -COBJS-y += sl811_usb.o -COBJS-y += usb_ohci.o -COBJS-y += usbdcore.o -COBJS-y += usbdcore_ep0.o -COBJS-y += usbdcore_mpc8xx.o -COBJS-y += usbdcore_omap1510.o - -# # Miscellaneous Drivers # COBJS-y += ali512x.o diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile new file mode 100644 index 0000000000..f8ea167b12 --- /dev/null +++ b/drivers/usb/Makefile @@ -0,0 +1,52 @@ +# +# (C) Copyright 2000-2007 +# Wolfgang Denk, DENX Software Engineering, wd@denx.de. +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +include $(TOPDIR)/config.mk + +LIB := $(obj)libusb.a + +COBJS-y += isp116x-hcd.o +COBJS-y += sl811_usb.o +COBJS-y += usb_ohci.o +COBJS-y += usbdcore.o +COBJS-y += usbdcore_ep0.o +COBJS-y += usbdcore_mpc8xx.o +COBJS-y += usbdcore_omap1510.o + +COBJS := $(COBJS-y) +SRCS := $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) + +all: $(LIB) + +$(LIB): $(obj).depend $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +######################################################################### diff --git a/drivers/isp116x-hcd.c b/drivers/usb/isp116x-hcd.c index b21af10d0b..b21af10d0b 100644 --- a/drivers/isp116x-hcd.c +++ b/drivers/usb/isp116x-hcd.c diff --git a/drivers/isp116x.h b/drivers/usb/isp116x.h index a3ce3b582c..a3ce3b582c 100644 --- a/drivers/isp116x.h +++ b/drivers/usb/isp116x.h diff --git a/drivers/sl811.h b/drivers/usb/sl811.h index c1f9f013bd..c1f9f013bd 100644 --- a/drivers/sl811.h +++ b/drivers/usb/sl811.h diff --git a/drivers/sl811_usb.c b/drivers/usb/sl811_usb.c index b0cdf0bc2c..c1f8427c96 100644 --- a/drivers/sl811_usb.c +++ b/drivers/usb/sl811_usb.c @@ -41,7 +41,7 @@ #include <usb.h> #include "sl811.h" -#include "../board/kup/common/kup.h" +#include "../../board/kup/common/kup.h" #ifdef __PPC__ # define EIEIO __asm__ volatile ("eieio") diff --git a/drivers/usb_ohci.c b/drivers/usb/usb_ohci.c index cfa384eff6..cfa384eff6 100644 --- a/drivers/usb_ohci.c +++ b/drivers/usb/usb_ohci.c diff --git a/drivers/usb_ohci.h b/drivers/usb/usb_ohci.h index 380cb4c927..380cb4c927 100644 --- a/drivers/usb_ohci.h +++ b/drivers/usb/usb_ohci.h diff --git a/drivers/usbdcore.c b/drivers/usb/usbdcore.c index 308c7ceccc..308c7ceccc 100644 --- a/drivers/usbdcore.c +++ b/drivers/usb/usbdcore.c diff --git a/drivers/usbdcore_ep0.c b/drivers/usb/usbdcore_ep0.c index 1e44f322a7..1e44f322a7 100644 --- a/drivers/usbdcore_ep0.c +++ b/drivers/usb/usbdcore_ep0.c diff --git a/drivers/usbdcore_mpc8xx.c b/drivers/usb/usbdcore_mpc8xx.c index d4c4096565..d4c4096565 100644 --- a/drivers/usbdcore_mpc8xx.c +++ b/drivers/usb/usbdcore_mpc8xx.c diff --git a/drivers/usbdcore_omap1510.c b/drivers/usb/usbdcore_omap1510.c index 84bb936d86..84bb936d86 100644 --- a/drivers/usbdcore_omap1510.c +++ b/drivers/usb/usbdcore_omap1510.c |