From: Jon Loeliger <jdl@freescale.com>
Date: Thu, 28 Jul 2005 15:35:56 +0000 (-0500)
Subject: Merge with rsync://git-user@source.denx.net/git/u-boot.git
X-Git-Tag: LABEL_2006_03_12_0025~242^2~6
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a720fd99b614ba36293565771bcd19799bc53959;p=u-boot

Merge with rsync://git-user@source.denx.net/git/u-boot.git
---

a720fd99b614ba36293565771bcd19799bc53959
diff --cc CHANGELOG
index f1ef6d946b,35c3969396..acd36fa1b9
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -1,39 -1,15 +1,47 @@@
  ======================================================================
  Changes for U-Boot 1.1.3:
  ======================================================================
 +* Patch by Eran Liberty
 +  Add support for the Freescale MPC8349ADS board.
 +
 +* Patch by Jon Loeliger, 2005-07-25
 +  Move the TSEC driver out of cpu/mpc85xx as it will be shared
 +  by the upcoming mpc83xx family as well.
 +
 +* Patch by Jon Loeliger, 2005-05-05
 +  Implemented support for MPC8548CDS board.
 +  Added DDR II support based on SPD values for MPC85xx boards.
 +  This roll-up patch also includes bugfies for the previously
 +  published patches:
 +    DDRII CPO, pre eTSEC, 8548 LBIU, Andy's TSEC, eTSEC 3&4 I/O
 +
 +* Patch by Jon Loeliger, 2005-Feb-10
 +  Add config option CONFIG_HAS_FEC calling out 8540 FEC features.
 +
 +* Patch by Jon Loeliger, Kumar Gala, 2005-02-08
 +  For MPC85xxCDS:
 +    Adds Relaxed Timing TRLX bit to FLASH ORx regs to allow
 +    for faster flash parts.
 +    Add documentation for BR/OR for FLASH.
 +
 +* Patch by Jon Loeliger 2005-02-08
 +  Determine L2 Cache size dynamically on 85XX boards.
 +
 +* Patch by Jon Loeliger, Kumar Gala 2005-02-08
 +  - Convert the CPM2 based functionality to use new CONFIG_CPM2
 +    option rather than a myriad of CONFIG_MPC8560-like variants.
 +    Applies to MPC85xx and MPC8260 boards, includes stxgp3 and sbc8560.
 +    Eliminates the CONFIG_MPC8560 option entirely.  Distributes the
 +    new CONFIG_CPM2 option to each 8260 board.
  
+ * Fix sysmon POST problem: check I2C error codes
+   This fixes a problem of displaying bogus voltages when the voltages
+   are so low that the I2C devices start failing while the rest of the
+   system keeps running.
+ 
+ * Patch by Cedric Vincent, 6 Jul 2005:
+   Fix CFG_CMD_SETGETDCR handling in "common/cmd_dcr.c"
+ 
  * Patch by Jon Loeliger, 20 Jul 2005:
    Add missing PCI IO port definitions.