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

diff --cc CHANGELOG
index 2a5622b82a9670248cd811b6b29c56d232fa923b,42768a365fc65297fb4d6af7f9632312e07434a0..ab3c59049bc5bb6528874b6f0c48e02dacd8eb1a
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -2,12 -2,12 +2,18 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
+ * Update for CAM5200 board:
+   - Map in a additional chip selects CS4 and CS5.
+   - Modify the port configration, configure six UARTs and no PCI,
+     ATA and USB.
+   - Add custom flash driver to handle specific byte swapping
+ 
 +* Fix TLB setup for Ocotea board
 +  Patch by Stefan Roese, 30 Sep 2006
 +
 +* Fix reset problem in sequoia sdram init code
 +  Patch by Stefan Roese, 23 Sep 2006
 +
  * Disable autoboot abort for FO300 when silent mode is enabled
    (according to S1 switch setting).