From: Wolfgang Denk <wd@pollux.denx.de>
Date: Fri, 5 Aug 2005 21:55:19 +0000 (+0200)
Subject: Merge with /home/sr/git/u-boot
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=d56019c0eed08632c2b1f828ca9e0b22d6151414;p=u-boot.git

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

d56019c0eed08632c2b1f828ca9e0b22d6151414
diff --cc CHANGELOG
index f1484ee05b,326eaa7533..6c2cdcfd59
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -2,60 -2,9 +2,63 @@@
  Changes for U-Boot 1.1.3:
  ======================================================================
  
+ * Add support for AMCC Bamboo PPC440EP eval board
+   Patch by Stefan Roese, 04 Aug 2005
+ 
 +* Patch by Jon Loeliger
 +  Fix style issues primarily in 85xx and 83xx boards.
 +    - C++ comments
 +    - Trailing white space
 +    - Indentation not by TAB
 +    - Excessive amount of empty lines
 +    - Trailing empty lines
 +
 +* Patch by Ron Alder, 11 Jul 2005
 +    Add Xianghua Xiao and Lunsheng Wang's support for the
 +    GDA MPC8540 EVAL board.
 +
 +* Patch by Eran Liberty
 +  Add support for the Freescale MPC8349ADS board.
 +
 +* Patch by Jon Loeliger, 25 Jul 2005
 +  Move the TSEC driver out of cpu/mpc85xx as it will be shared
 +  by the upcoming mpc83xx family as well.
 +
 +* Patch by Jon Loeliger, 05 May 2005
 +  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, 10 Feb 2005
 +  Add config option CONFIG_HAS_FEC calling out 8540 FEC features.
 +
 +* Patch by Jon Loeliger, Kumar Gala, 08 Feb 2005
 +  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 08 Feb 2005
 +  Determine L2 Cache size dynamically on 85XX boards.
 +
 +* Patch by Jon Loeliger, Kumar Gala 08 Feb 2005
 +  - 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.
 +
 +* Add support for MicroSys PM856 board
 +  Patch by Josef Wagner, 03 Aug 2005
 +
 +* Minor fixes to PM854 board
 +  Patch by Josef Wagner, 03 Aug 2005
 +
 +* Adjust configuration of XENIAX board
 +  (chip select and GPIO required for USB operation)
 +
  * Fix typos in cpu/85xx/start.S which caused DataTLB exception to be
    routed to the Watchdog handler
    Patch by Eugene Surovegin, 18 Jun 2005