diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-11-27 16:52:20 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2006-11-27 16:52:20 +0100 |
| commit | 83dc830b1693252d996bda920cd5f3161d7c64a9 (patch) | |
| tree | 7ddf0efb7a5dc45e38b82e7a0625f794352a8acd /cpu | |
| parent | d3c5e8b2f5945d93de8f23b053e9dcd033983245 (diff) | |
| parent | 58b485776698c3d71ec5a215e392123b4c15afa3 (diff) | |
| download | u-boot-imx-83dc830b1693252d996bda920cd5f3161d7c64a9.zip u-boot-imx-83dc830b1693252d996bda920cd5f3161d7c64a9.tar.gz u-boot-imx-83dc830b1693252d996bda920cd5f3161d7c64a9.tar.bz2 | |
Merge with /home/mk/git/u-boot-generic_ohci#generic_ohci
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/arm920t/at91rm9200/usb.c | 2 | ||||
| -rw-r--r-- | cpu/arm920t/s3c24x0/usb.c | 2 | ||||
| -rw-r--r-- | cpu/mpc5xxx/Makefile | 2 | ||||
| -rw-r--r-- | cpu/ppc4xx/Makefile | 5 | ||||
| -rw-r--r-- | cpu/pxa/usb.c | 2 |
5 files changed, 6 insertions, 7 deletions
diff --git a/cpu/arm920t/at91rm9200/usb.c b/cpu/arm920t/at91rm9200/usb.c index 98e3cdd..366262e 100644 --- a/cpu/arm920t/at91rm9200/usb.c +++ b/cpu/arm920t/at91rm9200/usb.c @@ -23,7 +23,7 @@ #include <common.h> -#if defined(CONFIG_USB_OHCI) && defined(CFG_USB_OHCI_CPU_INIT) +#if defined(CONFIG_USB_OHCI_NEW) && defined(CFG_USB_OHCI_CPU_INIT) # ifdef CONFIG_AT91RM9200 #include <asm/arch/hardware.h> diff --git a/cpu/arm920t/s3c24x0/usb.c b/cpu/arm920t/s3c24x0/usb.c index 4bc7961..ef5d5bf 100644 --- a/cpu/arm920t/s3c24x0/usb.c +++ b/cpu/arm920t/s3c24x0/usb.c @@ -23,7 +23,7 @@ #include <common.h> -#if defined(CONFIG_USB_OHCI) && defined(CFG_USB_OHCI_CPU_INIT) +#if defined(CONFIG_USB_OHCI_NEW) && defined(CFG_USB_OHCI_CPU_INIT) # if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) #if defined(CONFIG_S3C2400) diff --git a/cpu/mpc5xxx/Makefile b/cpu/mpc5xxx/Makefile index 235adb7..312b0bf 100644 --- a/cpu/mpc5xxx/Makefile +++ b/cpu/mpc5xxx/Makefile @@ -28,7 +28,7 @@ LIB = $(obj)lib$(CPU).a START = start.o SOBJS = io.o firmware_sc_task_bestcomm.impl.o firmware_sc_task.impl.o COBJS = i2c.o traps.o cpu.o cpu_init.o fec.o ide.o interrupts.o \ - loadtask.o pci_mpc5200.o serial.o speed.o usb_ohci.o + loadtask.o pci_mpc5200.o serial.o speed.o usb_ohci.o usb.o SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) diff --git a/cpu/ppc4xx/Makefile b/cpu/ppc4xx/Makefile index baecf70..87c6230 100644 --- a/cpu/ppc4xx/Makefile +++ b/cpu/ppc4xx/Makefile @@ -27,12 +27,11 @@ LIB = $(obj)lib$(CPU).a START = start.o resetvec.o kgdb.o SOBJS = dcr.o -COBJS = 405gp_pci.o 4xx_enet.o \ +COBJS = 405gp_pci.o 440spe_pcie.o 4xx_enet.o \ bedbug_405.o commproc.o \ cpu.o cpu_init.o i2c.o interrupts.o \ miiphy.o ndfc.o sdram.o serial.o \ - spd_sdram.o speed.o traps.o usb_ohci.o usbdev.o \ - 440spe_pcie.o + spd_sdram.o speed.o traps.o usb_ohci.o usbdev.o usb.o SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) diff --git a/cpu/pxa/usb.c b/cpu/pxa/usb.c index bff5bfb..5d273cb 100644 --- a/cpu/pxa/usb.c +++ b/cpu/pxa/usb.c @@ -23,7 +23,7 @@ #include <common.h> -#if defined(CONFIG_USB_OHCI) && defined(CFG_USB_OHCI_CPU_INIT) +#if defined(CONFIG_USB_OHCI_NEW) && defined(CFG_USB_OHCI_CPU_INIT) # ifdef CONFIG_CPU_MONAHANS #include <asm/arch/pxa-regs.h> |