From: Wolfgang Denk <wd@pollux.denx.de>
Date: Thu, 5 Oct 2006 09:10:17 +0000 (+0200)
Subject: Merge with /home/m8/git/u-boot
X-Git-Tag: U-Boot-1_1_5~26
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=eac5ba3e59187bb0d7d36c624851235fa850ccd1;p=u-boot

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

eac5ba3e59187bb0d7d36c624851235fa850ccd1
diff --cc CHANGELOG
index 2a5622b82a,42768a365f..ab3c59049b
--- a/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).