From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jean-Christophe PLAGNIOL-VILLARD Date: Fri, 27 Mar 2009 23:30:23 +0100 Subject: [U-Boot] [PATCH 10/13] at91: move usb driver to drivers/usb In-Reply-To: <1238193026-12564-9-git-send-email-plagnioj@jcrosoft.com> References: <1238193026-12564-1-git-send-email-plagnioj@jcrosoft.com> <1238193026-12564-2-git-send-email-plagnioj@jcrosoft.com> <1238193026-12564-3-git-send-email-plagnioj@jcrosoft.com> <1238193026-12564-4-git-send-email-plagnioj@jcrosoft.com> <1238193026-12564-5-git-send-email-plagnioj@jcrosoft.com> <1238193026-12564-6-git-send-email-plagnioj@jcrosoft.com> <1238193026-12564-7-git-send-email-plagnioj@jcrosoft.com> <1238193026-12564-8-git-send-email-plagnioj@jcrosoft.com> <1238193026-12564-9-git-send-email-plagnioj@jcrosoft.com> Message-ID: <1238193026-12564-10-git-send-email-plagnioj@jcrosoft.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- cpu/arm926ejs/at91/Makefile | 1 - drivers/usb/Makefile | 1 + .../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 deletions(-) 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 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 b306a65..de46b7b 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_SL811HS) += sl811_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 33a67ca..3a51e60 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 7e7f124..45af688 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 1fae3a3..18c81f6 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 752d7e9..5c94407 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 dd500ca..d77a780 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 -- 1.6.2.1