leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers/usb: Move conditional compilation to Makefile

Browse Source 
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Remy Böhmer <linux@bohmer.net>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2008-11-07 22:46:21 +01:00 committed by Remy Böhmer
parent 2077e348c2
commit d10c5a87cb
7 changed files with 14 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/usb/Makefile
View File

@ -25,15 +25,22 @@ include $(TOPDIR)/config.mk
LIB := $(obj)libusb.a
COBJS-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o
COBJS-y += isp116x-hcd.o
COBJS-y += sl811_usb.o
COBJS-y += usb_ohci.o
# core
COBJS-y += usbdcore.o
COBJS-$(CONFIG_USB_OHCI_NEW) += usb_ohci.o
# host
COBJS-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o
COBJS-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o
COBJS-$(CONFIG_USB_SL811HS) += sl811_usb.o
# device
ifdef CONFIG_USB_DEVICE
COBJS-y += usbdcore_ep0.o
COBJS-y += usbdcore_mpc8xx.o
COBJS-y += usbdcore_omap1510.o
COBJS-$(CONFIG_OMAP1510) += usbdcore_omap1510.o
COBJS-$(CONFIG_OMAP1610) += usbdcore_omap1510.o
COBJS-$(CONFIG_MPC885_FAMILY) += usbdcore_mpc8xx.o
endif
COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)

4
drivers/usb/isp116x-hcd.c
View File

@ -56,8 +56,6 @@
*/
#include <common.h>
#ifdef CONFIG_USB_ISP116X_HCD
#include <asm/io.h>
#include <usb.h>
#include <malloc.h>
@ -1441,5 +1439,3 @@ int usb_lowlevel_stop(void)
return 0;
}
#endif /* CONFIG_USB_ISP116X_HCD */

3
drivers/usb/sl811_usb.c
View File

@ -36,7 +36,6 @@
*/
#include <common.h>
#ifdef CONFIG_USB_SL811HS
#include <mpc8xx.h>
#include <usb.h>
#include "sl811.h"
@ -733,5 +732,3 @@ static int sl811_rh_submit_urb(struct usb_device *usb_dev, unsigned long pipe,
return status == 0 ? len : status;
}
#endif /* CONFIG_USB_SL811HS */

4
drivers/usb/usb_ohci.c
View File

@ -46,9 +46,6 @@
*/
#include <common.h>
#ifdef CONFIG_USB_OHCI_NEW
#include <asm/byteorder.h>
#if defined(CONFIG_PCI_OHCI)
@ -2016,4 +2013,3 @@ int usb_lowlevel_stop(void)
ohci_inited = 0;
return 0;
}
#endif /* CONFIG_USB_OHCI_NEW */

4
drivers/usb/usbdcore_ep0.c
View File

@ -51,8 +51,6 @@
*/
#include <common.h>
#if defined(CONFIG_USB_DEVICE)
#include "usbdcore.h"
#if 0
@ -597,5 +595,3 @@ int ep0_recv_setup (struct urb *urb)
}
return -1;
}
#endif

4
drivers/usb/usbdcore_mpc8xx.c
View File

@ -58,8 +58,6 @@
*/
#include <common.h>
#include <config.h>
#if defined(CONFIG_MPC885_FAMILY) && defined(CONFIG_USB_DEVICE)
#include <commproc.h>
#include "usbdcore.h"
#include "usbdcore_mpc8xx.h"
@ -1398,5 +1396,3 @@ static u32 mpc8xx_udc_alloc (u32 data_size, u32 alignment)
return retaddr;
}
#endif /* CONFIG_MPC885_FAMILY && CONFIG_USB_DEVICE) */

4
drivers/usb/usbdcore_omap1510.c
View File

@ -27,9 +27,6 @@
*/
#include <common.h>
#if ((defined(CONFIG_OMAP1510) || defined(CONFIG_OMAP1610)) && defined(CONFIG_USB_DEVICE))
#include <asm/io.h>
#ifdef CONFIG_OMAP_SX1
#include <i2c.h>
@ -1566,4 +1563,3 @@ void udc_unset_nak (int epid)
{
/* TODO: implement this functionality in omap1510 */
}
#endif