From: Wolfgang Denk <wd@pollux.denx.de>
Date: Wed, 12 Oct 2005 23:55:58 +0000 (+0200)
Subject: Merge with /home/sr/git/u-boot
X-Git-Tag: LABEL_2006_03_12_0025~93
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cbdf8824faaeab6f989bee60443987ef6272e77a;p=u-boot

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

cbdf8824faaeab6f989bee60443987ef6272e77a
diff --cc CHANGELOG
index fe79957c6c,c5b9d3fa60..75ed9d3b91
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -2,40 -2,14 +2,48 @@@
  Changes for U-Boot 1.1.4:
  ======================================================================
  
+ * Fix problem in ppc4xx eth-driver without ethaddr (only without
+   CONFIG_NET_MULTI set)
+   Patch by Stefan Roese, 10 Oct 2005
+ 
+ * Fix gzip bmp support (test if malloc fails, warning when truncated).
+   Increase CFG_VIDEO_LOGO_MAX_SIZE on HH405 board.
+   Patch by Stefan Roese, 07 Oct 2005
+ 
 +* Add support for OF flat tree for the STXtc board.
 +  Patch by Pantelis Antoniou, 04 Sep 2005
 +
 +* Support passing of OF flat trees to the kernel.
 +  Patch by Pantelis Antoniou, 04 Sep 2005
 +
 +* Cleanup
 +
 +* Add support for NetSilicon NS7520 processor.
 +  Patch by Art Shipkowski, 12 May 2005
 +
 +* Add support for AP1000 board.
 +  Patch by James MacAulay, 07 Oct 2005
 +
 +* Eliminate hard-coded address of Ethernet transfer buffer on at91rm9200
 +  Patch by Anders Larsen, 07 Oct 2005
 +
 +  The Atmel errata #11 states that the transfer buffer descriptor
 +  table must be aligned on a 16-word boundary. As it turned out, this
 +  is insufficient - it seems the table must be aligned on a boundary
 +  at least as large as the table itself (in Linux this is not an
 +  issue - the table is aligned on a PAGE_SIZE (4096) boundary).
 +
 +* Fixed compilation for ARM when using a (standard) hard-FP toolchain
 +  Patch by Anders Larsen, 07 Oct 2005
 +
 +* Cleanup warnings for cpu/arm720t & cpu/arm1136 files.
 +  sed the linker scripts, rather than pre-process them.
 +  Patch by Peter Pearse, 07 Oct 2005
 +
 +* Update make target for ARM supported boards.
 +  Use lowlevel_init() instead of platformsetup() [rename].
 +  Patch by Peter Pearse, 06 Oct 2005
 +
  * Fix booting from serial dataflash on AT91RM9200
    Patch by Peter Menzebach, 29 Aug 2005