summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2009-03-27 23:26:44 +0100
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2009-04-04 20:42:21 +0200
commit2b7178afce59f71e95da657273f4132012098c1f (patch)
treef47b545a7645a4ebaf893645eec0b4d6a6be8da9
parentf82518d7f443ebac5f8821103a3c521c963aa6ee (diff)
downloadu-boot-imx-2b7178afce59f71e95da657273f4132012098c1f.zip
u-boot-imx-2b7178afce59f71e95da657273f4132012098c1f.tar.gz
u-boot-imx-2b7178afce59f71e95da657273f4132012098c1f.tar.bz2
at91: move usb driver to drivers/usb
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
-rw-r--r--cpu/arm926ejs/at91/Makefile1
-rw-r--r--drivers/usb/Makefile1
-rw-r--r--drivers/usb/atmel_usb.c (renamed from cpu/arm926ejs/at91/usb.c)0
-rw-r--r--include/configs/afeb9260.h1
-rw-r--r--include/configs/at91cap9adk.h1
-rw-r--r--include/configs/at91sam9260ek.h1
-rw-r--r--include/configs/at91sam9261ek.h1
-rw-r--r--include/configs/at91sam9263ek.h1
8 files changed, 6 insertions, 1 deletions
diff --git a/cpu/arm926ejs/at91/Makefile b/cpu/arm926ejs/at91/Makefile
index f9e739c..d0d47e6 100644
--- a/cpu/arm926ejs/at91/Makefile
+++ b/cpu/arm926ejs/at91/Makefile
@@ -57,7 +57,6 @@ endif
COBJS-$(CONFIG_AT91_LED) += led.o
COBJS-$(CONFIG_HAS_DATAFLASH) += spi.o
COBJS-y += timer.o
-COBJS-y += usb.o
SOBJS = lowlevel_init.o
SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index 7ddb72a..5523cbd 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -31,6 +31,7 @@ COBJS-$(CONFIG_USB_OHCI_NEW) += usb_ohci.o
COBJS-$(CONFIG_USB_EHCI) += usb_ehci_core.o
# host
+COBJS-$(CONFIG_USB_ATMEL) += atmel_usb.o
COBJS-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o
COBJS-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o
COBJS-$(CONFIG_USB_S3C64XX) += s3c64xx_usb.o
diff --git a/cpu/arm926ejs/at91/usb.c b/drivers/usb/atmel_usb.c
index 7c44ad0..7c44ad0 100644
--- a/cpu/arm926ejs/at91/usb.c
+++ b/drivers/usb/atmel_usb.c
diff --git a/include/configs/afeb9260.h b/include/configs/afeb9260.h
index fa27119..72881ab 100644
--- a/include/configs/afeb9260.h
+++ b/include/configs/afeb9260.h
@@ -122,6 +122,7 @@
#define CONFIG_NET_RETRY_COUNT 20
/* USB */
+#define CONFIG_USB_ATMEL
#define CONFIG_USB_OHCI_NEW 1
#define CONFIG_DOS_PARTITION 1
#define CONFIG_SYS_USB_OHCI_CPU_INIT 1
diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h
index 2ddbd17..2f4baed 100644
--- a/include/configs/at91cap9adk.h
+++ b/include/configs/at91cap9adk.h
@@ -144,6 +144,7 @@
#define CONFIG_RESET_PHY_R 1
/* USB */
+#define CONFIG_USB_ATMEL
#define CONFIG_USB_OHCI_NEW 1
#define CONFIG_DOS_PARTITION 1
#define CONFIG_SYS_USB_OHCI_CPU_INIT 1
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index 1a5f9a4..29cabcf 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -142,6 +142,7 @@
#define CONFIG_RESET_PHY_R 1
/* USB */
+#define CONFIG_USB_ATMEL
#define CONFIG_USB_OHCI_NEW 1
#define CONFIG_DOS_PARTITION 1
#define CONFIG_SYS_USB_OHCI_CPU_INIT 1
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 4d50932..d6d140a 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -143,6 +143,7 @@
#define CONFIG_RESET_PHY_R 1
/* USB */
+#define CONFIG_USB_ATMEL
#define CONFIG_USB_OHCI_NEW 1
#define CONFIG_DOS_PARTITION 1
#define CONFIG_SYS_USB_OHCI_CPU_INIT 1
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index 78e0081..83baf67 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -150,6 +150,7 @@
#define CONFIG_RESET_PHY_R 1
/* USB */
+#define CONFIG_USB_ATMEL
#define CONFIG_USB_OHCI_NEW 1
#define CONFIG_DOS_PARTITION 1
#define CONFIG_SYS_USB_OHCI_CPU_INIT 1