From: Wolfgang Denk <wd@pollux.denx.de>
Date: Tue, 29 Aug 2006 12:19:46 +0000 (+0200)
Subject: Merge with /home/sr/git/u-boot/denx
X-Git-Tag: U-Boot-1_1_5~47
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2b75062a0f97ad6ff19d9d2c030d4b29829260f1;p=kernel%2Fu-boot.git

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

2b75062a0f97ad6ff19d9d2c030d4b29829260f1
diff --cc CHANGELOG
index 46e77e7,f09be8a..02ccd30
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -2,8 -2,21 +2,23 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
+ * PCIe endpoint support for AMCC Yucca 440SPe board
+   Patch by Tirumala R Marri, 26 Aug 2006
+ 
+ * Improve DIMM detection for AMCC Yucca 440SPe board
+   Improved the memory DIMM detection for the Yucca 440SPe board for
+   the case where a memory DIMM is falsely detected as present.
+   This issue is seen on some AMCC Yucca 440SPe validation boards if
+   only one 512MB memory DIMM is installed, i.e. DIMM slot 0 is
+   populated and DIMM slot 1 is empty.  In this case, U-Boot does
+   not correctly detect that there is only one DIMM memory module
+   installed and will falsely detect two DIMM memory modules are
+   present and therefore U-Boot will not calculate the correct amount
+   of total memory and u-boot will not booting up.
+   Patch by Adam Graham, 24 Aug 2006
+ 
 +* Fix typo.
 +
  * Code cleanup
  
  * Update for MCC200 / PRS200 boards: