From: Wolfgang Denk <wd@pollux.denx.de>
Date: Wed, 14 Sep 2005 14:59:18 +0000 (+0200)
Subject: Merge with /home/sr/git/u-boot
X-Git-Tag: LABEL_2006_03_12_0025~182^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=47278471f9b8c851241cb6154422c33439adeb90;p=u-boot

Merge with /home/sr/git/u-boot
---

47278471f9b8c851241cb6154422c33439adeb90
diff --cc CHANGELOG
index da0a953e39,5a8533e75e..b3775071df
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -2,16 -2,15 +2,20 @@@
  Changes for U-Boot 1.1.4:
  ======================================================================
  
+ * Fix problem in 440GP ethernet driver (ebony). Add support for 2nd
+   ethernet port on ebony.
+   Patch by Stefan Roese, 7 Sep 2005
+ 
  * Add I2C support to TQM8540 and TQM8560 boards (EEPROM, RTC, LM75-DTT).
 -  Removed CFG_CMD_DISPLAY from default commands.
 -  Fixed compiler warning in net.c.
    Patch by Stefan Roese, 31 Aug 2005
  
 +* Fix default command set (don't include CFG_CMD_DISPLAY command)
 +  Patch by Pantelis Antoniou, 02 Sep 2005
 +
 +* Cleanup
 +
 +* Enable SM712 driver support for HMI1001 board.
 +
  * Fix problems with ld version 2.16 (dot outside sections problem)
    Pointed out by Gerhard Jaeger, 31 Aug 2005;
    cf. http://sourceware.org/ml/binutils/2005-08/msg00412.html