From: Wolfgang Denk <wd@pollux.denx.de>
Date: Fri, 5 Aug 2005 09:22:28 +0000 (+0200)
Subject: Merge with /home/wd/git/u-boot/master
X-Git-Tag: v2008.10-rc1~1499^2~1
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fkernel%2Fu-boot.git;a=commitdiff_plain;h=cbf9c117282b8729bdb86071997b58fcab58c444

Merge with /home/wd/git/u-boot/master
---

cbf9c117282b8729bdb86071997b58fcab58c444
diff --cc CHANGELOG
index 27c013f,48c6ef8..50a8689
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -1,51 -1,31 +1,75 @@@
  ======================================================================
  Changes for U-Boot 1.1.3:
  ======================================================================
 +* 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 July 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, 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.
  
+ * 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
+ 
+ * (re)enabled scsi commands do_scsi() and do_scsiboot() 
+   Patch by Denis Peter, 06 Dec 2004
+ 
+ * Fix endianess problem in TFTP / NFS default filenames
+   Patch by Hiroshi Ito, 06 Dec 2004
+ 
+ * Ignore broadcast status bit in received frames in 8260 FCC ethernet
+   loopback test code
+   Patch by Murray Jensen, 18 Jul 2005
+ 
+ * Fix typo in mkconfig script (used == instead of =)
+   Patch by Murray Jensen, 18 Jul 2005
+ 
+ * Cleanup build problems on 64 bit build hosts
+ 
+ * Update MAINTAINERS file
+ 
  * Patch by Stefan Roese, 01 Aug 2005:
    - Major cleanup for AMCC eval boards Walnut, Bubinga, Ebony, Ocotea
      (former IBM eval board). Please see "doc/README.AMCC-eval-boards-cleanup"