From 2b7178afce59f71e95da657273f4132012098c1f Mon Sep 17 00:00:00 2001
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Fri, 27 Mar 2009 23:26:44 +0100
Subject: [PATCH] at91: move usb driver to drivers/usb

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 cpu/arm926ejs/at91/Makefile                         | 1 -
 drivers/usb/Makefile                                | 1 +
 cpu/arm926ejs/at91/usb.c => drivers/usb/atmel_usb.c | 0
 include/configs/afeb9260.h                          | 1 +
 include/configs/at91cap9adk.h                       | 1 +
 include/configs/at91sam9260ek.h                     | 1 +
 include/configs/at91sam9261ek.h                     | 1 +
 include/configs/at91sam9263ek.h                     | 1 +
 8 files changed, 6 insertions(+), 1 deletion(-)
 rename cpu/arm926ejs/at91/usb.c => drivers/usb/atmel_usb.c (100%)

diff --git a/cpu/arm926ejs/at91/Makefile b/cpu/arm926ejs/at91/Makefile
index f9e739c5c13..d0d47e67485 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 7ddb72a0e14..5523cbdd67a 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
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 fa271191326..72881abc441 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 2ddbd172a2d..2f4baed44b2 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 1a5f9a48bc9..29cabcfd3e8 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 4d5093203bc..d6d140a964e 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 78e00810dee..83baf67ea86 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
-- 
GitLab