From: Wolfgang Denk <wd@pollux.denx.de>
Date: Mon, 27 Nov 2006 15:52:20 +0000 (+0100)
Subject: Merge with /home/mk/git/u-boot-generic_ohci#generic_ohci
X-Git-Tag: v1.3.0-rc1~19^2~20^2~12^2~23^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=83dc830b1693252d996bda920cd5f3161d7c64a9;p=u-boot

Merge with /home/mk/git/u-boot-generic_ohci#generic_ohci
---

83dc830b1693252d996bda920cd5f3161d7c64a9
diff --cc cpu/mpc5xxx/Makefile
index 235adb7c04,94f82b225a..312b0bfc6c
--- a/cpu/mpc5xxx/Makefile
+++ b/cpu/mpc5xxx/Makefile
@@@ -23,21 -23,17 +23,21 @@@
  
  include $(TOPDIR)/config.mk
  
 -LIB	= lib$(CPU).a
 +LIB	= $(obj)lib$(CPU).a
  
  START	= start.o
 -ASOBJS	= io.o firmware_sc_task_bestcomm.impl.o firmware_sc_task.impl.o
 -OBJS	= i2c.o traps.o cpu.o cpu_init.o fec.o ide.o interrupts.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
  
 -all:	.depend $(START) $(ASOBJS) $(LIB)
 +SRCS	:= $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
 +OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
 +START	:= $(addprefix $(obj),$(START))
 +
 +all:	$(obj).depend $(START) $(LIB)
  
  $(LIB):	$(OBJS)
 -	$(AR) crv $@ $(ASOBJS) $(OBJS)
 +	$(AR) $(ARFLAGS) $@ $(OBJS)
  
  #########################################################################
  
diff --cc cpu/ppc4xx/Makefile
index baecf70352,ca68599f7c..87c6230dc9
--- a/cpu/ppc4xx/Makefile
+++ b/cpu/ppc4xx/Makefile
@@@ -23,25 -23,23 +23,24 @@@
  
  include $(TOPDIR)/config.mk
  
 -LIB	= lib$(CPU).a
 +LIB	= $(obj)lib$(CPU).a
  
  START	= start.o resetvec.o kgdb.o
 -AOBJS	= dcr.o
 -COBJS	= 405gp_pci.o 4xx_enet.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 sdram.o serial.o \
 -	  spd_sdram.o speed.o traps.o \
 -	  usb_ohci.o usbdev.o usb.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
  
 -OBJS	= $(AOBJS) $(COBJS)
 +SRCS	:= $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
 +OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
 +START	:= $(addprefix $(obj),$(START))
  
 -all:	.depend $(START) $(LIB)
 +all:	$(obj).depend $(START) $(LIB)
  
  $(LIB):	$(OBJS)
 -	$(AR) crv $@ $(OBJS)
 +	$(AR) $(ARFLAGS) $@ $(OBJS)
  
  #########################################################################
  
diff --cc include/configs/TQM5200.h
index 08674ca49f,6c8712b68d..2c34ce09bb
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@@ -145,10 -124,17 +145,17 @@@
  #define CONFIG_ISO_PARTITION
  
  /* USB */
 -#ifdef CONFIG_STK52XX
 +#if defined(CONFIG_STK52XX) || defined(CONFIG_FO300)
- #define CONFIG_USB_OHCI
+ #define CONFIG_USB_OHCI_NEW
  #define ADD_USB_CMD		CFG_CMD_USB | CFG_CMD_FAT
  #define CONFIG_USB_STORAGE
+ 
+ #undef CFG_USB_OHCI_BOARD_INIT
+ #define CFG_USB_OHCI_CPU_INIT
+ #define CFG_USB_OHCI_REGS_BASE	MPC5XXX_USB
+ #define CFG_USB_OHCI_SLOT_NAME	"mpc5200"
+ #define CFG_USB_OHCI_MAX_ROOT_PORTS	15
+ 
  #else
  #define ADD_USB_CMD		0
  #endif