Commit d10c5a87 authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD Committed by Remy Böhmer
Browse files

drivers/usb: Move conditional compilation to Makefile


Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: default avatarRemy Böhmer <linux@bohmer.net>
parent 2077e348
......@@ -25,15 +25,22 @@ include $(TOPDIR)/config.mk
LIB := $(obj)libusb.a
# 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
COBJS-y += isp116x-hcd.o
COBJS-y += sl811_usb.o
COBJS-y += usb_ohci.o
COBJS-y += usbdcore.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)
......
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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
......@@ -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) */
......@@ -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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment