From: Wolfgang Denk <wd@pollux.(none)>
Date: Fri, 16 Dec 2005 16:39:27 +0000 (+0100)
Subject: Merge with /home/sr/git/u-boot
X-Git-Tag: v2008.10-rc1~1309
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e6b6d16de73de6a76e2ec4338291e828b860f040;p=platform%2Fkernel%2Fu-boot.git

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

e6b6d16de73de6a76e2ec4338291e828b860f040
diff --cc CHANGELOG
index 16b7c55,e5c53d8..015932e
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -2,10 -2,13 +2,17 @@@
  Changes for U-Boot 1.1.4:
  ======================================================================
  
+ * Changes to Yellowstone & Yosemite 440EP/GR eval boards:
+   - Changed GPIO setup to enable another address line in order to
+     address 64M of FLASH.
+   - Added function sdram_tr1_set to auto calculate the tr1 value for
+     the DDR.
+   Patch by Steven Blakeslee, 12 Dec 2005
+ 
 +* MPC5200:  Set PCI retry counter to 0 = infinite retry;
 +  The default of 255 is too short for slow devices.
 +  Patch by Martin Nykodym, 12 Dec 2005
 +
  * Change port configuration for O2DNT (CODEC1 on PSC1).
  
  * Fix register for PCI async mode on PPC440EP