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

diff --cc CHANGELOG
index 8e9a0f334bc7f3fe998ccad0a37f31afb30611c3,2a41c2e7bbc737d63ab3984c9f183e0b92857f77..3213a89255716a681062b235a0559a30d7ae9ae9
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -2,18 -2,33 +2,45 @@@
  Changes for U-Boot 1.1.4:
  ======================================================================
  
 -    the defualt values will be used instead.
 -  - FLASH size detection added.
+ * Add support for TQM8541/8555 boards, TQM85xx support reworked:
+   - Support for TQM8541/8555 boards added.
+   - Complete rework of TQM8540/8560 support.
+   - Common TQM85xx code now supports all current TQM85xx platforms
+     (TQM8540/8541/8555/8560).
+   - DDR SDRAM size detection added.
+   - CAS latency default values can be overwritten by setting "serial#"
+     to e.g. "ABC0001 casl=25" -> CAS latency 2.5 will be used.
+     If problems are detected with this non default CAS latency,
 -  comprised the ppc type and revision but not additional informations
++    the default values will be used instead.
++  - Flash size detection added.
+   - Moved FCC ethernet driver initialization behind TSEC driver init
+     -> TSEC is first device.
+   Patch by Stefan Roese, 30 Nov 2005
+ 
+ * Add support for AMCC 440SP, add support for AMCC Luan 440SP eval board.
+   Patch by John Otken, 23 Nov 2005
+ 
+ * Changed PPC44x startup message (cpu info, speed...) to common style:
+   On PPC44x platforms, the startup message generated in "cpu.c" only
++  comprised the ppc type and revision but not additional information
+   like speed etc. Those speed infos where printed in the board specific
+   code. This new implementation now prints all CPU infos in the common
+   cpu specific code. No board specific code is needed anymore and
+   therefore removed from all current 44x implementations.
+   Patch by Stefan Roese, 27 Nov 2005
+ 
 +* Adjust TQM834x PHY addresses for latest hardware revision.
 +
 +* Increase malloc arena on TQM5200 board to 256 kB.
 +  With 64 kb uniform flash sector size the old value of 128 kB was
 +  too small.
 +  
 +* Fix miiphy global data initialization (problem on 4xx boards when
 +  no ethaddr is assigned). Initialization moved from
 +  miiphy_register() to eth_initialize().
 +
 +  Based on initial patch for 4xx platform by Matthias Fuchs.
 +
  * Remove unnnecessary #include <linux/types.h> from include/asm-*/u-boot.h
  
  * Allow use of include/image.h and include/asm-*/u-boot.h in proprietary code.

diff --cc net/eth.c
Simple merge