From: Markus Klotzbücher <mk@pollux.(none)>
Date: Fri, 24 Feb 2006 13:16:31 +0000 (+0100)
Subject: Merge /home/tur/nand/u-boot/
X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fu-boot.git;a=commitdiff_plain;h=0377dca227cc883bbaacbe1c442cef5bd6b0e121

Merge /home/tur/nand/u-boot/
This is a first version of the testing-NAND branch merged back to main.
---

0377dca227cc883bbaacbe1c442cef5bd6b0e121
diff --cc CHANGELOG
index a4b0700dbc,5d32bcec48..fba2d00004
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -2,32 -2,13 +2,37 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
+ * Merge the new NAND code (testing-NAND brach)
+ 
+   Rewrite of NAND code based on what is in 2.6.12 Linux kernel
+   Patch by Ladislav Michl, 29 Jun 2005
+ 
 +* Add basic support for the SMMACO4 Board from PanDaCom.
 +  Patch by Heiko Schocher, 20 Feb 2006
 +
 +* Add GIT version information (commid ID) to untagged U-Boot versions
 +
 +  As done in the linux kernel, the U-Boot version (U_BOOT_VERSION)
 +  of all unreleased (untagged) U-Boot images will be automatically
 +  extended upon compiletime with a part of the GIT commit ID and
 +  possibly with "dirty" if uncommited changes are detected.
 +
 +  Here an example for the resulting version:
 +  "U-Boot 1.1.4-g3457ac18-dirty"
 +
 +  The version is now maintained in the toplevel Makefile and the
 +  version headers are autogenerated.
 +
 +  Patch by Stefan Roese, 9 Feb 2006
 +
  * Update default environment for INKA4x00 board.
  
 +* Convert CPCI750 to use common CFI flash driver
 +  Patch by Reinhard Arlt, 8 Feb 2006
 +
 +* Various changes to esd HH405 board specific files
 +  Patch by Matthias Fuchs, 07 Feb 2006
 +
  * Cleanup U-Boot boot messages on ARM.
  
    To match the U-Boot user interface on ARM platforms to the U-Boot