From: Markus Klotzbuecher Date: Fri, 23 Mar 2007 08:52:17 +0000 (+0100) Subject: Merge with git://www.denx.de/git/u-boot.git#testing-USB X-Git-Tag: v1.3.0-rc1~19^2~20^2~12^2~23 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f2b07ebd32e42a5b1126c98efc768ddb8908de62;p=u-boot Merge with git://www.denx.de/git/u-boot.git#testing-USB --- f2b07ebd32e42a5b1126c98efc768ddb8908de62 diff --cc cpu/ppc4xx/Makefile index 96f0f62eb6,87c6230dc9..1347e0f9f0 --- a/cpu/ppc4xx/Makefile +++ b/cpu/ppc4xx/Makefile @@@ -31,9 -31,7 +31,9 @@@ COBJS = 405gp_pci.o 440spe_pcie.o 4xx_e 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 usb.o + 40x_spd_sdram.o 44x_spd_ddr.o 44x_spd_ddr2.o speed.o \ - tlb.o traps.o usb_ohci.o usbdev.o \ ++ tlb.o traps.o usb_ohci.o usbdev.o usb.o \ + 440spe_pcie.o SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) diff --cc drivers/Makefile index fffc22a5e1,b89b06f7b7..0ca400c682 --- a/drivers/Makefile +++ b/drivers/Makefile @@@ -44,9 -44,11 +44,11 @@@ COBJS = 3c589.o 5701rls.o ali512x.o atm serial.o serial_max3100.o \ serial_pl010.o serial_pl011.o serial_xuartlite.o \ sl811_usb.o sm501.o smc91111.o smiLynxEM.o \ - status_led.o sym53c8xx.o ahci.o \ + status_led.o sym53c8xx.o systemace.o ahci.o \ ti_pci1410a.o tigon3.o tsec.o \ - usbdcore.o usbdcore_ep0.o usbdcore_omap1510.o usbtty.o \ + usb_ohci.o \ + usbdcore.o usbdcore_ep0.o usbdcore_mpc8xx.o usbdcore_omap1510.o \ + usbtty.o \ videomodes.o w83c553f.o \ ks8695eth.o \ pxa_pcmcia.o mpc8xx_pcmcia.o tqm8xx_pcmcia.o \ diff --cc include/configs/yosemite.h index 818462eede,9f98500a6d..b59f75b9d0 --- a/include/configs/yosemite.h +++ b/include/configs/yosemite.h @@@ -233,18 -214,18 +233,24 @@@ #ifdef CONFIG_440EP /* USB */ - #define CONFIG_USB_OHCI + #define CONFIG_USB_OHCI_NEW #define CONFIG_USB_STORAGE + #undef CFG_USB_OHCI_BOARD_INIT + #define CFG_USB_OHCI_CPU_INIT 1 + #define CFG_USB_OHCI_REGS_BASE (CFG_PERIPHERAL_BASE | 0x1000) + #define CFG_USB_OHCI_SLOT_NAME "ppc440" + #define CFG_USB_OHCI_MAX_ROOT_PORTS 15 + -/*Comment this out to enable USB 1.1 device*/ +/* Comment this out to enable USB 1.1 device */ #define USB_2_0_DEVICE -#endif /*CONFIG_440EP*/ + +#define CMD_USB (CFG_CMD_USB | CFG_CMD_FAT | CFG_CMD_EXT2) + +#define CONFIG_SUPPORT_VFAT +#else +#define CMD_USB 0 /* no USB on 440GR */ +#endif /* CONFIG_440EP */ #ifdef DEBUG #define CONFIG_PANIC_HANG