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

diff --cc CHANGELOG
index 16b7c550af44a05ba005092583089a7cce0aefd4,e5c53d80f836adf3518ed677dd038f5fd4fa2c10..015932e74db7cd15bf695fbaafa816fd00c708f8
--- 1/CHANGELOG
--- 2/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