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

diff --cc cpu/mpc5xxx/Makefile
index 235adb7c04e60fc61aba0dcea2285b1d4170a598,94f82b225a8734e263e47379423c8b27c78bcf38..312b0bfc6cc8a64c3dbc5a3d37fe4b2052fb3d32
--- 1/cpu/mpc5xxx/Makefile
--- 2/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 baecf70352aca6bce11be1a2a0d1c292f4859c92,ca68599f7c74b5e396f7053fe59d1206b5bb2721..87c6230dc9950e8b5875ac2580173655e93a9047
--- 1/cpu/ppc4xx/Makefile
--- 2/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 08674ca49f5caa3ed9d43c711fca1d56d1b46297,6c8712b68d02bbb44a869fab23a8a31671c3d7c8..2c34ce09bb37c80bf2ea2247b08bddca9365c807
--- 1/include/configs/TQM5200.h
--- 2/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

diff --cc include/configs/yosemite.h
Simple merge