From 6d27bca15d445fcf07d6e7e30ced95c945c875ea Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Sun, 29 Mar 2009 23:01:42 +0200 Subject: [PATCH] s3c64xx: move usb driver to drivers/usb add CONFIG_USB_S3C64XX to activate the driver Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- cpu/arm1176/s3c64xx/Makefile | 1 - drivers/usb/Makefile | 1 + cpu/arm1176/s3c64xx/usb.c => drivers/usb/s3c64xx_usb.c | 0 include/configs/smdk6400.h | 1 + 4 files changed, 2 insertions(+), 1 deletion(-) rename cpu/arm1176/s3c64xx/usb.c => drivers/usb/s3c64xx_usb.c (100%) diff --git a/cpu/arm1176/s3c64xx/Makefile b/cpu/arm1176/s3c64xx/Makefile index 4ab181159a..fa4ee3f24e 100644 --- a/cpu/arm1176/s3c64xx/Makefile +++ b/cpu/arm1176/s3c64xx/Makefile @@ -30,7 +30,6 @@ LIB = $(obj)lib$(SOC).a COBJS-y = interrupts.o COBJS-$(CONFIG_S3C6400) += cpu_init.o speed.o -COBJS-$(CONFIG_USB_OHCI_NEW) += usb.o OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS-y)) diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile index b306a65a98..7ddb72a0e1 100644 --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile @@ -33,6 +33,7 @@ COBJS-$(CONFIG_USB_EHCI) += usb_ehci_core.o # host COBJS-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o COBJS-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o +COBJS-$(CONFIG_USB_S3C64XX) += s3c64xx_usb.o COBJS-$(CONFIG_USB_SL811HS) += sl811_usb.o COBJS-$(CONFIG_USB_EHCI_FSL) += usb_ehci_fsl.o COBJS-$(CONFIG_USB_EHCI_PCI) += usb_ehci_pci.o diff --git a/cpu/arm1176/s3c64xx/usb.c b/drivers/usb/s3c64xx_usb.c similarity index 100% rename from cpu/arm1176/s3c64xx/usb.c rename to drivers/usb/s3c64xx_usb.c diff --git a/include/configs/smdk6400.h b/include/configs/smdk6400.h index 06d6a88592..d3cf6e58f4 100644 --- a/include/configs/smdk6400.h +++ b/include/configs/smdk6400.h @@ -288,6 +288,7 @@ #if !defined(CONFIG_ENABLE_MMU) #define CONFIG_CMD_USB 1 +#define CONFIG_USB_S3C64XX #define CONFIG_USB_OHCI_NEW 1 #define CONFIG_SYS_USB_OHCI_REGS_BASE 0x74300000 #define CONFIG_SYS_USB_OHCI_SLOT_NAME "s3c6400" -- 2.30.2