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

diff --cc CHANGELOG
index 6f5d847022101d35269df71d1a5b191796810603,217cb0f13dc8fe936feba0155eb2bf448e738f22..ac3be077d14a6c39a3aff439695ecd6bad1e7abb
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -2,13 -2,8 +2,15 @@@
  Changes for U-Boot 1.1.4:
  ======================================================================
  
+ * Change port configuration for O2DNT (CODEC1 on PSC1).
+ 
 +* Fix register for PCI async mode on PPC440EP
 +  Patch by Youngchul Bang, 08 Dec 2005
 +
 +* Fix U-Boot linking problems (add .eh_frame segment to linker script)
 +  This segment may be required by some libgcc.a functions
 +  (like _udivdi3).
 +
  * Fix DPRAM offset/size for MPC8541/8555.
    Simplify TQM85xx Makefile handling.