Merge branch 'master' of http://www.denx.de/git/u-boot

1 files changed, 26 insertions, 0 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 12ae5dec13..a4b0700dbc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,32 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* 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