From: Wolfgang Denk <wd@pollux.denx.de>
Date: Thu, 13 Jul 2006 22:48:06 +0000 (+0200)
Subject: Merge with /home/tur/proj/usb_sticks/u-boot
X-Git-Tag: U-Boot-1_1_5~103
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ae1d7d4b2e87d8e43ff755108db851161d0231bb;p=u-boot

Merge with /home/tur/proj/usb_sticks/u-boot
---

ae1d7d4b2e87d8e43ff755108db851161d0231bb
diff --cc CHANGELOG
index 7d7784b058,97e18f5914..614ec569b7
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -2,19 -2,8 +2,21 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
+ * Fix problems with SanDisk Corporation Cruzer Micro USB memory stick.
+ 
 +* Add support for TQM885D board.
 +  Patch by Martin Krause, 20 Mar 2006
 +
 +* Fix FEC initialisation: All MII configuration is done via FEC1
 +  registers, but MII_SPEED was configured according to FEC used. So
 +  if only FEC2 was used, this caused the real MII_SPEED register in
 +  FEC1 to stay uninitalised, leqading to "mii_send STUCK!" messages.
 +  Fix: always configure MII_SPEED on FEC1 only.
 +  Patch by Markus Klotzbuecher, 12 Jul 2006
 +
 +* Add support for SPC1920 board.
 +  Patch by Markus Klotzbuecher, 12 Jul 2006
 +  
  * MCC200 board: support console on any one of the Quad UART ports.
  
  * Fix error in flash protection calculation on MCC200 board.