at91: move usb driver to drivers/usb

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

diff --git a/cpu/arm926ejs/at91/Makefile b/cpu/arm926ejs/at91/Makefile
index f9e739c5c1335954d98ea86790204b0dbe8e9313..d0d47e67485cefc6cfd961e9772b45cbaf0c35b9 100644 (file)
--- 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 7ddb72a0e146ad47c4903a0521a060fbc267ef6a..5523cbdd67a41331a6ab9ce9792fa0e69fda3b4c 100644 (file)
--- 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
similarity index 100%
rename from cpu/arm926ejs/at91/usb.c
rename to drivers/usb/atmel_usb.c

diff --git a/include/configs/afeb9260.h b/include/configs/afeb9260.h
index fa2711913268b32c9d7ddeb94a5263822e680684..72881abc441f1e74f4e9cff1cd277dbfb7c98490 100644 (file)
--- 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 2ddbd172a2d1bf389df3e91e9bc6d5ba03aec360..2f4baed44b2965a2f2dc55be996a2639ee78d26b 100644 (file)
--- 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 1a5f9a48bc9b750a33f6ddc4f682dad6a817f182..29cabcfd3e8653c0d8b3dc01a0631ffbbc2589d7 100644 (file)
--- 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 4d5093203bc695d5d8cafac805ab4e58e1b5b54c..d6d140a964e9ba664b94b18310aa863313de5e35 100644 (file)
--- 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 78e00810dee440f74036c571029c8bc8bb56fc30..83baf67ea862f120f4715918898db7d854d9ec7d 100644 (file)
--- 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