From: Wolfgang Denk <wd@atlas.denx.de>
Date: Sun, 8 Oct 2006 20:19:41 +0000 (+0200)
Subject: Merge with git+ssh://fifi/home/wd/git/u-boot/master
X-Git-Tag: U-Boot-1_1_5~25
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=9444b8818f1de25dfa322cbe3a283c758a3d20e3;p=karo-tx-uboot.git

Merge with git+ssh://fifi/home/wd/git/u-boot/master
---

9444b8818f1de25dfa322cbe3a283c758a3d20e3
diff --cc CHANGELOG
index ab3c59049b,2059b66038..31233b7892
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -2,18 -2,9 +2,21 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
+ * Fix comments in include/ppc440.h
+   Patch by Martin Hicks, 16 Jun 2006
+ 
 +* 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).